vant 4.0.0-alpha.2 → 4.0.0-alpha.3

package/es/uploader/utils.js

@@ -1,6 +1,5 @@
-import { createNamespace, isFunction } from "../utils";
+import { toArray, createNamespace, isFunction } from "../utils";
 const [name, bem, t] = createNamespace("uploader");
-const toArray = (item) => Array.isArray(item) ? item : [item];
 function readFileContent(file, resultType) {
   return new Promise((resolve) => {
     if (resultType === "file") {
@@ -66,6 +65,5 @@ export {
   isOversize,
   name,
   readFileContent,
-  t,
-  toArray
+  t
 };

package/es/utils/basic.d.ts

@@ -15,3 +15,4 @@ export declare type Writeable<T> = {
 };
 export declare function pick<T, U extends keyof T>(obj: T, keys: ReadonlyArray<U>, ignoreUndefined?: boolean): Writeable<Pick<T, U>>;
 export declare const isSameValue: (newValue: unknown, oldValue: unknown) => boolean;
+export declare const toArray: <T>(item: T | T[]) => T[];

package/es/utils/basic.js

@@ -20,11 +20,13 @@ function pick(obj, keys, ignoreUndefined) {
   }, {});
 }
 const isSameValue = (newValue, oldValue) => JSON.stringify(newValue) === JSON.stringify(oldValue);
+const toArray = (item) => Array.isArray(item) ? item : [item];
 export {
   extend,
   get,
   inBrowser,
   isSameValue,
   noop,
-  pick
+  pick,
+  toArray
 };

package/lib/empty/Empty.js

@@ -23,9 +23,14 @@ module.exports = __toCommonJS(stdin_exports);
 var import_vue = require("vue");
 var import_vue2 = require("vue");
 var import_utils = require("../utils");
-var import_Network = require("./Network");
+var import_Images = require("./Images");
 const [name, bem] = (0, import_utils.createNamespace)("empty");
-const PRESET_IMAGES = ["error", "search", "default"];
+const PRESET_IMAGES = {
+  error: import_Images.renderError,
+  search: import_Images.renderSearch,
+  network: import_Images.renderNetwork,
+  default: import_Images.renderMaterial
+};
 const emptyProps = {
   image: (0, import_utils.makeStringProp)("default"),
   imageSize: [Number, String, Array],
@@ -38,20 +43,12 @@ var stdin_default = (0, import_vue2.defineComponent)({
     slots
   }) {
     const renderImage = () => {
+      var _a;
       if (slots.image) {
         return slots.image();
       }
-      let {
-        image
-      } = props;
-      if (image === "network") {
-        return import_Network.Network;
-      }
-      if (PRESET_IMAGES.includes(image)) {
-        image = `https://img.yzcdn.cn/vant/empty-image-${image}.png`;
-      }
-      return (0, import_vue.createVNode)("img", {
-        "src": image
+      return ((_a = PRESET_IMAGES[props.image]) == null ? void 0 : _a.call(PRESET_IMAGES)) || (0, import_vue.createVNode)("img", {
+        "src": props.image
       }, null);
     };
     const renderDescription = () => {

package/lib/empty/Images.d.ts

@@ -0,0 +1,4 @@
+export declare const renderNetwork: () => JSX.Element;
+export declare const renderMaterial: () => JSX.Element;
+export declare const renderError: () => JSX.Element;
+export declare const renderSearch: () => JSX.Element;

package/lib/empty/Images.js

@@ -0,0 +1,290 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  renderError: () => renderError,
+  renderMaterial: () => renderMaterial,
+  renderNetwork: () => renderNetwork,
+  renderSearch: () => renderSearch
+});
+module.exports = __toCommonJS(stdin_exports);
+var import_vue = require("vue");
+const getId = (num) => `van-empty-${num}`;
+const useId = (num) => `url(#${getId(num)})`;
+const renderStop = (color, offset, opacity) => (0, import_vue.createVNode)("stop", {
+  "stop-color": color,
+  "offset": `${offset}%`,
+  "stop-opacity": opacity
+}, null);
+const renderStops = (fromColor, toColor) => [renderStop(fromColor, 0), renderStop(toColor, 100)];
+const renderShadow = (id) => [(0, import_vue.createVNode)("defs", null, [(0, import_vue.createVNode)("radialGradient", {
+  "id": getId(id),
+  "cx": "50%",
+  "cy": "54%",
+  "fx": "50%",
+  "fy": "54%",
+  "r": "297%",
+  "gradientTransform": "matrix(-.16 0 0 -.33 .58 .72)"
+}, [renderStop("#EBEDF0", 0), renderStop("#F2F3F5", 100, 0.3)])]), (0, import_vue.createVNode)("ellipse", {
+  "fill": useId(id),
+  "opacity": ".8",
+  "cx": "80",
+  "cy": "140",
+  "rx": "46",
+  "ry": "8"
+}, null)];
+const renderBuilding = () => [(0, import_vue.createVNode)("defs", null, [(0, import_vue.createVNode)("linearGradient", {
+  "id": getId("a"),
+  "x1": "64%",
+  "y1": "100%",
+  "x2": "64%"
+}, [renderStop("#FFF", 0, 0.5), renderStop("#F2F3F5", 100)])]), (0, import_vue.createVNode)("g", {
+  "opacity": ".8"
+}, [(0, import_vue.createVNode)("path", {
+  "d": "M36 131V53H16v20H2v58h34z",
+  "fill": useId("a")
+}, null), (0, import_vue.createVNode)("path", {
+  "d": "M123 15h22v14h9v77h-31V15z",
+  "fill": useId("a")
+}, null)])];
+const renderCloud = () => [(0, import_vue.createVNode)("defs", null, [(0, import_vue.createVNode)("linearGradient", {
+  "id": getId("b"),
+  "x1": "64%",
+  "y1": "97%",
+  "x2": "64%",
+  "y2": "0%"
+}, [renderStop("#F2F3F5", 0, 0.3), renderStop("#F2F3F5", 100)])]), (0, import_vue.createVNode)("g", {
+  "opacity": ".8"
+}, [(0, import_vue.createVNode)("path", {
+  "d": "M87 6c3 0 7 3 8 6a8 8 0 1 1-1 16H80a7 7 0 0 1-8-6c0-4 3-7 6-7 0-5 4-9 9-9Z",
+  "fill": useId("b")
+}, null), (0, import_vue.createVNode)("path", {
+  "d": "M19 23c2 0 3 1 4 3 2 0 4 2 4 4a4 4 0 0 1-4 3v1h-7v-1l-1 1c-2 0-3-2-3-4 0-1 1-3 3-3 0-2 2-4 4-4Z",
+  "fill": useId("b")
+}, null)])];
+const renderNetwork = () => (0, import_vue.createVNode)("svg", {
+  "viewBox": "0 0 160 160"
+}, [(0, import_vue.createVNode)("defs", null, [(0, import_vue.createVNode)("linearGradient", {
+  "id": getId(1),
+  "x1": "64%",
+  "y1": "100%",
+  "x2": "64%"
+}, [renderStop("#FFF", 0, 0.5), renderStop("#F2F3F5", 100)]), (0, import_vue.createVNode)("linearGradient", {
+  "id": getId(2),
+  "x1": "50%",
+  "x2": "50%",
+  "y2": "84%"
+}, [renderStop("#EBEDF0", 0), renderStop("#DCDEE0", 100, 0)]), (0, import_vue.createVNode)("linearGradient", {
+  "id": getId(3),
+  "x1": "100%",
+  "x2": "100%",
+  "y2": "100%"
+}, [renderStops("#EAEDF0", "#DCDEE0")]), (0, import_vue.createVNode)("radialGradient", {
+  "id": getId(4),
+  "cx": "50%",
+  "cy": "0%",
+  "fx": "50%",
+  "fy": "0%",
+  "r": "100%",
+  "gradientTransform": "matrix(0 1 -.54 0 .5 -.5)"
+}, [renderStop("#EBEDF0", 0), renderStop("#FFF", 100, 0)])]), (0, import_vue.createVNode)("g", {
+  "fill": "none"
+}, [renderBuilding(), (0, import_vue.createVNode)("path", {
+  "fill": useId(4),
+  "d": "M0 139h160v21H0z"
+}, null), (0, import_vue.createVNode)("path", {
+  "d": "M80 54a7 7 0 0 1 3 13v27l-2 2h-2a2 2 0 0 1-2-2V67a7 7 0 0 1 3-13z",
+  "fill": useId(2)
+}, null), (0, import_vue.createVNode)("g", {
+  "opacity": ".6",
+  "stroke-linecap": "round",
+  "stroke-width": "7"
+}, [(0, import_vue.createVNode)("path", {
+  "d": "M64 47a19 19 0 0 0-5 13c0 5 2 10 5 13",
+  "stroke": useId(3)
+}, null), (0, import_vue.createVNode)("path", {
+  "d": "M53 36a34 34 0 0 0 0 48",
+  "stroke": useId(3)
+}, null), (0, import_vue.createVNode)("path", {
+  "d": "M95 73a19 19 0 0 0 6-13c0-5-2-9-6-13",
+  "stroke": useId(3)
+}, null), (0, import_vue.createVNode)("path", {
+  "d": "M106 84a34 34 0 0 0 0-48",
+  "stroke": useId(3)
+}, null)]), (0, import_vue.createVNode)("g", {
+  "transform": "translate(31 105)"
+}, [(0, import_vue.createVNode)("rect", {
+  "fill": "#EBEDF0",
+  "width": "98",
+  "height": "34",
+  "rx": "2"
+}, null), (0, import_vue.createVNode)("rect", {
+  "fill": "#FFF",
+  "x": "9",
+  "y": "8",
+  "width": "80",
+  "height": "18",
+  "rx": "1.1"
+}, null), (0, import_vue.createVNode)("rect", {
+  "fill": "#EBEDF0",
+  "x": "15",
+  "y": "12",
+  "width": "18",
+  "height": "6",
+  "rx": "1.1"
+}, null)])])]);
+const renderMaterial = () => (0, import_vue.createVNode)("svg", {
+  "viewBox": "0 0 160 160"
+}, [(0, import_vue.createVNode)("defs", null, [(0, import_vue.createVNode)("linearGradient", {
+  "x1": "50%",
+  "x2": "50%",
+  "y2": "100%",
+  "id": getId(5)
+}, [renderStops("#F2F3F5", "#DCDEE0")]), (0, import_vue.createVNode)("linearGradient", {
+  "x1": "95%",
+  "y1": "48%",
+  "x2": "5.5%",
+  "y2": "51%",
+  "id": getId(6)
+}, [renderStops("#EAEDF1", "#DCDEE0")]), (0, import_vue.createVNode)("linearGradient", {
+  "y1": "45%",
+  "x2": "100%",
+  "y2": "54%",
+  "id": getId(7)
+}, [renderStops("#EAEDF1", "#DCDEE0")])]), renderBuilding(), renderCloud(), (0, import_vue.createVNode)("g", {
+  "transform": "translate(36 50)",
+  "fill": "none"
+}, [(0, import_vue.createVNode)("g", {
+  "transform": "translate(8)"
+}, [(0, import_vue.createVNode)("rect", {
+  "fill": "#EBEDF0",
+  "opacity": ".6",
+  "x": "38",
+  "y": "13",
+  "width": "36",
+  "height": "53",
+  "rx": "2"
+}, null), (0, import_vue.createVNode)("rect", {
+  "fill": useId(5),
+  "width": "64",
+  "height": "66",
+  "rx": "2"
+}, null), (0, import_vue.createVNode)("rect", {
+  "fill": "#FFF",
+  "x": "6",
+  "y": "6",
+  "width": "52",
+  "height": "55",
+  "rx": "1"
+}, null), (0, import_vue.createVNode)("g", {
+  "transform": "translate(15 17)",
+  "fill": useId(6)
+}, [(0, import_vue.createVNode)("rect", {
+  "width": "34",
+  "height": "6",
+  "rx": "1"
+}, null), (0, import_vue.createVNode)("path", {
+  "d": "M0 14h34v6H0z"
+}, null), (0, import_vue.createVNode)("rect", {
+  "y": "28",
+  "width": "34",
+  "height": "6",
+  "rx": "1"
+}, null)])]), (0, import_vue.createVNode)("rect", {
+  "fill": useId(7),
+  "y": "61",
+  "width": "88",
+  "height": "28",
+  "rx": "1"
+}, null), (0, import_vue.createVNode)("rect", {
+  "fill": "#F7F8FA",
+  "x": "29",
+  "y": "72",
+  "width": "30",
+  "height": "6",
+  "rx": "1"
+}, null)])]);
+const renderError = () => (0, import_vue.createVNode)("svg", {
+  "viewBox": "0 0 160 160"
+}, [(0, import_vue.createVNode)("defs", null, [(0, import_vue.createVNode)("linearGradient", {
+  "x1": "50%",
+  "x2": "50%",
+  "y2": "100%",
+  "id": getId(8)
+}, [renderStops("#EAEDF1", "#DCDEE0")])]), renderBuilding(), renderCloud(), renderShadow("c"), (0, import_vue.createVNode)("path", {
+  "d": "m59 60 21 21 21-21h3l9 9v3L92 93l21 21v3l-9 9h-3l-21-21-21 21h-3l-9-9v-3l21-21-21-21v-3l9-9h3Z",
+  "fill": useId(8)
+}, null)]);
+const renderSearch = () => (0, import_vue.createVNode)("svg", {
+  "viewBox": "0 0 160 160"
+}, [(0, import_vue.createVNode)("defs", null, [(0, import_vue.createVNode)("linearGradient", {
+  "x1": "50%",
+  "y1": "100%",
+  "x2": "50%",
+  "id": getId(9)
+}, [renderStops("#EEE", "#D8D8D8")]), (0, import_vue.createVNode)("linearGradient", {
+  "x1": "100%",
+  "y1": "50%",
+  "y2": "50%",
+  "id": getId(10)
+}, [renderStops("#F2F3F5", "#DCDEE0")]), (0, import_vue.createVNode)("linearGradient", {
+  "x1": "50%",
+  "x2": "50%",
+  "y2": "100%",
+  "id": getId(11)
+}, [renderStops("#F2F3F5", "#DCDEE0")]), (0, import_vue.createVNode)("linearGradient", {
+  "x1": "50%",
+  "x2": "50%",
+  "y2": "100%",
+  "id": getId(12)
+}, [renderStops("#FFF", "#F7F8FA")])]), renderBuilding(), renderCloud(), renderShadow("d"), (0, import_vue.createVNode)("g", {
+  "transform": "rotate(-45 113 -4)",
+  "fill": "none"
+}, [(0, import_vue.createVNode)("rect", {
+  "fill": useId(9),
+  "x": "24",
+  "y": "52.8",
+  "width": "5.8",
+  "height": "19",
+  "rx": "1"
+}, null), (0, import_vue.createVNode)("rect", {
+  "fill": useId(10),
+  "x": "22.1",
+  "y": "67.3",
+  "width": "9.9",
+  "height": "28",
+  "rx": "1"
+}, null), (0, import_vue.createVNode)("circle", {
+  "stroke": useId(11),
+  "stroke-width": "8",
+  "cx": "27",
+  "cy": "27",
+  "r": "27"
+}, null), (0, import_vue.createVNode)("circle", {
+  "fill": useId(12),
+  "cx": "27",
+  "cy": "27",
+  "r": "16"
+}, null), (0, import_vue.createVNode)("path", {
+  "d": "M37 7c-8 0-15 5-16 12",
+  "stroke": useId(11),
+  "stroke-width": "3",
+  "opacity": ".5",
+  "stroke-linecap": "round",
+  "transform": "rotate(45 29 13)"
+}, null)])]);

package/lib/field/Field.js

@@ -176,10 +176,13 @@ var stdin_default = (0, import_vue2.defineComponent)({
     });
     const validateWithTrigger = (trigger) => {
       if (form && props.rules) {
-        const defaultTrigger = form.props.validateTrigger === trigger;
+        const {
+          validateTrigger
+        } = form.props;
+        const defaultTrigger = (0, import_utils.toArray)(validateTrigger).includes(trigger);
         const rules = props.rules.filter((rule) => {
           if (rule.trigger) {
-            return rule.trigger === trigger;
+            return (0, import_utils.toArray)(rule.trigger).includes(trigger);
           }
           return defaultTrigger;
         });

package/lib/field/types.d.ts

@@ -18,7 +18,7 @@ export declare type FieldRuleValidator = (value: any, rule: FieldRule) => boolea
 export declare type FiledRuleFormatter = (value: any, rule: FieldRule) => string;
 export declare type FieldRule = {
     pattern?: RegExp;
-    trigger?: FieldValidateTrigger;
+    trigger?: FieldValidateTrigger | FieldValidateTrigger[];
     message?: FieldRuleMessage;
     required?: boolean;
     validator?: FieldRuleValidator;

package/lib/form/Form.d.ts

@@ -14,15 +14,15 @@ declare const formProps: {
         type: BooleanConstructor;
         default: true;
     };
-    validateTrigger: {
-        type: PropType<FieldValidateTrigger>;
-        default: FieldValidateTrigger;
-    };
     showErrorMessage: {
         type: BooleanConstructor;
         default: true;
     };
     errorMessageAlign: PropType<FieldTextAlign>;
+    validateTrigger: {
+        type: PropType<FieldValidateTrigger | FieldValidateTrigger[]>;
+        default: string;
+    };
 };
 export declare type FormProps = ExtractPropTypes<typeof formProps>;
 declare const _default: import("vue").DefineComponent<{
@@ -39,15 +39,15 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
-    validateTrigger: {
-        type: PropType<FieldValidateTrigger>;
-        default: FieldValidateTrigger;
-    };
     showErrorMessage: {
         type: BooleanConstructor;
         default: true;
     };
     errorMessageAlign: PropType<FieldTextAlign>;
+    validateTrigger: {
+        type: PropType<FieldValidateTrigger | FieldValidateTrigger[]>;
+        default: string;
+    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("submit" | "failed")[], "submit" | "failed", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
     colon: BooleanConstructor;
     disabled: BooleanConstructor;
@@ -62,15 +62,15 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
-    validateTrigger: {
-        type: PropType<FieldValidateTrigger>;
-        default: FieldValidateTrigger;
-    };
     showErrorMessage: {
         type: BooleanConstructor;
         default: true;
     };
     errorMessageAlign: PropType<FieldTextAlign>;
+    validateTrigger: {
+        type: PropType<FieldValidateTrigger | FieldValidateTrigger[]>;
+        default: string;
+    };
 }>> & {
     onSubmit?: ((...args: any[]) => any) | undefined;
     onFailed?: ((...args: any[]) => any) | undefined;
@@ -82,7 +82,7 @@ declare const _default: import("vue").DefineComponent<{
     scrollToError: boolean;
     validateFirst: boolean;
     submitOnEnter: boolean;
-    validateTrigger: FieldValidateTrigger;
     showErrorMessage: boolean;
+    validateTrigger: FieldValidateTrigger | FieldValidateTrigger[];
 }>;
 export default _default;

package/lib/form/Form.js

@@ -37,9 +37,12 @@ const formProps = {
   scrollToError: Boolean,
   validateFirst: Boolean,
   submitOnEnter: import_utils.truthProp,
-  validateTrigger: (0, import_utils.makeStringProp)("onBlur"),
   showErrorMessage: import_utils.truthProp,
-  errorMessageAlign: String
+  errorMessageAlign: String,
+  validateTrigger: {
+    type: [String, Array],
+    default: "onBlur"
+  }
 };
 var stdin_default = (0, import_vue2.defineComponent)({
   name,

package/lib/form/index.d.ts

@@ -13,15 +13,15 @@ export declare const Form: import("../utils").WithInstall<import("vue").DefineCo
         type: BooleanConstructor;
         default: true;
     };
-    validateTrigger: {
-        type: import("vue").PropType<import("..").FieldValidateTrigger>;
-        default: import("..").FieldValidateTrigger;
-    };
     showErrorMessage: {
         type: BooleanConstructor;
         default: true;
     };
     errorMessageAlign: import("vue").PropType<import("..").FieldTextAlign>;
+    validateTrigger: {
+        type: import("vue").PropType<import("..").FieldValidateTrigger | import("..").FieldValidateTrigger[]>;
+        default: string;
+    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("submit" | "failed")[], "submit" | "failed", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     colon: BooleanConstructor;
     disabled: BooleanConstructor;
@@ -36,15 +36,15 @@ export declare const Form: import("../utils").WithInstall<import("vue").DefineCo
         type: BooleanConstructor;
         default: true;
     };
-    validateTrigger: {
-        type: import("vue").PropType<import("..").FieldValidateTrigger>;
-        default: import("..").FieldValidateTrigger;
-    };
     showErrorMessage: {
         type: BooleanConstructor;
         default: true;
     };
     errorMessageAlign: import("vue").PropType<import("..").FieldTextAlign>;
+    validateTrigger: {
+        type: import("vue").PropType<import("..").FieldValidateTrigger | import("..").FieldValidateTrigger[]>;
+        default: string;
+    };
 }>> & {
     onSubmit?: ((...args: any[]) => any) | undefined;
     onFailed?: ((...args: any[]) => any) | undefined;
@@ -56,8 +56,8 @@ export declare const Form: import("../utils").WithInstall<import("vue").DefineCo
     scrollToError: boolean;
     validateFirst: boolean;
     submitOnEnter: boolean;
-    validateTrigger: import("..").FieldValidateTrigger;
     showErrorMessage: boolean;
+    validateTrigger: import("..").FieldValidateTrigger | import("..").FieldValidateTrigger[];
 }>>;
 export default Form;
 export type { FormProps };