You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by su...@apache.org on 2019/09/29 08:12:40 UTC
[incubator-echarts] branch release updated (9be0327 -> b2b38d6)
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a change to branch release
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.
from 9be0327 test: tweak test case.
new 46a57a9 fix: fix incorrect comment.
new 7dc0b7a chore: tweak code style.
new 2a4f289 build(release): 4.4.0
new b2b38d6 update package-lock.json for 4.4.0-rc.1
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dist/echarts-en.common.js | 1551 +++++++++++++++++++++++++--------
dist/echarts-en.common.min.js | 2 +-
dist/echarts-en.js | 1851 ++++++++++++++++++++++++++++++----------
dist/echarts-en.js.map | 2 +-
dist/echarts-en.min.js | 2 +-
dist/echarts-en.simple.js | 866 +++++++++++++------
dist/echarts-en.simple.min.js | 2 +-
dist/echarts.common.js | 1551 +++++++++++++++++++++++++--------
dist/echarts.common.min.js | 2 +-
dist/echarts.js | 1851 ++++++++++++++++++++++++++++++----------
dist/echarts.js.map | 2 +-
dist/echarts.min.js | 2 +-
dist/echarts.simple.js | 866 +++++++++++++------
dist/echarts.simple.min.js | 2 +-
dist/extension/bmap.js | 17 +
dist/extension/bmap.js.map | 2 +-
dist/extension/bmap.min.js | 2 +-
dist/extension/dataTool.js | 17 +-
dist/extension/dataTool.js.map | 2 +-
dist/extension/dataTool.min.js | 2 +-
extension/bmap/BMapModel.js | 1 +
extension/bmap/BMapView.js | 18 +
extension/dataTool/gexf.js | 6 +-
package-lock.json | 883 ++++++++++---------
package.json | 4 +-
src/coord/geo/GeoModel.js | 10 +-
src/echarts.js | 4 +-
src/util/graphic.js | 3 +-
test/runTest/actions/update.js | 20 +
29 files changed, 6978 insertions(+), 2565 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 02/04: chore: tweak code style.
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 7dc0b7a33bd9ce669a9e5715172ac9e3fb42dde3
Author: SHUANG SU <su...@gmail.com>
AuthorDate: Sat Sep 28 01:06:15 2019 +0800
chore: tweak code style.
---
src/coord/geo/GeoModel.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/coord/geo/GeoModel.js b/src/coord/geo/GeoModel.js
index 96a672e..528b48a 100644
--- a/src/coord/geo/GeoModel.js
+++ b/src/coord/geo/GeoModel.js
@@ -148,11 +148,11 @@ var GeoModel = ComponentModel.extend({
*/
getFormattedLabel: function (name, status) {
var regionModel = this.getRegionModel(name);
- var formatter = regionModel.get('label'
- + (status === 'normal'
- ? '.'
- : status + '.')
- + 'formatter');
+ var formatter = regionModel.get(
+ 'label'
+ + (status === 'normal' ? '.' : status + '.')
+ + 'formatter'
+ );
var params = {
name: name
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 01/04: fix: fix incorrect comment.
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 46a57a954ae5f3f85212b4f476684948e96b3b79
Author: SHUANG SU <su...@gmail.com>
AuthorDate: Fri Sep 27 23:46:20 2019 +0800
fix: fix incorrect comment.
---
src/util/graphic.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/util/graphic.js b/src/util/graphic.js
index 7066f8e..df4efc1 100644
--- a/src/util/graphic.js
+++ b/src/util/graphic.js
@@ -85,7 +85,8 @@ export function extendPath(pathData, opts) {
/**
* Register a user defined shape.
* The shape class can be fetched by `getShapeClass`
- * This method will not overwrite the built-in shapes.
+ * This method will overwrite the registered shapes, including
+ * the registered built-in shapes, if using the same `name`.
* The shape can be used in `custom series` and
* `graphic component` by declaring `{type: name}`.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 04/04: update package-lock.json for 4.4.0-rc.1
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit b2b38d67fe5d7e5b4244dd1499d43cc73e1aad40
Author: SHUANG SU <su...@gmail.com>
AuthorDate: Sun Sep 29 15:59:32 2019 +0800
update package-lock.json for 4.4.0-rc.1
---
package-lock.json | 883 +++++++++++++++++++++++++++++++-----------------------
1 file changed, 501 insertions(+), 382 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 47a4c5e..e376770 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "echarts",
- "version": "4.3.0",
+ "version": "4.4.0-rc.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -8,8 +8,9 @@
"version": "7.5.5",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
"integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
+ "dev": true,
"requires": {
- "@babel/highlight": "^7.0.0"
+ "@babel/highlight": "7.5.0"
}
},
"@babel/core": {
@@ -18,20 +19,20 @@
"integrity": "sha512-jRsuseXBo9pN197KnDwhhaaBzyZr2oIcLHHTt2oDdQrej5Qp57dCCJafWx5ivU8/alEYDpssYqv1MUqcxwQlrA==",
"dev": true,
"requires": {
- "@babel/code-frame": "^7.0.0",
- "@babel/generator": "^7.3.4",
- "@babel/helpers": "^7.2.0",
- "@babel/parser": "^7.3.4",
- "@babel/template": "^7.2.2",
- "@babel/traverse": "^7.3.4",
- "@babel/types": "^7.3.4",
- "convert-source-map": "^1.1.0",
- "debug": "^4.1.0",
- "json5": "^2.1.0",
- "lodash": "^4.17.11",
- "resolve": "^1.3.2",
- "semver": "^5.4.1",
- "source-map": "^0.5.0"
+ "@babel/code-frame": "7.5.5",
+ "@babel/generator": "7.6.0",
+ "@babel/helpers": "7.6.0",
+ "@babel/parser": "7.5.5",
+ "@babel/template": "7.6.0",
+ "@babel/traverse": "7.6.0",
+ "@babel/types": "7.6.1",
+ "convert-source-map": "1.6.0",
+ "debug": "4.1.1",
+ "json5": "2.1.0",
+ "lodash": "4.17.15",
+ "resolve": "1.12.0",
+ "semver": "5.7.1",
+ "source-map": "0.5.7"
},
"dependencies": {
"@babel/template": {
@@ -40,9 +41,9 @@
"integrity": "sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==",
"dev": true,
"requires": {
- "@babel/code-frame": "^7.0.0",
- "@babel/parser": "^7.6.0",
- "@babel/types": "^7.6.0"
+ "@babel/code-frame": "7.5.5",
+ "@babel/parser": "7.6.0",
+ "@babel/types": "7.6.1"
},
"dependencies": {
"@babel/parser": {
@@ -59,9 +60,9 @@
"integrity": "sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==",
"dev": true,
"requires": {
- "esutils": "^2.0.2",
- "lodash": "^4.17.13",
- "to-fast-properties": "^2.0.0"
+ "esutils": "2.0.3",
+ "lodash": "4.17.15",
+ "to-fast-properties": "2.0.0"
}
},
"semver": {
@@ -78,11 +79,11 @@
"integrity": "sha512-Ms8Mo7YBdMMn1BYuNtKuP/z0TgEIhbcyB8HVR6PPNYp4P61lMsABiS4A3VG1qznjXVCf3r+fVHhm4efTYVsySA==",
"dev": true,
"requires": {
- "@babel/types": "^7.6.0",
- "jsesc": "^2.5.1",
- "lodash": "^4.17.13",
- "source-map": "^0.5.0",
- "trim-right": "^1.0.1"
+ "@babel/types": "7.6.1",
+ "jsesc": "2.5.2",
+ "lodash": "4.17.15",
+ "source-map": "0.5.7",
+ "trim-right": "1.0.1"
},
"dependencies": {
"@babel/types": {
@@ -91,9 +92,9 @@
"integrity": "sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==",
"dev": true,
"requires": {
- "esutils": "^2.0.2",
- "lodash": "^4.17.13",
- "to-fast-properties": "^2.0.0"
+ "esutils": "2.0.3",
+ "lodash": "4.17.15",
+ "to-fast-properties": "2.0.0"
}
}
}
@@ -104,9 +105,9 @@
"integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
"dev": true,
"requires": {
- "@babel/helper-get-function-arity": "^7.0.0",
- "@babel/template": "^7.1.0",
- "@babel/types": "^7.0.0"
+ "@babel/helper-get-function-arity": "7.0.0",
+ "@babel/template": "7.6.0",
+ "@babel/types": "7.6.1"
},
"dependencies": {
"@babel/parser": {
@@ -121,9 +122,9 @@
"integrity": "sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==",
"dev": true,
"requires": {
- "@babel/code-frame": "^7.0.0",
- "@babel/parser": "^7.6.0",
- "@babel/types": "^7.6.0"
+ "@babel/code-frame": "7.5.5",
+ "@babel/parser": "7.6.0",
+ "@babel/types": "7.6.1"
}
},
"@babel/types": {
@@ -132,9 +133,9 @@
"integrity": "sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==",
"dev": true,
"requires": {
- "esutils": "^2.0.2",
- "lodash": "^4.17.13",
- "to-fast-properties": "^2.0.0"
+ "esutils": "2.0.3",
+ "lodash": "4.17.15",
+ "to-fast-properties": "2.0.0"
}
}
}
@@ -145,7 +146,7 @@
"integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
"dev": true,
"requires": {
- "@babel/types": "^7.0.0"
+ "@babel/types": "7.6.1"
},
"dependencies": {
"@babel/types": {
@@ -154,9 +155,9 @@
"integrity": "sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==",
"dev": true,
"requires": {
- "esutils": "^2.0.2",
- "lodash": "^4.17.13",
- "to-fast-properties": "^2.0.0"
+ "esutils": "2.0.3",
+ "lodash": "4.17.15",
+ "to-fast-properties": "2.0.0"
}
}
}
@@ -168,7 +169,7 @@
"dev": true,
"requires": {
"@babel/types": "7.0.0-beta.31",
- "lodash": "^4.2.0"
+ "lodash": "4.17.15"
}
},
"@babel/helper-module-transforms": {
@@ -181,7 +182,7 @@
"@babel/helper-simple-access": "7.0.0-beta.31",
"@babel/template": "7.0.0-beta.31",
"@babel/types": "7.0.0-beta.31",
- "lodash": "^4.2.0"
+ "lodash": "4.17.15"
}
},
"@babel/helper-simple-access": {
@@ -192,7 +193,7 @@
"requires": {
"@babel/template": "7.0.0-beta.31",
"@babel/types": "7.0.0-beta.31",
- "lodash": "^4.2.0"
+ "lodash": "4.17.15"
}
},
"@babel/helper-split-export-declaration": {
@@ -201,7 +202,7 @@
"integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
"dev": true,
"requires": {
- "@babel/types": "^7.4.4"
+ "@babel/types": "7.6.1"
},
"dependencies": {
"@babel/types": {
@@ -210,9 +211,9 @@
"integrity": "sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==",
"dev": true,
"requires": {
- "esutils": "^2.0.2",
- "lodash": "^4.17.13",
- "to-fast-properties": "^2.0.0"
+ "esutils": "2.0.3",
+ "lodash": "4.17.15",
+ "to-fast-properties": "2.0.0"
}
}
}
@@ -223,9 +224,9 @@
"integrity": "sha512-W9kao7OBleOjfXtFGgArGRX6eCP0UEcA2ZWEWNkJdRZnHhW4eEbeswbG3EwaRsnQUAEGWYgMq1HsIXuNNNy2eQ==",
"dev": true,
"requires": {
- "@babel/template": "^7.6.0",
- "@babel/traverse": "^7.6.0",
- "@babel/types": "^7.6.0"
+ "@babel/template": "7.6.0",
+ "@babel/traverse": "7.6.0",
+ "@babel/types": "7.6.1"
},
"dependencies": {
"@babel/parser": {
@@ -240,9 +241,9 @@
"integrity": "sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==",
"dev": true,
"requires": {
- "@babel/code-frame": "^7.0.0",
- "@babel/parser": "^7.6.0",
- "@babel/types": "^7.6.0"
+ "@babel/code-frame": "7.5.5",
+ "@babel/parser": "7.6.0",
+ "@babel/types": "7.6.1"
}
},
"@babel/types": {
@@ -251,9 +252,9 @@
"integrity": "sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==",
"dev": true,
"requires": {
- "esutils": "^2.0.2",
- "lodash": "^4.17.13",
- "to-fast-properties": "^2.0.0"
+ "esutils": "2.0.3",
+ "lodash": "4.17.15",
+ "to-fast-properties": "2.0.0"
}
}
}
@@ -262,10 +263,11 @@
"version": "7.5.0",
"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
"integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
+ "dev": true,
"requires": {
- "chalk": "^2.0.0",
- "esutils": "^2.0.2",
- "js-tokens": "^4.0.0"
+ "chalk": "2.4.2",
+ "esutils": "2.0.3",
+ "js-tokens": "4.0.0"
}
},
"@babel/parser": {
@@ -283,7 +285,7 @@
"@babel/code-frame": "7.0.0-beta.31",
"@babel/types": "7.0.0-beta.31",
"babylon": "7.0.0-beta.31",
- "lodash": "^4.2.0"
+ "lodash": "4.17.15"
},
"dependencies": {
"@babel/code-frame": {
@@ -292,9 +294,9 @@
"integrity": "sha512-yd7CkUughvHQoEahQqcMdrZw6o/6PwUxiRkfZuVDVHCDe77mysD/suoNyk5mK6phTnRW1kyIbPHyCJgxw++LXg==",
"dev": true,
"requires": {
- "chalk": "^2.0.0",
- "esutils": "^2.0.2",
- "js-tokens": "^3.0.0"
+ "chalk": "2.4.2",
+ "esutils": "2.0.3",
+ "js-tokens": "3.0.2"
}
},
"js-tokens": {
@@ -311,15 +313,15 @@
"integrity": "sha512-93t52SaOBgml/xY74lsmt7xOR4ufYvhb5c5qiM6lu4J/dWGMAfAh6eKw4PjLes6DI6nQgearoxnFJk60YchpvQ==",
"dev": true,
"requires": {
- "@babel/code-frame": "^7.5.5",
- "@babel/generator": "^7.6.0",
- "@babel/helper-function-name": "^7.1.0",
- "@babel/helper-split-export-declaration": "^7.4.4",
- "@babel/parser": "^7.6.0",
- "@babel/types": "^7.6.0",
- "debug": "^4.1.0",
- "globals": "^11.1.0",
- "lodash": "^4.17.13"
+ "@babel/code-frame": "7.5.5",
+ "@babel/generator": "7.6.0",
+ "@babel/helper-function-name": "7.1.0",
+ "@babel/helper-split-export-declaration": "7.4.4",
+ "@babel/parser": "7.6.0",
+ "@babel/types": "7.6.1",
+ "debug": "4.1.1",
+ "globals": "11.12.0",
+ "lodash": "4.17.15"
},
"dependencies": {
"@babel/parser": {
@@ -334,9 +336,9 @@
"integrity": "sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==",
"dev": true,
"requires": {
- "esutils": "^2.0.2",
- "lodash": "^4.17.13",
- "to-fast-properties": "^2.0.0"
+ "esutils": "2.0.3",
+ "lodash": "4.17.15",
+ "to-fast-properties": "2.0.0"
}
}
}
@@ -347,9 +349,9 @@
"integrity": "sha512-exAHB+NeFGxkfQ5dSUD03xl3zYGneeSk2Mw2ldTt/nTvYxuDiuSp3DlxgUBgzbdTFG4fbwPk0WtKWOoTXCmNGg==",
"dev": true,
"requires": {
- "esutils": "^2.0.2",
- "lodash": "^4.2.0",
- "to-fast-properties": "^2.0.0"
+ "esutils": "2.0.3",
+ "lodash": "4.17.15",
+ "to-fast-properties": "2.0.0"
}
},
"accepts": {
@@ -358,7 +360,7 @@
"integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
"dev": true,
"requires": {
- "mime-types": "~2.1.24",
+ "mime-types": "2.1.24",
"negotiator": "0.6.2"
},
"dependencies": {
@@ -388,7 +390,8 @@
"acorn-jsx": {
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.2.tgz",
- "integrity": "sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw=="
+ "integrity": "sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw==",
+ "dev": true
},
"after": {
"version": "0.8.2",
@@ -400,11 +403,12 @@
"version": "6.10.2",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
"integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+ "dev": true,
"requires": {
- "fast-deep-equal": "^2.0.1",
- "fast-json-stable-stringify": "^2.0.0",
- "json-schema-traverse": "^0.4.1",
- "uri-js": "^4.2.2"
+ "fast-deep-equal": "2.0.1",
+ "fast-json-stable-stringify": "2.0.0",
+ "json-schema-traverse": "0.4.1",
+ "uri-js": "4.2.2"
}
},
"amdefine": {
@@ -417,27 +421,31 @@
"ansi-escapes": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
- "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
+ "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+ "dev": true
},
"ansi-regex": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
- "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+ "dev": true
},
"ansi-styles": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
"requires": {
- "color-convert": "^1.9.0"
+ "color-convert": "1.9.3"
}
},
"argparse": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+ "dev": true,
"requires": {
- "sprintf-js": "~1.0.2"
+ "sprintf-js": "1.0.3"
}
},
"arraybuffer.slice": {
@@ -458,7 +466,8 @@
"astral-regex": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
- "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="
+ "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+ "dev": true
},
"async-limiter": {
"version": "1.0.1",
@@ -481,7 +490,8 @@
"balanced-match": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
- "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+ "dev": true
},
"base64-arraybuffer": {
"version": "0.1.5",
@@ -514,8 +524,9 @@
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+ "dev": true,
"requires": {
- "balanced-match": "^1.0.0",
+ "balanced-match": "1.0.0",
"concat-map": "0.0.1"
}
},
@@ -557,22 +568,25 @@
"callsites": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
- "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
+ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+ "dev": true
},
"chalk": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "dev": true,
"requires": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
+ "ansi-styles": "3.2.1",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "5.5.0"
}
},
"chardet": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
- "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
+ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+ "dev": true
},
"cli": {
"version": "1.0.1",
@@ -581,7 +595,7 @@
"dev": true,
"requires": {
"exit": "0.1.2",
- "glob": "^7.1.1"
+ "glob": "7.1.4"
},
"dependencies": {
"glob": {
@@ -590,12 +604,12 @@
"integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
"dev": true,
"requires": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.0.4",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
+ "fs.realpath": "1.0.0",
+ "inflight": "1.0.6",
+ "inherits": "2.0.1",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
}
}
}
@@ -604,19 +618,22 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
"integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+ "dev": true,
"requires": {
- "restore-cursor": "^2.0.0"
+ "restore-cursor": "2.0.0"
}
},
"cli-width": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
- "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
+ "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+ "dev": true
},
"color-convert": {
"version": "1.9.3",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+ "dev": true,
"requires": {
"color-name": "1.1.3"
}
@@ -624,7 +641,8 @@
"color-name": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+ "dev": true
},
"commander": {
"version": "2.11.0",
@@ -653,7 +671,8 @@
"concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
- "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+ "dev": true
},
"console-browserify": {
"version": "1.1.0",
@@ -661,7 +680,7 @@
"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
"dev": true,
"requires": {
- "date-now": "^0.1.4"
+ "date-now": "0.1.4"
}
},
"content-disposition": {
@@ -676,7 +695,7 @@
"integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
"dev": true,
"requires": {
- "safe-buffer": "~5.1.1"
+ "safe-buffer": "5.1.2"
}
},
"cookie": {
@@ -701,18 +720,20 @@
"version": "6.0.5",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+ "dev": true,
"requires": {
- "nice-try": "^1.0.4",
- "path-key": "^2.0.1",
- "semver": "^5.5.0",
- "shebang-command": "^1.2.0",
- "which": "^1.2.9"
+ "nice-try": "1.0.5",
+ "path-key": "2.0.1",
+ "semver": "5.7.1",
+ "shebang-command": "1.2.0",
+ "which": "1.3.1"
},
"dependencies": {
"semver": {
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
}
}
},
@@ -726,21 +747,24 @@
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "dev": true,
"requires": {
- "ms": "^2.1.1"
+ "ms": "2.1.2"
}
},
"deep-is": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
- "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+ "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+ "dev": true
},
"doctrine": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+ "dev": true,
"requires": {
- "esutils": "^2.0.2"
+ "esutils": "2.0.3"
}
},
"dom-serializer": {
@@ -749,8 +773,8 @@
"integrity": "sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==",
"dev": true,
"requires": {
- "domelementtype": "^2.0.1",
- "entities": "^2.0.0"
+ "domelementtype": "2.0.1",
+ "entities": "2.0.0"
},
"dependencies": {
"domelementtype": {
@@ -779,7 +803,7 @@
"integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=",
"dev": true,
"requires": {
- "domelementtype": "1"
+ "domelementtype": "1.3.1"
}
},
"domutils": {
@@ -788,14 +812,15 @@
"integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
"dev": true,
"requires": {
- "dom-serializer": "0",
- "domelementtype": "1"
+ "dom-serializer": "0.2.1",
+ "domelementtype": "1.3.1"
}
},
"emoji-regex": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
- "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+ "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+ "dev": true
},
"engine.io": {
"version": "3.3.2",
@@ -803,12 +828,12 @@
"integrity": "sha512-AsaA9KG7cWPXWHp5FvHdDWY3AMWeZ8x+2pUVLcn71qE5AtAzgGbxuclOytygskw8XGmiQafTmnI9Bix3uihu2w==",
"dev": true,
"requires": {
- "accepts": "~1.3.4",
+ "accepts": "1.3.7",
"base64id": "1.0.0",
"cookie": "0.3.1",
- "debug": "~3.1.0",
- "engine.io-parser": "~2.1.0",
- "ws": "~6.1.0"
+ "debug": "3.1.0",
+ "engine.io-parser": "2.1.3",
+ "ws": "6.1.4"
},
"dependencies": {
"debug": {
@@ -836,14 +861,14 @@
"requires": {
"component-emitter": "1.2.1",
"component-inherit": "0.0.3",
- "debug": "~3.1.0",
- "engine.io-parser": "~2.1.1",
+ "debug": "3.1.0",
+ "engine.io-parser": "2.1.3",
"has-cors": "1.1.0",
"indexof": "0.0.1",
"parseqs": "0.0.5",
"parseuri": "0.0.5",
- "ws": "~6.1.0",
- "xmlhttprequest-ssl": "~1.5.4",
+ "ws": "6.1.4",
+ "xmlhttprequest-ssl": "1.5.5",
"yeast": "0.1.2"
},
"dependencies": {
@@ -871,10 +896,10 @@
"dev": true,
"requires": {
"after": "0.8.2",
- "arraybuffer.slice": "~0.0.7",
+ "arraybuffer.slice": "0.0.7",
"base64-arraybuffer": "0.1.5",
"blob": "0.0.5",
- "has-binary2": "~1.0.2"
+ "has-binary2": "1.0.3"
}
},
"entities": {
@@ -886,7 +911,8 @@
"escape-string-regexp": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
- "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+ "dev": true
},
"escodegen": {
"version": "1.8.0",
@@ -894,11 +920,11 @@
"integrity": "sha1-skaq6CnOc9WeLFVyc1nt0cEwqBs=",
"dev": true,
"requires": {
- "esprima": "^2.7.1",
- "estraverse": "^1.9.1",
- "esutils": "^2.0.2",
- "optionator": "^0.8.1",
- "source-map": "~0.2.0"
+ "esprima": "2.7.2",
+ "estraverse": "1.9.3",
+ "esutils": "2.0.3",
+ "optionator": "0.8.2",
+ "source-map": "0.2.0"
},
"dependencies": {
"estraverse": {
@@ -914,7 +940,7 @@
"dev": true,
"optional": true,
"requires": {
- "amdefine": ">=0.0.4"
+ "amdefine": "1.0.1"
}
}
}
@@ -923,50 +949,52 @@
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-6.3.0.tgz",
"integrity": "sha512-ZvZTKaqDue+N8Y9g0kp6UPZtS4FSY3qARxBs7p4f0H0iof381XHduqVerFWtK8DPtKmemqbqCFENWSQgPR/Gow==",
+ "dev": true,
"requires": {
- "@babel/code-frame": "^7.0.0",
- "ajv": "^6.10.0",
- "chalk": "^2.1.0",
- "cross-spawn": "^6.0.5",
- "debug": "^4.0.1",
- "doctrine": "^3.0.0",
- "eslint-scope": "^5.0.0",
- "eslint-utils": "^1.4.2",
- "eslint-visitor-keys": "^1.1.0",
- "espree": "^6.1.1",
- "esquery": "^1.0.1",
- "esutils": "^2.0.2",
- "file-entry-cache": "^5.0.1",
- "functional-red-black-tree": "^1.0.1",
- "glob-parent": "^5.0.0",
- "globals": "^11.7.0",
- "ignore": "^4.0.6",
- "import-fresh": "^3.0.0",
- "imurmurhash": "^0.1.4",
- "inquirer": "^6.4.1",
- "is-glob": "^4.0.0",
- "js-yaml": "^3.13.1",
- "json-stable-stringify-without-jsonify": "^1.0.1",
- "levn": "^0.3.0",
- "lodash": "^4.17.14",
- "minimatch": "^3.0.4",
- "mkdirp": "^0.5.1",
- "natural-compare": "^1.4.0",
- "optionator": "^0.8.2",
- "progress": "^2.0.0",
- "regexpp": "^2.0.1",
- "semver": "^6.1.2",
- "strip-ansi": "^5.2.0",
- "strip-json-comments": "^3.0.1",
- "table": "^5.2.3",
- "text-table": "^0.2.0",
- "v8-compile-cache": "^2.0.3"
+ "@babel/code-frame": "7.5.5",
+ "ajv": "6.10.2",
+ "chalk": "2.4.2",
+ "cross-spawn": "6.0.5",
+ "debug": "4.1.1",
+ "doctrine": "3.0.0",
+ "eslint-scope": "5.0.0",
+ "eslint-utils": "1.4.2",
+ "eslint-visitor-keys": "1.1.0",
+ "espree": "6.1.1",
+ "esquery": "1.0.1",
+ "esutils": "2.0.3",
+ "file-entry-cache": "5.0.1",
+ "functional-red-black-tree": "1.0.1",
+ "glob-parent": "5.0.0",
+ "globals": "11.12.0",
+ "ignore": "4.0.6",
+ "import-fresh": "3.1.0",
+ "imurmurhash": "0.1.4",
+ "inquirer": "6.5.2",
+ "is-glob": "4.0.1",
+ "js-yaml": "3.13.1",
+ "json-stable-stringify-without-jsonify": "1.0.1",
+ "levn": "0.3.0",
+ "lodash": "4.17.15",
+ "minimatch": "3.0.4",
+ "mkdirp": "0.5.1",
+ "natural-compare": "1.4.0",
+ "optionator": "0.8.2",
+ "progress": "2.0.3",
+ "regexpp": "2.0.1",
+ "semver": "6.3.0",
+ "strip-ansi": "5.2.0",
+ "strip-json-comments": "3.0.1",
+ "table": "5.4.6",
+ "text-table": "0.2.0",
+ "v8-compile-cache": "2.1.0"
},
"dependencies": {
"strip-json-comments": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
- "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw=="
+ "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
+ "dev": true
}
}
},
@@ -974,38 +1002,43 @@
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
"integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==",
+ "dev": true,
"requires": {
- "esrecurse": "^4.1.0",
- "estraverse": "^4.1.1"
+ "esrecurse": "4.2.1",
+ "estraverse": "4.1.1"
}
},
"eslint-utils": {
"version": "1.4.2",
"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz",
"integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==",
+ "dev": true,
"requires": {
- "eslint-visitor-keys": "^1.0.0"
+ "eslint-visitor-keys": "1.1.0"
}
},
"eslint-visitor-keys": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
- "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A=="
+ "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
+ "dev": true
},
"espree": {
"version": "6.1.1",
"resolved": "https://registry.npmjs.org/espree/-/espree-6.1.1.tgz",
"integrity": "sha512-EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ==",
+ "dev": true,
"requires": {
- "acorn": "^7.0.0",
- "acorn-jsx": "^5.0.2",
- "eslint-visitor-keys": "^1.1.0"
+ "acorn": "7.0.0",
+ "acorn-jsx": "5.0.2",
+ "eslint-visitor-keys": "1.1.0"
},
"dependencies": {
"acorn": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.0.0.tgz",
- "integrity": "sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ=="
+ "integrity": "sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ==",
+ "dev": true
}
}
},
@@ -1019,22 +1052,25 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
"integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+ "dev": true,
"requires": {
- "estraverse": "^4.0.0"
+ "estraverse": "4.1.1"
}
},
"esrecurse": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
"integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+ "dev": true,
"requires": {
- "estraverse": "^4.1.0"
+ "estraverse": "4.1.1"
}
},
"estraverse": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz",
- "integrity": "sha1-9srKcokzqFDvkGYdDheYK6RxEaI="
+ "integrity": "sha1-9srKcokzqFDvkGYdDheYK6RxEaI=",
+ "dev": true
},
"estree-walker": {
"version": "0.5.2",
@@ -1045,7 +1081,8 @@
"esutils": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
- "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
+ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+ "dev": true
},
"exit": {
"version": "0.1.2",
@@ -1057,26 +1094,30 @@
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
"integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+ "dev": true,
"requires": {
- "chardet": "^0.7.0",
- "iconv-lite": "^0.4.24",
- "tmp": "^0.0.33"
+ "chardet": "0.7.0",
+ "iconv-lite": "0.4.24",
+ "tmp": "0.0.33"
}
},
"fast-deep-equal": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
- "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+ "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+ "dev": true
},
"fast-json-stable-stringify": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
- "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+ "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+ "dev": true
},
"fast-levenshtein": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
- "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+ "dev": true
},
"fast-url-parser": {
"version": "1.1.3",
@@ -1084,31 +1125,34 @@
"integrity": "sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0=",
"dev": true,
"requires": {
- "punycode": "^1.3.2"
+ "punycode": "1.4.1"
}
},
"figures": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
"integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+ "dev": true,
"requires": {
- "escape-string-regexp": "^1.0.5"
+ "escape-string-regexp": "1.0.5"
}
},
"file-entry-cache": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
"integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+ "dev": true,
"requires": {
- "flat-cache": "^2.0.1"
+ "flat-cache": "2.0.1"
}
},
"flat-cache": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
"integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+ "dev": true,
"requires": {
- "flatted": "^2.0.0",
+ "flatted": "2.0.1",
"rimraf": "2.6.3",
"write": "1.0.3"
},
@@ -1117,21 +1161,23 @@
"version": "7.1.4",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
"integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+ "dev": true,
"requires": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.0.4",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
+ "fs.realpath": "1.0.0",
+ "inflight": "1.0.6",
+ "inherits": "2.0.1",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
}
},
"rimraf": {
"version": "2.6.3",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+ "dev": true,
"requires": {
- "glob": "^7.1.3"
+ "glob": "7.1.4"
}
}
}
@@ -1139,7 +1185,8 @@
"flatted": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
- "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg=="
+ "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
+ "dev": true
},
"fs-extra": {
"version": "0.26.7",
@@ -1147,22 +1194,24 @@
"integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=",
"dev": true,
"requires": {
- "graceful-fs": "^4.1.2",
- "jsonfile": "^2.1.0",
- "klaw": "^1.0.0",
- "path-is-absolute": "^1.0.0",
- "rimraf": "^2.2.8"
+ "graceful-fs": "4.2.2",
+ "jsonfile": "2.4.0",
+ "klaw": "1.3.1",
+ "path-is-absolute": "1.0.1",
+ "rimraf": "2.7.1"
}
},
"fs.realpath": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
- "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+ "dev": true
},
"functional-red-black-tree": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
- "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
+ "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+ "dev": true
},
"glob": {
"version": "7.0.0",
@@ -1170,25 +1219,27 @@
"integrity": "sha1-OyCjV//89GuzhK7W+K6aZH/basQ=",
"dev": true,
"requires": {
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "2 || 3",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
+ "inflight": "1.0.6",
+ "inherits": "2.0.1",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
}
},
"glob-parent": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz",
"integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==",
+ "dev": true,
"requires": {
- "is-glob": "^4.0.1"
+ "is-glob": "4.0.1"
}
},
"globals": {
"version": "11.12.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
- "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
+ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+ "dev": true
},
"graceful-fs": {
"version": "4.2.2",
@@ -1214,7 +1265,8 @@
"has-flag": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
},
"htmlparser2": {
"version": "3.8.3",
@@ -1222,39 +1274,43 @@
"integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
"dev": true,
"requires": {
- "domelementtype": "1",
- "domhandler": "2.3",
- "domutils": "1.5",
- "entities": "1.0",
- "readable-stream": "1.1"
+ "domelementtype": "1.3.1",
+ "domhandler": "2.3.0",
+ "domutils": "1.5.1",
+ "entities": "1.0.0",
+ "readable-stream": "1.1.14"
}
},
"iconv-lite": {
"version": "0.4.24",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+ "dev": true,
"requires": {
- "safer-buffer": ">= 2.1.2 < 3"
+ "safer-buffer": "2.1.2"
}
},
"ignore": {
"version": "4.0.6",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
- "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
+ "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+ "dev": true
},
"import-fresh": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz",
"integrity": "sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==",
+ "dev": true,
"requires": {
- "parent-module": "^1.0.0",
- "resolve-from": "^4.0.0"
+ "parent-module": "1.0.1",
+ "resolve-from": "4.0.0"
}
},
"imurmurhash": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
- "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+ "dev": true
},
"indexof": {
"version": "0.0.1",
@@ -1266,52 +1322,58 @@
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+ "dev": true,
"requires": {
- "once": "^1.3.0",
- "wrappy": "1"
+ "once": "1.4.0",
+ "wrappy": "1.0.2"
}
},
"inherits": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
- "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
+ "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+ "dev": true
},
"inquirer": {
"version": "6.5.2",
"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
"integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
+ "dev": true,
"requires": {
- "ansi-escapes": "^3.2.0",
- "chalk": "^2.4.2",
- "cli-cursor": "^2.1.0",
- "cli-width": "^2.0.0",
- "external-editor": "^3.0.3",
- "figures": "^2.0.0",
- "lodash": "^4.17.12",
+ "ansi-escapes": "3.2.0",
+ "chalk": "2.4.2",
+ "cli-cursor": "2.1.0",
+ "cli-width": "2.2.0",
+ "external-editor": "3.1.0",
+ "figures": "2.0.0",
+ "lodash": "4.17.15",
"mute-stream": "0.0.7",
- "run-async": "^2.2.0",
- "rxjs": "^6.4.0",
- "string-width": "^2.1.0",
- "strip-ansi": "^5.1.0",
- "through": "^2.3.6"
+ "run-async": "2.3.0",
+ "rxjs": "6.5.3",
+ "string-width": "2.1.1",
+ "strip-ansi": "5.2.0",
+ "through": "2.3.8"
}
},
"is-extglob": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
- "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+ "dev": true
},
"is-fullwidth-code-point": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
- "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+ "dev": true
},
"is-glob": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+ "dev": true,
"requires": {
- "is-extglob": "^2.1.1"
+ "is-extglob": "2.1.1"
}
},
"is-module": {
@@ -1323,7 +1385,8 @@
"is-promise": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
- "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
+ "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+ "dev": true
},
"is-wsl": {
"version": "1.1.0",
@@ -1340,26 +1403,30 @@
"isexe": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
- "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+ "dev": true
},
"js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
- "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+ "dev": true
},
"js-yaml": {
"version": "3.13.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+ "dev": true,
"requires": {
- "argparse": "^1.0.7",
- "esprima": "^4.0.0"
+ "argparse": "1.0.10",
+ "esprima": "4.0.1"
},
"dependencies": {
"esprima": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
- "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+ "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+ "dev": true
}
}
},
@@ -1375,25 +1442,27 @@
"integrity": "sha512-e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA==",
"dev": true,
"requires": {
- "cli": "~1.0.0",
- "console-browserify": "1.1.x",
- "exit": "0.1.x",
- "htmlparser2": "3.8.x",
- "lodash": "~4.17.11",
- "minimatch": "~3.0.2",
- "shelljs": "0.3.x",
- "strip-json-comments": "1.0.x"
+ "cli": "1.0.1",
+ "console-browserify": "1.1.0",
+ "exit": "0.1.2",
+ "htmlparser2": "3.8.3",
+ "lodash": "4.17.15",
+ "minimatch": "3.0.4",
+ "shelljs": "0.3.0",
+ "strip-json-comments": "1.0.4"
}
},
"json-schema-traverse": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
- "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+ "dev": true
},
"json-stable-stringify-without-jsonify": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
- "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
+ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+ "dev": true
},
"json5": {
"version": "2.1.0",
@@ -1401,7 +1470,7 @@
"integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
"dev": true,
"requires": {
- "minimist": "^1.2.0"
+ "minimist": "1.2.0"
}
},
"jsonfile": {
@@ -1410,7 +1479,7 @@
"integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
"dev": true,
"requires": {
- "graceful-fs": "^4.1.6"
+ "graceful-fs": "4.2.2"
}
},
"klaw": {
@@ -1419,22 +1488,24 @@
"integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
"dev": true,
"requires": {
- "graceful-fs": "^4.1.9"
+ "graceful-fs": "4.2.2"
}
},
"levn": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+ "dev": true,
"requires": {
- "prelude-ls": "~1.1.2",
- "type-check": "~0.3.2"
+ "prelude-ls": "1.1.2",
+ "type-check": "0.3.2"
}
},
"lodash": {
"version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
- "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+ "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+ "dev": true
},
"magic-string": {
"version": "0.22.5",
@@ -1442,7 +1513,7 @@
"integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
"dev": true,
"requires": {
- "vlq": "^0.2.2"
+ "vlq": "0.2.3"
}
},
"mime-db": {
@@ -1457,20 +1528,22 @@
"integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
"dev": true,
"requires": {
- "mime-db": "~1.33.0"
+ "mime-db": "1.33.0"
}
},
"mimic-fn": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
- "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
+ "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+ "dev": true
},
"minimatch": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+ "dev": true,
"requires": {
- "brace-expansion": "^1.1.7"
+ "brace-expansion": "1.1.11"
}
},
"minimist": {
@@ -1483,6 +1556,7 @@
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+ "dev": true,
"requires": {
"minimist": "0.0.8"
},
@@ -1490,24 +1564,28 @@
"minimist": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
- "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+ "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+ "dev": true
}
}
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
- "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
},
"mute-stream": {
"version": "0.0.7",
"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
- "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
+ "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+ "dev": true
},
"natural-compare": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
- "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
+ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+ "dev": true
},
"negotiator": {
"version": "0.6.2",
@@ -1518,7 +1596,8 @@
"nice-try": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
- "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+ "dev": true
},
"object-component": {
"version": "0.0.3",
@@ -1530,16 +1609,18 @@
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+ "dev": true,
"requires": {
- "wrappy": "1"
+ "wrappy": "1.0.2"
}
},
"onetime": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
"integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+ "dev": true,
"requires": {
- "mimic-fn": "^1.0.0"
+ "mimic-fn": "1.2.0"
}
},
"open": {
@@ -1548,33 +1629,36 @@
"integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
"dev": true,
"requires": {
- "is-wsl": "^1.1.0"
+ "is-wsl": "1.1.0"
}
},
"optionator": {
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
"integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+ "dev": true,
"requires": {
- "deep-is": "~0.1.3",
- "fast-levenshtein": "~2.0.4",
- "levn": "~0.3.0",
- "prelude-ls": "~1.1.2",
- "type-check": "~0.3.2",
- "wordwrap": "~1.0.0"
+ "deep-is": "0.1.3",
+ "fast-levenshtein": "2.0.6",
+ "levn": "0.3.0",
+ "prelude-ls": "1.1.2",
+ "type-check": "0.3.2",
+ "wordwrap": "1.0.0"
}
},
"os-tmpdir": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
- "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+ "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+ "dev": true
},
"parent-module": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+ "dev": true,
"requires": {
- "callsites": "^3.0.0"
+ "callsites": "3.1.0"
}
},
"parseqs": {
@@ -1583,7 +1667,7 @@
"integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
"dev": true,
"requires": {
- "better-assert": "~1.0.0"
+ "better-assert": "1.0.2"
}
},
"parseuri": {
@@ -1592,13 +1676,14 @@
"integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
"dev": true,
"requires": {
- "better-assert": "~1.0.0"
+ "better-assert": "1.0.2"
}
},
"path-is-absolute": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
- "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+ "dev": true
},
"path-is-inside": {
"version": "1.0.2",
@@ -1609,7 +1694,8 @@
"path-key": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
- "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+ "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+ "dev": true
},
"path-parse": {
"version": "1.0.6",
@@ -1629,7 +1715,7 @@
"integrity": "sha512-b65UpTI40rGFY8QwN6IYuCbpmwAOL6M8d6voX4F3zR99UmDqh7r2QWLxoeHOazBRgEmDUdqNVESDREqFxQS7rQ==",
"dev": true,
"requires": {
- "pngjs": "^3.4.0"
+ "pngjs": "3.4.0"
}
},
"pngjs": {
@@ -1641,12 +1727,14 @@
"prelude-ls": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
- "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
+ "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+ "dev": true
},
"progress": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
- "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
+ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+ "dev": true
},
"punycode": {
"version": "1.4.1",
@@ -1666,10 +1754,10 @@
"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
"dev": true,
"requires": {
- "core-util-is": "~1.0.0",
- "inherits": "~2.0.1",
+ "core-util-is": "1.0.2",
+ "inherits": "2.0.1",
"isarray": "0.0.1",
- "string_decoder": "~0.10.x"
+ "string_decoder": "0.10.31"
},
"dependencies": {
"isarray": {
@@ -1683,7 +1771,8 @@
"regexpp": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
- "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="
+ "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
+ "dev": true
},
"resolve": {
"version": "1.12.0",
@@ -1691,21 +1780,23 @@
"integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
"dev": true,
"requires": {
- "path-parse": "^1.0.6"
+ "path-parse": "1.0.6"
}
},
"resolve-from": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
- "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
+ "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+ "dev": true
},
"restore-cursor": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
"integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+ "dev": true,
"requires": {
- "onetime": "^2.0.0",
- "signal-exit": "^3.0.2"
+ "onetime": "2.0.1",
+ "signal-exit": "3.0.2"
}
},
"rimraf": {
@@ -1714,7 +1805,7 @@
"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
"dev": true,
"requires": {
- "glob": "^7.1.3"
+ "glob": "7.1.4"
},
"dependencies": {
"glob": {
@@ -1723,12 +1814,12 @@
"integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
"dev": true,
"requires": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.0.4",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
+ "fs.realpath": "1.0.0",
+ "inflight": "1.0.6",
+ "inherits": "2.0.1",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
}
}
}
@@ -1745,11 +1836,11 @@
"integrity": "sha512-mg+WuD+jlwoo8bJtW3Mvx7Tz6TsIdMsdhuvCnDMoyjh0oxsVgsjB/N0X984RJCWwc5IIiqNVJhXeeITcc73++A==",
"dev": true,
"requires": {
- "acorn": "^5.2.1",
- "estree-walker": "^0.5.0",
- "magic-string": "^0.22.4",
- "resolve": "^1.4.0",
- "rollup-pluginutils": "^2.0.1"
+ "acorn": "5.7.3",
+ "estree-walker": "0.5.2",
+ "magic-string": "0.22.5",
+ "resolve": "1.12.0",
+ "rollup-pluginutils": "2.8.1"
}
},
"rollup-plugin-node-resolve": {
@@ -1758,10 +1849,10 @@
"integrity": "sha1-i4l8TDAw1QASd7BRSyXSygloPuA=",
"dev": true,
"requires": {
- "browser-resolve": "^1.11.0",
- "builtin-modules": "^1.1.0",
- "is-module": "^1.0.0",
- "resolve": "^1.1.6"
+ "browser-resolve": "1.11.3",
+ "builtin-modules": "1.1.1",
+ "is-module": "1.0.0",
+ "resolve": "1.12.0"
}
},
"rollup-plugin-uglify": {
@@ -1770,7 +1861,7 @@
"integrity": "sha1-Z7N60e/a+9g69MNrQMGJ7khmyWk=",
"dev": true,
"requires": {
- "uglify-js": "^3.0.9"
+ "uglify-js": "3.6.0"
}
},
"rollup-pluginutils": {
@@ -1779,7 +1870,7 @@
"integrity": "sha512-J5oAoysWar6GuZo0s+3bZ6sVZAC0pfqKz68De7ZgDi5z63jOVZn1uJL/+z1jeKHNbGII8kAyHF5q8LnxSX5lQg==",
"dev": true,
"requires": {
- "estree-walker": "^0.6.1"
+ "estree-walker": "0.6.1"
},
"dependencies": {
"estree-walker": {
@@ -1794,16 +1885,18 @@
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
"integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+ "dev": true,
"requires": {
- "is-promise": "^2.1.0"
+ "is-promise": "2.1.0"
}
},
"rxjs": {
"version": "6.5.3",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",
"integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
+ "dev": true,
"requires": {
- "tslib": "^1.9.0"
+ "tslib": "1.10.0"
}
},
"safe-buffer": {
@@ -1815,7 +1908,8 @@
"safer-buffer": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
- "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+ "dev": true
},
"seedrandom": {
"version": "3.0.3",
@@ -1826,7 +1920,8 @@
"semver": {
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
- "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "dev": true
},
"serve-handler": {
"version": "6.1.1",
@@ -1848,14 +1943,16 @@
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
"integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+ "dev": true,
"requires": {
- "shebang-regex": "^1.0.0"
+ "shebang-regex": "1.0.0"
}
},
"shebang-regex": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
- "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+ "dev": true
},
"shelljs": {
"version": "0.3.0",
@@ -1866,16 +1963,18 @@
"signal-exit": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
- "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+ "dev": true
},
"slice-ansi": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
"integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+ "dev": true,
"requires": {
- "ansi-styles": "^3.2.0",
- "astral-regex": "^1.0.0",
- "is-fullwidth-code-point": "^2.0.0"
+ "ansi-styles": "3.2.1",
+ "astral-regex": "1.0.0",
+ "is-fullwidth-code-point": "2.0.0"
}
},
"slugify": {
@@ -1890,12 +1989,12 @@
"integrity": "sha512-wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w==",
"dev": true,
"requires": {
- "debug": "~4.1.0",
- "engine.io": "~3.3.1",
- "has-binary2": "~1.0.2",
- "socket.io-adapter": "~1.1.0",
+ "debug": "4.1.1",
+ "engine.io": "3.3.2",
+ "has-binary2": "1.0.3",
+ "socket.io-adapter": "1.1.1",
"socket.io-client": "2.2.0",
- "socket.io-parser": "~3.3.0"
+ "socket.io-parser": "3.3.0"
}
},
"socket.io-adapter": {
@@ -1914,15 +2013,15 @@
"base64-arraybuffer": "0.1.5",
"component-bind": "1.0.0",
"component-emitter": "1.2.1",
- "debug": "~3.1.0",
- "engine.io-client": "~3.3.1",
- "has-binary2": "~1.0.2",
+ "debug": "3.1.0",
+ "engine.io-client": "3.3.2",
+ "has-binary2": "1.0.3",
"has-cors": "1.1.0",
"indexof": "0.0.1",
"object-component": "0.0.3",
"parseqs": "0.0.5",
"parseuri": "0.0.5",
- "socket.io-parser": "~3.3.0",
+ "socket.io-parser": "3.3.0",
"to-array": "0.1.4"
},
"dependencies": {
@@ -1950,7 +2049,7 @@
"dev": true,
"requires": {
"component-emitter": "1.2.1",
- "debug": "~3.1.0",
+ "debug": "3.1.0",
"isarray": "2.0.1"
},
"dependencies": {
@@ -1980,23 +2079,26 @@
"sprintf-js": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
- "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+ "dev": true
},
"string-width": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+ "dev": true,
"requires": {
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^4.0.0"
+ "is-fullwidth-code-point": "2.0.0",
+ "strip-ansi": "4.0.0"
},
"dependencies": {
"strip-ansi": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+ "dev": true,
"requires": {
- "ansi-regex": "^3.0.0"
+ "ansi-regex": "3.0.0"
}
}
}
@@ -2011,14 +2113,16 @@
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+ "dev": true,
"requires": {
- "ansi-regex": "^4.1.0"
+ "ansi-regex": "4.1.0"
},
"dependencies": {
"ansi-regex": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
- "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+ "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+ "dev": true
}
}
},
@@ -2032,29 +2136,32 @@
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
"requires": {
- "has-flag": "^3.0.0"
+ "has-flag": "3.0.0"
}
},
"table": {
"version": "5.4.6",
"resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
"integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
+ "dev": true,
"requires": {
- "ajv": "^6.10.2",
- "lodash": "^4.17.14",
- "slice-ansi": "^2.1.0",
- "string-width": "^3.0.0"
+ "ajv": "6.10.2",
+ "lodash": "4.17.15",
+ "slice-ansi": "2.1.0",
+ "string-width": "3.1.0"
},
"dependencies": {
"string-width": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+ "dev": true,
"requires": {
- "emoji-regex": "^7.0.1",
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^5.1.0"
+ "emoji-regex": "7.0.3",
+ "is-fullwidth-code-point": "2.0.0",
+ "strip-ansi": "5.2.0"
}
}
}
@@ -2062,19 +2169,22 @@
"text-table": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
- "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
+ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+ "dev": true
},
"through": {
"version": "2.3.8",
"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
- "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+ "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+ "dev": true
},
"tmp": {
"version": "0.0.33",
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+ "dev": true,
"requires": {
- "os-tmpdir": "~1.0.2"
+ "os-tmpdir": "1.0.2"
}
},
"to-array": {
@@ -2098,14 +2208,16 @@
"tslib": {
"version": "1.10.0",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
- "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
+ "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
+ "dev": true
},
"type-check": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+ "dev": true,
"requires": {
- "prelude-ls": "~1.1.2"
+ "prelude-ls": "1.1.2"
}
},
"uglify-js": {
@@ -2114,8 +2226,8 @@
"integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==",
"dev": true,
"requires": {
- "commander": "~2.20.0",
- "source-map": "~0.6.1"
+ "commander": "2.20.0",
+ "source-map": "0.6.1"
},
"dependencies": {
"commander": {
@@ -2136,14 +2248,16 @@
"version": "4.2.2",
"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+ "dev": true,
"requires": {
- "punycode": "^2.1.0"
+ "punycode": "2.1.1"
},
"dependencies": {
"punycode": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
- "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+ "dev": true
}
}
},
@@ -2159,7 +2273,8 @@
"v8-compile-cache": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
- "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g=="
+ "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==",
+ "dev": true
},
"vlq": {
"version": "0.2.3",
@@ -2171,26 +2286,30 @@
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+ "dev": true,
"requires": {
- "isexe": "^2.0.0"
+ "isexe": "2.0.0"
}
},
"wordwrap": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
- "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
+ "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+ "dev": true
},
"wrappy": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
- "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+ "dev": true
},
"write": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
"integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
+ "dev": true,
"requires": {
- "mkdirp": "^0.5.1"
+ "mkdirp": "0.5.1"
}
},
"ws": {
@@ -2199,7 +2318,7 @@
"integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==",
"dev": true,
"requires": {
- "async-limiter": "~1.0.0"
+ "async-limiter": "1.0.1"
}
},
"xmlhttprequest-ssl": {
@@ -2215,9 +2334,9 @@
"dev": true
},
"zrender": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/zrender/-/zrender-4.1.0.tgz",
- "integrity": "sha512-PkWDpBSRIZAKyBBSkizWCP5/bIL5s/+W+FM/AwkivN4m4QCVH04PS0nJmBB/E6CnUNQv9ZPfIV4tthg1qEP1gg=="
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/zrender/-/zrender-4.1.1.tgz",
+ "integrity": "sha512-epy1rl82dP/JKxhZl+JRfwcZjobKOoynxBzvBZJBPjmDMAxBE4grLjDryx8BHkHlKyWsUkis4XEL2wN61w5l4w=="
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 03/04: build(release): 4.4.0
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 2a4f289d22a3a79fcbdda0fdac504724e1607c20
Author: SHUANG SU <su...@gmail.com>
AuthorDate: Sun Sep 29 15:52:54 2019 +0800
build(release): 4.4.0
---
dist/echarts-en.common.js | 1551 +++++++++++++++++++++++++--------
dist/echarts-en.common.min.js | 2 +-
dist/echarts-en.js | 1851 ++++++++++++++++++++++++++++++----------
dist/echarts-en.js.map | 2 +-
dist/echarts-en.min.js | 2 +-
dist/echarts-en.simple.js | 866 +++++++++++++------
dist/echarts-en.simple.min.js | 2 +-
dist/echarts.common.js | 1551 +++++++++++++++++++++++++--------
dist/echarts.common.min.js | 2 +-
dist/echarts.js | 1851 ++++++++++++++++++++++++++++++----------
dist/echarts.js.map | 2 +-
dist/echarts.min.js | 2 +-
dist/echarts.simple.js | 866 +++++++++++++------
dist/echarts.simple.min.js | 2 +-
dist/extension/bmap.js | 17 +
dist/extension/bmap.js.map | 2 +-
dist/extension/bmap.min.js | 2 +-
dist/extension/dataTool.js | 17 +-
dist/extension/dataTool.js.map | 2 +-
dist/extension/dataTool.min.js | 2 +-
extension/bmap/BMapModel.js | 1 +
extension/bmap/BMapView.js | 18 +
extension/dataTool/gexf.js | 6 +-
package.json | 4 +-
src/echarts.js | 4 +-
test/runTest/actions/update.js | 20 +
26 files changed, 6470 insertions(+), 2177 deletions(-)
diff --git a/dist/echarts-en.common.js b/dist/echarts-en.common.js
index 0250538..b6a2c26 100644
--- a/dist/echarts-en.common.js
+++ b/dist/echarts-en.common.js
@@ -66,6 +66,8 @@ var guid = function () {
* @desc thanks zepto.
*/
+/* global wx */
+
var env = {};
if (typeof wx === 'object' && typeof wx.getSystemInfoSync === 'function') {
@@ -480,7 +482,9 @@ function inherits(clazz, baseClazz) {
clazz.prototype = new F();
for (var prop in clazzPrototype) {
- clazz.prototype[prop] = clazzPrototype[prop];
+ if (clazzPrototype.hasOwnProperty(prop)) {
+ clazz.prototype[prop] = clazzPrototype[prop];
+ }
}
clazz.prototype.constructor = clazz;
clazz.superClass = baseClazz;
@@ -732,6 +736,7 @@ function isDom(value) {
* @return {boolean}
*/
function eqNaN(value) {
+ /* eslint-disable-next-line no-self-compare */
return value !== value;
}
@@ -876,9 +881,11 @@ HashMap.prototype = {
// should not use the exposed keys, who are prefixed.
each: function (cb, context) {
context !== void 0 && (cb = bind(cb, context));
+ /* eslint-disable guard-for-in */
for (var key in this.data) {
this.data.hasOwnProperty(key) && cb(this.data[key], key);
}
+ /* eslint-enable guard-for-in */
},
// Do not use this method if performance sensitive.
removeKey: function (key) {
@@ -948,6 +955,8 @@ var zrUtil = (Object.freeze || Object)({
noop: noop
});
+/* global Float32Array */
+
var ArrayCtor = typeof Float32Array === 'undefined'
? Array
: Float32Array;
@@ -2506,6 +2515,8 @@ mixin(Handler, Draggable);
* @exports zrender/tool/matrix
*/
+/* global Float32Array */
+
var ArrayCtor$1 = typeof Float32Array === 'undefined'
? Array
: Float32Array;
@@ -3764,11 +3775,17 @@ function lerpNumber(a, b, p) {
}
function setRgba(out, r, g, b, a) {
- out[0] = r; out[1] = g; out[2] = b; out[3] = a;
+ out[0] = r;
+ out[1] = g;
+ out[2] = b;
+ out[3] = a;
return out;
}
function copyRgba(out, a) {
- out[0] = a[0]; out[1] = a[1]; out[2] = a[2]; out[3] = a[3];
+ out[0] = a[0];
+ out[1] = a[1];
+ out[2] = a[2];
+ out[3] = a[3];
return out;
}
@@ -4843,35 +4860,23 @@ if (typeof window !== 'undefined') {
*/
/**
- * debug日志选项：catchBrushException为true下有效
- * 0 : 不生成debug数据，发布用
- * 1 : 异常抛出，调试用
- * 2 : 控制台输出，调试用
+ * Debug log mode:
+ * 0: Do nothing, for release.
+ * 1: console.error, for debug.
*/
var debugMode = 0;
// retina 屏幕优化
var devicePixelRatio = dpr;
-var log = function () {
+var logError = function () {
};
if (debugMode === 1) {
- log = function () {
- for (var k in arguments) {
- throw new Error(arguments[k]);
- }
- };
-}
-else if (debugMode > 1) {
- log = function () {
- for (var k in arguments) {
- console.log(arguments[k]);
- }
- };
+ logError = console.error;
}
-var zrLog = log;
+var logError$1 = logError;
/**
* @alias modue:zrender/mixin/Animatable
@@ -4927,7 +4932,7 @@ Animatable.prototype = {
}
if (!target) {
- zrLog(
+ logError$1(
'Property "'
+ path
+ '" is not existed in element '
@@ -6148,7 +6153,10 @@ function TimSort(array, compare) {
while (stackSize > 1) {
var n = stackSize - 2;
- if (n >= 1 && runLength[n - 1] <= runLength[n] + runLength[n + 1] || n >= 2 && runLength[n - 2] <= runLength[n] + runLength[n - 1]) {
+ if (
+ (n >= 1 && runLength[n - 1] <= runLength[n] + runLength[n + 1])
+ || (n >= 2 && runLength[n - 2] <= runLength[n] + runLength[n - 1])
+ ) {
if (runLength[n - 1] < runLength[n + 1]) {
n--;
}
@@ -6238,7 +6246,9 @@ function TimSort(array, compare) {
}
var _minGallop = minGallop;
- var count1, count2, exit;
+ var count1;
+ var count2;
+ var exit;
while (1) {
count1 = 0;
@@ -6921,8 +6931,8 @@ Style.prototype = {
/**
* `true` is not supported.
* `false`/`null`/`undefined` are the same.
- * `false` is used to remove lineDash in some
- * case that `null`/`undefined` can not be set.
+ * `false` is used to remove lineDash in some
+ * case that `null`/`undefined` can not be set.
* (e.g., emphasis.lineStyle in echarts)
* @type {Array.<number>|boolean}
*/
@@ -7402,8 +7412,8 @@ var Layer = function (id, painter, dpr) {
domStyle['user-select'] = 'none';
domStyle['-webkit-touch-callout'] = 'none';
domStyle['-webkit-tap-highlight-color'] = 'rgba(0,0,0,0)';
- domStyle['padding'] = 0;
- domStyle['margin'] = 0;
+ domStyle['padding'] = 0; // eslint-disable-line dot-notation
+ domStyle['margin'] = 0; // eslint-disable-line dot-notation
domStyle['border-width'] = 0;
}
@@ -9529,7 +9539,7 @@ function isDisplayableCulled(el, width, height) {
function isClipPathChanged(clipPaths, prevClipPaths) {
// displayable.__clipPaths can only be `null`/`undefined` or an non-empty array.
- if (clipPaths === prevClipPaths) {
+ if (clipPaths === prevClipPaths) {
return false;
}
if (!clipPaths || !prevClipPaths || (clipPaths.length !== prevClipPaths.length)) {
@@ -10058,12 +10068,12 @@ Painter.prototype = {
var domRoot = this._domRoot;
if (layersMap[zlevel]) {
- zrLog('ZLevel ' + zlevel + ' has been used already');
+ logError$1('ZLevel ' + zlevel + ' has been used already');
return;
}
// Check if is a valid layer
if (!isLayerValid(layer)) {
- zrLog('Layer of zlevel ' + zlevel + ' is not valid');
+ logError$1('Layer of zlevel ' + zlevel + ' is not valid');
return;
}
@@ -10197,11 +10207,14 @@ Painter.prototype = {
incrementalLayerCount = 1;
}
else {
- layer = this.getLayer(zlevel + (incrementalLayerCount > 0 ? EL_AFTER_INCREMENTAL_INC : 0), this._needsManuallyCompositing);
+ layer = this.getLayer(
+ zlevel + (incrementalLayerCount > 0 ? EL_AFTER_INCREMENTAL_INC : 0),
+ this._needsManuallyCompositing
+ );
}
if (!layer.__builtin__) {
- zrLog('ZLevel ' + zlevel + ' has been used by unkown layer ' + layer.id);
+ logError$1('ZLevel ' + zlevel + ' has been used by unkown layer ' + layer.id);
}
if (layer !== prevLayer) {
@@ -11140,7 +11153,7 @@ var instances$1 = {}; // ZRender实例map索引
/**
* @type {string}
*/
-var version$1 = '4.1.0';
+var version$1 = '4.1.1';
/**
* Initializing a zrender instance
@@ -12410,7 +12423,7 @@ var getLineStyle = makeStyleMapper(
var lineStyleMixin = {
getLineStyle: function (excludes) {
var style = getLineStyle(this, excludes);
- // Always set lineDash whether dashed, otherwise we can not
+ // Always set lineDash whether dashed, otherwise we can not
// erase the previous style when assigning to el.style.
style.lineDash = this.getLineDash(style.lineWidth);
return style;
@@ -12423,15 +12436,15 @@ var lineStyleMixin = {
var lineType = this.get('type');
var dotSize = Math.max(lineWidth, 2);
var dashSize = lineWidth * 4;
- return (lineType === 'solid' || lineType == null)
- // Use `false` but not `null` for the solid line here, because `null` might be
- // ignored when assigning to `el.style`. e.g., when setting `lineStyle.type` as
- // `'dashed'` and `emphasis.lineStyle.type` as `'solid'` in graph series, the
- // `lineDash` gotten form the latter one is not able to erase that from the former
+ return (lineType === 'solid' || lineType == null)
+ // Use `false` but not `null` for the solid line here, because `null` might be
+ // ignored when assigning to `el.style`. e.g., when setting `lineStyle.type` as
+ // `'dashed'` and `emphasis.lineStyle.type` as `'solid'` in graph series, the
+ // `lineDash` gotten form the latter one is not able to erase that from the former
// one if using `null` here according to the emhpsis strategy in `util/graphic.js`.
? false
- : lineType === 'dashed'
- ? [dashSize, dashSize]
+ : lineType === 'dashed'
+ ? [dashSize, dashSize]
: [dotSize, dotSize];
}
};
@@ -13213,6 +13226,8 @@ function fromArc(
// TODO getTotalLength, getPointAtLength
+/* global Float32Array */
+
var CMD = {
M: 1,
L: 2,
@@ -13884,9 +13899,12 @@ PathProxy.prototype = {
*/
rebuildPath: function (ctx) {
var d = this.data;
- var x0, y0;
- var xi, yi;
- var x, y;
+ var x0;
+ var y0;
+ var xi;
+ var yi;
+ var x;
+ var y;
var ux = this._ux;
var uy = this._uy;
var len$$1 = this._len;
@@ -16743,6 +16761,8 @@ var NORMAL = 'normal';
var _highlightNextDigit = 1;
var _highlightKeyMap = {};
+var _customShapeMap = {};
+
/**
* Extend shape with parameters
@@ -16759,6 +16779,54 @@ function extendPath(pathData, opts) {
}
/**
+ * Register a user defined shape.
+ * The shape class can be fetched by `getShapeClass`
+ * This method will overwrite the registered shapes, including
+ * the registered built-in shapes, if using the same `name`.
+ * The shape can be used in `custom series` and
+ * `graphic component` by declaring `{type: name}`.
+ *
+ * @param {string} name
+ * @param {Object} ShapeClass Can be generated by `extendShape`.
+ */
+function registerShape(name, ShapeClass) {
+ _customShapeMap[name] = ShapeClass;
+}
+
+/**
+ * Find shape class registered by `registerShape`. Usually used in
+ * fetching user defined shape.
+ *
+ * [Caution]:
+ * (1) This method **MUST NOT be used inside echarts !!!**, unless it is prepared
+ * to use user registered shapes.
+ * Because the built-in shape (see `getBuiltInShape`) will be registered by
+ * `registerShape` by default. That enables users to get both built-in
+ * shapes as well as the shapes belonging to themsleves. But users can overwrite
+ * the built-in shapes by using names like 'circle', 'rect' via calling
+ * `registerShape`. So the echarts inner featrues should not fetch shapes from here
+ * in case that it is overwritten by users, except that some features, like
+ * `custom series`, `graphic component`, do it deliberately.
+ *
+ * (2) In the features like `custom series`, `graphic component`, the user input
+ * `{tpye: 'xxx'}` does not only specify shapes but also specify other graphic
+ * elements like `'group'`, `'text'`, `'image'` or event `'path'`. Those names
+ * are reserved names, that is, if some user register a shape named `'image'`,
+ * the shape will not be used. If we intending to add some more reserved names
+ * in feature, that might bring break changes (disable some existing user shape
+ * names). But that case probably rearly happen. So we dont make more mechanism
+ * to resolve this issue here.
+ *
+ * @param {string} name
+ * @return {Object} The shape class. If not found, return nothing.
+ */
+function getShapeClass(name) {
+ if (_customShapeMap.hasOwnProperty(name)) {
+ return _customShapeMap[name];
+ }
+}
+
+/**
* Create a path element from path data string
* @param {string} pathData
* @param {Object} opts
@@ -16959,11 +17027,12 @@ function singleEnterEmphasis(el) {
return;
}
- var useHoverLayer = el.useHoverLayer;
+ var zr = el.__zr;
+
+ var useHoverLayer = el.useHoverLayer && zr && zr.painter.type === 'canvas';
el.__highlighted = useHoverLayer ? 'layer' : 'plain';
- var zr = el.__zr;
- if (el.isGroup || (!zr && useHoverLayer)) {
+ if (el.isGroup || (!zr && el.useHoverLayer)) {
return;
}
@@ -17445,11 +17514,18 @@ function setTextStyleCommon(textStyle, textStyleModel, opt, isEmphasis) {
opt = opt || EMPTY_OBJ;
if (opt.isRectText) {
- var textPosition = textStyleModel.getShallow('position')
- || (isEmphasis ? null : 'inside');
- // 'outside' is not a valid zr textPostion value, but used
- // in bar series, and magric type should be considered.
- textPosition === 'outside' && (textPosition = 'top');
+ var textPosition;
+ if (opt.getTextPosition) {
+ textPosition = opt.getTextPosition(textStyleModel, isEmphasis);
+ }
+ else {
+ textPosition = textStyleModel.getShallow('position')
+ || (isEmphasis ? null : 'inside');
+ // 'outside' is not a valid zr textPostion value, but used
+ // in bar series, and magric type should be considered.
+ textPosition === 'outside' && (textPosition = 'top');
+ }
+
textStyle.textPosition = textPosition;
textStyle.textOffset = textStyleModel.getShallow('offset');
var labelRotate = textStyleModel.getShallow('rotate');
@@ -18048,6 +18124,18 @@ function nearZero(val) {
return val <= (1e-6) && val >= -(1e-6);
}
+// Register built-in shapes. These shapes might be overwirtten
+// by users, although we do not recommend that.
+registerShape('circle', Circle);
+registerShape('sector', Sector);
+registerShape('ring', Ring);
+registerShape('polygon', Polygon);
+registerShape('polyline', Polyline);
+registerShape('rect', Rect);
+registerShape('line', Line);
+registerShape('bezierCurve', BezierCurve);
+registerShape('arc', Arc);
+
@@ -18056,6 +18144,8 @@ var graphic = (Object.freeze || Object)({
CACHED_LABEL_STYLE_PROPERTIES: CACHED_LABEL_STYLE_PROPERTIES,
extendShape: extendShape,
extendPath: extendPath,
+ registerShape: registerShape,
+ getShapeClass: getShapeClass,
makePath: makePath,
makeImage: makeImage,
mergePath: mergePath,
@@ -18641,7 +18731,7 @@ function enableTopologicalTravel(entity, dependencyGetter) {
var RADIAN_EPSILON = 1e-4;
function _trim(str) {
- return str.replace(/^\s+/, '').replace(/\s+$/, '');
+ return str.replace(/^\s+|\s+$/g, '');
}
/**
@@ -21612,8 +21702,8 @@ var GlobalModel = Model.extend({
* {mainType: 'series', subType: 'pie', query: {seriesName: 'uio'}}
* );
* var result = findComponents(
- * {mainType: 'series'},
- * function (model, index) {...}
+ * {mainType: 'series',
+ * filter: function (model, index) {...}}
* );
* // result like [component0, componnet1, ...]
*
@@ -22932,12 +23022,17 @@ var backwardCompat = function (option, isTheme) {
var seriesType = seriesOpt.type;
- if (seriesType === 'pie' || seriesType === 'gauge') {
+ if (seriesType === 'line') {
+ if (seriesOpt.clipOverflow != null) {
+ seriesOpt.clip = seriesOpt.clipOverflow;
+ }
+ }
+ else if (seriesType === 'pie' || seriesType === 'gauge') {
if (seriesOpt.clockWise != null) {
seriesOpt.clockwise = seriesOpt.clockWise;
}
}
- if (seriesType === 'gauge') {
+ else if (seriesType === 'gauge') {
var pointerColor = get(seriesOpt, 'pointer.color');
pointerColor != null
&& set$1(seriesOpt, 'itemStyle.color', pointerColor);
@@ -22987,7 +23082,7 @@ var backwardCompat = function (option, isTheme) {
// data processing stage is blocked in stream.
// See <module:echarts/stream/Scheduler#performDataProcessorTasks>
// (2) Only register once when import repeatly.
-// Should be executed before after series filtered and before stack calculation.
+// Should be executed after series filtered and before stack calculation.
var dataStack = function (ecModel) {
var stackInfoMap = createHashMap();
ecModel.eachSeries(function (seriesModel) {
@@ -23499,6 +23594,7 @@ var dataFormatMixin = {
var name = data.getName(dataIndex);
var itemOpt = data.getRawDataItem(dataIndex);
var color = data.getItemVisual(dataIndex, 'color');
+ var borderColor = data.getItemVisual(dataIndex, 'borderColor');
var tooltipModel = this.ecModel.getComponent('tooltip');
var renderModeOption = tooltipModel && tooltipModel.get('renderMode');
var renderMode = getTooltipRenderMode(renderModeOption);
@@ -23520,6 +23616,7 @@ var dataFormatMixin = {
dataType: dataType,
value: rawValue,
color: color,
+ borderColor: borderColor,
dimensionNames: userOutput ? userOutput.dimensionNames : null,
encode: userOutput ? userOutput.encode : null,
marker: getTooltipMarker({
@@ -23998,6 +24095,11 @@ var SeriesModel = ComponentModel.extend({
visualColorAccessPath: 'itemStyle.color',
/**
+ * Access path of borderColor for visual
+ */
+ visualBorderColorAccessPath: 'itemStyle.borderColor',
+
+ /**
* Support merge layout params.
* Only support 'box' now (left/right/top/bottom/width/height).
* @type {string|Object} Object can be {ignoreSize: true}
@@ -24596,10 +24698,10 @@ Component$1.prototype = {
};
var componentProto = Component$1.prototype;
-componentProto.updateView
- = componentProto.updateLayout
- = componentProto.updateVisual
- = function (seriesModel, ecModel, api, payload) {
+componentProto.updateView =
+ componentProto.updateLayout =
+ componentProto.updateVisual =
+ function (seriesModel, ecModel, api, payload) {
// Do nothing;
};
// Enable Component.extend.
@@ -25117,6 +25219,10 @@ var seriesColor = {
// FIXME Set color function or use the platte color
data.setVisual('color', color);
+
+ var borderColorAccessPath = (seriesModel.visualBorderColorAccessPath || 'itemStyle.borderColor').split('.');
+ var borderColor = seriesModel.get(borderColorAccessPath);
+ data.setVisual('borderColor', borderColor);
// Only visible series has each data be visual encoded
if (!ecModel.isSeriesFiltered(seriesModel)) {
@@ -25132,9 +25238,13 @@ var seriesColor = {
var dataEach = function (data, idx) {
var itemModel = data.getItemModel(idx);
var color = itemModel.get(colorAccessPath, true);
+ var borderColor = itemModel.get(borderColorAccessPath, true);
if (color != null) {
data.setItemVisual(idx, 'color', color);
}
+ if (borderColor != null) {
+ data.setItemVisual(idx, 'borderColor', borderColor);
+ }
};
return { dataEach: data.hasItemOption ? dataEach : null };
@@ -25161,8 +25271,17 @@ var seriesColor = {
* under the License.
*/
+/**
+ * Language: English.
+ */
var lang = {
+ legend: {
+ selector: {
+ all: 'All',
+ inverse: 'Inv'
+ }
+ },
toolbox: {
brush: {
title: {
@@ -27139,15 +27258,17 @@ var isFunction = isFunction$1;
var isObject = isObject$1;
var parseClassType = ComponentModel.parseClassType;
-var version = '4.3.0';
+var version = '4.4.0';
var dependencies = {
- zrender: '4.1.0'
+ zrender: '4.1.1'
};
var TEST_FRAME_REMAIN_TIME = 1;
var PRIORITY_PROCESSOR_FILTER = 1000;
+var PRIORITY_PROCESSOR_SERIES_FILTER = 800;
+var PRIORITY_PROCESSOR_DATASTACK = 900;
var PRIORITY_PROCESSOR_STATISTIC = 5000;
var PRIORITY_VISUAL_LAYOUT = 1000;
@@ -27163,6 +27284,7 @@ var PRIORITY_VISUAL_BRUSH = 5000;
var PRIORITY = {
PROCESSOR: {
FILTER: PRIORITY_PROCESSOR_FILTER,
+ SERIES_FILTER: PRIORITY_PROCESSOR_SERIES_FILTER,
STATISTIC: PRIORITY_PROCESSOR_STATISTIC
},
VISUAL: {
@@ -27186,8 +27308,13 @@ var OPTION_UPDATED = '__optionUpdated';
var ACTION_REG = /^[a-zA-Z0-9_]+$/;
-function createRegisterEventWithLowercaseName(method) {
+function createRegisterEventWithLowercaseName(method, ignoreDisposed) {
return function (eventName, handler, context) {
+ if (!ignoreDisposed && this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
// Event name is all lowercase
eventName = eventName && eventName.toLowerCase();
Eventful.prototype[method].call(this, eventName, handler, context);
@@ -27200,9 +27327,9 @@ function createRegisterEventWithLowercaseName(method) {
function MessageCenter() {
Eventful.call(this);
}
-MessageCenter.prototype.on = createRegisterEventWithLowercaseName('on');
-MessageCenter.prototype.off = createRegisterEventWithLowercaseName('off');
-MessageCenter.prototype.one = createRegisterEventWithLowercaseName('one');
+MessageCenter.prototype.on = createRegisterEventWithLowercaseName('on', true);
+MessageCenter.prototype.off = createRegisterEventWithLowercaseName('off', true);
+MessageCenter.prototype.one = createRegisterEventWithLowercaseName('one', true);
mixin(MessageCenter, Eventful);
/**
@@ -27438,6 +27565,10 @@ echartsProto.setOption = function (option, notMerge, lazyUpdate) {
if (__DEV__) {
assert(!this[IN_MAIN_PROCESS], '`setOption` should not be called during main process.');
}
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
var silent;
if (isObject(notMerge)) {
@@ -27573,6 +27704,11 @@ echartsProto.getSvgDataUrl = function () {
* @param {string} [opts.excludeComponents]
*/
echartsProto.getDataURL = function (opts) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
opts = opts || {};
var excludeComponents = opts.excludeComponents;
var ecModel = this._model;
@@ -27613,6 +27749,11 @@ echartsProto.getDataURL = function (opts) {
* @param {string} [opts.backgroundColor]
*/
echartsProto.getConnectedDataURL = function (opts) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
if (!env$1.canvasSupported) {
return;
}
@@ -27732,6 +27873,11 @@ echartsProto.convertToPixel = curry(doConvertPixel, 'convertToPixel');
echartsProto.convertFromPixel = curry(doConvertPixel, 'convertFromPixel');
function doConvertPixel(methodName, finder, value) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
var ecModel = this._model;
var coordSysList = this._coordSysMgr.getCoordinateSystems();
var result;
@@ -27772,6 +27918,11 @@ function doConvertPixel(methodName, finder, value) {
* @return {boolean} result
*/
echartsProto.containPixel = function (finder, value) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
var ecModel = this._model;
var result;
@@ -28144,6 +28295,10 @@ echartsProto.resize = function (opts) {
if (__DEV__) {
assert(!this[IN_MAIN_PROCESS], '`resize` should not be called during main process.');
}
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
this._zr.resize(opts);
@@ -28186,6 +28341,11 @@ function updateStreamModes(ecIns, ecModel) {
* @param {Object} [cfg]
*/
echartsProto.showLoading = function (name, cfg) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
if (isObject(name)) {
cfg = name;
name = '';
@@ -28210,6 +28370,11 @@ echartsProto.showLoading = function (name, cfg) {
* Hide loading effect
*/
echartsProto.hideLoading = function () {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
this._loadingFX && this._zr.remove(this._loadingFX);
this._loadingFX = null;
};
@@ -28233,10 +28398,15 @@ echartsProto.makeActionFromEvent = function (eventObj) {
* @param {boolean} [opt.flush=undefined]
* true: Flush immediately, and then pixel in canvas can be fetched
* immediately. Caution: it might affect performance.
- * false: Not not flush.
+ * false: Not flush.
* undefined: Auto decide whether perform flush.
*/
echartsProto.dispatchAction = function (payload, opt) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
if (!isObject(opt)) {
opt = {silent: !!opt};
}
@@ -28405,6 +28575,11 @@ function bindRenderedEvent(zr, ecIns) {
* @param {Array|TypedArray} params.data
*/
echartsProto.appendData = function (params) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
var seriesIndex = params.seriesIndex;
var ecModel = this.getModel();
var seriesModel = ecModel.getSeriesByIndex(seriesIndex);
@@ -28430,9 +28605,9 @@ echartsProto.appendData = function (params) {
* Register event
* @method
*/
-echartsProto.on = createRegisterEventWithLowercaseName('on');
-echartsProto.off = createRegisterEventWithLowercaseName('off');
-echartsProto.one = createRegisterEventWithLowercaseName('one');
+echartsProto.on = createRegisterEventWithLowercaseName('on', false);
+echartsProto.off = createRegisterEventWithLowercaseName('off', false);
+echartsProto.one = createRegisterEventWithLowercaseName('one', false);
/**
* Prepare view instances of charts and components
@@ -28710,6 +28885,10 @@ echartsProto.isDisposed = function () {
* Clear
*/
echartsProto.clear = function () {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
this.setOption({ series: [] }, true);
};
@@ -28718,9 +28897,7 @@ echartsProto.clear = function () {
*/
echartsProto.dispose = function () {
if (this._disposed) {
- if (__DEV__) {
- console.warn('Instance ' + this.id + ' has been disposed');
- }
+ disposedWarning(this.id);
return;
}
this._disposed = true;
@@ -28745,6 +28922,12 @@ echartsProto.dispose = function () {
mixin(ECharts, Eventful);
+function disposedWarning(id) {
+ if (__DEV__) {
+ console.warn('Instance ' + id + ' has been disposed');
+ }
+}
+
function updateHoverLayerStatus(ecIns, ecModel) {
var zr = ecIns._zr;
var storage = zr.storage;
@@ -29094,9 +29277,9 @@ function init(dom, theme$$1, opts) {
)
) {
console.warn('Can\'t get DOM width or height. Please check '
- + 'dom.clientWidth and dom.clientHeight. They should not be 0.'
- + 'For example, you may need to call this in the callback '
- + 'of window.onload.');
+ + 'dom.clientWidth and dom.clientHeight. They should not be 0.'
+ + 'For example, you may need to call this in the callback '
+ + 'of window.onload.');
}
}
@@ -29447,7 +29630,7 @@ function getMap(mapName) {
registerVisual(PRIORITY_VISUAL_GLOBAL, seriesColor);
registerPreprocessor(backwardCompat);
-registerProcessor(PRIORITY_PROCESSOR_STATISTIC, dataStack);
+registerProcessor(PRIORITY_PROCESSOR_DATASTACK, dataStack);
registerLoading('default', loadingDefault);
// Default actions
@@ -31934,8 +32117,8 @@ function completeDimensions(sysDims, source, opt) {
// `coordDimIndex` should not be set directly.
sysDimItemDimsDef = sysDimItem.dimsDef;
sysDimItemOtherDims = sysDimItem.otherDims;
- sysDimItem.name = sysDimItem.coordDim = sysDimItem.coordDimIndex
- = sysDimItem.dimsDef = sysDimItem.otherDims = null;
+ sysDimItem.name = sysDimItem.coordDim = sysDimItem.coordDimIndex =
+ sysDimItem.dimsDef = sysDimItem.otherDims = null;
}
var dataDims = encodeDef.get(coordDim);
@@ -33342,6 +33525,7 @@ function doCalBarWidthAndOffset(seriesInfoList) {
var offset = -widthSum / 2;
each$1(stacks, function (column, stackId) {
result[coordSysName][stackId] = result[coordSysName][stackId] || {
+ bandWidth: bandWidth,
offset: offset,
width: column.width
};
@@ -33395,6 +33579,7 @@ function layout(seriesType, ecModel) {
lastStackCoords[stackId] = lastStackCoords[stackId] || [];
data.setLayout({
+ bandWidth: columnLayoutInfo.bandWidth,
offset: columnOffset,
size: columnWidth
});
@@ -33546,23 +33731,7 @@ function isInLargeMode(seriesModel) {
// See cases in `test/bar-start.html` and `#7412`, `#8747`.
function getValueAxisStart(baseAxis, valueAxis, stacked) {
- var extent = valueAxis.getGlobalExtent();
- var min;
- var max;
- if (extent[0] > extent[1]) {
- min = extent[1];
- max = extent[0];
- }
- else {
- min = extent[0];
- max = extent[1];
- }
-
- var valueStart = valueAxis.toGlobalCoord(valueAxis.dataToCoord(0));
- valueStart < min && (valueStart = min);
- valueStart > max && (valueStart = max);
-
- return valueStart;
+ return valueAxis.toGlobalCoord(valueAxis.dataToCoord(0));
}
/*
@@ -36012,6 +36181,7 @@ each$1(
'setHoverStyle', 'setLabelStyle', 'setTextStyle', 'setText',
'getFont', 'updateProps', 'initProps', 'getTransform',
'clipPointsByRect', 'clipRectByRect',
+ 'registerShape', 'getShapeClass',
'Group',
'Image',
'Text',
@@ -36084,7 +36254,7 @@ SeriesModel.extend({
// polarIndex: 0,
// If clip the overflow value
- clipOverflow: true,
+ clip: true,
// cursor: null,
label: {
@@ -37480,89 +37650,21 @@ var Polygon$1 = Path.extend({
* specific language governing permissions and limitations
* under the License.
*/
-
-// FIXME step not support polar
-
-function isPointsSame(points1, points2) {
- if (points1.length !== points2.length) {
- return;
- }
- for (var i = 0; i < points1.length; i++) {
- var p1 = points1[i];
- var p2 = points2[i];
- if (p1[0] !== p2[0] || p1[1] !== p2[1]) {
- return;
- }
- }
- return true;
-}
-
-function getSmooth(smooth) {
- return typeof (smooth) === 'number' ? smooth : (smooth ? 0.5 : 0);
-}
-
-function getAxisExtentWithGap(axis) {
- var extent = axis.getGlobalExtent();
- if (axis.onBand) {
- // Remove extra 1px to avoid line miter in clipped edge
- var halfBandWidth = axis.getBandWidth() / 2 - 1;
- var dir = extent[1] > extent[0] ? 1 : -1;
- extent[0] += dir * halfBandWidth;
- extent[1] -= dir * halfBandWidth;
- }
- return extent;
-}
-
-/**
- * @param {module:echarts/coord/cartesian/Cartesian2D|module:echarts/coord/polar/Polar} coordSys
- * @param {module:echarts/data/List} data
- * @param {Object} dataCoordInfo
- * @param {Array.<Array.<number>>} points
- */
-function getStackedOnPoints(coordSys, data, dataCoordInfo) {
- if (!dataCoordInfo.valueDim) {
- return [];
- }
-
- var points = [];
- for (var idx = 0, len = data.count(); idx < len; idx++) {
- points.push(getStackedOnPoint(dataCoordInfo, coordSys, data, idx));
- }
-
- return points;
-}
-
-function createGridClipShape(cartesian, hasAnimation, forSymbol, seriesModel) {
- var xExtent = getAxisExtentWithGap(cartesian.getAxis('x'));
- var yExtent = getAxisExtentWithGap(cartesian.getAxis('y'));
+function createGridClipPath(cartesian, hasAnimation, seriesModel) {
+ var rect = cartesian.getArea();
var isHorizontal = cartesian.getBaseAxis().isHorizontal();
- var x = Math.min(xExtent[0], xExtent[1]);
- var y = Math.min(yExtent[0], yExtent[1]);
- var width = Math.max(xExtent[0], xExtent[1]) - x;
- var height = Math.max(yExtent[0], yExtent[1]) - y;
+ var x = rect.x;
+ var y = rect.y;
+ var width = rect.width;
+ var height = rect.height;
- // Avoid float number rounding error for symbol on the edge of axis extent.
- // See #7913 and `test/dataZoom-clip.html`.
- if (forSymbol) {
- x -= 0.5;
- width += 0.5;
- y -= 0.5;
- height += 0.5;
- }
- else {
- var lineWidth = seriesModel.get('lineStyle.width') || 2;
- // Expand clip shape to avoid clipping when line value exceeds axis
- var expandSize = seriesModel.get('clipOverflow') ? lineWidth / 2 : Math.max(width, height);
- if (isHorizontal) {
- y -= expandSize;
- height += expandSize * 2;
- }
- else {
- x -= expandSize;
- width += expandSize * 2;
- }
- }
+ var lineWidth = seriesModel.get('lineStyle.width') || 2;
+ // Expand the clip path a bit to avoid the border is clipped and looks thinner
+ x -= lineWidth / 2;
+ y -= lineWidth / 2;
+ width += lineWidth;
+ height += lineWidth;
var clipPath = new Rect({
shape: {
@@ -37586,50 +37688,102 @@ function createGridClipShape(cartesian, hasAnimation, forSymbol, seriesModel) {
return clipPath;
}
-function createPolarClipShape(polar, hasAnimation, forSymbol, seriesModel) {
- var angleAxis = polar.getAngleAxis();
- var radiusAxis = polar.getRadiusAxis();
-
- var radiusExtent = radiusAxis.getExtent().slice();
- radiusExtent[0] > radiusExtent[1] && radiusExtent.reverse();
- var angleExtent = angleAxis.getExtent();
-
- var RADIAN = Math.PI / 180;
-
+function createPolarClipPath(polar, hasAnimation, seriesModel) {
+ var sectorArea = polar.getArea();
// Avoid float number rounding error for symbol on the edge of axis extent.
- if (forSymbol) {
- radiusExtent[0] -= 0.5;
- radiusExtent[1] += 0.5;
- }
var clipPath = new Sector({
shape: {
cx: round$1(polar.cx, 1),
cy: round$1(polar.cy, 1),
- r0: round$1(radiusExtent[0], 1),
- r: round$1(radiusExtent[1], 1),
- startAngle: -angleExtent[0] * RADIAN,
- endAngle: -angleExtent[1] * RADIAN,
- clockwise: angleAxis.inverse
+ r0: round$1(sectorArea.r0, 1),
+ r: round$1(sectorArea.r, 1),
+ startAngle: sectorArea.startAngle,
+ endAngle: sectorArea.endAngle,
+ clockwise: sectorArea.clockwise
}
});
if (hasAnimation) {
- clipPath.shape.endAngle = -angleExtent[0] * RADIAN;
+ clipPath.shape.endAngle = sectorArea.startAngle;
initProps(clipPath, {
shape: {
- endAngle: -angleExtent[1] * RADIAN
+ endAngle: sectorArea.endAngle
}
}, seriesModel);
}
-
return clipPath;
}
-function createClipShape(coordSys, hasAnimation, forSymbol, seriesModel) {
- return coordSys.type === 'polar'
- ? createPolarClipShape(coordSys, hasAnimation, forSymbol, seriesModel)
- : createGridClipShape(coordSys, hasAnimation, forSymbol, seriesModel);
+function createClipPath(coordSys, hasAnimation, seriesModel) {
+ if (!coordSys) {
+ return null;
+ }
+ else if (coordSys.type === 'polar') {
+ return createPolarClipPath(coordSys, hasAnimation, seriesModel);
+ }
+ else if (coordSys.type === 'cartesian2d') {
+ return createGridClipPath(coordSys, hasAnimation, seriesModel);
+ }
+ return null;
+}
+
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+// FIXME step not support polar
+
+function isPointsSame(points1, points2) {
+ if (points1.length !== points2.length) {
+ return;
+ }
+ for (var i = 0; i < points1.length; i++) {
+ var p1 = points1[i];
+ var p2 = points2[i];
+ if (p1[0] !== p2[0] || p1[1] !== p2[1]) {
+ return;
+ }
+ }
+ return true;
+}
+
+function getSmooth(smooth) {
+ return typeof (smooth) === 'number' ? smooth : (smooth ? 0.5 : 0);
+}
+
+/**
+ * @param {module:echarts/coord/cartesian/Cartesian2D|module:echarts/coord/polar/Polar} coordSys
+ * @param {module:echarts/data/List} data
+ * @param {Object} dataCoordInfo
+ * @param {Array.<Array.<number>>} points
+ */
+function getStackedOnPoints(coordSys, data, dataCoordInfo) {
+ if (!dataCoordInfo.valueDim) {
+ return [];
+ }
+
+ var points = [];
+ for (var idx = 0, len = data.count(); idx < len; idx++) {
+ points.push(getStackedOnPoint(dataCoordInfo, coordSys, data, idx));
+ }
+
+ return points;
}
function turnPointsIntoStep(points, coordSys, stepTurnAt) {
@@ -37828,6 +37982,31 @@ function canShowAllSymbolForCategory(categoryAxis, data) {
return true;
}
+function createLineClipPath(coordSys, hasAnimation, seriesModel) {
+ if (coordSys.type === 'cartesian2d') {
+ var isHorizontal = coordSys.getBaseAxis().isHorizontal();
+ var clipPath = createGridClipPath(coordSys, hasAnimation, seriesModel);
+ // Expand clip shape to avoid clipping when line value exceeds axis
+ if (!seriesModel.get('clip', true)) {
+ var rectShape = clipPath.shape;
+ var expandSize = Math.max(rectShape.width, rectShape.height);
+ if (isHorizontal) {
+ rectShape.y -= expandSize;
+ rectShape.height += expandSize * 2;
+ }
+ else {
+ rectShape.x -= expandSize;
+ rectShape.width += expandSize * 2;
+ }
+ }
+ return clipPath;
+ }
+ else {
+ return createPolarClipPath(coordSys, hasAnimation, seriesModel);
+ }
+
+}
+
Chart.extend({
type: 'line',
@@ -37892,13 +38071,29 @@ Chart.extend({
// FIXME step not support polar
var step = !isCoordSysPolar && seriesModel.get('step');
+ var clipShapeForSymbol;
+ if (coordSys && coordSys.getArea) {
+ clipShapeForSymbol = coordSys.getArea();
+ // Avoid float number rounding error for symbol on the edge of axis extent.
+ // See #7913 and `test/dataZoom-clip.html`.
+ if (clipShapeForSymbol.width != null) {
+ clipShapeForSymbol.x -= 0.1;
+ clipShapeForSymbol.y -= 0.1;
+ clipShapeForSymbol.width += 0.2;
+ clipShapeForSymbol.height += 0.2;
+ }
+ else if (clipShapeForSymbol.r0) {
+ clipShapeForSymbol.r0 -= 0.5;
+ clipShapeForSymbol.r1 += 0.5;
+ }
+ }
// Initialization animation or coordinate system changed
if (
!(polyline && prevCoordSys.type === coordSys.type && step === this._step)
) {
showSymbol && symbolDraw.updateData(data, {
isIgnore: isIgnoreFunc,
- clipShape: createClipShape(coordSys, false, true, seriesModel)
+ clipShape: clipShapeForSymbol
});
if (step) {
@@ -37914,7 +38109,7 @@ Chart.extend({
coordSys, hasAnimation
);
}
- lineGroup.setClipPath(createClipShape(coordSys, true, false, seriesModel));
+ lineGroup.setClipPath(createLineClipPath(coordSys, true, seriesModel));
}
else {
if (isAreaChart && !polygon) {
@@ -37931,13 +38126,13 @@ Chart.extend({
}
// Update clipPath
- lineGroup.setClipPath(createClipShape(coordSys, false, false, seriesModel));
+ lineGroup.setClipPath(createLineClipPath(coordSys, false, seriesModel));
// Always update, or it is wrong in the case turning on legend
// because points are not changed
showSymbol && symbolDraw.updateData(data, {
isIgnore: isIgnoreFunc,
- clipShape: createClipShape(coordSys, false, true, seriesModel)
+ clipShape: clipShapeForSymbol
});
// Stop symbol animation and sync with line points
@@ -38239,12 +38434,12 @@ Chart.extend({
}
});
- this._polyline
- = this._polygon
- = this._coordSys
- = this._points
- = this._stackedOnPoints
- = this._data = null;
+ this._polyline =
+ this._polygon =
+ this._coordSys =
+ this._points =
+ this._stackedOnPoints =
+ this._data = null;
}
});
@@ -38784,6 +38979,23 @@ Cartesian2D.prototype = {
*/
getOtherAxis: function (axis) {
return this.getAxis(axis.dim === 'x' ? 'y' : 'x');
+ },
+
+ /**
+ * Get rect area of cartesian.
+ * Area will have a contain function to determine if a point is in the coordinate system.
+ * @return {BoundingRect}
+ */
+ getArea: function () {
+ var xExtent = this.getAxis('x').getGlobalExtent();
+ var yExtent = this.getAxis('y').getGlobalExtent();
+ var x = Math.min(xExtent[0], xExtent[1]);
+ var y = Math.min(yExtent[0], yExtent[1]);
+ var width = Math.max(xExtent[0], xExtent[1]) - x;
+ var height = Math.max(yExtent[0], yExtent[1]) - y;
+
+ var rect = new BoundingRect(x, y, width, height);
+ return rect;
}
};
@@ -41707,8 +41919,13 @@ BaseBarSeries.extend({
progressiveThreshold = largeThreshold;
}
return progressiveThreshold;
- }
+ },
+ defaultOption: {
+ // If clipped
+ // Only available on cartesian2d
+ clip: true
+ }
});
/*
@@ -41829,6 +42046,29 @@ var _eventPos = [0, 0];
// Just for compatible with ec2.
extend(Model.prototype, barItemStyle);
+function getClipArea(coord, data) {
+ var coordSysClipArea = coord.getArea && coord.getArea();
+ if (coord.type === 'cartesian2d') {
+ var baseAxis = coord.getBaseAxis();
+ // When boundaryGap is false or using time axis. bar may exceed the grid.
+ // We should not clip this part.
+ // See test/bar2.html
+ if (baseAxis.type !== 'category' || !baseAxis.onBand) {
+ var expandWidth = data.getLayout('bandWidth');
+ if (baseAxis.isHorizontal()) {
+ coordSysClipArea.x -= expandWidth;
+ coordSysClipArea.width += expandWidth * 2;
+ }
+ else {
+ coordSysClipArea.y -= expandWidth;
+ coordSysClipArea.height += expandWidth * 2;
+ }
+ }
+ }
+
+ return coordSysClipArea;
+}
+
extendChartView({
type: 'bar',
@@ -41888,6 +42128,13 @@ extendChartView({
var animationModel = seriesModel.isAnimationEnabled() ? seriesModel : null;
+ var needsClip = seriesModel.get('clip', true);
+ var coordSysClipArea = getClipArea(coord, data);
+ // If there is clipPath created in large mode. Remove it.
+ group.removeClipPath();
+ // We don't use clipPath in normal mode because we needs a perfect animation
+ // And don't want the label are clipped.
+
data.diff(oldData)
.add(function (dataIndex) {
if (!data.hasValue(dataIndex)) {
@@ -41896,6 +42143,17 @@ extendChartView({
var itemModel = data.getItemModel(dataIndex);
var layout = getLayout[coord.type](data, dataIndex, itemModel);
+
+ if (needsClip) {
+ // Clip will modify the layout params.
+ // And return a boolean to determine if the shape are fully clipped.
+ var isClipped = clip[coord.type](coordSysClipArea, layout);
+ if (isClipped) {
+ group.remove(el);
+ return;
+ }
+ }
+
var el = elementCreator[coord.type](
data, dataIndex, itemModel, layout, isHorizontalOrRadial, animationModel
);
@@ -41918,6 +42176,14 @@ extendChartView({
var itemModel = data.getItemModel(newIndex);
var layout = getLayout[coord.type](data, newIndex, itemModel);
+ if (needsClip) {
+ var isClipped = clip[coord.type](coordSysClipArea, layout);
+ if (isClipped) {
+ group.remove(el);
+ return;
+ }
+ }
+
if (el) {
updateProps(el, {shape: layout}, animationModel, newIndex);
}
@@ -41953,6 +42219,17 @@ extendChartView({
_renderLarge: function (seriesModel, ecModel, api) {
this._clear();
createLarge(seriesModel, this.group);
+
+ // Use clipPath in large mode.
+ var clipPath = seriesModel.get('clip', true)
+ ? createClipPath(seriesModel.coordinateSystem, false, seriesModel)
+ : null;
+ if (clipPath) {
+ this.group.setClipPath(clipPath);
+ }
+ else {
+ this.group.removeClipPath();
+ }
},
_incrementalRenderLarge: function (params, seriesModel) {
@@ -41986,6 +42263,53 @@ extendChartView({
});
+var mathMax$4 = Math.max;
+var mathMin$4 = Math.min;
+
+var clip = {
+ cartesian2d: function (coordSysBoundingRect, layout) {
+ var signWidth = layout.width < 0 ? -1 : 1;
+ var signHeight = layout.height < 0 ? -1 : 1;
+ // Needs positive width and height
+ if (signWidth < 0) {
+ layout.x += layout.width;
+ layout.width = -layout.width;
+ }
+ if (signHeight < 0) {
+ layout.y += layout.height;
+ layout.height = -layout.height;
+ }
+
+ var x = mathMax$4(layout.x, coordSysBoundingRect.x);
+ var x2 = mathMin$4(layout.x + layout.width, coordSysBoundingRect.x + coordSysBoundingRect.width);
+ var y = mathMax$4(layout.y, coordSysBoundingRect.y);
+ var y2 = mathMin$4(layout.y + layout.height, coordSysBoundingRect.y + coordSysBoundingRect.height);
+
+ layout.x = x;
+ layout.y = y;
+ layout.width = x2 - x;
+ layout.height = y2 - y;
+
+ var clipped = layout.width < 0 || layout.height < 0;
+
+ // Reverse back
+ if (signWidth < 0) {
+ layout.x += layout.width;
+ layout.width = -layout.width;
+ }
+ if (signHeight < 0) {
+ layout.y += layout.height;
+ layout.height = -layout.height;
+ }
+
+ return clipped;
+ },
+
+ polar: function (coordSysClipArea) {
+ return false;
+ }
+};
+
var elementCreator = {
cartesian2d: function (
@@ -42589,9 +42913,12 @@ var PieSeries = extendSeriesModel({
borderWidth: 1
},
- // Animation type canbe expansion, scale
+ // Animation type. Valid values: expansion, scale
animationType: 'expansion',
+ // Animation type when update. Valid values: transition, expansion
+ animationTypeUpdate: 'transition',
+
animationEasing: 'cubicOut'
}
});
@@ -42708,6 +43035,8 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
var sectorShape = extend({}, layout);
sectorShape.label = null;
+ var animationTypeUpdate = seriesModel.getShallow('animationTypeUpdate');
+
if (firstCreate) {
sector.setShape(sectorShape);
@@ -42732,9 +43061,16 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
}
else {
- updateProps(sector, {
- shape: sectorShape
- }, seriesModel, idx);
+ if (animationTypeUpdate === 'expansion') {
+ // Sectors are set to be target shape and an overlaying clipPath is used for animation
+ sector.setShape(sectorShape);
+ }
+ else {
+ // Transition animation from the old shape
+ updateProps(sector, {
+ shape: sectorShape
+ }, seriesModel, idx);
+ }
}
// Update common style
@@ -42763,7 +43099,9 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
seriesModel.get('animation')
);
- this._updateLabel(data, idx);
+ // Label and text animation should be applied only for transition type animation when update
+ var withAnimation = !firstCreate && animationTypeUpdate === 'transition';
+ this._updateLabel(data, idx, withAnimation);
this.highDownOnUpdate = (itemModel.get('hoverAnimation') && seriesModel.isAnimationEnabled())
? function (fromState, toState) {
@@ -42797,7 +43135,7 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
setHoverStyle(this);
};
-piePieceProto._updateLabel = function (data, idx) {
+piePieceProto._updateLabel = function (data, idx, withAnimation) {
var labelLine = this.childAt(1);
var labelText = this.childAt(2);
@@ -42814,20 +43152,33 @@ piePieceProto._updateLabel = function (data, idx) {
return;
}
- updateProps(labelLine, {
- shape: {
- points: labelLayout.linePoints || [
- [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y]
- ]
- }
- }, seriesModel, idx);
+ var targetLineShape = {
+ points: labelLayout.linePoints || [
+ [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y]
+ ]
+ };
+ var targetTextStyle = {
+ x: labelLayout.x,
+ y: labelLayout.y
+ };
+ if (withAnimation) {
+ updateProps(labelLine, {
+ shape: targetLineShape
+ }, seriesModel, idx);
+
+ updateProps(labelText, {
+ style: targetTextStyle
+ }, seriesModel, idx);
+ }
+ else {
+ labelLine.attr({
+ shape: targetLineShape
+ });
+ labelText.attr({
+ style: targetTextStyle
+ });
+ }
- updateProps(labelText, {
- style: {
- x: labelLayout.x,
- y: labelLayout.y
- }
- }, seriesModel, idx);
labelText.attr({
rotation: labelLayout.rotation,
origin: [labelLayout.x, labelLayout.y],
@@ -42905,6 +43256,7 @@ var PieView = Chart.extend({
var hasAnimation = ecModel.get('animation');
var isFirstRender = !oldData;
var animationType = seriesModel.get('animationType');
+ var animationTypeUpdate = seriesModel.get('animationTypeUpdate');
var onSectorClick = curry(
updateDataSelected, this.uid, seriesModel, hasAnimation, api
@@ -42930,6 +43282,12 @@ var PieView = Chart.extend({
.update(function (newIdx, oldIdx) {
var piePiece = oldData.getItemGraphicEl(oldIdx);
+ if (!isFirstRender && animationTypeUpdate !== 'transition') {
+ piePiece.eachChild(function (child) {
+ child.stopAnimation(true);
+ });
+ }
+
piePiece.updateData(data, newIdx);
piePiece.off('click');
@@ -42944,9 +43302,8 @@ var PieView = Chart.extend({
.execute();
if (
- hasAnimation && isFirstRender && data.count() > 0
- // Default expansion animation
- && animationType !== 'scale'
+ hasAnimation && data.count() > 0
+ && (isFirstRender ? animationType !== 'scale' : animationTypeUpdate !== 'transition')
) {
var shape = data.getItemLayout(0);
for (var s = 1; isNaN(shape.startAngle) && s < data.count(); ++s) {
@@ -42957,7 +43314,7 @@ var PieView = Chart.extend({
var removeClipPath = bind(group.removeClipPath, group);
group.setClipPath(this._createClipPath(
- shape.cx, shape.cy, r, shape.startAngle, shape.clockwise, removeClipPath, seriesModel
+ shape.cx, shape.cy, r, shape.startAngle, shape.clockwise, removeClipPath, seriesModel, isFirstRender
));
}
else {
@@ -42971,7 +43328,7 @@ var PieView = Chart.extend({
dispose: function () {},
_createClipPath: function (
- cx, cy, r, startAngle, clockwise, cb, seriesModel
+ cx, cy, r, startAngle, clockwise, cb, seriesModel, isFirstRender
) {
var clipPath = new Sector({
shape: {
@@ -42985,7 +43342,8 @@ var PieView = Chart.extend({
}
});
- initProps(clipPath, {
+ var initOrUpdate = isFirstRender ? initProps : updateProps;
+ initOrUpdate(clipPath, {
shape: {
endAngle: startAngle + (clockwise ? 1 : -1) * Math.PI * 2
}
@@ -43119,10 +43477,16 @@ var dataColor = function (seriesType) {
var singleDataColor = filteredIdx != null
&& data.getItemVisual(filteredIdx, 'color', true);
- if (!singleDataColor) {
+ var singleDataBorderColor = filteredIdx != null
+ && data.getItemVisual(filteredIdx, 'borderColor', true);
+
+ var itemModel;
+ if (!singleDataColor || !singleDataBorderColor) {
// FIXME Performance
- var itemModel = dataAll.getItemModel(rawIdx);
+ itemModel = dataAll.getItemModel(rawIdx);
+ }
+ if (!singleDataColor) {
var color = itemModel.get('itemStyle.color')
|| seriesModel.getColorFromPalette(
dataAll.getName(rawIdx) || (rawIdx + ''), seriesModel.__paletteScope,
@@ -43140,6 +43504,21 @@ var dataColor = function (seriesType) {
// Set data all color for legend
dataAll.setItemVisual(rawIdx, 'color', singleDataColor);
}
+
+ if (!singleDataBorderColor) {
+ var borderColor = itemModel.get('itemStyle.borderColor');
+ // Legend may use the visual info in data before processed
+ dataAll.setItemVisual(rawIdx, 'borderColor', borderColor);
+
+ // Data is not filtered
+ if (filteredIdx != null) {
+ data.setItemVisual(filteredIdx, 'borderColor', borderColor);
+ }
+ }
+ else {
+ // Set data all borderColor for legend
+ dataAll.setItemVisual(rawIdx, 'borderColor', singleDataBorderColor);
+ }
});
}
};
@@ -43736,7 +44115,11 @@ SeriesModel.extend({
itemStyle: {
opacity: 0.8
// color: 各异
- }
+ },
+
+ // If clip the overflow graphics
+ // Works on cartesian / polar series
+ clip: true
// progressive: null
}
@@ -43776,6 +44159,8 @@ var LargeSymbolPath = extendShape({
symbolProxy: null,
+ softClipShape: null,
+
buildPath: function (path, shape) {
var points = shape.points;
var size = shape.size;
@@ -43797,6 +44182,9 @@ var LargeSymbolPath = extendShape({
if (isNaN(x) || isNaN(y)) {
continue;
}
+ if (this.softClipShape && !this.softClipShape.contain(x, y)) {
+ continue;
+ }
symbolProxyShape.x = x - size[0] / 2;
symbolProxyShape.y = y - size[1] / 2;
@@ -43825,6 +44213,9 @@ var LargeSymbolPath = extendShape({
if (isNaN(x) || isNaN(y)) {
continue;
}
+ if (this.softClipShape && !this.softClipShape.contain(x, y)) {
+ continue;
+ }
// fillRect is faster than building a rect path and draw.
// And it support light globalCompositeOperation.
ctx.fillRect(
@@ -43876,8 +44267,10 @@ largeSymbolProto.isPersistent = function () {
/**
* Update symbols draw by new data
* @param {module:echarts/data/List} data
+ * @param {Object} opt
+ * @param {Object} [opt.clipShape]
*/
-largeSymbolProto.updateData = function (data) {
+largeSymbolProto.updateData = function (data, opt) {
this.group.removeAll();
var symbolEl = new LargeSymbolPath({
rectHover: true,
@@ -43887,7 +44280,7 @@ largeSymbolProto.updateData = function (data) {
symbolEl.setShape({
points: data.getLayout('symbolPoints')
});
- this._setCommon(symbolEl, data);
+ this._setCommon(symbolEl, data, false, opt);
this.group.add(symbolEl);
this._incremental = null;
@@ -43928,7 +44321,7 @@ largeSymbolProto.incrementalPrepareUpdate = function (data) {
}
};
-largeSymbolProto.incrementalUpdate = function (taskParams, data) {
+largeSymbolProto.incrementalUpdate = function (taskParams, data, opt) {
var symbolEl;
if (this._incremental) {
symbolEl = new LargeSymbolPath();
@@ -43948,12 +44341,13 @@ largeSymbolProto.incrementalUpdate = function (taskParams, data) {
symbolEl.setShape({
points: data.getLayout('symbolPoints')
});
- this._setCommon(symbolEl, data, !!this._incremental);
+ this._setCommon(symbolEl, data, !!this._incremental, opt);
};
-largeSymbolProto._setCommon = function (symbolEl, data, isIncremental) {
+largeSymbolProto._setCommon = function (symbolEl, data, isIncremental, opt) {
var hostModel = data.hostModel;
+ opt = opt || {};
// TODO
// if (data.hasItemVisual.symbolSize) {
// // TODO typed array?
@@ -43969,6 +44363,7 @@ largeSymbolProto._setCommon = function (symbolEl, data, isIncremental) {
symbolEl.setShape('size', (size instanceof Array) ? size : [size, size]);
// }
+ symbolEl.softClipShape = opt.clipShape || null;
// Create symbolProxy to build path for each data
symbolEl.symbolProxy = createSymbol(
data.getVisual('symbol'), 0, 0, 0, 0
@@ -44042,7 +44437,14 @@ extendChartView({
var data = seriesModel.getData();
var symbolDraw = this._updateSymbolDraw(data, seriesModel);
- symbolDraw.updateData(data);
+
+ symbolDraw.updateData(data, {
+ // TODO
+ // If this parameter should be a shape or a bounding volume
+ // shape will be more general.
+ // But bounding volume like bounding rect will be much faster in the contain calculation
+ clipShape: this._getClipShape(seriesModel)
+ });
this._finished = true;
},
@@ -44057,7 +44459,9 @@ extendChartView({
},
incrementalRender: function (taskParams, seriesModel, ecModel) {
- this._symbolDraw.incrementalUpdate(taskParams, seriesModel.getData());
+ this._symbolDraw.incrementalUpdate(taskParams, seriesModel.getData(), {
+ clipShape: this._getClipShape(seriesModel)
+ });
this._finished = taskParams.end === seriesModel.getData().count();
},
@@ -44083,6 +44487,12 @@ extendChartView({
}
},
+ _getClipShape: function (seriesModel) {
+ var coordSys = seriesModel.coordinateSystem;
+ var clipArea = coordSys && coordSys.getArea && coordSys.getArea();
+ return seriesModel.get('clip', true) ? clipArea : null;
+ },
+
_updateSymbolDraw: function (data, seriesModel) {
var symbolDraw = this._symbolDraw;
var pipelineContext = seriesModel.pipelineContext;
@@ -44175,6 +44585,18 @@ registerLayout(pointsLayout('scatter'));
* under the License.
*/
+var _nonShapeGraphicElements = {
+
+ // Reserved but not supported in graphic component.
+ path: null,
+ compoundPath: null,
+
+ // Supported in graphic component.
+ group: Group,
+ image: ZImage,
+ text: Text
+};
+
// -------------
// Preprocessor
// -------------
@@ -44488,8 +44910,8 @@ extendComponentView({
var el = elMap.get(id);
if (el) {
- el.__ecGraphicWidth = elOption.width;
- el.__ecGraphicHeight = elOption.height;
+ el.__ecGraphicWidthOption = elOption.width;
+ el.__ecGraphicHeightOption = elOption.height;
setEventData(el, graphicModel, elOption);
}
});
@@ -44506,6 +44928,29 @@ extendComponentView({
var elOptions = graphicModel.option.elements;
var rootGroup = this.group;
var elMap = this._elMap;
+ var apiWidth = api.getWidth();
+ var apiHeight = api.getHeight();
+
+ // Top-down to calculate percentage width/height of group
+ for (var i = 0; i < elOptions.length; i++) {
+ var elOption = elOptions[i];
+ var el = elMap.get(elOption.id);
+
+ if (!el || !el.isGroup) {
+ continue;
+ }
+ var parentEl = el.parent;
+ var isParentRoot = parentEl === rootGroup;
+ // Like 'position:absolut' in css, default 0.
+ el.__ecGraphicWidth = parsePercent$1(
+ el.__ecGraphicWidthOption,
+ isParentRoot ? apiWidth : parentEl.__ecGraphicWidth
+ ) || 0;
+ el.__ecGraphicHeight = parsePercent$1(
+ el.__ecGraphicHeightOption,
+ isParentRoot ? apiHeight : parentEl.__ecGraphicHeight
+ ) || 0;
+ }
// Bottom-up tranvese all elements (consider ec resize) to locate elements.
for (var i = elOptions.length - 1; i >= 0; i--) {
@@ -44519,14 +44964,18 @@ extendComponentView({
var parentEl = el.parent;
var containerInfo = parentEl === rootGroup
? {
- width: api.getWidth(),
- height: api.getHeight()
+ width: apiWidth,
+ height: apiHeight
}
- : { // Like 'position:absolut' in css, default 0.
- width: parentEl.__ecGraphicWidth || 0,
- height: parentEl.__ecGraphicHeight || 0
+ : {
+ width: parentEl.__ecGraphicWidth,
+ height: parentEl.__ecGraphicHeight
};
+ // PENDING
+ // Currently, when `bounding: 'all'`, the union bounding rect of the group
+ // does not include the rect of [0, 0, group.width, group.height], which
+ // is probably weird for users. Should we make a break change for it?
positionElement(
el, elOption, containerInfo, null,
{hv: elOption.hv, boundingMode: elOption.bounding}
@@ -44562,7 +45011,11 @@ function createEl(id, targetElParent, elOption, elMap) {
assert$1(graphicType, 'graphic type MUST be set');
}
- var Clz = graphic[graphicType.charAt(0).toUpperCase() + graphicType.slice(1)];
+ var Clz = _nonShapeGraphicElements.hasOwnProperty(graphicType)
+ // Those graphic elements are not shapes. They should not be
+ // overwritten by users, so do them first.
+ ? _nonShapeGraphicElements[graphicType]
+ : getShapeClass(graphicType);
if (__DEV__) {
assert$1(Clz, 'graphic type can not be found');
@@ -45614,8 +46067,8 @@ BaseAxisPointer.prototype = {
}
this._lastGraphicKey = graphicKey;
- var moveAnimation = this._moveAnimation
- = this.determineAnimation(axisModel, axisPointerModel);
+ var moveAnimation = this._moveAnimation =
+ this.determineAnimation(axisModel, axisPointerModel);
if (!group) {
group = this._group = new Group();
@@ -46413,8 +46866,8 @@ registerPreprocessor(function (option) {
registerProcessor(PRIORITY.PROCESSOR.STATISTIC, function (ecModel, api) {
// Build axisPointerModel, mergin tooltip.axisPointer model for each axis.
// allAxesInfo should be updated when setOption performed.
- ecModel.getComponent('axisPointer').coordSysAxesInfo
- = collect(ecModel, api);
+ ecModel.getComponent('axisPointer').coordSysAxesInfo =
+ collect(ecModel, api);
});
// Broadcast to all views.
@@ -47934,6 +48387,19 @@ registerAction(
* under the License.
*/
+var langSelector = lang.legend.selector;
+
+var defaultSelectorOption = {
+ all: {
+ type: 'all',
+ title: clone(langSelector.all)
+ },
+ inverse: {
+ type: 'inverse',
+ title: clone(langSelector.inverse)
+ }
+};
+
var LegendModel = extendComponentModel({
type: 'legend.plain',
@@ -47956,10 +48422,25 @@ var LegendModel = extendComponentModel({
this.mergeDefaultAndTheme(option, ecModel);
option.selected = option.selected || {};
+ this._updateSelector(option);
},
mergeOption: function (option) {
LegendModel.superCall(this, 'mergeOption', option);
+ this._updateSelector(option);
+ },
+
+ _updateSelector: function (option) {
+ var selector = option.selector;
+ if (selector === true) {
+ selector = option.selector = ['all', 'inverse'];
+ }
+ if (isArray(selector)) {
+ each$1(selector, function (item, index) {
+ isString(item) && (item = {type: item});
+ selector[index] = merge(item, defaultSelectorOption[item.type]);
+ });
+ }
},
optionUpdated: function () {
@@ -48088,6 +48569,27 @@ var LegendModel = extendComponentModel({
this[selected[name] ? 'unSelect' : 'select'](name);
},
+ allSelect: function () {
+ var data = this._data;
+ var selected = this.option.selected;
+ each$1(data, function (dataItem) {
+ selected[dataItem.get('name', true)] = true;
+ });
+ },
+
+ inverseSelect: function () {
+ var data = this._data;
+ var selected = this.option.selected;
+ each$1(data, function (dataItem) {
+ var name = dataItem.get('name', true);
+ // Initially, default value is true
+ if (!selected.hasOwnProperty(name)) {
+ selected[name] = true;
+ }
+ selected[name] = !selected[name];
+ });
+ },
+
/**
* @param {string} name
*/
@@ -48097,6 +48599,12 @@ var LegendModel = extendComponentModel({
&& indexOf(this._availableNames, name) >= 0;
},
+ getOrient: function () {
+ return this.get('orient') === 'vertical'
+ ? {index: 1, name: 'vertical'}
+ : {index: 0, name: 'horizontal'};
+ },
+
defaultOption: {
// 一级层叠
zlevel: 0,
@@ -48131,14 +48639,22 @@ var LegendModel = extendComponentModel({
// 各个item之间的间隔，单位px，默认为10，
// 横向布局时为水平间隔，纵向布局时为纵向间隔
itemGap: 10,
- // 图例图形宽度
+ // the width of legend symbol
itemWidth: 25,
- // 图例图形高度
+ // the height of legend symbol
itemHeight: 14,
- // 图例关闭时候的颜色
+ // the color of unselected legend symbol
inactiveColor: '#ccc',
+ // the borderColor of unselected legend symbol
+ inactiveBorderColor: '#ccc',
+
+ itemStyle: {
+ // the default borderWidth of legend symbol
+ borderWidth: 0
+ },
+
textStyle: {
// 图例文字颜色
color: '#333'
@@ -48151,6 +48667,40 @@ var LegendModel = extendComponentModel({
// 图例内容（详见legend.data，数组中每一项代表一个item
// data: [],
+ // Usage:
+ // selector: [{type: 'all or inverse', title: xxx}]
+ // or
+ // selector: true
+ // or
+ // selector: ['all', 'inverse']
+ selector: false,
+
+ selectorLabel: {
+ show: true,
+ borderRadius: 10,
+ padding: [3, 5, 3, 5],
+ fontSize: 12,
+ fontFamily: ' sans-serif',
+ color: '#666',
+ borderWidth: 1,
+ borderColor: '#666'
+ },
+
+ emphasis: {
+ selectorLabel: {
+ show: true,
+ color: '#eee',
+ backgroundColor: '#666'
+ }
+ },
+
+ // Value can be 'start' or 'end'
+ selectorPosition: 'auto',
+
+ selectorItemGap: 7,
+
+ selectorButtonGap: 10,
+
// Tooltip 相关配置
tooltip: {
show: false
@@ -48190,6 +48740,9 @@ function legendSelectActionHandler(methodName, payload, ecModel) {
// doesn't has the item, they will assume it is selected.
legendModel[isSelected ? 'select' : 'unSelect'](payload.name);
}
+ else if (methodName === 'allSelect' || methodName === 'inverseSelect') {
+ legendModel[methodName]();
+ }
else {
legendModel[methodName](payload.name);
isSelected = legendModel.isSelected(payload.name);
@@ -48212,10 +48765,14 @@ function legendSelectActionHandler(methodName, payload, ecModel) {
});
});
// Return the event explicitly
- return {
- name: payload.name,
- selected: selectedMap
- };
+ return (methodName === 'allSelect' || methodName === 'inverseSelect')
+ ? {
+ selected: selectedMap
+ }
+ : {
+ name: payload.name,
+ selected: selectedMap
+ };
}
/**
* @event legendToggleSelect
@@ -48229,6 +48786,16 @@ registerAction(
curry(legendSelectActionHandler, 'toggleSelected')
);
+registerAction(
+ 'legendAllSelect', 'legendselectall',
+ curry(legendSelectActionHandler, 'allSelect')
+);
+
+registerAction(
+ 'legendInverseSelect', 'legendinverseselect',
+ curry(legendSelectActionHandler, 'inverseSelect')
+);
+
/**
* @event legendSelect
* @type {Object}
@@ -48377,6 +48944,12 @@ var LegendView = extendComponentView({
this._backgroundEl;
/**
+ * @private
+ * @type {module:zrender/container/Group}
+ */
+ this.group.add(this._selectorGroup = new Group$2());
+
+ /**
* If first rendering, `contentGroup.position` is [0, 0], which
* does not make sense and may cause unexepcted animation if adopted.
* @private
@@ -48393,6 +48966,13 @@ var LegendView = extendComponentView({
},
/**
+ * @protected
+ */
+ getSelectorGroup: function () {
+ return this._selectorGroup;
+ },
+
+ /**
* @override
*/
render: function (legendModel, ecModel, api) {
@@ -48406,14 +48986,21 @@ var LegendView = extendComponentView({
}
var itemAlign = legendModel.get('align');
+ var orient = legendModel.get('orient');
if (!itemAlign || itemAlign === 'auto') {
itemAlign = (
legendModel.get('left') === 'right'
- && legendModel.get('orient') === 'vertical'
+ && orient === 'vertical'
) ? 'right' : 'left';
}
- this.renderInner(itemAlign, legendModel, ecModel, api);
+ var selector = legendModel.get('selector', true);
+ var selectorPosition = legendModel.get('selectorPosition', true);
+ if (selector && (!selectorPosition || selectorPosition === 'auto')) {
+ selectorPosition = orient === 'horizontal' ? 'end' : 'start';
+ }
+
+ this.renderInner(itemAlign, legendModel, ecModel, api, selector, orient, selectorPosition);
// Perform layout.
var positionInfo = legendModel.getBoxLayoutParams();
@@ -48422,7 +49009,7 @@ var LegendView = extendComponentView({
var maxSize = getLayoutRect(positionInfo, viewportSize, padding);
- var mainRect = this.layoutInner(legendModel, itemAlign, maxSize, isFirstRender);
+ var mainRect = this.layoutInner(legendModel, itemAlign, maxSize, isFirstRender, selector, selectorPosition);
// Place mainGroup, based on the calculated `mainRect`.
var layoutRect = getLayoutRect(
@@ -48444,12 +49031,13 @@ var LegendView = extendComponentView({
resetInner: function () {
this.getContentGroup().removeAll();
this._backgroundEl && this.group.remove(this._backgroundEl);
+ this.getSelectorGroup().removeAll();
},
/**
* @protected
*/
- renderInner: function (itemAlign, legendModel, ecModel, api) {
+ renderInner: function (itemAlign, legendModel, ecModel, api, selector, orient, selectorPosition) {
var contentGroup = this.getContentGroup();
var legendDrawnMap = createHashMap();
var selectMode = legendModel.get('selectedMode');
@@ -48482,6 +49070,7 @@ var LegendView = extendComponentView({
if (seriesModel) {
var data = seriesModel.getData();
var color = data.getVisual('color');
+ var borderColor = data.getVisual('borderColor');
// If color is a callback function
if (typeof color === 'function') {
@@ -48489,6 +49078,12 @@ var LegendView = extendComponentView({
color = color(seriesModel.getDataParams(0));
}
+ // If borderColor is a callback function
+ if (typeof borderColor === 'function') {
+ // Use the first data
+ borderColor = borderColor(seriesModel.getDataParams(0));
+ }
+
// Using rect symbol defaultly
var legendSymbolType = data.getVisual('legendSymbol') || 'roundRect';
var symbolType = data.getVisual('symbol');
@@ -48496,7 +49091,7 @@ var LegendView = extendComponentView({
var itemGroup = this._createItem(
name, dataIndex, itemModel, legendModel,
legendSymbolType, symbolType,
- itemAlign, color,
+ itemAlign, color, borderColor,
selectMode
);
@@ -48522,13 +49117,14 @@ var LegendView = extendComponentView({
}
var color = data.getItemVisual(idx, 'color');
+ var borderColor = data.getItemVisual(idx, 'borderColor');
var legendSymbolType = 'roundRect';
var itemGroup = this._createItem(
name, dataIndex, itemModel, legendModel,
legendSymbolType, null,
- itemAlign, color,
+ itemAlign, color, borderColor,
selectMode
);
@@ -48553,17 +49149,63 @@ var LegendView = extendComponentView({
}
}
}, this);
+
+ if (selector) {
+ this._createSelector(selector, legendModel, api, orient, selectorPosition);
+ }
+ },
+
+ _createSelector: function (selector, legendModel, api, orient, selectorPosition) {
+ var selectorGroup = this.getSelectorGroup();
+
+ each$11(selector, function (selectorItem) {
+ createSelectorButton(selectorItem);
+ });
+
+ function createSelectorButton(selectorItem) {
+ var type = selectorItem.type;
+
+ var labelText = new Text({
+ style: {
+ x: 0,
+ y: 0,
+ align: 'center',
+ verticalAlign: 'middle'
+ },
+ onclick: function () {
+ api.dispatchAction({
+ type: type === 'all' ? 'legendAllSelect' : 'legendInverseSelect'
+ });
+ }
+ });
+
+ selectorGroup.add(labelText);
+
+ var labelModel = legendModel.getModel('selectorLabel');
+ var emphasisLabelModel = legendModel.getModel('emphasis.selectorLabel');
+
+ setLabelStyle(
+ labelText.style, labelText.hoverStyle = {}, labelModel, emphasisLabelModel,
+ {
+ defaultText: selectorItem.title,
+ isRectText: false
+ }
+ );
+ setHoverStyle(labelText);
+ }
},
_createItem: function (
name, dataIndex, itemModel, legendModel,
legendSymbolType, symbolType,
- itemAlign, color, selectMode
+ itemAlign, color, borderColor, selectMode
) {
var itemWidth = legendModel.get('itemWidth');
var itemHeight = legendModel.get('itemHeight');
var inactiveColor = legendModel.get('inactiveColor');
+ var inactiveBorderColor = legendModel.get('inactiveBorderColor');
var symbolKeepAspect = legendModel.get('symbolKeepAspect');
+ var legendModelItemStyle = legendModel.getModel('itemStyle');
var isSelected = legendModel.isSelected(name);
var itemGroup = new Group$2();
@@ -48577,7 +49219,7 @@ var LegendView = extendComponentView({
// Use user given icon first
legendSymbolType = itemIcon || legendSymbolType;
- itemGroup.add(createSymbol(
+ var legendSymbol = createSymbol(
legendSymbolType,
0,
0,
@@ -48586,7 +49228,13 @@ var LegendView = extendComponentView({
isSelected ? color : inactiveColor,
// symbolKeepAspect default true for legend
symbolKeepAspect == null ? true : symbolKeepAspect
- ));
+ );
+ itemGroup.add(
+ setSymbolStyle(
+ legendSymbol, legendSymbolType, legendModelItemStyle,
+ borderColor, inactiveBorderColor, isSelected
+ )
+ );
// Compose symbols
// PENDING
@@ -48598,8 +49246,7 @@ var LegendView = extendComponentView({
if (symbolType === 'none') {
symbolType = 'circle';
}
- // Put symbol in the center
- itemGroup.add(createSymbol(
+ var legendSymbolCenter = createSymbol(
symbolType,
(itemWidth - size) / 2,
(itemHeight - size) / 2,
@@ -48608,7 +49255,14 @@ var LegendView = extendComponentView({
isSelected ? color : inactiveColor,
// symbolKeepAspect default true for legend
symbolKeepAspect == null ? true : symbolKeepAspect
- ));
+ );
+ // Put symbol in the center
+ itemGroup.add(
+ setSymbolStyle(
+ legendSymbolCenter, symbolType, legendModelItemStyle,
+ borderColor, inactiveBorderColor, isSelected
+ )
+ );
}
var textX = itemAlign === 'left' ? itemWidth + 5 : -5;
@@ -48672,8 +49326,9 @@ var LegendView = extendComponentView({
/**
* @protected
*/
- layoutInner: function (legendModel, itemAlign, maxSize) {
+ layoutInner: function (legendModel, itemAlign, maxSize, isFirstRender, selector, selectorPosition) {
var contentGroup = this.getContentGroup();
+ var selectorGroup = this.getSelectorGroup();
// Place items in contentGroup.
box(
@@ -48685,9 +49340,48 @@ var LegendView = extendComponentView({
);
var contentRect = contentGroup.getBoundingRect();
- contentGroup.attr('position', [-contentRect.x, -contentRect.y]);
+ var contentPos = [-contentRect.x, -contentRect.y];
- return this.group.getBoundingRect();
+ if (selector) {
+ // Place buttons in selectorGroup
+ box(
+ // Buttons in selectorGroup always layout horizontally
+ 'horizontal',
+ selectorGroup,
+ legendModel.get('selectorItemGap', true)
+ );
+
+ var selectorRect = selectorGroup.getBoundingRect();
+ var selectorPos = [-selectorRect.x, -selectorRect.y];
+ var selectorButtonGap = legendModel.get('selectorButtonGap', true);
+
+ var orientIdx = legendModel.getOrient().index;
+ var wh = orientIdx === 0 ? 'width' : 'height';
+ var hw = orientIdx === 0 ? 'height' : 'width';
+ var yx = orientIdx === 0 ? 'y' : 'x';
+
+ if (selectorPosition === 'end') {
+ selectorPos[orientIdx] += contentRect[wh] + selectorButtonGap;
+ }
+ else {
+ contentPos[orientIdx] += selectorRect[wh] + selectorButtonGap;
+ }
+
+ //Always align selector to content as 'middle'
+ selectorPos[1 - orientIdx] += contentRect[hw] / 2 - selectorRect[hw] / 2;
+ selectorGroup.attr('position', selectorPos);
+ contentGroup.attr('position', contentPos);
+
+ var mainRect = {x: 0, y: 0};
+ mainRect[wh] = contentRect[wh] + selectorButtonGap + selectorRect[wh];
+ mainRect[hw] = Math.max(contentRect[hw], selectorRect[hw]);
+ mainRect[yx] = Math.min(0, selectorRect[yx] + selectorPos[1 - orientIdx]);
+ return mainRect;
+ }
+ else {
+ contentGroup.attr('position', contentPos);
+ return this.group.getBoundingRect();
+ }
},
/**
@@ -48700,6 +49394,21 @@ var LegendView = extendComponentView({
});
+function setSymbolStyle(symbol, symbolType, legendModelItemStyle, borderColor, inactiveBorderColor, isSelected) {
+ var itemStyle;
+ if (symbolType !== 'line' && symbolType.indexOf('empty') < 0) {
+ itemStyle = legendModelItemStyle.getItemStyle();
+ symbol.style.stroke = borderColor;
+ if (!isSelected) {
+ itemStyle.stroke = inactiveBorderColor;
+ }
+ }
+ else {
+ itemStyle = legendModelItemStyle.getItemStyle(['borderWidth', 'borderColor']);
+ }
+ return symbol.setStyle(itemStyle);
+}
+
function dispatchSelectAction(name, api) {
api.dispatchAction({
type: 'legendToggleSelect',
@@ -48795,7 +49504,7 @@ var legendFilter = function (ecModel) {
// Do not contain scrollable legend, for sake of file size.
// Series Filter
-registerProcessor(legendFilter);
+registerProcessor(PRIORITY.PROCESSOR.SERIES_FILTER, legendFilter);
ComponentModel.registerSubTypeDefaulter('legend', function () {
// Default 'plain' when no type specified.
@@ -48870,12 +49579,6 @@ var ScrollableLegendModel = LegendModel.extend({
ScrollableLegendModel.superCall(this, 'mergeOption', option, extraOpt);
mergeAndNormalizeLayoutParams(this, this.option, option);
- },
-
- getOrient: function () {
- return this.get('orient') === 'vertical'
- ? {index: 1, name: 'vertical'}
- : {index: 0, name: 'horizontal'};
}
});
@@ -48968,11 +49671,12 @@ var ScrollableLegendView = LegendView.extend({
/**
* @override
*/
- renderInner: function (itemAlign, legendModel, ecModel, api) {
+ renderInner: function (itemAlign, legendModel, ecModel, api, selector, orient, selectorPosition) {
var me = this;
// Render content items.
- ScrollableLegendView.superCall(this, 'renderInner', itemAlign, legendModel, ecModel, api);
+ ScrollableLegendView.superCall(this, 'renderInner', itemAlign,
+ legendModel, ecModel, api, selector, orient, selectorPosition);
var controllerGroup = this._controllerGroup;
@@ -49025,16 +49729,59 @@ var ScrollableLegendView = LegendView.extend({
/**
* @override
*/
- layoutInner: function (legendModel, itemAlign, maxSize, isFirstRender) {
- var contentGroup = this.getContentGroup();
- var containerGroup = this._containerGroup;
- var controllerGroup = this._controllerGroup;
+ layoutInner: function (legendModel, itemAlign, maxSize, isFirstRender, selector, selectorPosition) {
+ var selectorGroup = this.getSelectorGroup();
var orientIdx = legendModel.getOrient().index;
var wh = WH[orientIdx];
+ var xy = XY[orientIdx];
var hw = WH[1 - orientIdx];
var yx = XY[1 - orientIdx];
+ selector && box(
+ // Buttons in selectorGroup always layout horizontally
+ 'horizontal',
+ selectorGroup,
+ legendModel.get('selectorItemGap', true)
+ );
+
+ var selectorButtonGap = legendModel.get('selectorButtonGap', true);
+ var selectorRect = selectorGroup.getBoundingRect();
+ var selectorPos = [-selectorRect.x, -selectorRect.y];
+
+ var processMaxSize = clone(maxSize);
+ selector && (processMaxSize[wh] = maxSize[wh] - selectorRect[wh] - selectorButtonGap);
+
+ var mainRect = this._layoutContentAndController(legendModel, isFirstRender,
+ processMaxSize, orientIdx, wh, hw, yx
+ );
+
+ if (selector) {
+ if (selectorPosition === 'end') {
+ selectorPos[orientIdx] += mainRect[wh] + selectorButtonGap;
+ }
+ else {
+ var offset = selectorRect[wh] + selectorButtonGap;
+ selectorPos[orientIdx] -= offset;
+ mainRect[xy] -= offset;
+ }
+ mainRect[wh] += selectorRect[wh] + selectorButtonGap;
+
+ selectorPos[1 - orientIdx] += mainRect[yx] + mainRect[hw] / 2 - selectorRect[hw] / 2;
+ mainRect[hw] = Math.max(mainRect[hw], selectorRect[hw]);
+ mainRect[yx] = Math.min(mainRect[yx], selectorRect[yx] + selectorPos[1 - orientIdx]);
+
+ selectorGroup.attr('position', selectorPos);
+ }
+
+ return mainRect;
+ },
+
+ _layoutContentAndController: function (legendModel, isFirstRender, maxSize, orientIdx, wh, hw, yx) {
+ var contentGroup = this.getContentGroup();
+ var containerGroup = this._containerGroup;
+ var controllerGroup = this._controllerGroup;
+
// Place items in contentGroup.
box(
legendModel.get('orient'),
@@ -49093,11 +49840,12 @@ var ScrollableLegendView = LegendView.extend({
// Calculate `mainRect` and set `clipPath`.
// mainRect should not be calculated by `this.group.getBoundingRect()`
// for sake of the overflow.
- var mainRect = this.group.getBoundingRect();
var mainRect = {x: 0, y: 0};
+
// Consider content may be overflow (should be clipped).
mainRect[wh] = showController ? maxSize[wh] : contentRect[wh];
mainRect[hw] = Math.max(contentRect[hw], controllerRect[hw]);
+
// `containerRect[yx] + containerPos[1 - orientIdx]` is 0.
mainRect[yx] = Math.min(0, controllerRect[yx] + controllerPos[1 - orientIdx]);
@@ -49112,7 +49860,7 @@ var ScrollableLegendView = LegendView.extend({
containerGroup.__rectSize = clipShape[wh];
}
else {
- // Do not remove or ignore controller. Keep them set as place holders.
+ // Do not remove or ignore controller. Keep them set as placeholders.
controllerGroup.eachChild(function (child) {
child.attr({invisible: true, silent: true});
});
@@ -49124,7 +49872,7 @@ var ScrollableLegendView = LegendView.extend({
contentGroup,
{position: pageInfo.contentPosition},
// When switch from "show controller" to "not show controller", view should be
- // updated immediately without animation, otherwise causes weird efffect.
+ // updated immediately without animation, otherwise causes weird effect.
showController ? legendModel : false
);
@@ -49180,8 +49928,8 @@ var ScrollableLegendView = LegendView.extend({
* contentPosition: Array.<number>, null when data item not found.
* pageIndex: number, null when data item not found.
* pageCount: number, always be a number, can be 0.
- * pagePrevDataIndex: number, null when no next page.
- * pageNextDataIndex: number, null when no previous page.
+ * pagePrevDataIndex: number, null when no previous page.
+ * pageNextDataIndex: number, null when no next page.
* }
*/
_getPageInfo: function (legendModel) {
@@ -49673,7 +50421,7 @@ var MarkerModel = extendComponentModel({
/**
* @overrite
*/
- init: function (option, parentModel, ecModel, extraOpt) {
+ init: function (option, parentModel, ecModel) {
if (__DEV__) {
if (this.type === 'marker') {
@@ -49681,7 +50429,7 @@ var MarkerModel = extendComponentModel({
}
}
this.mergeDefaultAndTheme(option, ecModel);
- this.mergeOption(option, ecModel, extraOpt.createdBySelf, true);
+ this._mergeOption(option, ecModel, false, true);
},
/**
@@ -49696,7 +50444,14 @@ var MarkerModel = extendComponentModel({
return this.getShallow('animation') && hostSeries && hostSeries.isAnimationEnabled();
},
- mergeOption: function (newOpt, ecModel, createdBySelf, isInit) {
+ /**
+ * @overrite
+ */
+ mergeOption: function (newOpt, ecModel) {
+ this._mergeOption(newOpt, ecModel, false, false);
+ },
+
+ _mergeOption: function (newOpt, ecModel, createdBySelf, isInit) {
var MarkerModel = this.constructor;
var modelPropName = this.mainType + 'Model';
if (!createdBySelf) {
@@ -49740,7 +50495,7 @@ var MarkerModel = extendComponentModel({
markerModel.__hostSeries = seriesModel;
}
else {
- markerModel.mergeOption(markerOpt, ecModel, true);
+ markerModel._mergeOption(markerOpt, ecModel, true);
}
seriesModel[modelPropName] = markerModel;
}, this);
@@ -52417,7 +53172,7 @@ AxisProxy.prototype = {
// `calculateDataWindow` uses min/maxSpan.
setMinMaxSpan(this);
- var dataWindow = this.calculateDataWindow(dataZoomModel.option);
+ var dataWindow = this.calculateDataWindow(dataZoomModel.settledOption);
this._valueWindow = dataWindow.valueWindow;
this._percentWindow = dataWindow.percentWindow;
@@ -52764,29 +53519,55 @@ var DataZoomModel = extendComponentModel({
*/
this._rangePropMode = ['percent', 'percent'];
- var rawOption = retrieveRaw(option);
+ var inputRawOption = retrieveRawOption(option);
+
+ /**
+ * Suppose a "main process" start at the point that model prepared (that is,
+ * model initialized or merged or method called in `action`).
+ * We should keep the `main process` idempotent, that is, given a set of values
+ * on `option`, we get the same result.
+ *
+ * But sometimes, values on `option` will be updated for providing users
+ * a "final calculated value" (`dataZoomProcessor` will do that). Those value
+ * should not be the base/input of the `main process`.
+ *
+ * So in that case we should save and keep the input of the `main process`
+ * separately, called `settledOption`.
+ *
+ * For example, consider the case:
+ * (Step_1) brush zoom the grid by `toolbox.dataZoom`,
+ * where the original input `option.startValue`, `option.endValue` are earsed by
+ * calculated value.
+ * (Step)2) click the legend to hide and show a series,
+ * where the new range is calculated by the earsed `startValue` and `endValue`,
+ * which brings incorrect result.
+ *
+ * @readOnly
+ */
+ this.settledOption = inputRawOption;
this.mergeDefaultAndTheme(option, ecModel);
- this.doInit(rawOption);
+ this.doInit(inputRawOption);
},
/**
* @override
*/
mergeOption: function (newOption) {
- var rawOption = retrieveRaw(newOption);
+ var inputRawOption = retrieveRawOption(newOption);
//FIX #2591
merge(this.option, newOption, true);
+ merge(this.settledOption, inputRawOption, true);
- this.doInit(rawOption);
+ this.doInit(inputRawOption);
},
/**
* @protected
*/
- doInit: function (rawOption) {
+ doInit: function (inputRawOption) {
var thisOption = this.option;
// Disable realtime view update if canvas is not supported.
@@ -52794,16 +53575,17 @@ var DataZoomModel = extendComponentModel({
thisOption.realtime = false;
}
- this._setDefaultThrottle(rawOption);
+ this._setDefaultThrottle(inputRawOption);
- updateRangeUse(this, rawOption);
+ updateRangeUse(this, inputRawOption);
+ var settledOption = this.settledOption;
each$12([['start', 'startValue'], ['end', 'endValue']], function (names, index) {
// start/end has higher priority over startValue/endValue if they
// both set, but we should make chart.setOption({endValue: 1000})
// effective, rather than chart.setOption({endValue: 1000, end: null}).
if (this._rangePropMode[index] === 'value') {
- thisOption[names[0]] = null;
+ thisOption[names[0]] = settledOption[names[0]] = null;
}
// Otherwise do nothing and use the merge result.
}, this);
@@ -53023,16 +53805,16 @@ var DataZoomModel = extendComponentModel({
/**
* @private
*/
- _setDefaultThrottle: function (rawOption) {
+ _setDefaultThrottle: function (inputRawOption) {
// When first time user set throttle, auto throttle ends.
- if (rawOption.hasOwnProperty('throttle')) {
+ if (inputRawOption.hasOwnProperty('throttle')) {
this._autoThrottle = false;
}
if (this._autoThrottle) {
var globalOption = this.ecModel.option;
- this.option.throttle
- = (globalOption.animation && globalOption.animationDurationUpdate > 0)
- ? 100 : 20;
+ this.option.throttle = (
+ globalOption.animation && globalOption.animationDurationUpdate > 0
+ ) ? 100 : 20;
}
},
@@ -53098,23 +53880,42 @@ var DataZoomModel = extendComponentModel({
* @param {number} [opt.end]
* @param {number} [opt.startValue]
* @param {number} [opt.endValue]
- * @param {boolean} [ignoreUpdateRangeUsg=false]
*/
- setRawRange: function (opt, ignoreUpdateRangeUsg) {
- var option = this.option;
+ setRawRange: function (opt) {
+ var thisOption = this.option;
+ var settledOption = this.settledOption;
each$12([['start', 'startValue'], ['end', 'endValue']], function (names) {
- // If only one of 'start' and 'startValue' is not null/undefined, the other
- // should be cleared, which enable clear the option.
- // If both of them are not set, keep option with the original value, which
- // enable use only set start but not set end when calling `dispatchAction`.
- // The same as 'end' and 'endValue'.
+ // Consider the pair <start, startValue>:
+ // If one has value and the other one is `null/undefined`, we both set them
+ // to `settledOption`. This strategy enables the feature to clear the original
+ // value in `settledOption` to `null/undefined`.
+ // But if both of them are `null/undefined`, we do not set them to `settledOption`
+ // and keep `settledOption` with the original value. This strategy enables users to
+ // only set <end or endValue> but not set <start or startValue> when calling
+ // `dispatchAction`.
+ // The pair <end, endValue> is treated in the same way.
if (opt[names[0]] != null || opt[names[1]] != null) {
- option[names[0]] = opt[names[0]];
- option[names[1]] = opt[names[1]];
+ thisOption[names[0]] = settledOption[names[0]] = opt[names[0]];
+ thisOption[names[1]] = settledOption[names[1]] = opt[names[1]];
}
}, this);
- !ignoreUpdateRangeUsg && updateRangeUse(this, opt);
+ updateRangeUse(this, opt);
+ },
+
+ /**
+ * @public
+ * @param {Object} opt
+ * @param {number} [opt.start]
+ * @param {number} [opt.end]
+ * @param {number} [opt.startValue]
+ * @param {number} [opt.endValue]
+ */
+ setCalculatedRange: function (opt) {
+ var option = this.option;
+ each$12(['start', 'startValue', 'end', 'endValue'], function (name) {
+ option[name] = opt[name];
+ });
},
/**
@@ -53188,7 +53989,12 @@ var DataZoomModel = extendComponentModel({
});
-function retrieveRaw(option) {
+/**
+ * Retrieve the those raw params from option, which will be cached separately.
+ * becasue they will be overwritten by normalized/calculated values in the main
+ * process.
+ */
+function retrieveRawOption(option) {
var ret = {};
each$12(
['start', 'end', 'startValue', 'endValue', 'throttle'],
@@ -53199,13 +54005,13 @@ function retrieveRaw(option) {
return ret;
}
-function updateRangeUse(dataZoomModel, rawOption) {
+function updateRangeUse(dataZoomModel, inputRawOption) {
var rangePropMode = dataZoomModel._rangePropMode;
var rangeModeInOption = dataZoomModel.get('rangeMode');
each$12([['start', 'startValue'], ['end', 'endValue']], function (names, index) {
- var percentSpecified = rawOption[names[0]] != null;
- var valueSpecified = rawOption[names[1]] != null;
+ var percentSpecified = inputRawOption[names[0]] != null;
+ var valueSpecified = inputRawOption[names[1]] != null;
if (percentSpecified && !valueSpecified) {
rangePropMode[index] = 'percent';
}
@@ -54281,12 +55087,12 @@ registerProcessor({
var percentRange = axisProxy.getDataPercentWindow();
var valueRange = axisProxy.getDataValueWindow();
- dataZoomModel.setRawRange({
+ dataZoomModel.setCalculatedRange({
start: percentRange[0],
end: percentRange[1],
startValue: valueRange[0],
endValue: valueRange[1]
- }, true);
+ });
});
}
});
@@ -55545,7 +56351,8 @@ extendComponentView({
path.setStyle({
text: titles[iconName],
textPosition: iconStyleEmphasisModel.get('textPosition') || 'bottom',
- textFill: iconStyleEmphasisModel.get('textFill') || hoverStyle.fill || hoverStyle.stroke || '#000',
+ textFill: iconStyleEmphasisModel.get('textFill')
+ || hoverStyle.fill || hoverStyle.stroke || '#000',
textAlign: iconStyleEmphasisModel.get('textAlign') || 'center',
textBackgroundColor: iconStyleEmphasisModel.get('textBackgroundColor'),
textBorderRadius: iconStyleEmphasisModel.get('textBorderRadius'),
@@ -56409,8 +57216,8 @@ registerAction({
var curry$5 = curry;
var each$16 = each$1;
var map$2 = map;
-var mathMin$4 = Math.min;
-var mathMax$4 = Math.max;
+var mathMin$5 = Math.min;
+var mathMax$5 = Math.max;
var mathPow$2 = Math.pow;
var COVER_Z = 10000;
@@ -56929,7 +57736,7 @@ function createBaseRectCover(doDrift, controller, brushOption, edgeNames) {
function updateBaseRect(controller, cover, localRange, brushOption) {
var lineWidth = brushOption.brushStyle.lineWidth || 0;
- var handleSize = mathMax$4(lineWidth, MIN_RESIZE_LINE_WIDTH);
+ var handleSize = mathMax$5(lineWidth, MIN_RESIZE_LINE_WIDTH);
var x = localRange[0][0];
var y = localRange[1][0];
var xa = x - lineWidth / 2;
@@ -56996,8 +57803,8 @@ function makeStyle(brushOption) {
}
function formatRectRange(x, y, x2, y2) {
- var min = [mathMin$4(x, x2), mathMin$4(y, y2)];
- var max = [mathMax$4(x, x2), mathMax$4(y, y2)];
+ var min = [mathMin$5(x, x2), mathMin$5(y, y2)];
+ var max = [mathMax$5(x, x2), mathMax$5(y, y2)];
return [
[min[0], max[0]], // x range
@@ -57077,10 +57884,10 @@ function clipByPanel(controller, cover, data) {
}
function pointsToRect(points) {
- var xmin = mathMin$4(points[0][0], points[1][0]);
- var ymin = mathMin$4(points[0][1], points[1][1]);
- var xmax = mathMax$4(points[0][0], points[1][0]);
- var ymax = mathMax$4(points[0][1], points[1][1]);
+ var xmin = mathMin$5(points[0][0], points[1][0]);
+ var ymin = mathMin$5(points[0][1], points[1][1]);
+ var xmax = mathMax$5(points[0][0], points[1][0]);
+ var ymax = mathMax$5(points[0][1], points[1][1]);
return {
x: xmin,
@@ -57356,8 +58163,8 @@ function getLineRenderer(xyIndex) {
},
getCreatingRange: function (localTrack) {
var ends = getTrackEnds(localTrack);
- var min = mathMin$4(ends[0][xyIndex], ends[1][xyIndex]);
- var max = mathMax$4(ends[0][xyIndex], ends[1][xyIndex]);
+ var min = mathMin$5(ends[0][xyIndex], ends[1][xyIndex]);
+ var max = mathMax$5(ends[0][xyIndex], ends[1][xyIndex]);
return [min, max];
},
@@ -58149,6 +58956,7 @@ function DataZoom(model, ecModel, api) {
DataZoom.defaultOption = {
show: true,
+ filterMode: 'filter',
// Icon group
icon: {
zoom: 'M0,13.5h26.9 M13.5,26.9V0 M32.1,13.5H58V58H13.5 V32.1',
@@ -58397,6 +59205,8 @@ registerPreprocessor(function (option) {
var newOpt = {
type: 'select',
$fromToolbox: true,
+ // Default to be filter
+ filterMode: dataZoomOpt.filterMode || 'filter',
// Id for merge mapping.
id: DATA_ZOOM_ID_BASE + axisName + axisIndex
};
@@ -58542,7 +59352,7 @@ var sqrt = Math.sqrt;
var abs$1 = Math.abs;
var cos = Math.cos;
var sin = Math.sin;
-var mathMax$5 = Math.max;
+var mathMax$6 = Math.max;
if (!env$1.canvasSupported) {
@@ -58677,7 +59487,7 @@ if (!env$1.canvasSupported) {
width /= scale$$1[0] * Z;
height /= scale$$1[1] * Z;
- var dimension = mathMax$5(width, height);
+ var dimension = mathMax$6(width, height);
shift = 2 * 0 / dimension;
expansion = 2 * fill.r / dimension - shift;
}
@@ -59144,8 +59954,8 @@ if (!env$1.canvasSupported) {
applyTransform(p2, p2, m);
applyTransform(p3, p3, m);
- var maxX = mathMax$5(p0[0], p1[0], p2[0], p3[0]);
- var maxY = mathMax$5(p0[1], p1[1], p2[1], p3[1]);
+ var maxX = mathMax$6(p0[0], p1[0], p2[0], p3[0]);
+ var maxY = mathMax$6(p0[1], p1[1], p2[1], p3[1]);
var transformFilter = [];
transformFilter.push('M11=', m[0] / scaleX, comma,
@@ -59774,7 +60584,7 @@ VMLPainter.prototype = {
// Not supported methods
function createMethodNotSupport(method) {
return function () {
- zrLog('In IE8.0 VML mode painter not support method "' + method + '"');
+ logError$1('In IE8.0 VML mode painter not support method "' + method + '"');
};
}
@@ -60136,14 +60946,15 @@ var svgTextDrawRectText = function (el, rect, textRect) {
textRect = getBoundingRect(
text, font, align,
- verticalAlign, style.textPadding, style.textLineHeight
+ verticalAlign, style.textPadding, style.textLineHeight,
+ false, style.truncate
);
var lineHeight = textRect.lineHeight;
// Text position represented by coord
if (textPosition instanceof Array) {
- x = rect.x + textPosition[0];
- y = rect.y + textPosition[1];
+ x = rect.x + parsePercent(textPosition[0], rect.width);
+ y = rect.y + parsePercent(textPosition[1], rect.height);
}
else {
var newPos = el.calculateTextPosition
@@ -60205,7 +61016,10 @@ var svgTextDrawRectText = function (el, rect, textRect) {
setTransform(textSvgEl, transform);
}
- var textLines = text.split('\n');
+ var contentBlock = parsePlainText(
+ text, font, textPadding, lineHeight, style.truncate);
+
+ var textLines = contentBlock.lines;
var nTextLines = textLines.length;
var textAnchor = align;
// PENDING
@@ -60826,7 +61640,7 @@ GradientManager.prototype.add = function (gradient) {
dom = this.createElement('radialGradient');
}
else {
- zrLog('Illegal gradient type.');
+ logError$1('Illegal gradient type.');
return null;
}
@@ -60891,7 +61705,7 @@ GradientManager.prototype.updateDom = function (gradient, dom) {
dom.setAttribute('r', gradient.r);
}
else {
- zrLog('Illegal gradient type.');
+ logError$1('Illegal gradient type.');
return;
}
@@ -61269,7 +62083,10 @@ ShadowManager.prototype.updateDom = function (displayable, dom) {
var scaleY = displayable.scale ? (displayable.scale[1] || 1) : 1;
// TODO: textBoxShadowBlur is not supported yet
- var offsetX, offsetY, blur, color;
+ var offsetX;
+ var offsetY;
+ var blur;
+ var color;
if (style.shadowBlur || style.shadowOffsetX || style.shadowOffsetY) {
offsetX = style.shadowOffsetX || 0;
offsetY = style.shadowOffsetY || 0;
@@ -61376,6 +62193,12 @@ function prepend(parent, child) {
}
}
+// function append(parent, child) {
+// if (checkParentAvailable(parent, child)) {
+// parent.appendChild(child);
+// }
+// }
+
function remove$1(parent, child) {
if (child && parent && child.parentNode === parent) {
parent.removeChild(child);
@@ -61707,7 +62530,7 @@ SVGPainter.prototype = {
// Not supported methods
function createMethodNotSupport$1(method) {
return function () {
- zrLog('In SVG mode painter not support method "' + method + '"');
+ logError$1('In SVG mode painter not support method "' + method + '"');
};
}
diff --git a/dist/echarts-en.common.min.js b/dist/echarts-en.common.min.js
index ea1b3e1..bfb8e96 100644
--- a/dist/echarts-en.common.min.js
+++ b/dist/echarts-en.common.min.js
@@ -19,4 +19,4 @@
*/
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";var e=2311,i=function(){return e++},v="object"==typeof wx&&"function"==typeof wx.getSystemInfoSync?{browser:{},os:{},node:!1,wxa:!0,canvasSupported:!0,svgSupported:!1,touchEventsSupported:!0,domSupported:!1}:"undefined"==typeof document&&"undefined"!=typeof self?{browser:{},os:{},node:!1,worker:!0,canvasS [...]
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";var e=2311,n=function(){return e++},v="object"==typeof wx&&"function"==typeof wx.getSystemInfoSync?{browser:{},os:{},node:!1,wxa:!0,canvasSupported:!0,svgSupported:!1,touchEventsSupported:!0,domSupported:!1}:"undefined"==typeof document&&"undefined"!=typeof self?{browser:{},os:{},node:!1,worker:!0,canvasS [...]
diff --git a/dist/echarts-en.js b/dist/echarts-en.js
index 929af6b..031a920 100644
--- a/dist/echarts-en.js
+++ b/dist/echarts-en.js
@@ -66,6 +66,8 @@ var guid = function () {
* @desc thanks zepto.
*/
+/* global wx */
+
var env = {};
if (typeof wx === 'object' && typeof wx.getSystemInfoSync === 'function') {
@@ -480,7 +482,9 @@ function inherits(clazz, baseClazz) {
clazz.prototype = new F();
for (var prop in clazzPrototype) {
- clazz.prototype[prop] = clazzPrototype[prop];
+ if (clazzPrototype.hasOwnProperty(prop)) {
+ clazz.prototype[prop] = clazzPrototype[prop];
+ }
}
clazz.prototype.constructor = clazz;
clazz.superClass = baseClazz;
@@ -732,6 +736,7 @@ function isDom(value) {
* @return {boolean}
*/
function eqNaN(value) {
+ /* eslint-disable-next-line no-self-compare */
return value !== value;
}
@@ -876,9 +881,11 @@ HashMap.prototype = {
// should not use the exposed keys, who are prefixed.
each: function (cb, context) {
context !== void 0 && (cb = bind(cb, context));
+ /* eslint-disable guard-for-in */
for (var key in this.data) {
this.data.hasOwnProperty(key) && cb(this.data[key], key);
}
+ /* eslint-enable guard-for-in */
},
// Do not use this method if performance sensitive.
removeKey: function (key) {
@@ -948,6 +955,8 @@ var zrUtil = (Object.freeze || Object)({
noop: noop
});
+/* global Float32Array */
+
var ArrayCtor = typeof Float32Array === 'undefined'
? Array
: Float32Array;
@@ -2506,6 +2515,8 @@ mixin(Handler, Draggable);
* @exports zrender/tool/matrix
*/
+/* global Float32Array */
+
var ArrayCtor$1 = typeof Float32Array === 'undefined'
? Array
: Float32Array;
@@ -3764,11 +3775,17 @@ function lerpNumber(a, b, p) {
}
function setRgba(out, r, g, b, a) {
- out[0] = r; out[1] = g; out[2] = b; out[3] = a;
+ out[0] = r;
+ out[1] = g;
+ out[2] = b;
+ out[3] = a;
return out;
}
function copyRgba(out, a) {
- out[0] = a[0]; out[1] = a[1]; out[2] = a[2]; out[3] = a[3];
+ out[0] = a[0];
+ out[1] = a[1];
+ out[2] = a[2];
+ out[3] = a[3];
return out;
}
@@ -4843,35 +4860,23 @@ if (typeof window !== 'undefined') {
*/
/**
- * debug日志选项：catchBrushException为true下有效
- * 0 : 不生成debug数据，发布用
- * 1 : 异常抛出，调试用
- * 2 : 控制台输出，调试用
+ * Debug log mode:
+ * 0: Do nothing, for release.
+ * 1: console.error, for debug.
*/
var debugMode = 0;
// retina 屏幕优化
var devicePixelRatio = dpr;
-var log = function () {
+var logError = function () {
};
if (debugMode === 1) {
- log = function () {
- for (var k in arguments) {
- throw new Error(arguments[k]);
- }
- };
-}
-else if (debugMode > 1) {
- log = function () {
- for (var k in arguments) {
- console.log(arguments[k]);
- }
- };
+ logError = console.error;
}
-var zrLog = log;
+var logError$1 = logError;
/**
* @alias modue:zrender/mixin/Animatable
@@ -4927,7 +4932,7 @@ Animatable.prototype = {
}
if (!target) {
- zrLog(
+ logError$1(
'Property "'
+ path
+ '" is not existed in element '
@@ -6148,7 +6153,10 @@ function TimSort(array, compare) {
while (stackSize > 1) {
var n = stackSize - 2;
- if (n >= 1 && runLength[n - 1] <= runLength[n] + runLength[n + 1] || n >= 2 && runLength[n - 2] <= runLength[n] + runLength[n - 1]) {
+ if (
+ (n >= 1 && runLength[n - 1] <= runLength[n] + runLength[n + 1])
+ || (n >= 2 && runLength[n - 2] <= runLength[n] + runLength[n - 1])
+ ) {
if (runLength[n - 1] < runLength[n + 1]) {
n--;
}
@@ -6238,7 +6246,9 @@ function TimSort(array, compare) {
}
var _minGallop = minGallop;
- var count1, count2, exit;
+ var count1;
+ var count2;
+ var exit;
while (1) {
count1 = 0;
@@ -6921,8 +6931,8 @@ Style.prototype = {
/**
* `true` is not supported.
* `false`/`null`/`undefined` are the same.
- * `false` is used to remove lineDash in some
- * case that `null`/`undefined` can not be set.
+ * `false` is used to remove lineDash in some
+ * case that `null`/`undefined` can not be set.
* (e.g., emphasis.lineStyle in echarts)
* @type {Array.<number>|boolean}
*/
@@ -7402,8 +7412,8 @@ var Layer = function (id, painter, dpr) {
domStyle['user-select'] = 'none';
domStyle['-webkit-touch-callout'] = 'none';
domStyle['-webkit-tap-highlight-color'] = 'rgba(0,0,0,0)';
- domStyle['padding'] = 0;
- domStyle['margin'] = 0;
+ domStyle['padding'] = 0; // eslint-disable-line dot-notation
+ domStyle['margin'] = 0; // eslint-disable-line dot-notation
domStyle['border-width'] = 0;
}
@@ -9529,7 +9539,7 @@ function isDisplayableCulled(el, width, height) {
function isClipPathChanged(clipPaths, prevClipPaths) {
// displayable.__clipPaths can only be `null`/`undefined` or an non-empty array.
- if (clipPaths === prevClipPaths) {
+ if (clipPaths === prevClipPaths) {
return false;
}
if (!clipPaths || !prevClipPaths || (clipPaths.length !== prevClipPaths.length)) {
@@ -10058,12 +10068,12 @@ Painter.prototype = {
var domRoot = this._domRoot;
if (layersMap[zlevel]) {
- zrLog('ZLevel ' + zlevel + ' has been used already');
+ logError$1('ZLevel ' + zlevel + ' has been used already');
return;
}
// Check if is a valid layer
if (!isLayerValid(layer)) {
- zrLog('Layer of zlevel ' + zlevel + ' is not valid');
+ logError$1('Layer of zlevel ' + zlevel + ' is not valid');
return;
}
@@ -10197,11 +10207,14 @@ Painter.prototype = {
incrementalLayerCount = 1;
}
else {
- layer = this.getLayer(zlevel + (incrementalLayerCount > 0 ? EL_AFTER_INCREMENTAL_INC : 0), this._needsManuallyCompositing);
+ layer = this.getLayer(
+ zlevel + (incrementalLayerCount > 0 ? EL_AFTER_INCREMENTAL_INC : 0),
+ this._needsManuallyCompositing
+ );
}
if (!layer.__builtin__) {
- zrLog('ZLevel ' + zlevel + ' has been used by unkown layer ' + layer.id);
+ logError$1('ZLevel ' + zlevel + ' has been used by unkown layer ' + layer.id);
}
if (layer !== prevLayer) {
@@ -11140,7 +11153,7 @@ var instances$1 = {}; // ZRender实例map索引
/**
* @type {string}
*/
-var version$1 = '4.1.0';
+var version$1 = '4.1.1';
/**
* Initializing a zrender instance
@@ -12466,7 +12479,7 @@ var getLineStyle = makeStyleMapper(
var lineStyleMixin = {
getLineStyle: function (excludes) {
var style = getLineStyle(this, excludes);
- // Always set lineDash whether dashed, otherwise we can not
+ // Always set lineDash whether dashed, otherwise we can not
// erase the previous style when assigning to el.style.
style.lineDash = this.getLineDash(style.lineWidth);
return style;
@@ -12479,15 +12492,15 @@ var lineStyleMixin = {
var lineType = this.get('type');
var dotSize = Math.max(lineWidth, 2);
var dashSize = lineWidth * 4;
- return (lineType === 'solid' || lineType == null)
- // Use `false` but not `null` for the solid line here, because `null` might be
- // ignored when assigning to `el.style`. e.g., when setting `lineStyle.type` as
- // `'dashed'` and `emphasis.lineStyle.type` as `'solid'` in graph series, the
- // `lineDash` gotten form the latter one is not able to erase that from the former
+ return (lineType === 'solid' || lineType == null)
+ // Use `false` but not `null` for the solid line here, because `null` might be
+ // ignored when assigning to `el.style`. e.g., when setting `lineStyle.type` as
+ // `'dashed'` and `emphasis.lineStyle.type` as `'solid'` in graph series, the
+ // `lineDash` gotten form the latter one is not able to erase that from the former
// one if using `null` here according to the emhpsis strategy in `util/graphic.js`.
? false
- : lineType === 'dashed'
- ? [dashSize, dashSize]
+ : lineType === 'dashed'
+ ? [dashSize, dashSize]
: [dotSize, dotSize];
}
};
@@ -13269,6 +13282,8 @@ function fromArc(
// TODO getTotalLength, getPointAtLength
+/* global Float32Array */
+
var CMD = {
M: 1,
L: 2,
@@ -13940,9 +13955,12 @@ PathProxy.prototype = {
*/
rebuildPath: function (ctx) {
var d = this.data;
- var x0, y0;
- var xi, yi;
- var x, y;
+ var x0;
+ var y0;
+ var xi;
+ var yi;
+ var x;
+ var y;
var ux = this._ux;
var uy = this._uy;
var len$$1 = this._len;
@@ -16799,6 +16817,8 @@ var NORMAL = 'normal';
var _highlightNextDigit = 1;
var _highlightKeyMap = {};
+var _customShapeMap = {};
+
/**
* Extend shape with parameters
@@ -16815,6 +16835,54 @@ function extendPath(pathData, opts) {
}
/**
+ * Register a user defined shape.
+ * The shape class can be fetched by `getShapeClass`
+ * This method will overwrite the registered shapes, including
+ * the registered built-in shapes, if using the same `name`.
+ * The shape can be used in `custom series` and
+ * `graphic component` by declaring `{type: name}`.
+ *
+ * @param {string} name
+ * @param {Object} ShapeClass Can be generated by `extendShape`.
+ */
+function registerShape(name, ShapeClass) {
+ _customShapeMap[name] = ShapeClass;
+}
+
+/**
+ * Find shape class registered by `registerShape`. Usually used in
+ * fetching user defined shape.
+ *
+ * [Caution]:
+ * (1) This method **MUST NOT be used inside echarts !!!**, unless it is prepared
+ * to use user registered shapes.
+ * Because the built-in shape (see `getBuiltInShape`) will be registered by
+ * `registerShape` by default. That enables users to get both built-in
+ * shapes as well as the shapes belonging to themsleves. But users can overwrite
+ * the built-in shapes by using names like 'circle', 'rect' via calling
+ * `registerShape`. So the echarts inner featrues should not fetch shapes from here
+ * in case that it is overwritten by users, except that some features, like
+ * `custom series`, `graphic component`, do it deliberately.
+ *
+ * (2) In the features like `custom series`, `graphic component`, the user input
+ * `{tpye: 'xxx'}` does not only specify shapes but also specify other graphic
+ * elements like `'group'`, `'text'`, `'image'` or event `'path'`. Those names
+ * are reserved names, that is, if some user register a shape named `'image'`,
+ * the shape will not be used. If we intending to add some more reserved names
+ * in feature, that might bring break changes (disable some existing user shape
+ * names). But that case probably rearly happen. So we dont make more mechanism
+ * to resolve this issue here.
+ *
+ * @param {string} name
+ * @return {Object} The shape class. If not found, return nothing.
+ */
+function getShapeClass(name) {
+ if (_customShapeMap.hasOwnProperty(name)) {
+ return _customShapeMap[name];
+ }
+}
+
+/**
* Create a path element from path data string
* @param {string} pathData
* @param {Object} opts
@@ -17015,11 +17083,12 @@ function singleEnterEmphasis(el) {
return;
}
- var useHoverLayer = el.useHoverLayer;
+ var zr = el.__zr;
+
+ var useHoverLayer = el.useHoverLayer && zr && zr.painter.type === 'canvas';
el.__highlighted = useHoverLayer ? 'layer' : 'plain';
- var zr = el.__zr;
- if (el.isGroup || (!zr && useHoverLayer)) {
+ if (el.isGroup || (!zr && el.useHoverLayer)) {
return;
}
@@ -17501,11 +17570,18 @@ function setTextStyleCommon(textStyle, textStyleModel, opt, isEmphasis) {
opt = opt || EMPTY_OBJ;
if (opt.isRectText) {
- var textPosition = textStyleModel.getShallow('position')
- || (isEmphasis ? null : 'inside');
- // 'outside' is not a valid zr textPostion value, but used
- // in bar series, and magric type should be considered.
- textPosition === 'outside' && (textPosition = 'top');
+ var textPosition;
+ if (opt.getTextPosition) {
+ textPosition = opt.getTextPosition(textStyleModel, isEmphasis);
+ }
+ else {
+ textPosition = textStyleModel.getShallow('position')
+ || (isEmphasis ? null : 'inside');
+ // 'outside' is not a valid zr textPostion value, but used
+ // in bar series, and magric type should be considered.
+ textPosition === 'outside' && (textPosition = 'top');
+ }
+
textStyle.textPosition = textPosition;
textStyle.textOffset = textStyleModel.getShallow('offset');
var labelRotate = textStyleModel.getShallow('rotate');
@@ -18104,6 +18180,18 @@ function nearZero(val) {
return val <= (1e-6) && val >= -(1e-6);
}
+// Register built-in shapes. These shapes might be overwirtten
+// by users, although we do not recommend that.
+registerShape('circle', Circle);
+registerShape('sector', Sector);
+registerShape('ring', Ring);
+registerShape('polygon', Polygon);
+registerShape('polyline', Polyline);
+registerShape('rect', Rect);
+registerShape('line', Line);
+registerShape('bezierCurve', BezierCurve);
+registerShape('arc', Arc);
+
@@ -18112,6 +18200,8 @@ var graphic = (Object.freeze || Object)({
CACHED_LABEL_STYLE_PROPERTIES: CACHED_LABEL_STYLE_PROPERTIES,
extendShape: extendShape,
extendPath: extendPath,
+ registerShape: registerShape,
+ getShapeClass: getShapeClass,
makePath: makePath,
makeImage: makeImage,
mergePath: mergePath,
@@ -18697,7 +18787,7 @@ function enableTopologicalTravel(entity, dependencyGetter) {
var RADIAN_EPSILON = 1e-4;
function _trim(str) {
- return str.replace(/^\s+/, '').replace(/\s+$/, '');
+ return str.replace(/^\s+|\s+$/g, '');
}
/**
@@ -21691,8 +21781,8 @@ var GlobalModel = Model.extend({
* {mainType: 'series', subType: 'pie', query: {seriesName: 'uio'}}
* );
* var result = findComponents(
- * {mainType: 'series'},
- * function (model, index) {...}
+ * {mainType: 'series',
+ * filter: function (model, index) {...}}
* );
* // result like [component0, componnet1, ...]
*
@@ -23011,12 +23101,17 @@ var backwardCompat = function (option, isTheme) {
var seriesType = seriesOpt.type;
- if (seriesType === 'pie' || seriesType === 'gauge') {
+ if (seriesType === 'line') {
+ if (seriesOpt.clipOverflow != null) {
+ seriesOpt.clip = seriesOpt.clipOverflow;
+ }
+ }
+ else if (seriesType === 'pie' || seriesType === 'gauge') {
if (seriesOpt.clockWise != null) {
seriesOpt.clockwise = seriesOpt.clockWise;
}
}
- if (seriesType === 'gauge') {
+ else if (seriesType === 'gauge') {
var pointerColor = get(seriesOpt, 'pointer.color');
pointerColor != null
&& set$1(seriesOpt, 'itemStyle.color', pointerColor);
@@ -23066,7 +23161,7 @@ var backwardCompat = function (option, isTheme) {
// data processing stage is blocked in stream.
// See <module:echarts/stream/Scheduler#performDataProcessorTasks>
// (2) Only register once when import repeatly.
-// Should be executed before after series filtered and before stack calculation.
+// Should be executed after series filtered and before stack calculation.
var dataStack = function (ecModel) {
var stackInfoMap = createHashMap();
ecModel.eachSeries(function (seriesModel) {
@@ -23578,6 +23673,7 @@ var dataFormatMixin = {
var name = data.getName(dataIndex);
var itemOpt = data.getRawDataItem(dataIndex);
var color = data.getItemVisual(dataIndex, 'color');
+ var borderColor = data.getItemVisual(dataIndex, 'borderColor');
var tooltipModel = this.ecModel.getComponent('tooltip');
var renderModeOption = tooltipModel && tooltipModel.get('renderMode');
var renderMode = getTooltipRenderMode(renderModeOption);
@@ -23599,6 +23695,7 @@ var dataFormatMixin = {
dataType: dataType,
value: rawValue,
color: color,
+ borderColor: borderColor,
dimensionNames: userOutput ? userOutput.dimensionNames : null,
encode: userOutput ? userOutput.encode : null,
marker: getTooltipMarker({
@@ -24077,6 +24174,11 @@ var SeriesModel = ComponentModel.extend({
visualColorAccessPath: 'itemStyle.color',
/**
+ * Access path of borderColor for visual
+ */
+ visualBorderColorAccessPath: 'itemStyle.borderColor',
+
+ /**
* Support merge layout params.
* Only support 'box' now (left/right/top/bottom/width/height).
* @type {string|Object} Object can be {ignoreSize: true}
@@ -24675,10 +24777,10 @@ Component$1.prototype = {
};
var componentProto = Component$1.prototype;
-componentProto.updateView
- = componentProto.updateLayout
- = componentProto.updateVisual
- = function (seriesModel, ecModel, api, payload) {
+componentProto.updateView =
+ componentProto.updateLayout =
+ componentProto.updateVisual =
+ function (seriesModel, ecModel, api, payload) {
// Do nothing;
};
// Enable Component.extend.
@@ -25196,6 +25298,10 @@ var seriesColor = {
// FIXME Set color function or use the platte color
data.setVisual('color', color);
+
+ var borderColorAccessPath = (seriesModel.visualBorderColorAccessPath || 'itemStyle.borderColor').split('.');
+ var borderColor = seriesModel.get(borderColorAccessPath);
+ data.setVisual('borderColor', borderColor);
// Only visible series has each data be visual encoded
if (!ecModel.isSeriesFiltered(seriesModel)) {
@@ -25211,9 +25317,13 @@ var seriesColor = {
var dataEach = function (data, idx) {
var itemModel = data.getItemModel(idx);
var color = itemModel.get(colorAccessPath, true);
+ var borderColor = itemModel.get(borderColorAccessPath, true);
if (color != null) {
data.setItemVisual(idx, 'color', color);
}
+ if (borderColor != null) {
+ data.setItemVisual(idx, 'borderColor', borderColor);
+ }
};
return { dataEach: data.hasItemOption ? dataEach : null };
@@ -25240,8 +25350,17 @@ var seriesColor = {
* under the License.
*/
+/**
+ * Language: English.
+ */
var lang = {
+ legend: {
+ selector: {
+ all: 'All',
+ inverse: 'Inv'
+ }
+ },
toolbox: {
brush: {
title: {
@@ -27222,15 +27341,17 @@ var isFunction = isFunction$1;
var isObject = isObject$1;
var parseClassType = ComponentModel.parseClassType;
-var version = '4.3.0';
+var version = '4.4.0';
var dependencies = {
- zrender: '4.1.0'
+ zrender: '4.1.1'
};
var TEST_FRAME_REMAIN_TIME = 1;
var PRIORITY_PROCESSOR_FILTER = 1000;
+var PRIORITY_PROCESSOR_SERIES_FILTER = 800;
+var PRIORITY_PROCESSOR_DATASTACK = 900;
var PRIORITY_PROCESSOR_STATISTIC = 5000;
var PRIORITY_VISUAL_LAYOUT = 1000;
@@ -27246,6 +27367,7 @@ var PRIORITY_VISUAL_BRUSH = 5000;
var PRIORITY = {
PROCESSOR: {
FILTER: PRIORITY_PROCESSOR_FILTER,
+ SERIES_FILTER: PRIORITY_PROCESSOR_SERIES_FILTER,
STATISTIC: PRIORITY_PROCESSOR_STATISTIC
},
VISUAL: {
@@ -27269,8 +27391,13 @@ var OPTION_UPDATED = '__optionUpdated';
var ACTION_REG = /^[a-zA-Z0-9_]+$/;
-function createRegisterEventWithLowercaseName(method) {
+function createRegisterEventWithLowercaseName(method, ignoreDisposed) {
return function (eventName, handler, context) {
+ if (!ignoreDisposed && this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
// Event name is all lowercase
eventName = eventName && eventName.toLowerCase();
Eventful.prototype[method].call(this, eventName, handler, context);
@@ -27283,9 +27410,9 @@ function createRegisterEventWithLowercaseName(method) {
function MessageCenter() {
Eventful.call(this);
}
-MessageCenter.prototype.on = createRegisterEventWithLowercaseName('on');
-MessageCenter.prototype.off = createRegisterEventWithLowercaseName('off');
-MessageCenter.prototype.one = createRegisterEventWithLowercaseName('one');
+MessageCenter.prototype.on = createRegisterEventWithLowercaseName('on', true);
+MessageCenter.prototype.off = createRegisterEventWithLowercaseName('off', true);
+MessageCenter.prototype.one = createRegisterEventWithLowercaseName('one', true);
mixin(MessageCenter, Eventful);
/**
@@ -27521,6 +27648,10 @@ echartsProto.setOption = function (option, notMerge, lazyUpdate) {
if (__DEV__) {
assert(!this[IN_MAIN_PROCESS], '`setOption` should not be called during main process.');
}
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
var silent;
if (isObject(notMerge)) {
@@ -27656,6 +27787,11 @@ echartsProto.getSvgDataUrl = function () {
* @param {string} [opts.excludeComponents]
*/
echartsProto.getDataURL = function (opts) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
opts = opts || {};
var excludeComponents = opts.excludeComponents;
var ecModel = this._model;
@@ -27696,6 +27832,11 @@ echartsProto.getDataURL = function (opts) {
* @param {string} [opts.backgroundColor]
*/
echartsProto.getConnectedDataURL = function (opts) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
if (!env$1.canvasSupported) {
return;
}
@@ -27815,6 +27956,11 @@ echartsProto.convertToPixel = curry(doConvertPixel, 'convertToPixel');
echartsProto.convertFromPixel = curry(doConvertPixel, 'convertFromPixel');
function doConvertPixel(methodName, finder, value) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
var ecModel = this._model;
var coordSysList = this._coordSysMgr.getCoordinateSystems();
var result;
@@ -27855,6 +28001,11 @@ function doConvertPixel(methodName, finder, value) {
* @return {boolean} result
*/
echartsProto.containPixel = function (finder, value) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
var ecModel = this._model;
var result;
@@ -28227,6 +28378,10 @@ echartsProto.resize = function (opts) {
if (__DEV__) {
assert(!this[IN_MAIN_PROCESS], '`resize` should not be called during main process.');
}
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
this._zr.resize(opts);
@@ -28269,6 +28424,11 @@ function updateStreamModes(ecIns, ecModel) {
* @param {Object} [cfg]
*/
echartsProto.showLoading = function (name, cfg) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
if (isObject(name)) {
cfg = name;
name = '';
@@ -28293,6 +28453,11 @@ echartsProto.showLoading = function (name, cfg) {
* Hide loading effect
*/
echartsProto.hideLoading = function () {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
this._loadingFX && this._zr.remove(this._loadingFX);
this._loadingFX = null;
};
@@ -28316,10 +28481,15 @@ echartsProto.makeActionFromEvent = function (eventObj) {
* @param {boolean} [opt.flush=undefined]
* true: Flush immediately, and then pixel in canvas can be fetched
* immediately. Caution: it might affect performance.
- * false: Not not flush.
+ * false: Not flush.
* undefined: Auto decide whether perform flush.
*/
echartsProto.dispatchAction = function (payload, opt) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
if (!isObject(opt)) {
opt = {silent: !!opt};
}
@@ -28488,6 +28658,11 @@ function bindRenderedEvent(zr, ecIns) {
* @param {Array|TypedArray} params.data
*/
echartsProto.appendData = function (params) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
var seriesIndex = params.seriesIndex;
var ecModel = this.getModel();
var seriesModel = ecModel.getSeriesByIndex(seriesIndex);
@@ -28513,9 +28688,9 @@ echartsProto.appendData = function (params) {
* Register event
* @method
*/
-echartsProto.on = createRegisterEventWithLowercaseName('on');
-echartsProto.off = createRegisterEventWithLowercaseName('off');
-echartsProto.one = createRegisterEventWithLowercaseName('one');
+echartsProto.on = createRegisterEventWithLowercaseName('on', false);
+echartsProto.off = createRegisterEventWithLowercaseName('off', false);
+echartsProto.one = createRegisterEventWithLowercaseName('one', false);
/**
* Prepare view instances of charts and components
@@ -28793,6 +28968,10 @@ echartsProto.isDisposed = function () {
* Clear
*/
echartsProto.clear = function () {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
this.setOption({ series: [] }, true);
};
@@ -28801,9 +28980,7 @@ echartsProto.clear = function () {
*/
echartsProto.dispose = function () {
if (this._disposed) {
- if (__DEV__) {
- console.warn('Instance ' + this.id + ' has been disposed');
- }
+ disposedWarning(this.id);
return;
}
this._disposed = true;
@@ -28828,6 +29005,12 @@ echartsProto.dispose = function () {
mixin(ECharts, Eventful);
+function disposedWarning(id) {
+ if (__DEV__) {
+ console.warn('Instance ' + id + ' has been disposed');
+ }
+}
+
function updateHoverLayerStatus(ecIns, ecModel) {
var zr = ecIns._zr;
var storage = zr.storage;
@@ -29177,9 +29360,9 @@ function init(dom, theme$$1, opts) {
)
) {
console.warn('Can\'t get DOM width or height. Please check '
- + 'dom.clientWidth and dom.clientHeight. They should not be 0.'
- + 'For example, you may need to call this in the callback '
- + 'of window.onload.');
+ + 'dom.clientWidth and dom.clientHeight. They should not be 0.'
+ + 'For example, you may need to call this in the callback '
+ + 'of window.onload.');
}
}
@@ -29530,7 +29713,7 @@ function getMap(mapName) {
registerVisual(PRIORITY_VISUAL_GLOBAL, seriesColor);
registerPreprocessor(backwardCompat);
-registerProcessor(PRIORITY_PROCESSOR_STATISTIC, dataStack);
+registerProcessor(PRIORITY_PROCESSOR_DATASTACK, dataStack);
registerLoading('default', loadingDefault);
// Default actions
@@ -32017,8 +32200,8 @@ function completeDimensions(sysDims, source, opt) {
// `coordDimIndex` should not be set directly.
sysDimItemDimsDef = sysDimItem.dimsDef;
sysDimItemOtherDims = sysDimItem.otherDims;
- sysDimItem.name = sysDimItem.coordDim = sysDimItem.coordDimIndex
- = sysDimItem.dimsDef = sysDimItem.otherDims = null;
+ sysDimItem.name = sysDimItem.coordDim = sysDimItem.coordDimIndex =
+ sysDimItem.dimsDef = sysDimItem.otherDims = null;
}
var dataDims = encodeDef.get(coordDim);
@@ -33452,6 +33635,7 @@ function doCalBarWidthAndOffset(seriesInfoList) {
var offset = -widthSum / 2;
each$1(stacks, function (column, stackId) {
result[coordSysName][stackId] = result[coordSysName][stackId] || {
+ bandWidth: bandWidth,
offset: offset,
width: column.width
};
@@ -33505,6 +33689,7 @@ function layout(seriesType, ecModel) {
lastStackCoords[stackId] = lastStackCoords[stackId] || [];
data.setLayout({
+ bandWidth: columnLayoutInfo.bandWidth,
offset: columnOffset,
size: columnWidth
});
@@ -33656,23 +33841,7 @@ function isInLargeMode(seriesModel) {
// See cases in `test/bar-start.html` and `#7412`, `#8747`.
function getValueAxisStart(baseAxis, valueAxis, stacked) {
- var extent = valueAxis.getGlobalExtent();
- var min;
- var max;
- if (extent[0] > extent[1]) {
- min = extent[1];
- max = extent[0];
- }
- else {
- min = extent[0];
- max = extent[1];
- }
-
- var valueStart = valueAxis.toGlobalCoord(valueAxis.dataToCoord(0));
- valueStart < min && (valueStart = min);
- valueStart > max && (valueStart = max);
-
- return valueStart;
+ return valueAxis.toGlobalCoord(valueAxis.dataToCoord(0));
}
/*
@@ -36122,6 +36291,7 @@ each$1(
'setHoverStyle', 'setLabelStyle', 'setTextStyle', 'setText',
'getFont', 'updateProps', 'initProps', 'getTransform',
'clipPointsByRect', 'clipRectByRect',
+ 'registerShape', 'getShapeClass',
'Group',
'Image',
'Text',
@@ -36194,7 +36364,7 @@ SeriesModel.extend({
// polarIndex: 0,
// If clip the overflow value
- clipOverflow: true,
+ clip: true,
// cursor: null,
label: {
@@ -37590,89 +37760,21 @@ var Polygon$1 = Path.extend({
* specific language governing permissions and limitations
* under the License.
*/
-
-// FIXME step not support polar
-
-function isPointsSame(points1, points2) {
- if (points1.length !== points2.length) {
- return;
- }
- for (var i = 0; i < points1.length; i++) {
- var p1 = points1[i];
- var p2 = points2[i];
- if (p1[0] !== p2[0] || p1[1] !== p2[1]) {
- return;
- }
- }
- return true;
-}
-
-function getSmooth(smooth) {
- return typeof (smooth) === 'number' ? smooth : (smooth ? 0.5 : 0);
-}
-
-function getAxisExtentWithGap(axis) {
- var extent = axis.getGlobalExtent();
- if (axis.onBand) {
- // Remove extra 1px to avoid line miter in clipped edge
- var halfBandWidth = axis.getBandWidth() / 2 - 1;
- var dir = extent[1] > extent[0] ? 1 : -1;
- extent[0] += dir * halfBandWidth;
- extent[1] -= dir * halfBandWidth;
- }
- return extent;
-}
-
-/**
- * @param {module:echarts/coord/cartesian/Cartesian2D|module:echarts/coord/polar/Polar} coordSys
- * @param {module:echarts/data/List} data
- * @param {Object} dataCoordInfo
- * @param {Array.<Array.<number>>} points
- */
-function getStackedOnPoints(coordSys, data, dataCoordInfo) {
- if (!dataCoordInfo.valueDim) {
- return [];
- }
-
- var points = [];
- for (var idx = 0, len = data.count(); idx < len; idx++) {
- points.push(getStackedOnPoint(dataCoordInfo, coordSys, data, idx));
- }
-
- return points;
-}
-
-function createGridClipShape(cartesian, hasAnimation, forSymbol, seriesModel) {
- var xExtent = getAxisExtentWithGap(cartesian.getAxis('x'));
- var yExtent = getAxisExtentWithGap(cartesian.getAxis('y'));
+function createGridClipPath(cartesian, hasAnimation, seriesModel) {
+ var rect = cartesian.getArea();
var isHorizontal = cartesian.getBaseAxis().isHorizontal();
- var x = Math.min(xExtent[0], xExtent[1]);
- var y = Math.min(yExtent[0], yExtent[1]);
- var width = Math.max(xExtent[0], xExtent[1]) - x;
- var height = Math.max(yExtent[0], yExtent[1]) - y;
+ var x = rect.x;
+ var y = rect.y;
+ var width = rect.width;
+ var height = rect.height;
- // Avoid float number rounding error for symbol on the edge of axis extent.
- // See #7913 and `test/dataZoom-clip.html`.
- if (forSymbol) {
- x -= 0.5;
- width += 0.5;
- y -= 0.5;
- height += 0.5;
- }
- else {
- var lineWidth = seriesModel.get('lineStyle.width') || 2;
- // Expand clip shape to avoid clipping when line value exceeds axis
- var expandSize = seriesModel.get('clipOverflow') ? lineWidth / 2 : Math.max(width, height);
- if (isHorizontal) {
- y -= expandSize;
- height += expandSize * 2;
- }
- else {
- x -= expandSize;
- width += expandSize * 2;
- }
- }
+ var lineWidth = seriesModel.get('lineStyle.width') || 2;
+ // Expand the clip path a bit to avoid the border is clipped and looks thinner
+ x -= lineWidth / 2;
+ y -= lineWidth / 2;
+ width += lineWidth;
+ height += lineWidth;
var clipPath = new Rect({
shape: {
@@ -37696,50 +37798,102 @@ function createGridClipShape(cartesian, hasAnimation, forSymbol, seriesModel) {
return clipPath;
}
-function createPolarClipShape(polar, hasAnimation, forSymbol, seriesModel) {
- var angleAxis = polar.getAngleAxis();
- var radiusAxis = polar.getRadiusAxis();
-
- var radiusExtent = radiusAxis.getExtent().slice();
- radiusExtent[0] > radiusExtent[1] && radiusExtent.reverse();
- var angleExtent = angleAxis.getExtent();
-
- var RADIAN = Math.PI / 180;
-
+function createPolarClipPath(polar, hasAnimation, seriesModel) {
+ var sectorArea = polar.getArea();
// Avoid float number rounding error for symbol on the edge of axis extent.
- if (forSymbol) {
- radiusExtent[0] -= 0.5;
- radiusExtent[1] += 0.5;
- }
var clipPath = new Sector({
shape: {
cx: round$1(polar.cx, 1),
cy: round$1(polar.cy, 1),
- r0: round$1(radiusExtent[0], 1),
- r: round$1(radiusExtent[1], 1),
- startAngle: -angleExtent[0] * RADIAN,
- endAngle: -angleExtent[1] * RADIAN,
- clockwise: angleAxis.inverse
+ r0: round$1(sectorArea.r0, 1),
+ r: round$1(sectorArea.r, 1),
+ startAngle: sectorArea.startAngle,
+ endAngle: sectorArea.endAngle,
+ clockwise: sectorArea.clockwise
}
});
if (hasAnimation) {
- clipPath.shape.endAngle = -angleExtent[0] * RADIAN;
+ clipPath.shape.endAngle = sectorArea.startAngle;
initProps(clipPath, {
shape: {
- endAngle: -angleExtent[1] * RADIAN
+ endAngle: sectorArea.endAngle
}
}, seriesModel);
}
-
return clipPath;
}
-function createClipShape(coordSys, hasAnimation, forSymbol, seriesModel) {
- return coordSys.type === 'polar'
- ? createPolarClipShape(coordSys, hasAnimation, forSymbol, seriesModel)
- : createGridClipShape(coordSys, hasAnimation, forSymbol, seriesModel);
+function createClipPath(coordSys, hasAnimation, seriesModel) {
+ if (!coordSys) {
+ return null;
+ }
+ else if (coordSys.type === 'polar') {
+ return createPolarClipPath(coordSys, hasAnimation, seriesModel);
+ }
+ else if (coordSys.type === 'cartesian2d') {
+ return createGridClipPath(coordSys, hasAnimation, seriesModel);
+ }
+ return null;
+}
+
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+// FIXME step not support polar
+
+function isPointsSame(points1, points2) {
+ if (points1.length !== points2.length) {
+ return;
+ }
+ for (var i = 0; i < points1.length; i++) {
+ var p1 = points1[i];
+ var p2 = points2[i];
+ if (p1[0] !== p2[0] || p1[1] !== p2[1]) {
+ return;
+ }
+ }
+ return true;
+}
+
+function getSmooth(smooth) {
+ return typeof (smooth) === 'number' ? smooth : (smooth ? 0.5 : 0);
+}
+
+/**
+ * @param {module:echarts/coord/cartesian/Cartesian2D|module:echarts/coord/polar/Polar} coordSys
+ * @param {module:echarts/data/List} data
+ * @param {Object} dataCoordInfo
+ * @param {Array.<Array.<number>>} points
+ */
+function getStackedOnPoints(coordSys, data, dataCoordInfo) {
+ if (!dataCoordInfo.valueDim) {
+ return [];
+ }
+
+ var points = [];
+ for (var idx = 0, len = data.count(); idx < len; idx++) {
+ points.push(getStackedOnPoint(dataCoordInfo, coordSys, data, idx));
+ }
+
+ return points;
}
function turnPointsIntoStep(points, coordSys, stepTurnAt) {
@@ -37938,6 +38092,31 @@ function canShowAllSymbolForCategory(categoryAxis, data) {
return true;
}
+function createLineClipPath(coordSys, hasAnimation, seriesModel) {
+ if (coordSys.type === 'cartesian2d') {
+ var isHorizontal = coordSys.getBaseAxis().isHorizontal();
+ var clipPath = createGridClipPath(coordSys, hasAnimation, seriesModel);
+ // Expand clip shape to avoid clipping when line value exceeds axis
+ if (!seriesModel.get('clip', true)) {
+ var rectShape = clipPath.shape;
+ var expandSize = Math.max(rectShape.width, rectShape.height);
+ if (isHorizontal) {
+ rectShape.y -= expandSize;
+ rectShape.height += expandSize * 2;
+ }
+ else {
+ rectShape.x -= expandSize;
+ rectShape.width += expandSize * 2;
+ }
+ }
+ return clipPath;
+ }
+ else {
+ return createPolarClipPath(coordSys, hasAnimation, seriesModel);
+ }
+
+}
+
Chart.extend({
type: 'line',
@@ -38002,13 +38181,29 @@ Chart.extend({
// FIXME step not support polar
var step = !isCoordSysPolar && seriesModel.get('step');
+ var clipShapeForSymbol;
+ if (coordSys && coordSys.getArea) {
+ clipShapeForSymbol = coordSys.getArea();
+ // Avoid float number rounding error for symbol on the edge of axis extent.
+ // See #7913 and `test/dataZoom-clip.html`.
+ if (clipShapeForSymbol.width != null) {
+ clipShapeForSymbol.x -= 0.1;
+ clipShapeForSymbol.y -= 0.1;
+ clipShapeForSymbol.width += 0.2;
+ clipShapeForSymbol.height += 0.2;
+ }
+ else if (clipShapeForSymbol.r0) {
+ clipShapeForSymbol.r0 -= 0.5;
+ clipShapeForSymbol.r1 += 0.5;
+ }
+ }
// Initialization animation or coordinate system changed
if (
!(polyline && prevCoordSys.type === coordSys.type && step === this._step)
) {
showSymbol && symbolDraw.updateData(data, {
isIgnore: isIgnoreFunc,
- clipShape: createClipShape(coordSys, false, true, seriesModel)
+ clipShape: clipShapeForSymbol
});
if (step) {
@@ -38024,7 +38219,7 @@ Chart.extend({
coordSys, hasAnimation
);
}
- lineGroup.setClipPath(createClipShape(coordSys, true, false, seriesModel));
+ lineGroup.setClipPath(createLineClipPath(coordSys, true, seriesModel));
}
else {
if (isAreaChart && !polygon) {
@@ -38041,13 +38236,13 @@ Chart.extend({
}
// Update clipPath
- lineGroup.setClipPath(createClipShape(coordSys, false, false, seriesModel));
+ lineGroup.setClipPath(createLineClipPath(coordSys, false, seriesModel));
// Always update, or it is wrong in the case turning on legend
// because points are not changed
showSymbol && symbolDraw.updateData(data, {
isIgnore: isIgnoreFunc,
- clipShape: createClipShape(coordSys, false, true, seriesModel)
+ clipShape: clipShapeForSymbol
});
// Stop symbol animation and sync with line points
@@ -38349,12 +38544,12 @@ Chart.extend({
}
});
- this._polyline
- = this._polygon
- = this._coordSys
- = this._points
- = this._stackedOnPoints
- = this._data = null;
+ this._polyline =
+ this._polygon =
+ this._coordSys =
+ this._points =
+ this._stackedOnPoints =
+ this._data = null;
}
});
@@ -38894,6 +39089,23 @@ Cartesian2D.prototype = {
*/
getOtherAxis: function (axis) {
return this.getAxis(axis.dim === 'x' ? 'y' : 'x');
+ },
+
+ /**
+ * Get rect area of cartesian.
+ * Area will have a contain function to determine if a point is in the coordinate system.
+ * @return {BoundingRect}
+ */
+ getArea: function () {
+ var xExtent = this.getAxis('x').getGlobalExtent();
+ var yExtent = this.getAxis('y').getGlobalExtent();
+ var x = Math.min(xExtent[0], xExtent[1]);
+ var y = Math.min(yExtent[0], yExtent[1]);
+ var width = Math.max(xExtent[0], xExtent[1]) - x;
+ var height = Math.max(yExtent[0], yExtent[1]) - y;
+
+ var rect = new BoundingRect(x, y, width, height);
+ return rect;
}
};
@@ -41817,8 +42029,13 @@ BaseBarSeries.extend({
progressiveThreshold = largeThreshold;
}
return progressiveThreshold;
- }
+ },
+ defaultOption: {
+ // If clipped
+ // Only available on cartesian2d
+ clip: true
+ }
});
/*
@@ -41939,6 +42156,29 @@ var _eventPos = [0, 0];
// Just for compatible with ec2.
extend(Model.prototype, barItemStyle);
+function getClipArea(coord, data) {
+ var coordSysClipArea = coord.getArea && coord.getArea();
+ if (coord.type === 'cartesian2d') {
+ var baseAxis = coord.getBaseAxis();
+ // When boundaryGap is false or using time axis. bar may exceed the grid.
+ // We should not clip this part.
+ // See test/bar2.html
+ if (baseAxis.type !== 'category' || !baseAxis.onBand) {
+ var expandWidth = data.getLayout('bandWidth');
+ if (baseAxis.isHorizontal()) {
+ coordSysClipArea.x -= expandWidth;
+ coordSysClipArea.width += expandWidth * 2;
+ }
+ else {
+ coordSysClipArea.y -= expandWidth;
+ coordSysClipArea.height += expandWidth * 2;
+ }
+ }
+ }
+
+ return coordSysClipArea;
+}
+
extendChartView({
type: 'bar',
@@ -41998,6 +42238,13 @@ extendChartView({
var animationModel = seriesModel.isAnimationEnabled() ? seriesModel : null;
+ var needsClip = seriesModel.get('clip', true);
+ var coordSysClipArea = getClipArea(coord, data);
+ // If there is clipPath created in large mode. Remove it.
+ group.removeClipPath();
+ // We don't use clipPath in normal mode because we needs a perfect animation
+ // And don't want the label are clipped.
+
data.diff(oldData)
.add(function (dataIndex) {
if (!data.hasValue(dataIndex)) {
@@ -42006,6 +42253,17 @@ extendChartView({
var itemModel = data.getItemModel(dataIndex);
var layout = getLayout[coord.type](data, dataIndex, itemModel);
+
+ if (needsClip) {
+ // Clip will modify the layout params.
+ // And return a boolean to determine if the shape are fully clipped.
+ var isClipped = clip[coord.type](coordSysClipArea, layout);
+ if (isClipped) {
+ group.remove(el);
+ return;
+ }
+ }
+
var el = elementCreator[coord.type](
data, dataIndex, itemModel, layout, isHorizontalOrRadial, animationModel
);
@@ -42028,6 +42286,14 @@ extendChartView({
var itemModel = data.getItemModel(newIndex);
var layout = getLayout[coord.type](data, newIndex, itemModel);
+ if (needsClip) {
+ var isClipped = clip[coord.type](coordSysClipArea, layout);
+ if (isClipped) {
+ group.remove(el);
+ return;
+ }
+ }
+
if (el) {
updateProps(el, {shape: layout}, animationModel, newIndex);
}
@@ -42063,6 +42329,17 @@ extendChartView({
_renderLarge: function (seriesModel, ecModel, api) {
this._clear();
createLarge(seriesModel, this.group);
+
+ // Use clipPath in large mode.
+ var clipPath = seriesModel.get('clip', true)
+ ? createClipPath(seriesModel.coordinateSystem, false, seriesModel)
+ : null;
+ if (clipPath) {
+ this.group.setClipPath(clipPath);
+ }
+ else {
+ this.group.removeClipPath();
+ }
},
_incrementalRenderLarge: function (params, seriesModel) {
@@ -42096,6 +42373,53 @@ extendChartView({
});
+var mathMax$4 = Math.max;
+var mathMin$4 = Math.min;
+
+var clip = {
+ cartesian2d: function (coordSysBoundingRect, layout) {
+ var signWidth = layout.width < 0 ? -1 : 1;
+ var signHeight = layout.height < 0 ? -1 : 1;
+ // Needs positive width and height
+ if (signWidth < 0) {
+ layout.x += layout.width;
+ layout.width = -layout.width;
+ }
+ if (signHeight < 0) {
+ layout.y += layout.height;
+ layout.height = -layout.height;
+ }
+
+ var x = mathMax$4(layout.x, coordSysBoundingRect.x);
+ var x2 = mathMin$4(layout.x + layout.width, coordSysBoundingRect.x + coordSysBoundingRect.width);
+ var y = mathMax$4(layout.y, coordSysBoundingRect.y);
+ var y2 = mathMin$4(layout.y + layout.height, coordSysBoundingRect.y + coordSysBoundingRect.height);
+
+ layout.x = x;
+ layout.y = y;
+ layout.width = x2 - x;
+ layout.height = y2 - y;
+
+ var clipped = layout.width < 0 || layout.height < 0;
+
+ // Reverse back
+ if (signWidth < 0) {
+ layout.x += layout.width;
+ layout.width = -layout.width;
+ }
+ if (signHeight < 0) {
+ layout.y += layout.height;
+ layout.height = -layout.height;
+ }
+
+ return clipped;
+ },
+
+ polar: function (coordSysClipArea) {
+ return false;
+ }
+};
+
var elementCreator = {
cartesian2d: function (
@@ -42699,9 +43023,12 @@ var PieSeries = extendSeriesModel({
borderWidth: 1
},
- // Animation type canbe expansion, scale
+ // Animation type. Valid values: expansion, scale
animationType: 'expansion',
+ // Animation type when update. Valid values: transition, expansion
+ animationTypeUpdate: 'transition',
+
animationEasing: 'cubicOut'
}
});
@@ -42818,6 +43145,8 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
var sectorShape = extend({}, layout);
sectorShape.label = null;
+ var animationTypeUpdate = seriesModel.getShallow('animationTypeUpdate');
+
if (firstCreate) {
sector.setShape(sectorShape);
@@ -42842,9 +43171,16 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
}
else {
- updateProps(sector, {
- shape: sectorShape
- }, seriesModel, idx);
+ if (animationTypeUpdate === 'expansion') {
+ // Sectors are set to be target shape and an overlaying clipPath is used for animation
+ sector.setShape(sectorShape);
+ }
+ else {
+ // Transition animation from the old shape
+ updateProps(sector, {
+ shape: sectorShape
+ }, seriesModel, idx);
+ }
}
// Update common style
@@ -42873,7 +43209,9 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
seriesModel.get('animation')
);
- this._updateLabel(data, idx);
+ // Label and text animation should be applied only for transition type animation when update
+ var withAnimation = !firstCreate && animationTypeUpdate === 'transition';
+ this._updateLabel(data, idx, withAnimation);
this.highDownOnUpdate = (itemModel.get('hoverAnimation') && seriesModel.isAnimationEnabled())
? function (fromState, toState) {
@@ -42907,7 +43245,7 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
setHoverStyle(this);
};
-piePieceProto._updateLabel = function (data, idx) {
+piePieceProto._updateLabel = function (data, idx, withAnimation) {
var labelLine = this.childAt(1);
var labelText = this.childAt(2);
@@ -42924,20 +43262,33 @@ piePieceProto._updateLabel = function (data, idx) {
return;
}
- updateProps(labelLine, {
- shape: {
- points: labelLayout.linePoints || [
- [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y]
- ]
- }
- }, seriesModel, idx);
+ var targetLineShape = {
+ points: labelLayout.linePoints || [
+ [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y]
+ ]
+ };
+ var targetTextStyle = {
+ x: labelLayout.x,
+ y: labelLayout.y
+ };
+ if (withAnimation) {
+ updateProps(labelLine, {
+ shape: targetLineShape
+ }, seriesModel, idx);
+
+ updateProps(labelText, {
+ style: targetTextStyle
+ }, seriesModel, idx);
+ }
+ else {
+ labelLine.attr({
+ shape: targetLineShape
+ });
+ labelText.attr({
+ style: targetTextStyle
+ });
+ }
- updateProps(labelText, {
- style: {
- x: labelLayout.x,
- y: labelLayout.y
- }
- }, seriesModel, idx);
labelText.attr({
rotation: labelLayout.rotation,
origin: [labelLayout.x, labelLayout.y],
@@ -43015,6 +43366,7 @@ var PieView = Chart.extend({
var hasAnimation = ecModel.get('animation');
var isFirstRender = !oldData;
var animationType = seriesModel.get('animationType');
+ var animationTypeUpdate = seriesModel.get('animationTypeUpdate');
var onSectorClick = curry(
updateDataSelected, this.uid, seriesModel, hasAnimation, api
@@ -43040,6 +43392,12 @@ var PieView = Chart.extend({
.update(function (newIdx, oldIdx) {
var piePiece = oldData.getItemGraphicEl(oldIdx);
+ if (!isFirstRender && animationTypeUpdate !== 'transition') {
+ piePiece.eachChild(function (child) {
+ child.stopAnimation(true);
+ });
+ }
+
piePiece.updateData(data, newIdx);
piePiece.off('click');
@@ -43054,9 +43412,8 @@ var PieView = Chart.extend({
.execute();
if (
- hasAnimation && isFirstRender && data.count() > 0
- // Default expansion animation
- && animationType !== 'scale'
+ hasAnimation && data.count() > 0
+ && (isFirstRender ? animationType !== 'scale' : animationTypeUpdate !== 'transition')
) {
var shape = data.getItemLayout(0);
for (var s = 1; isNaN(shape.startAngle) && s < data.count(); ++s) {
@@ -43067,7 +43424,7 @@ var PieView = Chart.extend({
var removeClipPath = bind(group.removeClipPath, group);
group.setClipPath(this._createClipPath(
- shape.cx, shape.cy, r, shape.startAngle, shape.clockwise, removeClipPath, seriesModel
+ shape.cx, shape.cy, r, shape.startAngle, shape.clockwise, removeClipPath, seriesModel, isFirstRender
));
}
else {
@@ -43081,7 +43438,7 @@ var PieView = Chart.extend({
dispose: function () {},
_createClipPath: function (
- cx, cy, r, startAngle, clockwise, cb, seriesModel
+ cx, cy, r, startAngle, clockwise, cb, seriesModel, isFirstRender
) {
var clipPath = new Sector({
shape: {
@@ -43095,7 +43452,8 @@ var PieView = Chart.extend({
}
});
- initProps(clipPath, {
+ var initOrUpdate = isFirstRender ? initProps : updateProps;
+ initOrUpdate(clipPath, {
shape: {
endAngle: startAngle + (clockwise ? 1 : -1) * Math.PI * 2
}
@@ -43229,10 +43587,16 @@ var dataColor = function (seriesType) {
var singleDataColor = filteredIdx != null
&& data.getItemVisual(filteredIdx, 'color', true);
- if (!singleDataColor) {
+ var singleDataBorderColor = filteredIdx != null
+ && data.getItemVisual(filteredIdx, 'borderColor', true);
+
+ var itemModel;
+ if (!singleDataColor || !singleDataBorderColor) {
// FIXME Performance
- var itemModel = dataAll.getItemModel(rawIdx);
+ itemModel = dataAll.getItemModel(rawIdx);
+ }
+ if (!singleDataColor) {
var color = itemModel.get('itemStyle.color')
|| seriesModel.getColorFromPalette(
dataAll.getName(rawIdx) || (rawIdx + ''), seriesModel.__paletteScope,
@@ -43250,6 +43614,21 @@ var dataColor = function (seriesType) {
// Set data all color for legend
dataAll.setItemVisual(rawIdx, 'color', singleDataColor);
}
+
+ if (!singleDataBorderColor) {
+ var borderColor = itemModel.get('itemStyle.borderColor');
+ // Legend may use the visual info in data before processed
+ dataAll.setItemVisual(rawIdx, 'borderColor', borderColor);
+
+ // Data is not filtered
+ if (filteredIdx != null) {
+ data.setItemVisual(filteredIdx, 'borderColor', borderColor);
+ }
+ }
+ else {
+ // Set data all borderColor for legend
+ dataAll.setItemVisual(rawIdx, 'borderColor', singleDataBorderColor);
+ }
});
}
};
@@ -43846,7 +44225,11 @@ SeriesModel.extend({
itemStyle: {
opacity: 0.8
// color: 各异
- }
+ },
+
+ // If clip the overflow graphics
+ // Works on cartesian / polar series
+ clip: true
// progressive: null
}
@@ -43886,6 +44269,8 @@ var LargeSymbolPath = extendShape({
symbolProxy: null,
+ softClipShape: null,
+
buildPath: function (path, shape) {
var points = shape.points;
var size = shape.size;
@@ -43907,6 +44292,9 @@ var LargeSymbolPath = extendShape({
if (isNaN(x) || isNaN(y)) {
continue;
}
+ if (this.softClipShape && !this.softClipShape.contain(x, y)) {
+ continue;
+ }
symbolProxyShape.x = x - size[0] / 2;
symbolProxyShape.y = y - size[1] / 2;
@@ -43935,6 +44323,9 @@ var LargeSymbolPath = extendShape({
if (isNaN(x) || isNaN(y)) {
continue;
}
+ if (this.softClipShape && !this.softClipShape.contain(x, y)) {
+ continue;
+ }
// fillRect is faster than building a rect path and draw.
// And it support light globalCompositeOperation.
ctx.fillRect(
@@ -43986,8 +44377,10 @@ largeSymbolProto.isPersistent = function () {
/**
* Update symbols draw by new data
* @param {module:echarts/data/List} data
+ * @param {Object} opt
+ * @param {Object} [opt.clipShape]
*/
-largeSymbolProto.updateData = function (data) {
+largeSymbolProto.updateData = function (data, opt) {
this.group.removeAll();
var symbolEl = new LargeSymbolPath({
rectHover: true,
@@ -43997,7 +44390,7 @@ largeSymbolProto.updateData = function (data) {
symbolEl.setShape({
points: data.getLayout('symbolPoints')
});
- this._setCommon(symbolEl, data);
+ this._setCommon(symbolEl, data, false, opt);
this.group.add(symbolEl);
this._incremental = null;
@@ -44038,7 +44431,7 @@ largeSymbolProto.incrementalPrepareUpdate = function (data) {
}
};
-largeSymbolProto.incrementalUpdate = function (taskParams, data) {
+largeSymbolProto.incrementalUpdate = function (taskParams, data, opt) {
var symbolEl;
if (this._incremental) {
symbolEl = new LargeSymbolPath();
@@ -44058,12 +44451,13 @@ largeSymbolProto.incrementalUpdate = function (taskParams, data) {
symbolEl.setShape({
points: data.getLayout('symbolPoints')
});
- this._setCommon(symbolEl, data, !!this._incremental);
+ this._setCommon(symbolEl, data, !!this._incremental, opt);
};
-largeSymbolProto._setCommon = function (symbolEl, data, isIncremental) {
+largeSymbolProto._setCommon = function (symbolEl, data, isIncremental, opt) {
var hostModel = data.hostModel;
+ opt = opt || {};
// TODO
// if (data.hasItemVisual.symbolSize) {
// // TODO typed array?
@@ -44079,6 +44473,7 @@ largeSymbolProto._setCommon = function (symbolEl, data, isIncremental) {
symbolEl.setShape('size', (size instanceof Array) ? size : [size, size]);
// }
+ symbolEl.softClipShape = opt.clipShape || null;
// Create symbolProxy to build path for each data
symbolEl.symbolProxy = createSymbol(
data.getVisual('symbol'), 0, 0, 0, 0
@@ -44152,7 +44547,14 @@ extendChartView({
var data = seriesModel.getData();
var symbolDraw = this._updateSymbolDraw(data, seriesModel);
- symbolDraw.updateData(data);
+
+ symbolDraw.updateData(data, {
+ // TODO
+ // If this parameter should be a shape or a bounding volume
+ // shape will be more general.
+ // But bounding volume like bounding rect will be much faster in the contain calculation
+ clipShape: this._getClipShape(seriesModel)
+ });
this._finished = true;
},
@@ -44167,7 +44569,9 @@ extendChartView({
},
incrementalRender: function (taskParams, seriesModel, ecModel) {
- this._symbolDraw.incrementalUpdate(taskParams, seriesModel.getData());
+ this._symbolDraw.incrementalUpdate(taskParams, seriesModel.getData(), {
+ clipShape: this._getClipShape(seriesModel)
+ });
this._finished = taskParams.end === seriesModel.getData().count();
},
@@ -44193,6 +44597,12 @@ extendChartView({
}
},
+ _getClipShape: function (seriesModel) {
+ var coordSys = seriesModel.coordinateSystem;
+ var clipArea = coordSys && coordSys.getArea && coordSys.getArea();
+ return seriesModel.get('clip', true) ? clipArea : null;
+ },
+
_updateSymbolDraw: function (data, seriesModel) {
var symbolDraw = this._symbolDraw;
var pipelineContext = seriesModel.pipelineContext;
@@ -44425,7 +44835,7 @@ Radar.prototype.pointToData = function (pt) {
}
}
- return [closestAxisIdx, +(closestAxis && closestAxis.coodToData(radius))];
+ return [closestAxisIdx, +(closestAxis && closestAxis.coordToData(radius))];
};
Radar.prototype.resize = function (radarModel, api) {
@@ -46598,7 +47008,7 @@ function onIrrelevantElement(e, api, targetCoordSysModel) {
* under the License.
*/
-function getFixedItemStyle(model, scale) {
+function getFixedItemStyle(model) {
var itemStyle = model.getItemStyle();
var areaColor = model.get('areaColor');
@@ -46754,20 +47164,14 @@ MapDraw.prototype = {
var regionsGroup = this._regionsGroup;
var group = this.group;
- var scale = geo.scale;
- var transform = {
- position: geo.position,
- scale: scale
- };
-
- // No animation when first draw or in action
- if (!regionsGroup.childAt(0) || payload) {
- group.attr(transform);
- }
- else {
- updateProps(group, transform, mapOrGeoModel);
+ if (geo._roamTransformable.transform) {
+ group.transform = geo._roamTransformable.transform.slice();
+ group.decomposeTransform();
}
+ var scale = geo._rawTransformable.scale;
+ var position = geo._rawTransformable.position;
+
regionsGroup.removeAll();
var itemStyleAccessPath = ['itemStyle'];
@@ -46777,7 +47181,6 @@ MapDraw.prototype = {
var nameMap = createHashMap();
each$1(geo.regions, function (region) {
-
// Consider in GeoJson properties.name may be duplicated, for example,
// there is multiple region named "United Kindom" or "France" (so many
// colonies). And it is not appropriate to merge them in geo, which
@@ -46798,8 +47201,8 @@ MapDraw.prototype = {
var itemStyleModel = regionModel.getModel(itemStyleAccessPath);
var hoverItemStyleModel = regionModel.getModel(hoverItemStyleAccessPath);
- var itemStyle = getFixedItemStyle(itemStyleModel, scale);
- var hoverItemStyle = getFixedItemStyle(hoverItemStyleModel, scale);
+ var itemStyle = getFixedItemStyle(itemStyleModel);
+ var hoverItemStyle = getFixedItemStyle(hoverItemStyleModel);
var labelModel = regionModel.getModel(labelAccessPath);
var hoverLabelModel = regionModel.getModel(hoverLabelAccessPath);
@@ -46818,22 +47221,38 @@ MapDraw.prototype = {
}
}
+ var transformPoint = function (point) {
+ return [
+ point[0] * scale[0] + position[0],
+ point[1] * scale[1] + position[1]
+ ];
+ };
+
each$1(region.geometries, function (geometry) {
if (geometry.type !== 'polygon') {
return;
}
+ var points = [];
+ for (var i = 0; i < geometry.exterior.length; ++i) {
+ points.push(transformPoint(geometry.exterior[i]));
+ }
compoundPath.shape.paths.push(new Polygon({
segmentIgnoreThreshold: 1,
shape: {
- points: geometry.exterior
+ points: points
}
}));
- for (var i = 0; i < (geometry.interiors ? geometry.interiors.length : 0); i++) {
+ for (var i = 0; i < (geometry.interiors ? geometry.interiors.length : 0); ++i) {
+ var interior = geometry.interiors[i];
+ var points = [];
+ for (var j = 0; j < interior.length; ++j) {
+ points.push(transformPoint(interior[j]));
+ }
compoundPath.shape.paths.push(new Polygon({
segmentIgnoreThreshold: 1,
shape: {
- points: geometry.interiors[i]
+ points: points
}
}));
}
@@ -46842,6 +47261,7 @@ MapDraw.prototype = {
compoundPath.setStyle(itemStyle);
compoundPath.style.strokeNoScale = true;
compoundPath.culling = true;
+
// Label
var showLabel = labelModel.get('show');
var hoverShowLabel = hoverLabelModel.get('show');
@@ -46865,12 +47285,12 @@ MapDraw.prototype = {
}
var textEl = new Text({
- position: region.center.slice(),
+ position: transformPoint(region.center.slice()),
// FIXME
// label rotation is not support yet in geo or regions of series-map
// that has no data. The rotation will be effected by this `scale`.
// So needed to change to RectText?
- scale: [1 / scale[0], 1 / scale[1]],
+ scale: [1 / group.scale[0], 1 / group.scale[1]],
z2: 10,
silent: true
});
@@ -49203,7 +49623,9 @@ SeriesModel.extend({
// the layout of the tree, two value can be selected, 'orthogonal' or 'radial'
layout: 'orthogonal',
- roam: false, // true | false | 'move' | 'scale', see module:component/helper/RoamController.
+ // true | false | 'move' | 'scale', see module:component/helper/RoamController.
+ roam: false,
+
// Symbol size scale ratio in roam
nodeScaleRatio: 0.4,
@@ -49656,7 +50078,7 @@ extendChartView({
group.attr('position', [layoutInfo.x, layoutInfo.y]);
}
- this._updateViewCoordSys(seriesModel);
+ this._updateViewCoordSys(seriesModel, layoutInfo, layout);
this._updateController(seriesModel, ecModel, api);
var oldData = this._data;
@@ -49732,14 +50154,20 @@ extendChartView({
var min = [];
var max = [];
fromPoints(points, min, max);
+
+ // If don't Store min max when collapse the root node after roam,
+ // the root node will disappear.
+ var oldMin = this._min;
+ var oldMax = this._max;
+
// If width or height is 0
if (max[0] - min[0] === 0) {
- max[0] += 1;
- min[0] -= 1;
+ min[0] = oldMin ? oldMin[0] : min[0] - 1;
+ max[0] = oldMax ? oldMax[0] : max[0] + 1;
}
if (max[1] - min[1] === 0) {
- max[1] += 1;
- min[1] -= 1;
+ min[1] = oldMin ? oldMin[1] : min[1] - 1;
+ max[1] = oldMax ? oldMax[1] : max[1] + 1;
}
var viewCoordSys = seriesModel.coordinateSystem = new View();
@@ -49757,6 +50185,8 @@ extendChartView({
});
this._viewCoordSys = viewCoordSys;
+ this._min = min;
+ this._max = max;
},
_updateController: function (seriesModel, ecModel, api) {
@@ -50101,7 +50531,6 @@ registerAction({
var tree = seriesModel.getData().tree;
var node = tree.getNodeByDataIndex(dataIndex);
node.isExpand = !node.isExpand;
-
});
});
@@ -52956,8 +53385,8 @@ function mapVisual$1(nodeModel, visuals, child, index, mapping, seriesModel) {
* </licenses/LICENSE-d3>).
*/
-var mathMax$4 = Math.max;
-var mathMin$4 = Math.min;
+var mathMax$5 = Math.max;
+var mathMin$5 = Math.min;
var retrieveValue = retrieve;
var each$10 = each$1;
@@ -53119,8 +53548,8 @@ function squarify(node, options, hideChildren, depth) {
upperLabelHeight: upperLabelHeight
}, true);
- width = mathMax$4(width - 2 * layoutOffset, 0);
- height = mathMax$4(height - layoutOffset - layoutOffsetUpper, 0);
+ width = mathMax$5(width - 2 * layoutOffset, 0);
+ height = mathMax$5(height - layoutOffset - layoutOffsetUpper, 0);
var totalArea = width * height;
var viewChildren = initChildren(
@@ -53132,7 +53561,7 @@ function squarify(node, options, hideChildren, depth) {
}
var rect = {x: layoutOffset, y: layoutOffsetUpper, width: width, height: height};
- var rowFixedLength = mathMin$4(width, height);
+ var rowFixedLength = mathMin$5(width, height);
var best = Infinity; // the best row score so far
var row = [];
row.area = 0;
@@ -53153,7 +53582,7 @@ function squarify(node, options, hideChildren, depth) {
else {
row.area -= row.pop().getLayout().area;
position(row, rowFixedLength, rect, halfGapWidth, false);
- rowFixedLength = mathMin$4(rect.width, rect.height);
+ rowFixedLength = mathMin$5(rect.width, rect.height);
row.length = row.area = 0;
best = Infinity;
}
@@ -53340,7 +53769,7 @@ function worst(row, rowFixedLength, ratio) {
var f = rowFixedLength * rowFixedLength * ratio;
return squareArea
- ? mathMax$4(
+ ? mathMax$5(
(f * areaMax) / squareArea,
squareArea / (f * areaMin)
)
@@ -53378,15 +53807,15 @@ function position(row, rowFixedLength, rect, halfGapWidth, flush) {
var step = rowOtherLength
? node.getLayout().area / rowOtherLength : 0;
- var wh1 = nodeLayout[wh[idx1WhenH]] = mathMax$4(rowOtherLength - 2 * halfGapWidth, 0);
+ var wh1 = nodeLayout[wh[idx1WhenH]] = mathMax$5(rowOtherLength - 2 * halfGapWidth, 0);
// We use Math.max/min to avoid negative width/height when considering gap width.
var remain = rect[xy[idx0WhenH]] + rect[wh[idx0WhenH]] - last;
var modWH = (i === rowLen - 1 || remain < step) ? remain : step;
- var wh0 = nodeLayout[wh[idx0WhenH]] = mathMax$4(modWH - 2 * halfGapWidth, 0);
+ var wh0 = nodeLayout[wh[idx0WhenH]] = mathMax$5(modWH - 2 * halfGapWidth, 0);
- nodeLayout[xy[idx1WhenH]] = rect[xy[idx1WhenH]] + mathMin$4(halfGapWidth, wh1 / 2);
- nodeLayout[xy[idx0WhenH]] = last + mathMin$4(halfGapWidth, wh0 / 2);
+ nodeLayout[xy[idx1WhenH]] = rect[xy[idx1WhenH]] + mathMin$5(halfGapWidth, wh1 / 2);
+ nodeLayout[xy[idx0WhenH]] = last + mathMin$5(halfGapWidth, wh0 / 2);
last += modWH;
node.setLayout(nodeLayout, true);
@@ -56943,7 +57372,7 @@ var GaugeView = Chart.extend({
var prevEndAngle = startAngle;
var axisLineWidth = lineStyleModel.get('width');
var showAxis = axisLineModel.get('show');
-
+
for (var i = 0; showAxis && i < colorList.length; i++) {
// Clamp
var percent = Math.min(Math.max(colorList[i][0], 0), 1);
@@ -57733,7 +58162,7 @@ function labelLayout$1(data) {
x2 = x1 - labelLineLen;
textX = x2 - 5;
textAlign = 'right';
- }
+ }
else if (labelPosition === 'right') {
// Right side
x1 = (points[1][0] + points[2][0]) / 2;
@@ -57741,7 +58170,7 @@ function labelLayout$1(data) {
x2 = x1 + labelLineLen;
textX = x2 + 5;
textAlign = 'left';
- }
+ }
else if (labelPosition === 'rightTop') {
// RightTop side
x1 = points[1][0];
@@ -57749,7 +58178,7 @@ function labelLayout$1(data) {
x2 = x1 + labelLineLen;
textX = x2 + 5;
textAlign = 'top';
- }
+ }
else if (labelPosition === 'rightBottom') {
// RightBottom side
x1 = points[2][0];
@@ -57757,7 +58186,7 @@ function labelLayout$1(data) {
x2 = x1 + labelLineLen;
textX = x2 + 5;
textAlign = 'bottom';
- }
+ }
else if (labelPosition === 'leftTop') {
// LeftTop side
x1 = points[0][0];
@@ -57765,7 +58194,7 @@ function labelLayout$1(data) {
x2 = x1 - labelLineLen;
textX = x2 - 5;
textAlign = 'right';
- }
+ }
else if (labelPosition === 'leftBottom') {
// LeftBottom side
x1 = points[3][0];
@@ -57773,7 +58202,7 @@ function labelLayout$1(data) {
x2 = x1 - labelLineLen;
textX = x2 - 5;
textAlign = 'right';
- }
+ }
else {
// Right side
x1 = (points[1][0] + points[2][0]) / 2;
@@ -58175,8 +58604,8 @@ function restrict$1(value, extend) {
*/
var each$11 = each$1;
-var mathMin$5 = Math.min;
-var mathMax$5 = Math.max;
+var mathMin$6 = Math.min;
+var mathMax$6 = Math.max;
var mathFloor$2 = Math.floor;
var mathCeil$2 = Math.ceil;
var round$2 = round$1;
@@ -58627,8 +59056,8 @@ Parallel.prototype = {
else {
var winSize = axisExpandWindow[1] - axisExpandWindow[0];
var pos = extent[1] * pointCoord / winSize;
- axisExpandWindow = [mathMax$5(0, pos - winSize / 2)];
- axisExpandWindow[1] = mathMin$5(extent[1], axisExpandWindow[0] + winSize);
+ axisExpandWindow = [mathMax$6(0, pos - winSize / 2)];
+ axisExpandWindow[1] = mathMin$6(extent[1], axisExpandWindow[0] + winSize);
axisExpandWindow[0] = axisExpandWindow[1] - winSize;
}
@@ -58640,7 +59069,7 @@ Parallel.prototype = {
};
function restrict(len, extent) {
- return mathMin$5(mathMax$5(len, extent[0]), extent[1]);
+ return mathMin$6(mathMax$6(len, extent[0]), extent[1]);
}
function layoutAxisWithoutExpand(axisIndex, layoutInfo) {
@@ -59095,8 +59524,8 @@ registerAction('parallelAxisExpand', function (payload, ecModel) {
var curry$2 = curry;
var each$12 = each$1;
var map$2 = map;
-var mathMin$6 = Math.min;
-var mathMax$6 = Math.max;
+var mathMin$7 = Math.min;
+var mathMax$7 = Math.max;
var mathPow$2 = Math.pow;
var COVER_Z = 10000;
@@ -59615,7 +60044,7 @@ function createBaseRectCover(doDrift, controller, brushOption, edgeNames) {
function updateBaseRect(controller, cover, localRange, brushOption) {
var lineWidth = brushOption.brushStyle.lineWidth || 0;
- var handleSize = mathMax$6(lineWidth, MIN_RESIZE_LINE_WIDTH);
+ var handleSize = mathMax$7(lineWidth, MIN_RESIZE_LINE_WIDTH);
var x = localRange[0][0];
var y = localRange[1][0];
var xa = x - lineWidth / 2;
@@ -59682,8 +60111,8 @@ function makeStyle(brushOption) {
}
function formatRectRange(x, y, x2, y2) {
- var min = [mathMin$6(x, x2), mathMin$6(y, y2)];
- var max = [mathMax$6(x, x2), mathMax$6(y, y2)];
+ var min = [mathMin$7(x, x2), mathMin$7(y, y2)];
+ var max = [mathMax$7(x, x2), mathMax$7(y, y2)];
return [
[min[0], max[0]], // x range
@@ -59763,10 +60192,10 @@ function clipByPanel(controller, cover, data) {
}
function pointsToRect(points) {
- var xmin = mathMin$6(points[0][0], points[1][0]);
- var ymin = mathMin$6(points[0][1], points[1][1]);
- var xmax = mathMax$6(points[0][0], points[1][0]);
- var ymax = mathMax$6(points[0][1], points[1][1]);
+ var xmin = mathMin$7(points[0][0], points[1][0]);
+ var ymin = mathMin$7(points[0][1], points[1][1]);
+ var xmax = mathMax$7(points[0][0], points[1][0]);
+ var ymax = mathMax$7(points[0][1], points[1][1]);
return {
x: xmin,
@@ -60042,8 +60471,8 @@ function getLineRenderer(xyIndex) {
},
getCreatingRange: function (localTrack) {
var ends = getTrackEnds(localTrack);
- var min = mathMin$6(ends[0][xyIndex], ends[1][xyIndex]);
- var max = mathMax$6(ends[0][xyIndex], ends[1][xyIndex]);
+ var min = mathMin$7(ends[0][xyIndex], ends[1][xyIndex]);
+ var max = mathMax$7(ends[0][xyIndex], ends[1][xyIndex]);
return [min, max];
},
@@ -60664,7 +61093,7 @@ var ParallelView = Chart.extend({
// First create
if (!this._initialized) {
this._initialized = true;
- var clipPath = createGridClipShape$1(
+ var clipPath = createGridClipShape(
coordSys, seriesModel, function () {
// Callback will be invoked immediately if there is no animation
setTimeout(function () {
@@ -60737,7 +61166,7 @@ var ParallelView = Chart.extend({
}
});
-function createGridClipShape$1(coordSys, seriesModel, cb) {
+function createGridClipShape(coordSys, seriesModel, cb) {
var parallelModel = coordSys.model;
var rect = coordSys.getRect();
var rectEl = new Rect({
@@ -61450,7 +61879,7 @@ extendChartView({
});
if (!this._data && seriesModel.get('animation')) {
- group.setClipPath(createGridClipShape$2(group.getBoundingRect(), seriesModel, function () {
+ group.setClipPath(createGridClipShape$1(group.getBoundingRect(), seriesModel, function () {
group.removeClipPath();
}));
}
@@ -61532,7 +61961,7 @@ extendChartView({
});
// Add animation to the view
-function createGridClipShape$2(rect, seriesModel, cb) {
+function createGridClipShape$1(rect, seriesModel, cb) {
var rectEl = new Rect({
shape: {
x: rect.x - 10,
@@ -61572,7 +62001,7 @@ function createGridClipShape$2(rect, seriesModel, cb) {
registerAction({
type: 'dragNode',
- event: 'dragNode',
+ event: 'dragnode',
// here can only use 'update' now, other value is not support in echarts.
update: 'update'
}, function (payload, ecModel) {
@@ -63463,7 +63892,7 @@ var candlestickLayout = {
function largeProgress(params, data) {
// Structure: [sign, x, yhigh, ylow, sign, x, yhigh, ylow, ...]
- var points = new LargeArr$1(params.count * 5);
+ var points = new LargeArr$1(params.count * 4);
var offset = 0;
var point;
var tmpIn = [];
@@ -63479,7 +63908,7 @@ var candlestickLayout = {
if (isNaN(axisDimVal) || isNaN(lowestVal) || isNaN(highestVal)) {
points[offset++] = NaN;
- offset += 4;
+ offset += 3;
continue;
}
@@ -63682,13 +64111,14 @@ function normalizeSymbolSize$1(symbolSize) {
}
function updateRipplePath(rippleGroup, effectCfg) {
+ var color = effectCfg.rippleEffectColor || effectCfg.color;
rippleGroup.eachChild(function (ripplePath) {
ripplePath.attr({
z: effectCfg.z,
zlevel: effectCfg.zlevel,
style: {
- stroke: effectCfg.brushType === 'stroke' ? effectCfg.color : null,
- fill: effectCfg.brushType === 'fill' ? effectCfg.color : null
+ stroke: effectCfg.brushType === 'stroke' ? color : null,
+ fill: effectCfg.brushType === 'fill' ? color : null
}
});
});
@@ -63725,9 +64155,6 @@ effectSymbolProto.startEffectAnimation = function (effectCfg) {
var rippleGroup = this.childAt(1);
for (var i = 0; i < EFFECT_RIPPLE_NUMBER; i++) {
- // var ripplePath = createSymbol(
- // symbolType, -0.5, -0.5, 1, 1, color
- // );
// If width/height are set too small (e.g., set to 1) on ios10
// and macOS Sierra, a circle stroke become a rect, no matter what
// the scale is set. So we set width/height as 2. See #4136.
@@ -63842,6 +64269,7 @@ effectSymbolProto.updateData = function (data, idx) {
effectCfg.zlevel = itemModel.getShallow('zlevel') || 0;
effectCfg.symbolType = symbolType;
effectCfg.color = color;
+ effectCfg.rippleEffectColor = itemModel.get('rippleEffect.color');
this.off('mouseover').off('mouseout').off('emphasis').off('normal');
@@ -64281,6 +64709,10 @@ var LinesSeries = SeriesModel.extend({
// polyline not support curveness, label, animation
polyline: false,
+ // If clip the overflow.
+ // Available when coordinateSystem is cartesian or polar.
+ clip: true,
+
label: {
show: false,
position: 'end'
@@ -65116,6 +65548,16 @@ extendChartView({
lineDraw.updateData(data);
+ var clipPath = seriesModel.get('clip', true) && createClipPath(
+ seriesModel.coordinateSystem, false, seriesModel
+ );
+ if (clipPath) {
+ this.group.setClipPath(clipPath);
+ }
+ else {
+ this.group.removeClipPath();
+ }
+
this._lastZlevel = zlevel;
this._finished = true;
@@ -67248,9 +67690,8 @@ function layout$2(axisModel, opt) {
var directionMap = {top: -1, bottom: 1, right: 1, left: -1};
- layout.labelDirection = layout.tickDirection
- = layout.nameDirection
- = directionMap[axisPosition];
+ layout.labelDirection = layout.tickDirection =
+ layout.nameDirection = directionMap[axisPosition];
if (axisModel.get('axisTick.inside')) {
layout.tickDirection = -layout.tickDirection;
@@ -68409,8 +68850,8 @@ BaseAxisPointer.prototype = {
}
this._lastGraphicKey = graphicKey;
- var moveAnimation = this._moveAnimation
- = this.determineAnimation(axisModel, axisPointerModel);
+ var moveAnimation = this._moveAnimation =
+ this.determineAnimation(axisModel, axisPointerModel);
if (!group) {
group = this._group = new Group();
@@ -69220,8 +69661,8 @@ registerPreprocessor(function (option) {
registerProcessor(PRIORITY.PROCESSOR.STATISTIC, function (ecModel, api) {
// Build axisPointerModel, mergin tooltip.axisPointer model for each axis.
// allAxesInfo should be updated when setOption performed.
- ecModel.getComponent('axisPointer').coordSysAxesInfo
- = collect(ecModel, api);
+ ecModel.getComponent('axisPointer').coordSysAxesInfo =
+ collect(ecModel, api);
});
// Broadcast to all views.
@@ -69777,7 +70218,7 @@ extendChartView({
layerGroup.add(text);
group.add(layerGroup);
- polygon.setClipPath(createGridClipShape$3(polygon.getBoundingRect(), seriesModel, function () {
+ polygon.setClipPath(createGridClipShape$2(polygon.getBoundingRect(), seriesModel, function () {
polygon.removeClipPath();
}));
}
@@ -69830,7 +70271,7 @@ extendChartView({
});
// add animation to the view
-function createGridClipShape$3(rect, seriesModel, cb) {
+function createGridClipShape$2(rect, seriesModel, cb) {
var rectEl = new Rect({
shape: {
x: rect.x - 10,
@@ -70570,7 +71011,8 @@ SunburstPieceProto._updateLabel = function (seriesModel, visualColor, state) {
else if (rotate < -Math.PI / 2) {
rotate += Math.PI;
}
- } else if (typeof rotateType === 'number') {
+ }
+ else if (typeof rotateType === 'number') {
rotate = rotateType * Math.PI / 180;
}
label.attr('rotation', rotate);
@@ -71052,6 +71494,7 @@ registerAction(
*/
+// var PI2 = Math.PI * 2;
var RADIAN$2 = Math.PI / 180;
var sunburstLayout = function (seriesType, ecModel, api, payload) {
@@ -71104,6 +71547,9 @@ var sunburstLayout = function (seriesType, ecModel, api, payload) {
var stillShowZeroSum = seriesModel.get('stillShowZeroSum');
// In the case some sector angle is smaller than minAngle
+ // var restAngle = PI2;
+ // var valueSumLargerThanMinAngle = 0;
+
var dir = clockwise ? 1 : -1;
/**
@@ -71126,11 +71572,11 @@ var sunburstLayout = function (seriesType, ecModel, api, payload) {
? unitRadian : (value * unitRadian);
if (angle < minAngle) {
angle = minAngle;
-
- }
- else {
-
+ // restAngle -= minAngle;
}
+ // else {
+ // valueSumLargerThanMinAngle += value;
+ // }
endAngle = startAngle + dir * angle;
@@ -71595,7 +72041,13 @@ SeriesModel.extend({
z: 2,
legendHoverLink: true,
- useTransform: true
+ useTransform: true,
+
+ // Custom series will not clip by default.
+ // Some case will use custom series to draw label
+ // For example https://echarts.apache.org/examples/en/editor.html?c=custom-gantt-flight
+ // Only works on polar and cartesian2d coordinate system.
+ clip: false
// Cartesian coordinate system
// xAxisIndex: 0,
@@ -71674,6 +72126,17 @@ Chart.extend({
})
.execute();
+ // Do clipping
+ var clipPath = customSeries.get('clip', true)
+ ? createClipPath(customSeries.coordinateSystem, false, customSeries)
+ : null;
+ if (clipPath) {
+ group.setClipPath(clipPath);
+ }
+ else {
+ group.removeClipPath();
+ }
+
this._data = data;
},
@@ -71728,6 +72191,8 @@ function createEl(elOption) {
var graphicType = elOption.type;
var el;
+ // Those graphic elements are not shapes. They should not be
+ // overwritten by users, so do them first.
if (graphicType === 'path') {
var shape = elOption.shape;
// Using pathRect brings convenience to users sacle svg path.
@@ -71752,8 +72217,14 @@ function createEl(elOption) {
el = new Text({});
el.__customText = elOption.style.text;
}
+ else if (graphicType === 'group') {
+ el = new Group();
+ }
+ else if (graphicType === 'compoundPath') {
+ throw new Error('"compoundPath" is not supported yet.');
+ }
else {
- var Clz = graphic[graphicType.charAt(0).toUpperCase() + graphicType.slice(1)];
+ var Clz = getShapeClass(graphicType);
if (__DEV__) {
assert$1(Clz, 'graphic type "' + graphicType + '" can not be found.');
@@ -71833,19 +72304,11 @@ function updateEl(el, dataIndex, elOption, animatableModel, data, isInit, isRoot
// If `elOption.styleEmphasis` is `false`, remove hover style. The
// logic is ensured by `graphicUtil.setElementHoverStyle`.
var styleEmphasis = elOption.styleEmphasis;
- var disableStyleEmphasis = styleEmphasis === false;
- if (!(
- // Try to escapse setting hover style for performance.
- (el.__cusHasEmphStl && styleEmphasis == null)
- || (!el.__cusHasEmphStl && disableStyleEmphasis)
- )) {
- // Should not use graphicUtil.setHoverStyle, since the styleEmphasis
- // should not be share by group and its descendants.
- setElementHoverStyle(el, styleEmphasis);
- el.__cusHasEmphStl = !disableStyleEmphasis;
- }
+ // hoverStyle should always be set here, because if the hover style
+ // may already be changed, where the inner cache should be reset.
+ setElementHoverStyle(el, styleEmphasis);
if (isRoot) {
- setAsHighDownDispatcher(el, !disableStyleEmphasis);
+ setAsHighDownDispatcher(el, styleEmphasis !== false);
}
}
@@ -72368,8 +72831,7 @@ function barLayoutPolar(seriesType, ecModel, api) {
var axisKey = getAxisKey$1(polar, baseAxis);
var stackId = getSeriesStackId$1(seriesModel);
- var columnLayoutInfo
- = barWidthAndOffset[axisKey][stackId];
+ var columnLayoutInfo = barWidthAndOffset[axisKey][stackId];
var columnOffset = columnLayoutInfo.offset;
var columnWidth = columnLayoutInfo.width;
var valueAxis = polar.getOtherAxis(baseAxis);
@@ -73031,6 +73493,44 @@ Polar.prototype = {
var y = -Math.sin(radian) * radius + this.cy;
return [x, y];
+ },
+
+ /**
+ * Get ring area of cartesian.
+ * Area will have a contain function to determine if a point is in the coordinate system.
+ * @return {Ring}
+ */
+ getArea: function () {
+
+ var angleAxis = this.getAngleAxis();
+ var radiusAxis = this.getRadiusAxis();
+
+ var radiusExtent = radiusAxis.getExtent().slice();
+ radiusExtent[0] > radiusExtent[1] && radiusExtent.reverse();
+ var angleExtent = angleAxis.getExtent();
+
+ var RADIAN = Math.PI / 180;
+
+ return {
+ cx: this.cx,
+ cy: this.cy,
+ r0: radiusExtent[0],
+ r: radiusExtent[1],
+ startAngle: -angleExtent[0] * RADIAN,
+ endAngle: -angleExtent[1] * RADIAN,
+ clockwise: angleAxis.inverse,
+ contain: function (x, y) {
+ // It's a ring shape.
+ // Start angle and end angle don't matter
+ var dx = x - this.cx;
+ var dy = y - this.cy;
+ var d2 = dx * dx + dy * dy;
+ var r = this.r;
+ var r0 = this.r0;
+
+ return d2 <= r * r && d2 >= r0 * r0;
+ }
+ };
}
};
@@ -74123,7 +74623,11 @@ var GeoModel = ComponentModel.extend({
*/
getFormattedLabel: function (name, status) {
var regionModel = this.getRegionModel(name);
- var formatter = regionModel.get('label.' + status + '.formatter');
+ var formatter = regionModel.get(
+ 'label'
+ + (status === 'normal' ? '.' : status + '.')
+ + 'formatter'
+ );
var params = {
name: name
};
@@ -75410,6 +75914,18 @@ extendComponentView({
* under the License.
*/
+var _nonShapeGraphicElements = {
+
+ // Reserved but not supported in graphic component.
+ path: null,
+ compoundPath: null,
+
+ // Supported in graphic component.
+ group: Group,
+ image: ZImage,
+ text: Text
+};
+
// -------------
// Preprocessor
// -------------
@@ -75723,8 +76239,8 @@ extendComponentView({
var el = elMap.get(id);
if (el) {
- el.__ecGraphicWidth = elOption.width;
- el.__ecGraphicHeight = elOption.height;
+ el.__ecGraphicWidthOption = elOption.width;
+ el.__ecGraphicHeightOption = elOption.height;
setEventData(el, graphicModel, elOption);
}
});
@@ -75741,6 +76257,29 @@ extendComponentView({
var elOptions = graphicModel.option.elements;
var rootGroup = this.group;
var elMap = this._elMap;
+ var apiWidth = api.getWidth();
+ var apiHeight = api.getHeight();
+
+ // Top-down to calculate percentage width/height of group
+ for (var i = 0; i < elOptions.length; i++) {
+ var elOption = elOptions[i];
+ var el = elMap.get(elOption.id);
+
+ if (!el || !el.isGroup) {
+ continue;
+ }
+ var parentEl = el.parent;
+ var isParentRoot = parentEl === rootGroup;
+ // Like 'position:absolut' in css, default 0.
+ el.__ecGraphicWidth = parsePercent$1(
+ el.__ecGraphicWidthOption,
+ isParentRoot ? apiWidth : parentEl.__ecGraphicWidth
+ ) || 0;
+ el.__ecGraphicHeight = parsePercent$1(
+ el.__ecGraphicHeightOption,
+ isParentRoot ? apiHeight : parentEl.__ecGraphicHeight
+ ) || 0;
+ }
// Bottom-up tranvese all elements (consider ec resize) to locate elements.
for (var i = elOptions.length - 1; i >= 0; i--) {
@@ -75754,14 +76293,18 @@ extendComponentView({
var parentEl = el.parent;
var containerInfo = parentEl === rootGroup
? {
- width: api.getWidth(),
- height: api.getHeight()
+ width: apiWidth,
+ height: apiHeight
}
- : { // Like 'position:absolut' in css, default 0.
- width: parentEl.__ecGraphicWidth || 0,
- height: parentEl.__ecGraphicHeight || 0
+ : {
+ width: parentEl.__ecGraphicWidth,
+ height: parentEl.__ecGraphicHeight
};
+ // PENDING
+ // Currently, when `bounding: 'all'`, the union bounding rect of the group
+ // does not include the rect of [0, 0, group.width, group.height], which
+ // is probably weird for users. Should we make a break change for it?
positionElement(
el, elOption, containerInfo, null,
{hv: elOption.hv, boundingMode: elOption.bounding}
@@ -75797,7 +76340,11 @@ function createEl$1(id, targetElParent, elOption, elMap) {
assert$1(graphicType, 'graphic type MUST be set');
}
- var Clz = graphic[graphicType.charAt(0).toUpperCase() + graphicType.slice(1)];
+ var Clz = _nonShapeGraphicElements.hasOwnProperty(graphicType)
+ // Those graphic elements are not shapes. They should not be
+ // overwritten by users, so do them first.
+ ? _nonShapeGraphicElements[graphicType]
+ : getShapeClass(graphicType);
if (__DEV__) {
assert$1(Clz, 'graphic type can not be found');
@@ -76311,7 +76858,8 @@ extendComponentView({
path.setStyle({
text: titles[iconName],
textPosition: iconStyleEmphasisModel.get('textPosition') || 'bottom',
- textFill: iconStyleEmphasisModel.get('textFill') || hoverStyle.fill || hoverStyle.stroke || '#000',
+ textFill: iconStyleEmphasisModel.get('textFill')
+ || hoverStyle.fill || hoverStyle.stroke || '#000',
textAlign: iconStyleEmphasisModel.get('textAlign') || 'center',
textBackgroundColor: iconStyleEmphasisModel.get('textBackgroundColor'),
textBorderRadius: iconStyleEmphasisModel.get('textBorderRadius'),
@@ -78181,7 +78729,7 @@ AxisProxy.prototype = {
// `calculateDataWindow` uses min/maxSpan.
setMinMaxSpan(this);
- var dataWindow = this.calculateDataWindow(dataZoomModel.option);
+ var dataWindow = this.calculateDataWindow(dataZoomModel.settledOption);
this._valueWindow = dataWindow.valueWindow;
this._percentWindow = dataWindow.percentWindow;
@@ -78528,29 +79076,55 @@ var DataZoomModel = extendComponentModel({
*/
this._rangePropMode = ['percent', 'percent'];
- var rawOption = retrieveRaw(option);
+ var inputRawOption = retrieveRawOption(option);
+
+ /**
+ * Suppose a "main process" start at the point that model prepared (that is,
+ * model initialized or merged or method called in `action`).
+ * We should keep the `main process` idempotent, that is, given a set of values
+ * on `option`, we get the same result.
+ *
+ * But sometimes, values on `option` will be updated for providing users
+ * a "final calculated value" (`dataZoomProcessor` will do that). Those value
+ * should not be the base/input of the `main process`.
+ *
+ * So in that case we should save and keep the input of the `main process`
+ * separately, called `settledOption`.
+ *
+ * For example, consider the case:
+ * (Step_1) brush zoom the grid by `toolbox.dataZoom`,
+ * where the original input `option.startValue`, `option.endValue` are earsed by
+ * calculated value.
+ * (Step)2) click the legend to hide and show a series,
+ * where the new range is calculated by the earsed `startValue` and `endValue`,
+ * which brings incorrect result.
+ *
+ * @readOnly
+ */
+ this.settledOption = inputRawOption;
this.mergeDefaultAndTheme(option, ecModel);
- this.doInit(rawOption);
+ this.doInit(inputRawOption);
},
/**
* @override
*/
mergeOption: function (newOption) {
- var rawOption = retrieveRaw(newOption);
+ var inputRawOption = retrieveRawOption(newOption);
//FIX #2591
merge(this.option, newOption, true);
+ merge(this.settledOption, inputRawOption, true);
- this.doInit(rawOption);
+ this.doInit(inputRawOption);
},
/**
* @protected
*/
- doInit: function (rawOption) {
+ doInit: function (inputRawOption) {
var thisOption = this.option;
// Disable realtime view update if canvas is not supported.
@@ -78558,16 +79132,17 @@ var DataZoomModel = extendComponentModel({
thisOption.realtime = false;
}
- this._setDefaultThrottle(rawOption);
+ this._setDefaultThrottle(inputRawOption);
- updateRangeUse(this, rawOption);
+ updateRangeUse(this, inputRawOption);
+ var settledOption = this.settledOption;
each$19([['start', 'startValue'], ['end', 'endValue']], function (names, index) {
// start/end has higher priority over startValue/endValue if they
// both set, but we should make chart.setOption({endValue: 1000})
// effective, rather than chart.setOption({endValue: 1000, end: null}).
if (this._rangePropMode[index] === 'value') {
- thisOption[names[0]] = null;
+ thisOption[names[0]] = settledOption[names[0]] = null;
}
// Otherwise do nothing and use the merge result.
}, this);
@@ -78787,16 +79362,16 @@ var DataZoomModel = extendComponentModel({
/**
* @private
*/
- _setDefaultThrottle: function (rawOption) {
+ _setDefaultThrottle: function (inputRawOption) {
// When first time user set throttle, auto throttle ends.
- if (rawOption.hasOwnProperty('throttle')) {
+ if (inputRawOption.hasOwnProperty('throttle')) {
this._autoThrottle = false;
}
if (this._autoThrottle) {
var globalOption = this.ecModel.option;
- this.option.throttle
- = (globalOption.animation && globalOption.animationDurationUpdate > 0)
- ? 100 : 20;
+ this.option.throttle = (
+ globalOption.animation && globalOption.animationDurationUpdate > 0
+ ) ? 100 : 20;
}
},
@@ -78862,23 +79437,42 @@ var DataZoomModel = extendComponentModel({
* @param {number} [opt.end]
* @param {number} [opt.startValue]
* @param {number} [opt.endValue]
- * @param {boolean} [ignoreUpdateRangeUsg=false]
*/
- setRawRange: function (opt, ignoreUpdateRangeUsg) {
- var option = this.option;
+ setRawRange: function (opt) {
+ var thisOption = this.option;
+ var settledOption = this.settledOption;
each$19([['start', 'startValue'], ['end', 'endValue']], function (names) {
- // If only one of 'start' and 'startValue' is not null/undefined, the other
- // should be cleared, which enable clear the option.
- // If both of them are not set, keep option with the original value, which
- // enable use only set start but not set end when calling `dispatchAction`.
- // The same as 'end' and 'endValue'.
+ // Consider the pair <start, startValue>:
+ // If one has value and the other one is `null/undefined`, we both set them
+ // to `settledOption`. This strategy enables the feature to clear the original
+ // value in `settledOption` to `null/undefined`.
+ // But if both of them are `null/undefined`, we do not set them to `settledOption`
+ // and keep `settledOption` with the original value. This strategy enables users to
+ // only set <end or endValue> but not set <start or startValue> when calling
+ // `dispatchAction`.
+ // The pair <end, endValue> is treated in the same way.
if (opt[names[0]] != null || opt[names[1]] != null) {
- option[names[0]] = opt[names[0]];
- option[names[1]] = opt[names[1]];
+ thisOption[names[0]] = settledOption[names[0]] = opt[names[0]];
+ thisOption[names[1]] = settledOption[names[1]] = opt[names[1]];
}
}, this);
- !ignoreUpdateRangeUsg && updateRangeUse(this, opt);
+ updateRangeUse(this, opt);
+ },
+
+ /**
+ * @public
+ * @param {Object} opt
+ * @param {number} [opt.start]
+ * @param {number} [opt.end]
+ * @param {number} [opt.startValue]
+ * @param {number} [opt.endValue]
+ */
+ setCalculatedRange: function (opt) {
+ var option = this.option;
+ each$19(['start', 'startValue', 'end', 'endValue'], function (name) {
+ option[name] = opt[name];
+ });
},
/**
@@ -78952,7 +79546,12 @@ var DataZoomModel = extendComponentModel({
});
-function retrieveRaw(option) {
+/**
+ * Retrieve the those raw params from option, which will be cached separately.
+ * becasue they will be overwritten by normalized/calculated values in the main
+ * process.
+ */
+function retrieveRawOption(option) {
var ret = {};
each$19(
['start', 'end', 'startValue', 'endValue', 'throttle'],
@@ -78963,13 +79562,13 @@ function retrieveRaw(option) {
return ret;
}
-function updateRangeUse(dataZoomModel, rawOption) {
+function updateRangeUse(dataZoomModel, inputRawOption) {
var rangePropMode = dataZoomModel._rangePropMode;
var rangeModeInOption = dataZoomModel.get('rangeMode');
each$19([['start', 'startValue'], ['end', 'endValue']], function (names, index) {
- var percentSpecified = rawOption[names[0]] != null;
- var valueSpecified = rawOption[names[1]] != null;
+ var percentSpecified = inputRawOption[names[0]] != null;
+ var valueSpecified = inputRawOption[names[1]] != null;
if (percentSpecified && !valueSpecified) {
rangePropMode[index] = 'percent';
}
@@ -79198,12 +79797,12 @@ registerProcessor({
var percentRange = axisProxy.getDataPercentWindow();
var valueRange = axisProxy.getDataValueWindow();
- dataZoomModel.setRawRange({
+ dataZoomModel.setCalculatedRange({
start: percentRange[0],
end: percentRange[1],
startValue: valueRange[0],
endValue: valueRange[1]
- }, true);
+ });
});
}
});
@@ -79328,6 +79927,7 @@ function DataZoom(model, ecModel, api) {
DataZoom.defaultOption = {
show: true,
+ filterMode: 'filter',
// Icon group
icon: {
zoom: 'M0,13.5h26.9 M13.5,26.9V0 M32.1,13.5H58V58H13.5 V32.1',
@@ -79576,6 +80176,8 @@ registerPreprocessor(function (option) {
var newOpt = {
type: 'select',
$fromToolbox: true,
+ // Default to be filter
+ filterMode: dataZoomOpt.filterMode || 'filter',
// Id for merge mapping.
id: DATA_ZOOM_ID_BASE + axisName + axisIndex
};
@@ -83961,7 +84563,7 @@ var MarkerModel = extendComponentModel({
/**
* @overrite
*/
- init: function (option, parentModel, ecModel, extraOpt) {
+ init: function (option, parentModel, ecModel) {
if (__DEV__) {
if (this.type === 'marker') {
@@ -83969,7 +84571,7 @@ var MarkerModel = extendComponentModel({
}
}
this.mergeDefaultAndTheme(option, ecModel);
- this.mergeOption(option, ecModel, extraOpt.createdBySelf, true);
+ this._mergeOption(option, ecModel, false, true);
},
/**
@@ -83984,7 +84586,14 @@ var MarkerModel = extendComponentModel({
return this.getShallow('animation') && hostSeries && hostSeries.isAnimationEnabled();
},
- mergeOption: function (newOpt, ecModel, createdBySelf, isInit) {
+ /**
+ * @overrite
+ */
+ mergeOption: function (newOpt, ecModel) {
+ this._mergeOption(newOpt, ecModel, false, false);
+ },
+
+ _mergeOption: function (newOpt, ecModel, createdBySelf, isInit) {
var MarkerModel = this.constructor;
var modelPropName = this.mainType + 'Model';
if (!createdBySelf) {
@@ -84028,7 +84637,7 @@ var MarkerModel = extendComponentModel({
markerModel.__hostSeries = seriesModel;
}
else {
- markerModel.mergeOption(markerOpt, ecModel, true);
+ markerModel._mergeOption(markerOpt, ecModel, true);
}
seriesModel[modelPropName] = markerModel;
}, this);
@@ -85513,6 +86122,19 @@ registerPreprocessor(function (opt) {
* under the License.
*/
+var langSelector = lang.legend.selector;
+
+var defaultSelectorOption = {
+ all: {
+ type: 'all',
+ title: clone(langSelector.all)
+ },
+ inverse: {
+ type: 'inverse',
+ title: clone(langSelector.inverse)
+ }
+};
+
var LegendModel = extendComponentModel({
type: 'legend.plain',
@@ -85535,10 +86157,25 @@ var LegendModel = extendComponentModel({
this.mergeDefaultAndTheme(option, ecModel);
option.selected = option.selected || {};
+ this._updateSelector(option);
},
mergeOption: function (option) {
LegendModel.superCall(this, 'mergeOption', option);
+ this._updateSelector(option);
+ },
+
+ _updateSelector: function (option) {
+ var selector = option.selector;
+ if (selector === true) {
+ selector = option.selector = ['all', 'inverse'];
+ }
+ if (isArray(selector)) {
+ each$1(selector, function (item, index) {
+ isString(item) && (item = {type: item});
+ selector[index] = merge(item, defaultSelectorOption[item.type]);
+ });
+ }
},
optionUpdated: function () {
@@ -85667,6 +86304,27 @@ var LegendModel = extendComponentModel({
this[selected[name] ? 'unSelect' : 'select'](name);
},
+ allSelect: function () {
+ var data = this._data;
+ var selected = this.option.selected;
+ each$1(data, function (dataItem) {
+ selected[dataItem.get('name', true)] = true;
+ });
+ },
+
+ inverseSelect: function () {
+ var data = this._data;
+ var selected = this.option.selected;
+ each$1(data, function (dataItem) {
+ var name = dataItem.get('name', true);
+ // Initially, default value is true
+ if (!selected.hasOwnProperty(name)) {
+ selected[name] = true;
+ }
+ selected[name] = !selected[name];
+ });
+ },
+
/**
* @param {string} name
*/
@@ -85676,6 +86334,12 @@ var LegendModel = extendComponentModel({
&& indexOf(this._availableNames, name) >= 0;
},
+ getOrient: function () {
+ return this.get('orient') === 'vertical'
+ ? {index: 1, name: 'vertical'}
+ : {index: 0, name: 'horizontal'};
+ },
+
defaultOption: {
// 一级层叠
zlevel: 0,
@@ -85710,14 +86374,22 @@ var LegendModel = extendComponentModel({
// 各个item之间的间隔，单位px，默认为10，
// 横向布局时为水平间隔，纵向布局时为纵向间隔
itemGap: 10,
- // 图例图形宽度
+ // the width of legend symbol
itemWidth: 25,
- // 图例图形高度
+ // the height of legend symbol
itemHeight: 14,
- // 图例关闭时候的颜色
+ // the color of unselected legend symbol
inactiveColor: '#ccc',
+ // the borderColor of unselected legend symbol
+ inactiveBorderColor: '#ccc',
+
+ itemStyle: {
+ // the default borderWidth of legend symbol
+ borderWidth: 0
+ },
+
textStyle: {
// 图例文字颜色
color: '#333'
@@ -85730,6 +86402,40 @@ var LegendModel = extendComponentModel({
// 图例内容（详见legend.data，数组中每一项代表一个item
// data: [],
+ // Usage:
+ // selector: [{type: 'all or inverse', title: xxx}]
+ // or
+ // selector: true
+ // or
+ // selector: ['all', 'inverse']
+ selector: false,
+
+ selectorLabel: {
+ show: true,
+ borderRadius: 10,
+ padding: [3, 5, 3, 5],
+ fontSize: 12,
+ fontFamily: ' sans-serif',
+ color: '#666',
+ borderWidth: 1,
+ borderColor: '#666'
+ },
+
+ emphasis: {
+ selectorLabel: {
+ show: true,
+ color: '#eee',
+ backgroundColor: '#666'
+ }
+ },
+
+ // Value can be 'start' or 'end'
+ selectorPosition: 'auto',
+
+ selectorItemGap: 7,
+
+ selectorButtonGap: 10,
+
// Tooltip 相关配置
tooltip: {
show: false
@@ -85769,6 +86475,9 @@ function legendSelectActionHandler(methodName, payload, ecModel) {
// doesn't has the item, they will assume it is selected.
legendModel[isSelected ? 'select' : 'unSelect'](payload.name);
}
+ else if (methodName === 'allSelect' || methodName === 'inverseSelect') {
+ legendModel[methodName]();
+ }
else {
legendModel[methodName](payload.name);
isSelected = legendModel.isSelected(payload.name);
@@ -85791,10 +86500,14 @@ function legendSelectActionHandler(methodName, payload, ecModel) {
});
});
// Return the event explicitly
- return {
- name: payload.name,
- selected: selectedMap
- };
+ return (methodName === 'allSelect' || methodName === 'inverseSelect')
+ ? {
+ selected: selectedMap
+ }
+ : {
+ name: payload.name,
+ selected: selectedMap
+ };
}
/**
* @event legendToggleSelect
@@ -85808,6 +86521,16 @@ registerAction(
curry(legendSelectActionHandler, 'toggleSelected')
);
+registerAction(
+ 'legendAllSelect', 'legendselectall',
+ curry(legendSelectActionHandler, 'allSelect')
+);
+
+registerAction(
+ 'legendInverseSelect', 'legendinverseselect',
+ curry(legendSelectActionHandler, 'inverseSelect')
+);
+
/**
* @event legendSelect
* @type {Object}
@@ -85877,6 +86600,12 @@ var LegendView = extendComponentView({
this._backgroundEl;
/**
+ * @private
+ * @type {module:zrender/container/Group}
+ */
+ this.group.add(this._selectorGroup = new Group$3());
+
+ /**
* If first rendering, `contentGroup.position` is [0, 0], which
* does not make sense and may cause unexepcted animation if adopted.
* @private
@@ -85893,6 +86622,13 @@ var LegendView = extendComponentView({
},
/**
+ * @protected
+ */
+ getSelectorGroup: function () {
+ return this._selectorGroup;
+ },
+
+ /**
* @override
*/
render: function (legendModel, ecModel, api) {
@@ -85906,14 +86642,21 @@ var LegendView = extendComponentView({
}
var itemAlign = legendModel.get('align');
+ var orient = legendModel.get('orient');
if (!itemAlign || itemAlign === 'auto') {
itemAlign = (
legendModel.get('left') === 'right'
- && legendModel.get('orient') === 'vertical'
+ && orient === 'vertical'
) ? 'right' : 'left';
}
- this.renderInner(itemAlign, legendModel, ecModel, api);
+ var selector = legendModel.get('selector', true);
+ var selectorPosition = legendModel.get('selectorPosition', true);
+ if (selector && (!selectorPosition || selectorPosition === 'auto')) {
+ selectorPosition = orient === 'horizontal' ? 'end' : 'start';
+ }
+
+ this.renderInner(itemAlign, legendModel, ecModel, api, selector, orient, selectorPosition);
// Perform layout.
var positionInfo = legendModel.getBoxLayoutParams();
@@ -85922,7 +86665,7 @@ var LegendView = extendComponentView({
var maxSize = getLayoutRect(positionInfo, viewportSize, padding);
- var mainRect = this.layoutInner(legendModel, itemAlign, maxSize, isFirstRender);
+ var mainRect = this.layoutInner(legendModel, itemAlign, maxSize, isFirstRender, selector, selectorPosition);
// Place mainGroup, based on the calculated `mainRect`.
var layoutRect = getLayoutRect(
@@ -85944,12 +86687,13 @@ var LegendView = extendComponentView({
resetInner: function () {
this.getContentGroup().removeAll();
this._backgroundEl && this.group.remove(this._backgroundEl);
+ this.getSelectorGroup().removeAll();
},
/**
* @protected
*/
- renderInner: function (itemAlign, legendModel, ecModel, api) {
+ renderInner: function (itemAlign, legendModel, ecModel, api, selector, orient, selectorPosition) {
var contentGroup = this.getContentGroup();
var legendDrawnMap = createHashMap();
var selectMode = legendModel.get('selectedMode');
@@ -85982,6 +86726,7 @@ var LegendView = extendComponentView({
if (seriesModel) {
var data = seriesModel.getData();
var color = data.getVisual('color');
+ var borderColor = data.getVisual('borderColor');
// If color is a callback function
if (typeof color === 'function') {
@@ -85989,6 +86734,12 @@ var LegendView = extendComponentView({
color = color(seriesModel.getDataParams(0));
}
+ // If borderColor is a callback function
+ if (typeof borderColor === 'function') {
+ // Use the first data
+ borderColor = borderColor(seriesModel.getDataParams(0));
+ }
+
// Using rect symbol defaultly
var legendSymbolType = data.getVisual('legendSymbol') || 'roundRect';
var symbolType = data.getVisual('symbol');
@@ -85996,7 +86747,7 @@ var LegendView = extendComponentView({
var itemGroup = this._createItem(
name, dataIndex, itemModel, legendModel,
legendSymbolType, symbolType,
- itemAlign, color,
+ itemAlign, color, borderColor,
selectMode
);
@@ -86022,13 +86773,14 @@ var LegendView = extendComponentView({
}
var color = data.getItemVisual(idx, 'color');
+ var borderColor = data.getItemVisual(idx, 'borderColor');
var legendSymbolType = 'roundRect';
var itemGroup = this._createItem(
name, dataIndex, itemModel, legendModel,
legendSymbolType, null,
- itemAlign, color,
+ itemAlign, color, borderColor,
selectMode
);
@@ -86053,17 +86805,63 @@ var LegendView = extendComponentView({
}
}
}, this);
+
+ if (selector) {
+ this._createSelector(selector, legendModel, api, orient, selectorPosition);
+ }
+ },
+
+ _createSelector: function (selector, legendModel, api, orient, selectorPosition) {
+ var selectorGroup = this.getSelectorGroup();
+
+ each$25(selector, function (selectorItem) {
+ createSelectorButton(selectorItem);
+ });
+
+ function createSelectorButton(selectorItem) {
+ var type = selectorItem.type;
+
+ var labelText = new Text({
+ style: {
+ x: 0,
+ y: 0,
+ align: 'center',
+ verticalAlign: 'middle'
+ },
+ onclick: function () {
+ api.dispatchAction({
+ type: type === 'all' ? 'legendAllSelect' : 'legendInverseSelect'
+ });
+ }
+ });
+
+ selectorGroup.add(labelText);
+
+ var labelModel = legendModel.getModel('selectorLabel');
+ var emphasisLabelModel = legendModel.getModel('emphasis.selectorLabel');
+
+ setLabelStyle(
+ labelText.style, labelText.hoverStyle = {}, labelModel, emphasisLabelModel,
+ {
+ defaultText: selectorItem.title,
+ isRectText: false
+ }
+ );
+ setHoverStyle(labelText);
+ }
},
_createItem: function (
name, dataIndex, itemModel, legendModel,
legendSymbolType, symbolType,
- itemAlign, color, selectMode
+ itemAlign, color, borderColor, selectMode
) {
var itemWidth = legendModel.get('itemWidth');
var itemHeight = legendModel.get('itemHeight');
var inactiveColor = legendModel.get('inactiveColor');
+ var inactiveBorderColor = legendModel.get('inactiveBorderColor');
var symbolKeepAspect = legendModel.get('symbolKeepAspect');
+ var legendModelItemStyle = legendModel.getModel('itemStyle');
var isSelected = legendModel.isSelected(name);
var itemGroup = new Group$3();
@@ -86077,7 +86875,7 @@ var LegendView = extendComponentView({
// Use user given icon first
legendSymbolType = itemIcon || legendSymbolType;
- itemGroup.add(createSymbol(
+ var legendSymbol = createSymbol(
legendSymbolType,
0,
0,
@@ -86086,7 +86884,13 @@ var LegendView = extendComponentView({
isSelected ? color : inactiveColor,
// symbolKeepAspect default true for legend
symbolKeepAspect == null ? true : symbolKeepAspect
- ));
+ );
+ itemGroup.add(
+ setSymbolStyle(
+ legendSymbol, legendSymbolType, legendModelItemStyle,
+ borderColor, inactiveBorderColor, isSelected
+ )
+ );
// Compose symbols
// PENDING
@@ -86098,8 +86902,7 @@ var LegendView = extendComponentView({
if (symbolType === 'none') {
symbolType = 'circle';
}
- // Put symbol in the center
- itemGroup.add(createSymbol(
+ var legendSymbolCenter = createSymbol(
symbolType,
(itemWidth - size) / 2,
(itemHeight - size) / 2,
@@ -86108,7 +86911,14 @@ var LegendView = extendComponentView({
isSelected ? color : inactiveColor,
// symbolKeepAspect default true for legend
symbolKeepAspect == null ? true : symbolKeepAspect
- ));
+ );
+ // Put symbol in the center
+ itemGroup.add(
+ setSymbolStyle(
+ legendSymbolCenter, symbolType, legendModelItemStyle,
+ borderColor, inactiveBorderColor, isSelected
+ )
+ );
}
var textX = itemAlign === 'left' ? itemWidth + 5 : -5;
@@ -86172,8 +86982,9 @@ var LegendView = extendComponentView({
/**
* @protected
*/
- layoutInner: function (legendModel, itemAlign, maxSize) {
+ layoutInner: function (legendModel, itemAlign, maxSize, isFirstRender, selector, selectorPosition) {
var contentGroup = this.getContentGroup();
+ var selectorGroup = this.getSelectorGroup();
// Place items in contentGroup.
box(
@@ -86185,9 +86996,48 @@ var LegendView = extendComponentView({
);
var contentRect = contentGroup.getBoundingRect();
- contentGroup.attr('position', [-contentRect.x, -contentRect.y]);
+ var contentPos = [-contentRect.x, -contentRect.y];
+
+ if (selector) {
+ // Place buttons in selectorGroup
+ box(
+ // Buttons in selectorGroup always layout horizontally
+ 'horizontal',
+ selectorGroup,
+ legendModel.get('selectorItemGap', true)
+ );
+
+ var selectorRect = selectorGroup.getBoundingRect();
+ var selectorPos = [-selectorRect.x, -selectorRect.y];
+ var selectorButtonGap = legendModel.get('selectorButtonGap', true);
+
+ var orientIdx = legendModel.getOrient().index;
+ var wh = orientIdx === 0 ? 'width' : 'height';
+ var hw = orientIdx === 0 ? 'height' : 'width';
+ var yx = orientIdx === 0 ? 'y' : 'x';
- return this.group.getBoundingRect();
+ if (selectorPosition === 'end') {
+ selectorPos[orientIdx] += contentRect[wh] + selectorButtonGap;
+ }
+ else {
+ contentPos[orientIdx] += selectorRect[wh] + selectorButtonGap;
+ }
+
+ //Always align selector to content as 'middle'
+ selectorPos[1 - orientIdx] += contentRect[hw] / 2 - selectorRect[hw] / 2;
+ selectorGroup.attr('position', selectorPos);
+ contentGroup.attr('position', contentPos);
+
+ var mainRect = {x: 0, y: 0};
+ mainRect[wh] = contentRect[wh] + selectorButtonGap + selectorRect[wh];
+ mainRect[hw] = Math.max(contentRect[hw], selectorRect[hw]);
+ mainRect[yx] = Math.min(0, selectorRect[yx] + selectorPos[1 - orientIdx]);
+ return mainRect;
+ }
+ else {
+ contentGroup.attr('position', contentPos);
+ return this.group.getBoundingRect();
+ }
},
/**
@@ -86200,6 +87050,21 @@ var LegendView = extendComponentView({
});
+function setSymbolStyle(symbol, symbolType, legendModelItemStyle, borderColor, inactiveBorderColor, isSelected) {
+ var itemStyle;
+ if (symbolType !== 'line' && symbolType.indexOf('empty') < 0) {
+ itemStyle = legendModelItemStyle.getItemStyle();
+ symbol.style.stroke = borderColor;
+ if (!isSelected) {
+ itemStyle.stroke = inactiveBorderColor;
+ }
+ }
+ else {
+ itemStyle = legendModelItemStyle.getItemStyle(['borderWidth', 'borderColor']);
+ }
+ return symbol.setStyle(itemStyle);
+}
+
function dispatchSelectAction(name, api) {
api.dispatchAction({
type: 'legendToggleSelect',
@@ -86295,7 +87160,7 @@ var legendFilter = function (ecModel) {
// Do not contain scrollable legend, for sake of file size.
// Series Filter
-registerProcessor(legendFilter);
+registerProcessor(PRIORITY.PROCESSOR.SERIES_FILTER, legendFilter);
ComponentModel.registerSubTypeDefaulter('legend', function () {
// Default 'plain' when no type specified.
@@ -86370,12 +87235,6 @@ var ScrollableLegendModel = LegendModel.extend({
ScrollableLegendModel.superCall(this, 'mergeOption', option, extraOpt);
mergeAndNormalizeLayoutParams$1(this, this.option, option);
- },
-
- getOrient: function () {
- return this.get('orient') === 'vertical'
- ? {index: 1, name: 'vertical'}
- : {index: 0, name: 'horizontal'};
}
});
@@ -86468,11 +87327,12 @@ var ScrollableLegendView = LegendView.extend({
/**
* @override
*/
- renderInner: function (itemAlign, legendModel, ecModel, api) {
+ renderInner: function (itemAlign, legendModel, ecModel, api, selector, orient, selectorPosition) {
var me = this;
// Render content items.
- ScrollableLegendView.superCall(this, 'renderInner', itemAlign, legendModel, ecModel, api);
+ ScrollableLegendView.superCall(this, 'renderInner', itemAlign,
+ legendModel, ecModel, api, selector, orient, selectorPosition);
var controllerGroup = this._controllerGroup;
@@ -86525,16 +87385,59 @@ var ScrollableLegendView = LegendView.extend({
/**
* @override
*/
- layoutInner: function (legendModel, itemAlign, maxSize, isFirstRender) {
- var contentGroup = this.getContentGroup();
- var containerGroup = this._containerGroup;
- var controllerGroup = this._controllerGroup;
+ layoutInner: function (legendModel, itemAlign, maxSize, isFirstRender, selector, selectorPosition) {
+ var selectorGroup = this.getSelectorGroup();
var orientIdx = legendModel.getOrient().index;
var wh = WH$1[orientIdx];
+ var xy = XY$1[orientIdx];
var hw = WH$1[1 - orientIdx];
var yx = XY$1[1 - orientIdx];
+ selector && box(
+ // Buttons in selectorGroup always layout horizontally
+ 'horizontal',
+ selectorGroup,
+ legendModel.get('selectorItemGap', true)
+ );
+
+ var selectorButtonGap = legendModel.get('selectorButtonGap', true);
+ var selectorRect = selectorGroup.getBoundingRect();
+ var selectorPos = [-selectorRect.x, -selectorRect.y];
+
+ var processMaxSize = clone(maxSize);
+ selector && (processMaxSize[wh] = maxSize[wh] - selectorRect[wh] - selectorButtonGap);
+
+ var mainRect = this._layoutContentAndController(legendModel, isFirstRender,
+ processMaxSize, orientIdx, wh, hw, yx
+ );
+
+ if (selector) {
+ if (selectorPosition === 'end') {
+ selectorPos[orientIdx] += mainRect[wh] + selectorButtonGap;
+ }
+ else {
+ var offset = selectorRect[wh] + selectorButtonGap;
+ selectorPos[orientIdx] -= offset;
+ mainRect[xy] -= offset;
+ }
+ mainRect[wh] += selectorRect[wh] + selectorButtonGap;
+
+ selectorPos[1 - orientIdx] += mainRect[yx] + mainRect[hw] / 2 - selectorRect[hw] / 2;
+ mainRect[hw] = Math.max(mainRect[hw], selectorRect[hw]);
+ mainRect[yx] = Math.min(mainRect[yx], selectorRect[yx] + selectorPos[1 - orientIdx]);
+
+ selectorGroup.attr('position', selectorPos);
+ }
+
+ return mainRect;
+ },
+
+ _layoutContentAndController: function (legendModel, isFirstRender, maxSize, orientIdx, wh, hw, yx) {
+ var contentGroup = this.getContentGroup();
+ var containerGroup = this._containerGroup;
+ var controllerGroup = this._controllerGroup;
+
// Place items in contentGroup.
box(
legendModel.get('orient'),
@@ -86593,11 +87496,12 @@ var ScrollableLegendView = LegendView.extend({
// Calculate `mainRect` and set `clipPath`.
// mainRect should not be calculated by `this.group.getBoundingRect()`
// for sake of the overflow.
- var mainRect = this.group.getBoundingRect();
var mainRect = {x: 0, y: 0};
+
// Consider content may be overflow (should be clipped).
mainRect[wh] = showController ? maxSize[wh] : contentRect[wh];
mainRect[hw] = Math.max(contentRect[hw], controllerRect[hw]);
+
// `containerRect[yx] + containerPos[1 - orientIdx]` is 0.
mainRect[yx] = Math.min(0, controllerRect[yx] + controllerPos[1 - orientIdx]);
@@ -86612,7 +87516,7 @@ var ScrollableLegendView = LegendView.extend({
containerGroup.__rectSize = clipShape[wh];
}
else {
- // Do not remove or ignore controller. Keep them set as place holders.
+ // Do not remove or ignore controller. Keep them set as placeholders.
controllerGroup.eachChild(function (child) {
child.attr({invisible: true, silent: true});
});
@@ -86624,7 +87528,7 @@ var ScrollableLegendView = LegendView.extend({
contentGroup,
{position: pageInfo.contentPosition},
// When switch from "show controller" to "not show controller", view should be
- // updated immediately without animation, otherwise causes weird efffect.
+ // updated immediately without animation, otherwise causes weird effect.
showController ? legendModel : false
);
@@ -86680,8 +87584,8 @@ var ScrollableLegendView = LegendView.extend({
* contentPosition: Array.<number>, null when data item not found.
* pageIndex: number, null when data item not found.
* pageCount: number, always be a number, can be 0.
- * pagePrevDataIndex: number, null when no next page.
- * pageNextDataIndex: number, null when no previous page.
+ * pagePrevDataIndex: number, null when no previous page.
+ * pageNextDataIndex: number, null when no next page.
* }
*/
_getPageInfo: function (legendModel) {
@@ -89705,8 +90609,8 @@ function makeHighDownBatch(batch, visualMapModel) {
var linearMap$3 = linearMap;
var each$29 = each$1;
-var mathMin$7 = Math.min;
-var mathMax$7 = Math.max;
+var mathMin$8 = Math.min;
+var mathMax$8 = Math.max;
// Arbitrary value
var HOVER_LINK_SIZE = 12;
@@ -89884,7 +90788,7 @@ var ContinuousView = VisualMapView.extend({
));
var textRect = visualMapModel.textStyleModel.getTextRect('国');
- var textSize = mathMax$7(textRect.width, textRect.height);
+ var textSize = mathMax$8(textRect.width, textRect.height);
// Handle
if (useHandle) {
@@ -90298,7 +91202,7 @@ var ContinuousView = VisualMapView.extend({
);
// For hover link show when hover handle, which might be
// below or upper than sizeExtent.
- pos[1] = mathMin$7(mathMax$7(0, pos[1]), itemSize[1]);
+ pos[1] = mathMin$8(mathMax$8(0, pos[1]), itemSize[1]);
self._doHoverLinkToSeries(
pos[1],
0 <= pos[0] && pos[0] <= itemSize[0]
@@ -90344,7 +91248,7 @@ var ContinuousView = VisualMapView.extend({
var dataExtent = visualMapModel.getExtent();
// For hover link show when hover handle, which might be below or upper than sizeExtent.
- cursorPos = mathMin$7(mathMax$7(sizeExtent[0], cursorPos), sizeExtent[1]);
+ cursorPos = mathMin$8(mathMax$8(sizeExtent[0], cursorPos), sizeExtent[1]);
var halfHoverLinkSize = getHalfHoverLinkSize(visualMapModel, dataExtent, sizeExtent);
var hoverRange = [cursorPos - halfHoverLinkSize, cursorPos + halfHoverLinkSize];
@@ -90509,9 +91413,9 @@ function createHandlePoints(handleIndex, textSize) {
function createIndicatorPoints(isRange, halfHoverLinkSize, pos, extentMax) {
return isRange
? [ // indicate range
- [0, -mathMin$7(halfHoverLinkSize, mathMax$7(pos, 0))],
+ [0, -mathMin$8(halfHoverLinkSize, mathMax$8(pos, 0))],
[HOVER_LINK_OUT, 0],
- [0, mathMin$7(halfHoverLinkSize, mathMax$7(extentMax - pos, 0))]
+ [0, mathMin$8(halfHoverLinkSize, mathMax$8(extentMax - pos, 0))]
]
: [ // indicate single value
[0, 0], [5, -5], [5, 5]
@@ -91464,7 +92368,7 @@ var sqrt = Math.sqrt;
var abs$1 = Math.abs;
var cos = Math.cos;
var sin = Math.sin;
-var mathMax$8 = Math.max;
+var mathMax$9 = Math.max;
if (!env$1.canvasSupported) {
@@ -91599,7 +92503,7 @@ if (!env$1.canvasSupported) {
width /= scale$$1[0] * Z;
height /= scale$$1[1] * Z;
- var dimension = mathMax$8(width, height);
+ var dimension = mathMax$9(width, height);
shift = 2 * 0 / dimension;
expansion = 2 * fill.r / dimension - shift;
}
@@ -92066,8 +92970,8 @@ if (!env$1.canvasSupported) {
applyTransform(p2, p2, m);
applyTransform(p3, p3, m);
- var maxX = mathMax$8(p0[0], p1[0], p2[0], p3[0]);
- var maxY = mathMax$8(p0[1], p1[1], p2[1], p3[1]);
+ var maxX = mathMax$9(p0[0], p1[0], p2[0], p3[0]);
+ var maxY = mathMax$9(p0[1], p1[1], p2[1], p3[1]);
var transformFilter = [];
transformFilter.push('M11=', m[0] / scaleX, comma,
@@ -92696,7 +93600,7 @@ VMLPainter.prototype = {
// Not supported methods
function createMethodNotSupport(method) {
return function () {
- zrLog('In IE8.0 VML mode painter not support method "' + method + '"');
+ logError$1('In IE8.0 VML mode painter not support method "' + method + '"');
};
}
@@ -92728,7 +93632,7 @@ var mathRound = Math.round;
var mathSin$3 = Math.sin;
var mathCos$3 = Math.cos;
var PI$6 = Math.PI;
-var PI2$7 = Math.PI * 2;
+var PI2$6 = Math.PI * 2;
var degree = 180 / PI$6;
var EPSILON$4 = 1e-4;
@@ -92851,11 +93755,11 @@ function pathDataToString$1(path) {
var clockwise = data[i++];
var dThetaPositive = Math.abs(dTheta);
- var isCircle = isAroundZero$1(dThetaPositive - PI2$7)
+ var isCircle = isAroundZero$1(dThetaPositive - PI2$6)
&& !isAroundZero$1(dThetaPositive);
var large = false;
- if (dThetaPositive >= PI2$7) {
+ if (dThetaPositive >= PI2$6) {
large = true;
}
else if (isAroundZero$1(dThetaPositive)) {
@@ -92874,10 +93778,10 @@ function pathDataToString$1(path) {
// FIXME A better way to draw circle ?
if (isCircle) {
if (clockwise) {
- dTheta = PI2$7 - 1e-4;
+ dTheta = PI2$6 - 1e-4;
}
else {
- dTheta = -PI2$7 + 1e-4;
+ dTheta = -PI2$6 + 1e-4;
}
large = true;
@@ -93058,14 +93962,15 @@ var svgTextDrawRectText = function (el, rect, textRect) {
textRect = getBoundingRect(
text, font, align,
- verticalAlign, style.textPadding, style.textLineHeight
+ verticalAlign, style.textPadding, style.textLineHeight,
+ false, style.truncate
);
var lineHeight = textRect.lineHeight;
// Text position represented by coord
if (textPosition instanceof Array) {
- x = rect.x + textPosition[0];
- y = rect.y + textPosition[1];
+ x = rect.x + parsePercent(textPosition[0], rect.width);
+ y = rect.y + parsePercent(textPosition[1], rect.height);
}
else {
var newPos = el.calculateTextPosition
@@ -93127,7 +94032,10 @@ var svgTextDrawRectText = function (el, rect, textRect) {
setTransform(textSvgEl, transform);
}
- var textLines = text.split('\n');
+ var contentBlock = parsePlainText(
+ text, font, textPadding, lineHeight, style.truncate);
+
+ var textLines = contentBlock.lines;
var nTextLines = textLines.length;
var textAnchor = align;
// PENDING
@@ -93748,7 +94656,7 @@ GradientManager.prototype.add = function (gradient) {
dom = this.createElement('radialGradient');
}
else {
- zrLog('Illegal gradient type.');
+ logError$1('Illegal gradient type.');
return null;
}
@@ -93813,7 +94721,7 @@ GradientManager.prototype.updateDom = function (gradient, dom) {
dom.setAttribute('r', gradient.r);
}
else {
- zrLog('Illegal gradient type.');
+ logError$1('Illegal gradient type.');
return;
}
@@ -94191,7 +95099,10 @@ ShadowManager.prototype.updateDom = function (displayable, dom) {
var scaleY = displayable.scale ? (displayable.scale[1] || 1) : 1;
// TODO: textBoxShadowBlur is not supported yet
- var offsetX, offsetY, blur, color;
+ var offsetX;
+ var offsetY;
+ var blur;
+ var color;
if (style.shadowBlur || style.shadowOffsetX || style.shadowOffsetY) {
offsetX = style.shadowOffsetX || 0;
offsetY = style.shadowOffsetY || 0;
@@ -94298,6 +95209,12 @@ function prepend(parent, child) {
}
}
+// function append(parent, child) {
+// if (checkParentAvailable(parent, child)) {
+// parent.appendChild(child);
+// }
+// }
+
function remove$1(parent, child) {
if (child && parent && child.parentNode === parent) {
parent.removeChild(child);
@@ -94629,7 +95546,7 @@ SVGPainter.prototype = {
// Not supported methods
function createMethodNotSupport$1(method) {
return function () {
- zrLog('In SVG mode painter not support method "' + method + '"');
+ logError$1('In SVG mode painter not support method "' + method + '"');
};
}
diff --git a/dist/echarts-en.js.map b/dist/echarts-en.js.map
index a6994b3..7380cbe 100644
--- a/dist/echarts-en.js.map
+++ b/dist/echarts-en.js.map
@@ -1 +1 @@
-{"version":3,"file":"echarts-en.js","sources":["../src/config.js","../../zrender/src/core/guid.js","../../zrender/src/core/env.js","../../zrender/src/core/util.js","../../zrender/src/core/vector.js","../../zrender/src/mixin/Draggable.js","../../zrender/src/mixin/Eventful.js","../../zrender/src/core/fourPointsTransform.js","../../zrender/src/core/event.js","../../zrender/src/core/GestureMgr.js","../../zrender/src/Handler.js","../../zrender/src/core/matrix.js","../../zrender/src/mixin/Tran [...]
\ No newline at end of file
+{"version":3,"file":"echarts-en.js","sources":["../src/config.js","../../zrender/src/core/guid.js","../../zrender/src/core/env.js","../../zrender/src/core/util.js","../../zrender/src/core/vector.js","../../zrender/src/mixin/Draggable.js","../../zrender/src/mixin/Eventful.js","../../zrender/src/core/fourPointsTransform.js","../../zrender/src/core/event.js","../../zrender/src/core/GestureMgr.js","../../zrender/src/Handler.js","../../zrender/src/core/matrix.js","../../zrender/src/mixin/Tran [...]
\ No newline at end of file
diff --git a/dist/echarts-en.min.js b/dist/echarts-en.min.js
index f87bf53..ef6c644 100644
--- a/dist/echarts-en.min.js
+++ b/dist/echarts-en.min.js
@@ -19,4 +19,4 @@
*/
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";var e=2311,n=function(){return e++},v="object"==typeof wx&&"function"==typeof wx.getSystemInfoSync?{browser:{},os:{},node:!1,wxa:!0,canvasSupported:!0,svgSupported:!1,touchEventsSupported:!0,domSupported:!1}:"undefined"==typeof document&&"undefined"!=typeof self?{browser:{},os:{},node:!1,worker:!0,canvasS [...]
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";var e=2311,n=function(){return e++},v="object"==typeof wx&&"function"==typeof wx.getSystemInfoSync?{browser:{},os:{},node:!1,wxa:!0,canvasSupported:!0,svgSupported:!1,touchEventsSupported:!0,domSupported:!1}:"undefined"==typeof document&&"undefined"!=typeof self?{browser:{},os:{},node:!1,worker:!0,canvasS [...]
diff --git a/dist/echarts-en.simple.js b/dist/echarts-en.simple.js
index d327cc3..a4c44a9 100644
--- a/dist/echarts-en.simple.js
+++ b/dist/echarts-en.simple.js
@@ -66,6 +66,8 @@ var guid = function () {
* @desc thanks zepto.
*/
+/* global wx */
+
var env = {};
if (typeof wx === 'object' && typeof wx.getSystemInfoSync === 'function') {
@@ -480,7 +482,9 @@ function inherits(clazz, baseClazz) {
clazz.prototype = new F();
for (var prop in clazzPrototype) {
- clazz.prototype[prop] = clazzPrototype[prop];
+ if (clazzPrototype.hasOwnProperty(prop)) {
+ clazz.prototype[prop] = clazzPrototype[prop];
+ }
}
clazz.prototype.constructor = clazz;
clazz.superClass = baseClazz;
@@ -723,6 +727,7 @@ function isDom(value) {
* @return {boolean}
*/
function eqNaN(value) {
+ /* eslint-disable-next-line no-self-compare */
return value !== value;
}
@@ -867,9 +872,11 @@ HashMap.prototype = {
// should not use the exposed keys, who are prefixed.
each: function (cb, context) {
context !== void 0 && (cb = bind(cb, context));
+ /* eslint-disable guard-for-in */
for (var key in this.data) {
this.data.hasOwnProperty(key) && cb(this.data[key], key);
}
+ /* eslint-enable guard-for-in */
},
// Do not use this method if performance sensitive.
removeKey: function (key) {
@@ -886,6 +893,8 @@ function createHashMap(obj) {
function noop() {}
+/* global Float32Array */
+
var ArrayCtor = typeof Float32Array === 'undefined'
? Array
: Float32Array;
@@ -2391,6 +2400,8 @@ mixin(Handler, Draggable);
* @exports zrender/tool/matrix
*/
+/* global Float32Array */
+
var ArrayCtor$1 = typeof Float32Array === 'undefined'
? Array
: Float32Array;
@@ -3623,11 +3634,17 @@ function cssHueToRgb(m1, m2, h) {
}
function setRgba(out, r, g, b, a) {
- out[0] = r; out[1] = g; out[2] = b; out[3] = a;
+ out[0] = r;
+ out[1] = g;
+ out[2] = b;
+ out[3] = a;
return out;
}
function copyRgba(out, a) {
- out[0] = a[0]; out[1] = a[1]; out[2] = a[2]; out[3] = a[3];
+ out[0] = a[0];
+ out[1] = a[1];
+ out[2] = a[2];
+ out[3] = a[3];
return out;
}
@@ -4546,35 +4563,23 @@ if (typeof window !== 'undefined') {
*/
/**
- * debug日志选项：catchBrushException为true下有效
- * 0 : 不生成debug数据，发布用
- * 1 : 异常抛出，调试用
- * 2 : 控制台输出，调试用
+ * Debug log mode:
+ * 0: Do nothing, for release.
+ * 1: console.error, for debug.
*/
var debugMode = 0;
// retina 屏幕优化
var devicePixelRatio = dpr;
-var log = function () {
+var logError = function () {
};
if (debugMode === 1) {
- log = function () {
- for (var k in arguments) {
- throw new Error(arguments[k]);
- }
- };
-}
-else if (debugMode > 1) {
- log = function () {
- for (var k in arguments) {
- console.log(arguments[k]);
- }
- };
+ logError = console.error;
}
-var log$1 = log;
+var logError$1 = logError;
/**
* @alias modue:zrender/mixin/Animatable
@@ -4630,7 +4635,7 @@ Animatable.prototype = {
}
if (!target) {
- log$1(
+ logError$1(
'Property "'
+ path
+ '" is not existed in element '
@@ -5851,7 +5856,10 @@ function TimSort(array, compare) {
while (stackSize > 1) {
var n = stackSize - 2;
- if (n >= 1 && runLength[n - 1] <= runLength[n] + runLength[n + 1] || n >= 2 && runLength[n - 2] <= runLength[n] + runLength[n - 1]) {
+ if (
+ (n >= 1 && runLength[n - 1] <= runLength[n] + runLength[n + 1])
+ || (n >= 2 && runLength[n - 2] <= runLength[n] + runLength[n - 1])
+ ) {
if (runLength[n - 1] < runLength[n + 1]) {
n--;
}
@@ -5941,7 +5949,9 @@ function TimSort(array, compare) {
}
var _minGallop = minGallop;
- var count1, count2, exit;
+ var count1;
+ var count2;
+ var exit;
while (1) {
count1 = 0;
@@ -6624,8 +6634,8 @@ Style.prototype = {
/**
* `true` is not supported.
* `false`/`null`/`undefined` are the same.
- * `false` is used to remove lineDash in some
- * case that `null`/`undefined` can not be set.
+ * `false` is used to remove lineDash in some
+ * case that `null`/`undefined` can not be set.
* (e.g., emphasis.lineStyle in echarts)
* @type {Array.<number>|boolean}
*/
@@ -7105,8 +7115,8 @@ var Layer = function (id, painter, dpr) {
domStyle['user-select'] = 'none';
domStyle['-webkit-touch-callout'] = 'none';
domStyle['-webkit-tap-highlight-color'] = 'rgba(0,0,0,0)';
- domStyle['padding'] = 0;
- domStyle['margin'] = 0;
+ domStyle['padding'] = 0; // eslint-disable-line dot-notation
+ domStyle['margin'] = 0; // eslint-disable-line dot-notation
domStyle['border-width'] = 0;
}
@@ -9230,7 +9240,7 @@ function isDisplayableCulled(el, width, height) {
function isClipPathChanged(clipPaths, prevClipPaths) {
// displayable.__clipPaths can only be `null`/`undefined` or an non-empty array.
- if (clipPaths === prevClipPaths) {
+ if (clipPaths === prevClipPaths) {
return false;
}
if (!clipPaths || !prevClipPaths || (clipPaths.length !== prevClipPaths.length)) {
@@ -9759,12 +9769,12 @@ Painter.prototype = {
var domRoot = this._domRoot;
if (layersMap[zlevel]) {
- log$1('ZLevel ' + zlevel + ' has been used already');
+ logError$1('ZLevel ' + zlevel + ' has been used already');
return;
}
// Check if is a valid layer
if (!isLayerValid(layer)) {
- log$1('Layer of zlevel ' + zlevel + ' is not valid');
+ logError$1('Layer of zlevel ' + zlevel + ' is not valid');
return;
}
@@ -9898,11 +9908,14 @@ Painter.prototype = {
incrementalLayerCount = 1;
}
else {
- layer = this.getLayer(zlevel + (incrementalLayerCount > 0 ? EL_AFTER_INCREMENTAL_INC : 0), this._needsManuallyCompositing);
+ layer = this.getLayer(
+ zlevel + (incrementalLayerCount > 0 ? EL_AFTER_INCREMENTAL_INC : 0),
+ this._needsManuallyCompositing
+ );
}
if (!layer.__builtin__) {
- log$1('ZLevel ' + zlevel + ' has been used by unkown layer ' + layer.id);
+ logError$1('ZLevel ' + zlevel + ' has been used by unkown layer ' + layer.id);
}
if (layer !== prevLayer) {
@@ -10839,7 +10852,7 @@ var painterCtors = {
/**
* @type {string}
*/
-var version$1 = '4.1.0';
+var version$1 = '4.1.1';
/**
* Initializing a zrender instance
@@ -12076,7 +12089,7 @@ var getLineStyle = makeStyleMapper(
var lineStyleMixin = {
getLineStyle: function (excludes) {
var style = getLineStyle(this, excludes);
- // Always set lineDash whether dashed, otherwise we can not
+ // Always set lineDash whether dashed, otherwise we can not
// erase the previous style when assigning to el.style.
style.lineDash = this.getLineDash(style.lineWidth);
return style;
@@ -12089,15 +12102,15 @@ var lineStyleMixin = {
var lineType = this.get('type');
var dotSize = Math.max(lineWidth, 2);
var dashSize = lineWidth * 4;
- return (lineType === 'solid' || lineType == null)
- // Use `false` but not `null` for the solid line here, because `null` might be
- // ignored when assigning to `el.style`. e.g., when setting `lineStyle.type` as
- // `'dashed'` and `emphasis.lineStyle.type` as `'solid'` in graph series, the
- // `lineDash` gotten form the latter one is not able to erase that from the former
+ return (lineType === 'solid' || lineType == null)
+ // Use `false` but not `null` for the solid line here, because `null` might be
+ // ignored when assigning to `el.style`. e.g., when setting `lineStyle.type` as
+ // `'dashed'` and `emphasis.lineStyle.type` as `'solid'` in graph series, the
+ // `lineDash` gotten form the latter one is not able to erase that from the former
// one if using `null` here according to the emhpsis strategy in `util/graphic.js`.
? false
- : lineType === 'dashed'
- ? [dashSize, dashSize]
+ : lineType === 'dashed'
+ ? [dashSize, dashSize]
: [dotSize, dotSize];
}
};
@@ -12856,6 +12869,8 @@ function fromArc(
// TODO getTotalLength, getPointAtLength
+/* global Float32Array */
+
var CMD = {
M: 1,
L: 2,
@@ -13527,9 +13542,12 @@ PathProxy.prototype = {
*/
rebuildPath: function (ctx) {
var d = this.data;
- var x0, y0;
- var xi, yi;
- var x, y;
+ var x0;
+ var y0;
+ var xi;
+ var yi;
+ var x;
+ var y;
var ux = this._ux;
var uy = this._uy;
var len$$1 = this._len;
@@ -16386,6 +16404,8 @@ var NORMAL = 'normal';
var _highlightNextDigit = 1;
var _highlightKeyMap = {};
+var _customShapeMap = {};
+
/**
* Extend shape with parameters
@@ -16402,6 +16422,54 @@ function extendPath(pathData, opts) {
}
/**
+ * Register a user defined shape.
+ * The shape class can be fetched by `getShapeClass`
+ * This method will overwrite the registered shapes, including
+ * the registered built-in shapes, if using the same `name`.
+ * The shape can be used in `custom series` and
+ * `graphic component` by declaring `{type: name}`.
+ *
+ * @param {string} name
+ * @param {Object} ShapeClass Can be generated by `extendShape`.
+ */
+function registerShape(name, ShapeClass) {
+ _customShapeMap[name] = ShapeClass;
+}
+
+/**
+ * Find shape class registered by `registerShape`. Usually used in
+ * fetching user defined shape.
+ *
+ * [Caution]:
+ * (1) This method **MUST NOT be used inside echarts !!!**, unless it is prepared
+ * to use user registered shapes.
+ * Because the built-in shape (see `getBuiltInShape`) will be registered by
+ * `registerShape` by default. That enables users to get both built-in
+ * shapes as well as the shapes belonging to themsleves. But users can overwrite
+ * the built-in shapes by using names like 'circle', 'rect' via calling
+ * `registerShape`. So the echarts inner featrues should not fetch shapes from here
+ * in case that it is overwritten by users, except that some features, like
+ * `custom series`, `graphic component`, do it deliberately.
+ *
+ * (2) In the features like `custom series`, `graphic component`, the user input
+ * `{tpye: 'xxx'}` does not only specify shapes but also specify other graphic
+ * elements like `'group'`, `'text'`, `'image'` or event `'path'`. Those names
+ * are reserved names, that is, if some user register a shape named `'image'`,
+ * the shape will not be used. If we intending to add some more reserved names
+ * in feature, that might bring break changes (disable some existing user shape
+ * names). But that case probably rearly happen. So we dont make more mechanism
+ * to resolve this issue here.
+ *
+ * @param {string} name
+ * @return {Object} The shape class. If not found, return nothing.
+ */
+function getShapeClass(name) {
+ if (_customShapeMap.hasOwnProperty(name)) {
+ return _customShapeMap[name];
+ }
+}
+
+/**
* Create a path element from path data string
* @param {string} pathData
* @param {Object} opts
@@ -16602,11 +16670,12 @@ function singleEnterEmphasis(el) {
return;
}
- var useHoverLayer = el.useHoverLayer;
+ var zr = el.__zr;
+
+ var useHoverLayer = el.useHoverLayer && zr && zr.painter.type === 'canvas';
el.__highlighted = useHoverLayer ? 'layer' : 'plain';
- var zr = el.__zr;
- if (el.isGroup || (!zr && useHoverLayer)) {
+ if (el.isGroup || (!zr && el.useHoverLayer)) {
return;
}
@@ -17088,11 +17157,18 @@ function setTextStyleCommon(textStyle, textStyleModel, opt, isEmphasis) {
opt = opt || EMPTY_OBJ;
if (opt.isRectText) {
- var textPosition = textStyleModel.getShallow('position')
- || (isEmphasis ? null : 'inside');
- // 'outside' is not a valid zr textPostion value, but used
- // in bar series, and magric type should be considered.
- textPosition === 'outside' && (textPosition = 'top');
+ var textPosition;
+ if (opt.getTextPosition) {
+ textPosition = opt.getTextPosition(textStyleModel, isEmphasis);
+ }
+ else {
+ textPosition = textStyleModel.getShallow('position')
+ || (isEmphasis ? null : 'inside');
+ // 'outside' is not a valid zr textPostion value, but used
+ // in bar series, and magric type should be considered.
+ textPosition === 'outside' && (textPosition = 'top');
+ }
+
textStyle.textPosition = textPosition;
textStyle.textOffset = textStyleModel.getShallow('offset');
var labelRotate = textStyleModel.getShallow('rotate');
@@ -17691,6 +17767,18 @@ function nearZero(val) {
return val <= (1e-6) && val >= -(1e-6);
}
+// Register built-in shapes. These shapes might be overwirtten
+// by users, although we do not recommend that.
+registerShape('circle', Circle);
+registerShape('sector', Sector);
+registerShape('ring', Ring);
+registerShape('polygon', Polygon);
+registerShape('polyline', Polyline);
+registerShape('rect', Rect);
+registerShape('line', Line);
+registerShape('bezierCurve', BezierCurve);
+registerShape('arc', Arc);
+
@@ -17699,6 +17787,8 @@ var graphic = (Object.freeze || Object)({
CACHED_LABEL_STYLE_PROPERTIES: CACHED_LABEL_STYLE_PROPERTIES,
extendShape: extendShape,
extendPath: extendPath,
+ registerShape: registerShape,
+ getShapeClass: getShapeClass,
makePath: makePath,
makeImage: makeImage,
mergePath: mergePath,
@@ -18284,7 +18374,7 @@ function enableTopologicalTravel(entity, dependencyGetter) {
var RADIAN_EPSILON = 1e-4;
function _trim(str) {
- return str.replace(/^\s+/, '').replace(/\s+$/, '');
+ return str.replace(/^\s+|\s+$/g, '');
}
/**
@@ -21066,8 +21156,8 @@ var GlobalModel = Model.extend({
* {mainType: 'series', subType: 'pie', query: {seriesName: 'uio'}}
* );
* var result = findComponents(
- * {mainType: 'series'},
- * function (model, index) {...}
+ * {mainType: 'series',
+ * filter: function (model, index) {...}}
* );
* // result like [component0, componnet1, ...]
*
@@ -22386,12 +22476,17 @@ var backwardCompat = function (option, isTheme) {
var seriesType = seriesOpt.type;
- if (seriesType === 'pie' || seriesType === 'gauge') {
+ if (seriesType === 'line') {
+ if (seriesOpt.clipOverflow != null) {
+ seriesOpt.clip = seriesOpt.clipOverflow;
+ }
+ }
+ else if (seriesType === 'pie' || seriesType === 'gauge') {
if (seriesOpt.clockWise != null) {
seriesOpt.clockwise = seriesOpt.clockWise;
}
}
- if (seriesType === 'gauge') {
+ else if (seriesType === 'gauge') {
var pointerColor = get(seriesOpt, 'pointer.color');
pointerColor != null
&& set$1(seriesOpt, 'itemStyle.color', pointerColor);
@@ -22441,7 +22536,7 @@ var backwardCompat = function (option, isTheme) {
// data processing stage is blocked in stream.
// See <module:echarts/stream/Scheduler#performDataProcessorTasks>
// (2) Only register once when import repeatly.
-// Should be executed before after series filtered and before stack calculation.
+// Should be executed after series filtered and before stack calculation.
var dataStack = function (ecModel) {
var stackInfoMap = createHashMap();
ecModel.eachSeries(function (seriesModel) {
@@ -22953,6 +23048,7 @@ var dataFormatMixin = {
var name = data.getName(dataIndex);
var itemOpt = data.getRawDataItem(dataIndex);
var color = data.getItemVisual(dataIndex, 'color');
+ var borderColor = data.getItemVisual(dataIndex, 'borderColor');
var tooltipModel = this.ecModel.getComponent('tooltip');
var renderModeOption = tooltipModel && tooltipModel.get('renderMode');
var renderMode = getTooltipRenderMode(renderModeOption);
@@ -22974,6 +23070,7 @@ var dataFormatMixin = {
dataType: dataType,
value: rawValue,
color: color,
+ borderColor: borderColor,
dimensionNames: userOutput ? userOutput.dimensionNames : null,
encode: userOutput ? userOutput.encode : null,
marker: getTooltipMarker({
@@ -23452,6 +23549,11 @@ var SeriesModel = ComponentModel.extend({
visualColorAccessPath: 'itemStyle.color',
/**
+ * Access path of borderColor for visual
+ */
+ visualBorderColorAccessPath: 'itemStyle.borderColor',
+
+ /**
* Support merge layout params.
* Only support 'box' now (left/right/top/bottom/width/height).
* @type {string|Object} Object can be {ignoreSize: true}
@@ -24050,10 +24152,10 @@ Component.prototype = {
};
var componentProto = Component.prototype;
-componentProto.updateView
- = componentProto.updateLayout
- = componentProto.updateVisual
- = function (seriesModel, ecModel, api, payload) {
+componentProto.updateView =
+ componentProto.updateLayout =
+ componentProto.updateVisual =
+ function (seriesModel, ecModel, api, payload) {
// Do nothing;
};
// Enable Component.extend.
@@ -24536,6 +24638,10 @@ var seriesColor = {
// FIXME Set color function or use the platte color
data.setVisual('color', color);
+
+ var borderColorAccessPath = (seriesModel.visualBorderColorAccessPath || 'itemStyle.borderColor').split('.');
+ var borderColor = seriesModel.get(borderColorAccessPath);
+ data.setVisual('borderColor', borderColor);
// Only visible series has each data be visual encoded
if (!ecModel.isSeriesFiltered(seriesModel)) {
@@ -24551,9 +24657,13 @@ var seriesColor = {
var dataEach = function (data, idx) {
var itemModel = data.getItemModel(idx);
var color = itemModel.get(colorAccessPath, true);
+ var borderColor = itemModel.get(borderColorAccessPath, true);
if (color != null) {
data.setItemVisual(idx, 'color', color);
}
+ if (borderColor != null) {
+ data.setItemVisual(idx, 'borderColor', borderColor);
+ }
};
return { dataEach: data.hasItemOption ? dataEach : null };
@@ -24580,8 +24690,17 @@ var seriesColor = {
* under the License.
*/
+/**
+ * Language: English.
+ */
var lang = {
+ legend: {
+ selector: {
+ all: 'All',
+ inverse: 'Inv'
+ }
+ },
toolbox: {
brush: {
title: {
@@ -26558,15 +26677,17 @@ var isFunction = isFunction$1;
var isObject = isObject$1;
var parseClassType = ComponentModel.parseClassType;
-var version = '4.3.0';
+var version = '4.4.0';
var dependencies = {
- zrender: '4.1.0'
+ zrender: '4.1.1'
};
var TEST_FRAME_REMAIN_TIME = 1;
var PRIORITY_PROCESSOR_FILTER = 1000;
+var PRIORITY_PROCESSOR_SERIES_FILTER = 800;
+var PRIORITY_PROCESSOR_DATASTACK = 900;
var PRIORITY_PROCESSOR_STATISTIC = 5000;
var PRIORITY_VISUAL_LAYOUT = 1000;
@@ -26582,6 +26703,7 @@ var PRIORITY_VISUAL_BRUSH = 5000;
var PRIORITY = {
PROCESSOR: {
FILTER: PRIORITY_PROCESSOR_FILTER,
+ SERIES_FILTER: PRIORITY_PROCESSOR_SERIES_FILTER,
STATISTIC: PRIORITY_PROCESSOR_STATISTIC
},
VISUAL: {
@@ -26605,8 +26727,13 @@ var OPTION_UPDATED = '__optionUpdated';
var ACTION_REG = /^[a-zA-Z0-9_]+$/;
-function createRegisterEventWithLowercaseName(method) {
+function createRegisterEventWithLowercaseName(method, ignoreDisposed) {
return function (eventName, handler, context) {
+ if (!ignoreDisposed && this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
// Event name is all lowercase
eventName = eventName && eventName.toLowerCase();
Eventful.prototype[method].call(this, eventName, handler, context);
@@ -26619,9 +26746,9 @@ function createRegisterEventWithLowercaseName(method) {
function MessageCenter() {
Eventful.call(this);
}
-MessageCenter.prototype.on = createRegisterEventWithLowercaseName('on');
-MessageCenter.prototype.off = createRegisterEventWithLowercaseName('off');
-MessageCenter.prototype.one = createRegisterEventWithLowercaseName('one');
+MessageCenter.prototype.on = createRegisterEventWithLowercaseName('on', true);
+MessageCenter.prototype.off = createRegisterEventWithLowercaseName('off', true);
+MessageCenter.prototype.one = createRegisterEventWithLowercaseName('one', true);
mixin(MessageCenter, Eventful);
/**
@@ -26857,6 +26984,10 @@ echartsProto.setOption = function (option, notMerge, lazyUpdate) {
if (__DEV__) {
assert(!this[IN_MAIN_PROCESS], '`setOption` should not be called during main process.');
}
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
var silent;
if (isObject(notMerge)) {
@@ -26992,6 +27123,11 @@ echartsProto.getSvgDataUrl = function () {
* @param {string} [opts.excludeComponents]
*/
echartsProto.getDataURL = function (opts) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
opts = opts || {};
var excludeComponents = opts.excludeComponents;
var ecModel = this._model;
@@ -27032,6 +27168,11 @@ echartsProto.getDataURL = function (opts) {
* @param {string} [opts.backgroundColor]
*/
echartsProto.getConnectedDataURL = function (opts) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
if (!env$1.canvasSupported) {
return;
}
@@ -27151,6 +27292,11 @@ echartsProto.convertToPixel = curry(doConvertPixel, 'convertToPixel');
echartsProto.convertFromPixel = curry(doConvertPixel, 'convertFromPixel');
function doConvertPixel(methodName, finder, value) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
var ecModel = this._model;
var coordSysList = this._coordSysMgr.getCoordinateSystems();
var result;
@@ -27191,6 +27337,11 @@ function doConvertPixel(methodName, finder, value) {
* @return {boolean} result
*/
echartsProto.containPixel = function (finder, value) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
var ecModel = this._model;
var result;
@@ -27563,6 +27714,10 @@ echartsProto.resize = function (opts) {
if (__DEV__) {
assert(!this[IN_MAIN_PROCESS], '`resize` should not be called during main process.');
}
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
this._zr.resize(opts);
@@ -27605,6 +27760,11 @@ function updateStreamModes(ecIns, ecModel) {
* @param {Object} [cfg]
*/
echartsProto.showLoading = function (name, cfg) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
if (isObject(name)) {
cfg = name;
name = '';
@@ -27629,6 +27789,11 @@ echartsProto.showLoading = function (name, cfg) {
* Hide loading effect
*/
echartsProto.hideLoading = function () {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
this._loadingFX && this._zr.remove(this._loadingFX);
this._loadingFX = null;
};
@@ -27652,10 +27817,15 @@ echartsProto.makeActionFromEvent = function (eventObj) {
* @param {boolean} [opt.flush=undefined]
* true: Flush immediately, and then pixel in canvas can be fetched
* immediately. Caution: it might affect performance.
- * false: Not not flush.
+ * false: Not flush.
* undefined: Auto decide whether perform flush.
*/
echartsProto.dispatchAction = function (payload, opt) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
if (!isObject(opt)) {
opt = {silent: !!opt};
}
@@ -27824,6 +27994,11 @@ function bindRenderedEvent(zr, ecIns) {
* @param {Array|TypedArray} params.data
*/
echartsProto.appendData = function (params) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
var seriesIndex = params.seriesIndex;
var ecModel = this.getModel();
var seriesModel = ecModel.getSeriesByIndex(seriesIndex);
@@ -27849,9 +28024,9 @@ echartsProto.appendData = function (params) {
* Register event
* @method
*/
-echartsProto.on = createRegisterEventWithLowercaseName('on');
-echartsProto.off = createRegisterEventWithLowercaseName('off');
-echartsProto.one = createRegisterEventWithLowercaseName('one');
+echartsProto.on = createRegisterEventWithLowercaseName('on', false);
+echartsProto.off = createRegisterEventWithLowercaseName('off', false);
+echartsProto.one = createRegisterEventWithLowercaseName('one', false);
/**
* Prepare view instances of charts and components
@@ -28129,6 +28304,10 @@ echartsProto.isDisposed = function () {
* Clear
*/
echartsProto.clear = function () {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
this.setOption({ series: [] }, true);
};
@@ -28137,9 +28316,7 @@ echartsProto.clear = function () {
*/
echartsProto.dispose = function () {
if (this._disposed) {
- if (__DEV__) {
- console.warn('Instance ' + this.id + ' has been disposed');
- }
+ disposedWarning(this.id);
return;
}
this._disposed = true;
@@ -28164,6 +28341,12 @@ echartsProto.dispose = function () {
mixin(ECharts, Eventful);
+function disposedWarning(id) {
+ if (__DEV__) {
+ console.warn('Instance ' + id + ' has been disposed');
+ }
+}
+
function updateHoverLayerStatus(ecIns, ecModel) {
var zr = ecIns._zr;
var storage = zr.storage;
@@ -28513,9 +28696,9 @@ function init(dom, theme$$1, opts) {
)
) {
console.warn('Can\'t get DOM width or height. Please check '
- + 'dom.clientWidth and dom.clientHeight. They should not be 0.'
- + 'For example, you may need to call this in the callback '
- + 'of window.onload.');
+ + 'dom.clientWidth and dom.clientHeight. They should not be 0.'
+ + 'For example, you may need to call this in the callback '
+ + 'of window.onload.');
}
}
@@ -28866,7 +29049,7 @@ function getMap(mapName) {
registerVisual(PRIORITY_VISUAL_GLOBAL, seriesColor);
registerPreprocessor(backwardCompat);
-registerProcessor(PRIORITY_PROCESSOR_STATISTIC, dataStack);
+registerProcessor(PRIORITY_PROCESSOR_DATASTACK, dataStack);
registerLoading('default', loadingDefault);
// Default actions
@@ -31353,8 +31536,8 @@ function completeDimensions(sysDims, source, opt) {
// `coordDimIndex` should not be set directly.
sysDimItemDimsDef = sysDimItem.dimsDef;
sysDimItemOtherDims = sysDimItem.otherDims;
- sysDimItem.name = sysDimItem.coordDim = sysDimItem.coordDimIndex
- = sysDimItem.dimsDef = sysDimItem.otherDims = null;
+ sysDimItem.name = sysDimItem.coordDim = sysDimItem.coordDimIndex =
+ sysDimItem.dimsDef = sysDimItem.otherDims = null;
}
var dataDims = encodeDef.get(coordDim);
@@ -31853,7 +32036,7 @@ SeriesModel.extend({
// polarIndex: 0,
// If clip the overflow value
- clipOverflow: true,
+ clip: true,
// cursor: null,
label: {
@@ -33619,89 +33802,21 @@ var Polygon$1 = Path.extend({
* specific language governing permissions and limitations
* under the License.
*/
-
-// FIXME step not support polar
-
-function isPointsSame(points1, points2) {
- if (points1.length !== points2.length) {
- return;
- }
- for (var i = 0; i < points1.length; i++) {
- var p1 = points1[i];
- var p2 = points2[i];
- if (p1[0] !== p2[0] || p1[1] !== p2[1]) {
- return;
- }
- }
- return true;
-}
-
-function getSmooth(smooth) {
- return typeof (smooth) === 'number' ? smooth : (smooth ? 0.5 : 0);
-}
-
-function getAxisExtentWithGap(axis) {
- var extent = axis.getGlobalExtent();
- if (axis.onBand) {
- // Remove extra 1px to avoid line miter in clipped edge
- var halfBandWidth = axis.getBandWidth() / 2 - 1;
- var dir = extent[1] > extent[0] ? 1 : -1;
- extent[0] += dir * halfBandWidth;
- extent[1] -= dir * halfBandWidth;
- }
- return extent;
-}
-
-/**
- * @param {module:echarts/coord/cartesian/Cartesian2D|module:echarts/coord/polar/Polar} coordSys
- * @param {module:echarts/data/List} data
- * @param {Object} dataCoordInfo
- * @param {Array.<Array.<number>>} points
- */
-function getStackedOnPoints(coordSys, data, dataCoordInfo) {
- if (!dataCoordInfo.valueDim) {
- return [];
- }
-
- var points = [];
- for (var idx = 0, len = data.count(); idx < len; idx++) {
- points.push(getStackedOnPoint(dataCoordInfo, coordSys, data, idx));
- }
-
- return points;
-}
-
-function createGridClipShape(cartesian, hasAnimation, forSymbol, seriesModel) {
- var xExtent = getAxisExtentWithGap(cartesian.getAxis('x'));
- var yExtent = getAxisExtentWithGap(cartesian.getAxis('y'));
+function createGridClipPath(cartesian, hasAnimation, seriesModel) {
+ var rect = cartesian.getArea();
var isHorizontal = cartesian.getBaseAxis().isHorizontal();
- var x = Math.min(xExtent[0], xExtent[1]);
- var y = Math.min(yExtent[0], yExtent[1]);
- var width = Math.max(xExtent[0], xExtent[1]) - x;
- var height = Math.max(yExtent[0], yExtent[1]) - y;
+ var x = rect.x;
+ var y = rect.y;
+ var width = rect.width;
+ var height = rect.height;
- // Avoid float number rounding error for symbol on the edge of axis extent.
- // See #7913 and `test/dataZoom-clip.html`.
- if (forSymbol) {
- x -= 0.5;
- width += 0.5;
- y -= 0.5;
- height += 0.5;
- }
- else {
- var lineWidth = seriesModel.get('lineStyle.width') || 2;
- // Expand clip shape to avoid clipping when line value exceeds axis
- var expandSize = seriesModel.get('clipOverflow') ? lineWidth / 2 : Math.max(width, height);
- if (isHorizontal) {
- y -= expandSize;
- height += expandSize * 2;
- }
- else {
- x -= expandSize;
- width += expandSize * 2;
- }
- }
+ var lineWidth = seriesModel.get('lineStyle.width') || 2;
+ // Expand the clip path a bit to avoid the border is clipped and looks thinner
+ x -= lineWidth / 2;
+ y -= lineWidth / 2;
+ width += lineWidth;
+ height += lineWidth;
var clipPath = new Rect({
shape: {
@@ -33725,50 +33840,102 @@ function createGridClipShape(cartesian, hasAnimation, forSymbol, seriesModel) {
return clipPath;
}
-function createPolarClipShape(polar, hasAnimation, forSymbol, seriesModel) {
- var angleAxis = polar.getAngleAxis();
- var radiusAxis = polar.getRadiusAxis();
-
- var radiusExtent = radiusAxis.getExtent().slice();
- radiusExtent[0] > radiusExtent[1] && radiusExtent.reverse();
- var angleExtent = angleAxis.getExtent();
-
- var RADIAN = Math.PI / 180;
-
+function createPolarClipPath(polar, hasAnimation, seriesModel) {
+ var sectorArea = polar.getArea();
// Avoid float number rounding error for symbol on the edge of axis extent.
- if (forSymbol) {
- radiusExtent[0] -= 0.5;
- radiusExtent[1] += 0.5;
- }
var clipPath = new Sector({
shape: {
cx: round$1(polar.cx, 1),
cy: round$1(polar.cy, 1),
- r0: round$1(radiusExtent[0], 1),
- r: round$1(radiusExtent[1], 1),
- startAngle: -angleExtent[0] * RADIAN,
- endAngle: -angleExtent[1] * RADIAN,
- clockwise: angleAxis.inverse
+ r0: round$1(sectorArea.r0, 1),
+ r: round$1(sectorArea.r, 1),
+ startAngle: sectorArea.startAngle,
+ endAngle: sectorArea.endAngle,
+ clockwise: sectorArea.clockwise
}
});
if (hasAnimation) {
- clipPath.shape.endAngle = -angleExtent[0] * RADIAN;
+ clipPath.shape.endAngle = sectorArea.startAngle;
initProps(clipPath, {
shape: {
- endAngle: -angleExtent[1] * RADIAN
+ endAngle: sectorArea.endAngle
}
}, seriesModel);
}
-
return clipPath;
}
-function createClipShape(coordSys, hasAnimation, forSymbol, seriesModel) {
- return coordSys.type === 'polar'
- ? createPolarClipShape(coordSys, hasAnimation, forSymbol, seriesModel)
- : createGridClipShape(coordSys, hasAnimation, forSymbol, seriesModel);
+function createClipPath(coordSys, hasAnimation, seriesModel) {
+ if (!coordSys) {
+ return null;
+ }
+ else if (coordSys.type === 'polar') {
+ return createPolarClipPath(coordSys, hasAnimation, seriesModel);
+ }
+ else if (coordSys.type === 'cartesian2d') {
+ return createGridClipPath(coordSys, hasAnimation, seriesModel);
+ }
+ return null;
+}
+
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+// FIXME step not support polar
+
+function isPointsSame(points1, points2) {
+ if (points1.length !== points2.length) {
+ return;
+ }
+ for (var i = 0; i < points1.length; i++) {
+ var p1 = points1[i];
+ var p2 = points2[i];
+ if (p1[0] !== p2[0] || p1[1] !== p2[1]) {
+ return;
+ }
+ }
+ return true;
+}
+
+function getSmooth(smooth) {
+ return typeof (smooth) === 'number' ? smooth : (smooth ? 0.5 : 0);
+}
+
+/**
+ * @param {module:echarts/coord/cartesian/Cartesian2D|module:echarts/coord/polar/Polar} coordSys
+ * @param {module:echarts/data/List} data
+ * @param {Object} dataCoordInfo
+ * @param {Array.<Array.<number>>} points
+ */
+function getStackedOnPoints(coordSys, data, dataCoordInfo) {
+ if (!dataCoordInfo.valueDim) {
+ return [];
+ }
+
+ var points = [];
+ for (var idx = 0, len = data.count(); idx < len; idx++) {
+ points.push(getStackedOnPoint(dataCoordInfo, coordSys, data, idx));
+ }
+
+ return points;
}
function turnPointsIntoStep(points, coordSys, stepTurnAt) {
@@ -33967,6 +34134,31 @@ function canShowAllSymbolForCategory(categoryAxis, data) {
return true;
}
+function createLineClipPath(coordSys, hasAnimation, seriesModel) {
+ if (coordSys.type === 'cartesian2d') {
+ var isHorizontal = coordSys.getBaseAxis().isHorizontal();
+ var clipPath = createGridClipPath(coordSys, hasAnimation, seriesModel);
+ // Expand clip shape to avoid clipping when line value exceeds axis
+ if (!seriesModel.get('clip', true)) {
+ var rectShape = clipPath.shape;
+ var expandSize = Math.max(rectShape.width, rectShape.height);
+ if (isHorizontal) {
+ rectShape.y -= expandSize;
+ rectShape.height += expandSize * 2;
+ }
+ else {
+ rectShape.x -= expandSize;
+ rectShape.width += expandSize * 2;
+ }
+ }
+ return clipPath;
+ }
+ else {
+ return createPolarClipPath(coordSys, hasAnimation, seriesModel);
+ }
+
+}
+
Chart.extend({
type: 'line',
@@ -34031,13 +34223,29 @@ Chart.extend({
// FIXME step not support polar
var step = !isCoordSysPolar && seriesModel.get('step');
+ var clipShapeForSymbol;
+ if (coordSys && coordSys.getArea) {
+ clipShapeForSymbol = coordSys.getArea();
+ // Avoid float number rounding error for symbol on the edge of axis extent.
+ // See #7913 and `test/dataZoom-clip.html`.
+ if (clipShapeForSymbol.width != null) {
+ clipShapeForSymbol.x -= 0.1;
+ clipShapeForSymbol.y -= 0.1;
+ clipShapeForSymbol.width += 0.2;
+ clipShapeForSymbol.height += 0.2;
+ }
+ else if (clipShapeForSymbol.r0) {
+ clipShapeForSymbol.r0 -= 0.5;
+ clipShapeForSymbol.r1 += 0.5;
+ }
+ }
// Initialization animation or coordinate system changed
if (
!(polyline && prevCoordSys.type === coordSys.type && step === this._step)
) {
showSymbol && symbolDraw.updateData(data, {
isIgnore: isIgnoreFunc,
- clipShape: createClipShape(coordSys, false, true, seriesModel)
+ clipShape: clipShapeForSymbol
});
if (step) {
@@ -34053,7 +34261,7 @@ Chart.extend({
coordSys, hasAnimation
);
}
- lineGroup.setClipPath(createClipShape(coordSys, true, false, seriesModel));
+ lineGroup.setClipPath(createLineClipPath(coordSys, true, seriesModel));
}
else {
if (isAreaChart && !polygon) {
@@ -34070,13 +34278,13 @@ Chart.extend({
}
// Update clipPath
- lineGroup.setClipPath(createClipShape(coordSys, false, false, seriesModel));
+ lineGroup.setClipPath(createLineClipPath(coordSys, false, seriesModel));
// Always update, or it is wrong in the case turning on legend
// because points are not changed
showSymbol && symbolDraw.updateData(data, {
isIgnore: isIgnoreFunc,
- clipShape: createClipShape(coordSys, false, true, seriesModel)
+ clipShape: clipShapeForSymbol
});
// Stop symbol animation and sync with line points
@@ -34378,12 +34586,12 @@ Chart.extend({
}
});
- this._polyline
- = this._polygon
- = this._coordSys
- = this._points
- = this._stackedOnPoints
- = this._data = null;
+ this._polyline =
+ this._polygon =
+ this._coordSys =
+ this._points =
+ this._stackedOnPoints =
+ this._data = null;
}
});
@@ -35625,6 +35833,7 @@ function doCalBarWidthAndOffset(seriesInfoList) {
var offset = -widthSum / 2;
each$1(stacks, function (column, stackId) {
result[coordSysName][stackId] = result[coordSysName][stackId] || {
+ bandWidth: bandWidth,
offset: offset,
width: column.width
};
@@ -35678,6 +35887,7 @@ function layout(seriesType, ecModel) {
lastStackCoords[stackId] = lastStackCoords[stackId] || [];
data.setLayout({
+ bandWidth: columnLayoutInfo.bandWidth,
offset: columnOffset,
size: columnWidth
});
@@ -35829,23 +36039,7 @@ function isInLargeMode(seriesModel) {
// See cases in `test/bar-start.html` and `#7412`, `#8747`.
function getValueAxisStart(baseAxis, valueAxis, stacked) {
- var extent = valueAxis.getGlobalExtent();
- var min;
- var max;
- if (extent[0] > extent[1]) {
- min = extent[1];
- max = extent[0];
- }
- else {
- min = extent[0];
- max = extent[1];
- }
-
- var valueStart = valueAxis.toGlobalCoord(valueAxis.dataToCoord(0));
- valueStart < min && (valueStart = min);
- valueStart > max && (valueStart = max);
-
- return valueStart;
+ return valueAxis.toGlobalCoord(valueAxis.dataToCoord(0));
}
/*
@@ -36920,6 +37114,23 @@ Cartesian2D.prototype = {
*/
getOtherAxis: function (axis) {
return this.getAxis(axis.dim === 'x' ? 'y' : 'x');
+ },
+
+ /**
+ * Get rect area of cartesian.
+ * Area will have a contain function to determine if a point is in the coordinate system.
+ * @return {BoundingRect}
+ */
+ getArea: function () {
+ var xExtent = this.getAxis('x').getGlobalExtent();
+ var yExtent = this.getAxis('y').getGlobalExtent();
+ var x = Math.min(xExtent[0], xExtent[1]);
+ var y = Math.min(yExtent[0], yExtent[1]);
+ var width = Math.max(xExtent[0], xExtent[1]) - x;
+ var height = Math.max(yExtent[0], yExtent[1]) - y;
+
+ var rect = new BoundingRect(x, y, width, height);
+ return rect;
}
};
@@ -40380,8 +40591,13 @@ BaseBarSeries.extend({
progressiveThreshold = largeThreshold;
}
return progressiveThreshold;
- }
+ },
+ defaultOption: {
+ // If clipped
+ // Only available on cartesian2d
+ clip: true
+ }
});
/*
@@ -40502,6 +40718,29 @@ var _eventPos = [0, 0];
// Just for compatible with ec2.
extend(Model.prototype, barItemStyle);
+function getClipArea(coord, data) {
+ var coordSysClipArea = coord.getArea && coord.getArea();
+ if (coord.type === 'cartesian2d') {
+ var baseAxis = coord.getBaseAxis();
+ // When boundaryGap is false or using time axis. bar may exceed the grid.
+ // We should not clip this part.
+ // See test/bar2.html
+ if (baseAxis.type !== 'category' || !baseAxis.onBand) {
+ var expandWidth = data.getLayout('bandWidth');
+ if (baseAxis.isHorizontal()) {
+ coordSysClipArea.x -= expandWidth;
+ coordSysClipArea.width += expandWidth * 2;
+ }
+ else {
+ coordSysClipArea.y -= expandWidth;
+ coordSysClipArea.height += expandWidth * 2;
+ }
+ }
+ }
+
+ return coordSysClipArea;
+}
+
extendChartView({
type: 'bar',
@@ -40561,6 +40800,13 @@ extendChartView({
var animationModel = seriesModel.isAnimationEnabled() ? seriesModel : null;
+ var needsClip = seriesModel.get('clip', true);
+ var coordSysClipArea = getClipArea(coord, data);
+ // If there is clipPath created in large mode. Remove it.
+ group.removeClipPath();
+ // We don't use clipPath in normal mode because we needs a perfect animation
+ // And don't want the label are clipped.
+
data.diff(oldData)
.add(function (dataIndex) {
if (!data.hasValue(dataIndex)) {
@@ -40569,6 +40815,17 @@ extendChartView({
var itemModel = data.getItemModel(dataIndex);
var layout = getLayout[coord.type](data, dataIndex, itemModel);
+
+ if (needsClip) {
+ // Clip will modify the layout params.
+ // And return a boolean to determine if the shape are fully clipped.
+ var isClipped = clip[coord.type](coordSysClipArea, layout);
+ if (isClipped) {
+ group.remove(el);
+ return;
+ }
+ }
+
var el = elementCreator[coord.type](
data, dataIndex, itemModel, layout, isHorizontalOrRadial, animationModel
);
@@ -40591,6 +40848,14 @@ extendChartView({
var itemModel = data.getItemModel(newIndex);
var layout = getLayout[coord.type](data, newIndex, itemModel);
+ if (needsClip) {
+ var isClipped = clip[coord.type](coordSysClipArea, layout);
+ if (isClipped) {
+ group.remove(el);
+ return;
+ }
+ }
+
if (el) {
updateProps(el, {shape: layout}, animationModel, newIndex);
}
@@ -40626,6 +40891,17 @@ extendChartView({
_renderLarge: function (seriesModel, ecModel, api) {
this._clear();
createLarge(seriesModel, this.group);
+
+ // Use clipPath in large mode.
+ var clipPath = seriesModel.get('clip', true)
+ ? createClipPath(seriesModel.coordinateSystem, false, seriesModel)
+ : null;
+ if (clipPath) {
+ this.group.setClipPath(clipPath);
+ }
+ else {
+ this.group.removeClipPath();
+ }
},
_incrementalRenderLarge: function (params, seriesModel) {
@@ -40659,6 +40935,53 @@ extendChartView({
});
+var mathMax$4 = Math.max;
+var mathMin$4 = Math.min;
+
+var clip = {
+ cartesian2d: function (coordSysBoundingRect, layout) {
+ var signWidth = layout.width < 0 ? -1 : 1;
+ var signHeight = layout.height < 0 ? -1 : 1;
+ // Needs positive width and height
+ if (signWidth < 0) {
+ layout.x += layout.width;
+ layout.width = -layout.width;
+ }
+ if (signHeight < 0) {
+ layout.y += layout.height;
+ layout.height = -layout.height;
+ }
+
+ var x = mathMax$4(layout.x, coordSysBoundingRect.x);
+ var x2 = mathMin$4(layout.x + layout.width, coordSysBoundingRect.x + coordSysBoundingRect.width);
+ var y = mathMax$4(layout.y, coordSysBoundingRect.y);
+ var y2 = mathMin$4(layout.y + layout.height, coordSysBoundingRect.y + coordSysBoundingRect.height);
+
+ layout.x = x;
+ layout.y = y;
+ layout.width = x2 - x;
+ layout.height = y2 - y;
+
+ var clipped = layout.width < 0 || layout.height < 0;
+
+ // Reverse back
+ if (signWidth < 0) {
+ layout.x += layout.width;
+ layout.width = -layout.width;
+ }
+ if (signHeight < 0) {
+ layout.y += layout.height;
+ layout.height = -layout.height;
+ }
+
+ return clipped;
+ },
+
+ polar: function (coordSysClipArea) {
+ return false;
+ }
+};
+
var elementCreator = {
cartesian2d: function (
@@ -41262,9 +41585,12 @@ var PieSeries = extendSeriesModel({
borderWidth: 1
},
- // Animation type canbe expansion, scale
+ // Animation type. Valid values: expansion, scale
animationType: 'expansion',
+ // Animation type when update. Valid values: transition, expansion
+ animationTypeUpdate: 'transition',
+
animationEasing: 'cubicOut'
}
});
@@ -41381,6 +41707,8 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
var sectorShape = extend({}, layout);
sectorShape.label = null;
+ var animationTypeUpdate = seriesModel.getShallow('animationTypeUpdate');
+
if (firstCreate) {
sector.setShape(sectorShape);
@@ -41405,9 +41733,16 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
}
else {
- updateProps(sector, {
- shape: sectorShape
- }, seriesModel, idx);
+ if (animationTypeUpdate === 'expansion') {
+ // Sectors are set to be target shape and an overlaying clipPath is used for animation
+ sector.setShape(sectorShape);
+ }
+ else {
+ // Transition animation from the old shape
+ updateProps(sector, {
+ shape: sectorShape
+ }, seriesModel, idx);
+ }
}
// Update common style
@@ -41436,7 +41771,9 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
seriesModel.get('animation')
);
- this._updateLabel(data, idx);
+ // Label and text animation should be applied only for transition type animation when update
+ var withAnimation = !firstCreate && animationTypeUpdate === 'transition';
+ this._updateLabel(data, idx, withAnimation);
this.highDownOnUpdate = (itemModel.get('hoverAnimation') && seriesModel.isAnimationEnabled())
? function (fromState, toState) {
@@ -41470,7 +41807,7 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
setHoverStyle(this);
};
-piePieceProto._updateLabel = function (data, idx) {
+piePieceProto._updateLabel = function (data, idx, withAnimation) {
var labelLine = this.childAt(1);
var labelText = this.childAt(2);
@@ -41487,20 +41824,33 @@ piePieceProto._updateLabel = function (data, idx) {
return;
}
- updateProps(labelLine, {
- shape: {
- points: labelLayout.linePoints || [
- [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y]
- ]
- }
- }, seriesModel, idx);
+ var targetLineShape = {
+ points: labelLayout.linePoints || [
+ [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y]
+ ]
+ };
+ var targetTextStyle = {
+ x: labelLayout.x,
+ y: labelLayout.y
+ };
+ if (withAnimation) {
+ updateProps(labelLine, {
+ shape: targetLineShape
+ }, seriesModel, idx);
+
+ updateProps(labelText, {
+ style: targetTextStyle
+ }, seriesModel, idx);
+ }
+ else {
+ labelLine.attr({
+ shape: targetLineShape
+ });
+ labelText.attr({
+ style: targetTextStyle
+ });
+ }
- updateProps(labelText, {
- style: {
- x: labelLayout.x,
- y: labelLayout.y
- }
- }, seriesModel, idx);
labelText.attr({
rotation: labelLayout.rotation,
origin: [labelLayout.x, labelLayout.y],
@@ -41578,6 +41928,7 @@ var PieView = Chart.extend({
var hasAnimation = ecModel.get('animation');
var isFirstRender = !oldData;
var animationType = seriesModel.get('animationType');
+ var animationTypeUpdate = seriesModel.get('animationTypeUpdate');
var onSectorClick = curry(
updateDataSelected, this.uid, seriesModel, hasAnimation, api
@@ -41603,6 +41954,12 @@ var PieView = Chart.extend({
.update(function (newIdx, oldIdx) {
var piePiece = oldData.getItemGraphicEl(oldIdx);
+ if (!isFirstRender && animationTypeUpdate !== 'transition') {
+ piePiece.eachChild(function (child) {
+ child.stopAnimation(true);
+ });
+ }
+
piePiece.updateData(data, newIdx);
piePiece.off('click');
@@ -41617,9 +41974,8 @@ var PieView = Chart.extend({
.execute();
if (
- hasAnimation && isFirstRender && data.count() > 0
- // Default expansion animation
- && animationType !== 'scale'
+ hasAnimation && data.count() > 0
+ && (isFirstRender ? animationType !== 'scale' : animationTypeUpdate !== 'transition')
) {
var shape = data.getItemLayout(0);
for (var s = 1; isNaN(shape.startAngle) && s < data.count(); ++s) {
@@ -41630,7 +41986,7 @@ var PieView = Chart.extend({
var removeClipPath = bind(group.removeClipPath, group);
group.setClipPath(this._createClipPath(
- shape.cx, shape.cy, r, shape.startAngle, shape.clockwise, removeClipPath, seriesModel
+ shape.cx, shape.cy, r, shape.startAngle, shape.clockwise, removeClipPath, seriesModel, isFirstRender
));
}
else {
@@ -41644,7 +42000,7 @@ var PieView = Chart.extend({
dispose: function () {},
_createClipPath: function (
- cx, cy, r, startAngle, clockwise, cb, seriesModel
+ cx, cy, r, startAngle, clockwise, cb, seriesModel, isFirstRender
) {
var clipPath = new Sector({
shape: {
@@ -41658,7 +42014,8 @@ var PieView = Chart.extend({
}
});
- initProps(clipPath, {
+ var initOrUpdate = isFirstRender ? initProps : updateProps;
+ initOrUpdate(clipPath, {
shape: {
endAngle: startAngle + (clockwise ? 1 : -1) * Math.PI * 2
}
@@ -41792,10 +42149,16 @@ var dataColor = function (seriesType) {
var singleDataColor = filteredIdx != null
&& data.getItemVisual(filteredIdx, 'color', true);
- if (!singleDataColor) {
+ var singleDataBorderColor = filteredIdx != null
+ && data.getItemVisual(filteredIdx, 'borderColor', true);
+
+ var itemModel;
+ if (!singleDataColor || !singleDataBorderColor) {
// FIXME Performance
- var itemModel = dataAll.getItemModel(rawIdx);
+ itemModel = dataAll.getItemModel(rawIdx);
+ }
+ if (!singleDataColor) {
var color = itemModel.get('itemStyle.color')
|| seriesModel.getColorFromPalette(
dataAll.getName(rawIdx) || (rawIdx + ''), seriesModel.__paletteScope,
@@ -41813,6 +42176,21 @@ var dataColor = function (seriesType) {
// Set data all color for legend
dataAll.setItemVisual(rawIdx, 'color', singleDataColor);
}
+
+ if (!singleDataBorderColor) {
+ var borderColor = itemModel.get('itemStyle.borderColor');
+ // Legend may use the visual info in data before processed
+ dataAll.setItemVisual(rawIdx, 'borderColor', borderColor);
+
+ // Data is not filtered
+ if (filteredIdx != null) {
+ data.setItemVisual(filteredIdx, 'borderColor', borderColor);
+ }
+ }
+ else {
+ // Set data all borderColor for legend
+ dataAll.setItemVisual(rawIdx, 'borderColor', singleDataBorderColor);
+ }
});
}
};
diff --git a/dist/echarts-en.simple.min.js b/dist/echarts-en.simple.min.js
index ab7d46c..436c768 100644
--- a/dist/echarts-en.simple.min.js
+++ b/dist/echarts-en.simple.min.js
@@ -19,4 +19,4 @@
*/
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";var e=2311,n=function(){return e++},m="object"==typeof wx&&"function"==typeof wx.getSystemInfoSync?{browser:{},os:{},node:!1,wxa:!0,canvasSupported:!0,svgSupported:!1,touchEventsSupported:!0,domSupported:!1}:"undefined"==typeof document&&"undefined"!=typeof self?{browser:{},os:{},node:!1,worker:!0,canvasS [...]
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";var e=2311,n=function(){return e++},m="object"==typeof wx&&"function"==typeof wx.getSystemInfoSync?{browser:{},os:{},node:!1,wxa:!0,canvasSupported:!0,svgSupported:!1,touchEventsSupported:!0,domSupported:!1}:"undefined"==typeof document&&"undefined"!=typeof self?{browser:{},os:{},node:!1,worker:!0,canvasS [...]
diff --git a/dist/echarts.common.js b/dist/echarts.common.js
index 0615b10..08638e4 100644
--- a/dist/echarts.common.js
+++ b/dist/echarts.common.js
@@ -66,6 +66,8 @@ var guid = function () {
* @desc thanks zepto.
*/
+/* global wx */
+
var env = {};
if (typeof wx === 'object' && typeof wx.getSystemInfoSync === 'function') {
@@ -480,7 +482,9 @@ function inherits(clazz, baseClazz) {
clazz.prototype = new F();
for (var prop in clazzPrototype) {
- clazz.prototype[prop] = clazzPrototype[prop];
+ if (clazzPrototype.hasOwnProperty(prop)) {
+ clazz.prototype[prop] = clazzPrototype[prop];
+ }
}
clazz.prototype.constructor = clazz;
clazz.superClass = baseClazz;
@@ -732,6 +736,7 @@ function isDom(value) {
* @return {boolean}
*/
function eqNaN(value) {
+ /* eslint-disable-next-line no-self-compare */
return value !== value;
}
@@ -876,9 +881,11 @@ HashMap.prototype = {
// should not use the exposed keys, who are prefixed.
each: function (cb, context) {
context !== void 0 && (cb = bind(cb, context));
+ /* eslint-disable guard-for-in */
for (var key in this.data) {
this.data.hasOwnProperty(key) && cb(this.data[key], key);
}
+ /* eslint-enable guard-for-in */
},
// Do not use this method if performance sensitive.
removeKey: function (key) {
@@ -948,6 +955,8 @@ var zrUtil = (Object.freeze || Object)({
noop: noop
});
+/* global Float32Array */
+
var ArrayCtor = typeof Float32Array === 'undefined'
? Array
: Float32Array;
@@ -2506,6 +2515,8 @@ mixin(Handler, Draggable);
* @exports zrender/tool/matrix
*/
+/* global Float32Array */
+
var ArrayCtor$1 = typeof Float32Array === 'undefined'
? Array
: Float32Array;
@@ -3764,11 +3775,17 @@ function lerpNumber(a, b, p) {
}
function setRgba(out, r, g, b, a) {
- out[0] = r; out[1] = g; out[2] = b; out[3] = a;
+ out[0] = r;
+ out[1] = g;
+ out[2] = b;
+ out[3] = a;
return out;
}
function copyRgba(out, a) {
- out[0] = a[0]; out[1] = a[1]; out[2] = a[2]; out[3] = a[3];
+ out[0] = a[0];
+ out[1] = a[1];
+ out[2] = a[2];
+ out[3] = a[3];
return out;
}
@@ -4843,35 +4860,23 @@ if (typeof window !== 'undefined') {
*/
/**
- * debug日志选项：catchBrushException为true下有效
- * 0 : 不生成debug数据，发布用
- * 1 : 异常抛出，调试用
- * 2 : 控制台输出，调试用
+ * Debug log mode:
+ * 0: Do nothing, for release.
+ * 1: console.error, for debug.
*/
var debugMode = 0;
// retina 屏幕优化
var devicePixelRatio = dpr;
-var log = function () {
+var logError = function () {
};
if (debugMode === 1) {
- log = function () {
- for (var k in arguments) {
- throw new Error(arguments[k]);
- }
- };
-}
-else if (debugMode > 1) {
- log = function () {
- for (var k in arguments) {
- console.log(arguments[k]);
- }
- };
+ logError = console.error;
}
-var zrLog = log;
+var logError$1 = logError;
/**
* @alias modue:zrender/mixin/Animatable
@@ -4927,7 +4932,7 @@ Animatable.prototype = {
}
if (!target) {
- zrLog(
+ logError$1(
'Property "'
+ path
+ '" is not existed in element '
@@ -6148,7 +6153,10 @@ function TimSort(array, compare) {
while (stackSize > 1) {
var n = stackSize - 2;
- if (n >= 1 && runLength[n - 1] <= runLength[n] + runLength[n + 1] || n >= 2 && runLength[n - 2] <= runLength[n] + runLength[n - 1]) {
+ if (
+ (n >= 1 && runLength[n - 1] <= runLength[n] + runLength[n + 1])
+ || (n >= 2 && runLength[n - 2] <= runLength[n] + runLength[n - 1])
+ ) {
if (runLength[n - 1] < runLength[n + 1]) {
n--;
}
@@ -6238,7 +6246,9 @@ function TimSort(array, compare) {
}
var _minGallop = minGallop;
- var count1, count2, exit;
+ var count1;
+ var count2;
+ var exit;
while (1) {
count1 = 0;
@@ -6921,8 +6931,8 @@ Style.prototype = {
/**
* `true` is not supported.
* `false`/`null`/`undefined` are the same.
- * `false` is used to remove lineDash in some
- * case that `null`/`undefined` can not be set.
+ * `false` is used to remove lineDash in some
+ * case that `null`/`undefined` can not be set.
* (e.g., emphasis.lineStyle in echarts)
* @type {Array.<number>|boolean}
*/
@@ -7402,8 +7412,8 @@ var Layer = function (id, painter, dpr) {
domStyle['user-select'] = 'none';
domStyle['-webkit-touch-callout'] = 'none';
domStyle['-webkit-tap-highlight-color'] = 'rgba(0,0,0,0)';
- domStyle['padding'] = 0;
- domStyle['margin'] = 0;
+ domStyle['padding'] = 0; // eslint-disable-line dot-notation
+ domStyle['margin'] = 0; // eslint-disable-line dot-notation
domStyle['border-width'] = 0;
}
@@ -9529,7 +9539,7 @@ function isDisplayableCulled(el, width, height) {
function isClipPathChanged(clipPaths, prevClipPaths) {
// displayable.__clipPaths can only be `null`/`undefined` or an non-empty array.
- if (clipPaths === prevClipPaths) {
+ if (clipPaths === prevClipPaths) {
return false;
}
if (!clipPaths || !prevClipPaths || (clipPaths.length !== prevClipPaths.length)) {
@@ -10058,12 +10068,12 @@ Painter.prototype = {
var domRoot = this._domRoot;
if (layersMap[zlevel]) {
- zrLog('ZLevel ' + zlevel + ' has been used already');
+ logError$1('ZLevel ' + zlevel + ' has been used already');
return;
}
// Check if is a valid layer
if (!isLayerValid(layer)) {
- zrLog('Layer of zlevel ' + zlevel + ' is not valid');
+ logError$1('Layer of zlevel ' + zlevel + ' is not valid');
return;
}
@@ -10197,11 +10207,14 @@ Painter.prototype = {
incrementalLayerCount = 1;
}
else {
- layer = this.getLayer(zlevel + (incrementalLayerCount > 0 ? EL_AFTER_INCREMENTAL_INC : 0), this._needsManuallyCompositing);
+ layer = this.getLayer(
+ zlevel + (incrementalLayerCount > 0 ? EL_AFTER_INCREMENTAL_INC : 0),
+ this._needsManuallyCompositing
+ );
}
if (!layer.__builtin__) {
- zrLog('ZLevel ' + zlevel + ' has been used by unkown layer ' + layer.id);
+ logError$1('ZLevel ' + zlevel + ' has been used by unkown layer ' + layer.id);
}
if (layer !== prevLayer) {
@@ -11140,7 +11153,7 @@ var instances$1 = {}; // ZRender实例map索引
/**
* @type {string}
*/
-var version$1 = '4.1.0';
+var version$1 = '4.1.1';
/**
* Initializing a zrender instance
@@ -12410,7 +12423,7 @@ var getLineStyle = makeStyleMapper(
var lineStyleMixin = {
getLineStyle: function (excludes) {
var style = getLineStyle(this, excludes);
- // Always set lineDash whether dashed, otherwise we can not
+ // Always set lineDash whether dashed, otherwise we can not
// erase the previous style when assigning to el.style.
style.lineDash = this.getLineDash(style.lineWidth);
return style;
@@ -12423,15 +12436,15 @@ var lineStyleMixin = {
var lineType = this.get('type');
var dotSize = Math.max(lineWidth, 2);
var dashSize = lineWidth * 4;
- return (lineType === 'solid' || lineType == null)
- // Use `false` but not `null` for the solid line here, because `null` might be
- // ignored when assigning to `el.style`. e.g., when setting `lineStyle.type` as
- // `'dashed'` and `emphasis.lineStyle.type` as `'solid'` in graph series, the
- // `lineDash` gotten form the latter one is not able to erase that from the former
+ return (lineType === 'solid' || lineType == null)
+ // Use `false` but not `null` for the solid line here, because `null` might be
+ // ignored when assigning to `el.style`. e.g., when setting `lineStyle.type` as
+ // `'dashed'` and `emphasis.lineStyle.type` as `'solid'` in graph series, the
+ // `lineDash` gotten form the latter one is not able to erase that from the former
// one if using `null` here according to the emhpsis strategy in `util/graphic.js`.
? false
- : lineType === 'dashed'
- ? [dashSize, dashSize]
+ : lineType === 'dashed'
+ ? [dashSize, dashSize]
: [dotSize, dotSize];
}
};
@@ -13213,6 +13226,8 @@ function fromArc(
// TODO getTotalLength, getPointAtLength
+/* global Float32Array */
+
var CMD = {
M: 1,
L: 2,
@@ -13884,9 +13899,12 @@ PathProxy.prototype = {
*/
rebuildPath: function (ctx) {
var d = this.data;
- var x0, y0;
- var xi, yi;
- var x, y;
+ var x0;
+ var y0;
+ var xi;
+ var yi;
+ var x;
+ var y;
var ux = this._ux;
var uy = this._uy;
var len$$1 = this._len;
@@ -16743,6 +16761,8 @@ var NORMAL = 'normal';
var _highlightNextDigit = 1;
var _highlightKeyMap = {};
+var _customShapeMap = {};
+
/**
* Extend shape with parameters
@@ -16759,6 +16779,54 @@ function extendPath(pathData, opts) {
}
/**
+ * Register a user defined shape.
+ * The shape class can be fetched by `getShapeClass`
+ * This method will overwrite the registered shapes, including
+ * the registered built-in shapes, if using the same `name`.
+ * The shape can be used in `custom series` and
+ * `graphic component` by declaring `{type: name}`.
+ *
+ * @param {string} name
+ * @param {Object} ShapeClass Can be generated by `extendShape`.
+ */
+function registerShape(name, ShapeClass) {
+ _customShapeMap[name] = ShapeClass;
+}
+
+/**
+ * Find shape class registered by `registerShape`. Usually used in
+ * fetching user defined shape.
+ *
+ * [Caution]:
+ * (1) This method **MUST NOT be used inside echarts !!!**, unless it is prepared
+ * to use user registered shapes.
+ * Because the built-in shape (see `getBuiltInShape`) will be registered by
+ * `registerShape` by default. That enables users to get both built-in
+ * shapes as well as the shapes belonging to themsleves. But users can overwrite
+ * the built-in shapes by using names like 'circle', 'rect' via calling
+ * `registerShape`. So the echarts inner featrues should not fetch shapes from here
+ * in case that it is overwritten by users, except that some features, like
+ * `custom series`, `graphic component`, do it deliberately.
+ *
+ * (2) In the features like `custom series`, `graphic component`, the user input
+ * `{tpye: 'xxx'}` does not only specify shapes but also specify other graphic
+ * elements like `'group'`, `'text'`, `'image'` or event `'path'`. Those names
+ * are reserved names, that is, if some user register a shape named `'image'`,
+ * the shape will not be used. If we intending to add some more reserved names
+ * in feature, that might bring break changes (disable some existing user shape
+ * names). But that case probably rearly happen. So we dont make more mechanism
+ * to resolve this issue here.
+ *
+ * @param {string} name
+ * @return {Object} The shape class. If not found, return nothing.
+ */
+function getShapeClass(name) {
+ if (_customShapeMap.hasOwnProperty(name)) {
+ return _customShapeMap[name];
+ }
+}
+
+/**
* Create a path element from path data string
* @param {string} pathData
* @param {Object} opts
@@ -16959,11 +17027,12 @@ function singleEnterEmphasis(el) {
return;
}
- var useHoverLayer = el.useHoverLayer;
+ var zr = el.__zr;
+
+ var useHoverLayer = el.useHoverLayer && zr && zr.painter.type === 'canvas';
el.__highlighted = useHoverLayer ? 'layer' : 'plain';
- var zr = el.__zr;
- if (el.isGroup || (!zr && useHoverLayer)) {
+ if (el.isGroup || (!zr && el.useHoverLayer)) {
return;
}
@@ -17445,11 +17514,18 @@ function setTextStyleCommon(textStyle, textStyleModel, opt, isEmphasis) {
opt = opt || EMPTY_OBJ;
if (opt.isRectText) {
- var textPosition = textStyleModel.getShallow('position')
- || (isEmphasis ? null : 'inside');
- // 'outside' is not a valid zr textPostion value, but used
- // in bar series, and magric type should be considered.
- textPosition === 'outside' && (textPosition = 'top');
+ var textPosition;
+ if (opt.getTextPosition) {
+ textPosition = opt.getTextPosition(textStyleModel, isEmphasis);
+ }
+ else {
+ textPosition = textStyleModel.getShallow('position')
+ || (isEmphasis ? null : 'inside');
+ // 'outside' is not a valid zr textPostion value, but used
+ // in bar series, and magric type should be considered.
+ textPosition === 'outside' && (textPosition = 'top');
+ }
+
textStyle.textPosition = textPosition;
textStyle.textOffset = textStyleModel.getShallow('offset');
var labelRotate = textStyleModel.getShallow('rotate');
@@ -18048,6 +18124,18 @@ function nearZero(val) {
return val <= (1e-6) && val >= -(1e-6);
}
+// Register built-in shapes. These shapes might be overwirtten
+// by users, although we do not recommend that.
+registerShape('circle', Circle);
+registerShape('sector', Sector);
+registerShape('ring', Ring);
+registerShape('polygon', Polygon);
+registerShape('polyline', Polyline);
+registerShape('rect', Rect);
+registerShape('line', Line);
+registerShape('bezierCurve', BezierCurve);
+registerShape('arc', Arc);
+
@@ -18056,6 +18144,8 @@ var graphic = (Object.freeze || Object)({
CACHED_LABEL_STYLE_PROPERTIES: CACHED_LABEL_STYLE_PROPERTIES,
extendShape: extendShape,
extendPath: extendPath,
+ registerShape: registerShape,
+ getShapeClass: getShapeClass,
makePath: makePath,
makeImage: makeImage,
mergePath: mergePath,
@@ -18641,7 +18731,7 @@ function enableTopologicalTravel(entity, dependencyGetter) {
var RADIAN_EPSILON = 1e-4;
function _trim(str) {
- return str.replace(/^\s+/, '').replace(/\s+$/, '');
+ return str.replace(/^\s+|\s+$/g, '');
}
/**
@@ -21612,8 +21702,8 @@ var GlobalModel = Model.extend({
* {mainType: 'series', subType: 'pie', query: {seriesName: 'uio'}}
* );
* var result = findComponents(
- * {mainType: 'series'},
- * function (model, index) {...}
+ * {mainType: 'series',
+ * filter: function (model, index) {...}}
* );
* // result like [component0, componnet1, ...]
*
@@ -22932,12 +23022,17 @@ var backwardCompat = function (option, isTheme) {
var seriesType = seriesOpt.type;
- if (seriesType === 'pie' || seriesType === 'gauge') {
+ if (seriesType === 'line') {
+ if (seriesOpt.clipOverflow != null) {
+ seriesOpt.clip = seriesOpt.clipOverflow;
+ }
+ }
+ else if (seriesType === 'pie' || seriesType === 'gauge') {
if (seriesOpt.clockWise != null) {
seriesOpt.clockwise = seriesOpt.clockWise;
}
}
- if (seriesType === 'gauge') {
+ else if (seriesType === 'gauge') {
var pointerColor = get(seriesOpt, 'pointer.color');
pointerColor != null
&& set$1(seriesOpt, 'itemStyle.color', pointerColor);
@@ -22987,7 +23082,7 @@ var backwardCompat = function (option, isTheme) {
// data processing stage is blocked in stream.
// See <module:echarts/stream/Scheduler#performDataProcessorTasks>
// (2) Only register once when import repeatly.
-// Should be executed before after series filtered and before stack calculation.
+// Should be executed after series filtered and before stack calculation.
var dataStack = function (ecModel) {
var stackInfoMap = createHashMap();
ecModel.eachSeries(function (seriesModel) {
@@ -23499,6 +23594,7 @@ var dataFormatMixin = {
var name = data.getName(dataIndex);
var itemOpt = data.getRawDataItem(dataIndex);
var color = data.getItemVisual(dataIndex, 'color');
+ var borderColor = data.getItemVisual(dataIndex, 'borderColor');
var tooltipModel = this.ecModel.getComponent('tooltip');
var renderModeOption = tooltipModel && tooltipModel.get('renderMode');
var renderMode = getTooltipRenderMode(renderModeOption);
@@ -23520,6 +23616,7 @@ var dataFormatMixin = {
dataType: dataType,
value: rawValue,
color: color,
+ borderColor: borderColor,
dimensionNames: userOutput ? userOutput.dimensionNames : null,
encode: userOutput ? userOutput.encode : null,
marker: getTooltipMarker({
@@ -23998,6 +24095,11 @@ var SeriesModel = ComponentModel.extend({
visualColorAccessPath: 'itemStyle.color',
/**
+ * Access path of borderColor for visual
+ */
+ visualBorderColorAccessPath: 'itemStyle.borderColor',
+
+ /**
* Support merge layout params.
* Only support 'box' now (left/right/top/bottom/width/height).
* @type {string|Object} Object can be {ignoreSize: true}
@@ -24596,10 +24698,10 @@ Component$1.prototype = {
};
var componentProto = Component$1.prototype;
-componentProto.updateView
- = componentProto.updateLayout
- = componentProto.updateVisual
- = function (seriesModel, ecModel, api, payload) {
+componentProto.updateView =
+ componentProto.updateLayout =
+ componentProto.updateVisual =
+ function (seriesModel, ecModel, api, payload) {
// Do nothing;
};
// Enable Component.extend.
@@ -25117,6 +25219,10 @@ var seriesColor = {
// FIXME Set color function or use the platte color
data.setVisual('color', color);
+
+ var borderColorAccessPath = (seriesModel.visualBorderColorAccessPath || 'itemStyle.borderColor').split('.');
+ var borderColor = seriesModel.get(borderColorAccessPath);
+ data.setVisual('borderColor', borderColor);
// Only visible series has each data be visual encoded
if (!ecModel.isSeriesFiltered(seriesModel)) {
@@ -25132,9 +25238,13 @@ var seriesColor = {
var dataEach = function (data, idx) {
var itemModel = data.getItemModel(idx);
var color = itemModel.get(colorAccessPath, true);
+ var borderColor = itemModel.get(borderColorAccessPath, true);
if (color != null) {
data.setItemVisual(idx, 'color', color);
}
+ if (borderColor != null) {
+ data.setItemVisual(idx, 'borderColor', borderColor);
+ }
};
return { dataEach: data.hasItemOption ? dataEach : null };
@@ -25161,8 +25271,17 @@ var seriesColor = {
* under the License.
*/
+/**
+ * Language: (Simplified) Chinese.
+ */
var lang = {
+ legend: {
+ selector: {
+ all: '全选',
+ inverse: '反选'
+ }
+ },
toolbox: {
brush: {
title: {
@@ -27165,15 +27284,17 @@ var isFunction = isFunction$1;
var isObject = isObject$1;
var parseClassType = ComponentModel.parseClassType;
-var version = '4.3.0';
+var version = '4.4.0';
var dependencies = {
- zrender: '4.1.0'
+ zrender: '4.1.1'
};
var TEST_FRAME_REMAIN_TIME = 1;
var PRIORITY_PROCESSOR_FILTER = 1000;
+var PRIORITY_PROCESSOR_SERIES_FILTER = 800;
+var PRIORITY_PROCESSOR_DATASTACK = 900;
var PRIORITY_PROCESSOR_STATISTIC = 5000;
var PRIORITY_VISUAL_LAYOUT = 1000;
@@ -27189,6 +27310,7 @@ var PRIORITY_VISUAL_BRUSH = 5000;
var PRIORITY = {
PROCESSOR: {
FILTER: PRIORITY_PROCESSOR_FILTER,
+ SERIES_FILTER: PRIORITY_PROCESSOR_SERIES_FILTER,
STATISTIC: PRIORITY_PROCESSOR_STATISTIC
},
VISUAL: {
@@ -27212,8 +27334,13 @@ var OPTION_UPDATED = '__optionUpdated';
var ACTION_REG = /^[a-zA-Z0-9_]+$/;
-function createRegisterEventWithLowercaseName(method) {
+function createRegisterEventWithLowercaseName(method, ignoreDisposed) {
return function (eventName, handler, context) {
+ if (!ignoreDisposed && this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
// Event name is all lowercase
eventName = eventName && eventName.toLowerCase();
Eventful.prototype[method].call(this, eventName, handler, context);
@@ -27226,9 +27353,9 @@ function createRegisterEventWithLowercaseName(method) {
function MessageCenter() {
Eventful.call(this);
}
-MessageCenter.prototype.on = createRegisterEventWithLowercaseName('on');
-MessageCenter.prototype.off = createRegisterEventWithLowercaseName('off');
-MessageCenter.prototype.one = createRegisterEventWithLowercaseName('one');
+MessageCenter.prototype.on = createRegisterEventWithLowercaseName('on', true);
+MessageCenter.prototype.off = createRegisterEventWithLowercaseName('off', true);
+MessageCenter.prototype.one = createRegisterEventWithLowercaseName('one', true);
mixin(MessageCenter, Eventful);
/**
@@ -27464,6 +27591,10 @@ echartsProto.setOption = function (option, notMerge, lazyUpdate) {
if (__DEV__) {
assert(!this[IN_MAIN_PROCESS], '`setOption` should not be called during main process.');
}
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
var silent;
if (isObject(notMerge)) {
@@ -27599,6 +27730,11 @@ echartsProto.getSvgDataUrl = function () {
* @param {string} [opts.excludeComponents]
*/
echartsProto.getDataURL = function (opts) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
opts = opts || {};
var excludeComponents = opts.excludeComponents;
var ecModel = this._model;
@@ -27639,6 +27775,11 @@ echartsProto.getDataURL = function (opts) {
* @param {string} [opts.backgroundColor]
*/
echartsProto.getConnectedDataURL = function (opts) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
if (!env$1.canvasSupported) {
return;
}
@@ -27758,6 +27899,11 @@ echartsProto.convertToPixel = curry(doConvertPixel, 'convertToPixel');
echartsProto.convertFromPixel = curry(doConvertPixel, 'convertFromPixel');
function doConvertPixel(methodName, finder, value) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
var ecModel = this._model;
var coordSysList = this._coordSysMgr.getCoordinateSystems();
var result;
@@ -27798,6 +27944,11 @@ function doConvertPixel(methodName, finder, value) {
* @return {boolean} result
*/
echartsProto.containPixel = function (finder, value) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
var ecModel = this._model;
var result;
@@ -28170,6 +28321,10 @@ echartsProto.resize = function (opts) {
if (__DEV__) {
assert(!this[IN_MAIN_PROCESS], '`resize` should not be called during main process.');
}
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
this._zr.resize(opts);
@@ -28212,6 +28367,11 @@ function updateStreamModes(ecIns, ecModel) {
* @param {Object} [cfg]
*/
echartsProto.showLoading = function (name, cfg) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
if (isObject(name)) {
cfg = name;
name = '';
@@ -28236,6 +28396,11 @@ echartsProto.showLoading = function (name, cfg) {
* Hide loading effect
*/
echartsProto.hideLoading = function () {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
this._loadingFX && this._zr.remove(this._loadingFX);
this._loadingFX = null;
};
@@ -28259,10 +28424,15 @@ echartsProto.makeActionFromEvent = function (eventObj) {
* @param {boolean} [opt.flush=undefined]
* true: Flush immediately, and then pixel in canvas can be fetched
* immediately. Caution: it might affect performance.
- * false: Not not flush.
+ * false: Not flush.
* undefined: Auto decide whether perform flush.
*/
echartsProto.dispatchAction = function (payload, opt) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
if (!isObject(opt)) {
opt = {silent: !!opt};
}
@@ -28431,6 +28601,11 @@ function bindRenderedEvent(zr, ecIns) {
* @param {Array|TypedArray} params.data
*/
echartsProto.appendData = function (params) {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
+
var seriesIndex = params.seriesIndex;
var ecModel = this.getModel();
var seriesModel = ecModel.getSeriesByIndex(seriesIndex);
@@ -28456,9 +28631,9 @@ echartsProto.appendData = function (params) {
* Register event
* @method
*/
-echartsProto.on = createRegisterEventWithLowercaseName('on');
-echartsProto.off = createRegisterEventWithLowercaseName('off');
-echartsProto.one = createRegisterEventWithLowercaseName('one');
+echartsProto.on = createRegisterEventWithLowercaseName('on', false);
+echartsProto.off = createRegisterEventWithLowercaseName('off', false);
+echartsProto.one = createRegisterEventWithLowercaseName('one', false);
/**
* Prepare view instances of charts and components
@@ -28736,6 +28911,10 @@ echartsProto.isDisposed = function () {
* Clear
*/
echartsProto.clear = function () {
+ if (this._disposed) {
+ disposedWarning(this.id);
+ return;
+ }
this.setOption({ series: [] }, true);
};
@@ -28744,9 +28923,7 @@ echartsProto.clear = function () {
*/
echartsProto.dispose = function () {
if (this._disposed) {
- if (__DEV__) {
- console.warn('Instance ' + this.id + ' has been disposed');
- }
+ disposedWarning(this.id);
return;
}
this._disposed = true;
@@ -28771,6 +28948,12 @@ echartsProto.dispose = function () {
mixin(ECharts, Eventful);
+function disposedWarning(id) {
+ if (__DEV__) {
+ console.warn('Instance ' + id + ' has been disposed');
+ }
+}
+
function updateHoverLayerStatus(ecIns, ecModel) {
var zr = ecIns._zr;
var storage = zr.storage;
@@ -29120,9 +29303,9 @@ function init(dom, theme$$1, opts) {
)
) {
console.warn('Can\'t get DOM width or height. Please check '
- + 'dom.clientWidth and dom.clientHeight. They should not be 0.'
- + 'For example, you may need to call this in the callback '
- + 'of window.onload.');
+ + 'dom.clientWidth and dom.clientHeight. They should not be 0.'
+ + 'For example, you may need to call this in the callback '
+ + 'of window.onload.');
}
}
@@ -29473,7 +29656,7 @@ function getMap(mapName) {
registerVisual(PRIORITY_VISUAL_GLOBAL, seriesColor);
registerPreprocessor(backwardCompat);
-registerProcessor(PRIORITY_PROCESSOR_STATISTIC, dataStack);
+registerProcessor(PRIORITY_PROCESSOR_DATASTACK, dataStack);
registerLoading('default', loadingDefault);
// Default actions
@@ -31960,8 +32143,8 @@ function completeDimensions(sysDims, source, opt) {
// `coordDimIndex` should not be set directly.
sysDimItemDimsDef = sysDimItem.dimsDef;
sysDimItemOtherDims = sysDimItem.otherDims;
- sysDimItem.name = sysDimItem.coordDim = sysDimItem.coordDimIndex
- = sysDimItem.dimsDef = sysDimItem.otherDims = null;
+ sysDimItem.name = sysDimItem.coordDim = sysDimItem.coordDimIndex =
+ sysDimItem.dimsDef = sysDimItem.otherDims = null;
}
var dataDims = encodeDef.get(coordDim);
@@ -33368,6 +33551,7 @@ function doCalBarWidthAndOffset(seriesInfoList) {
var offset = -widthSum / 2;
each$1(stacks, function (column, stackId) {
result[coordSysName][stackId] = result[coordSysName][stackId] || {
+ bandWidth: bandWidth,
offset: offset,
width: column.width
};
@@ -33421,6 +33605,7 @@ function layout(seriesType, ecModel) {
lastStackCoords[stackId] = lastStackCoords[stackId] || [];
data.setLayout({
+ bandWidth: columnLayoutInfo.bandWidth,
offset: columnOffset,
size: columnWidth
});
@@ -33572,23 +33757,7 @@ function isInLargeMode(seriesModel) {
// See cases in `test/bar-start.html` and `#7412`, `#8747`.
function getValueAxisStart(baseAxis, valueAxis, stacked) {
- var extent = valueAxis.getGlobalExtent();
- var min;
- var max;
- if (extent[0] > extent[1]) {
- min = extent[1];
- max = extent[0];
- }
- else {
- min = extent[0];
- max = extent[1];
- }
-
- var valueStart = valueAxis.toGlobalCoord(valueAxis.dataToCoord(0));
- valueStart < min && (valueStart = min);
- valueStart > max && (valueStart = max);
-
- return valueStart;
+ return valueAxis.toGlobalCoord(valueAxis.dataToCoord(0));
}
/*
@@ -36038,6 +36207,7 @@ each$1(
'setHoverStyle', 'setLabelStyle', 'setTextStyle', 'setText',
'getFont', 'updateProps', 'initProps', 'getTransform',
'clipPointsByRect', 'clipRectByRect',
+ 'registerShape', 'getShapeClass',
'Group',
'Image',
'Text',
@@ -36110,7 +36280,7 @@ SeriesModel.extend({
// polarIndex: 0,
// If clip the overflow value
- clipOverflow: true,
+ clip: true,
// cursor: null,
label: {
@@ -37506,89 +37676,21 @@ var Polygon$1 = Path.extend({
* specific language governing permissions and limitations
* under the License.
*/
-
-// FIXME step not support polar
-
-function isPointsSame(points1, points2) {
- if (points1.length !== points2.length) {
- return;
- }
- for (var i = 0; i < points1.length; i++) {
- var p1 = points1[i];
- var p2 = points2[i];
- if (p1[0] !== p2[0] || p1[1] !== p2[1]) {
- return;
- }
- }
- return true;
-}
-
-function getSmooth(smooth) {
- return typeof (smooth) === 'number' ? smooth : (smooth ? 0.5 : 0);
-}
-
-function getAxisExtentWithGap(axis) {
- var extent = axis.getGlobalExtent();
- if (axis.onBand) {
- // Remove extra 1px to avoid line miter in clipped edge
- var halfBandWidth = axis.getBandWidth() / 2 - 1;
- var dir = extent[1] > extent[0] ? 1 : -1;
- extent[0] += dir * halfBandWidth;
- extent[1] -= dir * halfBandWidth;
- }
- return extent;
-}
-
-/**
- * @param {module:echarts/coord/cartesian/Cartesian2D|module:echarts/coord/polar/Polar} coordSys
- * @param {module:echarts/data/List} data
- * @param {Object} dataCoordInfo
- * @param {Array.<Array.<number>>} points
- */
-function getStackedOnPoints(coordSys, data, dataCoordInfo) {
- if (!dataCoordInfo.valueDim) {
- return [];
- }
-
- var points = [];
- for (var idx = 0, len = data.count(); idx < len; idx++) {
- points.push(getStackedOnPoint(dataCoordInfo, coordSys, data, idx));
- }
-
- return points;
-}
-
-function createGridClipShape(cartesian, hasAnimation, forSymbol, seriesModel) {
- var xExtent = getAxisExtentWithGap(cartesian.getAxis('x'));
- var yExtent = getAxisExtentWithGap(cartesian.getAxis('y'));
+function createGridClipPath(cartesian, hasAnimation, seriesModel) {
+ var rect = cartesian.getArea();
var isHorizontal = cartesian.getBaseAxis().isHorizontal();
- var x = Math.min(xExtent[0], xExtent[1]);
- var y = Math.min(yExtent[0], yExtent[1]);
- var width = Math.max(xExtent[0], xExtent[1]) - x;
- var height = Math.max(yExtent[0], yExtent[1]) - y;
+ var x = rect.x;
+ var y = rect.y;
+ var width = rect.width;
+ var height = rect.height;
- // Avoid float number rounding error for symbol on the edge of axis extent.
- // See #7913 and `test/dataZoom-clip.html`.
- if (forSymbol) {
- x -= 0.5;
- width += 0.5;
- y -= 0.5;
- height += 0.5;
- }
- else {
- var lineWidth = seriesModel.get('lineStyle.width') || 2;
- // Expand clip shape to avoid clipping when line value exceeds axis
- var expandSize = seriesModel.get('clipOverflow') ? lineWidth / 2 : Math.max(width, height);
- if (isHorizontal) {
- y -= expandSize;
- height += expandSize * 2;
- }
- else {
- x -= expandSize;
- width += expandSize * 2;
- }
- }
+ var lineWidth = seriesModel.get('lineStyle.width') || 2;
+ // Expand the clip path a bit to avoid the border is clipped and looks thinner
+ x -= lineWidth / 2;
+ y -= lineWidth / 2;
+ width += lineWidth;
+ height += lineWidth;
var clipPath = new Rect({
shape: {
@@ -37612,50 +37714,102 @@ function createGridClipShape(cartesian, hasAnimation, forSymbol, seriesModel) {
return clipPath;
}
-function createPolarClipShape(polar, hasAnimation, forSymbol, seriesModel) {
- var angleAxis = polar.getAngleAxis();
- var radiusAxis = polar.getRadiusAxis();
-
- var radiusExtent = radiusAxis.getExtent().slice();
- radiusExtent[0] > radiusExtent[1] && radiusExtent.reverse();
- var angleExtent = angleAxis.getExtent();
-
- var RADIAN = Math.PI / 180;
-
+function createPolarClipPath(polar, hasAnimation, seriesModel) {
+ var sectorArea = polar.getArea();
// Avoid float number rounding error for symbol on the edge of axis extent.
- if (forSymbol) {
- radiusExtent[0] -= 0.5;
- radiusExtent[1] += 0.5;
- }
var clipPath = new Sector({
shape: {
cx: round$1(polar.cx, 1),
cy: round$1(polar.cy, 1),
- r0: round$1(radiusExtent[0], 1),
- r: round$1(radiusExtent[1], 1),
- startAngle: -angleExtent[0] * RADIAN,
- endAngle: -angleExtent[1] * RADIAN,
- clockwise: angleAxis.inverse
+ r0: round$1(sectorArea.r0, 1),
+ r: round$1(sectorArea.r, 1),
+ startAngle: sectorArea.startAngle,
+ endAngle: sectorArea.endAngle,
+ clockwise: sectorArea.clockwise
}
});
if (hasAnimation) {
- clipPath.shape.endAngle = -angleExtent[0] * RADIAN;
+ clipPath.shape.endAngle = sectorArea.startAngle;
initProps(clipPath, {
shape: {
- endAngle: -angleExtent[1] * RADIAN
+ endAngle: sectorArea.endAngle
}
}, seriesModel);
}
-
return clipPath;
}
-function createClipShape(coordSys, hasAnimation, forSymbol, seriesModel) {
- return coordSys.type === 'polar'
- ? createPolarClipShape(coordSys, hasAnimation, forSymbol, seriesModel)
- : createGridClipShape(coordSys, hasAnimation, forSymbol, seriesModel);
+function createClipPath(coordSys, hasAnimation, seriesModel) {
+ if (!coordSys) {
+ return null;
+ }
+ else if (coordSys.type === 'polar') {
+ return createPolarClipPath(coordSys, hasAnimation, seriesModel);
+ }
+ else if (coordSys.type === 'cartesian2d') {
+ return createGridClipPath(coordSys, hasAnimation, seriesModel);
+ }
+ return null;
+}
+
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+// FIXME step not support polar
+
+function isPointsSame(points1, points2) {
+ if (points1.length !== points2.length) {
+ return;
+ }
+ for (var i = 0; i < points1.length; i++) {
+ var p1 = points1[i];
+ var p2 = points2[i];
+ if (p1[0] !== p2[0] || p1[1] !== p2[1]) {
+ return;
+ }
+ }
+ return true;
+}
+
+function getSmooth(smooth) {
+ return typeof (smooth) === 'number' ? smooth : (smooth ? 0.5 : 0);
+}
+
+/**
+ * @param {module:echarts/coord/cartesian/Cartesian2D|module:echarts/coord/polar/Polar} coordSys
+ * @param {module:echarts/data/List} data
+ * @param {Object} dataCoordInfo
+ * @param {Array.<Array.<number>>} points
+ */
+function getStackedOnPoints(coordSys, data, dataCoordInfo) {
+ if (!dataCoordInfo.valueDim) {
+ return [];
+ }
+
+ var points = [];
+ for (var idx = 0, len = data.count(); idx < len; idx++) {
+ points.push(getStackedOnPoint(dataCoordInfo, coordSys, data, idx));
+ }
+
+ return points;
}
function turnPointsIntoStep(points, coordSys, stepTurnAt) {
@@ -37854,6 +38008,31 @@ function canShowAllSymbolForCategory(categoryAxis, data) {
return true;
}
+function createLineClipPath(coordSys, hasAnimation, seriesModel) {
+ if (coordSys.type === 'cartesian2d') {
+ var isHorizontal = coordSys.getBaseAxis().isHorizontal();
+ var clipPath = createGridClipPath(coordSys, hasAnimation, seriesModel);
+ // Expand clip shape to avoid clipping when line value exceeds axis
+ if (!seriesModel.get('clip', true)) {
+ var rectShape = clipPath.shape;
+ var expandSize = Math.max(rectShape.width, rectShape.height);
+ if (isHorizontal) {
+ rectShape.y -= expandSize;
+ rectShape.height += expandSize * 2;
+ }
+ else {
+ rectShape.x -= expandSize;
+ rectShape.width += expandSize * 2;
+ }
+ }
+ return clipPath;
+ }
+ else {
+ return createPolarClipPath(coordSys, hasAnimation, seriesModel);
+ }
+
+}
+
Chart.extend({
type: 'line',
@@ -37918,13 +38097,29 @@ Chart.extend({
// FIXME step not support polar
var step = !isCoordSysPolar && seriesModel.get('step');
+ var clipShapeForSymbol;
+ if (coordSys && coordSys.getArea) {
+ clipShapeForSymbol = coordSys.getArea();
+ // Avoid float number rounding error for symbol on the edge of axis extent.
+ // See #7913 and `test/dataZoom-clip.html`.
+ if (clipShapeForSymbol.width != null) {
+ clipShapeForSymbol.x -= 0.1;
+ clipShapeForSymbol.y -= 0.1;
+ clipShapeForSymbol.width += 0.2;
+ clipShapeForSymbol.height += 0.2;
+ }
+ else if (clipShapeForSymbol.r0) {
+ clipShapeForSymbol.r0 -= 0.5;
+ clipShapeForSymbol.r1 += 0.5;
+ }
+ }
// Initialization animation or coordinate system changed
if (
!(polyline && prevCoordSys.type === coordSys.type && step === this._step)
) {
showSymbol && symbolDraw.updateData(data, {
isIgnore: isIgnoreFunc,
- clipShape: createClipShape(coordSys, false, true, seriesModel)
+ clipShape: clipShapeForSymbol
});
if (step) {
@@ -37940,7 +38135,7 @@ Chart.extend({
coordSys, hasAnimation
);
}
- lineGroup.setClipPath(createClipShape(coordSys, true, false, seriesModel));
+ lineGroup.setClipPath(createLineClipPath(coordSys, true, seriesModel));
}
else {
if (isAreaChart && !polygon) {
@@ -37957,13 +38152,13 @@ Chart.extend({
}
// Update clipPath
- lineGroup.setClipPath(createClipShape(coordSys, false, false, seriesModel));
+ lineGroup.setClipPath(createLineClipPath(coordSys, false, seriesModel));
// Always update, or it is wrong in the case turning on legend
// because points are not changed
showSymbol && symbolDraw.updateData(data, {
isIgnore: isIgnoreFunc,
- clipShape: createClipShape(coordSys, false, true, seriesModel)
+ clipShape: clipShapeForSymbol
});
// Stop symbol animation and sync with line points
@@ -38265,12 +38460,12 @@ Chart.extend({
}
});
- this._polyline
- = this._polygon
- = this._coordSys
- = this._points
- = this._stackedOnPoints
- = this._data = null;
+ this._polyline =
+ this._polygon =
+ this._coordSys =
+ this._points =
+ this._stackedOnPoints =
+ this._data = null;
}
});
@@ -38810,6 +39005,23 @@ Cartesian2D.prototype = {
*/
getOtherAxis: function (axis) {
return this.getAxis(axis.dim === 'x' ? 'y' : 'x');
+ },
+
+ /**
+ * Get rect area of cartesian.
+ * Area will have a contain function to determine if a point is in the coordinate system.
+ * @return {BoundingRect}
+ */
+ getArea: function () {
+ var xExtent = this.getAxis('x').getGlobalExtent();
+ var yExtent = this.getAxis('y').getGlobalExtent();
+ var x = Math.min(xExtent[0], xExtent[1]);
+ var y = Math.min(yExtent[0], yExtent[1]);
+ var width = Math.max(xExtent[0], xExtent[1]) - x;
+ var height = Math.max(yExtent[0], yExtent[1]) - y;
+
+ var rect = new BoundingRect(x, y, width, height);
+ return rect;
}
};
@@ -41733,8 +41945,13 @@ BaseBarSeries.extend({
progressiveThreshold = largeThreshold;
}
return progressiveThreshold;
- }
+ },
+ defaultOption: {
+ // If clipped
+ // Only available on cartesian2d
+ clip: true
+ }
});
/*
@@ -41855,6 +42072,29 @@ var _eventPos = [0, 0];
// Just for compatible with ec2.
extend(Model.prototype, barItemStyle);
+function getClipArea(coord, data) {
+ var coordSysClipArea = coord.getArea && coord.getArea();
+ if (coord.type === 'cartesian2d') {
+ var baseAxis = coord.getBaseAxis();
+ // When boundaryGap is false or using time axis. bar may exceed the grid.
+ // We should not clip this part.
+ // See test/bar2.html
+ if (baseAxis.type !== 'category' || !baseAxis.onBand) {
+ var expandWidth = data.getLayout('bandWidth');
+ if (baseAxis.isHorizontal()) {
+ coordSysClipArea.x -= expandWidth;
+ coordSysClipArea.width += expandWidth * 2;
+ }
+ else {
+ coordSysClipArea.y -= expandWidth;
+ coordSysClipArea.height += expandWidth * 2;
+ }
+ }
+ }
+
+ return coordSysClipArea;
+}
+
extendChartView({
type: 'bar',
@@ -41914,6 +42154,13 @@ extendChartView({
var animationModel = seriesModel.isAnimationEnabled() ? seriesModel : null;
+ var needsClip = seriesModel.get('clip', true);
+ var coordSysClipArea = getClipArea(coord, data);
+ // If there is clipPath created in large mode. Remove it.
+ group.removeClipPath();
+ // We don't use clipPath in normal mode because we needs a perfect animation
+ // And don't want the label are clipped.
+
data.diff(oldData)
.add(function (dataIndex) {
if (!data.hasValue(dataIndex)) {
@@ -41922,6 +42169,17 @@ extendChartView({
var itemModel = data.getItemModel(dataIndex);
var layout = getLayout[coord.type](data, dataIndex, itemModel);
+
+ if (needsClip) {
+ // Clip will modify the layout params.
+ // And return a boolean to determine if the shape are fully clipped.
+ var isClipped = clip[coord.type](coordSysClipArea, layout);
+ if (isClipped) {
+ group.remove(el);
+ return;
+ }
+ }
+
var el = elementCreator[coord.type](
data, dataIndex, itemModel, layout, isHorizontalOrRadial, animationModel
);
@@ -41944,6 +42202,14 @@ extendChartView({
var itemModel = data.getItemModel(newIndex);
var layout = getLayout[coord.type](data, newIndex, itemModel);
+ if (needsClip) {
+ var isClipped = clip[coord.type](coordSysClipArea, layout);
+ if (isClipped) {
+ group.remove(el);
+ return;
+ }
+ }
+
if (el) {
updateProps(el, {shape: layout}, animationModel, newIndex);
}
@@ -41979,6 +42245,17 @@ extendChartView({
_renderLarge: function (seriesModel, ecModel, api) {
this._clear();
createLarge(seriesModel, this.group);
+
+ // Use clipPath in large mode.
+ var clipPath = seriesModel.get('clip', true)
+ ? createClipPath(seriesModel.coordinateSystem, false, seriesModel)
+ : null;
+ if (clipPath) {
+ this.group.setClipPath(clipPath);
+ }
+ else {
+ this.group.removeClipPath();
+ }
},
_incrementalRenderLarge: function (params, seriesModel) {
@@ -42012,6 +42289,53 @@ extendChartView({
});
+var mathMax$4 = Math.max;
+var mathMin$4 = Math.min;
+
+var clip = {
+ cartesian2d: function (coordSysBoundingRect, layout) {
+ var signWidth = layout.width < 0 ? -1 : 1;
+ var signHeight = layout.height < 0 ? -1 : 1;
+ // Needs positive width and height
+ if (signWidth < 0) {
+ layout.x += layout.width;
+ layout.width = -layout.width;
+ }
+ if (signHeight < 0) {
+ layout.y += layout.height;
+ layout.height = -layout.height;
+ }
+
+ var x = mathMax$4(layout.x, coordSysBoundingRect.x);
+ var x2 = mathMin$4(layout.x + layout.width, coordSysBoundingRect.x + coordSysBoundingRect.width);
+ var y = mathMax$4(layout.y, coordSysBoundingRect.y);
+ var y2 = mathMin$4(layout.y + layout.height, coordSysBoundingRect.y + coordSysBoundingRect.height);
+
+ layout.x = x;
+ layout.y = y;
+ layout.width = x2 - x;
+ layout.height = y2 - y;
+
+ var clipped = layout.width < 0 || layout.height < 0;
+
+ // Reverse back
+ if (signWidth < 0) {
+ layout.x += layout.width;
+ layout.width = -layout.width;
+ }
+ if (signHeight < 0) {
+ layout.y += layout.height;
+ layout.height = -layout.height;
+ }
+
+ return clipped;
+ },
+
+ polar: function (coordSysClipArea) {
+ return false;
+ }
+};
+
var elementCreator = {
cartesian2d: function (
@@ -42615,9 +42939,12 @@ var PieSeries = extendSeriesModel({
borderWidth: 1
},
- // Animation type canbe expansion, scale
+ // Animation type. Valid values: expansion, scale
animationType: 'expansion',
+ // Animation type when update. Valid values: transition, expansion
+ animationTypeUpdate: 'transition',
+
animationEasing: 'cubicOut'
}
});
@@ -42734,6 +43061,8 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
var sectorShape = extend({}, layout);
sectorShape.label = null;
+ var animationTypeUpdate = seriesModel.getShallow('animationTypeUpdate');
+
if (firstCreate) {
sector.setShape(sectorShape);
@@ -42758,9 +43087,16 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
}
else {
- updateProps(sector, {
- shape: sectorShape
- }, seriesModel, idx);
+ if (animationTypeUpdate === 'expansion') {
+ // Sectors are set to be target shape and an overlaying clipPath is used for animation
+ sector.setShape(sectorShape);
+ }
+ else {
+ // Transition animation from the old shape
+ updateProps(sector, {
+ shape: sectorShape
+ }, seriesModel, idx);
+ }
}
// Update common style
@@ -42789,7 +43125,9 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
seriesModel.get('animation')
);
- this._updateLabel(data, idx);
+ // Label and text animation should be applied only for transition type animation when update
+ var withAnimation = !firstCreate && animationTypeUpdate === 'transition';
+ this._updateLabel(data, idx, withAnimation);
this.highDownOnUpdate = (itemModel.get('hoverAnimation') && seriesModel.isAnimationEnabled())
? function (fromState, toState) {
@@ -42823,7 +43161,7 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
setHoverStyle(this);
};
-piePieceProto._updateLabel = function (data, idx) {
+piePieceProto._updateLabel = function (data, idx, withAnimation) {
var labelLine = this.childAt(1);
var labelText = this.childAt(2);
@@ -42840,20 +43178,33 @@ piePieceProto._updateLabel = function (data, idx) {
return;
}
- updateProps(labelLine, {
- shape: {
- points: labelLayout.linePoints || [
- [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y]
- ]
- }
- }, seriesModel, idx);
+ var targetLineShape = {
+ points: labelLayout.linePoints || [
+ [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y]
+ ]
+ };
+ var targetTextStyle = {
+ x: labelLayout.x,
+ y: labelLayout.y
+ };
+ if (withAnimation) {
+ updateProps(labelLine, {
+ shape: targetLineShape
+ }, seriesModel, idx);
+
+ updateProps(labelText, {
+ style: targetTextStyle
+ }, seriesModel, idx);
+ }
+ else {
+ labelLine.attr({
+ shape: targetLineShape
+ });
+ labelText.attr({
+ style: targetTextStyle
+ });
+ }
- updateProps(labelText, {
- style: {
- x: labelLayout.x,
- y: labelLayout.y
- }
- }, seriesModel, idx);
labelText.attr({
rotation: labelLayout.rotation,
origin: [labelLayout.x, labelLayout.y],
@@ -42931,6 +43282,7 @@ var PieView = Chart.extend({
var hasAnimation = ecModel.get('animation');
var isFirstRender = !oldData;
var animationType = seriesModel.get('animationType');
+ var animationTypeUpdate = seriesModel.get('animationTypeUpdate');
var onSectorClick = curry(
updateDataSelected, this.uid, seriesModel, hasAnimation, api
@@ -42956,6 +43308,12 @@ var PieView = Chart.extend({
.update(function (newIdx, oldIdx) {
var piePiece = oldData.getItemGraphicEl(oldIdx);
+ if (!isFirstRender && animationTypeUpdate !== 'transition') {
+ piePiece.eachChild(function (child) {
+ child.stopAnimation(true);
+ });
+ }
+
piePiece.updateData(data, newIdx);
piePiece.off('click');
@@ -42970,9 +43328,8 @@ var PieView = Chart.extend({
.execute();
if (
- hasAnimation && isFirstRender && data.count() > 0
- // Default expansion animation
- && animationType !== 'scale'
+ hasAnimation && data.count() > 0
+ && (isFirstRender ? animationType !== 'scale' : animationTypeUpdate !== 'transition')
) {
var shape = data.getItemLayout(0);
for (var s = 1; isNaN(shape.startAngle) && s < data.count(); ++s) {
@@ -42983,7 +43340,7 @@ var PieView = Chart.extend({
var removeClipPath = bind(group.removeClipPath, group);
group.setClipPath(this._createClipPath(
- shape.cx, shape.cy, r, shape.startAngle, shape.clockwise, removeClipPath, seriesModel
+ shape.cx, shape.cy, r, shape.startAngle, shape.clockwise, removeClipPath, seriesModel, isFirstRender
));
}
else {
@@ -42997,7 +43354,7 @@ var PieView = Chart.extend({
dispose: function () {},
_createClipPath: function (
- cx, cy, r, startAngle, clockwise, cb, seriesModel
+ cx, cy, r, startAngle, clockwise, cb, seriesModel, isFirstRender
) {
var clipPath = new Sector({
shape: {
@@ -43011,7 +43368,8 @@ var PieView = Chart.extend({
}
});
... 7127 lines suppressed ...
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org