Merge pull request #19461 from apache/fix-ssr-data-undefined

fix(ssr): remove redundant SVG attributes with `undefined` value
apache · Jan 3, 2024 · 9d61cbc · 9d61cbc
2 parents f1d9eb5 + 7a26ce5
commit 9d61cbc
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 4 deletions.
diff --git a/src/core/echarts.ts b/src/core/echarts.ts
@@ -429,10 +429,14 @@ class ECharts extends Eventful<ECEventDefinition> {
 
         zrender.registerSSRDataGetter(el => {
             const ecData = getECData(el);
+            const dataIndex = ecData.dataIndex;
+            if (dataIndex == null) {
+                return;
+            }
             const hashMap = createHashMap();
             hashMap.set('series_index', ecData.seriesIndex);
-            hashMap.set('data_index', ecData.dataIndex);
-            hashMap.set('ssr_type', ecData.ssrType);
+            hashMap.set('data_index', dataIndex);
+            ecData.ssrType && hashMap.set('ssr_type', ecData.ssrType);
             return hashMap;
         });
 

diff --git a/src/util/innerStore.ts b/src/util/innerStore.ts
@@ -75,7 +75,7 @@ export const setCommonECData = (seriesIndex: number, dataType: SeriesDataType, d
                 childECData.seriesIndex = seriesIndex;
                 childECData.dataIndex = dataIdx;
                 childECData.dataType = dataType;
-                childECData.ssrType === 'chart';
+                childECData.ssrType = 'chart';
             });
         }
     }

diff --git a/test/svg-ssr.html b/test/svg-ssr.html