vant 3.4.8 → 4.0.0-alpha.2

package/lib/picker/Picker.d.ts

@@ -1,11 +1,12 @@
 import { type PropType, type ExtractPropTypes } from 'vue';
+import { type Numeric } from '../utils';
 import type { PickerColumn, PickerOption, PickerFieldNames, PickerToolbarPosition } from './types';
 export declare const pickerSharedProps: {
     title: StringConstructor;
     loading: BooleanConstructor;
     readonly: BooleanConstructor;
     allowHtml: BooleanConstructor;
-    itemHeight: {
+    optionHeight: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
@@ -17,7 +18,7 @@ export declare const pickerSharedProps: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
-    visibleItemCount: {
+    visibleOptionNum: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
@@ -29,7 +30,7 @@ declare const pickerProps: {
     loading: BooleanConstructor;
     readonly: BooleanConstructor;
     allowHtml: BooleanConstructor;
-    itemHeight: {
+    optionHeight: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
@@ -41,7 +42,7 @@ declare const pickerProps: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
-    visibleItemCount: {
+    visibleOptionNum: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
@@ -49,13 +50,12 @@ declare const pickerProps: {
     confirmButtonText: StringConstructor;
 } & {
     columns: {
-        type: PropType<(PickerOption | PickerColumn)[]>;
+        type: PropType<(PickerColumn | PickerOption)[]>;
         default: () => never[];
     };
-    valueKey: StringConstructor;
-    defaultIndex: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: number;
+    modelValue: {
+        type: PropType<Numeric[]>;
+        default: () => never[];
     };
     toolbarPosition: {
         type: PropType<PickerToolbarPosition>;
@@ -69,7 +69,7 @@ declare const _default: import("vue").DefineComponent<{
     loading: BooleanConstructor;
     readonly: BooleanConstructor;
     allowHtml: BooleanConstructor;
-    itemHeight: {
+    optionHeight: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
@@ -81,7 +81,7 @@ declare const _default: import("vue").DefineComponent<{
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
-    visibleItemCount: {
+    visibleOptionNum: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
@@ -89,25 +89,24 @@ declare const _default: import("vue").DefineComponent<{
     confirmButtonText: StringConstructor;
 } & {
     columns: {
-        type: PropType<(PickerOption | PickerColumn)[]>;
+        type: PropType<(PickerColumn | PickerOption)[]>;
         default: () => never[];
     };
-    valueKey: StringConstructor;
-    defaultIndex: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: number;
+    modelValue: {
+        type: PropType<Numeric[]>;
+        default: () => never[];
     };
     toolbarPosition: {
         type: PropType<PickerToolbarPosition>;
         default: PickerToolbarPosition;
     };
     columnsFieldNames: PropType<PickerFieldNames>;
-}, () => 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<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "change" | "cancel" | "confirm")[], "update:modelValue" | "change" | "cancel" | "confirm", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
     title: StringConstructor;
     loading: BooleanConstructor;
     readonly: BooleanConstructor;
     allowHtml: BooleanConstructor;
-    itemHeight: {
+    optionHeight: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
@@ -119,7 +118,7 @@ declare const _default: import("vue").DefineComponent<{
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
-    visibleItemCount: {
+    visibleOptionNum: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
@@ -127,13 +126,12 @@ declare const _default: import("vue").DefineComponent<{
     confirmButtonText: StringConstructor;
 } & {
     columns: {
-        type: PropType<(PickerOption | PickerColumn)[]>;
+        type: PropType<(PickerColumn | PickerOption)[]>;
         default: () => never[];
     };
-    valueKey: StringConstructor;
-    defaultIndex: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: number;
+    modelValue: {
+        type: PropType<Numeric[]>;
+        default: () => never[];
     };
     toolbarPosition: {
         type: PropType<PickerToolbarPosition>;
@@ -142,18 +140,19 @@ declare const _default: import("vue").DefineComponent<{
     columnsFieldNames: PropType<PickerFieldNames>;
 }>> & {
     onChange?: ((...args: any[]) => any) | undefined;
+    "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
     onCancel?: ((...args: any[]) => any) | undefined;
     onConfirm?: ((...args: any[]) => any) | undefined;
 }, {
+    modelValue: Numeric[];
     readonly: boolean;
     loading: boolean;
-    defaultIndex: string | number;
     allowHtml: boolean;
-    itemHeight: string | number;
+    optionHeight: string | number;
     showToolbar: boolean;
     swipeDuration: string | number;
-    visibleItemCount: string | number;
-    columns: (PickerOption | PickerColumn)[];
+    visibleOptionNum: string | number;
+    columns: (PickerColumn | PickerOption)[];
     toolbarPosition: PickerToolbarPosition;
 }>;
 export default _default;

package/lib/picker/Picker.js

@@ -27,6 +27,7 @@ module.exports = __toCommonJS(stdin_exports);
 var import_vue = require("vue");
 var import_vue2 = require("vue");
 var import_utils = require("../utils");
+var import_utils2 = require("./utils");
 var import_use = require("@vant/use");
 var import_use_expose = require("../composables/use-expose");
 var import_loading = require("../loading");
@@ -37,198 +38,85 @@ const pickerSharedProps = {
   loading: Boolean,
   readonly: Boolean,
   allowHtml: Boolean,
-  itemHeight: (0, import_utils.makeNumericProp)(44),
+  optionHeight: (0, import_utils.makeNumericProp)(44),
   showToolbar: import_utils.truthProp,
   swipeDuration: (0, import_utils.makeNumericProp)(1e3),
-  visibleItemCount: (0, import_utils.makeNumericProp)(6),
+  visibleOptionNum: (0, import_utils.makeNumericProp)(6),
   cancelButtonText: String,
   confirmButtonText: String
 };
 const pickerProps = (0, import_utils.extend)({}, pickerSharedProps, {
   columns: (0, import_utils.makeArrayProp)(),
-  valueKey: String,
-  defaultIndex: (0, import_utils.makeNumericProp)(0),
+  modelValue: (0, import_utils.makeArrayProp)(),
   toolbarPosition: (0, import_utils.makeStringProp)("top"),
   columnsFieldNames: Object
 });
 var stdin_default = (0, import_vue2.defineComponent)({
   name,
   props: pickerProps,
-  emits: ["confirm", "cancel", "change"],
+  emits: ["confirm", "cancel", "change", "update:modelValue"],
   setup(props, {
     emit,
     slots
   }) {
-    if (process.env.NODE_ENV !== "production") {
-      if (slots.default) {
-        console.warn('[Vant] Picker: "default" slot is deprecated, please use "toolbar" slot instead.');
-      }
-      if (props.valueKey) {
-        console.warn('[Vant] Picker: "valueKey" prop is deprecated, please use "columnsFieldNames" prop instead.');
-      }
-    }
-    const hasOptions = (0, import_vue2.ref)(false);
-    const formattedColumns = (0, import_vue2.ref)([]);
-    const {
-      text: textKey,
-      values: valuesKey,
-      children: childrenKey
-    } = (0, import_utils.extend)({
-      text: props.valueKey || "text",
-      values: "values",
-      children: "children"
-    }, props.columnsFieldNames);
+    const selectedValues = (0, import_vue2.ref)(props.modelValue);
     const {
       children,
       linkChildren
     } = (0, import_use.useChildren)(import_PickerColumn.PICKER_KEY);
     linkChildren();
-    const itemHeight = (0, import_vue2.computed)(() => (0, import_utils.unitToPx)(props.itemHeight));
-    const dataType = (0, import_vue2.computed)(() => {
-      const firstColumn = props.columns[0];
-      if (typeof firstColumn === "object") {
-        if (childrenKey in firstColumn) {
-          return "cascade";
-        }
-        if (valuesKey in firstColumn) {
-          return "object";
-        }
-      }
-      return "plain";
-    });
-    const formatCascade = () => {
-      var _a;
-      const formatted = [];
-      let cursor = {
-        [childrenKey]: props.columns
-      };
-      while (cursor && cursor[childrenKey]) {
-        const children2 = cursor[childrenKey];
-        let defaultIndex = (_a = cursor.defaultIndex) != null ? _a : +props.defaultIndex;
-        while (children2[defaultIndex] && children2[defaultIndex].disabled) {
-          if (defaultIndex < children2.length - 1) {
-            defaultIndex++;
-          } else {
-            defaultIndex = 0;
-            break;
-          }
-        }
-        formatted.push({
-          [valuesKey]: cursor[childrenKey],
-          className: cursor.className,
-          defaultIndex
-        });
-        cursor = children2[defaultIndex];
-      }
-      formattedColumns.value = formatted;
-    };
-    const format = () => {
+    const fields = (0, import_vue2.computed)(() => (0, import_utils2.assignDefaultFields)(props.columnsFieldNames));
+    const optionHeight = (0, import_vue2.computed)(() => (0, import_utils.unitToPx)(props.optionHeight));
+    const columnsType = (0, import_vue2.computed)(() => (0, import_utils2.getColumnsType)(props.columns, fields.value));
+    const currentColumns = (0, import_vue2.computed)(() => {
       const {
         columns
       } = props;
-      if (dataType.value === "plain") {
-        formattedColumns.value = [{
-          [valuesKey]: columns
-        }];
-      } else if (dataType.value === "cascade") {
-        formatCascade();
-      } else {
-        formattedColumns.value = columns;
-      }
-      hasOptions.value = formattedColumns.value.some((item) => item[valuesKey] && item[valuesKey].length !== 0);
-    };
-    const getIndexes = () => children.map((child) => child.state.index);
-    const setColumnValues = (index, options) => {
-      const column = children[index];
-      if (column) {
-        column.setOptions(options);
-        hasOptions.value = true;
-      }
-    };
-    const onCascadeChange = (columnIndex) => {
-      let cursor = {
-        [childrenKey]: props.columns
-      };
-      const indexes = getIndexes();
-      for (let i = 0; i <= columnIndex; i++) {
-        cursor = cursor[childrenKey][indexes[i]];
-      }
-      while (cursor && cursor[childrenKey]) {
-        columnIndex++;
-        setColumnValues(columnIndex, cursor[childrenKey]);
-        cursor = cursor[childrenKey][cursor.defaultIndex || 0];
-      }
-    };
-    const getChild = (index) => children[index];
-    const getColumnValue = (index) => {
-      const column = getChild(index);
-      if (column) {
-        return column.getValue();
-      }
-    };
-    const setColumnValue = (index, value) => {
-      const column = getChild(index);
-      if (column) {
-        column.setValue(value);
-        if (dataType.value === "cascade") {
-          onCascadeChange(index);
-        }
-      }
-    };
-    const getColumnIndex = (index) => {
-      const column = getChild(index);
-      if (column) {
-        return column.state.index;
-      }
-    };
-    const setColumnIndex = (columnIndex, optionIndex) => {
-      const column = getChild(columnIndex);
-      if (column) {
-        column.setIndex(optionIndex);
-        if (dataType.value === "cascade") {
-          onCascadeChange(columnIndex);
-        }
+      switch (columnsType.value) {
+        case "multiple":
+          return columns;
+        case "cascade":
+          return (0, import_utils2.formatCascadeColumns)(columns, fields.value, selectedValues);
+        default:
+          return [columns];
       }
-    };
-    const getColumnValues = (index) => {
-      const column = getChild(index);
-      if (column) {
-        return column.state.options;
+    });
+    const hasOptions = (0, import_vue2.computed)(() => currentColumns.value.some((options) => options.length));
+    const selectedOptions = (0, import_vue2.computed)(() => currentColumns.value.map((options, index) => (0, import_utils2.findOptionByValue)(options, selectedValues.value[index], fields.value)));
+    const setValue = (index, value) => {
+      if (selectedValues.value[index] !== value) {
+        const newValues = selectedValues.value.slice(0);
+        newValues[index] = value;
+        selectedValues.value = newValues;
+      }
+    };
+    const onChange = (value, columnIndex) => {
+      setValue(columnIndex, value);
+      if (columnsType.value === "cascade") {
+        selectedValues.value.forEach((value2, index) => {
+          const options = currentColumns.value[index];
+          if (!(0, import_utils2.isOptionExist)(options, value2, fields.value)) {
+            setValue(index, options.length ? options[0][fields.value.value] : void 0);
+          }
+        });
       }
-    };
-    const getValues = () => children.map((child) => child.getValue());
-    const setValues = (values) => {
-      values.forEach((value, index) => {
-        setColumnValue(index, value);
+      emit("change", {
+        columnIndex,
+        selectedValues: selectedValues.value,
+        selectedOptions: selectedOptions.value
       });
     };
-    const setIndexes = (indexes) => {
-      indexes.forEach((optionIndex, columnIndex) => {
-        setColumnIndex(columnIndex, optionIndex);
-      });
-    };
-    const emitAction = (event) => {
-      if (dataType.value === "plain") {
-        emit(event, getColumnValue(0), getColumnIndex(0));
-      } else {
-        emit(event, getValues(), getIndexes());
-      }
-    };
-    const onChange = (columnIndex) => {
-      if (dataType.value === "cascade") {
-        onCascadeChange(columnIndex);
-      }
-      if (dataType.value === "plain") {
-        emit("change", getColumnValue(0), getColumnIndex(0));
-      } else {
-        emit("change", getValues(), columnIndex);
-      }
-    };
     const confirm = () => {
       children.forEach((child) => child.stopMomentum());
-      emitAction("confirm");
+      emit("confirm", {
+        selectedValues: selectedValues.value,
+        selectedOptions: selectedOptions.value
+      });
     };
-    const cancel = () => emitAction("cancel");
+    const cancel = () => emit("cancel", {
+      selectedValues: selectedValues.value,
+      selectedOptions: selectedOptions.value
+    });
     const renderTitle = () => {
       if (slots.title) {
         return slots.title();
@@ -257,36 +145,31 @@ var stdin_default = (0, import_vue2.defineComponent)({
     };
     const renderToolbar = () => {
       if (props.showToolbar) {
-        const slot = slots.toolbar || slots.default;
         return (0, import_vue.createVNode)("div", {
           "class": bem("toolbar")
-        }, [slot ? slot() : [renderCancel(), renderTitle(), renderConfirm()]]);
-      }
-    };
-    const renderColumnItems = () => formattedColumns.value.map((item, columnIndex) => {
-      var _a;
-      return (0, import_vue.createVNode)(import_PickerColumn.default, {
-        "textKey": textKey,
-        "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],
-        "visibleItemCount": props.visibleItemCount,
-        "onChange": () => onChange(columnIndex)
-      }, {
-        option: slots.option
-      });
-    });
+        }, [slots.toolbar ? slots.toolbar() : [renderCancel(), renderTitle(), renderConfirm()]]);
+      }
+    };
+    const renderColumnItems = () => currentColumns.value.map((options, columnIndex) => (0, import_vue.createVNode)(import_PickerColumn.default, {
+      "value": selectedValues.value[columnIndex],
+      "fields": fields.value,
+      "options": options,
+      "readonly": props.readonly,
+      "allowHtml": props.allowHtml,
+      "optionHeight": optionHeight.value,
+      "swipeDuration": props.swipeDuration,
+      "visibleOptionNum": props.visibleOptionNum,
+      "onChange": (value) => onChange(value, columnIndex)
+    }, {
+      option: slots.option
+    }));
     const renderMask = (wrapHeight) => {
       if (hasOptions.value) {
         const frameStyle = {
-          height: `${itemHeight.value}px`
+          height: `${optionHeight.value}px`
         };
         const maskStyle = {
-          backgroundSize: `100% ${(wrapHeight - itemHeight.value) / 2}px`
+          backgroundSize: `100% ${(wrapHeight - optionHeight.value) / 2}px`
         };
         return [(0, import_vue.createVNode)("div", {
           "class": bem("mask"),
@@ -298,7 +181,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
       }
     };
     const renderColumns = () => {
-      const wrapHeight = itemHeight.value * +props.visibleItemCount;
+      const wrapHeight = optionHeight.value * +props.visibleOptionNum;
       const columnsStyle = {
         height: `${wrapHeight}px`
       };
@@ -308,21 +191,33 @@ var stdin_default = (0, import_vue2.defineComponent)({
         "onTouchmove": import_utils.preventDefault
       }, [renderColumnItems(), renderMask(wrapHeight)]);
     };
-    (0, import_vue2.watch)(() => props.columns, format, {
+    (0, import_vue2.watch)(currentColumns, (columns) => {
+      columns.forEach((options, index) => {
+        if (options.length && !(0, import_utils2.isOptionExist)(options, selectedValues.value[index], fields.value)) {
+          setValue(index, (0, import_utils2.getFirstEnabledOption)(options)[fields.value.value]);
+        }
+      });
+    }, {
+      immediate: true
+    });
+    (0, import_vue2.watch)(() => props.modelValue, (newValues) => {
+      if (!(0, import_utils.isSameValue)(newValues, selectedValues.value)) {
+        selectedValues.value = newValues;
+      }
+    }, {
+      deep: true
+    });
+    (0, import_vue2.watch)(selectedValues, (newValues) => {
+      if (!(0, import_utils.isSameValue)(newValues, props.modelValue)) {
+        emit("update:modelValue", newValues);
+      }
+    }, {
       immediate: true
     });
+    const getSelectedOptions = () => selectedOptions.value;
     (0, import_use_expose.useExpose)({
       confirm,
-      getValues,
-      setValues,
-      getIndexes,
-      setIndexes,
-      getColumnIndex,
-      setColumnIndex,
-      getColumnValue,
-      setColumnValue,
-      getColumnValues,
-      setColumnValues
+      getSelectedOptions
     });
     return () => {
       var _a, _b;

package/lib/picker/PickerColumn.d.ts

@@ -1,59 +1,51 @@
-import { type InjectionKey } from 'vue';
-import type { PickerOption, PickerColumnProvide } from './types';
+import { type PropType, type InjectionKey } from 'vue';
+import type { PickerOption, PickerFieldNames, PickerColumnProvide } from './types';
 export declare const PICKER_KEY: InjectionKey<PickerColumnProvide>;
 declare const _default: import("vue").DefineComponent<{
-    textKey: {
-        type: StringConstructor;
+    value: (NumberConstructor | StringConstructor)[];
+    fields: {
+        type: PropType<Required<PickerFieldNames>>;
         required: true;
     };
+    options: {
+        type: PropType<PickerOption[]>;
+        default: () => never[];
+    };
     readonly: BooleanConstructor;
     allowHtml: BooleanConstructor;
-    className: import("vue").PropType<unknown>;
-    itemHeight: {
+    optionHeight: {
         type: NumberConstructor;
         required: true;
     };
-    defaultIndex: {
-        type: NumberConstructor;
-        default: number;
-    };
     swipeDuration: {
         type: (NumberConstructor | StringConstructor)[];
         required: true;
     };
-    initialOptions: {
-        type: import("vue").PropType<PickerOption[]>;
-        default: () => never[];
-    };
-    visibleItemCount: {
+    visibleOptionNum: {
         type: (NumberConstructor | StringConstructor)[];
         required: true;
     };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "change"[], "change", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    textKey: {
-        type: StringConstructor;
+    value: (NumberConstructor | StringConstructor)[];
+    fields: {
+        type: PropType<Required<PickerFieldNames>>;
         required: true;
     };
+    options: {
+        type: PropType<PickerOption[]>;
+        default: () => never[];
+    };
     readonly: BooleanConstructor;
     allowHtml: BooleanConstructor;
-    className: import("vue").PropType<unknown>;
-    itemHeight: {
+    optionHeight: {
         type: NumberConstructor;
         required: true;
     };
-    defaultIndex: {
-        type: NumberConstructor;
-        default: number;
-    };
     swipeDuration: {
         type: (NumberConstructor | StringConstructor)[];
         required: true;
     };
-    initialOptions: {
-        type: import("vue").PropType<PickerOption[]>;
-        default: () => never[];
-    };
-    visibleItemCount: {
+    visibleOptionNum: {
         type: (NumberConstructor | StringConstructor)[];
         required: true;
     };
@@ -61,8 +53,7 @@ declare const _default: import("vue").DefineComponent<{
     onChange?: ((...args: any[]) => any) | undefined;
 }, {
     readonly: boolean;
-    defaultIndex: number;
     allowHtml: boolean;
-    initialOptions: PickerOption[];
+    options: PickerOption[];
 }>;
 export default _default;