@visactor/vtable-sheet 1.22.7-alpha.7 → 1.22.7-alpha.9

package/cjs/index.d.ts

@@ -2,5 +2,5 @@ import VTableSheet from './components/vtable-sheet';
 import type { ISheetDefine, IVTableSheetOptions } from './ts-types';
 import * as TYPES from './ts-types';
 import * as VTable from './vtable';
-export declare const version = "1.22.7-alpha.7";
+export declare const version = "1.22.7-alpha.9";
 export { VTableSheet, TYPES, VTable, ISheetDefine, IVTableSheetOptions };

package/cjs/index.js

@@ -47,4 +47,4 @@ exports.VTable = VTable;
 
 const style_manager_1 = require("./styles/style-manager");
 
-exports.version = "1.22.7-alpha.7", (0, style_manager_1.importStyles)();
+exports.version = "1.22.7-alpha.9", (0, style_manager_1.importStyles)();

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6EAAoD;AAW3C,sBAXF,sBAAW,CAWE;AATpB,kDAAoC;AASd,sBAAK;AAR3B,iDAAmC;AAQN,wBAAM;AAPnC,0DAAsD;AACzC,QAAA,OAAO,GAAG,gBAAgB,CAAC;AAExC,IAAA,4BAAY,GAAE,CAAC","file":"index.js","sourcesContent":["import VTableSheet from './components/vtable-sheet';\nimport type { ISheetDefine, IVTableSheetOptions } from './ts-types';\nimport * as TYPES from './ts-types';\nimport * as VTable from './vtable';\nimport { importStyles } from './styles/style-manager';\nexport const version = \"1.22.7-alpha.7\";\n// 导入样式\nimportStyles();\n/**\n * @namespace VTableSheet\n */\nexport { VTableSheet, TYPES, VTable, ISheetDefine, IVTableSheetOptions };\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6EAAoD;AAW3C,sBAXF,sBAAW,CAWE;AATpB,kDAAoC;AASd,sBAAK;AAR3B,iDAAmC;AAQN,wBAAM;AAPnC,0DAAsD;AACzC,QAAA,OAAO,GAAG,gBAAgB,CAAC;AAExC,IAAA,4BAAY,GAAE,CAAC","file":"index.js","sourcesContent":["import VTableSheet from './components/vtable-sheet';\nimport type { ISheetDefine, IVTableSheetOptions } from './ts-types';\nimport * as TYPES from './ts-types';\nimport * as VTable from './vtable';\nimport { importStyles } from './styles/style-manager';\nexport const version = \"1.22.7-alpha.9\";\n// 导入样式\nimportStyles();\n/**\n * @namespace VTableSheet\n */\nexport { VTableSheet, TYPES, VTable, ISheetDefine, IVTableSheetOptions };\n"]}

package/cjs/tools/index.js

@@ -12,5 +12,4 @@ function isPropertyWritable(obj, prop) {
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.isPropertyWritable = exports.checkTabTitle = void 0, exports.checkTabTitle = checkTabTitle, 
-exports.isPropertyWritable = isPropertyWritable;
-//# sourceMappingURL=index.js.map
+exports.isPropertyWritable = isPropertyWritable;

package/cjs/ts-types/event.js

@@ -7,4 +7,5 @@ Object.defineProperty(exports, "__esModule", {
 }), exports.WorkSheetEventType = void 0, function(WorkSheetEventType) {
     WorkSheetEventType.CELL_CLICK = "cell-click", WorkSheetEventType.CELL_VALUE_CHANGED = "cell-value-changed", 
     WorkSheetEventType.SELECTION_CHANGED = "selection-changed", WorkSheetEventType.SELECTION_END = "selection-end";
-}(WorkSheetEventType = exports.WorkSheetEventType || (exports.WorkSheetEventType = {}));
+}(WorkSheetEventType = exports.WorkSheetEventType || (exports.WorkSheetEventType = {}));
+//# sourceMappingURL=event.js.map

package/dist/vtable-sheet.js

@@ -55316,6 +55316,7 @@
       }
       setScrollTop(top, event, triggerEvent = !0) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        if (!this.table || !this.table.scenegraph) return;
         const totalHeight = this.table.getAllRowsHeight(),
           sizeTolerance = (null === (_a = this.table.options.customConfig) || void 0 === _a ? void 0 : _a._disableColumnAndRowSizeRound) ? 1 : 0;
         top = Math.max(0, Math.min(top, totalHeight - (null !== (_c = null === (_b = this.table.scenegraph) || void 0 === _b ? void 0 : _b.height) && void 0 !== _c ? _c : 0) - sizeTolerance)), top = Math.ceil(top);
@@ -59755,7 +59756,7 @@
       }
       constructor(container, options = {}) {
         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;
-        if (super(), this.showFrozenIcon = !0, this.version = "1.22.7-alpha.7", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), "node" === Env$1.mode ? (options = container, container = null) : container instanceof HTMLElement || (options = container, container = container.container ? container.container : null), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
+        if (super(), this.showFrozenIcon = !0, this.version = "1.22.7-alpha.9", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), "node" === Env$1.mode ? (options = container, container = null) : container instanceof HTMLElement || (options = container, container = container.container ? container.container : null), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
         this.pluginManager = new PluginManager(this, options), this.fireListeners(TABLE_EVENT_TYPE.BEFORE_INIT, {
           options: options,
           container: container
@@ -72768,10 +72769,14 @@
           newFilter = new Map(state.filters);
         switch (type) {
           case FilterActionType.ADD_FILTER:
-            newFilter.set(payload.field, payload);
+            payload.shouldKeepUnrelatedState ? newFilter.set(payload.field, Object.assign(Object.assign({}, newFilter.get(payload.field)), payload)) : newFilter.set(payload.field, payload);
             break;
           case FilterActionType.REMOVE_FILTER:
-            newFilter.delete(payload.field);
+            payload.shouldKeepUnrelatedState && "byValue" === payload.type ? (delete newFilter.get(payload.field).values, newFilter.set(payload.field, Object.assign(Object.assign({}, newFilter.get(payload.field)), {
+              enable: !1
+            }))) : payload.shouldKeepUnrelatedState && "byCondition" === payload.type ? (delete newFilter.get(payload.field).condition, delete newFilter.get(payload.field).operator, newFilter.set(payload.field, Object.assign(Object.assign({}, newFilter.get(payload.field)), {
+              enable: !1
+            }))) : newFilter.delete(payload.field);
             break;
           case FilterActionType.UPDATE_FILTER:
             newFilter.set(payload.field, Object.assign(Object.assign({}, newFilter.get(payload.field)), payload));
@@ -72978,34 +72983,6 @@
           }
         }), this.candidateKeys.set(fieldId, countMap), this.toUnformattedCache.set(fieldId, toUnformatted);
       }
-      syncRulesAndCandidateKeys() {
-        const currentRecords = this.table.internalProps.dataSource.records,
-          filteredFields = this.filterStateManager.getActiveFilterFields();
-        currentRecords.forEach(record => {
-          filteredFields.forEach(candidateField => {
-            var _a, _b;
-            const formatFn = this.getFormatFnCache(candidateField);
-            if (isValid$4(record)) {
-              const originalValue = record[candidateField],
-                formattedValue = formatFn(record);
-              !(this.toUnformattedCache.get(candidateField) || new Map()).has(formattedValue) && (null === (_b = null === (_a = this.filterStateManager.getFilterState(candidateField)) || void 0 === _a ? void 0 : _a.values) || void 0 === _b ? void 0 : _b.length) > 0 && (this.filterStateManager.getFilterState(candidateField).values.push(originalValue), this.selectedKeys.get(candidateField).add(originalValue));
-            }
-          });
-        });
-      }
-      syncSelectedKeys() {
-        const currentRecords = this.table.internalProps.dataSource.records,
-          filteredFields = this.filterStateManager.getActiveFilterFields();
-        currentRecords.forEach(record => {
-          filteredFields.forEach(candidateField => {
-            var _a;
-            if (isValid$4(record)) {
-              const originalValue = record[candidateField];
-              "byCondition" === (null === (_a = this.filterStateManager.getFilterState(candidateField)) || void 0 === _a ? void 0 : _a.type) && (this.selectedKeys.get(candidateField) || this.selectedKeys.set(candidateField, new Set()), this.selectedKeys.get(candidateField).add(originalValue));
-            }
-          });
-        });
-      }
       collectCandidateKeysForFilteredColumn(candidateField) {
         var _a, _b;
         const syncFilterItemsState = null === (_b = null === (_a = this.pluginOptions) || void 0 === _a ? void 0 : _a.syncFilterItemsState) || void 0 === _b || _b,
@@ -73054,8 +73031,8 @@
         const isHasFilteredState = this.filterStateManager.getActiveFilterFields(),
           isValueFilter = "byValue" === (null === (_a = this.filterStateManager.getFilterState(fieldId)) || void 0 === _a ? void 0 : _a.type);
         if (isHasFilteredState && isValueFilter) return;
-        let selectedValues = new Set();
-        const originalValues = new Set();
+        const selectedValues = new Set(),
+          originalValues = new Set();
         this.table.internalProps.records.forEach(record => {
           isValid$4(record) && originalValues.add(record[fieldId]);
         });
@@ -73063,37 +73040,52 @@
           this.table.internalProps.dataSource.records.forEach(record => {
             isValid$4(record) && selectedValues.add(record[fieldId]);
           });
+          !arrayEqual(Array.from(originalValues), Array.from(selectedValues)) && (this.selectedKeys.set(fieldId, selectedValues), this.filterStateManager.dispatch({
+            type: FilterActionType.ADD_FILTER,
+            payload: {
+              field: fieldId,
+              type: "byValue",
+              values: Array.from(selectedValues),
+              enable: !0
+            }
+          }));
         } else {
-          const selectedFromRules = (null === (_d = this.filterStateManager.getFilterState(fieldId)) || void 0 === _d ? void 0 : _d.values) || originalValues;
-          selectedValues = new Set(selectedFromRules);
+          const selectedRules = null === (_d = this.filterStateManager.getFilterState(fieldId)) || void 0 === _d ? void 0 : _d.values;
+          if (selectedRules) {
+            !arrayEqual(Array.from(originalValues), selectedRules) && (this.selectedKeys.set(fieldId, new Set(selectedRules)), this.filterStateManager.dispatch({
+              type: FilterActionType.ADD_FILTER,
+              payload: {
+                field: fieldId,
+                type: "byValue",
+                values: selectedRules,
+                enable: !0,
+                shouldKeepUnrelatedState: !0
+              }
+            }));
+          } else this.selectedKeys.set(fieldId, originalValues);
         }
-        this.selectedKeys.set(fieldId, selectedValues);
-        !arrayEqual(Array.from(originalValues), Array.from(selectedValues)) && this.filterStateManager.dispatch({
-          type: FilterActionType.ADD_FILTER,
-          payload: {
-            field: fieldId,
-            type: "byValue",
-            values: Array.from(selectedValues),
-            enable: !0
-          }
-        });
       }
       applyFilter(fieldId = this.selectedField) {
+        var _a, _b;
         const options = this.valueFilterOptionList.get(fieldId);
         if (!options || 0 === options.length) return;
         const selections = options.map(option => option.checkbox.checked ? option.originalValue : null).filter(key => null !== key).flat();
-        this.selectedKeys.set(fieldId, new Set(selections)), selections.length >= 0 && selections.length < this.valueFilterOptionList.get(fieldId).length ? this.filterStateManager.dispatch({
+        this.selectedKeys.set(fieldId, new Set(selections));
+        const syncFilterItemsState = null === (_b = null === (_a = this.pluginOptions) || void 0 === _a ? void 0 : _a.syncFilterItemsState) || void 0 === _b || _b;
+        selections.length >= 0 && selections.length < this.valueFilterOptionList.get(fieldId).length || !syncFilterItemsState ? this.filterStateManager.dispatch({
           type: FilterActionType.APPLY_FILTERS,
           payload: {
             field: fieldId,
             type: "byValue",
             values: selections,
-            enable: !0
+            enable: !0,
+            shouldKeepUnrelatedState: !syncFilterItemsState
           }
         }) : this.filterStateManager.dispatch({
           type: FilterActionType.REMOVE_FILTER,
           payload: {
-            field: fieldId
+            field: fieldId,
+            type: "byValue"
           }
         });
       }
@@ -73300,8 +73292,8 @@
     }];
 
     class ConditionFilter {
-      constructor(table, filterStateManager, pluginOptions) {
-        this.currentCategory = FilterOperatorCategory.ALL, this.categories = [], this.operators = [], this.table = table, this.filterStateManager = filterStateManager, this.pluginOptions = pluginOptions, this.styles = pluginOptions.styles || {}, this.categories = pluginOptions.conditionCategories, this.operators = operators;
+      constructor(table, filterStateManager, pluginOptions, filterToolBarHide) {
+        this.currentCategory = FilterOperatorCategory.ALL, this.categories = [], this.operators = [], this.table = table, this.filterStateManager = filterStateManager, this.pluginOptions = pluginOptions, this.styles = pluginOptions.styles || {}, this.categories = pluginOptions.conditionCategories, this.operators = operators, this.filterToolBarHide = filterToolBarHide;
       }
       setSelectedField(fieldId) {
         this.selectedField = fieldId, this.updateOperatorOptions(), this.loadCurrentFilterState();
@@ -73324,10 +73316,10 @@
         this.categorySelect && (this.currentCategory = this.categorySelect.value, this.updateOperatorOptions(), this.syncUIState());
       }
       loadCurrentFilterState() {
-        var _a, _b;
+        var _a, _b, _c, _d;
         const filter = this.filterStateManager.getFilterState(this.selectedField),
           syncFilterItemsState = null === (_b = null === (_a = this.pluginOptions) || void 0 === _a ? void 0 : _a.syncFilterItemsState) || void 0 === _b || _b;
-        !filter || "byCondition" !== filter.type && syncFilterItemsState ? this.reset() : (filter.operator && this.operatorSelect && (this.operatorSelect.value = filter.operator), void 0 !== filter.condition && this.valueInput && (Array.isArray(filter.condition) ? (this.valueInput.value = String(filter.condition[0]), this.valueInputMax && (this.valueInputMax.value = String(filter.condition[1]))) : (this.valueInput.value = String(filter.condition), this.valueInputMax && (this.valueInputMax.value = ""))), this.syncUIState());
+        filter && "byCondition" === filter.type || !syncFilterItemsState ? (this.operatorSelect && (this.operatorSelect.value = null !== (_c = null == filter ? void 0 : filter.operator) && void 0 !== _c ? _c : operators[0].value), this.valueInput && (Array.isArray(null == filter ? void 0 : filter.condition) ? (this.valueInput.value = String(filter.condition[0]), this.valueInputMax && (this.valueInputMax.value = String(filter.condition[1]))) : (this.valueInput.value = String(null !== (_d = null == filter ? void 0 : filter.condition) && void 0 !== _d ? _d : ""), this.valueInputMax && (this.valueInputMax.value = ""))), this.syncUIState()) : this.reset();
       }
       reset() {
         this.operatorSelect && (this.operatorSelect.selectedIndex = 0), this.valueInput && (this.valueInput.value = "", this.valueInput.placeholder = "请输入筛选值"), this.valueInputMax && (this.valueInputMax.value = ""), this.currentCategory = FilterOperatorCategory.ALL, this.categorySelect && (this.categorySelect.value = FilterOperatorCategory.ALL), this.updateOperatorOptions(), this.syncUIState();
@@ -73345,32 +73337,34 @@
         return "between" === operator || "notBetween" === operator;
       }
       applyFilter(fieldId = this.selectedField) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         if (!this.operatorSelect || !this.valueInput) return;
         const operator = null === (_a = this.operatorSelect) || void 0 === _a ? void 0 : _a.value;
         let conditionValue = null === (_b = this.valueInput) || void 0 === _b ? void 0 : _b.value;
-        if (this.currentCategory !== FilterOperatorCategory.NUMBER || (conditionValue = parseFloat(conditionValue), !isNaN(conditionValue))) {
-          if (this.isRangeOperator(operator)) {
-            const minValue = conditionValue;
-            let maxValue = this.valueInputMax.value.trim();
-            if (this.currentCategory === FilterOperatorCategory.NUMBER) {
-              const numMaxValue = parseFloat(maxValue);
-              if (isNaN(numMaxValue)) return;
-              maxValue = numMaxValue;
-            }
-            conditionValue = [minValue, maxValue];
-          }
-          conditionValue || !1 === conditionValue || 0 === conditionValue || this.isBooleanOperator(operator) ? (this.filterStateManager.dispatch({
-            type: FilterActionType.APPLY_FILTERS,
-            payload: {
-              field: fieldId,
-              type: "byCondition",
-              operator: operator,
-              condition: conditionValue,
-              enable: !0
-            }
-          }), this.hide()) : this.clearFilter(fieldId);
-        }
+        if (this.currentCategory === FilterOperatorCategory.NUMBER && (conditionValue = parseFloat(conditionValue), isNaN(conditionValue))) return;
+        if (this.isRangeOperator(operator)) {
+          const minValue = conditionValue;
+          let maxValue = this.valueInputMax.value.trim();
+          if (this.currentCategory === FilterOperatorCategory.NUMBER) {
+            const numMaxValue = parseFloat(maxValue);
+            if (isNaN(numMaxValue)) return;
+            maxValue = numMaxValue;
+          }
+          conditionValue = [minValue, maxValue];
+        }
+        if (!conditionValue && !1 !== conditionValue && 0 !== conditionValue && !this.isBooleanOperator(operator)) return void this.clearFilter(fieldId);
+        const syncFilterItemsState = null === (_d = null === (_c = this.pluginOptions) || void 0 === _c ? void 0 : _c.syncFilterItemsState) || void 0 === _d || _d;
+        this.filterStateManager.dispatch({
+          type: FilterActionType.APPLY_FILTERS,
+          payload: {
+            field: fieldId,
+            type: "byCondition",
+            operator: operator,
+            condition: conditionValue,
+            enable: !0,
+            shouldKeepUnrelatedState: !syncFilterItemsState
+          }
+        });
       }
       clearFilter(fieldId) {
         this.filterStateManager.dispatch({
@@ -73398,9 +73392,9 @@
       }
       bindEvents() {
         this.valueInput.addEventListener("keypress", event => {
-          "Enter" === event.key && this.applyFilter();
+          "Enter" === event.key && (this.applyFilter(), this.filterToolBarHide());
         }), this.valueInputMax.addEventListener("keypress", event => {
-          "Enter" === event.key && this.applyFilter();
+          "Enter" === event.key && (this.applyFilter(), this.filterToolBarHide());
         }), this.categorySelect.addEventListener("change", () => {
           this.handleCategoryChange();
         }), this.operatorSelect.addEventListener("change", () => {
@@ -73419,7 +73413,12 @@
 
     class FilterToolbar {
       constructor(table, filterStateManager, pluginOptions) {
-        this.valueFilter = null, this.conditionFilter = null, this.activeTab = "byValue", this.isVisible = !1, this.selectedField = null, this.filterModes = [], this.table = table, this.filterStateManager = filterStateManager, this.valueFilter = new ValueFilter(this.table, this.filterStateManager, pluginOptions), this.conditionFilter = new ConditionFilter(this.table, this.filterStateManager, pluginOptions), this.pluginOptions = pluginOptions, this.filterMenuWidth = 300, this.filterStateManager.subscribe(state => {
+        this.valueFilter = null, this.conditionFilter = null, this.activeTab = "byValue", this.isVisible = !1, this.selectedField = null, this.filterModes = [], this.hide = (currentCol, currentRow) => {
+          this.filterMenu.style.display = "none", this.isVisible = !1, this.table.fireListeners(TABLE_EVENT_TYPE.FILTER_MENU_HIDE, {
+            col: null != currentCol ? currentCol : this.currentCol,
+            row: null != currentRow ? currentRow : this.currentRow
+          });
+        }, this.table = table, this.filterStateManager = filterStateManager, this.valueFilter = new ValueFilter(this.table, this.filterStateManager, pluginOptions), this.conditionFilter = new ConditionFilter(this.table, this.filterStateManager, pluginOptions, this.hide), this.pluginOptions = pluginOptions, this.filterMenuWidth = 300, this.filterStateManager.subscribe(state => {
           this.isVisible && null !== this.selectedField && this.updateClearFilterButtonState(this.selectedField);
         });
       }
@@ -73432,10 +73431,10 @@
         this.selectedField = field, this.valueFilter && this.valueFilter.setSelectedField(field), this.conditionFilter && this.conditionFilter.setSelectedField(field);
       }
       applyFilter(field) {
-        "byValue" === this.activeTab ? this.valueFilter.applyFilter(field) : "byCondition" === this.activeTab && this.conditionFilter.applyFilter(field), this.hide(this.currentCol, this.currentRow);
+        "byValue" === this.activeTab ? this.valueFilter.applyFilter(field) : "byCondition" === this.activeTab && this.conditionFilter.applyFilter(field), this.hide();
       }
       clearFilter(field) {
-        this.valueFilter && this.valueFilter.clearFilter(field), this.conditionFilter && this.conditionFilter.clearFilter(field), this.hide(this.currentCol, this.currentRow);
+        this.valueFilter && this.valueFilter.clearFilter(field), this.conditionFilter && this.conditionFilter.clearFilter(field), this.hide();
       }
       updateClearFilterButtonState(field) {
         const currentFilter = this.filterStateManager.getFilterState(field),
@@ -73462,12 +73461,12 @@
           this.onTabSwitch("byValue");
         }), this.filterTabByCondition.addEventListener("click", () => {
           this.onTabSwitch("byCondition");
-        }), this.cancelFilterButton.addEventListener("click", () => this.hide(this.currentCol, this.currentRow)), this.clearFilterOptionLink.addEventListener("click", e => {
+        }), this.cancelFilterButton.addEventListener("click", () => this.hide()), this.clearFilterOptionLink.addEventListener("click", e => {
           e.preventDefault(), this.clearFilter(this.selectedField);
         }), this.applyFilterButton.addEventListener("click", () => {
           this.applyFilter(this.selectedField);
         }), document.addEventListener("click", () => {
-          this.isVisible && this.hide(this.currentCol, this.currentRow);
+          this.isVisible && this.hide();
         }), this.filterMenu.addEventListener("click", e => {
           e.stopPropagation();
         });
@@ -73497,12 +73496,6 @@
           });
         }, 0);
       }
-      hide(currentCol, currentRow) {
-        this.filterMenu.style.display = "none", this.isVisible = !1, this.table.fireListeners(TABLE_EVENT_TYPE.FILTER_MENU_HIDE, {
-          col: currentCol,
-          row: currentRow
-        });
-      }
       destroy() {
         this.valueFilter.destroy(), this.filterMenu.remove();
       }
@@ -91040,7 +91033,7 @@
         importStyle();
     }
 
-    const version = "1.22.7-alpha.7";
+    const version = "1.22.7-alpha.9";
     importStyles();
 
     exports.TYPES = index;