@visactor/vtable 1.26.7 → 1.26.8

package/es/PivotChart.js

@@ -59,9 +59,9 @@ export class PivotChart extends BaseTable {
         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", 
-        this.internalProps.dataConfig = {
+        this.internalProps.dataConfig = Object.assign(Object.assign({}, cloneDeep(options.dataConfig)), {
             isPivotChart: !0
-        }, this.internalProps.columnWidthConfig = options.columnWidthConfig, this.internalProps.columnWidthConfigForRowHeader = options.columnWidthConfigForRowHeader, 
+        }), this.internalProps.columnWidthConfig = options.columnWidthConfig, this.internalProps.columnWidthConfigForRowHeader = options.columnWidthConfigForRowHeader, 
         this._axes = isArray(options.axes) ? options.axes : [], options.columnTree && (!1 !== options.indicatorsAsCol && (this.internalProps.columnTree = supplementIndicatorNodesForCustomTree(this.internalProps.columnTree, options.indicators)), 
         columnDimensionTree = new DimensionTree(null !== (_j = this.internalProps.columnTree) && void 0 !== _j ? _j : [], this.layoutNodeId)), 
         options.rowTree && (!1 === options.indicatorsAsCol && (this.internalProps.rowTree = supplementIndicatorNodesForCustomTree(this.internalProps.rowTree, options.indicators)), 
@@ -151,9 +151,9 @@ export class PivotChart extends BaseTable {
         options.records && (this.internalProps.records = options.records), this.setCustomStateNameToSpec(), 
         this._selectedDataItemsInChart = [], internalProps.columnResizeType = null !== (_f = null !== (_e = null === (_d = options.resize) || void 0 === _d ? void 0 : _d.columnResizeType) && void 0 !== _e ? _e : options.columnResizeType) && void 0 !== _f ? _f : "column", 
         internalProps.rowResizeType = null !== (_j = null !== (_h = null === (_g = options.resize) || void 0 === _g ? void 0 : _g.rowResizeType) && void 0 !== _h ? _h : options.rowResizeType) && void 0 !== _j ? _j : "row", 
-        internalProps.dataConfig = {
+        internalProps.dataConfig = Object.assign(Object.assign({}, cloneDeep(options.dataConfig)), {
             isPivotChart: !0
-        }, this.internalProps.columnWidthConfig = options.columnWidthConfig, this.internalProps.columnWidthConfigForRowHeader = options.columnWidthConfigForRowHeader, 
+        }), this.internalProps.columnWidthConfig = options.columnWidthConfig, this.internalProps.columnWidthConfigForRowHeader = options.columnWidthConfigForRowHeader, 
         this._axes = isArray(options.axes) ? options.axes : [], options.columnTree && (!1 !== options.indicatorsAsCol && (this.internalProps.columnTree = supplementIndicatorNodesForCustomTree(this.internalProps.columnTree, options.indicators)), 
         columnDimensionTree = new DimensionTree(null !== (_k = this.internalProps.columnTree) && void 0 !== _k ? _k : [], this.layoutNodeId)), 
         options.rowTree && (!1 === options.indicatorsAsCol && (this.internalProps.rowTree = supplementIndicatorNodesForCustomTree(this.internalProps.rowTree, options.indicators)), 
@@ -260,17 +260,17 @@ export class PivotChart extends BaseTable {
         if (this.dataset) {
             let indicatorPosition;
             const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map(((colPath, index) => {
-                var _a;
+                var _a, _b;
                 return colPath.indicatorKey && (indicatorPosition = {
                     position: "col",
                     index: index
-                }), null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
+                }), null !== (_b = null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.dataValue) && void 0 !== _b ? _b : colPath.value;
             })), rowKeys = cellDimensionPath.rowHeaderPaths.map(((rowPath, index) => {
-                var _a;
+                var _a, _b;
                 return rowPath.indicatorKey && (indicatorPosition = {
                     position: "row",
                     index: index
-                }), null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+                }), null !== (_b = null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.dataValue) && void 0 !== _b ? _b : rowPath.value;
             })), aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), !0, indicatorPosition);
             return aggregator.value ? aggregator.value() : void 0;
         }
@@ -298,17 +298,17 @@ export class PivotChart extends BaseTable {
         if (this.dataset) {
             let indicatorPosition;
             const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map(((colPath, index) => {
-                var _a;
+                var _a, _b;
                 return colPath.indicatorKey && (indicatorPosition = {
                     position: "col",
                     index: index
-                }), null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
+                }), null !== (_b = null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.dataValue) && void 0 !== _b ? _b : colPath.value;
             })), rowKeys = cellDimensionPath.rowHeaderPaths.map(((rowPath, index) => {
-                var _a;
+                var _a, _b;
                 return rowPath.indicatorKey && (indicatorPosition = {
                     position: "row",
                     index: index
-                }), null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+                }), null !== (_b = null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.dataValue) && void 0 !== _b ? _b : rowPath.value;
             })), aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), !0, indicatorPosition);
             return aggregator.value ? aggregator.value() : void 0;
         }
@@ -322,17 +322,17 @@ export class PivotChart extends BaseTable {
         if (!this.internalProps.layoutMap.isHeader(col, row) && this.dataset) {
             let indicatorPosition;
             const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row), colKeys = cellDimensionPath.colHeaderPaths.map(((colPath, index) => {
-                var _a;
+                var _a, _b;
                 return colPath.indicatorKey && (indicatorPosition = {
                     position: "col",
                     index: index
-                }), null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.value;
+                }), null !== (_b = null !== (_a = colPath.indicatorKey) && void 0 !== _a ? _a : colPath.dataValue) && void 0 !== _b ? _b : colPath.value;
             })), rowKeys = cellDimensionPath.rowHeaderPaths.map(((rowPath, index) => {
-                var _a;
+                var _a, _b;
                 return rowPath.indicatorKey && (indicatorPosition = {
                     position: "row",
                     index: index
-                }), null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.value;
+                }), null !== (_b = null !== (_a = rowPath.indicatorKey) && void 0 !== _a ? _a : rowPath.dataValue) && void 0 !== _b ? _b : rowPath.value;
             }));
             return this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), !0, indicatorPosition).records;
         }