@visactor/vtable-plugins 1.22.4-alpha.6 → 1.22.4-alpha.8

package/dist/vtable-plugins.js

@@ -10665,8 +10665,6 @@ ${recordsStr}
                 const displayValue = optionDom.originalValue;
                 const rawValue = displayToRawMap ? displayToRawMap.get(displayValue) : displayValue;
                 optionDom.checkbox.checked = selectedRawValues.some(v => v === rawValue);
-                const count = this.uniqueKeys.get(filter.field)?.find(key => String(key.value) === optionDom.id)?.count || 0;
-                optionDom.checkbox.disabled = count === 0;
             });
         }
         syncSelectAllWithFilterState(filter) {
@@ -10769,12 +10767,11 @@ ${recordsStr}
                 checkbox.type = 'checkbox';
                 checkbox.value = String(value);
                 checkbox.checked = selectedRawValueSet.has(rawValue);
-                checkbox.disabled = count === 0;
                 applyStyles(checkbox, this.styles.checkbox);
                 const countSpan = document.createElement('span');
                 countSpan.textContent = String(count);
                 applyStyles(countSpan, this.styles.countSpan);
-                label.append(checkbox, ` ${value}`);
+                label.append(checkbox, ` ${rawValue}`);
                 itemDiv.append(label, countSpan);
                 this.filterItemsContainer.appendChild(itemDiv);
                 const itemDom = {
@@ -10800,19 +10797,46 @@ ${recordsStr}
                 const target = event.target;
                 if (target instanceof HTMLInputElement && target.type === 'checkbox') {
                     if (target === this.selectAllCheckbox) {
-                        this.toggleSelectAll(this.selectedField, this.selectAllCheckbox.checked);
+                        this.valueFilterOptionList.get(this.selectedField).forEach(item => (item.checkbox.checked = target.checked));
                     }
                     else {
-                        const checkbox = target;
-                        const checked = checkbox.checked;
-                        const value = this.valueFilterOptionList
-                            .get(this.selectedField)
-                            ?.find(item => item.id === checkbox.value)?.originalValue;
-                        this.onValueSelect(this.selectedField, value, checked);
+                        this.updateCheckboxUI(this.selectedField);
                     }
                 }
             });
         }
+        updateCheckboxUI(field) {
+            const checkedItem = this.valueFilterOptionList.get(field)?.filter(item => item.checkbox.checked);
+            const uncheckedItem = this.valueFilterOptionList.get(field)?.filter(item => !item.checkbox.checked);
+            if (!isValid$2(checkedItem) || !isValid$2(uncheckedItem)) {
+                return;
+            }
+            if (checkedItem.length !== 0 && uncheckedItem.length !== 0) {
+                this.selectAllCheckbox.indeterminate = true;
+            }
+            else {
+                this.selectAllCheckbox.indeterminate = false;
+                this.selectAllCheckbox.checked = uncheckedItem.length === 0;
+            }
+        }
+        updateCheckboxState(field) {
+            const originalValues = this.valueFilterOptionList
+                .get(field)
+                ?.filter(item => item.checkbox.checked)
+                .map(item => item.originalValue);
+            const displayToRawMap = this.displayToRawValueMap.get(field);
+            const rawValues = originalValues.map((displayValue) => {
+                return displayToRawMap ? displayToRawMap.get(displayValue) : displayValue;
+            });
+            this.filterStateManager.dispatch({
+                type: exports.FilterActionType.ADD_FILTER,
+                payload: {
+                    field: field,
+                    type: 'byValue',
+                    values: rawValues
+                }
+            });
+        }
         show() {
             this.collectUniqueColumnValues(this.selectedField);
             this.updateCandidateCounts(this.selectedField);
@@ -10826,6 +10850,7 @@ ${recordsStr}
                 this.filterByValueSearchInput.value = '';
             }
             this.renderFilterOptions(this.selectedField);
+            this.updateCheckboxUI(this.selectedField);
             this.filterByValuePanel.style.display = 'block';
         }
         hide() {
@@ -11209,12 +11234,13 @@ ${recordsStr}
         }
         applyFilter(field) {
             if (this.activeTab === 'byValue') {
+                this.valueFilter.updateCheckboxState(field);
                 this.valueFilter.applyFilter(field);
             }
             else if (this.activeTab === 'byCondition') {
                 this.conditionFilter.applyFilter(field);
             }
-            this.hide();
+            this.hide(this.currentCol, this.currentRow);
         }
         clearFilter(field) {
             if (this.valueFilter) {
@@ -11223,7 +11249,7 @@ ${recordsStr}
             if (this.conditionFilter) {
                 this.conditionFilter.clearFilter(field);
             }
-            this.hide();
+            this.hide(this.currentCol, this.currentRow);
         }
         updateClearFilterButtonState(field) {
             const currentFilter = this.filterStateManager.getFilterState(field);
@@ -11276,7 +11302,7 @@ ${recordsStr}
             this.filterTabByCondition.addEventListener('click', () => {
                 this.onTabSwitch('byCondition');
             });
-            this.cancelFilterButton.addEventListener('click', () => this.hide());
+            this.cancelFilterButton.addEventListener('click', () => this.hide(this.currentCol, this.currentRow));
             this.clearFilterOptionLink.addEventListener('click', e => {
                 e.preventDefault();
                 this.clearFilter(this.selectedField);
@@ -11286,7 +11312,7 @@ ${recordsStr}
             });
             document.addEventListener('click', () => {
                 if (this.isVisible) {
-                    this.hide();
+                    this.hide(this.currentCol, this.currentRow);
                 }
             });
             this.filterMenu.addEventListener('click', e => {
@@ -11348,11 +11374,19 @@ ${recordsStr}
             this.updateClearFilterButtonState(field);
             setTimeout(() => {
                 this.isVisible = true;
+                this.table.fireListeners(VTable.TABLE_EVENT_TYPE.FILTER_MENU_SHOW, {
+                    col: col,
+                    row: row
+                });
             }, 0);
         }
-        hide() {
+        hide(currentCol, currentRow) {
             this.filterMenu.style.display = 'none';
             this.isVisible = false;
+            this.table.fireListeners(VTable.TABLE_EVENT_TYPE.FILTER_MENU_HIDE, {
+                col: currentCol,
+                row: currentRow
+            });
         }
     }
 
@@ -20909,18 +20943,10 @@ ${recordsStr}
                 const col = eventArgs.col;
                 const row = eventArgs.row;
                 if (this.filterToolbar.isVisible) {
-                    this.filterToolbar.hide();
-                    this.table.fireListeners(VTable.TABLE_EVENT_TYPE.FILTER_MENU_HIDE, {
-                        col: eventArgs.col,
-                        row: eventArgs.row
-                    });
+                    this.filterToolbar.hide(eventArgs.col, eventArgs.row);
                 }
                 else {
                     this.filterToolbar.show(col, row, this.pluginOptions.filterModes);
-                    this.table.fireListeners(VTable.TABLE_EVENT_TYPE.FILTER_MENU_SHOW, {
-                        col: eventArgs.col,
-                        row: eventArgs.row
-                    });
                 }
             }
             else if (runtime === VTable.TABLE_EVENT_TYPE.SCROLL) {