vant 3.4.8 → 3.5.0-beta.1

package/lib/picker/Picker.js

@@ -69,15 +69,16 @@ var stdin_default = (0, import_vue2.defineComponent)({
     }
     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 columnsFieldNames = (0, import_vue2.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
@@ -87,10 +88,10 @@ var stdin_default = (0, import_vue2.defineComponent)({
     const dataType = (0, import_vue2.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";
         }
       }
@@ -100,10 +101,10 @@ var stdin_default = (0, import_vue2.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) {
@@ -114,7 +115,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
           }
         }
         formatted.push({
-          [valuesKey]: cursor[childrenKey],
+          [columnsFieldNames.value.values]: cursor[columnsFieldNames.value.children],
           className: cursor.className,
           defaultIndex
         });
@@ -128,14 +129,14 @@ var stdin_default = (0, import_vue2.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) => {
@@ -147,16 +148,16 @@ var stdin_default = (0, import_vue2.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];
@@ -266,14 +267,14 @@ var stdin_default = (0, import_vue2.defineComponent)({
     const renderColumnItems = () => formattedColumns.value.map((item, columnIndex) => {
       var _a;
       return (0, import_vue.createVNode)(import_PickerColumn.default, {
-        "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)
       }, {

package/lib/switch/Switch.js

@@ -47,7 +47,8 @@ var stdin_default = (0, import_vue2.defineComponent)({
   props: switchProps,
   emits: ["change", "update:modelValue"],
   setup(props, {
-    emit
+    emit,
+    slots
   }) {
     const isChecked = () => props.modelValue === props.activeValue;
     const onClick = () => {
@@ -65,6 +66,9 @@ var stdin_default = (0, import_vue2.defineComponent)({
           "color": color
         }, null);
       }
+      if (slots.node) {
+        return slots.node();
+      }
     };
     (0, import_use.useCustomFieldValue)(() => props.modelValue);
     return () => {

package/lib/uploader/Uploader.js

@@ -95,7 +95,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
         }
       }
       items = (0, import_vue2.reactive)(items);
-      emit("update:modelValue", [...props.modelValue, ...(0, import_utils2.toArray)(items)]);
+      emit("update:modelValue", [...props.modelValue, ...(0, import_utils.toArray)(items)]);
       if (props.afterRead) {
         props.afterRead(items, getDetail());
       }
@@ -205,9 +205,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
         "onClick": () => emit("click-preview", item, getDetail(index)),
         "onDelete": () => deleteFile(item, index),
         "onPreview": () => previewImage(item)
-      }, (0, import_utils.pick)(props, ["name", "lazyLoad"]), previewData), {
-        "preview-cover": slots["preview-cover"]
-      });
+      }, (0, import_utils.pick)(props, ["name", "lazyLoad"]), previewData), (0, import_utils.pick)(slots, ["preview-cover", "preview-delete"]));
     };
     const renderPreviewList = () => {
       if (props.previewImage) {

package/lib/uploader/UploaderPreviewItem.js

@@ -82,13 +82,16 @@ var stdin_default = (0, import_vue2.defineComponent)({
     const onPreview = () => emit("preview");
     const renderDeleteIcon = () => {
       if (props.deletable && props.item.status !== "uploading") {
+        const slot = slots["preview-delete"];
         return (0, import_vue.createVNode)("div", {
           "role": "button",
-          "class": (0, import_utils.bem)("preview-delete"),
+          "class": (0, import_utils.bem)("preview-delete", {
+            shadow: !slot
+          }),
           "tabindex": 0,
           "aria-label": (0, import_utils.t)("delete"),
           "onClick": onDelete
-        }, [(0, import_vue.createVNode)(import_icon.Icon, {
+        }, [slot ? slot() : (0, import_vue.createVNode)(import_icon.Icon, {
           "name": "cross",
           "class": (0, import_utils.bem)("preview-delete-icon")
         }, null)]);

package/lib/uploader/index.css

@@ -1 +1 @@
-:root{--van-uploader-size: 80px;--van-uploader-icon-size: 24px;--van-uploader-icon-color: var(--van-gray-4);--van-uploader-text-color: var(--van-text-color-2);--van-uploader-text-font-size: var(--van-font-size-sm);--van-uploader-upload-background-color: var(--van-gray-1);--van-uploader-upload-active-color: var(--van-active-color);--van-uploader-delete-color: var(--van-white);--van-uploader-delete-icon-size: 14px;--van-uploader-delete-background-color: rgba(0, 0, 0, .7);--van-uploader-file-background-color: var(--van-background-color);--van-uploader-file-icon-size: 20px;--van-uploader-file-icon-color: var(--van-gray-7);--van-uploader-file-name-padding: 0 var(--van-padding-base);--van-uploader-file-name-margin-top: var(--van-padding-xs);--van-uploader-file-name-font-size: var(--van-font-size-sm);--van-uploader-file-name-text-color: var(--van-gray-7);--van-uploader-mask-text-color: var(--van-white);--van-uploader-mask-background-color: rgba(50, 50, 51, .88);--van-uploader-mask-icon-size: 22px;--van-uploader-mask-message-font-size: var(--van-font-size-sm);--van-uploader-mask-message-line-height: var(--van-line-height-xs);--van-uploader-loading-icon-size: 22px;--van-uploader-loading-icon-color: var(--van-white);--van-uploader-disabled-opacity: var(--van-disabled-opacity)}.van-uploader{position:relative;display:inline-block}.van-uploader__wrapper{display:flex;flex-wrap:wrap}.van-uploader__wrapper--disabled{opacity:var(--van-uploader-disabled-opacity)}.van-uploader__input{position:absolute;top:0;left:0;width:100%;height:100%;overflow:hidden;cursor:pointer;opacity:0}.van-uploader__input-wrapper{position:relative}.van-uploader__input:disabled{cursor:not-allowed}.van-uploader__upload{position:relative;display:flex;flex-direction:column;align-items:center;justify-content:center;box-sizing:border-box;width:var(--van-uploader-size);height:var(--van-uploader-size);margin:0 var(--van-padding-xs) var(--van-padding-xs) 0;background:var(--van-uploader-upload-background-color)}.van-uploader__upload:active{background-color:var(--van-uploader-upload-active-color)}.van-uploader__upload--readonly:active{background-color:var(--van-uploader-upload-background-color)}.van-uploader__upload-icon{color:var(--van-uploader-icon-color);font-size:var(--van-uploader-icon-size)}.van-uploader__upload-text{margin-top:var(--van-padding-xs);color:var(--van-uploader-text-color);font-size:var(--van-uploader-text-font-size)}.van-uploader__preview{position:relative;margin:0 var(--van-padding-xs) var(--van-padding-xs) 0;cursor:pointer}.van-uploader__preview-image{display:block;width:var(--van-uploader-size);height:var(--van-uploader-size);overflow:hidden}.van-uploader__preview-delete{position:absolute;top:0;right:0;width:var(--van-uploader-delete-icon-size);height:var(--van-uploader-delete-icon-size);background:var(--van-uploader-delete-background-color);border-radius:0 0 0 12px}.van-uploader__preview-delete-icon{position:absolute;top:0;right:0;color:var(--van-uploader-delete-color);font-size:var(--van-uploader-delete-icon-size);transform:scale(.7) translate(10%,-10%)}.van-uploader__preview-cover{position:absolute;top:0;right:0;bottom:0;left:0}.van-uploader__mask{position:absolute;top:0;right:0;bottom:0;left:0;display:flex;flex-direction:column;align-items:center;justify-content:center;color:var(--van-uploader-mask-text-color);background:var(--van-uploader-mask-background-color)}.van-uploader__mask-icon{font-size:var(--van-uploader-mask-icon-size)}.van-uploader__mask-message{margin-top:6px;padding:0 var(--van-padding-base);font-size:var(--van-uploader-mask-message-font-size);line-height:var(--van-uploader-mask-message-line-height)}.van-uploader__loading{width:var(--van-uploader-loading-icon-size);height:var(--van-uploader-loading-icon-size);color:var(--van-uploader-loading-icon-color)}.van-uploader__file{display:flex;flex-direction:column;align-items:center;justify-content:center;width:var(--van-uploader-size);height:var(--van-uploader-size);background:var(--van-uploader-file-background-color)}.van-uploader__file-icon{color:var(--van-uploader-file-icon-color);font-size:var(--van-uploader-file-icon-size)}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:var(--van-uploader-file-name-margin-top);padding:var(--van-uploader-file-name-padding);color:var(--van-uploader-file-name-text-color);font-size:var(--van-uploader-file-name-font-size);text-align:center}
+:root{--van-uploader-size: 80px;--van-uploader-icon-size: 24px;--van-uploader-icon-color: var(--van-gray-4);--van-uploader-text-color: var(--van-text-color-2);--van-uploader-text-font-size: var(--van-font-size-sm);--van-uploader-upload-background-color: var(--van-gray-1);--van-uploader-upload-active-color: var(--van-active-color);--van-uploader-delete-color: var(--van-white);--van-uploader-delete-icon-size: 14px;--van-uploader-delete-background-color: rgba(0, 0, 0, .7);--van-uploader-file-background-color: var(--van-background-color);--van-uploader-file-icon-size: 20px;--van-uploader-file-icon-color: var(--van-gray-7);--van-uploader-file-name-padding: 0 var(--van-padding-base);--van-uploader-file-name-margin-top: var(--van-padding-xs);--van-uploader-file-name-font-size: var(--van-font-size-sm);--van-uploader-file-name-text-color: var(--van-gray-7);--van-uploader-mask-text-color: var(--van-white);--van-uploader-mask-background-color: rgba(50, 50, 51, .88);--van-uploader-mask-icon-size: 22px;--van-uploader-mask-message-font-size: var(--van-font-size-sm);--van-uploader-mask-message-line-height: var(--van-line-height-xs);--van-uploader-loading-icon-size: 22px;--van-uploader-loading-icon-color: var(--van-white);--van-uploader-disabled-opacity: var(--van-disabled-opacity)}.van-uploader{position:relative;display:inline-block}.van-uploader__wrapper{display:flex;flex-wrap:wrap}.van-uploader__wrapper--disabled{opacity:var(--van-uploader-disabled-opacity)}.van-uploader__input{position:absolute;top:0;left:0;width:100%;height:100%;overflow:hidden;cursor:pointer;opacity:0}.van-uploader__input-wrapper{position:relative}.van-uploader__input:disabled{cursor:not-allowed}.van-uploader__upload{position:relative;display:flex;flex-direction:column;align-items:center;justify-content:center;box-sizing:border-box;width:var(--van-uploader-size);height:var(--van-uploader-size);margin:0 var(--van-padding-xs) var(--van-padding-xs) 0;background:var(--van-uploader-upload-background-color)}.van-uploader__upload:active{background-color:var(--van-uploader-upload-active-color)}.van-uploader__upload--readonly:active{background-color:var(--van-uploader-upload-background-color)}.van-uploader__upload-icon{color:var(--van-uploader-icon-color);font-size:var(--van-uploader-icon-size)}.van-uploader__upload-text{margin-top:var(--van-padding-xs);color:var(--van-uploader-text-color);font-size:var(--van-uploader-text-font-size)}.van-uploader__preview{position:relative;margin:0 var(--van-padding-xs) var(--van-padding-xs) 0;cursor:pointer}.van-uploader__preview-image{display:block;width:var(--van-uploader-size);height:var(--van-uploader-size);overflow:hidden}.van-uploader__preview-delete{position:absolute;top:0;right:0}.van-uploader__preview-delete--shadow{width:var(--van-uploader-delete-icon-size);height:var(--van-uploader-delete-icon-size);background:var(--van-uploader-delete-background-color);border-radius:0 0 0 12px}.van-uploader__preview-delete-icon{position:absolute;top:0;right:0;color:var(--van-uploader-delete-color);font-size:var(--van-uploader-delete-icon-size);transform:scale(.7) translate(10%,-10%)}.van-uploader__preview-cover{position:absolute;top:0;right:0;bottom:0;left:0}.van-uploader__mask{position:absolute;top:0;right:0;bottom:0;left:0;display:flex;flex-direction:column;align-items:center;justify-content:center;color:var(--van-uploader-mask-text-color);background:var(--van-uploader-mask-background-color)}.van-uploader__mask-icon{font-size:var(--van-uploader-mask-icon-size)}.van-uploader__mask-message{margin-top:6px;padding:0 var(--van-padding-base);font-size:var(--van-uploader-mask-message-font-size);line-height:var(--van-uploader-mask-message-line-height)}.van-uploader__loading{width:var(--van-uploader-loading-icon-size);height:var(--van-uploader-loading-icon-size);color:var(--van-uploader-loading-icon-color)}.van-uploader__file{display:flex;flex-direction:column;align-items:center;justify-content:center;width:var(--van-uploader-size);height:var(--van-uploader-size);background:var(--van-uploader-file-background-color)}.van-uploader__file-icon{color:var(--van-uploader-file-icon-color);font-size:var(--van-uploader-file-icon-size)}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:var(--van-uploader-file-name-margin-top);padding:var(--van-uploader-file-name-padding);color:var(--van-uploader-file-name-text-color);font-size:var(--van-uploader-file-name-font-size);text-align:center}

package/lib/uploader/index.less

@@ -108,10 +108,13 @@
       position: absolute;
       top: 0;
       right: 0;
-      width: var(--van-uploader-delete-icon-size);
-      height: var(--van-uploader-delete-icon-size);
-      background: var(--van-uploader-delete-background-color);
-      border-radius: 0 0 0 12px;
+
+      &--shadow {
+        width: var(--van-uploader-delete-icon-size);
+        height: var(--van-uploader-delete-icon-size);
+        background: var(--van-uploader-delete-background-color);
+        border-radius: 0 0 0 12px;
+      }
 
       &-icon {
         position: absolute;

package/lib/uploader/utils.d.ts

@@ -1,7 +1,6 @@
 import type { UploaderMaxSize, UploaderResultType, UploaderFileListItem } from './types';
 declare const name: string, bem: (el?: import("../utils").Mods | undefined, mods?: import("../utils").Mods | undefined) => import("../utils").Mods, t: (path: string, ...args: unknown[]) => any;
 export { name, bem, t };
-export declare const toArray: <T>(item: T | T[]) => T[];
 export declare function readFileContent(file: File, resultType: UploaderResultType): Promise<string | void>;
 export declare function isOversize(items: UploaderFileListItem | UploaderFileListItem[], maxSize: UploaderMaxSize): boolean;
 export declare function filterFiles(items: UploaderFileListItem[], maxSize: UploaderMaxSize): {

package/lib/uploader/utils.js

@@ -24,13 +24,11 @@ __export(stdin_exports, {
   isOversize: () => isOversize,
   name: () => name,
   readFileContent: () => readFileContent,
-  t: () => t,
-  toArray: () => toArray
+  t: () => t
 });
 module.exports = __toCommonJS(stdin_exports);
 var import_utils = require("../utils");
 const [name, bem, t] = (0, import_utils.createNamespace)("uploader");
-const toArray = (item) => Array.isArray(item) ? item : [item];
 function readFileContent(file, resultType) {
   return new Promise((resolve) => {
     if (resultType === "file") {
@@ -49,7 +47,7 @@ function readFileContent(file, resultType) {
   });
 }
 function isOversize(items, maxSize) {
-  return toArray(items).some((item) => {
+  return (0, import_utils.toArray)(items).some((item) => {
     if (item.file) {
       if ((0, import_utils.isFunction)(maxSize)) {
         return maxSize(item.file);

package/lib/utils/basic.d.ts

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

package/lib/utils/basic.js

@@ -21,7 +21,8 @@ __export(stdin_exports, {
   get: () => get,
   inBrowser: () => inBrowser,
   noop: () => noop,
-  pick: () => pick
+  pick: () => pick,
+  toArray: () => toArray
 });
 module.exports = __toCommonJS(stdin_exports);
 function noop() {
@@ -45,3 +46,4 @@ function pick(obj, keys, ignoreUndefined) {
     return ret;
   }, {});
 }
+const toArray = (item) => Array.isArray(item) ? item : [item];