@visactor/vtable 0.23.1 → 0.23.2

package/es/PivotChart.js

@@ -10,6 +10,8 @@ import { cellInRange } from "./tools/helper";
 
 import { Dataset } from "./dataset/dataset";
 
+import { parseMarkLineGetExtendRange } from "./core/tableHelper";
+
 import { BaseTable } from "./core/BaseTable";
 
 import { clearChartCacheImage, updateChartData } from "./scenegraph/refresh-node/update-chart";
@@ -22,6 +24,8 @@ import { Env } from "./tools/env";
 
 import { TABLE_EVENT_TYPE } from "./core/TABLE_EVENT_TYPE";
 
+import { cloneDeepSpec } from "@visactor/vutils-extension";
+
 export class PivotChart extends BaseTable {
     constructor(container, options) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
@@ -29,7 +33,7 @@ export class PivotChart extends BaseTable {
         container = container.container ? container.container : null), super(container, options), 
         this._selectedDataItemsInChart = [], this._selectedDimensionInChart = [], this._chartEventMap = {}, 
         options.layout && Object.assign(options, options.layout), this.internalProps.columns = cloneDeep(options.columns), 
-        this.internalProps.rows = cloneDeep(options.rows), this.internalProps.indicators = cloneDeep(options.indicators), 
+        this.internalProps.rows = cloneDeep(options.rows), this.internalProps.indicators = cloneDeepSpec(options.indicators), 
         this.internalProps.columnTree = !options.indicatorsAsCol || (null === (_a = options.columns) || void 0 === _a ? void 0 : _a.length) || options.columnTree ? cloneDeep(options.columnTree) : [], 
         this.internalProps.rowTree = options.indicatorsAsCol || (null === (_b = options.rows) || void 0 === _b ? void 0 : _b.length) || options.rowTree ? cloneDeep(options.rowTree) : [], 
         this.internalProps.records = options.records, this.setCustomStateNameToSpec(), this.internalProps.columnResizeType = null !== (_c = options.columnResizeType) && void 0 !== _c ? _c : "column", 
@@ -81,7 +85,7 @@ export class PivotChart extends BaseTable {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         const internalProps = this.internalProps;
         super.updateOption(options), this.internalProps.columns = cloneDeep(options.columns), 
-        this.internalProps.rows = cloneDeep(options.rows), this.internalProps.indicators = (null === (_a = options.indicators) || void 0 === _a ? void 0 : _a.length) ? cloneDeep(options.indicators) : [], 
+        this.internalProps.rows = cloneDeep(options.rows), this.internalProps.indicators = (null === (_a = options.indicators) || void 0 === _a ? void 0 : _a.length) ? cloneDeepSpec(options.indicators) : [], 
         this.internalProps.columnTree = !options.indicatorsAsCol || (null === (_b = options.columns) || void 0 === _b ? void 0 : _b.length) || options.columnTree ? cloneDeep(options.columnTree) : [], 
         this.internalProps.rowTree = options.indicatorsAsCol || (null === (_c = options.rows) || void 0 === _c ? void 0 : _c.length) || options.rowTree ? cloneDeep(options.rowTree) : [], 
         options.records && (this.internalProps.records = options.records), this.setCustomStateNameToSpec(), 
@@ -321,65 +325,65 @@ export class PivotChart extends BaseTable {
         };
     }
     _generateCollectValuesConfig(columnKeys, rowKeys) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         const indicators = this.internalProps.indicators, collectValuesBy = {};
         for (let i = 0, len = null == indicators ? void 0 : indicators.length; i < len; i++) if ("string" != typeof indicators[i] && indicators[i].chartSpec) {
             if ("pie" === (null === (_a = indicators[i].chartSpec) || void 0 === _a ? void 0 : _a.type)) continue;
-            if (!1 === this.options.indicatorsAsCol) {
-                const indicatorDefine = indicators[i];
-                if (!1 !== (null === (_b = indicatorDefine.chartSpec) || void 0 === _b ? void 0 : _b.stack) && ("bar" === (null === (_c = indicatorDefine.chartSpec) || void 0 === _c ? void 0 : _c.type) || "area" === (null === (_d = indicatorDefine.chartSpec) || void 0 === _d ? void 0 : _d.type)) && (indicatorDefine.chartSpec.stack = !0), 
-                collectValuesBy[indicatorDefine.indicatorKey] = {
+            const indicatorDefine = indicators[i], indicatorSpec = indicatorDefine.chartSpec;
+            if (!1 === this.options.indicatorsAsCol) if (!1 !== (null == indicatorSpec ? void 0 : indicatorSpec.stack) && ("bar" === (null == indicatorSpec ? void 0 : indicatorSpec.type) || "area" === (null == indicatorSpec ? void 0 : indicatorSpec.type)) && (indicatorSpec.stack = !0), 
+            collectValuesBy[indicatorDefine.indicatorKey] = {
+                by: rowKeys,
+                range: !0,
+                sumBy: (null == indicatorSpec ? void 0 : indicatorSpec.stack) && columnKeys.concat(null == indicatorSpec ? void 0 : indicatorSpec.xField)
+            }, indicatorSpec.series) indicatorSpec.series.forEach((chartSeries => {
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+                const xField = "string" == typeof chartSeries.xField ? chartSeries.xField : chartSeries.xField[0];
+                collectValuesBy[xField] = {
+                    by: columnKeys,
+                    type: "horizontal" !== chartSeries.direction ? "xField" : void 0,
+                    range: "horizontal" === chartSeries.direction,
+                    sortBy: "horizontal" !== chartSeries.direction ? null !== (_d = null === (_c = null === (_b = null === (_a = null == chartSeries ? void 0 : chartSeries.data) || void 0 === _a ? void 0 : _a.fields) || void 0 === _b ? void 0 : _b[xField]) || void 0 === _c ? void 0 : _c.domain) && void 0 !== _d ? _d : null === (_g = null === (_f = null === (_e = null == indicatorSpec ? void 0 : indicatorSpec.data) || void 0 === _e ? void 0 : _e.fields) || void 0 === _f ? void 0 : _f[xField]) || void 0 === _g ? void 0 : _g.domain : void 0
+                };
+                const yField = chartSeries.yField;
+                !1 !== chartSeries.stack && ("bar" === chartSeries.type || "area" === chartSeries.type) && (chartSeries.stack = !0), 
+                collectValuesBy[yField] = {
                     by: rowKeys,
-                    range: !0,
-                    sumBy: (null === (_e = indicatorDefine.chartSpec) || void 0 === _e ? void 0 : _e.stack) && columnKeys.concat(null === (_f = indicatorDefine.chartSpec) || void 0 === _f ? void 0 : _f.xField)
-                }, indicatorDefine.chartSpec.series) indicatorDefine.chartSpec.series.forEach((chartSeries => {
-                    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-                    const xField = "string" == typeof chartSeries.xField ? chartSeries.xField : chartSeries.xField[0];
-                    collectValuesBy[xField] = {
-                        by: columnKeys,
-                        type: "horizontal" !== chartSeries.direction ? "xField" : void 0,
-                        range: "horizontal" === chartSeries.direction,
-                        sortBy: "horizontal" !== chartSeries.direction ? null !== (_d = null === (_c = null === (_b = null === (_a = null == chartSeries ? void 0 : chartSeries.data) || void 0 === _a ? void 0 : _a.fields) || void 0 === _b ? void 0 : _b[xField]) || void 0 === _c ? void 0 : _c.domain) && void 0 !== _d ? _d : null === (_h = null === (_g = null === (_f = null === (_e = indicatorDefine.chartSpec) || void 0 === _e ? void 0 : _e.data) || void 0 === _f ? void 0 : _f.fields) || void 0 === _g ? void 0 : _g[xField]) || void 0 === _h ? void 0 : _h.domain : void 0
-                    };
-                    const yField = chartSeries.yField;
-                    !1 !== chartSeries.stack && ("bar" === chartSeries.type || "area" === chartSeries.type) && (chartSeries.stack = !0), 
-                    collectValuesBy[yField] = {
-                        by: rowKeys,
-                        range: "horizontal" !== chartSeries.direction,
-                        sumBy: chartSeries.stack && columnKeys.concat(null == chartSeries ? void 0 : chartSeries.xField),
-                        sortBy: "horizontal" === chartSeries.direction ? null !== (_m = null === (_l = null === (_k = null === (_j = null == chartSeries ? void 0 : chartSeries.data) || void 0 === _j ? void 0 : _j.fields) || void 0 === _k ? void 0 : _k[yField]) || void 0 === _l ? void 0 : _l.domain) && void 0 !== _m ? _m : null === (_r = null === (_q = null === (_p = null === (_o = indicatorDefine.chartSpec) || void 0 === _o ? void 0 : _o.data) || void 0 === _p ? void 0 : _p.fields) || void 0 === _q ? void 0 : _q[yField]) || void 0 === _r ? void 0 : _r.domain : void 0
-                    };
-                })); else {
-                    const xField = "string" == typeof indicatorDefine.chartSpec.xField ? indicatorDefine.chartSpec.xField : indicatorDefine.chartSpec.xField[0];
-                    collectValuesBy[xField] = {
-                        by: columnKeys,
-                        type: "horizontal" !== indicatorDefine.chartSpec.direction ? "xField" : void 0,
-                        range: "horizontal" === indicatorDefine.chartSpec.direction,
-                        sortBy: "horizontal" !== indicatorDefine.chartSpec.direction ? null === (_k = null === (_j = null === (_h = null === (_g = indicatorDefine.chartSpec) || void 0 === _g ? void 0 : _g.data) || void 0 === _h ? void 0 : _h.fields) || void 0 === _j ? void 0 : _j[xField]) || void 0 === _k ? void 0 : _k.domain : void 0
-                    }, !1 !== (null === (_l = indicatorDefine.chartSpec) || void 0 === _l ? void 0 : _l.stack) && ("bar" === (null === (_m = indicatorDefine.chartSpec) || void 0 === _m ? void 0 : _m.type) || "area" === (null === (_o = indicatorDefine.chartSpec) || void 0 === _o ? void 0 : _o.type)) && (indicatorDefine.chartSpec.stack = !0);
-                    const yField = indicatorDefine.chartSpec.yField;
-                    collectValuesBy[yField] = {
-                        by: rowKeys,
-                        range: "horizontal" !== indicators[i].chartSpec.direction,
-                        sumBy: indicatorDefine.chartSpec.stack && columnKeys.concat(null === (_p = indicatorDefine.chartSpec) || void 0 === _p ? void 0 : _p.xField),
-                        sortBy: "horizontal" === indicatorDefine.chartSpec.direction ? null === (_t = null === (_s = null === (_r = null === (_q = indicatorDefine.chartSpec) || void 0 === _q ? void 0 : _q.data) || void 0 === _r ? void 0 : _r.fields) || void 0 === _s ? void 0 : _s[yField]) || void 0 === _t ? void 0 : _t.domain : void 0
-                    };
-                }
+                    range: "horizontal" !== chartSeries.direction,
+                    sumBy: chartSeries.stack && columnKeys.concat(null == chartSeries ? void 0 : chartSeries.xField),
+                    sortBy: "horizontal" === chartSeries.direction ? null !== (_l = null === (_k = null === (_j = null === (_h = null == chartSeries ? void 0 : chartSeries.data) || void 0 === _h ? void 0 : _h.fields) || void 0 === _j ? void 0 : _j[yField]) || void 0 === _k ? void 0 : _k.domain) && void 0 !== _l ? _l : null === (_p = null === (_o = null === (_m = null == indicatorSpec ? void 0 : indicatorSpec.data) || void 0 === _m ? void 0 : _m.fields) || void 0 === _o ? void 0 : _o[yField]) || void 0 === _p ? void 0 : _p.domain : void 0,
+                    extendRange: parseMarkLineGetExtendRange(indicatorSpec.markLine)
+                };
+            })); else {
+                const xField = "string" == typeof indicatorSpec.xField ? indicatorSpec.xField : indicatorSpec.xField[0];
+                collectValuesBy[xField] = {
+                    by: columnKeys,
+                    type: "horizontal" !== indicatorSpec.direction ? "xField" : void 0,
+                    range: "horizontal" === indicatorSpec.direction,
+                    sortBy: "horizontal" !== indicatorSpec.direction ? null === (_d = null === (_c = null === (_b = null == indicatorSpec ? void 0 : indicatorSpec.data) || void 0 === _b ? void 0 : _b.fields) || void 0 === _c ? void 0 : _c[xField]) || void 0 === _d ? void 0 : _d.domain : void 0
+                }, !1 !== (null == indicatorSpec ? void 0 : indicatorSpec.stack) && ("bar" === (null == indicatorSpec ? void 0 : indicatorSpec.type) || "area" === (null == indicatorSpec ? void 0 : indicatorSpec.type)) && (indicatorSpec.stack = !0);
+                const yField = indicatorSpec.yField;
+                collectValuesBy[yField] = {
+                    by: rowKeys,
+                    range: "horizontal" !== indicatorSpec.direction,
+                    sumBy: indicatorSpec.stack && columnKeys.concat(null == indicatorSpec ? void 0 : indicatorSpec.xField),
+                    sortBy: "horizontal" === indicatorSpec.direction ? null === (_g = null === (_f = null === (_e = null == indicatorSpec ? void 0 : indicatorSpec.data) || void 0 === _e ? void 0 : _e.fields) || void 0 === _f ? void 0 : _f[yField]) || void 0 === _g ? void 0 : _g.domain : void 0,
+                    extendRange: parseMarkLineGetExtendRange(indicatorSpec.markLine)
+                };
             } else {
                 const indicatorDefine = indicators[i];
-                if (!1 !== (null === (_u = indicatorDefine.chartSpec) || void 0 === _u ? void 0 : _u.stack) && ("bar" === (null === (_v = indicatorDefine.chartSpec) || void 0 === _v ? void 0 : _v.type) || "area" === (null === (_w = indicatorDefine.chartSpec) || void 0 === _w ? void 0 : _w.type)) && (indicatorDefine.chartSpec.stack = !0), 
+                if (!1 !== (null == indicatorSpec ? void 0 : indicatorSpec.stack) && ("bar" === (null == indicatorSpec ? void 0 : indicatorSpec.type) || "area" === (null == indicatorSpec ? void 0 : indicatorSpec.type)) && (indicatorSpec.stack = !0), 
                 collectValuesBy[indicatorDefine.indicatorKey] = {
                     by: columnKeys,
                     range: !0,
-                    sumBy: (null === (_x = indicatorDefine.chartSpec) || void 0 === _x ? void 0 : _x.stack) && rowKeys.concat(null === (_y = indicatorDefine.chartSpec) || void 0 === _y ? void 0 : _y.yField)
-                }, indicatorDefine.chartSpec.series) indicatorDefine.chartSpec.series.forEach((chartSeries => {
-                    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+                    sumBy: (null == indicatorSpec ? void 0 : indicatorSpec.stack) && rowKeys.concat(null == indicatorSpec ? void 0 : indicatorSpec.yField)
+                }, indicatorSpec.series) indicatorSpec.series.forEach((chartSeries => {
+                    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
                     const yField = "string" == typeof chartSeries.yField ? chartSeries.yField : chartSeries.yField[0];
                     collectValuesBy[yField] = {
                         by: rowKeys,
                         type: "horizontal" === chartSeries.direction ? "yField" : void 0,
                         range: "horizontal" !== chartSeries.direction,
-                        sortBy: "horizontal" === chartSeries.direction ? null !== (_d = null === (_c = null === (_b = null === (_a = null == chartSeries ? void 0 : chartSeries.data) || void 0 === _a ? void 0 : _a.fields) || void 0 === _b ? void 0 : _b[yField]) || void 0 === _c ? void 0 : _c.domain) && void 0 !== _d ? _d : null === (_h = null === (_g = null === (_f = null === (_e = indicatorDefine.chartSpec) || void 0 === _e ? void 0 : _e.data) || void 0 === _f ? void 0 : _f.fields) || void 0 === _g ? void 0 : _g[yField]) || void 0 === _h ? void 0 : _h.domain : void 0
+                        sortBy: "horizontal" === chartSeries.direction ? null !== (_d = null === (_c = null === (_b = null === (_a = null == chartSeries ? void 0 : chartSeries.data) || void 0 === _a ? void 0 : _a.fields) || void 0 === _b ? void 0 : _b[yField]) || void 0 === _c ? void 0 : _c.domain) && void 0 !== _d ? _d : null === (_g = null === (_f = null === (_e = null == indicatorSpec ? void 0 : indicatorSpec.data) || void 0 === _e ? void 0 : _e.fields) || void 0 === _f ? void 0 : _f[yField]) || void 0 === _g ? void 0 : _g.domain : void 0
                     };
                     const xField = chartSeries.xField;
                     !1 !== chartSeries.stack && ("bar" === chartSeries.type || "area" === chartSeries.type) && (chartSeries.stack = !0), 
@@ -387,22 +391,24 @@ export class PivotChart extends BaseTable {
                         by: columnKeys,
                         range: "horizontal" === chartSeries.direction,
                         sumBy: chartSeries.stack && rowKeys.concat(null == chartSeries ? void 0 : chartSeries.yField),
-                        sortBy: "horizontal" !== chartSeries.direction ? null !== (_m = null === (_l = null === (_k = null === (_j = null == chartSeries ? void 0 : chartSeries.data) || void 0 === _j ? void 0 : _j.fields) || void 0 === _k ? void 0 : _k[xField]) || void 0 === _l ? void 0 : _l.domain) && void 0 !== _m ? _m : null === (_r = null === (_q = null === (_p = null === (_o = indicatorDefine.chartSpec) || void 0 === _o ? void 0 : _o.data) || void 0 === _p ? void 0 : _p.fields) || void 0 === _q ? void 0 : _q[xField]) || void 0 === _r ? void 0 : _r.domain : void 0
+                        sortBy: "horizontal" !== chartSeries.direction ? null !== (_l = null === (_k = null === (_j = null === (_h = null == chartSeries ? void 0 : chartSeries.data) || void 0 === _h ? void 0 : _h.fields) || void 0 === _j ? void 0 : _j[xField]) || void 0 === _k ? void 0 : _k.domain) && void 0 !== _l ? _l : null === (_p = null === (_o = null === (_m = null == indicatorSpec ? void 0 : indicatorSpec.data) || void 0 === _m ? void 0 : _m.fields) || void 0 === _o ? void 0 : _o[xField]) || void 0 === _p ? void 0 : _p.domain : void 0,
+                        extendRange: parseMarkLineGetExtendRange(indicatorSpec.markLine)
                     };
                 })); else {
-                    const yField = "string" == typeof indicatorDefine.chartSpec.yField ? indicatorDefine.chartSpec.yField : indicatorDefine.chartSpec.yField[0];
+                    const yField = "string" == typeof indicatorSpec.yField ? indicatorSpec.yField : indicatorSpec.yField[0];
                     collectValuesBy[yField] = {
                         by: rowKeys,
-                        type: "horizontal" === indicatorDefine.chartSpec.direction ? "yField" : void 0,
-                        range: "horizontal" !== indicatorDefine.chartSpec.direction,
-                        sortBy: "horizontal" === indicatorDefine.chartSpec.direction ? null === (_2 = null === (_1 = null === (_0 = null === (_z = indicatorDefine.chartSpec) || void 0 === _z ? void 0 : _z.data) || void 0 === _0 ? void 0 : _0.fields) || void 0 === _1 ? void 0 : _1[yField]) || void 0 === _2 ? void 0 : _2.domain : void 0
-                    }, !1 !== (null === (_3 = indicatorDefine.chartSpec) || void 0 === _3 ? void 0 : _3.stack) && ("bar" === (null === (_4 = indicatorDefine.chartSpec) || void 0 === _4 ? void 0 : _4.type) || "area" === (null === (_5 = indicatorDefine.chartSpec) || void 0 === _5 ? void 0 : _5.type)) && (indicatorDefine.chartSpec.stack = !0);
-                    const xField = indicatorDefine.chartSpec.xField;
+                        type: "horizontal" === indicatorSpec.direction ? "yField" : void 0,
+                        range: "horizontal" !== indicatorSpec.direction,
+                        sortBy: "horizontal" === indicatorSpec.direction ? null === (_k = null === (_j = null === (_h = null == indicatorSpec ? void 0 : indicatorSpec.data) || void 0 === _h ? void 0 : _h.fields) || void 0 === _j ? void 0 : _j[yField]) || void 0 === _k ? void 0 : _k.domain : void 0
+                    }, !1 !== (null == indicatorSpec ? void 0 : indicatorSpec.stack) && ("bar" === (null == indicatorSpec ? void 0 : indicatorSpec.type) || "area" === (null == indicatorSpec ? void 0 : indicatorSpec.type)) && (indicatorSpec.stack = !0);
+                    const xField = indicatorSpec.xField;
                     collectValuesBy[xField] = {
                         by: columnKeys,
-                        range: "horizontal" === indicators[i].chartSpec.direction,
-                        sumBy: indicatorDefine.chartSpec.stack && rowKeys.concat(null === (_6 = indicatorDefine.chartSpec) || void 0 === _6 ? void 0 : _6.yField),
-                        sortBy: "horizontal" !== indicatorDefine.chartSpec.direction ? null === (_10 = null === (_9 = null === (_8 = null === (_7 = indicatorDefine.chartSpec) || void 0 === _7 ? void 0 : _7.data) || void 0 === _8 ? void 0 : _8.fields) || void 0 === _9 ? void 0 : _9[xField]) || void 0 === _10 ? void 0 : _10.domain : void 0
+                        range: "horizontal" === indicatorSpec.direction,
+                        sumBy: indicatorSpec.stack && rowKeys.concat(null == indicatorSpec ? void 0 : indicatorSpec.yField),
+                        sortBy: "horizontal" !== indicatorSpec.direction ? null === (_o = null === (_m = null === (_l = null == indicatorSpec ? void 0 : indicatorSpec.data) || void 0 === _l ? void 0 : _l.fields) || void 0 === _m ? void 0 : _m[xField]) || void 0 === _o ? void 0 : _o.domain : void 0,
+                        extendRange: parseMarkLineGetExtendRange(indicatorSpec.markLine)
                     };
                 }
             }