@visactor/vtable-sheet 1.22.7-alpha.2 → 1.22.7-alpha.3

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.2";
+export declare const version = "1.22.7-alpha.3";
 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.2", (0, style_manager_1.importStyles)();
+exports.version = "1.22.7-alpha.3", (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.2\";\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.3\";\n// 导入样式\nimportStyles();\n/**\n * @namespace VTableSheet\n */\nexport { VTableSheet, TYPES, VTable, ISheetDefine, IVTableSheetOptions };\n"]}

package/dist/vtable-sheet.js

@@ -59755,7 +59755,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.2", 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.3", 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
@@ -72975,16 +72975,31 @@
           }
         }), this.candidateKeys.set(fieldId, countMap), this.toUnformattedCache.set(fieldId, toUnformatted);
       }
-      update() {
+      updateBeforeFilter() {
         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),
-              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));
+            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));
+            }
+          });
+        });
+      }
+      updateAfterFilter() {
+        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));
+            }
           });
         });
       }
@@ -73000,11 +73015,13 @@
           records = this.table.internalProps.records.filter(record => filteredFields.every(field => this.selectedKeys.get(field).has(record[field])));
         } else records = this.table.internalProps.records;
         records.forEach(record => {
-          const originalValue = record[candidateField],
-            formattedValue = formatFn(record);
-          if (countMap.set(formattedValue, (countMap.get(formattedValue) || 0) + 1), null != formattedValue) {
-            const unformattedSet = toUnformatted.get(formattedValue);
-            null != unformattedSet ? unformattedSet.add(originalValue) : toUnformatted.set(formattedValue, new Set([originalValue]));
+          if (isValid$4(record)) {
+            const originalValue = record[candidateField],
+              formattedValue = formatFn(record);
+            if (countMap.set(formattedValue, (countMap.get(formattedValue) || 0) + 1), null != formattedValue) {
+              const unformattedSet = toUnformatted.get(formattedValue);
+              null != unformattedSet ? unformattedSet.add(originalValue) : toUnformatted.set(formattedValue, new Set([originalValue]));
+            }
           }
         }), this.candidateKeys.set(candidateField, countMap), this.toUnformattedCache.set(candidateField, toUnformatted);
       }
@@ -73034,10 +73051,10 @@
         const selectedValues = new Set(),
           originalValues = new Set();
         this.table.internalProps.dataSource.records.forEach(record => {
-          selectedValues.add(record[fieldId]);
+          isValid$4(record) && selectedValues.add(record[fieldId]);
         });
         this.table.internalProps.records.forEach(record => {
-          originalValues.add(record[fieldId]);
+          isValid$4(record) && originalValues.add(record[fieldId]);
         });
         !arrayEqual(Array.from(originalValues), Array.from(selectedValues)) && (this.selectedKeys.set(fieldId, selectedValues), this.filterStateManager.dispatch({
           type: FilterActionType.ADD_FILTER,
@@ -73419,6 +73436,8 @@
       }
       updateStyles(styles) {
         applyStyles(this.filterMenu, styles.filterMenu), applyStyles(this.filterTabsContainer, styles.tabsContainer), applyStyles(this.filterTabByValue, styles.tabStyle(!0)), applyStyles(this.footerContainer, styles.footerContainer), applyStyles(this.clearFilterOptionLink, styles.clearLink), applyStyles(this.cancelFilterButton, styles.footerButton(!1)), applyStyles(this.applyFilterButton, styles.footerButton(!0)), this.valueFilter.updateStyles(styles), this.conditionFilter.updateStyles(styles);
+        const currentFilter = this.filterStateManager.getFilterState(this.selectedField);
+        currentFilter && "byCondition" === currentFilter.type ? this.onTabSwitch("byCondition") : this.onTabSwitch("byValue");
       }
       attachEventListeners() {
         this.filterTabByValue.addEventListener("click", () => {
@@ -82981,8 +83000,8 @@
         this.pluginOptions = lodashExports.merge(this.pluginOptions, pluginOptions), this.filterToolbar.updateStyles(this.pluginOptions.styles);
       }
       update() {
-        var _a;
-        null === (_a = this.filterToolbar.valueFilter) || void 0 === _a || _a.update(), this.filterStateManager && this.reapplyActiveFilters();
+        var _a, _b;
+        null === (_a = this.filterToolbar.valueFilter) || void 0 === _a || _a.updateBeforeFilter(), this.filterStateManager && this.reapplyActiveFilters(), null === (_b = this.filterToolbar.valueFilter) || void 0 === _b || _b.updateAfterFilter();
       }
       handleOptionUpdate(options) {
         const currentActiveFields = this.filterStateManager ? this.filterStateManager.getActiveFilterFields() : [];
@@ -91001,7 +91020,7 @@
         importStyle();
     }
 
-    const version = "1.22.7-alpha.2";
+    const version = "1.22.7-alpha.3";
     importStyles();
 
     exports.TYPES = index;