vant 4.8.9 → 4.8.11

package/lib/index.d.ts

@@ -106,4 +106,4 @@ declare namespace _default {
 }
 export default _default;
 export function install(app: any): void;
-export const version: "4.8.9";
+export const version: "4.8.11";

package/lib/index.js

@@ -226,7 +226,7 @@ __reExport(stdin_exports, require("./toast"), module.exports);
 __reExport(stdin_exports, require("./tree-select"), module.exports);
 __reExport(stdin_exports, require("./uploader"), module.exports);
 __reExport(stdin_exports, require("./watermark"), module.exports);
-const version = "4.8.9";
+const version = "4.8.11";
 function install(app) {
   const components = [
     import_action_bar.ActionBar,

package/lib/vant.cjs.js

@@ -8637,44 +8637,37 @@ const couponCellProps = {
     default: -1
   }
 };
+const getValue = (coupon) => {
+  const {
+    value,
+    denominations
+  } = coupon;
+  if (isDef(value)) {
+    return value;
+  }
+  if (isDef(denominations)) {
+    return denominations;
+  }
+  return 0;
+};
 function formatValue({
   coupons,
   chosenCoupon,
   currency
 }) {
-  const getValue = (coupon) => {
-    let value2 = 0;
-    const {
-      value: couponValue,
-      denominations
-    } = coupon;
-    if (isDef(coupon.value)) {
-      value2 = couponValue;
-    } else if (isDef(coupon.denominations)) {
-      value2 = denominations;
-    }
-    return value2;
-  };
-  let value = 0, isExist = false;
-  if (Array.isArray(chosenCoupon)) {
-    chosenCoupon.forEach((i) => {
-      const coupon = coupons[+i];
-      if (coupon) {
-        isExist = true;
-        value += getValue(coupon);
-      }
-    });
-  } else {
-    const coupon = coupons[+chosenCoupon];
+  let value = 0;
+  let isExist = false;
+  (Array.isArray(chosenCoupon) ? chosenCoupon : [chosenCoupon]).forEach((i) => {
+    const coupon = coupons[+i];
     if (coupon) {
       isExist = true;
-      value = getValue(coupon);
+      value += getValue(coupon);
     }
+  });
+  if (isExist) {
+    return `-${currency} ${(value / 100).toFixed(2)}`;
   }
-  if (!isExist) {
-    return coupons.length === 0 ? t$a("noCoupon") : t$a("count", coupons.length);
-  }
-  return `-${currency} ${(value / 100).toFixed(2)}`;
+  return coupons.length === 0 ? t$a("noCoupon") : t$a("count", coupons.length);
 }
 var stdin_default$_ = vue.defineComponent({
   name: name$R,
@@ -9019,7 +9012,6 @@ const couponListProps = {
   currency: makeStringProp("¥"),
   showCount: truthProp,
   emptyImage: String,
-  chosenCoupon: [Number, Array],
   enabledTitle: String,
   disabledTitle: String,
   disabledCoupons: makeArrayProp(),
@@ -9031,7 +9023,11 @@ const couponListProps = {
   exchangeButtonText: String,
   displayedCouponIndex: makeNumberProp(-1),
   exchangeButtonLoading: Boolean,
-  exchangeButtonDisabled: Boolean
+  exchangeButtonDisabled: Boolean,
+  chosenCoupon: {
+    type: [Number, Array],
+    default: -1
+  }
 };
 var stdin_default$Y = vue.defineComponent({
   name: name$P,
@@ -9099,18 +9095,16 @@ var stdin_default$Y = vue.defineComponent({
     };
     const renderCouponTab = () => {
       const {
-        coupons
+        coupons,
+        chosenCoupon
       } = props2;
       const count = props2.showCount ? ` (${coupons.length})` : "";
       const title = (props2.enabledTitle || t$9("enable")) + count;
-      const getChosenCoupon = (chosenCoupon = [], value = 0) => {
-        const unrefChosenCoupon = vue.unref(chosenCoupon);
-        const index = unrefChosenCoupon.indexOf(value);
-        if (index === -1) {
-          return [...unrefChosenCoupon, value];
+      const updateChosenCoupon = (currentValues = [], value = 0) => {
+        if (currentValues.includes(value)) {
+          return currentValues.filter((item) => item !== value);
         }
-        unrefChosenCoupon.splice(index, 1);
-        return [...unrefChosenCoupon];
+        return [...currentValues, value];
       };
       return vue.createVNode(Tab, {
         "title": title
@@ -9128,9 +9122,9 @@ var stdin_default$Y = vue.defineComponent({
             "key": coupon.id,
             "ref": setCouponRefs(index),
             "coupon": coupon,
-            "chosen": Array.isArray(props2.chosenCoupon) ? props2.chosenCoupon.includes(index) : index === props2.chosenCoupon,
+            "chosen": Array.isArray(chosenCoupon) ? chosenCoupon.includes(index) : index === chosenCoupon,
             "currency": props2.currency,
-            "onClick": () => emit("change", Array.isArray(props2.chosenCoupon) ? getChosenCoupon(props2.chosenCoupon, index) : index)
+            "onClick": () => emit("change", Array.isArray(chosenCoupon) ? updateChosenCoupon(chosenCoupon, index) : index)
           }, null)), !coupons.length && renderEmpty(), (_a = slots["list-footer"]) == null ? void 0 : _a.call(slots)])];
         }
       });
@@ -9232,7 +9226,7 @@ var stdin_default$X = vue.defineComponent({
     const isMaxYear = (year) => year === props2.maxDate.getFullYear();
     const isMinMonth = (month) => month === props2.minDate.getMonth() + 1;
     const isMaxMonth = (month) => month === props2.maxDate.getMonth() + 1;
-    const getValue = (type) => {
+    const getValue2 = (type) => {
       const {
         minDate,
         columnsType
@@ -9252,14 +9246,14 @@ var stdin_default$X = vue.defineComponent({
       }
     };
     const genMonthOptions = () => {
-      const year = getValue("year");
+      const year = getValue2("year");
       const minMonth = isMinYear(year) ? props2.minDate.getMonth() + 1 : 1;
       const maxMonth = isMaxYear(year) ? props2.maxDate.getMonth() + 1 : 12;
       return genOptions(minMonth, maxMonth, "month", props2.formatter, props2.filter);
     };
     const genDayOptions = () => {
-      const year = getValue("year");
-      const month = getValue("month");
+      const year = getValue2("year");
+      const month = getValue2("month");
       const minDate = isMinYear(year) && isMinMonth(month) ? props2.minDate.getDate() : 1;
       const maxDate = isMaxYear(year) && isMaxMonth(month) ? props2.maxDate.getDate() : getMonthEndDay(year, month);
       return genOptions(minDate, maxDate, "day", props2.formatter, props2.filter);
@@ -9839,8 +9833,14 @@ var stdin_default$T = vue.defineComponent({
       const {
         activeColor
       } = parent.props;
+      const {
+        disabled
+      } = option;
       const active = option.value === props2.modelValue;
       const onClick = () => {
+        if (disabled) {
+          return;
+        }
         state.showPopup = false;
         if (option.value !== props2.modelValue) {
           emit("update:modelValue", option.value);
@@ -9851,7 +9851,7 @@ var stdin_default$T = vue.defineComponent({
         if (active) {
           return vue.createVNode(Icon, {
             "class": bem$K("icon"),
-            "color": activeColor,
+            "color": disabled ? void 0 : activeColor,
             "name": "success"
           }, null);
         }
@@ -9862,13 +9862,14 @@ var stdin_default$T = vue.defineComponent({
         "icon": option.icon,
         "title": option.text,
         "class": bem$K("option", {
-          active
+          active,
+          disabled
         }),
         "style": {
           color: active ? activeColor : ""
         },
         "tabindex": active ? 0 : -1,
-        "clickable": true,
+        "clickable": !disabled,
         "onClick": onClick
       }, {
         value: renderIcon
@@ -16873,7 +16874,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.8.9";
+const version = "4.8.11";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.es.js

@@ -8635,44 +8635,37 @@ const couponCellProps = {
     default: -1
   }
 };
+const getValue = (coupon) => {
+  const {
+    value,
+    denominations
+  } = coupon;
+  if (isDef(value)) {
+    return value;
+  }
+  if (isDef(denominations)) {
+    return denominations;
+  }
+  return 0;
+};
 function formatValue({
   coupons,
   chosenCoupon,
   currency
 }) {
-  const getValue = (coupon) => {
-    let value2 = 0;
-    const {
-      value: couponValue,
-      denominations
-    } = coupon;
-    if (isDef(coupon.value)) {
-      value2 = couponValue;
-    } else if (isDef(coupon.denominations)) {
-      value2 = denominations;
-    }
-    return value2;
-  };
-  let value = 0, isExist = false;
-  if (Array.isArray(chosenCoupon)) {
-    chosenCoupon.forEach((i) => {
-      const coupon = coupons[+i];
-      if (coupon) {
-        isExist = true;
-        value += getValue(coupon);
-      }
-    });
-  } else {
-    const coupon = coupons[+chosenCoupon];
+  let value = 0;
+  let isExist = false;
+  (Array.isArray(chosenCoupon) ? chosenCoupon : [chosenCoupon]).forEach((i) => {
+    const coupon = coupons[+i];
     if (coupon) {
       isExist = true;
-      value = getValue(coupon);
+      value += getValue(coupon);
     }
+  });
+  if (isExist) {
+    return `-${currency} ${(value / 100).toFixed(2)}`;
   }
-  if (!isExist) {
-    return coupons.length === 0 ? t$a("noCoupon") : t$a("count", coupons.length);
-  }
-  return `-${currency} ${(value / 100).toFixed(2)}`;
+  return coupons.length === 0 ? t$a("noCoupon") : t$a("count", coupons.length);
 }
 var stdin_default$_ = defineComponent({
   name: name$R,
@@ -9017,7 +9010,6 @@ const couponListProps = {
   currency: makeStringProp("¥"),
   showCount: truthProp,
   emptyImage: String,
-  chosenCoupon: [Number, Array],
   enabledTitle: String,
   disabledTitle: String,
   disabledCoupons: makeArrayProp(),
@@ -9029,7 +9021,11 @@ const couponListProps = {
   exchangeButtonText: String,
   displayedCouponIndex: makeNumberProp(-1),
   exchangeButtonLoading: Boolean,
-  exchangeButtonDisabled: Boolean
+  exchangeButtonDisabled: Boolean,
+  chosenCoupon: {
+    type: [Number, Array],
+    default: -1
+  }
 };
 var stdin_default$Y = defineComponent({
   name: name$P,
@@ -9097,18 +9093,16 @@ var stdin_default$Y = defineComponent({
     };
     const renderCouponTab = () => {
       const {
-        coupons
+        coupons,
+        chosenCoupon
       } = props2;
       const count = props2.showCount ? ` (${coupons.length})` : "";
       const title = (props2.enabledTitle || t$9("enable")) + count;
-      const getChosenCoupon = (chosenCoupon = [], value = 0) => {
-        const unrefChosenCoupon = unref(chosenCoupon);
-        const index = unrefChosenCoupon.indexOf(value);
-        if (index === -1) {
-          return [...unrefChosenCoupon, value];
+      const updateChosenCoupon = (currentValues = [], value = 0) => {
+        if (currentValues.includes(value)) {
+          return currentValues.filter((item) => item !== value);
         }
-        unrefChosenCoupon.splice(index, 1);
-        return [...unrefChosenCoupon];
+        return [...currentValues, value];
       };
       return createVNode(Tab, {
         "title": title
@@ -9126,9 +9120,9 @@ var stdin_default$Y = defineComponent({
             "key": coupon.id,
             "ref": setCouponRefs(index),
             "coupon": coupon,
-            "chosen": Array.isArray(props2.chosenCoupon) ? props2.chosenCoupon.includes(index) : index === props2.chosenCoupon,
+            "chosen": Array.isArray(chosenCoupon) ? chosenCoupon.includes(index) : index === chosenCoupon,
             "currency": props2.currency,
-            "onClick": () => emit("change", Array.isArray(props2.chosenCoupon) ? getChosenCoupon(props2.chosenCoupon, index) : index)
+            "onClick": () => emit("change", Array.isArray(chosenCoupon) ? updateChosenCoupon(chosenCoupon, index) : index)
           }, null)), !coupons.length && renderEmpty(), (_a = slots["list-footer"]) == null ? void 0 : _a.call(slots)])];
         }
       });
@@ -9230,7 +9224,7 @@ var stdin_default$X = defineComponent({
     const isMaxYear = (year) => year === props2.maxDate.getFullYear();
     const isMinMonth = (month) => month === props2.minDate.getMonth() + 1;
     const isMaxMonth = (month) => month === props2.maxDate.getMonth() + 1;
-    const getValue = (type) => {
+    const getValue2 = (type) => {
       const {
         minDate,
         columnsType
@@ -9250,14 +9244,14 @@ var stdin_default$X = defineComponent({
       }
     };
     const genMonthOptions = () => {
-      const year = getValue("year");
+      const year = getValue2("year");
       const minMonth = isMinYear(year) ? props2.minDate.getMonth() + 1 : 1;
       const maxMonth = isMaxYear(year) ? props2.maxDate.getMonth() + 1 : 12;
       return genOptions(minMonth, maxMonth, "month", props2.formatter, props2.filter);
     };
     const genDayOptions = () => {
-      const year = getValue("year");
-      const month = getValue("month");
+      const year = getValue2("year");
+      const month = getValue2("month");
       const minDate = isMinYear(year) && isMinMonth(month) ? props2.minDate.getDate() : 1;
       const maxDate = isMaxYear(year) && isMaxMonth(month) ? props2.maxDate.getDate() : getMonthEndDay(year, month);
       return genOptions(minDate, maxDate, "day", props2.formatter, props2.filter);
@@ -9837,8 +9831,14 @@ var stdin_default$T = defineComponent({
       const {
         activeColor
       } = parent.props;
+      const {
+        disabled
+      } = option;
       const active = option.value === props2.modelValue;
       const onClick = () => {
+        if (disabled) {
+          return;
+        }
         state.showPopup = false;
         if (option.value !== props2.modelValue) {
           emit("update:modelValue", option.value);
@@ -9849,7 +9849,7 @@ var stdin_default$T = defineComponent({
         if (active) {
           return createVNode(Icon, {
             "class": bem$K("icon"),
-            "color": activeColor,
+            "color": disabled ? void 0 : activeColor,
             "name": "success"
           }, null);
         }
@@ -9860,13 +9860,14 @@ var stdin_default$T = defineComponent({
         "icon": option.icon,
         "title": option.text,
         "class": bem$K("option", {
-          active
+          active,
+          disabled
         }),
         "style": {
           color: active ? activeColor : ""
         },
         "tabindex": active ? 0 : -1,
-        "clickable": true,
+        "clickable": !disabled,
         "onClick": onClick
       }, {
         value: renderIcon
@@ -16871,7 +16872,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.8.9";
+const version = "4.8.11";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.js

@@ -9079,44 +9079,37 @@
       default: -1
     }
   };
+  const getValue = (coupon) => {
+    const {
+      value,
+      denominations
+    } = coupon;
+    if (isDef(value)) {
+      return value;
+    }
+    if (isDef(denominations)) {
+      return denominations;
+    }
+    return 0;
+  };
   function formatValue({
     coupons,
     chosenCoupon,
     currency
   }) {
-    const getValue = (coupon) => {
-      let value2 = 0;
-      const {
-        value: couponValue,
-        denominations
-      } = coupon;
-      if (isDef(coupon.value)) {
-        value2 = couponValue;
-      } else if (isDef(coupon.denominations)) {
-        value2 = denominations;
-      }
-      return value2;
-    };
-    let value = 0, isExist = false;
-    if (Array.isArray(chosenCoupon)) {
-      chosenCoupon.forEach((i) => {
-        const coupon = coupons[+i];
-        if (coupon) {
-          isExist = true;
-          value += getValue(coupon);
-        }
-      });
-    } else {
-      const coupon = coupons[+chosenCoupon];
+    let value = 0;
+    let isExist = false;
+    (Array.isArray(chosenCoupon) ? chosenCoupon : [chosenCoupon]).forEach((i) => {
+      const coupon = coupons[+i];
       if (coupon) {
         isExist = true;
-        value = getValue(coupon);
+        value += getValue(coupon);
       }
+    });
+    if (isExist) {
+      return `-${currency} ${(value / 100).toFixed(2)}`;
     }
-    if (!isExist) {
-      return coupons.length === 0 ? t$a("noCoupon") : t$a("count", coupons.length);
-    }
-    return `-${currency} ${(value / 100).toFixed(2)}`;
+    return coupons.length === 0 ? t$a("noCoupon") : t$a("count", coupons.length);
   }
   var stdin_default$_ = vue.defineComponent({
     name: name$R,
@@ -9461,7 +9454,6 @@
     currency: makeStringProp("¥"),
     showCount: truthProp,
     emptyImage: String,
-    chosenCoupon: [Number, Array],
     enabledTitle: String,
     disabledTitle: String,
     disabledCoupons: makeArrayProp(),
@@ -9473,7 +9465,11 @@
     exchangeButtonText: String,
     displayedCouponIndex: makeNumberProp(-1),
     exchangeButtonLoading: Boolean,
-    exchangeButtonDisabled: Boolean
+    exchangeButtonDisabled: Boolean,
+    chosenCoupon: {
+      type: [Number, Array],
+      default: -1
+    }
   };
   var stdin_default$Y = vue.defineComponent({
     name: name$P,
@@ -9541,18 +9537,16 @@
       };
       const renderCouponTab = () => {
         const {
-          coupons
+          coupons,
+          chosenCoupon
         } = props2;
         const count = props2.showCount ? ` (${coupons.length})` : "";
         const title = (props2.enabledTitle || t$9("enable")) + count;
-        const getChosenCoupon = (chosenCoupon = [], value = 0) => {
-          const unrefChosenCoupon = vue.unref(chosenCoupon);
-          const index = unrefChosenCoupon.indexOf(value);
-          if (index === -1) {
-            return [...unrefChosenCoupon, value];
+        const updateChosenCoupon = (currentValues = [], value = 0) => {
+          if (currentValues.includes(value)) {
+            return currentValues.filter((item) => item !== value);
           }
-          unrefChosenCoupon.splice(index, 1);
-          return [...unrefChosenCoupon];
+          return [...currentValues, value];
         };
         return vue.createVNode(Tab, {
           "title": title
@@ -9570,9 +9564,9 @@
               "key": coupon.id,
               "ref": setCouponRefs(index),
               "coupon": coupon,
-              "chosen": Array.isArray(props2.chosenCoupon) ? props2.chosenCoupon.includes(index) : index === props2.chosenCoupon,
+              "chosen": Array.isArray(chosenCoupon) ? chosenCoupon.includes(index) : index === chosenCoupon,
               "currency": props2.currency,
-              "onClick": () => emit("change", Array.isArray(props2.chosenCoupon) ? getChosenCoupon(props2.chosenCoupon, index) : index)
+              "onClick": () => emit("change", Array.isArray(chosenCoupon) ? updateChosenCoupon(chosenCoupon, index) : index)
             }, null)), !coupons.length && renderEmpty(), (_a = slots["list-footer"]) == null ? void 0 : _a.call(slots)])];
           }
         });
@@ -9674,7 +9668,7 @@
       const isMaxYear = (year) => year === props2.maxDate.getFullYear();
       const isMinMonth = (month) => month === props2.minDate.getMonth() + 1;
       const isMaxMonth = (month) => month === props2.maxDate.getMonth() + 1;
-      const getValue = (type) => {
+      const getValue2 = (type) => {
         const {
           minDate,
           columnsType
@@ -9694,14 +9688,14 @@
         }
       };
       const genMonthOptions = () => {
-        const year = getValue("year");
+        const year = getValue2("year");
         const minMonth = isMinYear(year) ? props2.minDate.getMonth() + 1 : 1;
         const maxMonth = isMaxYear(year) ? props2.maxDate.getMonth() + 1 : 12;
         return genOptions(minMonth, maxMonth, "month", props2.formatter, props2.filter);
       };
       const genDayOptions = () => {
-        const year = getValue("year");
-        const month = getValue("month");
+        const year = getValue2("year");
+        const month = getValue2("month");
         const minDate = isMinYear(year) && isMinMonth(month) ? props2.minDate.getDate() : 1;
         const maxDate = isMaxYear(year) && isMaxMonth(month) ? props2.maxDate.getDate() : getMonthEndDay(year, month);
         return genOptions(minDate, maxDate, "day", props2.formatter, props2.filter);
@@ -10275,8 +10269,14 @@
         const {
           activeColor
         } = parent.props;
+        const {
+          disabled
+        } = option;
         const active = option.value === props2.modelValue;
         const onClick = () => {
+          if (disabled) {
+            return;
+          }
           state.showPopup = false;
           if (option.value !== props2.modelValue) {
             emit("update:modelValue", option.value);
@@ -10287,7 +10287,7 @@
           if (active) {
             return vue.createVNode(Icon, {
               "class": bem$K("icon"),
-              "color": activeColor,
+              "color": disabled ? void 0 : activeColor,
               "name": "success"
             }, null);
           }
@@ -10298,13 +10298,14 @@
           "icon": option.icon,
           "title": option.text,
           "class": bem$K("option", {
-            active
+            active,
+            disabled
           }),
           "style": {
             color: active ? activeColor : ""
           },
           "tabindex": active ? 0 : -1,
-          "clickable": true,
+          "clickable": !disabled,
           "onClick": onClick
         }, {
           value: renderIcon
@@ -18086,7 +18087,7 @@
       });
     }
   };
-  const version = "4.8.9";
+  const version = "4.8.11";
   function install(app) {
     const components = [
       ActionBar,