vant 3.6.12 → 3.6.13

package/lib/area/Area.d.ts

@@ -1,11 +1,10 @@
 import { type PropType, type ExtractPropTypes } from 'vue';
 import type { AreaList } from './types';
-declare const areaProps: {
-    title: StringConstructor;
+export declare const areaProps: import("../utils").Writeable<Pick<{
     loading: BooleanConstructor;
     readonly: BooleanConstructor;
     allowHtml: BooleanConstructor;
-    itemHeight: {
+    optionHeight: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
@@ -17,38 +16,35 @@ declare const areaProps: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
-    visibleItemCount: {
+    visibleOptionNum: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
+} & {
+    title: StringConstructor;
     cancelButtonText: StringConstructor;
     confirmButtonText: StringConstructor;
-} & {
-    value: StringConstructor;
+}, "title" | "readonly" | "loading" | "optionHeight" | "swipeDuration" | "visibleOptionNum" | "cancelButtonText" | "confirmButtonText">> & {
+    modelValue: StringConstructor;
     columnsNum: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
     columnsPlaceholder: {
-        type: PropType<string[]>;
+        type: PropType<T[]>;
         default: () => never[];
     };
     areaList: {
         type: PropType<AreaList>;
         default: () => {};
     };
-    isOverseaCode: {
-        type: PropType<(code: string) => boolean>;
-        default: (code: string) => boolean;
-    };
 };
-export declare type AreaProps = ExtractPropTypes<typeof areaProps>;
-declare const _default: import("vue").DefineComponent<{
-    title: StringConstructor;
+export type AreaProps = ExtractPropTypes<typeof areaProps>;
+declare const _default: import("vue").DefineComponent<ExtractPropTypes<import("../utils").Writeable<Pick<{
     loading: BooleanConstructor;
     readonly: BooleanConstructor;
     allowHtml: BooleanConstructor;
-    itemHeight: {
+    optionHeight: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
@@ -60,36 +56,33 @@ declare const _default: import("vue").DefineComponent<{
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
-    visibleItemCount: {
+    visibleOptionNum: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
+} & {
+    title: StringConstructor;
     cancelButtonText: StringConstructor;
     confirmButtonText: StringConstructor;
-} & {
-    value: StringConstructor;
+}, "title" | "readonly" | "loading" | "optionHeight" | "swipeDuration" | "visibleOptionNum" | "cancelButtonText" | "confirmButtonText">> & {
+    modelValue: StringConstructor;
     columnsNum: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
     columnsPlaceholder: {
-        type: PropType<string[]>;
+        type: PropType<T[]>;
         default: () => never[];
     };
     areaList: {
         type: PropType<AreaList>;
         default: () => {};
     };
-    isOverseaCode: {
-        type: PropType<(code: string) => boolean>;
-        default: (code: string) => boolean;
-    };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("change" | "cancel" | "confirm")[], "change" | "cancel" | "confirm", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
-    title: StringConstructor;
+}>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "cancel" | "change" | "confirm")[], "update:modelValue" | "cancel" | "change" | "confirm", import("vue").PublicProps, Readonly<ExtractPropTypes<import("../utils").Writeable<Pick<{
     loading: BooleanConstructor;
     readonly: BooleanConstructor;
     allowHtml: BooleanConstructor;
-    itemHeight: {
+    optionHeight: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
@@ -101,45 +94,41 @@ declare const _default: import("vue").DefineComponent<{
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
-    visibleItemCount: {
+    visibleOptionNum: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
+} & {
+    title: StringConstructor;
     cancelButtonText: StringConstructor;
     confirmButtonText: StringConstructor;
-} & {
-    value: StringConstructor;
+}, "title" | "readonly" | "loading" | "optionHeight" | "swipeDuration" | "visibleOptionNum" | "cancelButtonText" | "confirmButtonText">> & {
+    modelValue: StringConstructor;
     columnsNum: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
     columnsPlaceholder: {
-        type: PropType<string[]>;
+        type: PropType<T[]>;
         default: () => never[];
     };
     areaList: {
         type: PropType<AreaList>;
         default: () => {};
     };
-    isOverseaCode: {
-        type: PropType<(code: string) => boolean>;
-        default: (code: string) => boolean;
-    };
-}>> & {
+}>> & Readonly<{
     onChange?: ((...args: any[]) => any) | undefined;
+    "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
     onCancel?: ((...args: any[]) => any) | undefined;
     onConfirm?: ((...args: any[]) => any) | undefined;
-}, {
+}>, {
     readonly: boolean;
     loading: boolean;
-    allowHtml: boolean;
-    itemHeight: string | number;
-    showToolbar: boolean;
+    optionHeight: string | number;
     swipeDuration: string | number;
-    visibleItemCount: string | number;
+    visibleOptionNum: string | number;
     columnsNum: string | number;
     columnsPlaceholder: string[];
     areaList: AreaList;
-    isOverseaCode: (code: string) => boolean;
-}>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/lib/area/Area.js

@@ -17,244 +17,79 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var stdin_exports = {};
 __export(stdin_exports, {
+  areaProps: () => areaProps,
   default: () => stdin_default
 });
 module.exports = __toCommonJS(stdin_exports);
 var import_vue = require("vue");
-var import_vue2 = require("vue");
-var import_deep_clone = require("../utils/deep-clone");
 var import_utils = require("../utils");
 var import_Picker = require("../picker/Picker");
+var import_utils2 = require("./utils");
 var import_use_expose = require("../composables/use-expose");
 var import_picker = require("../picker");
 const [name, bem] = (0, import_utils.createNamespace)("area");
-const EMPTY_CODE = "000000";
-const INHERIT_SLOTS = ["title", "cancel", "confirm", "toolbar", "columns-top", "columns-bottom"];
-const INHERIT_PROPS = ["title", "loading", "readonly", "itemHeight", "swipeDuration", "visibleItemCount", "cancelButtonText", "confirmButtonText"];
-const isOverseaCode = (code) => code[0] === "9";
-const areaProps = (0, import_utils.extend)({}, import_Picker.pickerSharedProps, {
-  value: String,
+const areaProps = (0, import_utils.extend)({}, (0, import_utils.pick)(import_Picker.pickerSharedProps, import_utils2.INHERIT_PROPS), {
+  modelValue: String,
   columnsNum: (0, import_utils.makeNumericProp)(3),
   columnsPlaceholder: (0, import_utils.makeArrayProp)(),
   areaList: {
     type: Object,
     default: () => ({})
-  },
-  isOverseaCode: {
-    type: Function,
-    default: isOverseaCode
   }
 });
-var stdin_default = (0, import_vue2.defineComponent)({
+var stdin_default = (0, import_vue.defineComponent)({
   name,
   props: areaProps,
-  emits: ["change", "confirm", "cancel"],
+  emits: ["change", "confirm", "cancel", "update:modelValue"],
   setup(props, {
     emit,
     slots
   }) {
-    const pickerRef = (0, import_vue2.ref)();
-    const state = (0, import_vue2.reactive)({
-      code: props.value,
-      columns: [{
-        values: []
-      }, {
-        values: []
-      }, {
-        values: []
-      }]
-    });
-    const areaList = (0, import_vue2.computed)(() => {
-      const {
-        areaList: areaList2
-      } = props;
-      return {
-        province: areaList2.province_list || {},
-        city: areaList2.city_list || {},
-        county: areaList2.county_list || {}
-      };
-    });
-    const placeholderMap = (0, import_vue2.computed)(() => {
-      const {
-        columnsPlaceholder
-      } = props;
-      return {
-        province: columnsPlaceholder[0] || "",
-        city: columnsPlaceholder[1] || "",
-        county: columnsPlaceholder[2] || ""
-      };
-    });
-    const getDefaultCode = () => {
-      if (props.columnsPlaceholder.length) {
-        return EMPTY_CODE;
-      }
-      const {
-        county,
-        city
-      } = areaList.value;
-      const countyCodes = Object.keys(county);
-      if (countyCodes[0]) {
-        return countyCodes[0];
-      }
-      const cityCodes = Object.keys(city);
-      if (cityCodes[0]) {
-        return cityCodes[0];
-      }
-      return "";
-    };
-    const getColumnValues = (type, code) => {
-      let column = [];
-      if (type !== "province" && !code) {
-        return column;
-      }
-      const list = areaList.value[type];
-      column = Object.keys(list).map((listCode) => ({
-        code: listCode,
-        name: list[listCode]
-      }));
-      if (code) {
-        if (type === "city" && props.isOverseaCode(code)) {
-          code = "9";
-        }
-        column = column.filter((item) => item.code.indexOf(code) === 0);
-      }
-      if (placeholderMap.value[type] && column.length) {
-        let codeFill = "";
-        if (type === "city") {
-          codeFill = EMPTY_CODE.slice(2, 4);
-        } else if (type === "county") {
-          codeFill = EMPTY_CODE.slice(4, 6);
-        }
-        column.unshift({
-          code: code + codeFill,
-          name: placeholderMap.value[type]
-        });
-      }
-      return column;
-    };
-    const getIndex = (type, code) => {
-      let compareNum = code.length;
-      if (type === "province") {
-        compareNum = props.isOverseaCode(code) ? 1 : 2;
-      }
-      if (type === "city") {
-        compareNum = 4;
-      }
-      code = code.slice(0, compareNum);
-      const list = getColumnValues(type, compareNum > 2 ? code.slice(0, compareNum - 2) : "");
-      for (let i = 0; i < list.length; i++) {
-        if (list[i].code.slice(0, compareNum) === code) {
-          return i;
-        }
-      }
-      return 0;
-    };
-    const setValues = () => {
-      const picker = pickerRef.value;
-      if (!picker) {
-        return;
-      }
-      let code = state.code || getDefaultCode();
-      const province = getColumnValues("province");
-      const city = getColumnValues("city", code.slice(0, 2));
-      picker.setColumnValues(0, province);
-      picker.setColumnValues(1, city);
-      if (city.length && code.slice(2, 4) === "00" && !props.isOverseaCode(code)) {
-        [{
-          code
-        }] = city;
-      }
-      picker.setColumnValues(2, getColumnValues("county", code.slice(0, 4)));
-      picker.setIndexes([getIndex("province", code), getIndex("city", code), getIndex("county", code)]);
-    };
-    const parseValues = (values) => values.map((value, index) => {
-      if (value) {
-        value = (0, import_deep_clone.deepClone)(value);
-        if (!value.code || value.name === props.columnsPlaceholder[index]) {
-          value.code = "";
-          value.name = "";
-        }
+    const codes = (0, import_vue.ref)([]);
+    const picker = (0, import_vue.ref)();
+    const columns = (0, import_vue.computed)(() => (0, import_utils2.formatDataForCascade)(props));
+    const onChange = (...args) => emit("change", ...args);
+    const onCancel = (...args) => emit("cancel", ...args);
+    const onConfirm = (...args) => emit("confirm", ...args);
+    (0, import_vue.watch)(codes, (newCodes) => {
+      const lastCode = newCodes.length ? newCodes[newCodes.length - 1] : "";
+      if (lastCode && lastCode !== props.modelValue) {
+        emit("update:modelValue", lastCode);
       }
-      return value;
+    }, {
+      deep: true
     });
-    const getValues = () => {
-      if (pickerRef.value) {
-        const values = pickerRef.value.getValues().filter(Boolean);
-        return parseValues(values);
-      }
-      return [];
-    };
-    const getArea = () => {
-      const values = getValues();
-      const area = {
-        code: "",
-        country: "",
-        province: "",
-        city: "",
-        county: ""
-      };
-      if (!values.length) {
-        return area;
-      }
-      const names = values.map((item) => item.name);
-      const validValues = values.filter((value) => value.code);
-      area.code = validValues.length ? validValues[validValues.length - 1].code : "";
-      if (props.isOverseaCode(area.code)) {
-        area.country = names[1] || "";
-        area.province = names[2] || "";
+    (0, import_vue.watch)(() => props.modelValue, (newCode) => {
+      if (newCode) {
+        const lastCode = codes.value.length ? codes.value[codes.value.length - 1] : "";
+        if (newCode !== lastCode) {
+          codes.value = [`${newCode.slice(0, 2)}0000`, `${newCode.slice(0, 4)}00`, newCode].slice(0, +props.columnsNum);
+        }
       } else {
-        area.province = names[0] || "";
-        area.city = names[1] || "";
-        area.county = names[2] || "";
-      }
-      return area;
-    };
-    const reset = (newCode = "") => {
-      state.code = newCode;
-      setValues();
-    };
-    const onChange = (values, index) => {
-      state.code = values[index].code;
-      setValues();
-      if (pickerRef.value) {
-        const parsedValues = parseValues(pickerRef.value.getValues());
-        emit("change", parsedValues, index);
+        codes.value = [];
       }
-    };
-    const onConfirm = (values, index) => {
-      setValues();
-      emit("confirm", parseValues(values), index);
-    };
-    const onCancel = (...args) => emit("cancel", ...args);
-    (0, import_vue2.onMounted)(setValues);
-    (0, import_vue2.watch)(() => props.value, (value) => {
-      state.code = value;
-      setValues();
-    });
-    (0, import_vue2.watch)(() => props.areaList, setValues, {
-      deep: true
-    });
-    (0, import_vue2.watch)(() => props.columnsNum, () => {
-      (0, import_vue2.nextTick)(setValues);
+    }, {
+      immediate: true
     });
     (0, import_use_expose.useExpose)({
-      reset,
-      getArea,
-      getValues
+      confirm: () => {
+        var _a;
+        return (_a = picker.value) == null ? void 0 : _a.confirm();
+      },
+      getSelectedOptions: () => {
+        var _a;
+        return ((_a = picker.value) == null ? void 0 : _a.getSelectedOptions()) || [];
+      }
     });
-    return () => {
-      const columns = state.columns.slice(0, +props.columnsNum);
-      return (0, import_vue.createVNode)(import_picker.Picker, (0, import_vue.mergeProps)({
-        "ref": pickerRef,
-        "class": bem(),
-        "columns": columns,
-        "columnsFieldNames": {
-          text: "name"
-        },
-        "onChange": onChange,
-        "onCancel": onCancel,
-        "onConfirm": onConfirm
-      }, (0, import_utils.pick)(props, INHERIT_PROPS)), (0, import_utils.pick)(slots, INHERIT_SLOTS));
-    };
+    return () => (0, import_vue.createVNode)(import_picker.Picker, (0, import_vue.mergeProps)({
+      "ref": picker,
+      "modelValue": codes.value,
+      "onUpdate:modelValue": ($event) => codes.value = $event,
+      "class": bem(),
+      "columns": columns.value,
+      "onChange": onChange,
+      "onCancel": onCancel,
+      "onConfirm": onConfirm
+    }, (0, import_utils.pick)(props, import_utils2.INHERIT_PROPS)), (0, import_utils.pick)(slots, import_utils2.INHERIT_SLOTS));
   }
 });

package/lib/area/index.d.ts

@@ -1,9 +1,8 @@
-export declare const Area: import("../utils").WithInstall<import("vue").DefineComponent<{
-    title: StringConstructor;
+export declare const Area: import("../utils").WithInstall<import("vue").DefineComponent<import("vue").ExtractPropTypes<import("../utils").Writeable<Pick<{
     loading: BooleanConstructor;
     readonly: BooleanConstructor;
     allowHtml: BooleanConstructor;
-    itemHeight: {
+    optionHeight: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
@@ -15,36 +14,33 @@ export declare const Area: import("../utils").WithInstall<import("vue").DefineCo
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
-    visibleItemCount: {
+    visibleOptionNum: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
+} & {
+    title: StringConstructor;
     cancelButtonText: StringConstructor;
     confirmButtonText: StringConstructor;
-} & {
-    value: StringConstructor;
+}, "title" | "readonly" | "loading" | "optionHeight" | "swipeDuration" | "visibleOptionNum" | "cancelButtonText" | "confirmButtonText">> & {
+    modelValue: StringConstructor;
     columnsNum: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
     columnsPlaceholder: {
-        type: import("vue").PropType<string[]>;
+        type: import("vue").PropType<T[]>;
         default: () => never[];
     };
     areaList: {
         type: import("vue").PropType<import("./types").AreaList>;
         default: () => {};
     };
-    isOverseaCode: {
-        type: import("vue").PropType<(code: string) => boolean>;
-        default: (code: string) => boolean;
-    };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("change" | "cancel" | "confirm")[], "change" | "cancel" | "confirm", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    title: StringConstructor;
+}>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "cancel" | "change" | "confirm")[], "update:modelValue" | "cancel" | "change" | "confirm", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<import("../utils").Writeable<Pick<{
     loading: BooleanConstructor;
     readonly: BooleanConstructor;
     allowHtml: BooleanConstructor;
-    itemHeight: {
+    optionHeight: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
@@ -56,50 +52,47 @@ export declare const Area: import("../utils").WithInstall<import("vue").DefineCo
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
-    visibleItemCount: {
+    visibleOptionNum: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
+} & {
+    title: StringConstructor;
     cancelButtonText: StringConstructor;
     confirmButtonText: StringConstructor;
-} & {
-    value: StringConstructor;
+}, "title" | "readonly" | "loading" | "optionHeight" | "swipeDuration" | "visibleOptionNum" | "cancelButtonText" | "confirmButtonText">> & {
+    modelValue: StringConstructor;
     columnsNum: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
     columnsPlaceholder: {
-        type: import("vue").PropType<string[]>;
+        type: import("vue").PropType<T[]>;
         default: () => never[];
     };
     areaList: {
         type: import("vue").PropType<import("./types").AreaList>;
         default: () => {};
     };
-    isOverseaCode: {
-        type: import("vue").PropType<(code: string) => boolean>;
-        default: (code: string) => boolean;
-    };
-}>> & {
+}>> & Readonly<{
     onChange?: ((...args: any[]) => any) | undefined;
+    "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
     onCancel?: ((...args: any[]) => any) | undefined;
     onConfirm?: ((...args: any[]) => any) | undefined;
-}, {
+}>, {
     readonly: boolean;
     loading: boolean;
-    allowHtml: boolean;
-    itemHeight: string | number;
-    showToolbar: boolean;
+    optionHeight: string | number;
     swipeDuration: string | number;
-    visibleItemCount: string | number;
+    visibleOptionNum: string | number;
     columnsNum: string | number;
     columnsPlaceholder: string[];
     areaList: import("./types").AreaList;
-    isOverseaCode: (code: string) => boolean;
-}>>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>>;
 export default Area;
+export { areaProps } from './Area';
 export type { AreaProps } from './Area';
-export type { AreaList, AreaInstance, AreaColumnOption } from './types';
+export type { AreaList, AreaInstance } from './types';
 declare module 'vue' {
     interface GlobalComponents {
         VanArea: typeof Area;

package/lib/area/index.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -24,10 +28,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var stdin_exports = {};
 __export(stdin_exports, {
   Area: () => Area,
+  areaProps: () => import_Area2.areaProps,
   default: () => stdin_default
 });
 module.exports = __toCommonJS(stdin_exports);
 var import_utils = require("../utils");
 var import_Area = __toESM(require("./Area"));
+var import_Area2 = require("./Area");
 const Area = (0, import_utils.withInstall)(import_Area.default);
 var stdin_default = Area;

package/lib/area/style/index.js

@@ -1,3 +1,10 @@
 require("../../style/base.css");
+require("../../badge/index.css");
 require("../../loading/index.css");
+require("../../sticky/index.css");
+require("../../swipe/index.css");
+require("../../swipe-item/index.css");
+require("../../tabs/index.css");
+require("../../tab/index.css");
 require("../../picker/index.css");
+require("../../picker-group/index.css");

package/lib/area/types.d.ts

@@ -1,24 +1,9 @@
 import type { ComponentPublicInstance } from 'vue';
+import { PickerExpose } from '../picker/types';
 import type { AreaProps } from './Area';
-export declare type AreaList = {
+export type AreaList = {
     city_list: Record<string, string>;
     county_list: Record<string, string>;
     province_list: Record<string, string>;
 };
-export declare type AreaColumnOption = {
-    name: string;
-    code: string;
-};
-export declare type AreaColumnType = 'province' | 'county' | 'city';
-export declare type AreaExpose = {
-    reset: (newCode?: string) => void;
-    getArea: () => {
-        code: string;
-        country: string;
-        province: string;
-        city: string;
-        county: string;
-    };
-    getValues: () => AreaColumnOption[];
-};
-export declare type AreaInstance = ComponentPublicInstance<AreaProps, AreaExpose>;
+export type AreaInstance = ComponentPublicInstance<AreaProps, PickerExpose>;

package/lib/area/utils.d.ts

@@ -0,0 +1,6 @@
+import type { AreaProps } from '.';
+import type { PickerOption } from '../picker';
+export declare const AREA_EMPTY_CODE = "000000";
+export declare const INHERIT_SLOTS: readonly ["title", "cancel", "confirm", "toolbar", "columns-top", "columns-bottom"];
+export declare const INHERIT_PROPS: readonly ["title", "loading", "readonly", "optionHeight", "swipeDuration", "visibleOptionNum", "cancelButtonText", "confirmButtonText"];
+export declare function formatDataForCascade({ areaList, columnsNum, columnsPlaceholder: placeholder, }: AreaProps): PickerOption[];