zartui 3.1.14 → 3.1.16

package/lib/zartui.cjs.js

@@ -134,6 +134,20 @@ function colorFromCSSClass(className, defaultColor) {
   document.body.removeChild(tmp);
   return !classColor ? defaultColor : classColor;
 }
+const getTargetDom = (target) => {
+  if (target) {
+    if (typeof target === "string") {
+      return document.querySelectorAll(target)[0];
+    }
+    if (typeof target === "function") {
+      return target();
+    }
+    if (typeof target === "object" && target instanceof window.HTMLElement) {
+      return target;
+    }
+  }
+  return document.body;
+};
 const { width: windowWidth, height: windowHeight } = use.useWindowSize();
 function addUnit(value) {
   if (isDef(value)) {
@@ -7193,7 +7207,7 @@ var stdin_default$17 = vue.defineComponent({
         }
       }
       onClose();
-      emit("confirm");
+      emit("confirm", currentValue.value);
     };
     const onOpen = () => {
       var _a, _b, _c;
@@ -14696,7 +14710,8 @@ var stdin_default$z = vue.defineComponent({
         }, [slots.options ? slots.options(option) : vue.createVNode("div", childData, null)]);
       });
     };
-    const setConfirmIndex = (indexes) => {
+    const setConfirmIndex = (data) => {
+      const indexes = deepClone(data);
       state.confirmed = true;
       const keys = Object.keys(indexes);
       currentIndexes.value.length = 0;
@@ -14734,17 +14749,31 @@ const multiplePickerProps = {
   textKey: makeStringProp("text"),
   columnCounts: makeNumberProp(3),
   selectedIndex: makeArrayProp([]),
+  selectedValue: makeArrayProp([]),
   popup: truthProp
 };
 var stdin_default$y = vue.defineComponent({
   name: name$s,
   props: multiplePickerProps,
-  emits: ["cancel", "confirm", "change", "update:showPicker", "update:selectedIndex"],
+  emits: ["cancel", "confirm", "change", "update:showPicker", "update:selectedIndex", "update:selectedValue"],
   setup(props, {
     emit,
     slots
   }) {
     const confirmIndexes = vue.ref(props.selectedIndex);
+    const confirmValues = vue.ref(props.selectedValue);
+    const getIndexesByValues = () => {
+      var _a;
+      if (confirmValues.value && confirmValues.value.length > 0) {
+        confirmIndexes.value.splice(0, confirmIndexes.value.length);
+        (_a = props.options) == null ? void 0 : _a.forEach((option, index) => {
+          if (option.value && confirmValues.value.includes(option.value)) {
+            confirmIndexes.value.push(index);
+          }
+        });
+      }
+    };
+    getIndexesByValues();
     const pickerOptions = vue.ref();
     const currentShow = vue.ref(props.showPicker);
     const DEFAULT_ITEM_HEIGHT = vue.ref(36);
@@ -14752,7 +14781,9 @@ var stdin_default$y = vue.defineComponent({
       if (newValue !== props.showPicker) {
         emit("update:showPicker", newValue);
       }
-      confirmIndexes.value = props.selectedIndex;
+      confirmIndexes.value = deepClone(props.selectedIndex);
+      confirmValues.value = deepClone(props.selectedValue);
+      getIndexesByValues();
     });
     vue.watch(() => props.showPicker, (newValue) => {
       var _a;
@@ -15908,7 +15939,8 @@ const pullRefreshProps = {
   loadingText: String,
   pullDistance: numericProp,
   successDuration: makeNumericProp(500),
-  animationDuration: makeNumericProp(300)
+  animationDuration: makeNumericProp(300),
+  scrollElement: null
 };
 var stdin_default$q = vue.defineComponent({
   name: name$k,
@@ -15921,7 +15953,17 @@ var stdin_default$q = vue.defineComponent({
     let reachTop;
     const root = vue.ref();
     const track = vue.ref();
-    const scrollParent = use.useScrollParent(root);
+    const rootScrollElement = use.useScrollParent(root);
+    const scrollParent = vue.computed(() => {
+      if (props.scrollElement) {
+        const targetDom = getTargetDom(props.scrollElement);
+        if (!targetDom) {
+          console.warn("请检查props scroll-element元素是否存在！");
+        }
+        return targetDom != null ? targetDom : rootScrollElement.value;
+      }
+      return rootScrollElement.value;
+    });
     const state = vue.reactive({
       status: "normal",
       distance: 0,
@@ -20544,7 +20586,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.1.13";
+const version = "3.1.15";
 function install(app) {
   const components = [
     ActionSheet,

package/lib/zartui.es.js

@@ -132,6 +132,20 @@ function colorFromCSSClass(className, defaultColor) {
   document.body.removeChild(tmp);
   return !classColor ? defaultColor : classColor;
 }
+const getTargetDom = (target) => {
+  if (target) {
+    if (typeof target === "string") {
+      return document.querySelectorAll(target)[0];
+    }
+    if (typeof target === "function") {
+      return target();
+    }
+    if (typeof target === "object" && target instanceof window.HTMLElement) {
+      return target;
+    }
+  }
+  return document.body;
+};
 const { width: windowWidth, height: windowHeight } = useWindowSize();
 function addUnit(value) {
   if (isDef(value)) {
@@ -7191,7 +7205,7 @@ var stdin_default$17 = defineComponent({
         }
       }
       onClose();
-      emit("confirm");
+      emit("confirm", currentValue.value);
     };
     const onOpen = () => {
       var _a, _b, _c;
@@ -14694,7 +14708,8 @@ var stdin_default$z = defineComponent({
         }, [slots.options ? slots.options(option) : createVNode("div", childData, null)]);
       });
     };
-    const setConfirmIndex = (indexes) => {
+    const setConfirmIndex = (data) => {
+      const indexes = deepClone(data);
       state.confirmed = true;
       const keys = Object.keys(indexes);
       currentIndexes.value.length = 0;
@@ -14732,17 +14747,31 @@ const multiplePickerProps = {
   textKey: makeStringProp("text"),
   columnCounts: makeNumberProp(3),
   selectedIndex: makeArrayProp([]),
+  selectedValue: makeArrayProp([]),
   popup: truthProp
 };
 var stdin_default$y = defineComponent({
   name: name$s,
   props: multiplePickerProps,
-  emits: ["cancel", "confirm", "change", "update:showPicker", "update:selectedIndex"],
+  emits: ["cancel", "confirm", "change", "update:showPicker", "update:selectedIndex", "update:selectedValue"],
   setup(props, {
     emit,
     slots
   }) {
     const confirmIndexes = ref(props.selectedIndex);
+    const confirmValues = ref(props.selectedValue);
+    const getIndexesByValues = () => {
+      var _a;
+      if (confirmValues.value && confirmValues.value.length > 0) {
+        confirmIndexes.value.splice(0, confirmIndexes.value.length);
+        (_a = props.options) == null ? void 0 : _a.forEach((option, index) => {
+          if (option.value && confirmValues.value.includes(option.value)) {
+            confirmIndexes.value.push(index);
+          }
+        });
+      }
+    };
+    getIndexesByValues();
     const pickerOptions = ref();
     const currentShow = ref(props.showPicker);
     const DEFAULT_ITEM_HEIGHT = ref(36);
@@ -14750,7 +14779,9 @@ var stdin_default$y = defineComponent({
       if (newValue !== props.showPicker) {
         emit("update:showPicker", newValue);
       }
-      confirmIndexes.value = props.selectedIndex;
+      confirmIndexes.value = deepClone(props.selectedIndex);
+      confirmValues.value = deepClone(props.selectedValue);
+      getIndexesByValues();
     });
     watch(() => props.showPicker, (newValue) => {
       var _a;
@@ -15906,7 +15937,8 @@ const pullRefreshProps = {
   loadingText: String,
   pullDistance: numericProp,
   successDuration: makeNumericProp(500),
-  animationDuration: makeNumericProp(300)
+  animationDuration: makeNumericProp(300),
+  scrollElement: null
 };
 var stdin_default$q = defineComponent({
   name: name$k,
@@ -15919,7 +15951,17 @@ var stdin_default$q = defineComponent({
     let reachTop;
     const root = ref();
     const track = ref();
-    const scrollParent = useScrollParent(root);
+    const rootScrollElement = useScrollParent(root);
+    const scrollParent = computed(() => {
+      if (props.scrollElement) {
+        const targetDom = getTargetDom(props.scrollElement);
+        if (!targetDom) {
+          console.warn("请检查props scroll-element元素是否存在！");
+        }
+        return targetDom != null ? targetDom : rootScrollElement.value;
+      }
+      return rootScrollElement.value;
+    });
     const state = reactive({
       status: "normal",
       distance: 0,
@@ -20542,7 +20584,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.1.13";
+const version = "3.1.15";
 function install(app) {
   const components = [
     ActionSheet,

package/lib/zartui.js

@@ -404,6 +404,20 @@
     document.body.removeChild(tmp);
     return !classColor ? defaultColor : classColor;
   }
+  const getTargetDom = (target) => {
+    if (target) {
+      if (typeof target === "string") {
+        return document.querySelectorAll(target)[0];
+      }
+      if (typeof target === "function") {
+        return target();
+      }
+      if (typeof target === "object" && target instanceof window.HTMLElement) {
+        return target;
+      }
+    }
+    return document.body;
+  };
   const { width: windowWidth, height: windowHeight } = useWindowSize();
   function addUnit(value) {
     if (isDef(value)) {
@@ -7437,7 +7451,7 @@
           }
         }
         onClose();
-        emit("confirm");
+        emit("confirm", currentValue.value);
       };
       const onOpen = () => {
         var _a, _b, _c;
@@ -15013,7 +15027,8 @@
           }, [slots.options ? slots.options(option) : vue.createVNode("div", childData, null)]);
         });
       };
-      const setConfirmIndex = (indexes) => {
+      const setConfirmIndex = (data) => {
+        const indexes = deepClone(data);
         state.confirmed = true;
         const keys = Object.keys(indexes);
         currentIndexes.value.length = 0;
@@ -15051,17 +15066,31 @@
     textKey: makeStringProp("text"),
     columnCounts: makeNumberProp(3),
     selectedIndex: makeArrayProp([]),
+    selectedValue: makeArrayProp([]),
     popup: truthProp
   };
   var stdin_default$y = vue.defineComponent({
     name: name$s,
     props: multiplePickerProps,
-    emits: ["cancel", "confirm", "change", "update:showPicker", "update:selectedIndex"],
+    emits: ["cancel", "confirm", "change", "update:showPicker", "update:selectedIndex", "update:selectedValue"],
     setup(props, {
       emit,
       slots
     }) {
       const confirmIndexes = vue.ref(props.selectedIndex);
+      const confirmValues = vue.ref(props.selectedValue);
+      const getIndexesByValues = () => {
+        var _a;
+        if (confirmValues.value && confirmValues.value.length > 0) {
+          confirmIndexes.value.splice(0, confirmIndexes.value.length);
+          (_a = props.options) == null ? void 0 : _a.forEach((option, index) => {
+            if (option.value && confirmValues.value.includes(option.value)) {
+              confirmIndexes.value.push(index);
+            }
+          });
+        }
+      };
+      getIndexesByValues();
       const pickerOptions = vue.ref();
       const currentShow = vue.ref(props.showPicker);
       const DEFAULT_ITEM_HEIGHT = vue.ref(36);
@@ -15069,7 +15098,9 @@
         if (newValue !== props.showPicker) {
           emit("update:showPicker", newValue);
         }
-        confirmIndexes.value = props.selectedIndex;
+        confirmIndexes.value = deepClone(props.selectedIndex);
+        confirmValues.value = deepClone(props.selectedValue);
+        getIndexesByValues();
       });
       vue.watch(() => props.showPicker, (newValue) => {
         var _a;
@@ -17549,7 +17580,8 @@
     loadingText: String,
     pullDistance: numericProp,
     successDuration: makeNumericProp(500),
-    animationDuration: makeNumericProp(300)
+    animationDuration: makeNumericProp(300),
+    scrollElement: null
   };
   var stdin_default$q = vue.defineComponent({
     name: name$k,
@@ -17562,7 +17594,17 @@
       let reachTop;
       const root = vue.ref();
       const track = vue.ref();
-      const scrollParent = useScrollParent(root);
+      const rootScrollElement = useScrollParent(root);
+      const scrollParent = vue.computed(() => {
+        if (props.scrollElement) {
+          const targetDom = getTargetDom(props.scrollElement);
+          if (!targetDom) {
+            console.warn("请检查props scroll-element元素是否存在！");
+          }
+          return targetDom != null ? targetDom : rootScrollElement.value;
+        }
+        return rootScrollElement.value;
+      });
       const state = vue.reactive({
         status: "normal",
         distance: 0,
@@ -22162,7 +22204,7 @@
       });
     }
   };
-  const version = "3.1.13";
+  const version = "3.1.15";
   function install(app) {
     const components = [
       ActionSheet,