vant 3.5.0-beta.1 → 3.5.2

package/lib/uploader/index.d.ts

@@ -50,7 +50,7 @@ export declare const Uploader: import("../utils").WithInstall<import("vue").Defi
         type: BooleanConstructor;
         default: true;
     };
-    previewOptions: import("vue").PropType<import("..").ImagePreviewOptions>;
+    previewOptions: import("vue").PropType<Partial<import("..").ImagePreviewOptions>>;
     previewFullImage: {
         type: BooleanConstructor;
         default: true;
@@ -110,7 +110,7 @@ export declare const Uploader: import("../utils").WithInstall<import("vue").Defi
         type: BooleanConstructor;
         default: true;
     };
-    previewOptions: import("vue").PropType<import("..").ImagePreviewOptions>;
+    previewOptions: import("vue").PropType<Partial<import("..").ImagePreviewOptions>>;
     previewFullImage: {
         type: BooleanConstructor;
         default: true;

package/lib/vant.cjs.js

@@ -395,9 +395,30 @@ function withInstall(options) {
   };
   return options;
 }
+const useHeight = (element) => {
+  const height = vue.ref();
+  const setHeight = () => {
+    height.value = use.useRect(element).height;
+  };
+  vue.onMounted(() => {
+    vue.nextTick(setHeight);
+    setTimeout(setHeight, 100);
+  });
+  return height;
+};
+function usePlaceholder(contentRef, bem2) {
+  const height = useHeight(contentRef);
+  return (renderContent) => vue.createVNode("div", {
+    "class": bem2("placeholder"),
+    "style": {
+      height: height.value ? `${height.value}px` : void 0
+    }
+  }, [renderContent()]);
+}
 const [name$1u, bem$1q] = createNamespace("action-bar");
 const ACTION_BAR_KEY = Symbol(name$1u);
 const actionBarProps = {
+  placeholder: Boolean,
   safeAreaInsetBottom: truthProp
 };
 var stdin_default$1B = vue.defineComponent({
@@ -406,18 +427,27 @@ var stdin_default$1B = vue.defineComponent({
   setup(props, {
     slots
   }) {
+    const root = vue.ref();
+    const renderPlaceholder = usePlaceholder(root, bem$1q);
     const {
       linkChildren
     } = use.useChildren(ACTION_BAR_KEY);
     linkChildren();
-    return () => {
+    const renderActionBar = () => {
       var _a;
       return vue.createVNode("div", {
+        "ref": root,
         "class": [bem$1q(), {
           "van-safe-area-bottom": props.safeAreaInsetBottom
         }]
       }, [(_a = slots.default) == null ? void 0 : _a.call(slots)]);
     };
+    return () => {
+      if (props.placeholder) {
+        return renderPlaceholder(renderActionBar);
+      }
+      return renderActionBar();
+    };
   }
 });
 const ActionBar = withInstall(stdin_default$1B);
@@ -1301,7 +1331,7 @@ var stdin_default$1s = vue.defineComponent({
       }
     });
     vue.onDeactivated(() => {
-      if (props.show) {
+      if (props.show && props.teleport) {
         close();
         shouldReopen = true;
       }
@@ -1655,6 +1685,7 @@ var stdin_default$1q = vue.defineComponent({
       }
     };
     const getValue = () => state.options[state.index];
+    const hasOptions = () => state.options.length;
     setIndex(state.index);
     use.useParent(PICKER_KEY);
     useExpose({
@@ -1663,6 +1694,7 @@ var stdin_default$1q = vue.defineComponent({
       getValue,
       setValue,
       setOptions,
+      hasOptions,
       stopMomentum
     });
     vue.watch(() => props.initialOptions, setOptions);
@@ -1782,7 +1814,7 @@ var stdin_default$1p = vue.defineComponent({
       } else {
         formattedColumns.value = columns;
       }
-      hasOptions.value = formattedColumns.value.some((item) => item[columnsFieldNames.value.values] && item[columnsFieldNames.value.values].length !== 0);
+      hasOptions.value = formattedColumns.value.some((item) => item[columnsFieldNames.value.values] && item[columnsFieldNames.value.values].length !== 0) || children.some((item) => item.hasOptions);
     };
     const getIndexes = () => children.map((child) => child.state.index);
     const setColumnValues = (index, options) => {
@@ -2615,7 +2647,7 @@ const fieldProps = extend({}, cellSharedProps, fieldSharedProps, {
 var stdin_default$1l = vue.defineComponent({
   name: name$1e,
   props: fieldProps,
-  emits: ["blur", "focus", "clear", "keypress", "click-input", "click-left-icon", "click-right-icon", "update:modelValue"],
+  emits: ["blur", "focus", "clear", "keypress", "click-input", "end-validate", "start-validate", "click-left-icon", "click-right-icon", "update:modelValue"],
   setup(props, {
     emit,
     slots
@@ -2689,18 +2721,24 @@ var stdin_default$1l = vue.defineComponent({
       state.status = "unvalidated";
       state.validateMessage = "";
     };
+    const endValidate = () => emit("end-validate", {
+      status: state.status
+    });
     const validate = (rules = props.rules) => new Promise((resolve) => {
       resetValidation();
       if (rules) {
+        emit("start-validate");
         runRules(rules).then(() => {
           if (state.status === "failed") {
             resolve({
               name: props.name,
               message: state.validateMessage
             });
+            endValidate();
           } else {
             state.status = "passed";
             resolve();
+            endValidate();
           }
         });
       } else {
@@ -3329,6 +3367,7 @@ var stdin_default$1j = vue.defineComponent({
     };
     use.useCustomFieldValue(() => props.modelValue);
     return () => {
+      var _a;
       const {
         size,
         loading,
@@ -3354,7 +3393,7 @@ var stdin_default$1j = vue.defineComponent({
         "onClick": onClick
       }, [vue.createVNode("div", {
         "class": bem$18("node")
-      }, [renderLoading()])]);
+      }, [renderLoading()]), (_a = slots.background) == null ? void 0 : _a.call(slots)]);
     };
   }
 });
@@ -4244,17 +4283,6 @@ const proxyPickerMethods = (picker, callback) => {
     }
   });
 };
-const useHeight = (element) => {
-  const height = vue.ref();
-  const setHeight = () => {
-    height.value = use.useRect(element).height;
-  };
-  vue.onMounted(() => {
-    vue.nextTick(setHeight);
-    setTimeout(setHeight, 100);
-  });
-  return height;
-};
 const [name$13] = createNamespace("calendar-day");
 var stdin_default$1a = vue.defineComponent({
   name: name$13,
@@ -4726,6 +4754,9 @@ var stdin_default$17 = vue.defineComponent({
     const months = vue.computed(() => {
       const months2 = [];
       const cursor = new Date(props.minDate);
+      if (props.lazyRender && !props.show && props.poppable) {
+        return months2;
+      }
       cursor.setDate(1);
       do {
         months2.push(new Date(cursor));
@@ -8603,8 +8634,10 @@ const dialogProps = extend({}, popupSharedProps, {
   showCancelButton: Boolean,
   cancelButtonText: String,
   cancelButtonColor: String,
+  cancelButtonDisabled: Boolean,
   confirmButtonText: String,
   confirmButtonColor: String,
+  confirmButtonDisabled: Boolean,
   showConfirmButton: truthProp,
   closeOnClickOverlay: Boolean
 });
@@ -8725,6 +8758,7 @@ var stdin_default$F = vue.defineComponent({
         color: props.cancelButtonColor
       },
       "loading": loading.cancel,
+      "disabled": props.cancelButtonDisabled,
       "onClick": onCancel
     }, null), props.showConfirmButton && vue.createVNode(Button, {
       "size": "large",
@@ -8736,6 +8770,7 @@ var stdin_default$F = vue.defineComponent({
         color: props.confirmButtonColor
       },
       "loading": loading.confirm,
+      "disabled": props.confirmButtonDisabled,
       "onClick": onConfirm
     }, null)]);
     const renderRoundButtons = () => vue.createVNode(ActionBar, {
@@ -8747,6 +8782,7 @@ var stdin_default$F = vue.defineComponent({
         "class": bem$A("cancel"),
         "color": props.cancelButtonColor,
         "loading": loading.cancel,
+        "disabled": props.cancelButtonDisabled,
         "onClick": onCancel
       }, null), props.showConfirmButton && vue.createVNode(ActionBarButton, {
         "type": "danger",
@@ -8754,6 +8790,7 @@ var stdin_default$F = vue.defineComponent({
         "class": bem$A("confirm"),
         "color": props.confirmButtonColor,
         "loading": loading.confirm,
+        "disabled": props.confirmButtonDisabled,
         "onClick": onConfirm
       }, null)]
     });
@@ -8838,8 +8875,10 @@ Dialog.defaultOptions = {
   messageAlign: "",
   cancelButtonText: "",
   cancelButtonColor: null,
+  cancelButtonDisabled: false,
   confirmButtonText: "",
   confirmButtonColor: null,
+  confirmButtonDisabled: false,
   showConfirmButton: true,
   showCancelButton: false,
   closeOnPopstate: true,
@@ -10220,15 +10259,6 @@ var stdin_default$v = vue.defineComponent({
   }
 });
 const List = withInstall(stdin_default$v);
-function usePlaceholder(contentRef, bem2) {
-  const height = useHeight(contentRef);
-  return (renderContent) => vue.createVNode("div", {
-    "class": bem2("placeholder"),
-    "style": {
-      height: height.value ? `${height.value}px` : void 0
-    }
-  }, [renderContent()]);
-}
 const [name$p, bem$p] = createNamespace("nav-bar");
 const navBarProps = {
   title: String,
@@ -11346,7 +11376,7 @@ const pullRefreshProps = {
 var stdin_default$l = vue.defineComponent({
   name: name$g,
   props: pullRefreshProps,
-  emits: ["refresh", "update:modelValue"],
+  emits: ["change", "refresh", "update:modelValue"],
   setup(props, {
     emit,
     slots
@@ -11391,6 +11421,10 @@ var stdin_default$l = vue.defineComponent({
       } else {
         state.status = "loosing";
       }
+      emit("change", {
+        status: state.status,
+        distance
+      });
     };
     const getStatusText = () => {
       const {
@@ -12775,6 +12809,7 @@ const submitBarProps = {
   buttonType: makeStringProp("danger"),
   buttonColor: String,
   suffixLabel: String,
+  placeholder: Boolean,
   decimalLength: makeNumericProp(2),
   safeAreaInsetBottom: truthProp
 };
@@ -12786,6 +12821,8 @@ var stdin_default$a = vue.defineComponent({
     emit,
     slots
   }) {
+    const root = vue.ref();
+    const renderPlaceholder = usePlaceholder(root, bem$5);
     const renderText = () => {
       const {
         price,
@@ -12845,9 +12882,10 @@ var stdin_default$a = vue.defineComponent({
         "onClick": onClickButton
       }, null);
     };
-    return () => {
+    const renderSubmitBar = () => {
       var _a, _b;
       return vue.createVNode("div", {
+        "ref": root,
         "class": [bem$5(), {
           "van-safe-area-bottom": props.safeAreaInsetBottom
         }]
@@ -12855,6 +12893,12 @@ var stdin_default$a = vue.defineComponent({
         "class": bem$5("bar")
       }, [(_b = slots.default) == null ? void 0 : _b.call(slots), renderText(), renderButton()])]);
     };
+    return () => {
+      if (props.placeholder) {
+        return renderPlaceholder(renderSubmitBar);
+      }
+      return renderSubmitBar();
+    };
   }
 });
 const SubmitBar = withInstall(stdin_default$a);
@@ -14547,7 +14591,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.5.0-beta.1";
+const version = "3.5.2";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.es.js

@@ -1,5 +1,5 @@
 import { useWindowSize, useRect, useChildren, useParent, onMountedOrActivated, getScrollParent, useEventListener, CUSTOM_FIELD_INJECTION_KEY, useCustomFieldValue, useToggle, raf, useScrollParent, usePageVisibility, doubleRaf, cancelRaf, useCountDown, useClickAway, inBrowser as inBrowser$1 } from "@vant/use";
-import { unref, ref, reactive, defineComponent, createVNode, getCurrentInstance, computed, provide, inject, mergeProps, onDeactivated, onBeforeUnmount, watch, Transition, withDirectives, vShow, nextTick, onMounted, onActivated, Teleport, Fragment, createTextVNode, createApp, onUnmounted, onBeforeUpdate, resolveDirective, withKeys, onUpdated, watchEffect, h } from "vue";
+import { unref, ref, reactive, onMounted, nextTick, createVNode, defineComponent, getCurrentInstance, computed, provide, inject, mergeProps, onDeactivated, onBeforeUnmount, watch, Transition, withDirectives, vShow, onActivated, Teleport, Fragment, createTextVNode, createApp, onUnmounted, onBeforeUpdate, resolveDirective, withKeys, onUpdated, watchEffect, h } from "vue";
 import { createPopper, offsetModifier } from "@vant/popperjs";
 function noop() {
 }
@@ -393,9 +393,30 @@ function withInstall(options) {
   };
   return options;
 }
+const useHeight = (element) => {
+  const height = ref();
+  const setHeight = () => {
+    height.value = useRect(element).height;
+  };
+  onMounted(() => {
+    nextTick(setHeight);
+    setTimeout(setHeight, 100);
+  });
+  return height;
+};
+function usePlaceholder(contentRef, bem2) {
+  const height = useHeight(contentRef);
+  return (renderContent) => createVNode("div", {
+    "class": bem2("placeholder"),
+    "style": {
+      height: height.value ? `${height.value}px` : void 0
+    }
+  }, [renderContent()]);
+}
 const [name$1u, bem$1q] = createNamespace("action-bar");
 const ACTION_BAR_KEY = Symbol(name$1u);
 const actionBarProps = {
+  placeholder: Boolean,
   safeAreaInsetBottom: truthProp
 };
 var stdin_default$1B = defineComponent({
@@ -404,18 +425,27 @@ var stdin_default$1B = defineComponent({
   setup(props, {
     slots
   }) {
+    const root = ref();
+    const renderPlaceholder = usePlaceholder(root, bem$1q);
     const {
       linkChildren
     } = useChildren(ACTION_BAR_KEY);
     linkChildren();
-    return () => {
+    const renderActionBar = () => {
       var _a;
       return createVNode("div", {
+        "ref": root,
         "class": [bem$1q(), {
           "van-safe-area-bottom": props.safeAreaInsetBottom
         }]
       }, [(_a = slots.default) == null ? void 0 : _a.call(slots)]);
     };
+    return () => {
+      if (props.placeholder) {
+        return renderPlaceholder(renderActionBar);
+      }
+      return renderActionBar();
+    };
   }
 });
 const ActionBar = withInstall(stdin_default$1B);
@@ -1299,7 +1329,7 @@ var stdin_default$1s = defineComponent({
       }
     });
     onDeactivated(() => {
-      if (props.show) {
+      if (props.show && props.teleport) {
         close();
         shouldReopen = true;
       }
@@ -1653,6 +1683,7 @@ var stdin_default$1q = defineComponent({
       }
     };
     const getValue = () => state.options[state.index];
+    const hasOptions = () => state.options.length;
     setIndex(state.index);
     useParent(PICKER_KEY);
     useExpose({
@@ -1661,6 +1692,7 @@ var stdin_default$1q = defineComponent({
       getValue,
       setValue,
       setOptions,
+      hasOptions,
       stopMomentum
     });
     watch(() => props.initialOptions, setOptions);
@@ -1780,7 +1812,7 @@ var stdin_default$1p = defineComponent({
       } else {
         formattedColumns.value = columns;
       }
-      hasOptions.value = formattedColumns.value.some((item) => item[columnsFieldNames.value.values] && item[columnsFieldNames.value.values].length !== 0);
+      hasOptions.value = formattedColumns.value.some((item) => item[columnsFieldNames.value.values] && item[columnsFieldNames.value.values].length !== 0) || children.some((item) => item.hasOptions);
     };
     const getIndexes = () => children.map((child) => child.state.index);
     const setColumnValues = (index, options) => {
@@ -2613,7 +2645,7 @@ const fieldProps = extend({}, cellSharedProps, fieldSharedProps, {
 var stdin_default$1l = defineComponent({
   name: name$1e,
   props: fieldProps,
-  emits: ["blur", "focus", "clear", "keypress", "click-input", "click-left-icon", "click-right-icon", "update:modelValue"],
+  emits: ["blur", "focus", "clear", "keypress", "click-input", "end-validate", "start-validate", "click-left-icon", "click-right-icon", "update:modelValue"],
   setup(props, {
     emit,
     slots
@@ -2687,18 +2719,24 @@ var stdin_default$1l = defineComponent({
       state.status = "unvalidated";
       state.validateMessage = "";
     };
+    const endValidate = () => emit("end-validate", {
+      status: state.status
+    });
     const validate = (rules = props.rules) => new Promise((resolve) => {
       resetValidation();
       if (rules) {
+        emit("start-validate");
         runRules(rules).then(() => {
           if (state.status === "failed") {
             resolve({
               name: props.name,
               message: state.validateMessage
             });
+            endValidate();
           } else {
             state.status = "passed";
             resolve();
+            endValidate();
           }
         });
       } else {
@@ -3327,6 +3365,7 @@ var stdin_default$1j = defineComponent({
     };
     useCustomFieldValue(() => props.modelValue);
     return () => {
+      var _a;
       const {
         size,
         loading,
@@ -3352,7 +3391,7 @@ var stdin_default$1j = defineComponent({
         "onClick": onClick
       }, [createVNode("div", {
         "class": bem$18("node")
-      }, [renderLoading()])]);
+      }, [renderLoading()]), (_a = slots.background) == null ? void 0 : _a.call(slots)]);
     };
   }
 });
@@ -4242,17 +4281,6 @@ const proxyPickerMethods = (picker, callback) => {
     }
   });
 };
-const useHeight = (element) => {
-  const height = ref();
-  const setHeight = () => {
-    height.value = useRect(element).height;
-  };
-  onMounted(() => {
-    nextTick(setHeight);
-    setTimeout(setHeight, 100);
-  });
-  return height;
-};
 const [name$13] = createNamespace("calendar-day");
 var stdin_default$1a = defineComponent({
   name: name$13,
@@ -4724,6 +4752,9 @@ var stdin_default$17 = defineComponent({
     const months = computed(() => {
       const months2 = [];
       const cursor = new Date(props.minDate);
+      if (props.lazyRender && !props.show && props.poppable) {
+        return months2;
+      }
       cursor.setDate(1);
       do {
         months2.push(new Date(cursor));
@@ -8601,8 +8632,10 @@ const dialogProps = extend({}, popupSharedProps, {
   showCancelButton: Boolean,
   cancelButtonText: String,
   cancelButtonColor: String,
+  cancelButtonDisabled: Boolean,
   confirmButtonText: String,
   confirmButtonColor: String,
+  confirmButtonDisabled: Boolean,
   showConfirmButton: truthProp,
   closeOnClickOverlay: Boolean
 });
@@ -8723,6 +8756,7 @@ var stdin_default$F = defineComponent({
         color: props.cancelButtonColor
       },
       "loading": loading.cancel,
+      "disabled": props.cancelButtonDisabled,
       "onClick": onCancel
     }, null), props.showConfirmButton && createVNode(Button, {
       "size": "large",
@@ -8734,6 +8768,7 @@ var stdin_default$F = defineComponent({
         color: props.confirmButtonColor
       },
       "loading": loading.confirm,
+      "disabled": props.confirmButtonDisabled,
       "onClick": onConfirm
     }, null)]);
     const renderRoundButtons = () => createVNode(ActionBar, {
@@ -8745,6 +8780,7 @@ var stdin_default$F = defineComponent({
         "class": bem$A("cancel"),
         "color": props.cancelButtonColor,
         "loading": loading.cancel,
+        "disabled": props.cancelButtonDisabled,
         "onClick": onCancel
       }, null), props.showConfirmButton && createVNode(ActionBarButton, {
         "type": "danger",
@@ -8752,6 +8788,7 @@ var stdin_default$F = defineComponent({
         "class": bem$A("confirm"),
         "color": props.confirmButtonColor,
         "loading": loading.confirm,
+        "disabled": props.confirmButtonDisabled,
         "onClick": onConfirm
       }, null)]
     });
@@ -8836,8 +8873,10 @@ Dialog.defaultOptions = {
   messageAlign: "",
   cancelButtonText: "",
   cancelButtonColor: null,
+  cancelButtonDisabled: false,
   confirmButtonText: "",
   confirmButtonColor: null,
+  confirmButtonDisabled: false,
   showConfirmButton: true,
   showCancelButton: false,
   closeOnPopstate: true,
@@ -10218,15 +10257,6 @@ var stdin_default$v = defineComponent({
   }
 });
 const List = withInstall(stdin_default$v);
-function usePlaceholder(contentRef, bem2) {
-  const height = useHeight(contentRef);
-  return (renderContent) => createVNode("div", {
-    "class": bem2("placeholder"),
-    "style": {
-      height: height.value ? `${height.value}px` : void 0
-    }
-  }, [renderContent()]);
-}
 const [name$p, bem$p] = createNamespace("nav-bar");
 const navBarProps = {
   title: String,
@@ -11344,7 +11374,7 @@ const pullRefreshProps = {
 var stdin_default$l = defineComponent({
   name: name$g,
   props: pullRefreshProps,
-  emits: ["refresh", "update:modelValue"],
+  emits: ["change", "refresh", "update:modelValue"],
   setup(props, {
     emit,
     slots
@@ -11389,6 +11419,10 @@ var stdin_default$l = defineComponent({
       } else {
         state.status = "loosing";
       }
+      emit("change", {
+        status: state.status,
+        distance
+      });
     };
     const getStatusText = () => {
       const {
@@ -12773,6 +12807,7 @@ const submitBarProps = {
   buttonType: makeStringProp("danger"),
   buttonColor: String,
   suffixLabel: String,
+  placeholder: Boolean,
   decimalLength: makeNumericProp(2),
   safeAreaInsetBottom: truthProp
 };
@@ -12784,6 +12819,8 @@ var stdin_default$a = defineComponent({
     emit,
     slots
   }) {
+    const root = ref();
+    const renderPlaceholder = usePlaceholder(root, bem$5);
     const renderText = () => {
       const {
         price,
@@ -12843,9 +12880,10 @@ var stdin_default$a = defineComponent({
         "onClick": onClickButton
       }, null);
     };
-    return () => {
+    const renderSubmitBar = () => {
       var _a, _b;
       return createVNode("div", {
+        "ref": root,
         "class": [bem$5(), {
           "van-safe-area-bottom": props.safeAreaInsetBottom
         }]
@@ -12853,6 +12891,12 @@ var stdin_default$a = defineComponent({
         "class": bem$5("bar")
       }, [(_b = slots.default) == null ? void 0 : _b.call(slots), renderText(), renderButton()])]);
     };
+    return () => {
+      if (props.placeholder) {
+        return renderPlaceholder(renderSubmitBar);
+      }
+      return renderSubmitBar();
+    };
   }
 });
 const SubmitBar = withInstall(stdin_default$a);
@@ -14545,7 +14589,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.5.0-beta.1";
+const version = "3.5.2";
 function install(app) {
   const components = [
     ActionBar,