This is an automated email from the ASF dual-hosted git repository. sushuang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 3ca9e32a9f94f0d01dd3e1e7dc477ce367b114f9 Merge: 583711e95 6347c2c3e Author: sushuang <sushuang0...@gmail.com> AuthorDate: Mon Sep 26 01:05:06 2022 +0800 Merge pull request #17696 from apache/release Merge 5.4.0 release to master dist/echarts.common.js | 1207 +++++++++++++++-------------- dist/echarts.common.js.map | 2 +- dist/echarts.common.min.js | 4 +- dist/echarts.esm.js | 1557 ++++++++++++++++++++++---------------- dist/echarts.esm.js.map | 2 +- dist/echarts.esm.min.js | 4 +- dist/echarts.js | 1557 ++++++++++++++++++++++---------------- dist/echarts.js.map | 2 +- dist/echarts.min.js | 4 +- dist/echarts.simple.js | 1164 +++++++++++++++------------- dist/echarts.simple.js.map | 2 +- dist/echarts.simple.min.js | 4 +- dist/extension/bmap.js | 14 +- dist/extension/bmap.js.map | 2 +- i18n/langUA-obj.js | 174 +++++ i18n/langUA.js | 170 +++++ package-lock.json | 728 ++++++------------ package.json | 8 +- src/animation/basicTransition.ts | 8 +- src/chart/bar/BaseBarSeries.ts | 7 +- src/core/echarts.ts | 4 +- test/dataView.html | 6 +- 22 files changed, 3719 insertions(+), 2911 deletions(-) diff --cc package-lock.json index bdc0335a4,260b4e717..9e8a5f09c --- a/package-lock.json +++ b/package-lock.json @@@ -13471,25 -13260,14 +13326,24 @@@ "bin": { "z-schema": "bin/z-schema" }, + "engines": { + "node": ">=8.0.0" + }, "optionalDependencies": { - "commander": "^2.7.1" + "commander": "^2.20.3" } }, + "node_modules/z-schema/node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true, + "optional": true + }, "node_modules/zrender": { - "name": "zrender-nightly", - "version": "5.3.3-dev.20220820", - "resolved": "https://registry.npmjs.org/zrender-nightly/-/zrender-nightly-5.3.3-dev.20220820.tgz", - "integrity": "sha512-/4hBgw+X1EAZ+wE/4VYfOJEkOD+FWJ+GUEMYVNUoo8FWpU97avPhcTVMupP2w6qjuDY8178ivDs8PMBL7igdxQ==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.0.tgz", + "integrity": "sha512-rOS09Z2HSVGFs2dn/TuYk5BlCaZcVe8UDLLjj1ySYF828LATKKdxuakSZMvrDz54yiKPDYVfjdKqcX8Jky3BIA==", "dependencies": { "tslib": "2.3.0" } diff --cc src/chart/bar/BaseBarSeries.ts index e21d96830,45e2836a9..0626e4717 --- a/src/chart/bar/BaseBarSeries.ts +++ b/src/chart/bar/BaseBarSeries.ts @@@ -29,12 -30,9 +30,12 @@@ import import GlobalModel from '../../model/Global'; import Cartesian2D from '../../coord/cartesian/Cartesian2D'; import SeriesData from '../../data/SeriesData'; +import {dimPermutations} from '../../component/marker/MarkAreaView'; +import { each } from 'zrender/src/core/util'; +import type Axis2D from '../../coord/cartesian/Axis2D'; - export interface BaseBarSeriesOption<StateOption, ExtraStateOption = DefaultStatesMixin> + export interface BaseBarSeriesOption<StateOption, ExtraStateOption extends StatesMixinBase = DefaultStatesMixin> extends SeriesOption<StateOption, ExtraStateOption>, SeriesOnCartesianOptionMixin, SeriesOnPolarOptionMixin { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org