Skip to content

Commit 9d61cbc

Browse files
authored
Merge pull request #19461 from apache/fix-ssr-data-undefined
fix(ssr): remove redundant SVG attributes with `undefined` value
2 parents f1d9eb5 + 7a26ce5 commit 9d61cbc

File tree

3 files changed

+44
-4
lines changed

3 files changed

+44
-4
lines changed

src/core/echarts.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,10 +429,14 @@ class ECharts extends Eventful<ECEventDefinition> {
429429

430430
zrender.registerSSRDataGetter(el => {
431431
const ecData = getECData(el);
432+
const dataIndex = ecData.dataIndex;
433+
if (dataIndex == null) {
434+
return;
435+
}
432436
const hashMap = createHashMap();
433437
hashMap.set('series_index', ecData.seriesIndex);
434-
hashMap.set('data_index', ecData.dataIndex);
435-
hashMap.set('ssr_type', ecData.ssrType);
438+
hashMap.set('data_index', dataIndex);
439+
ecData.ssrType && hashMap.set('ssr_type', ecData.ssrType);
436440
return hashMap;
437441
});
438442

src/util/innerStore.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export const setCommonECData = (seriesIndex: number, dataType: SeriesDataType, d
7575
childECData.seriesIndex = seriesIndex;
7676
childECData.dataIndex = dataIdx;
7777
childECData.dataType = dataType;
78-
childECData.ssrType === 'chart';
78+
childECData.ssrType = 'chart';
7979
});
8080
}
8181
}

test/svg-ssr.html

Lines changed: 37 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)