@visactor/vtable 1.20.1-alpha.1 → 1.20.2-alpha.0

package/es/PivotChart.d.ts

@@ -74,6 +74,10 @@ export declare class PivotChart extends BaseTable implements PivotChartAPI {
     private _generateAggregationRules;
     private setCustomStateNameToSpec;
     updateFilterRules(filterRules: FilterRules): void;
+    private _throttleTimer;
+    private _latestFilterRules;
+    private _throttledUpdateFilterRules;
+    private _executeFilterUpdate;
     clearChartCacheImage(col?: number, row?: number): void;
     getLegendSelected(): any[];
     setLegendSelected(selectedData: (string | number)[]): void;

package/es/PivotChart.js

@@ -50,9 +50,9 @@ export class PivotChart extends BaseTable {
         super(container, options), this.layoutNodeId = {
             seqId: 0
         }, this._selectedDataItemsInChart = [], this._selectedDimensionInChart = [], this._chartEventMap = {}, 
-        (options = this.options).layout && Object.assign(options, options.layout), this.internalProps.columns = cloneDeep(options.columns), 
-        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._throttleTimer = null, this._latestFilterRules = null, (options = this.options).layout && Object.assign(options, options.layout), 
+        this.internalProps.columns = cloneDeep(options.columns), 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 !== (_e = null !== (_d = null === (_c = options.resize) || void 0 === _c ? void 0 : _c.columnResizeType) && void 0 !== _d ? _d : options.columnResizeType) && void 0 !== _e ? _e : "column", 
         this.internalProps.rowResizeType = null !== (_h = null !== (_g = null === (_f = options.resize) || void 0 === _f ? void 0 : _f.rowResizeType) && void 0 !== _g ? _g : options.rowResizeType) && void 0 !== _h ? _h : "row", 
@@ -393,19 +393,19 @@ 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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
         columnKeys = columnKeys.filter((key => key !== IndicatorDimensionKeyPlaceholder)), 
         rowKeys = rowKeys.filter((key => key !== IndicatorDimensionKeyPlaceholder));
         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) || "rose" === (null === (_b = indicators[i].chartSpec) || void 0 === _b ? void 0 : _b.type) || "radar" === (null === (_c = indicators[i].chartSpec) || void 0 === _c ? void 0 : _c.type) || "gauge" === (null === (_d = indicators[i].chartSpec) || void 0 === _d ? void 0 : _d.type) || "wordCloud" === (null === (_e = indicators[i].chartSpec) || void 0 === _e ? void 0 : _e.type)) continue;
+            if ("pie" === (null === (_a = indicators[i].chartSpec) || void 0 === _a ? void 0 : _a.type) || "rose" === (null === (_b = indicators[i].chartSpec) || void 0 === _b ? void 0 : _b.type) || "funnel" === (null === (_c = indicators[i].chartSpec) || void 0 === _c ? void 0 : _c.type) || "radar" === (null === (_d = indicators[i].chartSpec) || void 0 === _d ? void 0 : _d.type) || "gauge" === (null === (_e = indicators[i].chartSpec) || void 0 === _e ? void 0 : _e.type) || "wordCloud" === (null === (_f = indicators[i].chartSpec) || void 0 === _f ? void 0 : _f.type) || "sunburst" === (null === (_g = indicators[i].chartSpec) || void 0 === _g ? void 0 : _g.type) || "treemap" === (null === (_h = indicators[i].chartSpec) || void 0 === _h ? void 0 : _h.type) || "sankey" === (null === (_j = indicators[i].chartSpec) || void 0 === _j ? void 0 : _j.type) || "circlePacking" === (null === (_k = indicators[i].chartSpec) || void 0 === _k ? void 0 : _k.type)) continue;
             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] = {
+            "heatmap" !== (null == indicatorSpec ? void 0 : indicatorSpec.type) && (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 => {
+                sumBy: "histogram" === indicatorSpec.type ? columnKeys.concat(null == indicatorSpec ? void 0 : indicatorSpec.xField, null == indicatorSpec ? void 0 : indicatorSpec.x2Field) : (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] = {
@@ -424,29 +424,30 @@ export class PivotChart extends BaseTable {
                     extendRange: parseMarkLineGetExtendRange(indicatorSpec.markLine)
                 };
             })); else {
-                const xField = "string" == typeof indicatorSpec.xField ? indicatorSpec.xField : indicatorSpec.xField[0];
+                const xField = "histogram" === indicatorSpec.type ? indicatorSpec.x2Field : "string" == typeof indicatorSpec.xField ? indicatorSpec.xField : indicatorSpec.xField[0];
                 collectValuesBy[xField] = {
                     by: columnKeys,
                     type: "horizontal" !== indicatorSpec.direction ? "xField" : void 0,
                     range: hasLinearAxis(indicatorSpec, this._axes, "horizontal" === indicatorSpec.direction, !0),
-                    sortBy: "horizontal" !== indicatorSpec.direction ? null === (_h = null === (_g = null === (_f = null == indicatorSpec ? void 0 : indicatorSpec.data) || void 0 === _f ? void 0 : _f.fields) || void 0 === _g ? void 0 : _g[xField]) || void 0 === _h ? void 0 : _h.domain : void 0
+                    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
                 }, !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 === (_l = null === (_k = null === (_j = null == indicatorSpec ? void 0 : indicatorSpec.data) || void 0 === _j ? void 0 : _j.fields) || void 0 === _k ? void 0 : _k[yField]) || void 0 === _l ? void 0 : _l.domain : void 0,
+                    type: "horizontal" !== indicatorSpec.direction ? "yField" : void 0,
+                    range: hasLinearAxis(indicatorSpec, this._axes, "horizontal" === indicatorSpec.direction, !1),
+                    sumBy: "histogram" === indicatorSpec.type ? columnKeys.concat(null == indicatorSpec ? void 0 : indicatorSpec.xField, null == indicatorSpec ? void 0 : indicatorSpec.x2Field) : indicatorSpec.stack && columnKeys.concat(null == indicatorSpec ? void 0 : indicatorSpec.xField),
+                    sortBy: "horizontal" === indicatorSpec.direction ? null === (_r = null === (_q = null === (_p = null == indicatorSpec ? void 0 : indicatorSpec.data) || void 0 === _p ? void 0 : _p.fields) || void 0 === _q ? void 0 : _q[yField]) || void 0 === _r ? void 0 : _r.domain : void 0,
                     extendRange: parseMarkLineGetExtendRange(indicatorSpec.markLine)
                 };
             } else {
                 const indicatorDefine = indicators[i];
                 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] = {
+                "heatmap" !== (null == indicatorSpec ? void 0 : indicatorSpec.type) && (collectValuesBy[indicatorDefine.indicatorKey] = {
                     by: columnKeys,
                     range: !0,
                     sumBy: (null == indicatorSpec ? void 0 : indicatorSpec.stack) && rowKeys.concat(null == indicatorSpec ? void 0 : indicatorSpec.yField)
-                }, indicatorSpec.series) indicatorSpec.series.forEach((chartSeries => {
+                }), 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] = {
@@ -470,14 +471,15 @@ export class PivotChart extends BaseTable {
                         by: rowKeys,
                         type: "horizontal" === indicatorSpec.direction ? "yField" : void 0,
                         range: hasLinearAxis(indicatorSpec, this._axes, "horizontal" === indicatorSpec.direction, !1),
-                        sortBy: "horizontal" === indicatorSpec.direction ? 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
+                        sortBy: "horizontal" === indicatorSpec.direction ? null === (_u = null === (_t = null === (_s = null == indicatorSpec ? void 0 : indicatorSpec.data) || void 0 === _s ? void 0 : _s.fields) || void 0 === _t ? void 0 : _t[yField]) || void 0 === _u ? void 0 : _u.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;
+                    const xField = "histogram" === indicatorSpec.type ? indicatorSpec.x2Field : indicatorSpec.xField;
                     collectValuesBy[xField] = {
                         by: columnKeys,
+                        type: "horizontal" === indicatorSpec.direction ? "xField" : void 0,
                         range: hasLinearAxis(indicatorSpec, this._axes, "horizontal" === indicatorSpec.direction, !0),
                         sumBy: indicatorSpec.stack && rowKeys.concat(null == indicatorSpec ? void 0 : indicatorSpec.yField),
-                        sortBy: "horizontal" !== indicatorSpec.direction ? null === (_s = null === (_r = null === (_q = null == indicatorSpec ? void 0 : indicatorSpec.data) || void 0 === _q ? void 0 : _q.fields) || void 0 === _r ? void 0 : _r[xField]) || void 0 === _s ? void 0 : _s.domain : void 0,
+                        sortBy: "horizontal" !== indicatorSpec.direction ? null === (_x = null === (_w = null === (_v = null == indicatorSpec ? void 0 : indicatorSpec.data) || void 0 === _v ? void 0 : _v.fields) || void 0 === _w ? void 0 : _w[xField]) || void 0 === _x ? void 0 : _x.domain : void 0,
                         extendRange: parseMarkLineGetExtendRange(indicatorSpec.markLine)
                     };
                 }
@@ -540,6 +542,16 @@ export class PivotChart extends BaseTable {
         }));
     }
     updateFilterRules(filterRules) {
+        this._throttledUpdateFilterRules(filterRules);
+    }
+    _throttledUpdateFilterRules(filterRules) {
+        this._latestFilterRules = filterRules, null === this._throttleTimer && (this._executeFilterUpdate(filterRules), 
+        this._throttleTimer = window.setTimeout((() => {
+            this._latestFilterRules !== filterRules && this._executeFilterUpdate(this._latestFilterRules), 
+            this._throttleTimer = null;
+        }), 200));
+    }
+    _executeFilterUpdate(filterRules) {
         this.internalProps.dataConfig.filterRules = filterRules, this.dataset.updateFilterRules(filterRules), 
         clearChartCacheImage(this.scenegraph), updateChartData(this.scenegraph), this.render();
     }