@visactor/vtable 1.22.11-alpha.8 → 1.22.11

package/cjs/layout/pivot-header-layout.js

@@ -1045,7 +1045,7 @@ class PivotHeaderLayoutMap {
             var _a, _b, _c;
             const colHeaderPath = {};
             colHeaderPath.dimensionKey = colHeader.dimensionKey, colHeaderPath.indicatorKey = colHeader.indicatorKey, 
-            colHeaderPath.value = null !== (_c = null !== (_a = colHeader.value) && void 0 !== _a ? _a : null === (_b = this.getIndicatorInfoByIndicatorKey(colHeader.indicatorKey)) || void 0 === _b ? void 0 : _b.title) && void 0 !== _c ? _c : "", 
+            colHeaderPath.value = null !== (_a = colHeader.value) && void 0 !== _a ? _a : colHeader.indicatorKey ? null !== (_c = null === (_b = this.getIndicatorInfoByIndicatorKey(colHeader.indicatorKey)) || void 0 === _b ? void 0 : _b.title) && void 0 !== _c ? _c : "" : colHeader.value, 
             colHeaderPath.virtual = colHeader.virtual, colHeaderPath.role = colHeader.role, 
             headerPaths.colHeaderPaths.push(colHeaderPath);
         })), null === (_b = headerPathsWidthNode.rowHeaderPaths) || void 0 === _b || _b.forEach((rowHeader => {
@@ -1694,54 +1694,35 @@ class PivotHeaderLayoutMap {
         return null;
     }
     _generateChartState() {
-        const select_filter = datum => {
-            var _a;
-            if (this._table._selectedDataItemsInChart.length >= 1) {
-                return !!this._table._selectedDataItemsInChart.find((item => {
-                    for (const itemKey in item) if ("object" != typeof item[itemKey] && item[itemKey] !== datum[itemKey]) return !1;
-                    return !0;
-                }));
-            }
-            if (null === (_a = this._table._selectedDimensionInChart) || void 0 === _a ? void 0 : _a.length) {
-                return !!this._table._selectedDimensionInChart.every((item => "object" == typeof item.value || datum[item.key] === item.value));
-            }
-            return !1;
-        }, selected_reverse = datum => {
-            var _a;
-            if (this._table._selectedDataItemsInChart.length >= 1) {
-                return !this._table._selectedDataItemsInChart.find((item => {
-                    for (const itemKey in item) if ("object" != typeof item[itemKey] && item[itemKey] !== datum[itemKey]) return !1;
-                    return !0;
-                }));
-            }
-            if (null === (_a = this._table._selectedDimensionInChart) || void 0 === _a ? void 0 : _a.length) {
-                return !this._table._selectedDimensionInChart.every((item => "object" == typeof item.value || datum[item.key] === item.value));
-            }
-            return !1;
-        };
         return {
             vtable_selected: {
                 filter: datum => {
                     var _a;
-                    return (null === (_a = this._table.options.chartDimensionLinkage) || void 0 === _a ? void 0 : _a.selectedStateFilter) ? this._table.options.chartDimensionLinkage.selectedStateFilter(datum) : "click" === this._table._selectedDataMode && select_filter(datum);
+                    if (this._table._selectedDataItemsInChart.length >= 1) {
+                        return !!this._table._selectedDataItemsInChart.find((item => {
+                            for (const itemKey in item) if ("object" != typeof item[itemKey] && item[itemKey] !== datum[itemKey]) return !1;
+                            return !0;
+                        }));
+                    }
+                    if (null === (_a = this._table._selectedDimensionInChart) || void 0 === _a ? void 0 : _a.length) {
+                        return !!this._table._selectedDimensionInChart.every((item => "object" == typeof item.value || datum[item.key] === item.value));
+                    }
+                    return !1;
                 }
             },
             vtable_selected_reverse: {
                 filter: datum => {
                     var _a;
-                    return (null === (_a = this._table.options.chartDimensionLinkage) || void 0 === _a ? void 0 : _a.selectedReverseStateFilter) ? this._table.options.chartDimensionLinkage.selectedReverseStateFilter(datum) : "click" === this._table._selectedDataMode && selected_reverse(datum);
-                }
-            },
-            inBrush: {
-                filter: datum => {
-                    var _a;
-                    return (null === (_a = this._table.options.chartDimensionLinkage) || void 0 === _a ? void 0 : _a.inBrushStateFilter) ? this._table.options.chartDimensionLinkage.inBrushStateFilter(datum) : "brush" === this._table._selectedDataMode && select_filter(datum);
-                }
-            },
-            outOfBrush: {
-                filter: datum => {
-                    var _a;
-                    return (null === (_a = this._table.options.chartDimensionLinkage) || void 0 === _a ? void 0 : _a.outOfBrushStateFilter) ? this._table.options.chartDimensionLinkage.outOfBrushStateFilter(datum) : "brush" === this._table._selectedDataMode && selected_reverse(datum);
+                    if (this._table._selectedDataItemsInChart.length >= 1) {
+                        return !this._table._selectedDataItemsInChart.find((item => {
+                            for (const itemKey in item) if ("object" != typeof item[itemKey] && item[itemKey] !== datum[itemKey]) return !1;
+                            return !0;
+                        }));
+                    }
+                    if (null === (_a = this._table._selectedDimensionInChart) || void 0 === _a ? void 0 : _a.length) {
+                        return !this._table._selectedDimensionInChart.every((item => "object" == typeof item.value || datum[item.key] === item.value));
+                    }
+                    return !1;
                 }
             }
         };