vxe-pc-ui 4.7.16 → 4.7.17

package/lib/index.umd.js

@@ -4285,14 +4285,14 @@ function checkDynamic() {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-const log_version = `ui v${"4.7.16"}`;
+const log_version = `ui v${"4.7.17"}`;
 const warnLog = log.create('warn', log_version);
 const errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
 
-const ui_version = "4.7.16";
+const ui_version = "4.7.17";
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -15980,13 +15980,7 @@ const Countdown = VxeCountdown;
         }, evnt);
       }
     };
-    const isDateDisabled = item => {
-      const {
-        disabledMethod
-      } = props;
-      const {
-        datePanelType
-      } = reactData;
+    const isRangeDisabled = item => {
       const dateStartTime = computeDateStartTime.value;
       const dateEndTime = computeDateEndTime.value;
       const {
@@ -15998,6 +15992,18 @@ const Countdown = VxeCountdown;
       if (dateEndTime && dateEndTime.getTime() < date.getTime()) {
         return true;
       }
+      return false;
+    };
+    const isDateDisabled = item => {
+      const {
+        disabledMethod
+      } = props;
+      const {
+        datePanelType
+      } = reactData;
+      const {
+        date
+      } = item;
       if (disabledMethod) {
         return disabledMethod({
           type: datePanelType,
@@ -16008,6 +16014,9 @@ const Countdown = VxeCountdown;
       }
       return false;
     };
+    const hasAllDisabled = item => {
+      return isRangeDisabled(item) || isDateDisabled(item);
+    };
     const dateSelectItem = date => {
       const {
         type,
@@ -16061,12 +16070,12 @@ const Countdown = VxeCountdown;
       }
     };
     const dateSelectEvent = item => {
-      if (!isDateDisabled(item)) {
+      if (!hasAllDisabled(item)) {
         dateSelectItem(item.date);
       }
     };
     const dateMoveDay = offsetDay => {
-      if (!isDateDisabled({
+      if (!hasAllDisabled({
         date: offsetDay
       })) {
         const dayList = computeDayList.value;
@@ -16077,7 +16086,7 @@ const Countdown = VxeCountdown;
       }
     };
     const dateMoveYear = offsetYear => {
-      if (!isDateDisabled({
+      if (!hasAllDisabled({
         date: offsetYear
       })) {
         const yearList = computeYearList.value;
@@ -16088,7 +16097,7 @@ const Countdown = VxeCountdown;
       }
     };
     const dateMoveQuarter = offsetQuarter => {
-      if (!isDateDisabled({
+      if (!hasAllDisabled({
         date: offsetQuarter
       })) {
         const quarterList = computeQuarterList.value;
@@ -16099,7 +16108,7 @@ const Countdown = VxeCountdown;
       }
     };
     const dateMoveMonth = offsetMonth => {
-      if (!isDateDisabled({
+      if (!hasAllDisabled({
         date: offsetMonth
       })) {
         const monthList = computeMonthList.value;
@@ -16110,7 +16119,7 @@ const Countdown = VxeCountdown;
       }
     };
     const dateMouseenterEvent = item => {
-      if (!isDateDisabled(item)) {
+      if (!hasAllDisabled(item)) {
         const {
           datePanelType
         } = reactData;
@@ -16370,6 +16379,7 @@ const Countdown = VxeCountdown;
               'is--current': item.isCurrent,
               'is--now': item.isNow,
               'is--next': item.isNext,
+              'is--range-disabled': isRangeDisabled(item),
               'is--disabled': isDateDisabled(item),
               'is--selected': isSelected,
               'is--over': overCount && !isSelected,
@@ -16436,6 +16446,7 @@ const Countdown = VxeCountdown;
               'is--current': item.isCurrent,
               'is--now': rIndex ? item.isNow : isNowWeek,
               'is--next': item.isNext,
+              'is--range-disabled': isRangeDisabled(item),
               'is--disabled': isDateDisabled(item),
               'is--selected': isSelected,
               'is--over': overCount && !isSelected,
@@ -16484,6 +16495,7 @@ const Countdown = VxeCountdown;
               'is--current': item.isCurrent,
               'is--now': item.isNow,
               'is--next': item.isNext,
+              'is--range-disabled': isRangeDisabled(item),
               'is--disabled': isDateDisabled(item),
               'is--selected': isSelected,
               'is--over': overCount && !isSelected,
@@ -16532,6 +16544,7 @@ const Countdown = VxeCountdown;
               'is--current': item.isCurrent,
               'is--now': item.isNow,
               'is--next': item.isNext,
+              'is--range-disabled': isRangeDisabled(item),
               'is--disabled': isDateDisabled(item),
               'is--selected': isSelected,
               'is--over': overCount && !isSelected,
@@ -16580,6 +16593,7 @@ const Countdown = VxeCountdown;
               'is--current': item.isCurrent,
               'is--now': item.isNow,
               'is--next': item.isNext,
+              'is--range-disabled': isRangeDisabled(item),
               'is--disabled': isDateDisabled(item),
               'is--selected': isSelected,
               'is--over': overCount && !isSelected,
@@ -17606,8 +17620,8 @@ const DatePanel = VxeDatePanel;
         limitCount: props.limitCount,
         startDate: props.startDate,
         endDate: props.endDate,
-        minDate: props.minDate,
         defaultDate: props.defaultDate,
+        minDate: props.minDate,
         maxDate: props.maxDate,
         startDay: props.startDay,
         labelFormat: props.labelFormat,
@@ -17841,6 +17855,14 @@ const DatePicker = VxeDatePicker;
       type: String,
       default: () => getConfig().dateRangePicker.size || getConfig().size
     },
+    // startDate: {
+    //   type: [String, Number, Date] as PropType<VxeDateRangePickerPropTypes.StartDate>,
+    //   default: () => getConfig().dateRangePicker.startDate
+    // },
+    // endDate: {
+    //   type: [String, Number, Date] as PropType<VxeDateRangePickerPropTypes.EndDate>,
+    //   default: () => getConfig().dateRangePicker.endDate
+    // },
     minDate: [String, Number, Date],
     maxDate: [String, Number, Date],
     defaultDate: [String, Number, Date],
@@ -18735,8 +18757,8 @@ const DatePicker = VxeDatePicker;
         className: props.className,
         minDate: props.minDate,
         maxDate: props.maxDate,
-        startDay: props.startDay,
         endDate: endValue,
+        startDay: props.startDay,
         labelFormat: props.labelFormat,
         valueFormat: props.valueFormat,
         timeFormat: props.timeFormat,
@@ -18751,8 +18773,8 @@ const DatePicker = VxeDatePicker;
         className: props.className,
         minDate: props.minDate,
         maxDate: props.maxDate,
-        startDay: props.startDay,
         startDate: startValue,
+        startDay: props.startDay,
         labelFormat: props.labelFormat,
         valueFormat: props.valueFormat,
         timeFormat: props.timeFormat,