vant 4.6.1 → 4.6.3

package/lib/utils/dom.js

@@ -32,7 +32,7 @@ __export(stdin_exports, {
 module.exports = __toCommonJS(stdin_exports);
 var import_use = require("@vant/use");
 var import_vue = require("vue");
-var import_validate = require("./validate");
+var import_basic = require("./basic");
 function getScrollTop(el) {
   const top = "scrollTop" in el ? el.scrollTop : el.pageYOffset;
   return Math.max(top, 0);
@@ -58,7 +58,7 @@ function getElementTop(el, scroller) {
   const scrollTop = scroller ? getScrollTop(scroller) : getRootScrollTop();
   return (0, import_use.useRect)(el).top + scrollTop;
 }
-const isIOS = (0, import_validate.isIOS)();
+const isIOS = (0, import_basic.isIOS)();
 function resetScroll() {
   if (isIOS) {
     setRootScrollTop(getRootScrollTop());

package/lib/utils/format.js

@@ -31,15 +31,15 @@ __export(stdin_exports, {
 module.exports = __toCommonJS(stdin_exports);
 var import_basic = require("./basic");
 var import_dom = require("./dom");
-var import_validate = require("./validate");
+var import_basic2 = require("./basic");
 function addUnit(value) {
-  if ((0, import_validate.isDef)(value)) {
-    return (0, import_validate.isNumeric)(value) ? `${value}px` : String(value);
+  if ((0, import_basic2.isDef)(value)) {
+    return (0, import_basic2.isNumeric)(value) ? `${value}px` : String(value);
   }
   return void 0;
 }
 function getSizeStyle(originSize) {
-  if ((0, import_validate.isDef)(originSize)) {
+  if ((0, import_basic2.isDef)(originSize)) {
     if (Array.isArray(originSize)) {
       return {
         width: addUnit(originSize[0]),

package/lib/utils/index.d.ts

@@ -4,7 +4,6 @@ export * from './dom';
 export * from './create';
 export * from './format';
 export * from './constant';
-export * from './validate';
 export * from './interceptor';
 export * from './with-install';
 export * from './closest';

package/lib/utils/index.js

@@ -20,7 +20,6 @@ __reExport(stdin_exports, require("./dom"), module.exports);
 __reExport(stdin_exports, require("./create"), module.exports);
 __reExport(stdin_exports, require("./format"), module.exports);
 __reExport(stdin_exports, require("./constant"), module.exports);
-__reExport(stdin_exports, require("./validate"), module.exports);
 __reExport(stdin_exports, require("./interceptor"), module.exports);
 __reExport(stdin_exports, require("./with-install"), module.exports);
 __reExport(stdin_exports, require("./closest"), module.exports);

package/lib/utils/interceptor.js

@@ -21,7 +21,6 @@ __export(stdin_exports, {
 });
 module.exports = __toCommonJS(stdin_exports);
 var import_basic = require("./basic");
-var import_validate = require("./validate");
 function callInterceptor(interceptor, {
   args = [],
   done,
@@ -29,7 +28,7 @@ function callInterceptor(interceptor, {
 }) {
   if (interceptor) {
     const returnVal = interceptor.apply(null, args);
-    if ((0, import_validate.isPromise)(returnVal)) {
+    if ((0, import_basic.isPromise)(returnVal)) {
       returnVal.then((value) => {
         if (value) {
           done();

package/lib/vant.cjs.js

@@ -4,9 +4,13 @@ const vue = require("vue");
 const use = require("@vant/use");
 const shared = require("@vue/shared");
 const popperjs = require("@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) {
@@ -15,10 +19,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;
@@ -29,12 +29,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];
@@ -3107,8 +3110,8 @@ var stdin_default$1A = vue.defineComponent({
         titleClass,
         titleStyle
       } = props2;
-      parsedClass.value = titleClass ? vue.normalizeClass(titleClass) : "";
-      parsedStyle.value = titleStyle && typeof titleStyle !== "string" ? shared.stringifyStyle(vue.normalizeStyle(titleStyle)) : titleStyle;
+      parsedClass.value = titleClass ? shared.normalizeClass(titleClass) : "";
+      parsedStyle.value = titleStyle && typeof titleStyle !== "string" ? shared.stringifyStyle(shared.normalizeStyle(titleStyle)) : titleStyle;
     });
     const renderTitle = (onClickTab) => vue.createVNode(TabTitle, vue.mergeProps({
       "key": id,
@@ -3977,8 +3980,14 @@ const fieldSharedProps = {
   inputAlign: String,
   placeholder: String,
   autocomplete: String,
+  autocapitalize: String,
+  autocorrect: String,
   errorMessage: String,
   enterkeyhint: String,
+  spellcheck: {
+    type: Boolean,
+    default: null
+  },
   clearTrigger: makeStringProp("focus"),
   formatTrigger: makeStringProp("onChange"),
   error: {
@@ -4306,7 +4315,10 @@ var stdin_default$1u = vue.defineComponent({
         autofocus: props2.autofocus,
         placeholder: props2.placeholder,
         autocomplete: props2.autocomplete,
+        autocapitalize: props2.autocapitalize,
+        autocorrect: props2.autocorrect,
         enterkeyhint: props2.enterkeyhint,
+        spellcheck: props2.spellcheck,
         "aria-labelledby": props2.label ? `${id}-label` : void 0,
         onBlur,
         onFocus,
@@ -5179,6 +5191,7 @@ var stdin_default$1q = vue.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,
@@ -5288,7 +5301,6 @@ var stdin_default$1o = vue.defineComponent({
 const Tag = withInstall(stdin_default$1o);
 const checkerProps = {
   name: unknownProp,
-  shape: makeStringProp("round"),
   disabled: Boolean,
   iconSize: numericProp,
   modelValue: unknownProp,
@@ -5300,6 +5312,7 @@ var stdin_default$1n = vue.defineComponent({
   props: extend({}, checkerProps, {
     bem: makeRequiredProp(Function),
     role: String,
+    shape: String,
     parent: Object,
     checked: Boolean,
     bindGroup: truthProp
@@ -5338,6 +5351,9 @@ var stdin_default$1n = vue.defineComponent({
         };
       }
     });
+    const shape = vue.computed(() => {
+      return props2.shape || getParentProp("shape") || "round";
+    });
     const onClick = (event) => {
       const {
         target
@@ -5350,27 +5366,36 @@ var stdin_default$1n = vue.defineComponent({
       emit("click", event);
     };
     const renderIcon = () => {
+      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": {
+        "style": shape.value !== "dot" ? {
           fontSize: addUnit(iconSize)
+        } : {
+          width: addUnit(iconSize),
+          height: addUnit(iconSize),
+          borderColor: (_a = iconStyle.value) == null ? void 0 : _a.borderColor
         }
       }, [slots.icon ? slots.icon({
         checked,
         disabled: disabled.value
-      }) : vue.createVNode(Icon, {
+      }) : shape.value !== "dot" ? vue.createVNode(Icon, {
         "name": "success",
         "style": iconStyle.value
+      }, null) : vue.createVNode("div", {
+        "class": bem2("icon--dot__icon"),
+        "style": {
+          backgroundColor: (_b = iconStyle.value) == null ? void 0 : _b.backgroundColor
+        }
       }, null)]);
     };
     const renderLabel = () => {
@@ -5397,11 +5422,13 @@ var stdin_default$1n = vue.defineComponent({
     };
   }
 });
-const radioProps = checkerProps;
+const radioProps = extend({}, checkerProps, {
+  shape: String
+});
 const [name$1d, bem$19] = createNamespace("radio");
 var stdin_default$1m = vue.defineComponent({
   name: name$1d,
-  props: checkerProps,
+  props: radioProps,
   emits: ["update:modelValue"],
   setup(props2, {
     emit,
@@ -5525,6 +5552,7 @@ const addressListProps = {
   switchable: truthProp,
   disabledText: String,
   disabledList: makeArrayProp(),
+  showAddButton: truthProp,
   addButtonText: String,
   defaultTagText: String,
   rightIcon: makeStringProp("edit")
@@ -5566,7 +5594,7 @@ var stdin_default$1k = vue.defineComponent({
         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,
@@ -5575,7 +5603,7 @@ var stdin_default$1k = vue.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);
@@ -7394,6 +7422,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,
@@ -7455,6 +7484,7 @@ var stdin_default$19 = vue.defineComponent({
 });
 const [name$$, bem$_] = createNamespace("checkbox");
 const checkboxProps = extend({}, checkerProps, {
+  shape: String,
   bindGroup: truthProp
 });
 var stdin_default$18 = vue.defineComponent({
@@ -9687,10 +9717,10 @@ var stdin_default$S = vue.defineComponent({
 const DropdownItem = withInstall(stdin_default$S);
 const DropdownMenu = withInstall(stdin_default$T);
 const floatingBubbleProps = {
+  gap: makeNumberProp(24),
+  icon: String,
   axis: makeStringProp("y"),
   magnetic: String,
-  icon: String,
-  gap: makeNumberProp(24),
   offset: {
     type: Object,
     default: () => ({
@@ -9721,8 +9751,8 @@ var stdin_default$R = vue.defineComponent({
     });
     const boundary = vue.computed(() => ({
       top: props2.gap,
-      right: windowWidth.value - state.value.height - props2.gap,
-      bottom: windowHeight.value - state.value.width - props2.gap,
+      right: windowWidth.value - state.value.width - props2.gap,
+      bottom: windowHeight.value - state.value.height - props2.gap,
       left: props2.gap
     }));
     const dragging = vue.ref(false);
@@ -9820,9 +9850,7 @@ var stdin_default$R = vue.defineComponent({
         initialized = true;
       });
     });
-    vue.watch([windowWidth, windowHeight, () => props2.gap, () => props2.offset], () => updateState(), {
-      deep: true
-    });
+    vue.watch([windowWidth, windowHeight, () => props2.gap, () => props2.offset], updateState);
     const show = vue.ref(true);
     vue.onActivated(() => {
       show.value = true;
@@ -14582,7 +14610,8 @@ const textEllipsisProps = {
   dots: makeStringProp("..."),
   content: makeStringProp(""),
   expandText: makeStringProp(""),
-  collapseText: makeStringProp("")
+  collapseText: makeStringProp(""),
+  position: makeStringProp("end")
 };
 var stdin_default$9 = vue.defineComponent({
   name: name$4,
@@ -14595,6 +14624,7 @@ var stdin_default$9 = vue.defineComponent({
     const expanded = vue.ref(false);
     const hasAction = vue.ref(false);
     const root = vue.ref();
+    const actionText = vue.computed(() => expanded.value ? props2.expandText : props2.collapseText);
     const pxToNum = (value) => {
       if (!value)
         return 0;
@@ -14623,24 +14653,53 @@ var stdin_default$9 = vue.defineComponent({
       };
       const calcEllipsisText = (container2, maxHeight2) => {
         const {
-          dots,
           content,
-          expandText
+          position,
+          dots
         } = props2;
-        let left = 0;
-        let right = content.length;
-        let res = -1;
-        while (left <= right) {
-          const mid = Math.floor((left + right) / 2);
-          container2.innerText = content.slice(0, mid) + dots + expandText;
-          if (container2.offsetHeight <= maxHeight2) {
-            left = mid + 1;
-            res = mid;
-          } else {
-            right = mid - 1;
+        const end = content.length;
+        const calcEllipse = () => {
+          const tail = (left, right) => {
+            if (right - left <= 1) {
+              if (position === "end") {
+                return content.slice(0, left) + dots;
+              }
+              return dots + content.slice(right, end);
+            }
+            const middle2 = Math.round(left + right >> 1);
+            if (position === "end") {
+              container2.innerText = content.slice(0, middle2) + dots + actionText.value;
+            } else {
+              container2.innerText = dots + content.slice(middle2, end) + actionText.value;
+            }
+            if (container2.offsetHeight > maxHeight2) {
+              if (position === "end") {
+                return tail(left, middle2);
+              }
+              return tail(middle2, right);
+            }
+            if (position === "end") {
+              return tail(middle2, right);
+            }
+            return tail(left, middle2);
+          };
+          container2.innerText = tail(0, end);
+        };
+        const middleTail = (leftPart, rightPart) => {
+          if (leftPart[1] - leftPart[0] <= 1 && rightPart[1] - rightPart[0] <= 1) {
+            return content.slice(0, leftPart[1]) + dots + dots + content.slice(rightPart[1], end);
           }
-        }
-        return content.slice(0, res) + dots;
+          const leftMiddle = Math.floor(leftPart[0] + leftPart[1] >> 1);
+          const rightMiddle = Math.ceil(rightPart[0] + rightPart[1] >> 1);
+          container2.innerText = props2.content.slice(0, leftMiddle) + props2.dots + actionText.value + props2.dots + props2.content.slice(rightMiddle, end);
+          if (container2.offsetHeight >= maxHeight2) {
+            return middleTail([leftPart[0], leftMiddle], [rightMiddle, rightPart[1]]);
+          }
+          return middleTail([leftMiddle, leftPart[1]], [rightPart[0], rightMiddle]);
+        };
+        const middle = 0 + end >> 1;
+        props2.position === "middle" ? container2.innerText = middleTail([0, middle], [middle, end]) : calcEllipse();
+        return container2.innerText;
       };
       const container = cloneContainer();
       if (!container)
@@ -14650,7 +14709,7 @@ var stdin_default$9 = vue.defineComponent({
         paddingTop,
         lineHeight
       } = container.style;
-      const maxHeight = (Number(props2.rows) + 0.5) * pxToNum(lineHeight) + pxToNum(paddingTop) + pxToNum(paddingBottom);
+      const maxHeight = Math.ceil((Number(props2.rows) + 0.5) * pxToNum(lineHeight) + pxToNum(paddingTop) + pxToNum(paddingBottom));
       if (maxHeight < container.offsetHeight) {
         hasAction.value = true;
         text.value = calcEllipsisText(container, maxHeight);
@@ -14669,7 +14728,7 @@ var stdin_default$9 = vue.defineComponent({
       "onClick": onClickAction
     }, [expanded.value ? props2.collapseText : props2.expandText]);
     vue.onMounted(calcEllipsised);
-    vue.watch(() => [props2.content, props2.rows], calcEllipsised);
+    vue.watch(() => [props2.content, props2.rows, props2.position], calcEllipsised);
     use.useEventListener("resize", calcEllipsised);
     return () => vue.createVNode("div", {
       "ref": root,
@@ -16328,7 +16387,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.6.1";
+const version = "4.6.3";
 function install(app) {
   const components = [
     ActionBar,