You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by sh...@apache.org on 2020/05/26 14:53:15 UTC
[incubator-echarts] branch label-enhancement updated (ea1978b ->
72c10a2)
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a change to branch label-enhancement
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.
from ea1978b fix: use fill instead of textFIll for text
add 398f619 feat: enable label to be silent.
add 08d6c47 fix: incorrect commit ed73906f11fadec7b2f0af37fb0972a84d30bf5d
add b338c22 fix: (1) move "auto outside stroke" back to zrender. Think that's reasonable to auto provide this strategy to user. (2) do not specify insideStroke directly, use zrender auto strategry, otherwise incorrect in emphasis.
add 2708396 fix: tweak emphasis text position.
add 0802ef0 fix: (1) revert increamental render broken brought by a96d97191b28500d2a3dc4f44e53221d54fbe218 (2) add stream test tools.
add 95e9b27 fix: (1) fix bar incremental render (brought by a61fd5ab7f434c7e967e107d6435c1e3f4f6d008) (2) add stream test case.
add 1785081 fix: clarify comments.
add 9db5c3e fix: fix interval split area in polor: should go back to the start angle.
add 1b7f2f4 fix let declare order in ES6 build target.
add 4d8fbea chore: try esbuild to improve rebuild speed in dev mode.
new 72c10a2 Merge branch 'next' into label-enhancement
The 1 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:
build/dev-fast.js | 52 +++++
package-lock.json | 113 +++++++++++
package.json | 3 +
src/chart/bar/BarView.ts | 5 +-
src/component/axis/AngleAxisView.ts | 7 +-
src/coord/CoordinateSystem.ts | 3 -
src/data/List.ts | 43 ++--
src/data/helper/dataProvider.ts | 6 +-
src/echarts.ts | 81 ++++----
src/model/Component.ts | 14 +-
src/model/Global.ts | 17 +-
src/model/Model.ts | 14 +-
src/model/Series.ts | 14 +-
src/util/graphic.ts | 24 ++-
src/util/types.ts | 1 +
src/view/Chart.ts | 14 +-
src/view/Component.ts | 14 +-
test/-cases.js | 2 +
test/axis-splitArea.html | 170 ++++++++++++++++
test/bar-stream-large.html | 15 +-
test/hoverStyle.html | 26 ++-
test/lib/reset.css | 14 ++
test/lib/testHelper.js | 224 +++++++++++++++++----
.../removeDEV/src/code.src.js => stream-basic.css} | 47 ++---
test/stream-basic.js | 99 +++++++++
test/stream-basic1.html | 106 ++++++++++
test/stream-basic2.html | 114 +++++++++++
27 files changed, 1052 insertions(+), 190 deletions(-)
create mode 100644 build/dev-fast.js
copy test/{build/removeDEV/src/code.src.js => stream-basic.css} (66%)
create mode 100644 test/stream-basic.js
create mode 100644 test/stream-basic1.html
create mode 100644 test/stream-basic2.html
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 01/01: Merge branch 'next' into
label-enhancement
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch label-enhancement
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 72c10a2d326e10dc17634bb97d05203e011f50b1
Merge: ea1978b 4d8fbea
Author: pissang <bm...@gmail.com>
AuthorDate: Tue May 26 22:52:02 2020 +0800
Merge branch 'next' into label-enhancement
build/dev-fast.js | 52 +++++++++
package-lock.json | 113 ++++++++++++++++++
package.json | 3 +
src/chart/bar/BarView.ts | 5 +-
src/component/axis/AngleAxisView.ts | 7 +-
src/coord/CoordinateSystem.ts | 3 -
src/data/List.ts | 43 ++++---
src/data/helper/dataProvider.ts | 6 +-
src/echarts.ts | 81 ++++++-------
src/model/Component.ts | 14 ++-
src/model/Global.ts | 17 ++-
src/model/Model.ts | 14 ++-
src/model/Series.ts | 14 ++-
src/util/graphic.ts | 24 +++-
src/util/types.ts | 1 +
src/view/Chart.ts | 14 ++-
src/view/Component.ts | 14 ++-
test/-cases.js | 2 +
test/axis-splitArea.html | 170 +++++++++++++++++++++++++++
test/bar-stream-large.html | 15 ++-
test/hoverStyle.html | 26 ++++-
test/lib/reset.css | 14 +++
test/lib/testHelper.js | 224 +++++++++++++++++++++++++++++-------
test/stream-basic.css | 39 +++++++
test/stream-basic.js | 99 ++++++++++++++++
test/stream-basic1.html | 106 +++++++++++++++++
test/stream-basic2.html | 114 ++++++++++++++++++
27 files changed, 1074 insertions(+), 160 deletions(-)
diff --cc src/echarts.ts
index 7420e3a,5be348b..6723c9d
--- a/src/echarts.ts
+++ b/src/echarts.ts
@@@ -175,6 -174,48 +175,44 @@@ messageCenterProto.on = createRegisterE
messageCenterProto.off = createRegisterEventWithLowercaseMessageCenter('off');
// messageCenterProto.one = createRegisterEventWithLowercaseMessageCenter('one');
+ // ---------------------------------------
+ // Internal method names for class ECharts
+ // ---------------------------------------
+ let prepare: (ecIns: ECharts) => void;
+ let prepareView: (ecIns: ECharts, isComponent: boolean) => void;
+ let updateDirectly: (
+ ecIns: ECharts, method: string, payload: Payload, mainType: ComponentMainType, subType?: ComponentSubType
+ ) => void;
+ type UpdateMethod = (this: ECharts, payload?: Payload) => void;
+ let updateMethods: {
+ prepareAndUpdate: UpdateMethod,
+ update: UpdateMethod,
+ updateTransform: UpdateMethod,
+ updateView: UpdateMethod,
+ updateVisual: UpdateMethod,
+ updateLayout: UpdateMethod
+ };
+ let doConvertPixel: (ecIns: ECharts, methodName: string, finder: ModelFinder, value: any) => any;
+ let updateStreamModes: (ecIns: ECharts, ecModel: GlobalModel) => void;
+ let doDispatchAction: (this: ECharts, payload: Payload, silent: boolean) => void;
+ let flushPendingActions: (this: ECharts, silent: boolean) => void;
+ let triggerUpdatedEvent: (this: ECharts, silent: boolean) => void;
+ let bindRenderedEvent: (zr: zrender.ZRenderType, ecIns: ECharts) => void;
+ let clearColorPalette: (ecModel: GlobalModel) => void;
+ let render: (ecIns: ECharts, ecModel: GlobalModel, api: ExtensionAPI, payload: Payload) => void;
+ let renderComponents: (
+ ecIns: ECharts, ecModel: GlobalModel, api: ExtensionAPI, payload: Payload, dirtyList?: ComponentView[]
+ ) => void;
+ let renderSeries: (
+ ecIns: ECharts,
+ ecModel: GlobalModel,
+ api: ExtensionAPI,
+ payload: Payload | 'remain',
+ dirtyMap?: {[uid: string]: any}
+ ) => void;
+ let performPostUpdateFuncs: (ecModel: GlobalModel, api: ExtensionAPI) => void;
-let updateHoverLayerStatus: (ecIns: ECharts, ecModel: GlobalModel) => void;
-let updateBlend: (seriesModel: SeriesModel, chartView: ChartView) => void;
-let updateZ: (model: ComponentModel, view: ComponentView | ChartView) => void;
-let updateHoverEmphasisHandler: (view: ComponentView | ChartView) => void;
+ let createExtensionAPI: (ecIns: ECharts) => ExtensionAPI;
+ let enableConnect: (chart: ECharts) => void;
class ECharts extends Eventful {
@@@ -1666,11 -1692,13 +1704,14 @@@
if (dirtyMap && dirtyMap.get(seriesModel.uid)) {
renderTask.dirty();
}
-
- unfinished |= +renderTask.perform(scheduler.getPerformArgs(renderTask));
+ if (renderTask.perform(scheduler.getPerformArgs(renderTask))) {
+ unfinished = true;
+ }
chartView.group.silent = !!seriesModel.get('silent');
+ // Should not call markRedraw on group, because it will disable zrender
+ // increamental render (alway render from the __startIndex each frame)
+ // chartView.group.markRedraw();
updateZ(seriesModel, chartView);
@@@ -1923,46 -1874,7 +1964,6 @@@
}
- // ---------------------------------------
- // Internal method names for class ECharts
- // ---------------------------------------
- let prepare: (ecIns: ECharts) => void;
- let prepareView: (ecIns: ECharts, isComponent: boolean) => void;
- let updateDirectly: (
- ecIns: ECharts, method: string, payload: Payload, mainType: ComponentMainType, subType?: ComponentSubType
- ) => void;
- type UpdateMethod = (this: ECharts, payload?: Payload) => void;
- let updateMethods: {
- prepareAndUpdate: UpdateMethod,
- update: UpdateMethod,
- updateTransform: UpdateMethod,
- updateView: UpdateMethod,
- updateVisual: UpdateMethod,
- updateLayout: UpdateMethod
- };
- let doConvertPixel: (ecIns: ECharts, methodName: string, finder: ModelFinder, value: any) => any;
- let updateStreamModes: (ecIns: ECharts, ecModel: GlobalModel) => void;
- let doDispatchAction: (this: ECharts, payload: Payload, silent: boolean) => void;
- let flushPendingActions: (this: ECharts, silent: boolean) => void;
- let triggerUpdatedEvent: (this: ECharts, silent: boolean) => void;
- let bindRenderedEvent: (zr: zrender.ZRenderType, ecIns: ECharts) => void;
- let clearColorPalette: (ecModel: GlobalModel) => void;
- let render: (ecIns: ECharts, ecModel: GlobalModel, api: ExtensionAPI, payload: Payload) => void;
- let renderComponents: (
- ecIns: ECharts, ecModel: GlobalModel, api: ExtensionAPI, payload: Payload, dirtyList?: ComponentView[]
- ) => void;
- let renderSeries: (
- ecIns: ECharts,
- ecModel: GlobalModel,
- api: ExtensionAPI,
- payload: Payload | 'remain',
- dirtyMap?: {[uid: string]: any}
- ) => void;
- let performPostUpdateFuncs: (ecModel: GlobalModel, api: ExtensionAPI) => void;
- let createExtensionAPI: (ecIns: ECharts) => ExtensionAPI;
- let enableConnect: (chart: ECharts) => void;
-
--
const echartsProto = ECharts.prototype;
echartsProto.on = createRegisterEventWithLowercaseECharts('on');
echartsProto.off = createRegisterEventWithLowercaseECharts('off');
diff --cc src/model/Model.ts
index a2f588f,e743be4..e9cf064
--- a/src/model/Model.ts
+++ b/src/model/Model.ts
@@@ -44,17 -46,30 +44,21 @@@ type Value<Opt, R> = Opt extends Dictio
class Model<Opt extends ModelOption = ModelOption> { // TODO: TYPE use unkown insteadof any?
- // [Caution]: for compat the previous "class extend"
- // publich and protected fields must be initialized on
- // prototype rather than in constructor. Otherwise the
- // subclass overrided filed will be overwritten by this
- // class. That is, they should not be initialized here.
+ // [Caution]: Becuase this class or desecendants can be used as `XXX.extend(subProto)`,
+ // the class members must not be initialized in constructor or declaration place.
+ // Otherwise there is bad case:
+ // class A {xxx = 1;}
+ // enableClassExtend(A);
+ // class B extends A {}
+ // var C = B.extend({xxx: 5});
+ // var c = new C();
+ // console.log(c.xxx); // expect 5 but always 1.
- /**
- * @readOnly
- */
parentModel: Model;
- /**
- * @readOnly
- */
- ecModel: GlobalModel;;
+ ecModel: GlobalModel;
- /**
- * @readOnly
- */
- option: Opt;
+ option: Opt; // TODO Opt should only be object.
constructor(option?: Opt, parentModel?: Model, ecModel?: GlobalModel) {
this.parentModel = parentModel;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org