This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch remove-component
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 29f2984163a385cd5e7e14ca5e487865b17cfbb8
Merge: 3154459 7304d5a
Author: 100pah <sushuang0...@gmail.com>
AuthorDate: Fri Jul 17 20:03:12 2020 +0800
Merge branch 'next' into remove-component
# Conflicts:
# src/model/Global.ts
src/model/Global.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc src/model/Global.ts
index 9073aab,141ba8f..ff220f8
--- a/src/model/Global.ts
+++ b/src/model/Global.ts
@@@ -82,20 -73,11 +82,20 @@@ class GlobalModel extends Model<ECUnitO
private _optionManager: OptionManager;
- private _componentsMap: HashMap<ComponentModel[], string>;
+ private _componentsMap: HashMap<ComponentModel[], ComponentMainType>;
/**
+ * `_componentsMap` might have "hole" becuase of remove.
+ * So save components count for a certain mainType here.
+ */
+ private _componentsCount: HashMap<number>;
+
+ /**
* Mapping between filtered series list and raw series list.
* key: filtered series indices, value: raw series indices.
+ * Items of `_seriesIndices` never be null/empty/-1.
+ * If series has been removed by `replaceMerge`, those series
+ * also won't be in `_seriesIndices`, just like be filtered.
*/
private _seriesIndices: number[];
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
