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

package/dist/vtable-plugins.js

@@ -10376,19 +10376,38 @@ ${recordsStr}
             this.candidateKeys.set(fieldId, countMap);
             this.toUnformattedCache.set(fieldId, toUnformatted);
         }
-        update() {
+        updateBeforeFilter() {
             const currentRecords = this.table.internalProps.dataSource.records;
             const filteredFields = this.filterStateManager.getActiveFilterFields();
             currentRecords.forEach(record => {
                 filteredFields.forEach(candidateField => {
                     const formatFn = this.getFormatFnCache(candidateField);
-                    const originalValue = record[candidateField];
-                    const formattedValue = formatFn(record);
-                    const lastToUnformatted = this.toUnformattedCache.get(candidateField) || new Map();
-                    if (!lastToUnformatted.has(formattedValue) &&
-                        this.filterStateManager.getFilterState(candidateField)?.values?.length > 0) {
-                        this.filterStateManager.getFilterState(candidateField).values.push(originalValue);
-                        this.selectedKeys.get(candidateField).add(originalValue);
+                    if (isValid$2(record)) {
+                        const originalValue = record[candidateField];
+                        const formattedValue = formatFn(record);
+                        const lastToUnformatted = this.toUnformattedCache.get(candidateField) || new Map();
+                        if (!lastToUnformatted.has(formattedValue) &&
+                            this.filterStateManager.getFilterState(candidateField)?.values?.length > 0) {
+                            this.filterStateManager.getFilterState(candidateField).values.push(originalValue);
+                            this.selectedKeys.get(candidateField).add(originalValue);
+                        }
+                    }
+                });
+            });
+        }
+        updateAfterFilter() {
+            const currentRecords = this.table.internalProps.dataSource.records;
+            const filteredFields = this.filterStateManager.getActiveFilterFields();
+            currentRecords.forEach(record => {
+                filteredFields.forEach(candidateField => {
+                    if (isValid$2(record)) {
+                        const originalValue = record[candidateField];
+                        if (this.filterStateManager.getFilterState(candidateField)?.type === 'byCondition') {
+                            if (!this.selectedKeys.get(candidateField)) {
+                                this.selectedKeys.set(candidateField, new Set());
+                            }
+                            this.selectedKeys.get(candidateField).add(originalValue);
+                        }
                     }
                 });
             });
@@ -10411,16 +10430,18 @@ ${recordsStr}
                 }));
             }
             records.forEach(record => {
-                const originalValue = record[candidateField];
-                const formattedValue = formatFn(record);
-                countMap.set(formattedValue, (countMap.get(formattedValue) || 0) + 1);
-                if (formattedValue !== undefined && formattedValue !== null) {
-                    const unformattedSet = toUnformatted.get(formattedValue);
-                    if (unformattedSet !== undefined && unformattedSet !== null) {
-                        unformattedSet.add(originalValue);
-                    }
-                    else {
-                        toUnformatted.set(formattedValue, new Set([originalValue]));
+                if (isValid$2(record)) {
+                    const originalValue = record[candidateField];
+                    const formattedValue = formatFn(record);
+                    countMap.set(formattedValue, (countMap.get(formattedValue) || 0) + 1);
+                    if (formattedValue !== undefined && formattedValue !== null) {
+                        const unformattedSet = toUnformatted.get(formattedValue);
+                        if (unformattedSet !== undefined && unformattedSet !== null) {
+                            unformattedSet.add(originalValue);
+                        }
+                        else {
+                            toUnformatted.set(formattedValue, new Set([originalValue]));
+                        }
                     }
                 }
             });
@@ -10462,11 +10483,15 @@ ${recordsStr}
             const originalValues = new Set();
             const currentRecords = this.table.internalProps.dataSource.records;
             currentRecords.forEach(record => {
-                selectedValues.add(record[fieldId]);
+                if (isValid$2(record)) {
+                    selectedValues.add(record[fieldId]);
+                }
             });
             const originalRecords = this.table.internalProps.records;
             originalRecords.forEach(record => {
-                originalValues.add(record[fieldId]);
+                if (isValid$2(record)) {
+                    originalValues.add(record[fieldId]);
+                }
             });
             const hasFiltered = !arrayEqual(Array.from(originalValues), Array.from(selectedValues));
             if (hasFiltered) {
@@ -11177,6 +11202,13 @@ ${recordsStr}
             applyStyles(this.applyFilterButton, styles.footerButton(true));
             this.valueFilter.updateStyles(styles);
             this.conditionFilter.updateStyles(styles);
+            const currentFilter = this.filterStateManager.getFilterState(this.selectedField);
+            if (currentFilter && currentFilter.type === 'byCondition') {
+                this.onTabSwitch('byCondition');
+            }
+            else {
+                this.onTabSwitch('byValue');
+            }
         }
         attachEventListeners() {
             this.filterTabByValue.addEventListener('click', () => {
@@ -20851,10 +20883,11 @@ ${recordsStr}
             this.filterToolbar.updateStyles(this.pluginOptions.styles);
         }
         update() {
-            this.filterToolbar.valueFilter?.update();
+            this.filterToolbar.valueFilter?.updateBeforeFilter();
             if (this.filterStateManager) {
                 this.reapplyActiveFilters();
             }
+            this.filterToolbar.valueFilter?.updateAfterFilter();
         }
         handleOptionUpdate(options) {
             const currentActiveFields = this.filterStateManager ? this.filterStateManager.getActiveFilterFields() : [];