vant 3.4.9 → 3.5.0-beta.0

package/lib/vant.es.js

@@ -1713,15 +1713,16 @@ var stdin_default$1p = defineComponent({
   }) {
     const hasOptions = ref(false);
     const formattedColumns = ref([]);
-    const {
-      text: textKey,
-      values: valuesKey,
-      children: childrenKey
-    } = extend({
-      text: props.valueKey || "text",
-      values: "values",
-      children: "children"
-    }, props.columnsFieldNames);
+    const columnsFieldNames = computed(() => {
+      const {
+        columnsFieldNames: columnsFieldNames2
+      } = props;
+      return {
+        text: (columnsFieldNames2 == null ? void 0 : columnsFieldNames2.text) || props.valueKey || "text",
+        values: (columnsFieldNames2 == null ? void 0 : columnsFieldNames2.values) || "values",
+        children: (columnsFieldNames2 == null ? void 0 : columnsFieldNames2.children) || "children"
+      };
+    });
     const {
       children,
       linkChildren
@@ -1731,10 +1732,10 @@ var stdin_default$1p = defineComponent({
     const dataType = computed(() => {
       const firstColumn = props.columns[0];
       if (typeof firstColumn === "object") {
-        if (childrenKey in firstColumn) {
+        if (columnsFieldNames.value.children in firstColumn) {
           return "cascade";
         }
-        if (valuesKey in firstColumn) {
+        if (columnsFieldNames.value.values in firstColumn) {
           return "object";
         }
       }
@@ -1744,10 +1745,10 @@ var stdin_default$1p = defineComponent({
       var _a;
       const formatted = [];
       let cursor = {
-        [childrenKey]: props.columns
+        [columnsFieldNames.value.children]: props.columns
       };
-      while (cursor && cursor[childrenKey]) {
-        const children2 = cursor[childrenKey];
+      while (cursor && cursor[columnsFieldNames.value.children]) {
+        const children2 = cursor[columnsFieldNames.value.children];
         let defaultIndex = (_a = cursor.defaultIndex) != null ? _a : +props.defaultIndex;
         while (children2[defaultIndex] && children2[defaultIndex].disabled) {
           if (defaultIndex < children2.length - 1) {
@@ -1758,7 +1759,7 @@ var stdin_default$1p = defineComponent({
           }
         }
         formatted.push({
-          [valuesKey]: cursor[childrenKey],
+          [columnsFieldNames.value.values]: cursor[columnsFieldNames.value.children],
           className: cursor.className,
           defaultIndex
         });
@@ -1772,14 +1773,14 @@ var stdin_default$1p = defineComponent({
       } = props;
       if (dataType.value === "plain") {
         formattedColumns.value = [{
-          [valuesKey]: columns
+          [columnsFieldNames.value.values]: columns
         }];
       } else if (dataType.value === "cascade") {
         formatCascade();
       } else {
         formattedColumns.value = columns;
       }
-      hasOptions.value = formattedColumns.value.some((item) => item[valuesKey] && item[valuesKey].length !== 0);
+      hasOptions.value = formattedColumns.value.some((item) => item[columnsFieldNames.value.values] && item[columnsFieldNames.value.values].length !== 0);
     };
     const getIndexes = () => children.map((child) => child.state.index);
     const setColumnValues = (index, options) => {
@@ -1791,16 +1792,16 @@ var stdin_default$1p = defineComponent({
     };
     const onCascadeChange = (columnIndex) => {
       let cursor = {
-        [childrenKey]: props.columns
+        [columnsFieldNames.value.children]: props.columns
       };
       const indexes = getIndexes();
       for (let i = 0; i <= columnIndex; i++) {
-        cursor = cursor[childrenKey][indexes[i]];
+        cursor = cursor[columnsFieldNames.value.children][indexes[i]];
       }
-      while (cursor && cursor[childrenKey]) {
+      while (cursor && cursor[columnsFieldNames.value.children]) {
         columnIndex++;
-        setColumnValues(columnIndex, cursor[childrenKey]);
-        cursor = cursor[childrenKey][cursor.defaultIndex || 0];
+        setColumnValues(columnIndex, cursor[columnsFieldNames.value.children]);
+        cursor = cursor[columnsFieldNames.value.children][cursor.defaultIndex || 0];
       }
     };
     const getChild = (index) => children[index];
@@ -1910,14 +1911,14 @@ var stdin_default$1p = defineComponent({
     const renderColumnItems = () => formattedColumns.value.map((item, columnIndex) => {
       var _a;
       return createVNode(stdin_default$1q, {
-        "textKey": textKey,
+        "textKey": columnsFieldNames.value.text,
         "readonly": props.readonly,
         "allowHtml": props.allowHtml,
         "className": item.className,
         "itemHeight": itemHeight.value,
         "defaultIndex": (_a = item.defaultIndex) != null ? _a : +props.defaultIndex,
         "swipeDuration": props.swipeDuration,
-        "initialOptions": item[valuesKey],
+        "initialOptions": item[columnsFieldNames.value.values],
         "visibleItemCount": props.visibleItemCount,
         "onChange": () => onChange(columnIndex)
       }, {
@@ -2419,6 +2420,10 @@ var stdin_default$1m = defineComponent({
         item.resetValidation();
       });
     };
+    const getValidationStatus = () => children.reduce((form, field) => {
+      form[field.name] = field.getValidationStatus();
+      return form;
+    }, {});
     const scrollToField = (name2, options) => {
       children.some((item) => {
         if (item.name === name2) {
@@ -2456,7 +2461,8 @@ var stdin_default$1m = defineComponent({
       validate,
       getValues,
       scrollToField,
-      resetValidation
+      resetValidation,
+      getValidationStatus
     });
     return () => {
       var _a;
@@ -2614,8 +2620,8 @@ var stdin_default$1l = defineComponent({
   }) {
     const id = useId$1();
     const state = reactive({
+      status: "unvalidated",
       focused: false,
-      validateFailed: false,
       validateMessage: ""
     });
     const inputRef = ref();
@@ -2651,7 +2657,7 @@ var stdin_default$1l = defineComponent({
       return props.modelValue;
     });
     const runRules = (rules) => rules.reduce((promise, rule) => promise.then(() => {
-      if (state.validateFailed) {
+      if (state.status === "failed") {
         return;
       }
       let {
@@ -2661,38 +2667,37 @@ var stdin_default$1l = defineComponent({
         value = rule.formatter(value, rule);
       }
       if (!runSyncRule(value, rule)) {
-        state.validateFailed = true;
+        state.status = "failed";
         state.validateMessage = getRuleMessage(value, rule);
         return;
       }
       if (rule.validator) {
         return runRuleValidator(value, rule).then((result) => {
           if (result && typeof result === "string") {
-            state.validateFailed = true;
+            state.status = "failed";
             state.validateMessage = result;
           } else if (result === false) {
-            state.validateFailed = true;
+            state.status = "failed";
             state.validateMessage = getRuleMessage(value, rule);
           }
         });
       }
     }), Promise.resolve());
     const resetValidation = () => {
-      if (state.validateFailed) {
-        state.validateFailed = false;
-        state.validateMessage = "";
-      }
+      state.status = "unvalidated";
+      state.validateMessage = "";
     };
     const validate = (rules = props.rules) => new Promise((resolve) => {
       resetValidation();
       if (rules) {
         runRules(rules).then(() => {
-          if (state.validateFailed) {
+          if (state.status === "failed") {
             resolve({
               name: props.name,
               message: state.validateMessage
             });
           } else {
+            state.status = "passed";
             resolve();
           }
         });
@@ -2796,7 +2801,7 @@ var stdin_default$1l = defineComponent({
       if (typeof props.error === "boolean") {
         return props.error;
       }
-      if (form && form.props.showError && state.validateFailed) {
+      if (form && form.props.showError && state.status === "failed") {
         return true;
       }
     });
@@ -2822,6 +2827,7 @@ var stdin_default$1l = defineComponent({
       emit("keypress", event);
     };
     const getInputId = () => props.id || `${id}-input`;
+    const getValidationStatus = () => state.status;
     const renderInput = () => {
       const controlClass = bem$1a("control", [getProp("inputAlign"), {
         error: showError.value,
@@ -2840,7 +2846,6 @@ var stdin_default$1l = defineComponent({
         name: props.name,
         rows: props.rows !== void 0 ? +props.rows : void 0,
         class: controlClass,
-        value: props.modelValue,
         disabled: getProp("disabled"),
         readonly: getProp("readonly"),
         autofocus: props.autofocus,
@@ -2937,7 +2942,8 @@ var stdin_default$1l = defineComponent({
       focus,
       validate,
       formValue,
-      resetValidation
+      resetValidation,
+      getValidationStatus
     });
     provide(CUSTOM_FIELD_INJECTION_KEY, {
       customValue,
@@ -3296,7 +3302,8 @@ var stdin_default$1j = defineComponent({
   props: switchProps,
   emits: ["change", "update:modelValue"],
   setup(props, {
-    emit
+    emit,
+    slots
   }) {
     const isChecked = () => props.modelValue === props.activeValue;
     const onClick = () => {
@@ -3314,6 +3321,9 @@ var stdin_default$1j = defineComponent({
           "color": color
         }, null);
       }
+      if (slots.node) {
+        return slots.node();
+      }
     };
     useCustomFieldValue(() => props.modelValue);
     return () => {
@@ -13388,13 +13398,16 @@ var stdin_default$5 = defineComponent({
     const onPreview = () => emit("preview");
     const renderDeleteIcon = () => {
       if (props.deletable && props.item.status !== "uploading") {
+        const slot = slots["preview-delete"];
         return createVNode("div", {
           "role": "button",
-          "class": bem("preview-delete"),
+          "class": bem("preview-delete", {
+            shadow: !slot
+          }),
           "tabindex": 0,
           "aria-label": t("delete"),
           "onClick": onDelete
-        }, [createVNode(Icon, {
+        }, [slot ? slot() : createVNode(Icon, {
           "name": "cross",
           "class": bem("preview-delete-icon")
         }, null)]);
@@ -13621,9 +13634,7 @@ var stdin_default$4 = defineComponent({
         "onClick": () => emit("click-preview", item, getDetail(index)),
         "onDelete": () => deleteFile(item, index),
         "onPreview": () => previewImage(item)
-      }, pick(props, ["name", "lazyLoad"]), previewData), {
-        "preview-cover": slots["preview-cover"]
-      });
+      }, pick(props, ["name", "lazyLoad"]), previewData), pick(slots, ["preview-cover", "preview-delete"]));
     };
     const renderPreviewList = () => {
       if (props.previewImage) {
@@ -14534,7 +14545,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.4.9";
+const version = "3.5.0-beta.0";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.es.min.js

@@ -1713,15 +1713,16 @@ var stdin_default$1p = defineComponent({
   }) {
     const hasOptions = ref(false);
     const formattedColumns = ref([]);
-    const {
-      text: textKey,
-      values: valuesKey,
-      children: childrenKey
-    } = extend({
-      text: props.valueKey || "text",
-      values: "values",
-      children: "children"
-    }, props.columnsFieldNames);
+    const columnsFieldNames = computed(() => {
+      const {
+        columnsFieldNames: columnsFieldNames2
+      } = props;
+      return {
+        text: (columnsFieldNames2 == null ? void 0 : columnsFieldNames2.text) || props.valueKey || "text",
+        values: (columnsFieldNames2 == null ? void 0 : columnsFieldNames2.values) || "values",
+        children: (columnsFieldNames2 == null ? void 0 : columnsFieldNames2.children) || "children"
+      };
+    });
     const {
       children,
       linkChildren
@@ -1731,10 +1732,10 @@ var stdin_default$1p = defineComponent({
     const dataType = computed(() => {
       const firstColumn = props.columns[0];
       if (typeof firstColumn === "object") {
-        if (childrenKey in firstColumn) {
+        if (columnsFieldNames.value.children in firstColumn) {
           return "cascade";
         }
-        if (valuesKey in firstColumn) {
+        if (columnsFieldNames.value.values in firstColumn) {
           return "object";
         }
       }
@@ -1744,10 +1745,10 @@ var stdin_default$1p = defineComponent({
       var _a;
       const formatted = [];
       let cursor = {
-        [childrenKey]: props.columns
+        [columnsFieldNames.value.children]: props.columns
       };
-      while (cursor && cursor[childrenKey]) {
-        const children2 = cursor[childrenKey];
+      while (cursor && cursor[columnsFieldNames.value.children]) {
+        const children2 = cursor[columnsFieldNames.value.children];
         let defaultIndex = (_a = cursor.defaultIndex) != null ? _a : +props.defaultIndex;
         while (children2[defaultIndex] && children2[defaultIndex].disabled) {
           if (defaultIndex < children2.length - 1) {
@@ -1758,7 +1759,7 @@ var stdin_default$1p = defineComponent({
           }
         }
         formatted.push({
-          [valuesKey]: cursor[childrenKey],
+          [columnsFieldNames.value.values]: cursor[columnsFieldNames.value.children],
           className: cursor.className,
           defaultIndex
         });
@@ -1772,14 +1773,14 @@ var stdin_default$1p = defineComponent({
       } = props;
       if (dataType.value === "plain") {
         formattedColumns.value = [{
-          [valuesKey]: columns
+          [columnsFieldNames.value.values]: columns
         }];
       } else if (dataType.value === "cascade") {
         formatCascade();
       } else {
         formattedColumns.value = columns;
       }
-      hasOptions.value = formattedColumns.value.some((item) => item[valuesKey] && item[valuesKey].length !== 0);
+      hasOptions.value = formattedColumns.value.some((item) => item[columnsFieldNames.value.values] && item[columnsFieldNames.value.values].length !== 0);
     };
     const getIndexes = () => children.map((child) => child.state.index);
     const setColumnValues = (index, options) => {
@@ -1791,16 +1792,16 @@ var stdin_default$1p = defineComponent({
     };
     const onCascadeChange = (columnIndex) => {
       let cursor = {
-        [childrenKey]: props.columns
+        [columnsFieldNames.value.children]: props.columns
       };
       const indexes = getIndexes();
       for (let i = 0; i <= columnIndex; i++) {
-        cursor = cursor[childrenKey][indexes[i]];
+        cursor = cursor[columnsFieldNames.value.children][indexes[i]];
       }
-      while (cursor && cursor[childrenKey]) {
+      while (cursor && cursor[columnsFieldNames.value.children]) {
         columnIndex++;
-        setColumnValues(columnIndex, cursor[childrenKey]);
-        cursor = cursor[childrenKey][cursor.defaultIndex || 0];
+        setColumnValues(columnIndex, cursor[columnsFieldNames.value.children]);
+        cursor = cursor[columnsFieldNames.value.children][cursor.defaultIndex || 0];
       }
     };
     const getChild = (index) => children[index];
@@ -1910,14 +1911,14 @@ var stdin_default$1p = defineComponent({
     const renderColumnItems = () => formattedColumns.value.map((item, columnIndex) => {
       var _a;
       return createVNode(stdin_default$1q, {
-        "textKey": textKey,
+        "textKey": columnsFieldNames.value.text,
         "readonly": props.readonly,
         "allowHtml": props.allowHtml,
         "className": item.className,
         "itemHeight": itemHeight.value,
         "defaultIndex": (_a = item.defaultIndex) != null ? _a : +props.defaultIndex,
         "swipeDuration": props.swipeDuration,
-        "initialOptions": item[valuesKey],
+        "initialOptions": item[columnsFieldNames.value.values],
         "visibleItemCount": props.visibleItemCount,
         "onChange": () => onChange(columnIndex)
       }, {
@@ -2419,6 +2420,10 @@ var stdin_default$1m = defineComponent({
         item.resetValidation();
       });
     };
+    const getValidationStatus = () => children.reduce((form, field) => {
+      form[field.name] = field.getValidationStatus();
+      return form;
+    }, {});
     const scrollToField = (name2, options) => {
       children.some((item) => {
         if (item.name === name2) {
@@ -2456,7 +2461,8 @@ var stdin_default$1m = defineComponent({
       validate,
       getValues,
       scrollToField,
-      resetValidation
+      resetValidation,
+      getValidationStatus
     });
     return () => {
       var _a;
@@ -2614,8 +2620,8 @@ var stdin_default$1l = defineComponent({
   }) {
     const id = useId$1();
     const state = reactive({
+      status: "unvalidated",
       focused: false,
-      validateFailed: false,
       validateMessage: ""
     });
     const inputRef = ref();
@@ -2651,7 +2657,7 @@ var stdin_default$1l = defineComponent({
       return props.modelValue;
     });
     const runRules = (rules) => rules.reduce((promise, rule) => promise.then(() => {
-      if (state.validateFailed) {
+      if (state.status === "failed") {
         return;
       }
       let {
@@ -2661,38 +2667,37 @@ var stdin_default$1l = defineComponent({
         value = rule.formatter(value, rule);
       }
       if (!runSyncRule(value, rule)) {
-        state.validateFailed = true;
+        state.status = "failed";
         state.validateMessage = getRuleMessage(value, rule);
         return;
       }
       if (rule.validator) {
         return runRuleValidator(value, rule).then((result) => {
           if (result && typeof result === "string") {
-            state.validateFailed = true;
+            state.status = "failed";
             state.validateMessage = result;
           } else if (result === false) {
-            state.validateFailed = true;
+            state.status = "failed";
             state.validateMessage = getRuleMessage(value, rule);
           }
         });
       }
     }), Promise.resolve());
     const resetValidation = () => {
-      if (state.validateFailed) {
-        state.validateFailed = false;
-        state.validateMessage = "";
-      }
+      state.status = "unvalidated";
+      state.validateMessage = "";
     };
     const validate = (rules = props.rules) => new Promise((resolve) => {
       resetValidation();
       if (rules) {
         runRules(rules).then(() => {
-          if (state.validateFailed) {
+          if (state.status === "failed") {
             resolve({
               name: props.name,
               message: state.validateMessage
             });
           } else {
+            state.status = "passed";
             resolve();
           }
         });
@@ -2796,7 +2801,7 @@ var stdin_default$1l = defineComponent({
       if (typeof props.error === "boolean") {
         return props.error;
       }
-      if (form && form.props.showError && state.validateFailed) {
+      if (form && form.props.showError && state.status === "failed") {
         return true;
       }
     });
@@ -2822,6 +2827,7 @@ var stdin_default$1l = defineComponent({
       emit("keypress", event);
     };
     const getInputId = () => props.id || `${id}-input`;
+    const getValidationStatus = () => state.status;
     const renderInput = () => {
       const controlClass = bem$1a("control", [getProp("inputAlign"), {
         error: showError.value,
@@ -2840,7 +2846,6 @@ var stdin_default$1l = defineComponent({
         name: props.name,
         rows: props.rows !== void 0 ? +props.rows : void 0,
         class: controlClass,
-        value: props.modelValue,
         disabled: getProp("disabled"),
         readonly: getProp("readonly"),
         autofocus: props.autofocus,
@@ -2937,7 +2942,8 @@ var stdin_default$1l = defineComponent({
       focus,
       validate,
       formValue,
-      resetValidation
+      resetValidation,
+      getValidationStatus
     });
     provide(CUSTOM_FIELD_INJECTION_KEY, {
       customValue,
@@ -3296,7 +3302,8 @@ var stdin_default$1j = defineComponent({
   props: switchProps,
   emits: ["change", "update:modelValue"],
   setup(props, {
-    emit
+    emit,
+    slots
   }) {
     const isChecked = () => props.modelValue === props.activeValue;
     const onClick = () => {
@@ -3314,6 +3321,9 @@ var stdin_default$1j = defineComponent({
           "color": color
         }, null);
       }
+      if (slots.node) {
+        return slots.node();
+      }
     };
     useCustomFieldValue(() => props.modelValue);
     return () => {
@@ -13388,13 +13398,16 @@ var stdin_default$5 = defineComponent({
     const onPreview = () => emit("preview");
     const renderDeleteIcon = () => {
       if (props.deletable && props.item.status !== "uploading") {
+        const slot = slots["preview-delete"];
         return createVNode("div", {
           "role": "button",
-          "class": bem("preview-delete"),
+          "class": bem("preview-delete", {
+            shadow: !slot
+          }),
           "tabindex": 0,
           "aria-label": t("delete"),
           "onClick": onDelete
-        }, [createVNode(Icon, {
+        }, [slot ? slot() : createVNode(Icon, {
           "name": "cross",
           "class": bem("preview-delete-icon")
         }, null)]);
@@ -13621,9 +13634,7 @@ var stdin_default$4 = defineComponent({
         "onClick": () => emit("click-preview", item, getDetail(index)),
         "onDelete": () => deleteFile(item, index),
         "onPreview": () => previewImage(item)
-      }, pick(props, ["name", "lazyLoad"]), previewData), {
-        "preview-cover": slots["preview-cover"]
-      });
+      }, pick(props, ["name", "lazyLoad"]), previewData), pick(slots, ["preview-cover", "preview-delete"]));
     };
     const renderPreviewList = () => {
       if (props.previewImage) {
@@ -14534,7 +14545,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.4.9";
+const version = "3.5.0-beta.0";
 function install(app) {
   const components = [
     ActionBar,