@visactor/vchart 1.6.7 → 1.7.0-alpha.1

package/esm/model/base-model.js

@@ -26,30 +26,32 @@ var __awaiter = this && this.__awaiter || function(thisArg, _arguments, P, gener
 
 import { cloneDeepSpec } from "../util/spec/clone-deep";
 
-import { preprocessSpecOrTheme } from "../util/spec/preprocess";
-
 import { createID } from "../util/id";
 
 import { mergeSpec } from "../util/spec/merge-spec";
 
 import { Event } from "../event/event";
 
-import { LayoutItem } from "./layout-item";
-
-import { PREFIX } from "../constant";
-
-import { isArray, isEqual, isValid } from "@visactor/vutils";
+import { isArray, isValid } from "@visactor/vutils";
 
 import { Factory } from "../core/factory";
 
 import { MarkSet } from "../mark/mark-set";
 
-import { defaultChartLevelTheme } from "../theme/builtin";
+import { CompilableBase } from "../compile/compilable-base";
+
+import { PREFIX } from "../constant/base";
 
-export class BaseModel extends LayoutItem {
+export class BaseModel extends CompilableBase {
+    getSpec() {
+        return this._spec || {};
+    }
     getData() {
         return this._data;
     }
+    get layout() {
+        return this._layout;
+    }
     getSpecIndex() {
         return this._specIndex;
     }
@@ -77,13 +79,13 @@ export class BaseModel extends LayoutItem {
         return this._option.getChart();
     }
     constructor(spec, option) {
-        var _a, _b, _c;
+        var _a, _b;
         super(option), this.type = "null", this.modelType = "null", this.userId = void 0, 
-        this._data = null, this._specIndex = 0, this.specKey = "", this._marks = new MarkSet, 
-        this._lastLayoutRect = null, this._isLayout = !0, this.id = createID(), this._originalSpec = spec, 
+        this._data = null, this._layout = null, this._specIndex = 0, this.specKey = "", 
+        this._marks = new MarkSet, this._lastLayoutRect = null, this.id = createID(), this._originalSpec = spec, 
         this._spec = cloneDeepSpec(spec), this._transformSpec(), this.userId = spec.id, 
-        this._specIndex = null !== (_a = option.specIndex) && void 0 !== _a ? _a : 0, this.specKey = null !== (_b = option.specKey) && void 0 !== _b ? _b : "", 
-        this.effect = {}, this.event = new Event(option.eventDispatcher, option.mode), null === (_c = option.map) || void 0 === _c || _c.set(this.id, this);
+        this._specIndex = null !== (_a = option.specIndex) && void 0 !== _a ? _a : 0, this.effect = {}, 
+        this.event = new Event(option.eventDispatcher, option.mode), null === (_b = option.map) || void 0 === _b || _b.set(this.id, this);
     }
     _releaseEvent() {
         this.event.release();
@@ -93,18 +95,17 @@ export class BaseModel extends LayoutItem {
     }
     init(option) {}
     afterInit() {}
+    getVisible() {
+        var _a;
+        return !1 !== (null === (_a = this._spec) || void 0 === _a ? void 0 : _a.visible);
+    }
     onLayoutStart(layoutRect, viewRect, ctx) {
-        super.onLayoutStart(layoutRect, viewRect, ctx), this._isLayout = !0;
+        var _a;
+        null === (_a = this._layout) || void 0 === _a || _a.onLayoutStart(layoutRect, viewRect, ctx);
     }
     onLayoutEnd(ctx) {
-        const layoutRect = this.getLayoutRect();
-        !this._forceLayoutTag && isEqual(this._lastLayoutRect, layoutRect) || this.updateLayoutAttribute(), 
-        this._forceLayoutTag = !1, this.getMarks().forEach((m => m.updateLayoutState(!0, !0))), 
-        this._isLayout = !1;
-    }
-    _forceLayout() {
         var _a;
-        this._isLayout || (this._forceLayoutTag = !0, null === (_a = this._option.globalInstance.getChart()) || void 0 === _a || _a.setLayoutTag(!0));
+        null === (_a = this._layout) || void 0 === _a || _a.onLayoutEnd(ctx), this.getMarks().forEach((m => m.updateLayoutState(!0, !0)));
     }
     onEvaluateEnd(ctx) {}
     onDataUpdate() {}
@@ -143,7 +144,6 @@ export class BaseModel extends LayoutItem {
             const specFromChart = this._getDefaultSpecFromChart(this.getChart().getSpec()), merge = originalSpec => mergeSpec({}, this._theme, this._prepareSpecBeforeMergingTheme(specFromChart), this._prepareSpecBeforeMergingTheme(originalSpec)), baseSpec = this._spec;
             isArray(baseSpec) ? this._spec = baseSpec.map((spec => merge(spec))) : this._spec = merge(baseSpec);
         }
-        this._prepareSpecAfterMergingTheme();
     }
     _getDefaultSpecFromChart(chartSpec) {
         return {};
@@ -154,11 +154,6 @@ export class BaseModel extends LayoutItem {
     _prepareSpecBeforeMergingTheme(obj) {
         return obj;
     }
-    _prepareSpecAfterMergingTheme(obj) {
-        arguments.length || (obj = this._spec);
-        const newObj = preprocessSpecOrTheme("spec", obj, this.getColorScheme(), "series" === this.modelType ? this._spec : void 0);
-        return arguments.length || (this._spec = newObj), newObj;
-    }
     setCurrentTheme(noRender) {
         return __awaiter(this, void 0, void 0, (function*() {
             const modifyConfig = () => (this.reInit(this._getTheme()), {
@@ -170,7 +165,8 @@ export class BaseModel extends LayoutItem {
     }
     updateLayoutAttribute() {}
     setAttrFromSpec() {
-        super.setAttrFromSpec(this._spec, this._option.getChartViewRect());
+        var _a;
+        null === (_a = this._layout) || void 0 === _a || _a.setAttrFromSpec(this._spec, this._option.getChartViewRect());
     }
     _convertMarkStyle(style) {
         return Object.assign({}, style);
@@ -212,12 +208,8 @@ export class BaseModel extends LayoutItem {
     }
     _getDataIdKey() {}
     getColorScheme() {
-        var _a, _b, _c;
-        return (null !== (_c = null === (_b = (_a = this._option).getThemeConfig) || void 0 === _b ? void 0 : _b.call(_a).chartLevelTheme) && void 0 !== _c ? _c : defaultChartLevelTheme).colorScheme;
-    }
-    _getChartLevelTheme() {
-        var _a, _b, _c;
-        return null !== (_c = null === (_b = (_a = this._option).getThemeConfig) || void 0 === _b ? void 0 : _b.call(_a).chartLevelTheme) && void 0 !== _c ? _c : defaultChartLevelTheme;
+        var _a, _b;
+        return null === (_b = (_a = this._option).getTheme) || void 0 === _b ? void 0 : _b.call(_a).colorScheme;
     }
 }
 //# sourceMappingURL=base-model.js.map

package/esm/model/base-model.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/model/base-model.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAwB3C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,MAAM,OAAgB,SAAgC,SAAQ,UAAa;IAgBzE,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAGD,YAAY;QACV,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAOD,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAGD,QAAQ;;QACN,OAAO,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,QAAQ,EAAE,mCAAI,EAAE,CAAC;IACvC,CAAC;IACD,cAAc;;QACZ,OAAO,MAAA,IAAI,CAAC,MAAM,0CAAE,cAAc,EAAE,CAAC;IACvC,CAAC;IACD,UAAU;QACR,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IACD,eAAe;QACb,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAClC,IAAI,EAAE,IAAI,CAAC,IAAoB;YAC/B,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAC,CAAC;IACN,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;IACjC,CAAC;IAUD,YAAY,IAAO,EAAE,MAAoB;;QACvC,KAAK,CAAC,MAAM,CAAC,CAAC;QA/DP,SAAI,GAAW,MAAM,CAAC;QACtB,cAAS,GAAW,MAAM,CAAC;QAIpC,WAAM,GAA+B,SAAS,CAAC;QASrC,UAAK,GAAmB,IAAI,CAAC;QAK7B,eAAU,GAAW,CAAC,CAAC;QAKxB,YAAO,GAAW,EAAE,CAAC;QASpB,WAAM,GAAY,IAAI,OAAO,EAAE,CAAC;QAwBhC,oBAAe,GAAgB,IAAI,CAAC;QAGpC,cAAS,GAAY,IAAI,CAAC;QAIlC,IAAI,CAAC,EAAE,GAAG,QAAQ,EAAE,CAAC;QACrB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,MAAA,MAAM,CAAC,SAAS,mCAAI,CAAC,CAAC;QACxC,IAAI,CAAC,OAAO,GAAG,MAAA,MAAM,CAAC,OAAO,mCAAI,EAAE,CAAC;QACpC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAC5D,MAAA,MAAM,CAAC,GAAG,0CAAE,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACjC,CAAC;IAGS,aAAa;QACrB,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;IAED,OAAO;QACL,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED,IAAI,CAAC,MAAwB;IAE7B,CAAC;IAED,SAAS;IAET,CAAC;IAED,aAAa,CAAC,UAAiB,EAAE,QAAqB,EAAE,GAAQ;QAC9D,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC/C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IACxB,CAAC;IACD,WAAW,CAAC,GAAQ;QAElB,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACxC,IAAI,IAAI,CAAC,eAAe,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,EAAE;YACtE,IAAI,CAAC,qBAAqB,EAAE,CAAC;SAC9B;QACD,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;QAC7B,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QAC9D,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IACzB,CAAC;IAES,YAAY;;QACpB,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,OAAO;SACR;QACD,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,MAAA,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,0CAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED,aAAa,CAAC,GAAyB;IAEvC,CAAC;IAGD,YAAY;IAEZ,CAAC;IAED,aAAa;IAEb,CAAC;IAED,OAAO;;QACL,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACvB,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1C,MAAA,IAAI,CAAC,KAAK,0CAAE,OAAO,EAAE,CAAC;QACtB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACpC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACpB,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;IAED,UAAU,CAAC,IAAS;QAClB,IAAI,CAAC,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACnC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAClB,IAAI,CAAC,MAAM,EAAE,CAAC;SACf;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAES,cAAc;IAGxB,CAAC;IAES,YAAY;QACpB,MAAM,MAAM,GAAG;YACb,MAAM,EAAE,KAAK;YACb,MAAM,EAAE,KAAK;YACb,QAAQ,EAAE,KAAK;YACf,MAAM,EAAE,KAAK;YACb,SAAS,EAAE,KAAK;SACjB,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,KAAW;QAEhB,IAAI,CAAC,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC/C,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACvB,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAES,UAAU,CAAC,KAAW;QAC9B,IAAI,KAAK,EAAE;YACT,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;SACrB;aAAM;YACL,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;SAChC;QAED,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAES,SAAS;QACjB,OAAO,SAAS,CAAC;IACnB,CAAC;IAGS,iBAAiB;QACzB,IAAI,IAAI,CAAC,uBAAuB,EAAE,EAAE;YAClC,MAAM,aAAa,GAAG,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;YAG/E,MAAM,KAAK,GAAG,CAAC,YAAiB,EAAE,EAAE,CAClC,SAAS,CACP,EAAE,EACF,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,8BAA8B,CAAC,aAAa,CAAC,EAClD,IAAI,CAAC,8BAA8B,CAAC,YAAY,CAAC,CAClD,CAAC;YAEJ,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;YAC5B,IAAI,OAAO,CAAC,QAAQ,CAAC,EAAE;gBACrB,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAiB,CAAC;aAChE;iBAAM;gBACL,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;aAC9B;SACF;QACD,IAAI,CAAC,6BAA6B,EAAE,CAAC;IACvC,CAAC;IAGS,wBAAwB,CAAC,SAAc;QAC/C,OAAO,EAAE,CAAC;IACZ,CAAC;IAGS,uBAAuB;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IAGS,8BAA8B,CAAC,GAAS;QAEhD,OAAO,GAAG,CAAC;IACb,CAAC;IAGS,6BAA6B,CAAC,GAAS;QAC/C,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;YACrB,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC;SAClB;QAED,MAAM,MAAM,GAAG,qBAAqB,CAClC,MAAM,EACN,GAAG,EACH,IAAI,CAAC,cAAc,EAAE,EACrB,IAAI,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAE,IAAI,CAAC,KAAgC,CAAC,CAAC,CAAC,SAAS,CACjF,CAAC;QAEF,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;YACrB,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC;SACrB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEK,eAAe,CAAC,QAAkB;;YACtC,MAAM,YAAY,GAAG,GAAG,EAAE;gBAExB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;gBAE9B,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;YACzC,CAAC,CAAC;YAEF,IAAI,QAAQ,EAAE;gBACZ,YAAY,EAAE,CAAC;aAChB;iBAAM;gBACL,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,6BAA6B,CAAC,YAAY,CAAC,CAAC;aAC/E;QACH,CAAC;KAAA;IAED,qBAAqB;IAErB,CAAC;IAED,eAAe;QACb,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IACrE,CAAC;IAGS,iBAAiB,CACzB,KAAyD;QAEzD,MAAM,QAAQ,qBAAa,KAAK,CAAE,CAAC;QACnC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,YAAY,CACV,IAAiB,EACjB,KAA0D,EAC1D,KAAsB,EACtB,KAAc;QAEd,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACrC,OAAO;SACR;QACD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC;IAED,qBAAqB,CAAC,IAAY,EAAE,IAAU,EAAE,GAAY;QAC1D,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACpC,OAAO;SACR;QACD,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QAC9B,MAAM,OAAO,qBAAQ,IAAI,CAAE,CAAC;QAE5B,IAAI,KAAK,EAAE;YACT,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;SAC/C;QACD,IAAI,KAAK,EAAE;YACT,OAAO,CAAC,KAAK,GAAG,EAAE,CAAC;YACnB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBAC/B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1D,CAAC,CAAC,CAAC;SACJ;QACD,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACvC,CAAC;IAES,oBAAoB,CAAC,GAAW,EAAE,GAAY;QACtD,IAAI,IAAI,GAAG,GAAG,MAAM,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC;QACxE,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,WAAW;;QACT,MAAA,IAAI,CAAC,KAAK,0CAAE,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,YAAY,CAAC,KAA2B;QACtC,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC1B,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC;IAES,WAAW,CAAkB,QAAwB,EAAE,SAA+B,EAAE;QAChG,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC;QAChC,MAAM,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,IAAW,EAAE,IAAI,kBAC5C,KAAK,EAAE,IAAI,EACX,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,EACrB,WAAW,EAAE,IAAI,CAAC,WAAW,EAC7B,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,IAClC,MAAM,EACJ,CAAC;QACR,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO,EAAE,CAAC;QACb,OAAO,CAAC,CAAC;IACX,CAAC;IAOS,aAAa;QACrB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,cAAc;;QACZ,OAAO,CAAC,MAAA,MAAA,MAAA,IAAI,CAAC,OAAO,EAAC,cAAc,mDAAK,eAAe,mCAAI,sBAAsB,CAAC,CAAC,WAAW,CAAC;IACjG,CAAC;IAES,mBAAmB;;QAC3B,OAAO,MAAA,MAAA,MAAA,IAAI,CAAC,OAAO,EAAC,cAAc,mDAAK,eAAe,mCAAI,sBAAsB,CAAC;IACnF,CAAC;CACF","file":"base-model.js","sourcesContent":["import { cloneDeepSpec } from '../util/spec/clone-deep';\nimport { preprocessSpecOrTheme } from '../util/spec/preprocess';\nimport { createID } from '../util/id';\nimport { mergeSpec } from '../util/spec/merge-spec';\nimport { Event } from '../event/event';\nimport type { IEvent } from '../event/interface';\nimport { LayoutItem } from './layout-item';\nimport type {\n  IEffect,\n  IModel,\n  IModelInitOption,\n  IModelOption,\n  IModelRenderOption,\n  IModelEvaluateOption,\n  IModelSpec,\n  ILayoutRect,\n  IModelMarkInfo\n} from './interface';\nimport type { CoordinateType } from '../typings/coordinate';\nimport type { IMark, IMarkOption, IMarkRaw, IMarkStyle, MarkTypeEnum } from '../mark/interface';\nimport type {\n  Datum,\n  StateValueType,\n  ConvertToMarkStyleSpec,\n  ICommonSpec,\n  StringOrNumber,\n  IRect,\n  ISeriesSpec\n} from '../typings';\nimport type { CompilableData } from '../compile/data/compilable-data';\nimport { PREFIX } from '../constant';\nimport type { IGroupMark } from '@visactor/vgrammar-core';\nimport { isArray, isEqual, isValid } from '@visactor/vutils';\nimport { Factory } from '../core/factory';\nimport { MarkSet } from '../mark/mark-set';\nimport { defaultChartLevelTheme } from '../theme/builtin';\n\nexport abstract class BaseModel<T extends IModelSpec> extends LayoutItem<T> implements IModel {\n  readonly type: string = 'null';\n  readonly modelType: string = 'null';\n\n  readonly id;\n\n  userId: StringOrNumber | undefined = undefined;\n\n  // 事件\n  readonly event: IEvent;\n\n  // 副作用\n  readonly effect: IEffect;\n\n  // 数据\n  protected _data: CompilableData = null;\n  getData() {\n    return this._data;\n  }\n\n  protected _specIndex: number = 0;\n  getSpecIndex() {\n    return this._specIndex;\n  }\n\n  readonly specKey: string = '';\n\n  protected _originalSpec: any;\n\n  protected declare _option: IModelOption;\n  getOption() {\n    return this._option;\n  }\n\n  protected _marks: MarkSet = new MarkSet();\n  getMarks(): IMark[] {\n    return this._marks?.getMarks() ?? [];\n  }\n  getMarkNameMap() {\n    return this._marks?.getMarkNameMap();\n  }\n  getMarkSet() {\n    return this._marks;\n  }\n  getMarkInfoList(): IModelMarkInfo[] {\n    return this.getMarks().map(mark => ({\n      type: mark.type as MarkTypeEnum,\n      name: mark.name\n    }));\n  }\n\n  getChart() {\n    return this._option.getChart();\n  }\n\n  protected _theme?: any; // 非全局 theme，是对应于具体 model 的 theme 对象\n\n  /** for layout diff */\n  protected _lastLayoutRect: ILayoutRect = null;\n\n  // TODO: 有些hack,这个tag是为了避免布局逻辑中，轴的数据变化，又由数据变化触发重新布局\n  protected _isLayout: boolean = true;\n\n  constructor(spec: T, option: IModelOption) {\n    super(option);\n    this.id = createID();\n    this._originalSpec = spec;\n    this._spec = cloneDeepSpec(spec);\n    this._transformSpec();\n    this.userId = spec.id;\n    this._specIndex = option.specIndex ?? 0;\n    this.specKey = option.specKey ?? '';\n    this.effect = {};\n    this.event = new Event(option.eventDispatcher, option.mode);\n    option.map?.set(this.id, this);\n  }\n  coordinate?: CoordinateType;\n\n  protected _releaseEvent() {\n    this.event.release();\n  }\n\n  created() {\n    this._initTheme();\n    this.setAttrFromSpec();\n  }\n\n  init(option: IModelInitOption) {\n    // do nothing\n  }\n\n  afterInit() {\n    // do nothing\n  }\n\n  onLayoutStart(layoutRect: IRect, viewRect: ILayoutRect, ctx: any): void {\n    super.onLayoutStart(layoutRect, viewRect, ctx);\n    this._isLayout = true;\n  }\n  onLayoutEnd(ctx: any): void {\n    // diff layoutRect\n    const layoutRect = this.getLayoutRect();\n    if (this._forceLayoutTag || !isEqual(this._lastLayoutRect, layoutRect)) {\n      this.updateLayoutAttribute();\n    }\n    this._forceLayoutTag = false;\n    this.getMarks().forEach(m => m.updateLayoutState(true, true));\n    this._isLayout = false;\n  }\n\n  protected _forceLayout() {\n    if (this._isLayout) {\n      return;\n    }\n    this._forceLayoutTag = true;\n    this._option.globalInstance.getChart()?.setLayoutTag(true);\n  }\n\n  onEvaluateEnd(ctx: IModelEvaluateOption) {\n    // do nothing\n  }\n  abstract onRender(ctx: IModelRenderOption): void;\n\n  onDataUpdate() {\n    // do nothing\n  }\n\n  beforeRelease() {\n    // do nothing\n  }\n\n  release() {\n    this._releaseEvent();\n    this._originalSpec = {};\n    this._spec = undefined;\n    this.getMarks().forEach(m => m.release());\n    this._data?.release();\n    this._data = this._specIndex = null;\n    this._marks.clear();\n    super.release();\n  }\n\n  updateSpec(spec: any) {\n    this._spec = cloneDeepSpec(spec);\n    const result = this._compareSpec();\n    this._originalSpec = spec;\n    if (!result.reMake) {\n      this.reInit();\n    }\n    return result;\n  }\n\n  protected _transformSpec() {\n    // do nothing\n    // change spec by default logic\n  }\n\n  protected _compareSpec() {\n    const result = {\n      change: false,\n      reMake: false,\n      reRender: false,\n      reSize: false,\n      reCompile: false\n    };\n    return result;\n  }\n\n  reInit(theme?: any) {\n    // before reInit reset this._spec to original\n    this._spec = cloneDeepSpec(this._originalSpec);\n    this._transformSpec();\n    this._initTheme(theme);\n    this.setAttrFromSpec();\n  }\n\n  protected _initTheme(theme?: any) {\n    if (theme) {\n      this._theme = theme;\n    } else {\n      this._theme = this._getTheme();\n    }\n\n    this._mergeThemeToSpec();\n  }\n\n  protected _getTheme(): any {\n    return undefined;\n  }\n\n  /** 将 theme merge 到 spec 中 */\n  protected _mergeThemeToSpec() {\n    if (this._shouldMergeThemeToSpec()) {\n      const specFromChart = this._getDefaultSpecFromChart(this.getChart().getSpec());\n\n      // this._originalSpec + specFromChart + this._theme = this._spec\n      const merge = (originalSpec: any) =>\n        mergeSpec(\n          {},\n          this._theme,\n          this._prepareSpecBeforeMergingTheme(specFromChart),\n          this._prepareSpecBeforeMergingTheme(originalSpec)\n        );\n\n      const baseSpec = this._spec;\n      if (isArray(baseSpec)) {\n        this._spec = baseSpec.map(spec => merge(spec)) as unknown as T;\n      } else {\n        this._spec = merge(baseSpec);\n      }\n    }\n    this._prepareSpecAfterMergingTheme();\n  }\n\n  /** 从 chart spec 提取配置作为 model 的默认 spec 配置 */\n  protected _getDefaultSpecFromChart(chartSpec: any): Partial<T> {\n    return {};\n  }\n\n  /** 是否在初始化时将 theme 自动 merge 到 spec */\n  protected _shouldMergeThemeToSpec(): boolean {\n    return true;\n  }\n\n  /** 在 merge 主题前对 spec 进行预处理 */\n  protected _prepareSpecBeforeMergingTheme(obj?: any): any {\n    // do nothing\n    return obj;\n  }\n\n  /** 在 merge 主题后对 spec 进行遍历和转换 */\n  protected _prepareSpecAfterMergingTheme(obj?: any): any {\n    if (!arguments.length) {\n      obj = this._spec;\n    }\n\n    const newObj = preprocessSpecOrTheme(\n      'spec',\n      obj,\n      this.getColorScheme(),\n      this.modelType === 'series' ? (this._spec as unknown as ISeriesSpec) : undefined\n    );\n\n    if (!arguments.length) {\n      this._spec = newObj;\n    }\n    return newObj;\n  }\n\n  async setCurrentTheme(noRender?: boolean) {\n    const modifyConfig = () => {\n      // 重新初始化\n      this.reInit(this._getTheme());\n\n      return { change: true, reMake: false };\n    };\n\n    if (noRender) {\n      modifyConfig();\n    } else {\n      await this._option.globalInstance.updateCustomConfigAndRerender(modifyConfig);\n    }\n  }\n\n  updateLayoutAttribute() {\n    // do nothing\n  }\n\n  setAttrFromSpec() {\n    super.setAttrFromSpec(this._spec, this._option.getChartViewRect());\n  }\n\n  /** mark style 内部转换逻辑，override 使用 */\n  protected _convertMarkStyle<T extends ICommonSpec = ICommonSpec>(\n    style: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>\n  ): Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>> {\n    const newStyle: any = { ...style };\n    return newStyle;\n  }\n\n  setMarkStyle<T extends ICommonSpec>(\n    mark: IMarkRaw<T>,\n    style?: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>,\n    state?: StateValueType,\n    level?: number\n  ) {\n    if (!isValid(mark) || !isValid(style)) {\n      return;\n    }\n    mark.setStyle(this._convertMarkStyle(style), state, level);\n  }\n\n  initMarkStyleWithSpec(mark?: IMark, spec?: any, key?: string) {\n    if (!isValid(mark) || !isValid(spec)) {\n      return;\n    }\n    const { style, state } = spec;\n    const newSpec = { ...spec };\n\n    if (style) {\n      newSpec.style = this._convertMarkStyle(style);\n    }\n    if (state) {\n      newSpec.state = {};\n      Object.keys(state).forEach(key => {\n        newSpec.state[key] = this._convertMarkStyle(state[key]);\n      });\n    }\n    mark.initStyleWithSpec(newSpec, key);\n  }\n\n  protected stateKeyToSignalName(key: string, opt?: string) {\n    let name = `${PREFIX}_${this.modelType}_${this.type}_${this.id}_${key}`;\n    opt && (name += `_${opt}`);\n    return name;\n  }\n\n  compileData() {\n    this._data?.compile();\n  }\n\n  compileMarks(group?: string | IGroupMark) {\n    this.getMarks().forEach(m => {\n      m.compile({ group });\n    });\n  }\n\n  protected _createMark<T extends IMark>(markInfo: IModelMarkInfo, option: Partial<IMarkOption> = {}): T {\n    const { type, name } = markInfo;\n    const m = Factory.createMark(type as any, name, {\n      model: this,\n      map: this._option.map,\n      getCompiler: this.getCompiler,\n      globalScale: this._option.globalScale,\n      ...option\n    }) as T;\n    m?.created();\n    return m;\n  }\n\n  /**\n   * 数据唯一ID\n   * 根据自身动画数据匹配需求设置返回值。\n   * 默认返回 undefined 时，根据 VGrammar 默认数据 ID 进行索引和匹配。\n   */\n  protected _getDataIdKey(): string | ((datum: Datum) => string) | undefined {\n    return undefined;\n  }\n\n  getColorScheme() {\n    return (this._option.getThemeConfig?.().chartLevelTheme ?? defaultChartLevelTheme).colorScheme;\n  }\n\n  protected _getChartLevelTheme() {\n    return this._option.getThemeConfig?.().chartLevelTheme ?? defaultChartLevelTheme;\n  }\n}\n"]}
+{"version":3,"sources":["../src/model/base-model.ts"],"names":[],"mappings":"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","file":"base-model.js","sourcesContent":["import { cloneDeepSpec } from '../util/spec/clone-deep';\nimport { createID } from '../util/id';\nimport { mergeSpec } from '../util/spec/merge-spec';\nimport { Event } from '../event/event';\nimport type { IEvent } from '../event/interface';\nimport type {\n  IEffect,\n  IModel,\n  IModelInitOption,\n  IModelOption,\n  IModelRenderOption,\n  IModelEvaluateOption,\n  IModelSpec,\n  IModelMarkInfo\n} from './interface';\nimport type { CoordinateType } from '../typings/coordinate';\nimport type { IMark, IMarkOption, IMarkRaw, IMarkStyle, MarkTypeEnum } from '../mark/interface';\nimport type {\n  Datum,\n  StateValueType,\n  ConvertToMarkStyleSpec,\n  ICommonSpec,\n  StringOrNumber,\n  IRect,\n  ILayoutRect\n} from '../typings';\nimport type { CompilableData } from '../compile/data/compilable-data';\nimport type { IGroupMark } from '@visactor/vgrammar-core';\nimport { isArray, isValid } from '@visactor/vutils';\nimport { Factory } from '../core/factory';\nimport { MarkSet } from '../mark/mark-set';\nimport type { ILayoutItem } from '../layout/interface';\nimport { CompilableBase } from '../compile/compilable-base';\nimport { PREFIX } from '../constant/base';\n\nexport abstract class BaseModel<T extends IModelSpec> extends CompilableBase implements IModel {\n  protected _spec: T;\n  getSpec(): T {\n    return this._spec || ({} as T);\n  }\n\n  readonly type: string = 'null';\n  readonly modelType: string = 'null';\n\n  readonly id;\n\n  userId: StringOrNumber | undefined = undefined;\n\n  // 事件\n  readonly event: IEvent;\n\n  // 副作用\n  readonly effect: IEffect;\n\n  // 数据\n  protected _data: CompilableData = null;\n  getData() {\n    return this._data;\n  }\n\n  // 布局\n  protected _layout?: ILayoutItem = null;\n  get layout() {\n    return this._layout;\n  }\n\n  protected _specIndex: number = 0;\n  getSpecIndex() {\n    return this._specIndex;\n  }\n\n  readonly specKey: string = '';\n\n  protected _originalSpec: any;\n\n  protected declare _option: IModelOption;\n  getOption() {\n    return this._option;\n  }\n\n  protected _marks: MarkSet = new MarkSet();\n  getMarks(): IMark[] {\n    return this._marks?.getMarks() ?? [];\n  }\n  getMarkNameMap() {\n    return this._marks?.getMarkNameMap();\n  }\n  getMarkSet() {\n    return this._marks;\n  }\n  getMarkInfoList(): IModelMarkInfo[] {\n    return this.getMarks().map(mark => ({\n      type: mark.type as MarkTypeEnum,\n      name: mark.name\n    }));\n  }\n\n  getChart() {\n    return this._option.getChart();\n  }\n\n  protected _theme?: any; // 非全局 theme，是对应于具体 model 的 theme 对象\n\n  /** for layout diff */\n  protected _lastLayoutRect: ILayoutRect = null;\n\n  constructor(spec: T, option: IModelOption) {\n    super(option);\n    this.id = createID();\n    this._originalSpec = spec;\n    this._spec = cloneDeepSpec(spec);\n    this._transformSpec();\n    this.userId = spec.id;\n    this._specIndex = option.specIndex ?? 0;\n    this.effect = {};\n    this.event = new Event(option.eventDispatcher, option.mode);\n    option.map?.set(this.id, this);\n  }\n  coordinate?: CoordinateType;\n\n  protected _releaseEvent() {\n    this.event.release();\n  }\n\n  created() {\n    this._initTheme();\n    this.setAttrFromSpec();\n  }\n\n  init(option: IModelInitOption) {\n    // do nothing\n  }\n\n  afterInit() {\n    // do nothing\n  }\n\n  getVisible() {\n    return (this._spec as unknown as any)?.visible !== false;\n  }\n\n  onLayoutStart(layoutRect: IRect, viewRect: ILayoutRect, ctx: any): void {\n    // do nothing\n    this._layout?.onLayoutStart(layoutRect, viewRect, ctx);\n  }\n  onLayoutEnd(ctx: any): void {\n    this._layout?.onLayoutEnd(ctx);\n    this.getMarks().forEach(m => m.updateLayoutState(true, true));\n  }\n\n  onEvaluateEnd(ctx: IModelEvaluateOption) {\n    // do nothing\n  }\n  abstract onRender(ctx: IModelRenderOption): void;\n\n  onDataUpdate() {\n    // do nothing\n  }\n\n  beforeRelease() {\n    // do nothing\n  }\n\n  release() {\n    this._releaseEvent();\n    this._originalSpec = {};\n    this._spec = undefined;\n    this.getMarks().forEach(m => m.release());\n    this._data?.release();\n    this._data = this._specIndex = null;\n    this._marks.clear();\n    super.release();\n  }\n\n  updateSpec(spec: any) {\n    this._spec = cloneDeepSpec(spec);\n    const result = this._compareSpec();\n    this._originalSpec = spec;\n    if (!result.reMake) {\n      this.reInit();\n    }\n    return result;\n  }\n\n  protected _transformSpec() {\n    // do nothing\n    // change spec by default logic\n  }\n\n  protected _compareSpec() {\n    const result = {\n      change: false,\n      reMake: false,\n      reRender: false,\n      reSize: false,\n      reCompile: false\n    };\n    return result;\n  }\n\n  reInit(theme?: any) {\n    // before reInit reset this._spec to original\n    this._spec = cloneDeepSpec(this._originalSpec);\n    this._transformSpec();\n    this._initTheme(theme);\n    this.setAttrFromSpec();\n  }\n\n  protected _initTheme(theme?: any) {\n    // if (this.getVisible() === false) {\n    //   // 不展示不需要处理主题\n    //   return;\n    // }\n    if (theme) {\n      this._theme = theme;\n    } else {\n      this._theme = this._getTheme();\n    }\n\n    this._mergeThemeToSpec();\n  }\n\n  protected _getTheme(): any {\n    return undefined;\n  }\n\n  /** 将 theme merge 到 spec 中 */\n  protected _mergeThemeToSpec() {\n    if (this._shouldMergeThemeToSpec()) {\n      const specFromChart = this._getDefaultSpecFromChart(this.getChart().getSpec());\n\n      // this._originalSpec + specFromChart + this._theme = this._spec\n      const merge = (originalSpec: any) =>\n        mergeSpec(\n          {},\n          this._theme,\n          this._prepareSpecBeforeMergingTheme(specFromChart),\n          this._prepareSpecBeforeMergingTheme(originalSpec)\n        );\n\n      const baseSpec = this._spec;\n      if (isArray(baseSpec)) {\n        this._spec = baseSpec.map(spec => merge(spec)) as unknown as T;\n      } else {\n        this._spec = merge(baseSpec);\n      }\n    }\n  }\n\n  /** 从 chart spec 提取配置作为 model 的默认 spec 配置 */\n  protected _getDefaultSpecFromChart(chartSpec: any): Partial<T> {\n    return {};\n  }\n\n  /** 是否在初始化时将 theme 自动 merge 到 spec */\n  protected _shouldMergeThemeToSpec(): boolean {\n    return true;\n  }\n\n  /** 在 merge 主题前对 spec 进行预处理 */\n  protected _prepareSpecBeforeMergingTheme(obj?: any): any {\n    // do nothing\n    return obj;\n  }\n\n  async setCurrentTheme(noRender?: boolean) {\n    const modifyConfig = () => {\n      // 重新初始化\n      this.reInit(this._getTheme());\n\n      return { change: true, reMake: false };\n    };\n\n    if (noRender) {\n      modifyConfig();\n    } else {\n      await this._option.globalInstance.updateCustomConfigAndRerender(modifyConfig);\n    }\n  }\n\n  updateLayoutAttribute() {\n    // do nothing\n  }\n\n  setAttrFromSpec() {\n    this._layout?.setAttrFromSpec(this._spec, this._option.getChartViewRect());\n  }\n\n  /** mark style 内部转换逻辑，override 使用 */\n  protected _convertMarkStyle<T extends ICommonSpec = ICommonSpec>(\n    style: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>\n  ): Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>> {\n    const newStyle: any = { ...style };\n    return newStyle;\n  }\n\n  setMarkStyle<T extends ICommonSpec>(\n    mark: IMarkRaw<T>,\n    style?: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>,\n    state?: StateValueType,\n    level?: number\n  ) {\n    if (!isValid(mark) || !isValid(style)) {\n      return;\n    }\n    mark.setStyle(this._convertMarkStyle(style), state, level);\n  }\n\n  initMarkStyleWithSpec(mark?: IMark, spec?: any, key?: string) {\n    if (!isValid(mark) || !isValid(spec)) {\n      return;\n    }\n    const { style, state } = spec;\n    const newSpec = { ...spec };\n\n    if (style) {\n      newSpec.style = this._convertMarkStyle(style);\n    }\n    if (state) {\n      newSpec.state = {};\n      Object.keys(state).forEach(key => {\n        newSpec.state[key] = this._convertMarkStyle(state[key]);\n      });\n    }\n    mark.initStyleWithSpec(newSpec, key);\n  }\n\n  protected stateKeyToSignalName(key: string, opt?: string) {\n    let name = `${PREFIX}_${this.modelType}_${this.type}_${this.id}_${key}`;\n    opt && (name += `_${opt}`);\n    return name;\n  }\n\n  compileData() {\n    this._data?.compile();\n  }\n\n  compileMarks(group?: string | IGroupMark) {\n    this.getMarks().forEach(m => {\n      m.compile({ group });\n    });\n  }\n\n  protected _createMark<T extends IMark>(markInfo: IModelMarkInfo, option: Partial<IMarkOption> = {}): T {\n    const { type, name } = markInfo;\n    const m = Factory.createMark(type as any, name, {\n      model: this,\n      map: this._option.map,\n      getCompiler: this.getCompiler,\n      globalScale: this._option.globalScale,\n      ...option\n    }) as T;\n    m?.created();\n    return m;\n  }\n\n  /**\n   * 数据唯一ID\n   * 根据自身动画数据匹配需求设置返回值。\n   * 默认返回 undefined 时，根据 VGrammar 默认数据 ID 进行索引和匹配。\n   */\n  protected _getDataIdKey(): string | ((datum: Datum) => string) | undefined {\n    return undefined;\n  }\n\n  getColorScheme() {\n    return this._option.getTheme?.().colorScheme;\n  }\n}\n"]}

package/esm/model/interface.d.ts

@@ -5,92 +5,19 @@ import type { IMark, IMarkRaw, IMarkStyle, MarkTypeEnum } from '../mark/interfac
 import type { RenderMode } from '../typings/spec/common';
 import type { VChart } from '../vchart-all';
 import type { IData } from '@visactor/vgrammar-core';
-import type { IOrientType, IPoint, IGroupMarkSpec, ConvertToMarkStyleSpec, CoordinateType, ICommonSpec, IRect, StringOrNumber } from '../typings';
+import type { StringOrNumber } from '../typings/common';
+import type { IGroupMarkSpec, ConvertToMarkStyleSpec, ICommonSpec } from '../typings/visual';
+import type { IRect } from '../typings/space';
+import type { IPoint, CoordinateType } from '../typings/coordinate';
 import type { ITheme } from '../theme';
 import type { StateValueType } from '../typings/spec';
 import type { ICompilable, ICompilableInitOption } from '../compile/interface';
 import type { ICompilableData } from '../compile/data';
 import type { IGlobalScale } from '../scale/interface';
 import type { IChart } from '../chart/interface';
-import type { IChartLevelTheme } from '../core/interface';
 import type { IThemeColorScheme } from '../theme/color-scheme/interface';
-export type ILayoutNumber = number | IPercent | ((layoutRect: ILayoutRect) => number) | IPercentOffset;
-export interface ILayoutPoint {
-    x: number;
-    y: number;
-}
-export interface ILayoutRectLevel {
-    width: number;
-    height: number;
-}
-export interface ILayoutRect {
-    width: number;
-    height: number;
-}
-export type IPercent = `${number}%`;
-export type IPercentOffset = {
-    percent?: number;
-    offset?: number;
-};
-export type ILayoutPercent = IPercent | number;
-type ILayoutType = 'region-relative' | 'region' | 'normal' | 'absolute' | 'normal-inline';
-export type ILayoutOrientPadding = {
-    left?: ILayoutNumber;
-    right?: ILayoutNumber;
-    top?: ILayoutNumber;
-    bottom?: ILayoutNumber;
-};
-export type ILayoutPaddingSpec = ILayoutOrientPadding | ILayoutNumber | ILayoutNumber[];
-export interface ILayoutItem {
-    directionStr?: 'l2r' | 'r2l' | 't2b' | 'b2t';
-    layoutClip: boolean;
-    layoutType: ILayoutType;
-    layoutBindRegionID: number | number[];
-    layoutOrient: IOrientType;
-    layoutPaddingLeft: number;
-    layoutPaddingTop: number;
-    layoutPaddingRight: number;
-    layoutPaddingBottom: number;
-    layoutOffsetX: number;
-    layoutOffsetY: number;
-    layoutLevel: number;
-    layoutZIndex: number;
-    chartLayoutRect: ILayoutRect;
-    getVisible: () => boolean;
-    getSpec?: () => any;
-    getAutoIndent: () => boolean;
-    getLayoutStartPoint: () => ILayoutPoint;
-    getLayoutRect: () => ILayoutRect;
-    getLastComputeOutBounds: () => IBoundsLike;
-    getGraphicBounds: () => IBoundsLike;
-    setLayoutRect: (rect: Partial<ILayoutRect>, levelMap?: Partial<ILayoutRectLevel>) => void;
-    computeBoundsInRect: (rect: ILayoutRect) => ILayoutRect;
-    setLayoutStartPosition: (pos: Partial<IPoint>) => void;
-    absoluteLayoutInRect: (rect: IRect) => void;
-    updateLayoutAttribute: () => void;
-}
-export interface ILayoutItemSpec {
-    layoutType?: ILayoutType;
-    layoutLevel?: number;
-    orient?: IOrientType;
-    padding?: ILayoutPaddingSpec;
-    noOuterPadding?: boolean;
-    width?: ILayoutNumber;
-    maxWidth?: ILayoutNumber;
-    minWidth?: ILayoutNumber;
-    height?: ILayoutNumber;
-    maxHeight?: ILayoutNumber;
-    minHeight?: ILayoutNumber;
-    offsetX?: ILayoutNumber;
-    offsetY?: ILayoutNumber;
-    zIndex?: number;
-    clip?: boolean;
-    left?: ILayoutNumber;
-    right?: ILayoutNumber;
-    top?: ILayoutNumber;
-    bottom?: ILayoutNumber;
-    center?: boolean;
-}
+import type { ILayoutItem, ILayoutItemSpec } from '../layout/interface';
+import type { ILayoutPoint, ILayoutRect } from '../typings/layout';
 export interface IModelInitOption {
 }
 export interface IModelLayoutOption {
@@ -118,7 +45,7 @@ export interface IUpdateSpecResult {
 export interface IModelProduct {
     srData: IData;
 }
-export interface IModel extends ICompilable, ILayoutItem {
+export interface IModel extends ICompilable {
     readonly modelType: string;
     readonly type: string;
     readonly specKey: string;
@@ -127,6 +54,8 @@ export interface IModel extends ICompilable, ILayoutItem {
     readonly event: IEvent;
     readonly effect: IEffect;
     coordinate?: CoordinateType;
+    layout?: ILayoutItem;
+    getVisible: () => boolean;
     getOption: () => IModelOption;
     getMarks: () => IMark[];
     getMarkNameMap: () => Record<string, IMark>;
@@ -137,19 +66,28 @@ export interface IModel extends ICompilable, ILayoutItem {
     init: (option: IModelInitOption) => void;
     reInit: (theme?: any, lastSpec?: any) => void;
     beforeRelease: () => void;
-    onLayoutStart: (layoutRect: IRect, viewRect: ILayoutRect, ctx: IModelLayoutOption) => void;
-    onLayoutEnd: (ctx: IModelLayoutOption) => void;
     onEvaluateEnd: (ctx: IModelEvaluateOption) => void;
     onRender: (ctx: IModelRenderOption) => void;
     onDataUpdate: () => void;
     updateSpec: (spec: any, totalSpec?: any) => IUpdateSpecResult;
     getSpec?: () => any;
     getSpecIndex: () => number;
+    onLayoutStart: (layoutRect: IRect, viewRect: ILayoutRect, ctx: IModelLayoutOption) => void;
+    onLayoutEnd: (ctx: IModelLayoutOption) => void;
     setCurrentTheme: (noRender?: boolean) => void;
     getColorScheme: () => IThemeColorScheme | undefined;
     setMarkStyle: <T extends ICommonSpec>(mark?: IMarkRaw<T>, style?: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>, state?: StateValueType, level?: number) => void;
     initMarkStyleWithSpec: (mark?: IMark, spec?: any, key?: string) => void;
 }
+export interface ILayoutModel extends IModel {
+    getLayoutStartPoint: () => IPoint;
+    setLayoutStartPosition: (pos: Partial<IPoint>) => void;
+    getLayoutRect: () => ILayoutRect;
+    setLayoutRect: (rect: Partial<ILayoutRect>, levelMap?: Partial<ILayoutRect>) => void;
+    getLastComputeOutBounds: () => IBoundsLike;
+    getBoundsInRect: (rect: ILayoutRect, fullRect: ILayoutRect) => IBoundsLike;
+    afterSetLayoutStartPoint: (pos: ILayoutPoint) => void;
+}
 export interface IModelOption extends ICompilableInitOption {
     eventDispatcher: IEventDispatcher;
     dataSet: DataSet;
@@ -158,12 +96,7 @@ export interface IModelOption extends ICompilableInitOption {
     globalInstance: VChart;
     specIndex?: number;
     specKey?: string;
-    getThemeConfig?: () => {
-        globalTheme?: string;
-        optionTheme?: string | ITheme;
-        specTheme?: string | ITheme;
-        chartLevelTheme: IChartLevelTheme;
-    };
+    getTheme?: () => ITheme;
     getChartLayoutRect: () => IRect;
     getChartViewRect: () => ILayoutRect;
     getChart: () => IChart;
@@ -185,4 +118,3 @@ export interface IModelMarkInfo {
     type: MarkTypeEnum | string | (MarkTypeEnum | string)[];
     name: string;
 }
-export {};

package/esm/model/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/model/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IBoundsLike } from '@visactor/vutils';\nimport type { DataSet } from '@visactor/vdataset';\nimport type { IEvent, IEventDispatcher } from '../event/interface';\nimport type { IMark, IMarkRaw, IMarkStyle, MarkTypeEnum } from '../mark/interface';\nimport type { RenderMode } from '../typings/spec/common';\nimport type { VChart } from '../vchart-all';\nimport type { IData } from '@visactor/vgrammar-core';\nimport type {\n  IOrientType,\n  IPoint,\n  IGroupMarkSpec,\n  ConvertToMarkStyleSpec,\n  CoordinateType,\n  ICommonSpec,\n  IRect,\n  StringOrNumber\n} from '../typings';\nimport type { ITheme } from '../theme';\nimport type { StateValueType } from '../typings/spec';\nimport type { ICompilable, ICompilableInitOption } from '../compile/interface';\nimport type { ICompilableData } from '../compile/data';\nimport type { IGlobalScale } from '../scale/interface';\nimport type { IChart } from '../chart/interface';\nimport type { IChartLevelTheme } from '../core/interface';\nimport type { IThemeColorScheme } from '../theme/color-scheme/interface';\n\nexport type ILayoutNumber = number | IPercent | ((layoutRect: ILayoutRect) => number) | IPercentOffset;\n\nexport interface ILayoutPoint {\n  x: number;\n  y: number;\n}\n\nexport interface ILayoutRectLevel {\n  width: number;\n  height: number;\n}\nexport interface ILayoutRect {\n  width: number;\n  height: number;\n}\n\nexport type IPercent = `${number}%`;\n\nexport type IPercentOffset = { percent?: number; offset?: number };\n\nexport type ILayoutPercent = IPercent | number;\n\n/**\n * 相对布局和绝对布局\n * 在相对布局结束后进行二次的绝对布局\n * 绝对布局会只根据 chart 进行相对处理\n */\n\ntype ILayoutType = 'region-relative' | 'region' | 'normal' | 'absolute' | 'normal-inline';\n\nexport type ILayoutOrientPadding = {\n  left?: ILayoutNumber;\n  right?: ILayoutNumber;\n  top?: ILayoutNumber;\n  bottom?: ILayoutNumber;\n};\n\n/** 布局 padding的配置 */\nexport type ILayoutPaddingSpec = ILayoutOrientPadding | ILayoutNumber | ILayoutNumber[];\n\n/**\n * 因为这些元素都会继承到各个模块，所以这里统一有前缀避免语意冲突\n */\nexport interface ILayoutItem {\n  /**\n   * 标记这个布局Item的方向（left->right, right->left, top->bottom, bottom->top）\n   */\n  directionStr?: 'l2r' | 'r2l' | 't2b' | 'b2t';\n  layoutClip: boolean;\n  layoutType: ILayoutType;\n  layoutBindRegionID: number | number[];\n  layoutOrient: IOrientType;\n\n  layoutPaddingLeft: number;\n  layoutPaddingTop: number;\n  layoutPaddingRight: number;\n  layoutPaddingBottom: number;\n\n  layoutOffsetX: number;\n  layoutOffsetY: number;\n\n  // 越大越先处理\n  layoutLevel: number;\n\n  layoutZIndex: number;\n  chartLayoutRect: ILayoutRect;\n\n  /** 是否可见 */\n  getVisible: () => boolean;\n\n  getSpec?: () => any;\n\n  /** 是否自动缩进 */\n  getAutoIndent: () => boolean;\n\n  getLayoutStartPoint: () => ILayoutPoint;\n  getLayoutRect: () => ILayoutRect;\n  getLastComputeOutBounds: () => IBoundsLike;\n  getGraphicBounds: () => IBoundsLike;\n\n  /**\n   * 更新元素布局的 layoutRect 大小，用来更新指定布局空间\n   */\n  setLayoutRect: (rect: Partial<ILayoutRect>, levelMap?: Partial<ILayoutRectLevel>) => void;\n  /**\n   * 基于元素内部逻辑计算占位空间，rect表示可用空间\n   */\n  computeBoundsInRect: (rect: ILayoutRect) => ILayoutRect;\n  /**\n   * 更新元素布局的起始点位置\n   */\n  setLayoutStartPosition: (pos: Partial<IPoint>) => void;\n  /**\n   * 更新绝对布局元素的位置信息\n   */\n  absoluteLayoutInRect: (rect: IRect) => void;\n  /**\n   * 元素内部布局信息更新\n   */\n  updateLayoutAttribute: () => void;\n}\n\nexport interface ILayoutItemSpec {\n  /** 当前模块的布局类型，配置为 absolute 的话，当前元素会以图表左上角为原点进行绝对布局 */\n  layoutType?: ILayoutType;\n  /**\n   * 布局顺序等级，等级越大的，越优先布局\n   * 比如顶部同时有标题和图例的场景，期望标题先放在顶部，然后放置图例。\n   */\n  layoutLevel?: number;\n\n  // 基础的布局配置\n  /** 模块布局位置 */\n  orient?: IOrientType;\n  /** 模块的布局间距 */\n  padding?: ILayoutPaddingSpec;\n  /** 是否按照 orient 自动修改 padding，隐藏位于外侧的 padding。目前只在组件上生效 */\n  noOuterPadding?: boolean;\n  /** 模块的布局大小：宽度 */\n  width?: ILayoutNumber;\n  /** 模块的布局最大宽度 */\n  maxWidth?: ILayoutNumber;\n  /** 模块的布局最小宽度 */\n  minWidth?: ILayoutNumber;\n  /** 模块的布局大小：高度 */\n  height?: ILayoutNumber;\n  /** 模块的布局最大高度 */\n  maxHeight?: ILayoutNumber;\n  /** 模块的布局最小高度 */\n  minHeight?: ILayoutNumber;\n  /** 模块的布局位置偏移：X */\n  offsetX?: ILayoutNumber;\n  /** 模块的布局位置偏移：Y */\n  offsetY?: ILayoutNumber;\n\n  /** 模块的展示层级，当2个模块重叠时，层级较大的展示在上方 */\n  zIndex?: number;\n  /** 模块是否裁剪超出布局区域外的绘图内容 */\n  clip?: boolean;\n\n  // 绝对布局下的对齐设置\n\n  /** 模块绝对布局下，与图表左侧的距离。注意仅在 layoutType === 'absolute' 时生效  */\n  left?: ILayoutNumber;\n  /** 模块绝对布局下，与图表右侧的距离。注意仅在 layoutType === 'absolute' 时生效  */\n  right?: ILayoutNumber;\n  /** 模块绝对布局下，与图表顶部的距离。注意仅在 layoutType === 'absolute' 时生效  */\n  top?: ILayoutNumber;\n  /** 模块绝对布局下，与图表底部的距离。注意仅在 layoutType === 'absolute' 时生效  */\n  bottom?: ILayoutNumber;\n  /** 模块绝对布局下，元素将放置在图表的正中间。注意仅在 layoutType === 'absolute' 时生效，同时将忽略 padding 属性  */\n  center?: boolean;\n}\n\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelInitOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelLayoutOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelEvaluateOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelRenderOption {}\n\nexport interface IEffect {\n  [key: string]: (e?: any) => any;\n}\n\nexport interface IMarkTreeGroup extends Partial<IMarkStyle<IGroupMarkSpec>> {\n  // 必须要有名字\n  type: 'group';\n  name: string;\n  marks: (IMarkTreeGroup | IMark)[];\n  // TODO: 这里要不要支持复杂场景，有图形组合的场景，用自定义mark？\n  // from?: IData;\n}\n\nexport type IMarkTree = IMarkTreeGroup | IMark | (IMarkTreeGroup | IMark)[];\n\nexport interface IUpdateSpecResult {\n  change: boolean;\n  reMake: boolean;\n  reRender?: boolean;\n  reSize?: boolean;\n  // TODO: compile 的判断应不应该出现在这里?\n  reCompile?: boolean;\n}\n\nexport interface IModelProduct {\n  srData: IData;\n}\n\nexport interface IModel extends ICompilable, ILayoutItem {\n  readonly modelType: string;\n  readonly type: string;\n  readonly specKey: string;\n\n  readonly id: number;\n\n  readonly userId?: StringOrNumber;\n\n  // 事件\n  readonly event: IEvent;\n\n  // 副作用\n  readonly effect: IEffect;\n\n  coordinate?: CoordinateType;\n\n  // 初始化参数\n  getOption: () => IModelOption;\n\n  getMarks: () => IMark[];\n  getMarkNameMap: () => Record<string, IMark>;\n  getMarkInfoList: () => IModelMarkInfo[];\n\n  getData: () => ICompilableData;\n\n  getChart: () => IChart;\n\n  //生命周期\n  // 创建模块自身内容，设置自身属性\n  created: () => void;\n  // 用来处理与其他图表模块的联系\n  init: (option: IModelInitOption) => void;\n  // updateSpec 或者切换主题后，根据新 spec 执行的初始化过程\n  reInit: (theme?: any, lastSpec?: any) => void;\n  beforeRelease: () => void;\n\n  onLayoutStart: (layoutRect: IRect, viewRect: ILayoutRect, ctx: IModelLayoutOption) => void;\n  onLayoutEnd: (ctx: IModelLayoutOption) => void;\n  onEvaluateEnd: (ctx: IModelEvaluateOption) => void;\n  onRender: (ctx: IModelRenderOption) => void;\n  onDataUpdate: () => void;\n\n  updateSpec: (spec: any, totalSpec?: any) => IUpdateSpecResult;\n  getSpec?: () => any;\n  getSpecIndex: () => number;\n\n  // theme\n  setCurrentTheme: (noRender?: boolean) => void;\n  getColorScheme: () => IThemeColorScheme | undefined;\n\n  setMarkStyle: <T extends ICommonSpec>(\n    mark?: IMarkRaw<T>,\n    style?: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>,\n    state?: StateValueType,\n    level?: number\n  ) => void;\n\n  initMarkStyleWithSpec: (mark?: IMark, spec?: any, key?: string) => void;\n}\n\nexport interface IModelOption extends ICompilableInitOption {\n  eventDispatcher: IEventDispatcher;\n  dataSet: DataSet;\n  map: Map<StringOrNumber, IModel | IMark>;\n  mode: RenderMode;\n  globalInstance: VChart;\n  specIndex?: number;\n  specKey?: string;\n\n  getThemeConfig?: () => {\n    globalTheme?: string;\n    optionTheme?: string | ITheme;\n    specTheme?: string | ITheme;\n    chartLevelTheme: IChartLevelTheme;\n  };\n\n  getChartLayoutRect: () => IRect;\n  getChartViewRect: () => ILayoutRect;\n\n  getChart: () => IChart;\n\n  globalScale: IGlobalScale;\n  animation: boolean;\n  /**\n   * 错误消息回调函数\n   */\n  onError: (...args: any[]) => void;\n}\n\nexport interface IModelConstructor {\n  new (ctx: IModelOption): IModel;\n}\n\nexport type ILayoutModelState = {\n  layoutUpdateRank: number;\n  [key: string]: unknown;\n};\n\n// TODO: 补充model共有配置\nexport type IModelSpec = ILayoutItemSpec & { id?: StringOrNumber };\n\nexport interface IModelMarkInfo {\n  /** mark 类型 */\n  type: MarkTypeEnum | string | (MarkTypeEnum | string)[];\n  /** mark 名称 */\n  name: string;\n}\n"]}
+{"version":3,"sources":["../src/model/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IBoundsLike } from '@visactor/vutils';\nimport type { DataSet } from '@visactor/vdataset';\nimport type { IEvent, IEventDispatcher } from '../event/interface';\nimport type { IMark, IMarkRaw, IMarkStyle, MarkTypeEnum } from '../mark/interface';\nimport type { RenderMode } from '../typings/spec/common';\nimport type { VChart } from '../vchart-all';\nimport type { IData } from '@visactor/vgrammar-core';\nimport type { StringOrNumber } from '../typings/common';\nimport type { IGroupMarkSpec, ConvertToMarkStyleSpec, ICommonSpec } from '../typings/visual';\nimport type { IRect } from '../typings/space';\nimport type { IPoint, CoordinateType } from '../typings/coordinate';\nimport type { ITheme } from '../theme';\nimport type { StateValueType } from '../typings/spec';\nimport type { ICompilable, ICompilableInitOption } from '../compile/interface';\nimport type { ICompilableData } from '../compile/data';\nimport type { IGlobalScale } from '../scale/interface';\nimport type { IChart } from '../chart/interface';\nimport type { IThemeColorScheme } from '../theme/color-scheme/interface';\nimport type { ILayoutItem, ILayoutItemSpec } from '../layout/interface';\nimport type { ILayoutPoint, ILayoutRect } from '../typings/layout';\n\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelInitOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelLayoutOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelEvaluateOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelRenderOption {}\n\nexport interface IEffect {\n  [key: string]: (e?: any) => any;\n}\n\nexport interface IMarkTreeGroup extends Partial<IMarkStyle<IGroupMarkSpec>> {\n  // 必须要有名字\n  type: 'group';\n  name: string;\n  marks: (IMarkTreeGroup | IMark)[];\n  // TODO: 这里要不要支持复杂场景，有图形组合的场景，用自定义mark？\n  // from?: IData;\n}\n\nexport type IMarkTree = IMarkTreeGroup | IMark | (IMarkTreeGroup | IMark)[];\n\nexport interface IUpdateSpecResult {\n  change: boolean;\n  reMake: boolean;\n  reRender?: boolean;\n  reSize?: boolean;\n  // TODO: compile 的判断应不应该出现在这里?\n  reCompile?: boolean;\n}\n\nexport interface IModelProduct {\n  srData: IData;\n}\n\nexport interface IModel extends ICompilable {\n  readonly modelType: string;\n  readonly type: string;\n  readonly specKey: string;\n\n  readonly id: number;\n\n  readonly userId?: StringOrNumber;\n\n  // 事件\n  readonly event: IEvent;\n\n  // 副作用\n  readonly effect: IEffect;\n\n  coordinate?: CoordinateType;\n\n  // 布局\n  layout?: ILayoutItem;\n\n  /** 是否可见 */\n  getVisible: () => boolean;\n\n  // 初始化参数\n  getOption: () => IModelOption;\n\n  getMarks: () => IMark[];\n  getMarkNameMap: () => Record<string, IMark>;\n  getMarkInfoList: () => IModelMarkInfo[];\n\n  getData: () => ICompilableData;\n\n  getChart: () => IChart;\n\n  //生命周期\n  // 创建模块自身内容，设置自身属性\n  created: () => void;\n  // 用来处理与其他图表模块的联系\n  init: (option: IModelInitOption) => void;\n  // updateSpec 或者切换主题后，根据新 spec 执行的初始化过程\n  reInit: (theme?: any, lastSpec?: any) => void;\n  beforeRelease: () => void;\n\n  onEvaluateEnd: (ctx: IModelEvaluateOption) => void;\n  onRender: (ctx: IModelRenderOption) => void;\n  onDataUpdate: () => void;\n\n  updateSpec: (spec: any, totalSpec?: any) => IUpdateSpecResult;\n  getSpec?: () => any;\n  getSpecIndex: () => number;\n\n  //布局周期\n  onLayoutStart: (layoutRect: IRect, viewRect: ILayoutRect, ctx: IModelLayoutOption) => void;\n  onLayoutEnd: (ctx: IModelLayoutOption) => void;\n\n  // theme\n  setCurrentTheme: (noRender?: boolean) => void;\n  getColorScheme: () => IThemeColorScheme | undefined;\n\n  setMarkStyle: <T extends ICommonSpec>(\n    mark?: IMarkRaw<T>,\n    style?: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>,\n    state?: StateValueType,\n    level?: number\n  ) => void;\n\n  initMarkStyleWithSpec: (mark?: IMark, spec?: any, key?: string) => void;\n}\n\nexport interface ILayoutModel extends IModel {\n  // 布局相关\n  getLayoutStartPoint: () => IPoint;\n  setLayoutStartPosition: (pos: Partial<IPoint>) => void;\n  getLayoutRect: () => ILayoutRect;\n  setLayoutRect: (rect: Partial<ILayoutRect>, levelMap?: Partial<ILayoutRect>) => void;\n\n  getLastComputeOutBounds: () => IBoundsLike;\n\n  getBoundsInRect: (rect: ILayoutRect, fullRect: ILayoutRect) => IBoundsLike;\n\n  //布局周期\n  afterSetLayoutStartPoint: (pos: ILayoutPoint) => void;\n}\n\nexport interface IModelOption extends ICompilableInitOption {\n  eventDispatcher: IEventDispatcher;\n  dataSet: DataSet;\n  map: Map<StringOrNumber, IModel | IMark>;\n  mode: RenderMode;\n  globalInstance: VChart;\n  specIndex?: number;\n  specKey?: string;\n\n  getTheme?: () => ITheme;\n  getChartLayoutRect: () => IRect;\n  getChartViewRect: () => ILayoutRect;\n\n  getChart: () => IChart;\n\n  globalScale: IGlobalScale;\n  animation: boolean;\n  /**\n   * 错误消息回调函数\n   */\n  onError: (...args: any[]) => void;\n}\n\nexport interface IModelConstructor {\n  new (ctx: IModelOption): IModel;\n}\n\nexport type ILayoutModelState = {\n  layoutUpdateRank: number;\n  [key: string]: unknown;\n};\n\n// TODO: 补充model共有配置\nexport type IModelSpec = ILayoutItemSpec & { id?: StringOrNumber };\n\nexport interface IModelMarkInfo {\n  /** mark 类型 */\n  type: MarkTypeEnum | string | (MarkTypeEnum | string)[];\n  /** mark 名称 */\n  name: string;\n}\n"]}

package/esm/model/layout-model.d.ts

@@ -0,0 +1,41 @@
+import type { IBoundsLike } from '@visactor/vutils';
+import type { ILayoutItem } from '../layout/interface';
+import type { IOrientType, IPolarOrientType, IRect } from '../typings/space';
+import { BaseModel } from './base-model';
+import type { IModelSpec } from './interface';
+import type { IPoint } from '../typings/coordinate';
+import type { ILayoutType, ILayoutPoint, ILayoutRect } from '../typings/layout';
+export declare abstract class LayoutModel<T extends IModelSpec> extends BaseModel<T> {
+    protected layoutType: ILayoutType | 'none';
+    protected layoutLevel?: number;
+    protected layoutZIndex: number;
+    layoutClip: boolean;
+    get layoutOrient(): IOrientType;
+    set layoutOrient(v: IOrientType);
+    protected _forceLayoutTag: boolean;
+    protected _layout: ILayoutItem;
+    protected _orient?: IPolarOrientType | IOrientType;
+    protected _layoutRect: ILayoutRect;
+    protected _layoutStartPos: IPoint;
+    protected _isLayout: boolean;
+    initLayout(): void;
+    onLayoutStart(layoutRect: IRect, viewRect: ILayoutRect, ctx: any): void;
+    onLayoutEnd(ctx: any): void;
+    afterSetLayoutStartPoint(_pos: ILayoutPoint): void;
+    protected _forceLayout(): void;
+    getLayoutStartPoint(): IPoint;
+    setLayoutStartPosition(pos: Partial<IPoint>): any;
+    getLayoutRect(): ILayoutRect;
+    setLayoutRect(rect: Partial<ILayoutRect>, levelMap?: Partial<ILayoutRect>): any;
+    getLastComputeOutBounds(): IBoundsLike;
+    getGraphicBounds: () => {
+        x1: number;
+        y1: number;
+        x2: number;
+        y2: number;
+    };
+    setAttrFromSpec(): void;
+    abstract getBoundsInRect(rect: ILayoutRect, fullRect: ILayoutRect): IBoundsLike;
+    protected _transformLayoutRect: (rect: ILayoutRect) => ILayoutRect;
+    protected _transformLayoutPosition: (rect: Partial<IPoint>) => Partial<IPoint>;
+}

package/esm/model/layout-model.js

@@ -0,0 +1,80 @@
+import { isEqual, merge } from "@visactor/vutils";
+
+import { BaseModel } from "./base-model";
+
+import { LayoutItem } from "../layout/layout-item";
+
+export class LayoutModel extends BaseModel {
+    constructor() {
+        super(...arguments), this.layoutType = "normal", this.layoutLevel = 0, this.layoutZIndex = 0, 
+        this._forceLayoutTag = !1, this._layout = null, this._orient = null, this._layoutRect = {
+            width: 0,
+            height: 0
+        }, this._layoutStartPos = {
+            x: 0,
+            y: 0
+        }, this._isLayout = !0, this.getGraphicBounds = () => this._layout ? {
+            x1: this._layout.getLayoutStartPoint().x,
+            y1: this._layout.getLayoutStartPoint().y,
+            x2: this._layout.getLayoutStartPoint().x + this._layout.getLayoutRect().width,
+            y2: this._layout.getLayoutStartPoint().y + this._layout.getLayoutRect().height
+        } : {
+            x1: 0,
+            x2: 0,
+            y1: 0,
+            y2: 0
+        }, this._transformLayoutRect = null, this._transformLayoutPosition = null;
+    }
+    get layoutOrient() {
+        return this._orient;
+    }
+    set layoutOrient(v) {
+        this._orient = v, this._layout && (this._layout.layoutOrient = v);
+    }
+    initLayout() {
+        "none" !== this.layoutType && (this._layout = new LayoutItem(this, {
+            layoutType: this.layoutType,
+            layoutLevel: this.layoutLevel,
+            layoutOrient: this._orient,
+            transformLayoutRect: this._transformLayoutRect,
+            transformLayoutPosition: this._transformLayoutPosition
+        }), this._orient && "radius" !== this._orient && "angle" !== this._orient && this.layout && (this._layout.layoutOrient = this._orient));
+    }
+    onLayoutStart(layoutRect, viewRect, ctx) {
+        this._isLayout = !0, super.onLayoutStart(layoutRect, viewRect, ctx);
+    }
+    onLayoutEnd(ctx) {
+        super.onLayoutEnd(ctx), this.updateLayoutAttribute();
+        const layoutRect = this.getLayoutRect();
+        !this._forceLayoutTag && isEqual(this._lastLayoutRect, layoutRect) || (this._lastLayoutRect = Object.assign({}, layoutRect)), 
+        this._forceLayoutTag = !1, this._isLayout = !1;
+    }
+    afterSetLayoutStartPoint(_pos) {}
+    _forceLayout() {
+        var _a;
+        this._isLayout || (this._forceLayoutTag = !0, null === (_a = this._option.globalInstance.getChart()) || void 0 === _a || _a.setLayoutTag(!0));
+    }
+    getLayoutStartPoint() {
+        return this._layout ? this._layout.getLayoutStartPoint() : this._layoutStartPos;
+    }
+    setLayoutStartPosition(pos) {
+        return this._layout ? this._layout.setLayoutStartPosition(pos) : this._layoutStartPos = merge(this._layoutStartPos, pos);
+    }
+    getLayoutRect() {
+        return this._layout ? this._layout.getLayoutRect() : this._layoutRect;
+    }
+    setLayoutRect(rect, levelMap) {
+        return this._layout ? this._layout.setLayoutRect(rect) : this._lastLayoutRect = merge(this._layoutRect, rect);
+    }
+    getLastComputeOutBounds() {
+        var _a;
+        return null === (_a = this._layout) || void 0 === _a ? void 0 : _a.getLastComputeOutBounds();
+    }
+    setAttrFromSpec() {
+        var _a, _b, _c;
+        super.setAttrFromSpec(), this.layoutClip = null !== (_a = this._spec.clip) && void 0 !== _a ? _a : this.layoutClip, 
+        this.layoutZIndex = null !== (_b = this._spec.zIndex) && void 0 !== _b ? _b : this.layoutZIndex, 
+        this.layoutType = null !== (_c = this._spec.layoutType) && void 0 !== _c ? _c : this.layoutType;
+    }
+}
+//# sourceMappingURL=layout-model.js.map

package/esm/model/layout-model.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/model/layout-model.ts"],"names":[],"mappings":"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","file":"layout-model.js","sourcesContent":["import type { IBoundsLike } from '@visactor/vutils';\nimport { isEqual, merge } from '@visactor/vutils';\nimport type { ILayoutItem } from '../layout/interface';\nimport type { IOrientType, IPolarOrientType, IRect } from '../typings/space';\nimport { BaseModel } from './base-model';\nimport type { IModelSpec } from './interface';\nimport { LayoutItem } from '../layout/layout-item';\nimport type { IPoint } from '../typings/coordinate';\nimport type { ILayoutType, ILayoutPoint, ILayoutRect } from '../typings/layout';\n\nexport abstract class LayoutModel<T extends IModelSpec> extends BaseModel<T> {\n  protected layoutType: ILayoutType | 'none' = 'normal';\n  protected layoutLevel?: number = 0;\n  protected layoutZIndex: number = 0;\n  layoutClip: boolean;\n  get layoutOrient() {\n    return this._orient as IOrientType;\n  }\n\n  set layoutOrient(v: IOrientType) {\n    this._orient = v;\n    this._layout && (this._layout.layoutOrient = v);\n  }\n\n  protected _forceLayoutTag: boolean = false;\n  protected _layout: ILayoutItem = null;\n  protected _orient?: IPolarOrientType | IOrientType = null;\n\n  protected _layoutRect: ILayoutRect = { width: 0, height: 0 };\n  protected _layoutStartPos: IPoint = { x: 0, y: 0 };\n\n  // TODO: 有些hack,这个tag是为了避免布局逻辑中，轴的数据变化，又由数据变化触发重新布局\n  protected _isLayout: boolean = true;\n\n  initLayout() {\n    if (this.layoutType === 'none') {\n      return;\n    }\n    this._layout = new LayoutItem(this, {\n      layoutType: this.layoutType,\n      layoutLevel: this.layoutLevel,\n      layoutOrient: this._orient as IOrientType,\n      transformLayoutRect: this._transformLayoutRect,\n      transformLayoutPosition: this._transformLayoutPosition\n    });\n    if (this._orient && this._orient !== 'radius' && this._orient !== 'angle' && this.layout) {\n      this._layout.layoutOrient = this._orient;\n    }\n  }\n\n  onLayoutStart(layoutRect: IRect, viewRect: ILayoutRect, ctx: any): void {\n    this._isLayout = true;\n    super.onLayoutStart(layoutRect, viewRect, ctx);\n  }\n  onLayoutEnd(ctx: any): void {\n    super.onLayoutEnd(ctx);\n    // diff layoutRect\n    this.updateLayoutAttribute();\n    const layoutRect = this.getLayoutRect();\n    if (this._forceLayoutTag || !isEqual(this._lastLayoutRect, layoutRect)) {\n      this._lastLayoutRect = { ...layoutRect };\n    }\n    this._forceLayoutTag = false;\n    this._isLayout = false;\n  }\n\n  afterSetLayoutStartPoint(_pos: ILayoutPoint) {\n    // do nothing\n  }\n\n  protected _forceLayout() {\n    if (this._isLayout) {\n      return;\n    }\n    this._forceLayoutTag = true;\n    this._option.globalInstance.getChart()?.setLayoutTag(true);\n  }\n\n  // 布局相关\n  getLayoutStartPoint() {\n    return this._layout ? this._layout.getLayoutStartPoint() : this._layoutStartPos;\n  }\n  setLayoutStartPosition(pos: Partial<IPoint>) {\n    return this._layout\n      ? this._layout.setLayoutStartPosition(pos)\n      : (this._layoutStartPos = merge(this._layoutStartPos, pos));\n  }\n  getLayoutRect() {\n    return this._layout ? this._layout.getLayoutRect() : this._layoutRect;\n  }\n  setLayoutRect(rect: Partial<ILayoutRect>, levelMap?: Partial<ILayoutRect>) {\n    return this._layout ? this._layout.setLayoutRect(rect) : (this._lastLayoutRect = merge(this._layoutRect, rect));\n  }\n\n  getLastComputeOutBounds() {\n    return this._layout?.getLastComputeOutBounds();\n  }\n\n  getGraphicBounds = () => {\n    if (this._layout) {\n      return {\n        x1: this._layout.getLayoutStartPoint().x,\n        y1: this._layout.getLayoutStartPoint().y,\n        x2: this._layout.getLayoutStartPoint().x + this._layout.getLayoutRect().width,\n        y2: this._layout.getLayoutStartPoint().y + this._layout.getLayoutRect().height\n      };\n    }\n    return { x1: 0, x2: 0, y1: 0, y2: 0 };\n  };\n\n  setAttrFromSpec(): void {\n    super.setAttrFromSpec();\n    this.layoutClip = this._spec.clip ?? this.layoutClip;\n    this.layoutZIndex = this._spec.zIndex ?? this.layoutZIndex;\n    this.layoutType = this._spec.layoutType ?? this.layoutType;\n  }\n\n  abstract getBoundsInRect(rect: ILayoutRect, fullRect: ILayoutRect): IBoundsLike;\n\n  protected _transformLayoutRect: (rect: ILayoutRect) => ILayoutRect = null;\n  protected _transformLayoutPosition: (rect: Partial<IPoint>) => Partial<IPoint> = null;\n}\n"]}

package/esm/region/interface.d.ts

@@ -1,5 +1,5 @@
 import type { IMark } from '../mark/interface';
-import type { IModel, IModelOption, ILayoutItem, ILayoutItemSpec } from '../model/interface';
+import type { ILayoutModel, IModelOption } from '../model/interface';
 import type { ISeries, SeriesType } from '../series/interface';
 import type { CoordinateType } from '../typings/coordinate';
 import type { IInteraction } from '../interaction/interface';
@@ -8,7 +8,8 @@ import type { ConvertToMarkStyleSpec, IRectMarkSpec } from '../typings/visual';
 import type { IAnimate } from '../animation/interface';
 import type { IGroupMark } from '../mark/group';
 import type { StringOrNumber } from '../typings';
-export interface IRegion extends IModel, ILayoutItem {
+import type { ILayoutItemSpec } from '../layout/interface';
+export interface IRegion extends ILayoutModel {
     animate?: IAnimate;
     interaction: IInteraction;
     getStackInverse: () => boolean;

package/esm/region/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/region/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IMark } from '../mark/interface';\nimport type { IModel, IModelOption, ILayoutItem, ILayoutItemSpec } from '../model/interface';\nimport type { ISeries, SeriesType } from '../series/interface';\nimport type { CoordinateType } from '../typings/coordinate';\nimport type { IInteraction } from '../interaction/interface';\nimport type { IProjectionSpec } from '../component/geo/interface';\nimport type { ConvertToMarkStyleSpec, IRectMarkSpec } from '../typings/visual';\nimport type { IAnimate } from '../animation/interface';\nimport type { IGroupMark } from '../mark/group';\nimport type { StringOrNumber } from '../typings';\n\nexport interface IRegion extends IModel, ILayoutItem {\n  animate?: IAnimate;\n  interaction: IInteraction;\n\n  //stack\n  getStackInverse: () => boolean;\n\n  getMaxWidth: () => number | undefined;\n  setMaxWidth: (value: number) => void;\n  getMaxHeight: () => number | undefined;\n  setMaxHeight: (value: number) => void;\n\n  // 系列\n  addSeries: (series: ISeries) => void;\n  removeSeries: (series: ISeries) => void;\n\n  getSeries: (opt?: ISeriesFilter) => ISeries[];\n  getSeriesInName: (name: string) => ISeries;\n  getSeriesInUserId: (userId: string) => ISeries;\n  getSeriesInId: (id: number) => ISeries;\n  getSeriesInType: (type: SeriesType) => ISeries[];\n  getSeriesInCoordinateType: (type: CoordinateType) => ISeries[];\n  getSeriesInDataName: (dataName: string) => ISeries[];\n\n  getMarks: () => IMark[];\n  getGroupMark: () => IGroupMark;\n}\n\nexport type ISeriesFilter = {\n  name?: string;\n  userId?: StringOrNumber | StringOrNumber[];\n  specIndex?: number | number[];\n  id?: number;\n  type?: string;\n  coordinateType?: CoordinateType;\n  dataName?: string;\n};\n\nexport interface IRegionConstructor {\n  new (spec: IRegionSpec, ctx: IModelOption): IRegion;\n}\n\nexport interface IRegionSpec extends ILayoutItemSpec {\n  id?: StringOrNumber;\n  coordinate?: CoordinateType;\n  style?: ConvertToMarkStyleSpec<IRectMarkSpec>;\n  /**\n   * 堆积时是否逆序\n   * @default false\n   * @since 1.4.0\n   */\n  stackInverse?: boolean;\n}\n\nexport interface IGeoRegionSpec extends IRegionSpec {\n  coordinate?: 'geo';\n  /**\n   * 是否可以拖拽\n   * @default false\n   */\n  roam?: boolean;\n  /**\n   * 数据中的经度字段名\n   */\n  longitudeField?: string;\n  /**\n   * 数据中的纬度字段名\n   */\n  latitudeField?: string;\n  /**\n   * 地理映射配置\n   */\n  projection?: Partial<Omit<IProjectionSpec, 'name'>>;\n  /**\n   * 缩放最大最小倍数限制\n   */\n  zoomLimit?: {\n    min?: number;\n    max?: number;\n  };\n}\n"]}
+{"version":3,"sources":["../src/region/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IMark } from '../mark/interface';\nimport type { ILayoutModel, IModelOption } from '../model/interface';\nimport type { ISeries, SeriesType } from '../series/interface';\nimport type { CoordinateType } from '../typings/coordinate';\nimport type { IInteraction } from '../interaction/interface';\nimport type { IProjectionSpec } from '../component/geo/interface';\nimport type { ConvertToMarkStyleSpec, IRectMarkSpec } from '../typings/visual';\nimport type { IAnimate } from '../animation/interface';\nimport type { IGroupMark } from '../mark/group';\nimport type { StringOrNumber } from '../typings';\nimport type { ILayoutItemSpec } from '../layout/interface';\n\nexport interface IRegion extends ILayoutModel {\n  animate?: IAnimate;\n  interaction: IInteraction;\n\n  //stack\n  getStackInverse: () => boolean;\n\n  getMaxWidth: () => number | undefined;\n  setMaxWidth: (value: number) => void;\n  getMaxHeight: () => number | undefined;\n  setMaxHeight: (value: number) => void;\n\n  // 系列\n  addSeries: (series: ISeries) => void;\n  removeSeries: (series: ISeries) => void;\n\n  getSeries: (opt?: ISeriesFilter) => ISeries[];\n  getSeriesInName: (name: string) => ISeries;\n  getSeriesInUserId: (userId: string) => ISeries;\n  getSeriesInId: (id: number) => ISeries;\n  getSeriesInType: (type: SeriesType) => ISeries[];\n  getSeriesInCoordinateType: (type: CoordinateType) => ISeries[];\n  getSeriesInDataName: (dataName: string) => ISeries[];\n\n  getMarks: () => IMark[];\n  getGroupMark: () => IGroupMark;\n}\n\nexport type ISeriesFilter = {\n  name?: string;\n  userId?: StringOrNumber | StringOrNumber[];\n  specIndex?: number | number[];\n  id?: number;\n  type?: string;\n  coordinateType?: CoordinateType;\n  dataName?: string;\n};\n\nexport interface IRegionConstructor {\n  new (spec: IRegionSpec, ctx: IModelOption): IRegion;\n}\n\nexport interface IRegionSpec extends ILayoutItemSpec {\n  id?: StringOrNumber;\n  coordinate?: CoordinateType;\n  style?: ConvertToMarkStyleSpec<IRectMarkSpec>;\n  /**\n   * 堆积时是否逆序\n   * @default false\n   * @since 1.4.0\n   */\n  stackInverse?: boolean;\n}\n\nexport interface IGeoRegionSpec extends IRegionSpec {\n  coordinate?: 'geo';\n  /**\n   * 是否可以拖拽\n   * @default false\n   */\n  roam?: boolean;\n  /**\n   * 数据中的经度字段名\n   */\n  longitudeField?: string;\n  /**\n   * 数据中的纬度字段名\n   */\n  latitudeField?: string;\n  /**\n   * 地理映射配置\n   */\n  projection?: Partial<Omit<IProjectionSpec, 'name'>>;\n  /**\n   * 缩放最大最小倍数限制\n   */\n  zoomLimit?: {\n    min?: number;\n    max?: number;\n  };\n}\n"]}