vant 3.2.7 → 3.3.2

package/es/address-edit/AddressEdit.js

@@ -7,6 +7,7 @@ import { useExpose } from '../composables/use-expose'; // Components
 
 import { Area } from '../area';
 import { Cell } from '../cell';
+import { Form } from '../form';
 import { Field } from '../field';
 import { Popup } from '../popup';
 import { Toast } from '../toast';
@@ -74,18 +75,9 @@ export default defineComponent({
       slots
     } = _ref;
     var areaRef = ref();
-    var state = reactive({
-      data: {},
-      showAreaPopup: false,
-      detailFocused: false,
-      errorInfo: {
-        tel: '',
-        name: '',
-        areaCode: '',
-        postalCode: '',
-        addressDetail: ''
-      }
-    });
+    var data = reactive({});
+    var showAreaPopup = ref(false);
+    var detailFocused = ref(false);
     var areaListLoaded = computed(() => isObject(props.areaList) && Object.keys(props.areaList).length);
     var areaText = computed(() => {
       var {
@@ -94,7 +86,7 @@ export default defineComponent({
         city,
         county,
         areaCode
-      } = state.data;
+      } = data;
 
       if (areaCode) {
         var arr = [country, province, city, county];
@@ -112,7 +104,7 @@ export default defineComponent({
     var hideBottomFields = 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 = () => {
@@ -120,77 +112,59 @@ export default defineComponent({
         var detail = areaRef.value.getArea();
         detail.areaCode = detail.code;
         delete detail.code;
-        extend(state.data, detail);
+        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 = 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);
     };
 
@@ -199,22 +173,25 @@ export default defineComponent({
 
       if (values.some(value => !value.code)) {
         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) {
         nextTick(assignAreaValues);
@@ -224,20 +201,20 @@ export default 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': () => _createVNode(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)
@@ -248,8 +225,6 @@ export default defineComponent({
           "class": bem('default')
         }, _slots), [[_vShow, !hideBottomFields.value]]);
       }
-
-      return null;
     };
 
     useExpose({
@@ -257,115 +232,114 @@ export default defineComponent({
       setAreaCode,
       setAddressDetail
     });
-    watch(() => props.areaList, () => setAreaCode(state.data.areaCode));
+    watch(() => props.areaList, () => setAreaCode(data.areaCode));
     watch(() => props.addressInfo, value => {
-      state.data = extend({}, DEFAULT_DATA, value);
+      extend(data, DEFAULT_DATA, value);
       setAreaCode(value.areaCode);
     }, {
       deep: true,
       immediate: true
     });
     return () => {
-      var {
-        data,
-        errorInfo
-      } = state;
       var {
         disableArea
       } = props;
-      return _createVNode("div", {
-        "class": bem()
-      }, [_createVNode("div", {
-        "class": bem('fields')
-      }, [_createVNode(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), _createVNode(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), _withDirectives(_createVNode(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), [[_vShow, props.showArea]]), _createVNode(AddressEditDetail, {
-        "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 && _withDirectives(_createVNode(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), [[_vShow, !hideBottomFields.value]]), slots.default == null ? void 0 : slots.default()]), renderSetDefaultCell(), _withDirectives(_createVNode("div", {
-        "class": bem('buttons')
-      }, [_createVNode(Button, {
-        "block": true,
-        "round": true,
-        "type": "danger",
-        "text": props.saveButtonText || t('save'),
-        "class": bem('button'),
-        "loading": props.isSaving,
-        "onClick": onSave
-      }, null), props.showDelete && _createVNode(Button, {
-        "block": true,
-        "round": true,
-        "class": bem('button'),
-        "loading": props.isDeleting,
-        "text": props.deleteButtonText || t('delete'),
-        "onClick": onDelete
-      }, null)]), [[_vShow, !hideBottomFields.value]]), _createVNode(Popup, {
-        "show": state.showAreaPopup,
-        "onUpdate:show": $event => state.showAreaPopup = $event,
-        "round": true,
-        "teleport": "body",
-        "position": "bottom",
-        "lazyRender": false
+      return _createVNode(Form, {
+        "class": bem(),
+        "onSubmit": onSave
       }, {
-        default: () => [_createVNode(Area, {
-          "ref": areaRef,
-          "value": data.areaCode,
-          "loading": !areaListLoaded.value,
-          "areaList": props.areaList,
-          "columnsPlaceholder": props.areaColumnsPlaceholder,
-          "onConfirm": onAreaConfirm,
-          "onCancel": () => {
-            state.showAreaPopup = false;
+        default: () => [_createVNode("div", {
+          "class": bem('fields')
+        }, [_createVNode(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), _createVNode(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), _withDirectives(_createVNode(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), [[_vShow, props.showArea]]), _createVNode(AddressEditDetail, {
+          "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 && _withDirectives(_createVNode(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), [[_vShow, !hideBottomFields.value]]), slots.default == null ? void 0 : slots.default()]), renderSetDefaultCell(), _withDirectives(_createVNode("div", {
+          "class": bem('buttons')
+        }, [_createVNode(Button, {
+          "block": true,
+          "round": true,
+          "type": "danger",
+          "text": props.saveButtonText || t('save'),
+          "class": bem('button'),
+          "loading": props.isSaving,
+          "nativeType": "submit"
+        }, null), props.showDelete && _createVNode(Button, {
+          "block": true,
+          "round": true,
+          "class": bem('button'),
+          "loading": props.isDeleting,
+          "text": props.deleteButtonText || t('delete'),
+          "onClick": onDelete
+        }, null)]), [[_vShow, !hideBottomFields.value]]), _createVNode(Popup, {
+          "show": showAreaPopup.value,
+          "onUpdate:show": $event => showAreaPopup.value = $event,
+          "round": true,
+          "teleport": "body",
+          "position": "bottom",
+          "lazyRender": false
+        }, {
+          default: () => [_createVNode(Area, {
+            "ref": areaRef,
+            "value": data.areaCode,
+            "loading": !areaListLoaded.value,
+            "areaList": props.areaList,
+            "columnsPlaceholder": props.areaColumnsPlaceholder,
+            "onConfirm": onAreaConfirm,
+            "onCancel": () => {
+              showAreaPopup.value = false;
+            }
+          }, null)]
+        })]
+      });
     };
   }
 

package/es/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/es/address-edit/AddressEditDetail.js

@@ -11,12 +11,12 @@ export default defineComponent({
   name,
   props: {
     show: Boolean,
+    rows: numericProp,
     value: String,
+    rules: Array,
     focused: Boolean,
-    detailRows: numericProp,
+    maxlength: numericProp,
     searchResult: Array,
-    errorMessage: String,
-    detailMaxlength: numericProp,
     showSearchResult: Boolean
   },
   emits: ['blur', 'focus', 'input', 'select-search'],
@@ -77,14 +77,14 @@ export default 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/es/button/Button.js

@@ -1,7 +1,7 @@
 import { createVNode as _createVNode } from "vue";
 import { defineComponent } from 'vue'; // Utils
 
-import { extend, numericProp, makeStringProp, createNamespace, BORDER_SURROUND } from '../utils';
+import { extend, numericProp, preventDefault, makeStringProp, createNamespace, BORDER_SURROUND } from '../utils';
 import { useRoute, routeProps } from '../composables/use-route'; // Components
 
 import { Icon } from '../icon';
@@ -118,7 +118,7 @@ export default defineComponent({
 
     var onClick = event => {
       if (props.loading) {
-        event.preventDefault();
+        preventDefault(event);
       } else if (!props.disabled) {
         emit('click', event);
         route();

package/es/calendar/Calendar.js

@@ -220,7 +220,7 @@ export default defineComponent({
         months.value.some((month, index) => {
           if (compareMonth(month, targetDate) === 0) {
             if (bodyRef.value) {
-              monthRefs.value[index].scrollIntoView(bodyRef.value);
+              monthRefs.value[index].scrollToDate(bodyRef.value, targetDate);
             }
 
             return true;
@@ -230,10 +230,9 @@ export default defineComponent({
         });
         onScroll();
       });
-    }; // scroll to current month
-
+    };
 
-    var scrollIntoView = () => {
+    var scrollToCurrentDate = () => {
       if (props.poppable && !props.show) {
         return;
       }
@@ -255,7 +254,7 @@ export default defineComponent({
         // add Math.floor to avoid decimal height issues
         // https://github.com/youzan/vant/issues/5640
         bodyHeight = Math.floor(useRect(bodyRef).height);
-        scrollIntoView();
+        scrollToCurrentDate();
       });
     };
 
@@ -265,7 +264,7 @@ export default defineComponent({
       }
 
       currentDate.value = date;
-      scrollIntoView();
+      scrollToCurrentDate();
     };
 
     var checkRange = date => {
@@ -303,13 +302,8 @@ export default defineComponent({
         var valid = checkRange(date);
 
         if (!valid) {
-          // auto selected to max range if showConfirm
-          if (props.showConfirm) {
-            setCurrentDate([date[0], getDayByOffset(date[0], +props.maxRange - 1)]);
-          } else {
-            setCurrentDate(date);
-          }
-
+          // auto selected to max range
+          setCurrentDate([date[0], getDayByOffset(date[0], +props.maxRange - 1)]);
           return;
         }
       }
@@ -467,7 +461,7 @@ export default defineComponent({
       }
 
       currentDate.value = value;
-      scrollIntoView();
+      scrollToCurrentDate();
     });
     useExpose({
       reset,

package/es/calendar/CalendarHeader.js

@@ -30,9 +30,7 @@ export default defineComponent({
       }
     };
 
-    var onClickSubtitle = event => {
-      emit('click-subtitle', event);
-    };
+    var onClickSubtitle = event => emit('click-subtitle', event);
 
     var renderSubtitle = () => {
       if (props.showSubtitle) {

package/es/calendar/CalendarMonth.js

@@ -58,15 +58,6 @@ export default defineComponent({
 
     var getTitle = () => title.value;
 
-    var scrollIntoView = body => {
-      var el = props.showSubtitle ? daysRef.value : monthRef.value;
-
-      if (el) {
-        var scrollTop = useRect(el).top - useRect(body).top + body.scrollTop;
-        setScrollTop(body, scrollTop);
-      }
-    };
-
     var getMultipleDayType = day => {
       var isSelected = date => props.currentDate.some(item => compareDay(item, date) === 0);
 
@@ -219,6 +210,16 @@ export default defineComponent({
     });
     var disabledDays = computed(() => days.value.filter(day => day.type === 'disabled'));
 
+    var scrollToDate = (body, targetDate) => {
+      if (daysRef.value) {
+        var daysRect = useRect(daysRef.value);
+        var totalRows = placeholders.value.length;
+        var currentRow = Math.ceil((targetDate.getDate() + offset.value) / 7);
+        var rowOffset = (currentRow - 1) * daysRect.height / totalRows;
+        setScrollTop(body, daysRect.top + rowOffset + body.scrollTop - useRect(body).top);
+      }
+    };
+
     var renderDay = (item, index) => _createVNode(CalendarDay, {
       "item": item,
       "index": index,
@@ -238,7 +239,7 @@ export default defineComponent({
       getTitle,
       getHeight: () => height.value,
       setVisible,
-      scrollIntoView,
+      scrollToDate,
       disabledDays
     });
     return () => _createVNode("div", {

package/es/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[]>>;
 }>;