From 68b2862eae41a1e44d649aca7745d7d95fa9cb48 Mon Sep 17 00:00:00 2001 From: plainheart Date: Wed, 2 Nov 2022 14:50:58 +0800 Subject: [PATCH 1/2] fix(data): fix deprecated access to `HashMap.data` due to ecomfe/zrender#966, change `hasOwnProperty` to `hasKey`. --- src/data/helper/createDimensions.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/data/helper/createDimensions.ts b/src/data/helper/createDimensions.ts index cd44440aa7..b5fefd03c2 100644 --- a/src/data/helper/createDimensions.ts +++ b/src/data/helper/createDimensions.ts @@ -114,7 +114,7 @@ export default function prepareSeriesDataSchema( const resultList: SeriesDimensionDefine[] = []; const dimCount = getDimCount(source, sysDims, dimsDef, opt.dimensionsCount); - // Try to ignore unsed dimensions if sharing a high dimension datastore + // Try to ignore unused dimensions if sharing a high dimension datastore // 30 is an experience value. const omitUnusedDimensions = opt.canOmitUnusedDimensions && shouldOmitUnusedDimensions(dimCount); @@ -188,7 +188,7 @@ export default function prepareSeriesDataSchema( }); }); - // Apply templetes and default order from `sysDims`. + // Apply templates and default order from `sysDims`. let availDimIdx = 0; each(sysDims, function (sysDimItemRaw) { let coordDim: DimensionName; @@ -368,7 +368,7 @@ function removeDuplication(result: SeriesDimensionDefine[]) { // But // (1) custom series should be considered. where other dims // may be visited. -// (2) sometimes user need to calcualte bubble size or use visualMap +// (2) sometimes user need to calculate bubble size or use visualMap // on other dimensions besides coordSys needed. // So, dims that is not used by system, should be shared in data store? function getDimCount( @@ -399,10 +399,9 @@ function genCoordDimName( map: HashMap, fromZero: boolean ) { - const mapData = map.data; - if (fromZero || mapData.hasOwnProperty(name)) { + if (fromZero || map.hasKey(name)) { let i = 0; - while (mapData.hasOwnProperty(name + i)) { + while (map.hasKey(name + i)) { i++; } name += i; From 3f1de742567294685b7c04c71ce410f77b8747af Mon Sep 17 00:00:00 2001 From: plainheart Date: Fri, 4 Nov 2022 16:12:39 +0800 Subject: [PATCH 2/2] chore(dep): update zrender to the latest nightly version --- package-lock.json | 15 ++++++++------- package.json | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9e8a5f09c9..6cfd3467bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "tslib": "2.3.0", - "zrender": "5.4.0" + "zrender": "npm:zrender-nightly@^5.4.1-dev.20221104" }, "devDependencies": { "@babel/code-frame": "7.10.4", @@ -13341,9 +13341,10 @@ "optional": true }, "node_modules/zrender": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.0.tgz", - "integrity": "sha512-rOS09Z2HSVGFs2dn/TuYk5BlCaZcVe8UDLLjj1ySYF828LATKKdxuakSZMvrDz54yiKPDYVfjdKqcX8Jky3BIA==", + "name": "zrender-nightly", + "version": "5.4.1-dev.20221104", + "resolved": "https://registry.npmjs.org/zrender-nightly/-/zrender-nightly-5.4.1-dev.20221104.tgz", + "integrity": "sha512-FigVUqINkG/qOxCGi9oYO3raMxEked55dnCAx3Gc47DKePVibOXhVeIqSCdPlu9wUJat6L9A5Jm/ImpoC8DH7A==", "dependencies": { "tslib": "2.3.0" } @@ -24157,9 +24158,9 @@ } }, "zrender": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.0.tgz", - "integrity": "sha512-rOS09Z2HSVGFs2dn/TuYk5BlCaZcVe8UDLLjj1ySYF828LATKKdxuakSZMvrDz54yiKPDYVfjdKqcX8Jky3BIA==", + "version": "npm:zrender-nightly@5.4.1-dev.20221104", + "resolved": "https://registry.npmjs.org/zrender-nightly/-/zrender-nightly-5.4.1-dev.20221104.tgz", + "integrity": "sha512-FigVUqINkG/qOxCGi9oYO3raMxEked55dnCAx3Gc47DKePVibOXhVeIqSCdPlu9wUJat6L9A5Jm/ImpoC8DH7A==", "requires": { "tslib": "2.3.0" } diff --git a/package.json b/package.json index 01641c758f..0e7ea3f844 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ }, "dependencies": { "tslib": "2.3.0", - "zrender": "5.4.0" + "zrender": "npm:zrender-nightly@^5.4.1-dev.20221104" }, "devDependencies": { "@babel/code-frame": "7.10.4",