Skip to content

fix(data): change deprecated map.data.hasOwnProperty to map.hasKey #17861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pissang merged 2 commits into from
Nov 6, 2022
Merged

fix(data): change deprecated map.data.hasOwnProperty to map.hasKey #17861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68b2862
fix(data): fix deprecated access to `HashMap.data` due to ecomfe/zren…
plainheart Nov 2, 2022
3f1de74
chore(dep): update zrender to the latest nightly version
plainheart Nov 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions package-lock.json
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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