Skip to content

Commit

Permalink
Merge pull request #17861 from apache/fix/hashmap
Browse files Browse the repository at this point in the history
fix(data): change deprecated `map.data.hasOwnProperty` to `map.hasKey`
  • Loading branch information
pissang authored Nov 6, 2022
2 parents 9c4b742 + 3f1de74 commit 273f3ed
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
15 changes: 8 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
11 changes: 5 additions & 6 deletions src/data/helper/createDimensions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -399,10 +399,9 @@ function genCoordDimName(
map: HashMap<unknown, DimensionName>,
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;
Expand Down

0 comments on commit 273f3ed

Please sign in to comment.