zartui 3.1.15 → 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;
@@ -15925,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,
@@ -15938,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,

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;
@@ -15923,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,
@@ -15936,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,

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;
@@ -17566,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,
@@ -17579,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,