vant 3.2.8 → 3.3.3-beta.nuxt3

package/lib/address-edit/AddressEdit.js

@@ -13,6 +13,8 @@ var _area = require("../area");
 
 var _cell = require("../cell");
 
+var _form = require("../form");
+
 var _field = require("../field");
 
 var _popup = require("../popup");
@@ -91,18 +93,9 @@ var _default = (0, _vue.defineComponent)({
       slots
     } = _ref;
     var areaRef = (0, _vue.ref)();
-    var state = (0, _vue.reactive)({
-      data: {},
-      showAreaPopup: false,
-      detailFocused: false,
-      errorInfo: {
-        tel: '',
-        name: '',
-        areaCode: '',
-        postalCode: '',
-        addressDetail: ''
-      }
-    });
+    var data = (0, _vue.reactive)({});
+    var showAreaPopup = (0, _vue.ref)(false);
+    var detailFocused = (0, _vue.ref)(false);
     var areaListLoaded = (0, _vue.computed)(() => (0, _utils.isObject)(props.areaList) && Object.keys(props.areaList).length);
     var areaText = (0, _vue.computed)(() => {
       var {
@@ -111,7 +104,7 @@ var _default = (0, _vue.defineComponent)({
         city,
         county,
         areaCode
-      } = state.data;
+      } = data;
 
       if (areaCode) {
         var arr = [country, province, city, county];
@@ -129,7 +122,7 @@ var _default = (0, _vue.defineComponent)({
     var hideBottomFields = (0, _vue.computed)(() => {
       var _props$searchResult;
 
-      return ((_props$searchResult = props.searchResult) == null ? void 0 : _props$searchResult.length) && state.detailFocused;
+      return ((_props$searchResult = props.searchResult) == null ? void 0 : _props$searchResult.length) && detailFocused.value;
     });
 
     var assignAreaValues = () => {
@@ -137,77 +130,59 @@ var _default = (0, _vue.defineComponent)({
         var detail = areaRef.value.getArea();
         detail.areaCode = detail.code;
         delete detail.code;
-        (0, _utils.extend)(state.data, detail);
+        (0, _utils.extend)(data, detail);
       }
     };
 
     var onFocus = key => {
-      state.errorInfo[key] = '';
-      state.detailFocused = key === 'addressDetail';
+      detailFocused.value = key === 'addressDetail';
       emit('focus', key);
     };
 
-    var getErrorMessage = key => {
-      var value = String(state.data[key] || '').trim();
-
-      if (props.validator) {
-        var message = props.validator(key, value);
-
-        if (message) {
-          return message;
-        }
-      }
-
-      switch (key) {
-        case 'name':
-          return value ? '' : t('nameEmpty');
-
-        case 'tel':
-          return props.telValidator(value) ? '' : t('telInvalid');
-
-        case 'areaCode':
-          return value ? '' : t('areaEmpty');
-
-        case 'addressDetail':
-          return value ? '' : t('addressEmpty');
-
-        case 'postalCode':
-          return value && !props.postalValidator(value) ? t('postalEmpty') : '';
-      }
-    };
-
-    var onSave = () => {
-      var items = ['name', 'tel'];
-
-      if (props.showArea) {
-        items.push('areaCode');
-      }
+    var rules = (0, _vue.computed)(() => {
+      var {
+        validator,
+        telValidator,
+        postalValidator
+      } = props;
 
-      if (props.showDetail) {
-        items.push('addressDetail');
-      }
+      var makeRule = (name, emptyMessage) => ({
+        validator: value => {
+          if (validator) {
+            var message = validator(name, value);
 
-      if (props.showPostal) {
-        items.push('postalCode');
-      }
+            if (message) {
+              return message;
+            }
+          }
 
-      var isValid = items.every(item => {
-        var msg = getErrorMessage(item);
+          if (!value) {
+            return emptyMessage;
+          }
 
-        if (msg) {
-          state.errorInfo[item] = msg;
+          return true;
         }
-
-        return !msg;
       });
 
-      if (isValid && !props.isSaving) {
-        emit('save', state.data);
-      }
-    };
+      return {
+        name: [makeRule('name', t('nameEmpty'))],
+        tel: [makeRule('tel', t('telInvalid')), {
+          validator: telValidator,
+          message: t('telInvalid')
+        }],
+        areaCode: [makeRule('areaCode', t('areaEmpty'))],
+        addressDetail: [makeRule('addressDetail', t('addressEmpty'))],
+        postalCode: [makeRule('addressDetail', t('postalEmpty')), {
+          validator: postalValidator,
+          message: t('postalEmpty')
+        }]
+      };
+    });
+
+    var onSave = () => emit('save', data);
 
     var onChangeDetail = val => {
-      state.data.addressDetail = val;
+      data.addressDetail = val;
       emit('change-detail', val);
     };
 
@@ -216,22 +191,25 @@ var _default = (0, _vue.defineComponent)({
 
       if (values.some(value => !value.code)) {
         (0, _toast.Toast)(t('areaEmpty'));
-        return;
+      } else {
+        showAreaPopup.value = false;
+        assignAreaValues();
+        emit('change-area', values);
       }
-
-      state.showAreaPopup = false;
-      assignAreaValues();
-      emit('change-area', values);
     };
 
-    var onDelete = () => emit('delete', state.data); // get values of area component
+    var onDelete = () => emit('delete', data); // get values of area component
+
 
+    var getArea = () => {
+      var _areaRef$value;
 
-    var getArea = () => areaRef.value ? areaRef.value.getValues() : []; // set area code to area component
+      return ((_areaRef$value = areaRef.value) == null ? void 0 : _areaRef$value.getValues()) || [];
+    }; // set area code to area component
 
 
     var setAreaCode = code => {
-      state.data.areaCode = code || '';
+      data.areaCode = code || '';
 
       if (code) {
         (0, _vue.nextTick)(assignAreaValues);
@@ -241,20 +219,20 @@ var _default = (0, _vue.defineComponent)({
     var onDetailBlur = () => {
       // await for click search event
       setTimeout(() => {
-        state.detailFocused = false;
+        detailFocused.value = false;
       });
     };
 
     var setAddressDetail = value => {
-      state.data.addressDetail = value;
+      data.addressDetail = value;
     };
 
     var renderSetDefaultCell = () => {
       if (props.showSetDefault) {
         var _slots = {
           'right-icon': () => (0, _vue.createVNode)(_switch.Switch, {
-            "modelValue": state.data.isDefault,
-            "onUpdate:modelValue": $event => state.data.isDefault = $event,
+            "modelValue": data.isDefault,
+            "onUpdate:modelValue": $event => data.isDefault = $event,
             "size": "24",
             "onChange": event => emit('change-default', event)
           }, null)
@@ -265,8 +243,6 @@ var _default = (0, _vue.defineComponent)({
           "class": bem('default')
         }, _slots), [[_vue.vShow, !hideBottomFields.value]]);
       }
-
-      return null;
     };
 
     (0, _useExpose.useExpose)({
@@ -274,115 +250,114 @@ var _default = (0, _vue.defineComponent)({
       setAreaCode,
       setAddressDetail
     });
-    (0, _vue.watch)(() => props.areaList, () => setAreaCode(state.data.areaCode));
+    (0, _vue.watch)(() => props.areaList, () => setAreaCode(data.areaCode));
     (0, _vue.watch)(() => props.addressInfo, value => {
-      state.data = (0, _utils.extend)({}, DEFAULT_DATA, value);
+      (0, _utils.extend)(data, DEFAULT_DATA, value);
       setAreaCode(value.areaCode);
     }, {
       deep: true,
       immediate: true
     });
     return () => {
-      var {
-        data,
-        errorInfo
-      } = state;
       var {
         disableArea
       } = props;
-      return (0, _vue.createVNode)("div", {
-        "class": bem()
-      }, [(0, _vue.createVNode)("div", {
-        "class": bem('fields')
-      }, [(0, _vue.createVNode)(_field.Field, {
-        "modelValue": data.name,
-        "onUpdate:modelValue": $event => data.name = $event,
-        "clearable": true,
-        "label": t('name'),
-        "placeholder": t('name'),
-        "errorMessage": errorInfo.name,
-        "onFocus": () => onFocus('name')
-      }, null), (0, _vue.createVNode)(_field.Field, {
-        "modelValue": data.tel,
-        "onUpdate:modelValue": $event => data.tel = $event,
-        "clearable": true,
-        "type": "tel",
-        "label": t('tel'),
-        "maxlength": props.telMaxlength,
-        "placeholder": t('tel'),
-        "errorMessage": errorInfo.tel,
-        "onFocus": () => onFocus('tel')
-      }, null), (0, _vue.withDirectives)((0, _vue.createVNode)(_field.Field, {
-        "readonly": true,
-        "label": t('area'),
-        "is-link": !disableArea,
-        "modelValue": areaText.value,
-        "placeholder": props.areaPlaceholder || t('area'),
-        "errorMessage": errorInfo.areaCode,
-        "onFocus": () => onFocus('areaCode'),
-        "onClick": () => {
-          emit('click-area');
-          state.showAreaPopup = !disableArea;
-        }
-      }, null), [[_vue.vShow, props.showArea]]), (0, _vue.createVNode)(_AddressEditDetail.default, {
-        "show": props.showDetail,
-        "value": data.addressDetail,
-        "focused": state.detailFocused,
-        "detailRows": props.detailRows,
-        "errorMessage": errorInfo.addressDetail,
-        "searchResult": props.searchResult,
-        "detailMaxlength": props.detailMaxlength,
-        "showSearchResult": props.showSearchResult,
-        "onBlur": onDetailBlur,
-        "onFocus": () => onFocus('addressDetail'),
-        "onInput": onChangeDetail,
-        "onSelect-search": event => emit('select-search', event)
-      }, null), props.showPostal && (0, _vue.withDirectives)((0, _vue.createVNode)(_field.Field, {
-        "modelValue": data.postalCode,
-        "onUpdate:modelValue": $event => data.postalCode = $event,
-        "type": "tel",
-        "label": t('postal'),
-        "maxlength": "6",
-        "placeholder": t('postal'),
-        "errorMessage": errorInfo.postalCode,
-        "onFocus": () => onFocus('postalCode')
-      }, null), [[_vue.vShow, !hideBottomFields.value]]), slots.default == null ? void 0 : slots.default()]), renderSetDefaultCell(), (0, _vue.withDirectives)((0, _vue.createVNode)("div", {
-        "class": bem('buttons')
-      }, [(0, _vue.createVNode)(_button.Button, {
-        "block": true,
-        "round": true,
-        "type": "danger",
-        "text": props.saveButtonText || t('save'),
-        "class": bem('button'),
-        "loading": props.isSaving,
-        "onClick": onSave
-      }, null), props.showDelete && (0, _vue.createVNode)(_button.Button, {
-        "block": true,
-        "round": true,
-        "class": bem('button'),
-        "loading": props.isDeleting,
-        "text": props.deleteButtonText || t('delete'),
-        "onClick": onDelete
-      }, null)]), [[_vue.vShow, !hideBottomFields.value]]), (0, _vue.createVNode)(_popup.Popup, {
-        "show": state.showAreaPopup,
-        "onUpdate:show": $event => state.showAreaPopup = $event,
-        "round": true,
-        "teleport": "body",
-        "position": "bottom",
-        "lazyRender": false
+      return (0, _vue.createVNode)(_form.Form, {
+        "class": bem(),
+        "onSubmit": onSave
       }, {
-        default: () => [(0, _vue.createVNode)(_area.Area, {
-          "ref": areaRef,
-          "value": data.areaCode,
-          "loading": !areaListLoaded.value,
-          "areaList": props.areaList,
-          "columnsPlaceholder": props.areaColumnsPlaceholder,
-          "onConfirm": onAreaConfirm,
-          "onCancel": () => {
-            state.showAreaPopup = false;
+        default: () => [(0, _vue.createVNode)("div", {
+          "class": bem('fields')
+        }, [(0, _vue.createVNode)(_field.Field, {
+          "modelValue": data.name,
+          "onUpdate:modelValue": $event => data.name = $event,
+          "clearable": true,
+          "label": t('name'),
+          "rules": rules.value.name,
+          "placeholder": t('name'),
+          "onFocus": () => onFocus('name')
+        }, null), (0, _vue.createVNode)(_field.Field, {
+          "modelValue": data.tel,
+          "onUpdate:modelValue": $event => data.tel = $event,
+          "clearable": true,
+          "type": "tel",
+          "label": t('tel'),
+          "rules": rules.value.tel,
+          "maxlength": props.telMaxlength,
+          "placeholder": t('tel'),
+          "onFocus": () => onFocus('tel')
+        }, null), (0, _vue.withDirectives)((0, _vue.createVNode)(_field.Field, {
+          "readonly": true,
+          "label": t('area'),
+          "is-link": !disableArea,
+          "modelValue": areaText.value,
+          "rules": rules.value.areaCode,
+          "placeholder": props.areaPlaceholder || t('area'),
+          "onFocus": () => onFocus('areaCode'),
+          "onClick": () => {
+            emit('click-area');
+            showAreaPopup.value = !disableArea;
           }
-        }, null)]
-      })]);
+        }, null), [[_vue.vShow, props.showArea]]), (0, _vue.createVNode)(_AddressEditDetail.default, {
+          "show": props.showDetail,
+          "rows": props.detailRows,
+          "rules": rules.value.addressDetail,
+          "value": data.addressDetail,
+          "focused": detailFocused.value,
+          "maxlength": props.detailMaxlength,
+          "searchResult": props.searchResult,
+          "showSearchResult": props.showSearchResult,
+          "onBlur": onDetailBlur,
+          "onFocus": () => onFocus('addressDetail'),
+          "onInput": onChangeDetail,
+          "onSelect-search": event => emit('select-search', event)
+        }, null), props.showPostal && (0, _vue.withDirectives)((0, _vue.createVNode)(_field.Field, {
+          "modelValue": data.postalCode,
+          "onUpdate:modelValue": $event => data.postalCode = $event,
+          "type": "tel",
+          "rules": rules.value.postalCode,
+          "label": t('postal'),
+          "maxlength": "6",
+          "placeholder": t('postal'),
+          "onFocus": () => onFocus('postalCode')
+        }, null), [[_vue.vShow, !hideBottomFields.value]]), slots.default == null ? void 0 : slots.default()]), renderSetDefaultCell(), (0, _vue.withDirectives)((0, _vue.createVNode)("div", {
+          "class": bem('buttons')
+        }, [(0, _vue.createVNode)(_button.Button, {
+          "block": true,
+          "round": true,
+          "type": "danger",
+          "text": props.saveButtonText || t('save'),
+          "class": bem('button'),
+          "loading": props.isSaving,
+          "nativeType": "submit"
+        }, null), props.showDelete && (0, _vue.createVNode)(_button.Button, {
+          "block": true,
+          "round": true,
+          "class": bem('button'),
+          "loading": props.isDeleting,
+          "text": props.deleteButtonText || t('delete'),
+          "onClick": onDelete
+        }, null)]), [[_vue.vShow, !hideBottomFields.value]]), (0, _vue.createVNode)(_popup.Popup, {
+          "show": showAreaPopup.value,
+          "onUpdate:show": $event => showAreaPopup.value = $event,
+          "round": true,
+          "teleport": "body",
+          "position": "bottom",
+          "lazyRender": false
+        }, {
+          default: () => [(0, _vue.createVNode)(_area.Area, {
+            "ref": areaRef,
+            "value": data.areaCode,
+            "loading": !areaListLoaded.value,
+            "areaList": props.areaList,
+            "columnsPlaceholder": props.areaColumnsPlaceholder,
+            "onConfirm": onAreaConfirm,
+            "onCancel": () => {
+              showAreaPopup.value = false;
+            }
+          }, null)]
+        })]
+      });
     };
   }
 

package/lib/address-edit/AddressEditDetail.d.ts

@@ -1,22 +1,23 @@
 import { PropType } from 'vue';
 import type { AddressEditSearchItem } from './types';
+import type { FieldRule } from '../field/types';
 declare const _default: import("vue").DefineComponent<{
     show: BooleanConstructor;
+    rows: (NumberConstructor | StringConstructor)[];
     value: StringConstructor;
+    rules: PropType<FieldRule[]>;
     focused: BooleanConstructor;
-    detailRows: (NumberConstructor | StringConstructor)[];
+    maxlength: (NumberConstructor | StringConstructor)[];
     searchResult: PropType<AddressEditSearchItem[]>;
-    errorMessage: StringConstructor;
-    detailMaxlength: (NumberConstructor | StringConstructor)[];
     showSearchResult: BooleanConstructor;
 }, () => JSX.Element | undefined, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("input" | "focus" | "blur" | "select-search")[], "input" | "focus" | "blur" | "select-search", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
     show?: unknown;
+    rows?: unknown;
     value?: unknown;
+    rules?: unknown;
     focused?: unknown;
-    detailRows?: unknown;
+    maxlength?: unknown;
     searchResult?: unknown;
-    errorMessage?: unknown;
-    detailMaxlength?: unknown;
     showSearchResult?: unknown;
 } & {
     focused: boolean;
@@ -24,10 +25,10 @@ declare const _default: import("vue").DefineComponent<{
     showSearchResult: boolean;
 } & {
     value?: string | undefined;
-    errorMessage?: string | undefined;
+    maxlength?: string | number | undefined;
+    rows?: string | number | undefined;
+    rules?: FieldRule[] | undefined;
     searchResult?: AddressEditSearchItem[] | undefined;
-    detailRows?: string | number | undefined;
-    detailMaxlength?: string | number | undefined;
 }> & {
     onFocus?: ((...args: any[]) => any) | undefined;
     onBlur?: ((...args: any[]) => any) | undefined;

package/lib/address-edit/AddressEditDetail.js

@@ -19,12 +19,12 @@ var _default = (0, _vue.defineComponent)({
   name,
   props: {
     show: Boolean,
+    rows: _utils.numericProp,
     value: String,
+    rules: Array,
     focused: Boolean,
-    detailRows: _utils.numericProp,
+    maxlength: _utils.numericProp,
     searchResult: Array,
-    errorMessage: String,
-    detailMaxlength: _utils.numericProp,
     showSearchResult: Boolean
   },
   emits: ['blur', 'focus', 'input', 'select-search'],
@@ -85,14 +85,14 @@ var _default = (0, _vue.defineComponent)({
           "clearable": true,
           "ref": field,
           "class": bem(),
-          "rows": props.detailRows,
+          "rows": props.rows,
           "type": "textarea",
+          "rules": props.rules,
           "label": t('label'),
           "border": !showSearchResult(),
-          "maxlength": props.detailMaxlength,
+          "maxlength": props.maxlength,
           "modelValue": props.value,
           "placeholder": t('placeholder'),
-          "errorMessage": props.errorMessage,
           "onBlur": onBlur,
           "onFocus": onFocus,
           "onUpdate:modelValue": onInput

package/lib/button/Button.js

@@ -127,7 +127,7 @@ var _default = (0, _vue.defineComponent)({
 
     var onClick = event => {
       if (props.loading) {
-        event.preventDefault();
+        (0, _utils.preventDefault)(event);
       } else if (!props.disabled) {
         emit('click', event);
         route();

package/lib/calendar/Calendar.js

@@ -237,7 +237,7 @@ var _default = (0, _vue.defineComponent)({
         months.value.some((month, index) => {
           if ((0, _utils2.compareMonth)(month, targetDate) === 0) {
             if (bodyRef.value) {
-              monthRefs.value[index].scrollIntoView(bodyRef.value);
+              monthRefs.value[index].scrollToDate(bodyRef.value, targetDate);
             }
 
             return true;
@@ -247,10 +247,9 @@ var _default = (0, _vue.defineComponent)({
         });
         onScroll();
       });
-    }; // scroll to current month
-
+    };
 
-    var scrollIntoView = () => {
+    var scrollToCurrentDate = () => {
       if (props.poppable && !props.show) {
         return;
       }
@@ -272,7 +271,7 @@ var _default = (0, _vue.defineComponent)({
         // add Math.floor to avoid decimal height issues
         // https://github.com/youzan/vant/issues/5640
         bodyHeight = Math.floor((0, _use.useRect)(bodyRef).height);
-        scrollIntoView();
+        scrollToCurrentDate();
       });
     };
 
@@ -282,7 +281,7 @@ var _default = (0, _vue.defineComponent)({
       }
 
       currentDate.value = date;
-      scrollIntoView();
+      scrollToCurrentDate();
     };
 
     var checkRange = date => {
@@ -320,13 +319,8 @@ var _default = (0, _vue.defineComponent)({
         var valid = checkRange(date);
 
         if (!valid) {
-          // auto selected to max range if showConfirm
-          if (props.showConfirm) {
-            setCurrentDate([date[0], (0, _utils2.getDayByOffset)(date[0], +props.maxRange - 1)]);
-          } else {
-            setCurrentDate(date);
-          }
-
+          // auto selected to max range
+          setCurrentDate([date[0], (0, _utils2.getDayByOffset)(date[0], +props.maxRange - 1)]);
           return;
         }
       }
@@ -484,7 +478,7 @@ var _default = (0, _vue.defineComponent)({
       }
 
       currentDate.value = value;
-      scrollIntoView();
+      scrollToCurrentDate();
     });
     (0, _useExpose.useExpose)({
       reset,

package/lib/calendar/CalendarHeader.js

@@ -38,9 +38,7 @@ var _default = (0, _vue.defineComponent)({
       }
     };
 
-    var onClickSubtitle = event => {
-      emit('click-subtitle', event);
-    };
+    var onClickSubtitle = event => emit('click-subtitle', event);
 
     var renderSubtitle = () => {
       if (props.showSubtitle) {

package/lib/calendar/CalendarMonth.js

@@ -72,15 +72,6 @@ var _default = (0, _vue.defineComponent)({
 
     var getTitle = () => title.value;
 
-    var scrollIntoView = body => {
-      var el = props.showSubtitle ? daysRef.value : monthRef.value;
-
-      if (el) {
-        var scrollTop = (0, _use.useRect)(el).top - (0, _use.useRect)(body).top + body.scrollTop;
-        (0, _utils.setScrollTop)(body, scrollTop);
-      }
-    };
-
     var getMultipleDayType = day => {
       var isSelected = date => props.currentDate.some(item => (0, _utils3.compareDay)(item, date) === 0);
 
@@ -233,6 +224,16 @@ var _default = (0, _vue.defineComponent)({
     });
     var disabledDays = (0, _vue.computed)(() => days.value.filter(day => day.type === 'disabled'));
 
+    var scrollToDate = (body, targetDate) => {
+      if (daysRef.value) {
+        var daysRect = (0, _use.useRect)(daysRef.value);
+        var totalRows = placeholders.value.length;
+        var currentRow = Math.ceil((targetDate.getDate() + offset.value) / 7);
+        var rowOffset = (currentRow - 1) * daysRect.height / totalRows;
+        (0, _utils.setScrollTop)(body, daysRect.top + rowOffset + body.scrollTop - (0, _use.useRect)(body).top);
+      }
+    };
+
     var renderDay = (item, index) => (0, _vue.createVNode)(_CalendarDay.default, {
       "item": item,
       "index": index,
@@ -252,7 +253,7 @@ var _default = (0, _vue.defineComponent)({
       getTitle,
       getHeight: () => height.value,
       setVisible,
-      scrollIntoView,
+      scrollToDate,
       disabledDays
     });
     return () => (0, _vue.createVNode)("div", {

package/lib/calendar/types.d.ts

@@ -21,6 +21,6 @@ export declare type CalendarMonthInstance = ComponentPublicInstance<CalendarMont
     getTitle: () => string;
     getHeight: () => number;
     setVisible: (value?: boolean | undefined) => void;
-    scrollIntoView: (body: Element) => void;
+    scrollToDate: (body: Element, targetDate: Date) => void;
     disabledDays: Ref<ComputedRef<CalendarDayItem[]>>;
 }>;