zartui 3.1.63 → 3.1.65

package/lib/zartui.cjs.js

@@ -16941,6 +16941,7 @@ const multiplePickerProps = {
   showToolbar: truthProp,
   showTitle: truthProp,
   options: makeArrayProp(),
+  filteredOptions: makeArrayProp(),
   toolbarPosition: makeStringProp("bottom"),
   textKey: makeStringProp("text"),
   columnCounts: makeNumberProp(3),
@@ -16960,13 +16961,33 @@ var stdin_default$A = vue.defineComponent({
     const currentOptions2 = vue.ref(props.options);
     const currentSelectedIndex = vue.computed(() => props.selectedIndex);
     const currentSelectedValue = vue.computed(() => props.selectedValue);
+    const allSelectedOptions = vue.ref([]);
     const confirmIndexes = vue.ref(props.selectedIndex);
     const confirmValues = vue.ref(props.selectedValue);
+    const displayOptions = vue.computed(() => {
+      return props.filteredOptions && props.filteredOptions.length > 0 ? props.filteredOptions : currentOptions2.value;
+    });
+    const displaySelectedIndexes = vue.computed(() => {
+      if (!props.filteredOptions || props.filteredOptions.length === 0) {
+        return confirmIndexes.value;
+      }
+      const selectedValues = new Set(confirmIndexes.value.filter((idx) => idx >= 0 && idx < currentOptions2.value.length).map((idx) => {
+        var _a;
+        return (_a = currentOptions2.value[idx]) == null ? void 0 : _a.value;
+      }));
+      const result = [];
+      displayOptions.value.forEach((option2, index2) => {
+        if (selectedValues.has(option2.value)) {
+          result.push(index2);
+        }
+      });
+      return result;
+    });
     const isIndeterminate = vue.computed(() => {
-      return confirmIndexes.value.length > 0 && confirmIndexes.value.length < currentOptions2.value.length;
+      return displaySelectedIndexes.value.length > 0 && displaySelectedIndexes.value.length < displayOptions.value.length;
     });
     const isAllSelected = vue.computed(() => {
-      return confirmIndexes.value.length > 0 && confirmIndexes.value.length === currentOptions2.value.length;
+      return displayOptions.value.length > 0 && displaySelectedIndexes.value.length > 0 && displaySelectedIndexes.value.length === displayOptions.value.length;
     });
     const resetOptions = (props2) => {
       currentOptions2.value = props2.options;
@@ -16979,14 +17000,39 @@ var stdin_default$A = vue.defineComponent({
       emit("update:selectedValue", confirmValues.value);
     };
     const onUpdateCurrentIndexes = (newVal) => {
-      confirmIndexes.value = newVal;
-      if (newVal.length > 0) {
+      if (props.filteredOptions && props.filteredOptions.length > 0) {
+        const selectedValues = newVal.filter((idx) => idx >= 0 && idx < displayOptions.value.length).map((idx) => {
+          var _a;
+          return (_a = displayOptions.value[idx]) == null ? void 0 : _a.value;
+        });
+        const newSelectedIndexes = /* @__PURE__ */ new Set();
+        confirmIndexes.value.forEach((idx) => {
+          var _a;
+          if (idx >= 0 && idx < currentOptions2.value.length) {
+            const value = (_a = currentOptions2.value[idx]) == null ? void 0 : _a.value;
+            const isInFilteredList = displayOptions.value.some((opt) => opt.value === value);
+            if (!isInFilteredList) {
+              newSelectedIndexes.add(idx);
+            }
+          }
+        });
+        selectedValues.forEach((value) => {
+          const originalIndex = currentOptions2.value.findIndex((opt) => opt.value === value);
+          if (originalIndex >= 0) {
+            newSelectedIndexes.add(originalIndex);
+          }
+        });
+        confirmIndexes.value = Array.from(newSelectedIndexes);
+      } else {
+        confirmIndexes.value = newVal;
+      }
+      if (confirmIndexes.value.length > 0) {
         getValuesByIndexes();
       } else {
         confirmValues.value = [];
       }
-      getValuesByIndexes();
       emit("update:selectedValue", confirmValues.value);
+      updateAllSelectedOptions();
     };
     const getIndexesByValues = () => {
       var _a;
@@ -17038,20 +17084,27 @@ var stdin_default$A = vue.defineComponent({
     };
     const updateShow = (value) => emit("update:showPicker", value);
     const getOptions = () => {
-      const indexes = confirmIndexes.value;
+      return allSelectedOptions.value;
+    };
+    const onChange = () => {
+      updateAllSelectedOptions();
+      emit("change", getOptions());
+    };
+    const updateAllSelectedOptions = () => {
       const result = [];
+      const indexes = confirmIndexes.value;
       indexes == null ? void 0 : indexes.forEach((index2) => {
         if (index2 > -1 && index2 < currentOptions2.value.length && currentOptions2.value[index2]) {
+          const option2 = currentOptions2.value[index2];
           result.push({
-            [props.textKey]: currentOptions2.value[index2][props.textKey],
-            value: currentOptions2.value[index2].value,
+            [props.textKey]: option2[props.textKey],
+            value: option2.value,
             initialIndex: index2
           });
         }
       });
-      return result;
+      allSelectedOptions.value = result;
     };
-    const onChange = () => emit("change", getOptions());
     const confirm = () => {
       const options = getOptions();
       emit("confirm", options);
@@ -17127,7 +17180,6 @@ var stdin_default$A = vue.defineComponent({
       "class": bem$s("toolbar-checkbox"),
       "shape": "square",
       "modelValue": isAllSelected.value,
-      "onUpdate:modelValue": ($event) => isAllSelected.value = $event,
       "indeterminate": isIndeterminate.value,
       "onClick": handleSelectAll
     }, {
@@ -17136,33 +17188,74 @@ var stdin_default$A = vue.defineComponent({
       "class": bem$s("toolbar-divider")
     }, null), vue.createVNode("span", {
       "class": bem$s("toolbar-checkbox-text")
-    }, [vue.createTextVNode("已选 "), confirmIndexes.value.length])]);
+    }, [vue.createTextVNode("已选 "), allSelectedOptions.value.length])]);
     const handleSelectAll = () => {
-      confirmIndexes.value = !isAllSelected.value ? currentOptions2.value.map((_, index2) => index2) : [];
+      if (!isAllSelected.value) {
+        if (props.filteredOptions && props.filteredOptions.length > 0) {
+          const selectedIndexes = [];
+          displayOptions.value.forEach((option2) => {
+            const originalIndex = currentOptions2.value.findIndex((opt) => opt.value === option2.value);
+            if (originalIndex >= 0) {
+              selectedIndexes.push(originalIndex);
+            }
+          });
+          confirmIndexes.value = selectedIndexes;
+        } else {
+          confirmIndexes.value = currentOptions2.value.map((_, index2) => index2);
+        }
+      } else {
+        confirmIndexes.value = [];
+      }
+      updateAllSelectedOptions();
     };
     const onSelectOther = () => {
-      const temp = Array();
-      currentOptions2.value.forEach((_, index2) => {
-        if (!confirmIndexes.value.includes(index2)) {
-          temp.push(index2);
-        }
-      });
-      confirmIndexes.value = temp;
+      if (props.filteredOptions && props.filteredOptions.length > 0) {
+        const filteredValues = new Set(displayOptions.value.map((opt) => opt.value));
+        const currentSelectedInFiltered = /* @__PURE__ */ new Set();
+        confirmIndexes.value.forEach((idx) => {
+          var _a;
+          if (idx >= 0 && idx < currentOptions2.value.length) {
+            const value = (_a = currentOptions2.value[idx]) == null ? void 0 : _a.value;
+            if (filteredValues.has(value)) {
+              currentSelectedInFiltered.add(idx);
+            }
+          }
+        });
+        const newSelectedIndexes = [];
+        displayOptions.value.forEach((option2) => {
+          const originalIndex = currentOptions2.value.findIndex((opt) => opt.value === option2.value);
+          if (originalIndex >= 0) {
+            if (!currentSelectedInFiltered.has(originalIndex)) {
+              newSelectedIndexes.push(originalIndex);
+            }
+          }
+        });
+        confirmIndexes.value = newSelectedIndexes;
+      } else {
+        const temp = new Array();
+        currentOptions2.value.forEach((_, index2) => {
+          if (!confirmIndexes.value.includes(index2)) {
+            temp.push(index2);
+          }
+        });
+        confirmIndexes.value = temp;
+      }
+      updateAllSelectedOptions();
     };
-    const genOptionItems = vue.computed(() => {
+    const genOptionItems = () => {
       let formatOptions = [];
-      if (currentOptions2.value && currentOptions2.value[0] && typeof currentOptions2.value[0] !== "object") {
-        formatOptions = currentOptions2.value.map((v) => ({
+      if (displayOptions.value && displayOptions.value[0] && typeof displayOptions.value[0] !== "object") {
+        formatOptions = displayOptions.value.map((v) => ({
           value: v,
           text: v
         }));
       } else {
-        formatOptions = currentOptions2.value;
+        formatOptions = displayOptions.value;
       }
       return vue.createVNode(stdin_default$B, {
         "ref": pickerOptions,
-        "currentIndexes": confirmIndexes.value,
-        "onUpdate:currentIndexes": [($event) => confirmIndexes.value = $event, onUpdateCurrentIndexes],
+        "currentIndexes": displaySelectedIndexes.value,
+        "onUpdate:currentIndexes": [($event) => displaySelectedIndexes.value = $event, onUpdateCurrentIndexes],
         "columnCounts": props.columnCounts,
         "initialOptions": formatOptions,
         "allowHtml": props.allowHtml,
@@ -17173,10 +17266,10 @@ var stdin_default$A = vue.defineComponent({
       }, {
         option: slots.option
       });
-    });
+    };
     const genOptions2 = () => vue.createVNode("div", {
       "class": bem$s("options")
-    }, [genOptionItems.value]);
+    }, [genOptionItems()]);
     const renderMultiplePicker = () => vue.createVNode("div", {
       "class": bem$s()
     }, [genTitle(), props.loading ? vue.createVNode(stdin_default$1T, {
@@ -23269,7 +23362,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.1.63";
+const version = "3.1.65";
 function install(app) {
   const components = [
     ActionSheet,

package/lib/zartui.es.js

@@ -16939,6 +16939,7 @@ const multiplePickerProps = {
   showToolbar: truthProp,
   showTitle: truthProp,
   options: makeArrayProp(),
+  filteredOptions: makeArrayProp(),
   toolbarPosition: makeStringProp("bottom"),
   textKey: makeStringProp("text"),
   columnCounts: makeNumberProp(3),
@@ -16958,13 +16959,33 @@ var stdin_default$A = defineComponent({
     const currentOptions2 = ref(props.options);
     const currentSelectedIndex = computed(() => props.selectedIndex);
     const currentSelectedValue = computed(() => props.selectedValue);
+    const allSelectedOptions = ref([]);
     const confirmIndexes = ref(props.selectedIndex);
     const confirmValues = ref(props.selectedValue);
+    const displayOptions = computed(() => {
+      return props.filteredOptions && props.filteredOptions.length > 0 ? props.filteredOptions : currentOptions2.value;
+    });
+    const displaySelectedIndexes = computed(() => {
+      if (!props.filteredOptions || props.filteredOptions.length === 0) {
+        return confirmIndexes.value;
+      }
+      const selectedValues = new Set(confirmIndexes.value.filter((idx) => idx >= 0 && idx < currentOptions2.value.length).map((idx) => {
+        var _a;
+        return (_a = currentOptions2.value[idx]) == null ? void 0 : _a.value;
+      }));
+      const result = [];
+      displayOptions.value.forEach((option2, index2) => {
+        if (selectedValues.has(option2.value)) {
+          result.push(index2);
+        }
+      });
+      return result;
+    });
     const isIndeterminate = computed(() => {
-      return confirmIndexes.value.length > 0 && confirmIndexes.value.length < currentOptions2.value.length;
+      return displaySelectedIndexes.value.length > 0 && displaySelectedIndexes.value.length < displayOptions.value.length;
     });
     const isAllSelected = computed(() => {
-      return confirmIndexes.value.length > 0 && confirmIndexes.value.length === currentOptions2.value.length;
+      return displayOptions.value.length > 0 && displaySelectedIndexes.value.length > 0 && displaySelectedIndexes.value.length === displayOptions.value.length;
     });
     const resetOptions = (props2) => {
       currentOptions2.value = props2.options;
@@ -16977,14 +16998,39 @@ var stdin_default$A = defineComponent({
       emit("update:selectedValue", confirmValues.value);
     };
     const onUpdateCurrentIndexes = (newVal) => {
-      confirmIndexes.value = newVal;
-      if (newVal.length > 0) {
+      if (props.filteredOptions && props.filteredOptions.length > 0) {
+        const selectedValues = newVal.filter((idx) => idx >= 0 && idx < displayOptions.value.length).map((idx) => {
+          var _a;
+          return (_a = displayOptions.value[idx]) == null ? void 0 : _a.value;
+        });
+        const newSelectedIndexes = /* @__PURE__ */ new Set();
+        confirmIndexes.value.forEach((idx) => {
+          var _a;
+          if (idx >= 0 && idx < currentOptions2.value.length) {
+            const value = (_a = currentOptions2.value[idx]) == null ? void 0 : _a.value;
+            const isInFilteredList = displayOptions.value.some((opt) => opt.value === value);
+            if (!isInFilteredList) {
+              newSelectedIndexes.add(idx);
+            }
+          }
+        });
+        selectedValues.forEach((value) => {
+          const originalIndex = currentOptions2.value.findIndex((opt) => opt.value === value);
+          if (originalIndex >= 0) {
+            newSelectedIndexes.add(originalIndex);
+          }
+        });
+        confirmIndexes.value = Array.from(newSelectedIndexes);
+      } else {
+        confirmIndexes.value = newVal;
+      }
+      if (confirmIndexes.value.length > 0) {
         getValuesByIndexes();
       } else {
         confirmValues.value = [];
       }
-      getValuesByIndexes();
       emit("update:selectedValue", confirmValues.value);
+      updateAllSelectedOptions();
     };
     const getIndexesByValues = () => {
       var _a;
@@ -17036,20 +17082,27 @@ var stdin_default$A = defineComponent({
     };
     const updateShow = (value) => emit("update:showPicker", value);
     const getOptions = () => {
-      const indexes = confirmIndexes.value;
+      return allSelectedOptions.value;
+    };
+    const onChange = () => {
+      updateAllSelectedOptions();
+      emit("change", getOptions());
+    };
+    const updateAllSelectedOptions = () => {
       const result = [];
+      const indexes = confirmIndexes.value;
       indexes == null ? void 0 : indexes.forEach((index2) => {
         if (index2 > -1 && index2 < currentOptions2.value.length && currentOptions2.value[index2]) {
+          const option2 = currentOptions2.value[index2];
           result.push({
-            [props.textKey]: currentOptions2.value[index2][props.textKey],
-            value: currentOptions2.value[index2].value,
+            [props.textKey]: option2[props.textKey],
+            value: option2.value,
             initialIndex: index2
           });
         }
       });
-      return result;
+      allSelectedOptions.value = result;
     };
-    const onChange = () => emit("change", getOptions());
     const confirm = () => {
       const options = getOptions();
       emit("confirm", options);
@@ -17125,7 +17178,6 @@ var stdin_default$A = defineComponent({
       "class": bem$s("toolbar-checkbox"),
       "shape": "square",
       "modelValue": isAllSelected.value,
-      "onUpdate:modelValue": ($event) => isAllSelected.value = $event,
       "indeterminate": isIndeterminate.value,
       "onClick": handleSelectAll
     }, {
@@ -17134,33 +17186,74 @@ var stdin_default$A = defineComponent({
       "class": bem$s("toolbar-divider")
     }, null), createVNode("span", {
       "class": bem$s("toolbar-checkbox-text")
-    }, [createTextVNode("已选 "), confirmIndexes.value.length])]);
+    }, [createTextVNode("已选 "), allSelectedOptions.value.length])]);
     const handleSelectAll = () => {
-      confirmIndexes.value = !isAllSelected.value ? currentOptions2.value.map((_, index2) => index2) : [];
+      if (!isAllSelected.value) {
+        if (props.filteredOptions && props.filteredOptions.length > 0) {
+          const selectedIndexes = [];
+          displayOptions.value.forEach((option2) => {
+            const originalIndex = currentOptions2.value.findIndex((opt) => opt.value === option2.value);
+            if (originalIndex >= 0) {
+              selectedIndexes.push(originalIndex);
+            }
+          });
+          confirmIndexes.value = selectedIndexes;
+        } else {
+          confirmIndexes.value = currentOptions2.value.map((_, index2) => index2);
+        }
+      } else {
+        confirmIndexes.value = [];
+      }
+      updateAllSelectedOptions();
     };
     const onSelectOther = () => {
-      const temp = Array();
-      currentOptions2.value.forEach((_, index2) => {
-        if (!confirmIndexes.value.includes(index2)) {
-          temp.push(index2);
-        }
-      });
-      confirmIndexes.value = temp;
+      if (props.filteredOptions && props.filteredOptions.length > 0) {
+        const filteredValues = new Set(displayOptions.value.map((opt) => opt.value));
+        const currentSelectedInFiltered = /* @__PURE__ */ new Set();
+        confirmIndexes.value.forEach((idx) => {
+          var _a;
+          if (idx >= 0 && idx < currentOptions2.value.length) {
+            const value = (_a = currentOptions2.value[idx]) == null ? void 0 : _a.value;
+            if (filteredValues.has(value)) {
+              currentSelectedInFiltered.add(idx);
+            }
+          }
+        });
+        const newSelectedIndexes = [];
+        displayOptions.value.forEach((option2) => {
+          const originalIndex = currentOptions2.value.findIndex((opt) => opt.value === option2.value);
+          if (originalIndex >= 0) {
+            if (!currentSelectedInFiltered.has(originalIndex)) {
+              newSelectedIndexes.push(originalIndex);
+            }
+          }
+        });
+        confirmIndexes.value = newSelectedIndexes;
+      } else {
+        const temp = new Array();
+        currentOptions2.value.forEach((_, index2) => {
+          if (!confirmIndexes.value.includes(index2)) {
+            temp.push(index2);
+          }
+        });
+        confirmIndexes.value = temp;
+      }
+      updateAllSelectedOptions();
     };
-    const genOptionItems = computed(() => {
+    const genOptionItems = () => {
       let formatOptions = [];
-      if (currentOptions2.value && currentOptions2.value[0] && typeof currentOptions2.value[0] !== "object") {
-        formatOptions = currentOptions2.value.map((v) => ({
+      if (displayOptions.value && displayOptions.value[0] && typeof displayOptions.value[0] !== "object") {
+        formatOptions = displayOptions.value.map((v) => ({
           value: v,
           text: v
         }));
       } else {
-        formatOptions = currentOptions2.value;
+        formatOptions = displayOptions.value;
       }
       return createVNode(stdin_default$B, {
         "ref": pickerOptions,
-        "currentIndexes": confirmIndexes.value,
-        "onUpdate:currentIndexes": [($event) => confirmIndexes.value = $event, onUpdateCurrentIndexes],
+        "currentIndexes": displaySelectedIndexes.value,
+        "onUpdate:currentIndexes": [($event) => displaySelectedIndexes.value = $event, onUpdateCurrentIndexes],
         "columnCounts": props.columnCounts,
         "initialOptions": formatOptions,
         "allowHtml": props.allowHtml,
@@ -17171,10 +17264,10 @@ var stdin_default$A = defineComponent({
       }, {
         option: slots.option
       });
-    });
+    };
     const genOptions2 = () => createVNode("div", {
       "class": bem$s("options")
-    }, [genOptionItems.value]);
+    }, [genOptionItems()]);
     const renderMultiplePicker = () => createVNode("div", {
       "class": bem$s()
     }, [genTitle(), props.loading ? createVNode(stdin_default$1T, {
@@ -23267,7 +23360,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.1.63";
+const version = "3.1.65";
 function install(app) {
   const components = [
     ActionSheet,