vant 3.5.0-beta.1 → 3.5.0

package/lib/vant.es.js

@@ -1653,6 +1653,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 +1662,7 @@ var stdin_default$1q = defineComponent({
       getValue,
       setValue,
       setOptions,
+      hasOptions,
       stopMomentum
     });
     watch(() => props.initialOptions, setOptions);
@@ -1780,7 +1782,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) => {
@@ -3327,6 +3329,7 @@ var stdin_default$1j = defineComponent({
     };
     useCustomFieldValue(() => props.modelValue);
     return () => {
+      var _a;
       const {
         size,
         loading,
@@ -3352,7 +3355,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)]);
     };
   }
 });
@@ -8601,8 +8604,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 +8728,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 +8740,7 @@ var stdin_default$F = defineComponent({
         color: props.confirmButtonColor
       },
       "loading": loading.confirm,
+      "disabled": props.confirmButtonDisabled,
       "onClick": onConfirm
     }, null)]);
     const renderRoundButtons = () => createVNode(ActionBar, {
@@ -8745,6 +8752,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 +8760,7 @@ var stdin_default$F = defineComponent({
         "class": bem$A("confirm"),
         "color": props.confirmButtonColor,
         "loading": loading.confirm,
+        "disabled": props.confirmButtonDisabled,
         "onClick": onConfirm
       }, null)]
     });
@@ -8836,8 +8845,10 @@ Dialog.defaultOptions = {
   messageAlign: "",
   cancelButtonText: "",
   cancelButtonColor: null,
+  cancelButtonDisabled: false,
   confirmButtonText: "",
   confirmButtonColor: null,
+  confirmButtonDisabled: false,
   showConfirmButton: true,
   showCancelButton: false,
   closeOnPopstate: true,
@@ -14545,7 +14556,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.5.0-beta.1";
+const version = "3.5.0";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.es.min.js

@@ -1653,6 +1653,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 +1662,7 @@ var stdin_default$1q = defineComponent({
       getValue,
       setValue,
       setOptions,
+      hasOptions,
       stopMomentum
     });
     watch(() => props.initialOptions, setOptions);
@@ -1780,7 +1782,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) => {
@@ -3327,6 +3329,7 @@ var stdin_default$1j = defineComponent({
     };
     useCustomFieldValue(() => props.modelValue);
     return () => {
+      var _a;
       const {
         size,
         loading,
@@ -3352,7 +3355,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)]);
     };
   }
 });
@@ -8601,8 +8604,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 +8728,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 +8740,7 @@ var stdin_default$F = defineComponent({
         color: props.confirmButtonColor
       },
       "loading": loading.confirm,
+      "disabled": props.confirmButtonDisabled,
       "onClick": onConfirm
     }, null)]);
     const renderRoundButtons = () => createVNode(ActionBar, {
@@ -8745,6 +8752,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 +8760,7 @@ var stdin_default$F = defineComponent({
         "class": bem$A("confirm"),
         "color": props.confirmButtonColor,
         "loading": loading.confirm,
+        "disabled": props.confirmButtonDisabled,
         "onClick": onConfirm
       }, null)]
     });
@@ -8836,8 +8845,10 @@ Dialog.defaultOptions = {
   messageAlign: "",
   cancelButtonText: "",
   cancelButtonColor: null,
+  cancelButtonDisabled: false,
   confirmButtonText: "",
   confirmButtonColor: null,
+  confirmButtonDisabled: false,
   showConfirmButton: true,
   showCancelButton: false,
   closeOnPopstate: true,
@@ -14545,7 +14556,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.5.0-beta.1";
+const version = "3.5.0";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.js

@@ -2007,6 +2007,7 @@
         }
       };
       const getValue = () => state.options[state.index];
+      const hasOptions = () => state.options.length;
       setIndex(state.index);
       useParent(PICKER_KEY);
       useExpose({
@@ -2015,6 +2016,7 @@
         getValue,
         setValue,
         setOptions,
+        hasOptions,
         stopMomentum
       });
       vue.watch(() => props.initialOptions, setOptions);
@@ -2134,7 +2136,7 @@
         } 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) => {
@@ -3681,6 +3683,7 @@
       };
       useCustomFieldValue(() => props.modelValue);
       return () => {
+        var _a;
         const {
           size,
           loading,
@@ -3706,7 +3709,7 @@
           "onClick": onClick
         }, [vue.createVNode("div", {
           "class": bem$18("node")
-        }, [renderLoading()])]);
+        }, [renderLoading()]), (_a = slots.background) == null ? void 0 : _a.call(slots)]);
       };
     }
   });
@@ -8955,8 +8958,10 @@
     showCancelButton: Boolean,
     cancelButtonText: String,
     cancelButtonColor: String,
+    cancelButtonDisabled: Boolean,
     confirmButtonText: String,
     confirmButtonColor: String,
+    confirmButtonDisabled: Boolean,
     showConfirmButton: truthProp,
     closeOnClickOverlay: Boolean
   });
@@ -9077,6 +9082,7 @@
           color: props.cancelButtonColor
         },
         "loading": loading.cancel,
+        "disabled": props.cancelButtonDisabled,
         "onClick": onCancel
       }, null), props.showConfirmButton && vue.createVNode(Button, {
         "size": "large",
@@ -9088,6 +9094,7 @@
           color: props.confirmButtonColor
         },
         "loading": loading.confirm,
+        "disabled": props.confirmButtonDisabled,
         "onClick": onConfirm
       }, null)]);
       const renderRoundButtons = () => vue.createVNode(ActionBar, {
@@ -9099,6 +9106,7 @@
           "class": bem$A("cancel"),
           "color": props.cancelButtonColor,
           "loading": loading.cancel,
+          "disabled": props.cancelButtonDisabled,
           "onClick": onCancel
         }, null), props.showConfirmButton && vue.createVNode(ActionBarButton, {
           "type": "danger",
@@ -9106,6 +9114,7 @@
           "class": bem$A("confirm"),
           "color": props.confirmButtonColor,
           "loading": loading.confirm,
+          "disabled": props.confirmButtonDisabled,
           "onClick": onConfirm
         }, null)]
       });
@@ -9190,8 +9199,10 @@
     messageAlign: "",
     cancelButtonText: "",
     cancelButtonColor: null,
+    cancelButtonDisabled: false,
     confirmButtonText: "",
     confirmButtonColor: null,
+    confirmButtonDisabled: false,
     showConfirmButton: true,
     showCancelButton: false,
     closeOnPopstate: true,
@@ -15793,7 +15804,7 @@
       });
     }
   };
-  const version = "3.5.0-beta.1";
+  const version = "3.5.0";
   function install(app) {
     const components = [
       ActionBar,