vant 4.6.2 → 4.6.3

package/lib/vant.es.js

@@ -1,10 +1,14 @@
-import { unref, ref, reactive, inject, watch, onMounted, nextTick, createVNode, defineComponent, getCurrentInstance, computed, onActivated, onDeactivated, onBeforeUnmount, provide, watchEffect, mergeProps, Transition, withDirectives, vShow, Teleport, Fragment, onBeforeUpdate, normalizeClass, normalizeStyle, createTextVNode, onUnmounted, createApp, resolveDirective, withKeys, onUpdated, Comment, Text, h } from "vue";
+import { unref, ref, reactive, inject, watch, onMounted, nextTick, createVNode, defineComponent, getCurrentInstance, computed, onActivated, onDeactivated, onBeforeUnmount, provide, watchEffect, mergeProps, Transition, withDirectives, vShow, Teleport, Fragment, onBeforeUpdate, createTextVNode, onUnmounted, createApp, resolveDirective, withKeys, onUpdated, Comment, Text, h } from "vue";
 import { useWindowSize, useRect, useChildren, useParent, onMountedOrActivated, getScrollParent, useEventListener, cancelRaf, raf, useScrollParent, usePageVisibility, doubleRaf, CUSTOM_FIELD_INJECTION_KEY, useCustomFieldValue, inBrowser as inBrowser$1, useToggle, useCountDown, useClickAway } from "@vant/use";
-import { stringifyStyle } from "@vue/shared";
+import { normalizeClass, stringifyStyle, normalizeStyle } from "@vue/shared";
 import { offsetModifier, createPopper } from "@vant/popperjs";
+function noop() {
+}
+const extend = Object.assign;
+const inBrowser = typeof window !== "undefined";
+const isObject = (val) => val !== null && typeof val === "object";
 const isDef = (val) => val !== void 0 && val !== null;
 const isFunction = (val) => typeof val === "function";
-const isObject = (val) => val !== null && typeof val === "object";
 const isPromise = (val) => isObject(val) && isFunction(val.then) && isFunction(val.catch);
 const isDate = (val) => Object.prototype.toString.call(val) === "[object Date]" && !Number.isNaN(val.getTime());
 function isMobile(value) {
@@ -13,10 +17,6 @@ function isMobile(value) {
 }
 const isNumeric = (val) => typeof val === "number" || /^\d+(\.\d+)?$/.test(val);
 const isIOS$1 = () => inBrowser ? /ios|iphone|ipad|ipod/.test(navigator.userAgent.toLowerCase()) : false;
-function noop() {
-}
-const extend = Object.assign;
-const inBrowser = typeof window !== "undefined";
 function get(object, path) {
   const keys = path.split(".");
   let result = object;
@@ -27,12 +27,15 @@ function get(object, path) {
   return result;
 }
 function pick(obj, keys, ignoreUndefined) {
-  return keys.reduce((ret, key) => {
-    if (!ignoreUndefined || obj[key] !== void 0) {
-      ret[key] = obj[key];
-    }
-    return ret;
-  }, {});
+  return keys.reduce(
+    (ret, key) => {
+      if (!ignoreUndefined || obj[key] !== void 0) {
+        ret[key] = obj[key];
+      }
+      return ret;
+    },
+    {}
+  );
 }
 const isSameValue = (newValue, oldValue) => JSON.stringify(newValue) === JSON.stringify(oldValue);
 const toArray = (item) => Array.isArray(item) ? item : [item];
@@ -5186,6 +5189,7 @@ var stdin_default$1q = defineComponent({
 const AddressEdit = withInstall(stdin_default$1q);
 const [name$1f, bem$1b] = createNamespace("radio-group");
 const radioGroupProps = {
+  shape: String,
   disabled: Boolean,
   iconSize: numericProp,
   direction: String,
@@ -5306,7 +5310,7 @@ var stdin_default$1n = defineComponent({
   props: extend({}, checkerProps, {
     bem: makeRequiredProp(Function),
     role: String,
-    shape: makeStringProp("round"),
+    shape: String,
     parent: Object,
     checked: Boolean,
     bindGroup: truthProp
@@ -5345,6 +5349,9 @@ var stdin_default$1n = defineComponent({
         };
       }
     });
+    const shape = computed(() => {
+      return props2.shape || getParentProp("shape") || "round";
+    });
     const onClick = (event) => {
       const {
         target
@@ -5360,17 +5367,16 @@ var stdin_default$1n = defineComponent({
       var _a, _b;
       const {
         bem: bem2,
-        shape,
         checked
       } = props2;
       const iconSize = props2.iconSize || getParentProp("iconSize");
       return createVNode("div", {
         "ref": iconRef,
-        "class": bem2("icon", [shape, {
+        "class": bem2("icon", [shape.value, {
           disabled: disabled.value,
           checked
         }]),
-        "style": shape !== "dot" ? {
+        "style": shape.value !== "dot" ? {
           fontSize: addUnit(iconSize)
         } : {
           width: addUnit(iconSize),
@@ -5380,7 +5386,7 @@ var stdin_default$1n = defineComponent({
       }, [slots.icon ? slots.icon({
         checked,
         disabled: disabled.value
-      }) : shape !== "dot" ? createVNode(Icon, {
+      }) : shape.value !== "dot" ? createVNode(Icon, {
         "name": "success",
         "style": iconStyle.value
       }, null) : createVNode("div", {
@@ -5415,7 +5421,7 @@ var stdin_default$1n = defineComponent({
   }
 });
 const radioProps = extend({}, checkerProps, {
-  shape: makeStringProp("round")
+  shape: String
 });
 const [name$1d, bem$19] = createNamespace("radio");
 var stdin_default$1m = defineComponent({
@@ -5544,6 +5550,7 @@ const addressListProps = {
   switchable: truthProp,
   disabledText: String,
   disabledList: makeArrayProp(),
+  showAddButton: truthProp,
   addButtonText: String,
   defaultTagText: String,
   rightIcon: makeStringProp("edit")
@@ -5585,7 +5592,7 @@ var stdin_default$1k = defineComponent({
         return list.map((item, index) => renderItem(item, index, disabled));
       }
     };
-    const renderBottom = () => createVNode("div", {
+    const renderBottom = () => props2.showAddButton ? createVNode("div", {
       "class": [bem$17("bottom"), "van-safe-area-bottom"]
     }, [createVNode(Button, {
       "round": true,
@@ -5594,7 +5601,7 @@ var stdin_default$1k = defineComponent({
       "text": props2.addButtonText || t$h("add"),
       "class": bem$17("add"),
       "onClick": () => emit("add")
-    }, null)]);
+    }, null)]) : void 0;
     return () => {
       var _a, _b;
       const List2 = renderList(props2.list);
@@ -7413,6 +7420,7 @@ const CellGroup = withInstall(stdin_default$1a);
 const [name$10, bem$$] = createNamespace("checkbox-group");
 const checkboxGroupProps = {
   max: numericProp,
+  shape: makeStringProp("round"),
   disabled: Boolean,
   iconSize: numericProp,
   direction: String,
@@ -7474,7 +7482,7 @@ var stdin_default$19 = defineComponent({
 });
 const [name$$, bem$_] = createNamespace("checkbox");
 const checkboxProps = extend({}, checkerProps, {
-  shape: makeStringProp("round"),
+  shape: String,
   bindGroup: truthProp
 });
 var stdin_default$18 = defineComponent({
@@ -16377,7 +16385,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.6.2";
+const version = "4.6.3";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.js

@@ -2,10 +2,14 @@
   typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("vue")) : typeof define === "function" && define.amd ? define(["exports", "vue"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.vant = {}, global.Vue));
 })(this, function(exports2, vue) {
   "use strict";
+  function noop() {
+  }
+  const extend = Object.assign;
+  const inBrowser$1 = typeof window !== "undefined";
+  const isObject$1 = (val) => val !== null && typeof val === "object";
   const isDef = (val) => val !== void 0 && val !== null;
   const isFunction = (val) => typeof val === "function";
-  const isObject = (val) => val !== null && typeof val === "object";
-  const isPromise = (val) => isObject(val) && isFunction(val.then) && isFunction(val.catch);
+  const isPromise = (val) => isObject$1(val) && isFunction(val.then) && isFunction(val.catch);
   const isDate = (val) => Object.prototype.toString.call(val) === "[object Date]" && !Number.isNaN(val.getTime());
   function isMobile(value) {
     value = value.replace(/[^-|\d]/g, "");
@@ -13,26 +17,25 @@
   }
   const isNumeric = (val) => typeof val === "number" || /^\d+(\.\d+)?$/.test(val);
   const isIOS$1 = () => inBrowser$1 ? /ios|iphone|ipad|ipod/.test(navigator.userAgent.toLowerCase()) : false;
-  function noop() {
-  }
-  const extend = Object.assign;
-  const inBrowser$1 = typeof window !== "undefined";
   function get(object, path) {
     const keys = path.split(".");
     let result = object;
     keys.forEach((key) => {
       var _a;
-      result = isObject(result) ? (_a = result[key]) != null ? _a : "" : "";
+      result = isObject$1(result) ? (_a = result[key]) != null ? _a : "" : "";
     });
     return result;
   }
   function pick(obj, keys, ignoreUndefined) {
-    return keys.reduce((ret, key) => {
-      if (!ignoreUndefined || obj[key] !== void 0) {
-        ret[key] = obj[key];
-      }
-      return ret;
-    }, {});
+    return keys.reduce(
+      (ret, key) => {
+        if (!ignoreUndefined || obj[key] !== void 0) {
+          ret[key] = obj[key];
+        }
+        return ret;
+      },
+      {}
+    );
   }
   const isSameValue = (newValue, oldValue) => JSON.stringify(newValue) === JSON.stringify(oldValue);
   const toArray = (item) => Array.isArray(item) ? item : [item];
@@ -614,7 +617,7 @@
     if (!isDef(val)) {
       return;
     }
-    if (!hasOwnProperty.call(to, key) || !isObject(val)) {
+    if (!hasOwnProperty.call(to, key) || !isObject$1(val)) {
       to[key] = val;
     } else {
       to[key] = deepAssign(Object(to[key]), val);
@@ -2292,7 +2295,9 @@
     });
     return propRef;
   };
+  const isArray = Array.isArray;
   const isString = (val) => typeof val === "string";
+  const isObject = (val) => val !== null && typeof val === "object";
   const cacheStringFunction = (fn) => {
     const cache = /* @__PURE__ */ Object.create(null);
     return (str) => {
@@ -2304,6 +2309,38 @@
   const hyphenate = cacheStringFunction(
     (str) => str.replace(hyphenateRE, "-$1").toLowerCase()
   );
+  function normalizeStyle(value) {
+    if (isArray(value)) {
+      const res = {};
+      for (let i = 0; i < value.length; i++) {
+        const item = value[i];
+        const normalized = isString(item) ? parseStringStyle(item) : normalizeStyle(item);
+        if (normalized) {
+          for (const key in normalized) {
+            res[key] = normalized[key];
+          }
+        }
+      }
+      return res;
+    } else if (isString(value)) {
+      return value;
+    } else if (isObject(value)) {
+      return value;
+    }
+  }
+  const listDelimiterRE = /;(?![^(]*\))/g;
+  const propertyDelimiterRE = /:([^]+)/;
+  const styleCommentRE = /\/\*[^]*?\*\//g;
+  function parseStringStyle(cssText) {
+    const ret = {};
+    cssText.replace(styleCommentRE, "").split(listDelimiterRE).forEach((item) => {
+      if (item) {
+        const tmp = item.split(propertyDelimiterRE);
+        tmp.length > 1 && (ret[tmp[0].trim()] = tmp[1].trim());
+      }
+    });
+    return ret;
+  }
   function stringifyStyle(styles) {
     let ret = "";
     if (!styles || isString(styles)) {
@@ -2318,6 +2355,26 @@
     }
     return ret;
   }
+  function normalizeClass(value) {
+    let res = "";
+    if (isString(value)) {
+      res = value;
+    } else if (isArray(value)) {
+      for (let i = 0; i < value.length; i++) {
+        const normalized = normalizeClass(value[i]);
+        if (normalized) {
+          res += normalized + " ";
+        }
+      }
+    } else if (isObject(value)) {
+      for (const name2 in value) {
+        if (value[name2]) {
+          res += name2 + " ";
+        }
+      }
+    }
+    return res.trim();
+  }
   function scrollLeftTo(scroller, to, duration) {
     let rafId;
     let count = 0;
@@ -3512,8 +3569,8 @@
           titleClass,
           titleStyle
         } = props2;
-        parsedClass.value = titleClass ? vue.normalizeClass(titleClass) : "";
-        parsedStyle.value = titleStyle && typeof titleStyle !== "string" ? stringifyStyle(vue.normalizeStyle(titleStyle)) : titleStyle;
+        parsedClass.value = titleClass ? normalizeClass(titleClass) : "";
+        parsedStyle.value = titleStyle && typeof titleStyle !== "string" ? stringifyStyle(normalizeStyle(titleStyle)) : titleStyle;
       });
       const renderTitle = (onClickTab) => vue.createVNode(TabTitle, vue.mergeProps({
         "key": id,
@@ -4332,7 +4389,7 @@
     const scrollTop = getRootScrollTop();
     input.style.height = "auto";
     let height2 = input.scrollHeight;
-    if (isObject(autosize)) {
+    if (isObject$1(autosize)) {
       const { maxHeight, minHeight } = autosize;
       if (maxHeight !== void 0) {
         height2 = Math.min(height2, maxHeight);
@@ -5070,7 +5127,7 @@
   let currentOptions$2 = extend({}, defaultOptions$1);
   const defaultOptionsMap = /* @__PURE__ */ new Map();
   function parseOptions$1(message) {
-    if (isObject(message)) {
+    if (isObject$1(message)) {
       return message;
     }
     return {
@@ -5370,7 +5427,7 @@
       const data = vue.reactive({});
       const showAreaPopup = vue.ref(false);
       const detailFocused = vue.ref(false);
-      const areaListLoaded = vue.computed(() => isObject(props2.areaList) && Object.keys(props2.areaList).length);
+      const areaListLoaded = vue.computed(() => isObject$1(props2.areaList) && Object.keys(props2.areaList).length);
       const areaText = vue.computed(() => {
         const {
           province,
@@ -5593,6 +5650,7 @@
   const AddressEdit = withInstall(stdin_default$1q);
   const [name$1f, bem$1b] = createNamespace("radio-group");
   const radioGroupProps = {
+    shape: String,
     disabled: Boolean,
     iconSize: numericProp,
     direction: String,
@@ -5713,7 +5771,7 @@
     props: extend({}, checkerProps, {
       bem: makeRequiredProp(Function),
       role: String,
-      shape: makeStringProp("round"),
+      shape: String,
       parent: Object,
       checked: Boolean,
       bindGroup: truthProp
@@ -5752,6 +5810,9 @@
           };
         }
       });
+      const shape = vue.computed(() => {
+        return props2.shape || getParentProp("shape") || "round";
+      });
       const onClick = (event) => {
         const {
           target
@@ -5767,17 +5828,16 @@
         var _a, _b;
         const {
           bem: bem2,
-          shape,
           checked
         } = props2;
         const iconSize = props2.iconSize || getParentProp("iconSize");
         return vue.createVNode("div", {
           "ref": iconRef,
-          "class": bem2("icon", [shape, {
+          "class": bem2("icon", [shape.value, {
             disabled: disabled.value,
             checked
           }]),
-          "style": shape !== "dot" ? {
+          "style": shape.value !== "dot" ? {
             fontSize: addUnit(iconSize)
           } : {
             width: addUnit(iconSize),
@@ -5787,7 +5847,7 @@
         }, [slots.icon ? slots.icon({
           checked,
           disabled: disabled.value
-        }) : shape !== "dot" ? vue.createVNode(Icon, {
+        }) : shape.value !== "dot" ? vue.createVNode(Icon, {
           "name": "success",
           "style": iconStyle.value
         }, null) : vue.createVNode("div", {
@@ -5822,7 +5882,7 @@
     }
   });
   const radioProps = extend({}, checkerProps, {
-    shape: makeStringProp("round")
+    shape: String
   });
   const [name$1d, bem$19] = createNamespace("radio");
   var stdin_default$1m = vue.defineComponent({
@@ -5951,6 +6011,7 @@
     switchable: truthProp,
     disabledText: String,
     disabledList: makeArrayProp(),
+    showAddButton: truthProp,
     addButtonText: String,
     defaultTagText: String,
     rightIcon: makeStringProp("edit")
@@ -5992,7 +6053,7 @@
           return list.map((item, index) => renderItem(item, index, disabled));
         }
       };
-      const renderBottom = () => vue.createVNode("div", {
+      const renderBottom = () => props2.showAddButton ? vue.createVNode("div", {
         "class": [bem$17("bottom"), "van-safe-area-bottom"]
       }, [vue.createVNode(Button, {
         "round": true,
@@ -6001,7 +6062,7 @@
         "text": props2.addButtonText || t$h("add"),
         "class": bem$17("add"),
         "onClick": () => emit("add")
-      }, null)]);
+      }, null)]) : void 0;
       return () => {
         var _a, _b;
         const List2 = renderList(props2.list);
@@ -7817,6 +7878,7 @@
   const [name$10, bem$$] = createNamespace("checkbox-group");
   const checkboxGroupProps = {
     max: numericProp,
+    shape: makeStringProp("round"),
     disabled: Boolean,
     iconSize: numericProp,
     direction: String,
@@ -7878,7 +7940,7 @@
   });
   const [name$$, bem$_] = createNamespace("checkbox");
   const checkboxProps = extend({}, checkerProps, {
-    shape: makeStringProp("round"),
+    shape: String,
     bindGroup: truthProp
   });
   var stdin_default$18 = vue.defineComponent({
@@ -8030,7 +8092,7 @@
           strokeLinecap
         } = props2;
         const offset2 = PERIMETER * currentRate / 100;
-        const color = isObject(props2.color) ? `url(#${id})` : props2.color;
+        const color = isObject$1(props2.color) ? `url(#${id})` : props2.color;
         const style = {
           stroke: color,
           strokeWidth: `${+strokeWidth + 1}px`,
@@ -8060,7 +8122,7 @@
         const {
           color
         } = props2;
-        if (!isObject(color)) {
+        if (!isObject$1(color)) {
           return;
         }
         const Stops = Object.keys(color).sort((a, b) => parseFloat(a) - parseFloat(b)).map((key, index) => vue.createVNode("stop", {
@@ -11770,7 +11832,7 @@
   });
   let timer;
   let instance;
-  const parseOptions = (message) => isObject(message) ? message : {
+  const parseOptions = (message) => isObject$1(message) ? message : {
     message
   };
   function initInstance() {
@@ -15704,7 +15766,7 @@
           const {
             to
           } = props2;
-          const config = isObject(to) ? to : {
+          const config = isObject$1(to) ? to : {
             path: to
           };
           return !!$route.matched.find((val) => {
@@ -17290,7 +17352,7 @@
       valueFormatter(value) {
         let src = value;
         let { loading, error } = this.options;
-        if (isObject(value)) {
+        if (isObject$1(value)) {
           ({ src } = value);
           loading = value.loading || this.options.loading;
           error = value.error || this.options.error;
@@ -17535,7 +17597,7 @@
       });
     }
   };
-  const version = "4.6.2";
+  const version = "4.6.3";
   function install(app) {
     const components = [
       ActionBar,