vxe-pc-ui 4.15.24 → 4.15.25

package/dist/all.esm.js

@@ -81,7 +81,7 @@ function checkDynamic() {
 }
 
 const { log } = VxeUI;
-const uiVersion = `ui v${"4.15.24"}`;
+const uiVersion = `ui v${"4.15.25"}`;
 function createComponentLog(name) {
     const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -95,7 +95,7 @@ function createComponentLog(name) {
 const warnLog$g = log.create('warn', uiVersion);
 log.create('error', uiVersion);
 
-const version = "4.15.24";
+const version = "4.15.25";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -3866,7 +3866,7 @@ dynamicApp.use(VxeButton);
 VxeUI.component(VxeButtonComponent);
 const Button = VxeButton;
 
-const { errLog: errLog$h } = createComponentLog('backtop');
+const { errLog: errLog$i } = createComponentLog('backtop');
 function createInternalData$j() {
     return {
         targetEl: null
@@ -4044,13 +4044,13 @@ var VxeBacktopComponent = defineVxeComponent({
                 const { target } = props;
                 if (!target) {
                     removeScrollEvent();
-                    errLog$h('vxe.error.reqProp', ['target']);
+                    errLog$i('vxe.error.reqProp', ['target']);
                     return;
                 }
                 if (XEUtils.isString(target)) {
                     const tEl = document.querySelector(target);
                     if (!tEl) {
-                        errLog$h('vxe.error.errProp', [`target=${target}`, 'body']);
+                        errLog$i('vxe.error.errProp', [`target=${target}`, 'body']);
                     }
                     const { targetEl } = internalData;
                     if (targetEl !== tEl) {
@@ -4572,7 +4572,7 @@ function parseDateValue(val, type, options) {
     const { valueFormat } = options;
     if (val) {
         if (type === 'time') {
-            return toStringTimeDate(XEUtils.isArray(val) ? val : XEUtils.last(val));
+            return toStringTimeDate(XEUtils.isArray(val) ? XEUtils.last(val) : val);
         }
         if (XEUtils.isNumber(val) || /^[0-9]{10,15}$/.test(`${val}`)) {
             return new Date(Number(val));
@@ -4753,6 +4753,16 @@ function checkDateInputFormat(numStr, formatKey) {
     }
     return numVal;
 }
+const getPrevYear = (date, size = 1) => {
+    const currtYear = date.getFullYear();
+    date.setFullYear(currtYear - size);
+    return date;
+};
+const getNextYear = (date, size = 1) => {
+    const currtYear = date.getFullYear();
+    date.setFullYear(currtYear + size);
+    return date;
+};
 const getPrevMonth = (date) => {
     const currtYear = date.getFullYear();
     const currMonth = date.getMonth();
@@ -4778,7 +4788,7 @@ const getNextMonth = (date) => {
     return date;
 };
 
-const { errLog: errLog$g } = createComponentLog('calendar');
+const { errLog: errLog$h } = createComponentLog('calendar');
 const { menus: menus$2, getConfig: getConfig$2, getI18n: getI18n$1 } = VxeUI;
 var VxeCalendarComponent = defineVxeComponent({
     name: 'VxeCalendar',
@@ -6046,7 +6056,7 @@ var VxeCalendarComponent = defineVxeComponent({
             const { menuConfig } = props;
             const VxeUIContextMenu = VxeUI.getComponent('VxeContextMenu');
             if (menuConfig && !VxeUIContextMenu) {
-                errLog$g('vxe.error.reqComp', ['vxe-context-menu']);
+                errLog$h('vxe.error.reqComp', ['vxe-context-menu']);
             }
             dateOpenPanel();
         });
@@ -6859,7 +6869,7 @@ function clearRowAnimate(elem, clss) {
     }, 500);
 }
 
-const { errLog: errLog$f } = createComponentLog('tree');
+const { errLog: errLog$g } = createComponentLog('tree');
 function getRowKeyByField(row, keyField) {
     return row ? ('' + (row[keyField] || '')) : '';
 }
@@ -8356,17 +8366,17 @@ var VxeListComponent = defineVxeComponent({
             const keyField = computeKeyField.value;
             if (!keyField) {
                 if (showRadio) {
-                    errLog$f('vxe.error.reqSupportProp', ['show-radio', 'row-config.keyField']);
+                    errLog$g('vxe.error.reqSupportProp', ['show-radio', 'row-config.keyField']);
                 }
                 if (showCheckbox) {
-                    errLog$f('vxe.error.reqSupportProp', ['show-checkbox', 'row-config.keyField']);
+                    errLog$g('vxe.error.reqSupportProp', ['show-checkbox', 'row-config.keyField']);
                 }
                 if (isDrag) {
-                    errLog$f('vxe.error.reqSupportProp', ['drag-config', 'row-config.keyField']);
+                    errLog$g('vxe.error.reqSupportProp', ['drag-config', 'row-config.keyField']);
                 }
             }
             if (useKey && !keyField) {
-                errLog$f('vxe.error.reqSupportProp', ['row-config.useKey', 'row-config.keyField']);
+                errLog$g('vxe.error.reqSupportProp', ['row-config.useKey', 'row-config.keyField']);
             }
             if (props.autoResize) {
                 const el = refElem.value;
@@ -17430,6 +17440,7 @@ dynamicApp.use(VxeCountdown);
 VxeUI.component(VxeCountdownComponent);
 const Countdown = VxeCountdown;
 
+const { errLog: errLog$f } = createComponentLog('date-panel');
 var VxeDatePanelComponent = defineVxeComponent({
     name: 'VxeDatePanel',
     props: {
@@ -17515,32 +17526,26 @@ var VxeDatePanelComponent = defineVxeComponent({
             currentDate: null
         });
         const internalData = {
-            yearSize: 12,
-            monthSize: 20,
-            quarterSize: 8,
+            yearSize: 16,
+            monthSize: 12,
+            quarterSize: 4,
             hpTimeout: undefined
         };
         const refElem = ref();
         const refPanelWrapper = ref();
         const refInputTimeBody = ref();
-        const refMaps = {
-            refElem
-        };
-        const $xeDatePanel = {
-            xID,
-            props,
-            context,
-            reactData,
-            internalData,
-            getRefMaps: () => refMaps
-        };
-        const computeIsDateTimeType = computed(() => {
+        const computeIsTimeType = computed(() => {
             const { type } = props;
-            return type === 'time' || type === 'datetime';
+            return type === 'time';
+        });
+        const computeIsTimeOrDateTimeType = computed(() => {
+            const { type } = props;
+            const isTimeType = computeIsTimeType.value;
+            return isTimeType || type === 'datetime';
         });
         const computeIsDatePanelType = computed(() => {
-            const isDateTimeType = computeIsDateTimeType.value;
-            return isDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(props.type) > -1;
+            const isTimeOrDateTimeType = computeIsTimeOrDateTimeType.value;
+            return isTimeOrDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(props.type) > -1;
         });
         const computeDateStartDate = computed(() => {
             return props.startDate ? XEUtils.toStringDate(props.startDate) : null;
@@ -17549,19 +17554,25 @@ var VxeDatePanelComponent = defineVxeComponent({
             return props.endDate ? XEUtils.toStringDate(props.endDate) : null;
         });
         const computeDateListValue = computed(() => {
-            const { modelValue } = props;
+            const { modelValue, valueFormat } = props;
             const isDatePanelType = computeIsDatePanelType.value;
             const dateValueFormat = computeDateValueFormat.value;
+            const restList = [];
             if (modelValue && isDatePanelType) {
-                return XEUtils.toValueString(modelValue).split(',').map(item => {
-                    const date = parseDate(item, dateValueFormat);
-                    if (XEUtils.isValidDate(date)) {
-                        return date;
+                (XEUtils.isArray(modelValue) ? modelValue : XEUtils.toValueString(modelValue).split(',')).forEach(val => {
+                    let strVal = val;
+                    if (val) {
+                        if (valueFormat === 'timestamp') {
+                            if (XEUtils.isString(val) && /^\d+$/.test(val)) {
+                                strVal = Number(strVal);
+                            }
+                        }
+                        const date = parseDate(strVal, dateValueFormat);
+                        restList.push(date);
                     }
-                    return date;
                 });
             }
-            return [];
+            return restList;
         });
         const computeDateMultipleValue = computed(() => {
             const dateListValue = computeDateListValue.value;
@@ -17634,8 +17645,8 @@ var VxeDatePanelComponent = defineVxeComponent({
         });
         const computeDateHMSTime = computed(() => {
             const dateValue = computeDateValue.value;
-            const isDateTimeType = computeIsDateTimeType.value;
-            return dateValue && isDateTimeType ? (dateValue.getHours() * 3600 + dateValue.getMinutes() * 60 + dateValue.getSeconds()) * 1000 : 0;
+            const isTimeOrDateTimeType = computeIsTimeOrDateTimeType.value;
+            return dateValue && isTimeOrDateTimeType ? (dateValue.getHours() * 3600 + dateValue.getMinutes() * 60 + dateValue.getSeconds()) * 1000 : 0;
         });
         const computeDateLabelFormat = computed(() => {
             const { labelFormat } = props;
@@ -17653,7 +17664,7 @@ var VxeDatePanelComponent = defineVxeComponent({
                 const currFullYear = currentDate.getFullYear();
                 const selectFullYear = selectMonth.getFullYear();
                 const startYearDate = new Date(selectFullYear - selectFullYear % yearSize, 0, 1);
-                for (let index = -4; index < yearSize + 4; index++) {
+                for (let index = 0; index < yearSize; index++) {
                     const date = XEUtils.getWhatYear(startYearDate, index, 'first');
                     const itemFullYear = date.getFullYear();
                     years.push({
@@ -17753,7 +17764,7 @@ var VxeDatePanelComponent = defineVxeComponent({
                 const currQuarter = getDateQuarter(currentDate);
                 const firstYear = XEUtils.getWhatYear(selectMonth, 0, 'first');
                 const selFullYear = firstYear.getFullYear();
-                for (let index = -2; index < quarterSize - 2; index++) {
+                for (let index = 0; index < quarterSize; index++) {
                     const date = XEUtils.getWhatQuarter(firstYear, index);
                     const itemFullYear = date.getFullYear();
                     const itemQuarter = getDateQuarter(date);
@@ -17782,7 +17793,7 @@ var VxeDatePanelComponent = defineVxeComponent({
                 const currFullYear = currentDate.getFullYear();
                 const currMonth = currentDate.getMonth();
                 const selFullYear = XEUtils.getWhatYear(selectMonth, 0, 'first').getFullYear();
-                for (let index = -4; index < monthSize - 4; index++) {
+                for (let index = 0; index < monthSize; index++) {
                     const date = XEUtils.getWhatYear(selectMonth, 0, index);
                     const itemFullYear = date.getFullYear();
                     const itemMonth = date.getMonth();
@@ -17860,8 +17871,8 @@ var VxeDatePanelComponent = defineVxeComponent({
             const timeOpts = computeTimeOpts.value;
             const { hours: hourOptions, hourDisabledMethod } = timeOpts;
             const list = [];
-            const isDateTimeType = computeIsDateTimeType.value;
-            if (isDateTimeType) {
+            const isTimeOrDateTimeType = computeIsTimeOrDateTimeType.value;
+            if (isTimeOrDateTimeType) {
                 if (hourOptions && hourOptions.length) {
                     hourOptions.forEach(item => {
                         if (XEUtils.isNumber(item) || XEUtils.isString(item)) {
@@ -17899,8 +17910,8 @@ var VxeDatePanelComponent = defineVxeComponent({
             const timeOpts = computeTimeOpts.value;
             const { minutes: minuteOptions, minuteDisabledMethod } = timeOpts;
             const list = [];
-            const isDateTimeType = computeIsDateTimeType.value;
-            if (isDateTimeType) {
+            const isTimeOrDateTimeType = computeIsTimeOrDateTimeType.value;
+            if (isTimeOrDateTimeType) {
                 if (minuteOptions && minuteOptions.length) {
                     minuteOptions.forEach(item => {
                         if (XEUtils.isNumber(item) || XEUtils.isString(item)) {
@@ -17948,8 +17959,8 @@ var VxeDatePanelComponent = defineVxeComponent({
             const timeOpts = computeTimeOpts.value;
             const { seconds: secondOptions, secondDisabledMethod } = timeOpts;
             const list = [];
-            const isDateTimeType = computeIsDateTimeType.value;
-            if (isDateTimeType) {
+            const isTimeOrDateTimeType = computeIsTimeOrDateTimeType.value;
+            if (isTimeOrDateTimeType) {
                 if (secondOptions && secondOptions.length) {
                     secondOptions.forEach(item => {
                         if (XEUtils.isNumber(item) || XEUtils.isString(item)) {
@@ -17983,6 +17994,22 @@ var VxeDatePanelComponent = defineVxeComponent({
             }
             return list;
         });
+        const refMaps = {
+            refElem
+        };
+        const computeMaps = {
+            computeSize,
+            computeYearList
+        };
+        const $xeDatePanel = {
+            xID,
+            props,
+            context,
+            reactData,
+            internalData,
+            getRefMaps: () => refMaps,
+            getComputeMaps: () => computeMaps
+        };
         const updateModelValue = (modelValue) => {
             const { type } = props;
             const dateValueFormat = computeDateValueFormat.value;
@@ -17994,7 +18021,7 @@ var VxeDatePanelComponent = defineVxeComponent({
         const parseDate = (value, format) => {
             const { type, multiple } = props;
             if (type === 'time') {
-                return toStringTimeDate(XEUtils.isArray(value) ? value : XEUtils.last(value));
+                return toStringTimeDate(XEUtils.isArray(value) ? XEUtils.last(value) : value);
             }
             if (XEUtils.isArray(value)) {
                 return XEUtils.toStringDate(XEUtils.last(value), format);
@@ -18148,14 +18175,15 @@ var VxeDatePanelComponent = defineVxeComponent({
         const dateChange = (date, isReload) => {
             const { modelValue, multiple, valueSort } = props;
             const { datetimePanelValue } = reactData;
-            const isDateTimeType = computeIsDateTimeType.value;
+            const isTimeType = computeIsTimeType.value;
+            const isTimeOrDateTimeType = computeIsTimeOrDateTimeType.value;
             const dateValueFormat = computeDateValueFormat.value;
             const firstDayOfWeek = computeFirstDayOfWeek.value;
             if (props.type === 'week') {
                 const sWeek = XEUtils.toNumber(props.selectDay);
                 date = XEUtils.getWhatWeek(date, 0, sWeek, firstDayOfWeek);
             }
-            else if (isDateTimeType) {
+            else if (isTimeOrDateTimeType) {
                 if (datetimePanelValue) {
                     date.setHours(datetimePanelValue.getHours());
                     date.setMinutes(datetimePanelValue.getMinutes());
@@ -18164,10 +18192,10 @@ var VxeDatePanelComponent = defineVxeComponent({
             }
             const inpVal = XEUtils.toDateString(date, dateValueFormat, { firstDay: firstDayOfWeek });
             dateCheckMonth(date);
-            if (multiple) {
+            if (!isTimeType && multiple) {
                 const overCount = computeOverCount.value;
                 // 如果为多选
-                if (isDateTimeType) {
+                if (isTimeOrDateTimeType) {
                     // 如果是datetime特殊类型
                     const dateListValue = isReload ? [] : [...computeDateListValue.value];
                     let datetimeRest = [];
@@ -18503,19 +18531,21 @@ var VxeDatePanelComponent = defineVxeComponent({
         };
         const dateConfirmEvent = (evnt) => {
             const { multiple } = props;
-            const { datetimePanelValue } = reactData;
+            const { datetimePanelValue, currentDate } = reactData;
             const dateValue = computeDateValue.value;
-            const isDateTimeType = computeIsDateTimeType.value;
-            if (isDateTimeType) {
+            const isTimeType = computeIsTimeType.value;
+            const isTimeOrDateTimeType = computeIsTimeOrDateTimeType.value;
+            if (isTimeOrDateTimeType) {
                 const dateValueFormat = computeDateValueFormat.value;
-                if (multiple) {
+                if (!isTimeType && multiple) {
                     // 如果为多选
                     const dateMultipleValue = computeDateMultipleValue.value;
-                    if (isDateTimeType) {
+                    const dateListValue = computeDateListValue.value;
+                    if (isTimeOrDateTimeType) {
                         // 如果是datetime特殊类型
-                        const dateListValue = [...computeDateListValue.value];
+                        const listVals = dateListValue.length ? [...dateListValue] : [];
                         const datetimeRest = [];
-                        dateListValue.forEach(item => {
+                        listVals.forEach(item => {
                             if (item) {
                                 if (datetimePanelValue) {
                                     item.setHours(datetimePanelValue.getHours());
@@ -18533,7 +18563,7 @@ var VxeDatePanelComponent = defineVxeComponent({
                     }
                 }
                 else {
-                    dateChange(dateValue || reactData.currentDate);
+                    dateChange(dateValue || currentDate);
                 }
             }
             hidePanel();
@@ -18559,7 +18589,7 @@ var VxeDatePanelComponent = defineVxeComponent({
         };
         const dateOpenPanel = () => {
             const { type, defaultDate, defaultTime } = props;
-            const isDateTimeType = computeIsDateTimeType.value;
+            const isTimeOrDateTimeType = computeIsTimeOrDateTimeType.value;
             const dateValue = computeDateValue.value;
             if (['year', 'quarter', 'month', 'week'].indexOf(type) > -1) {
                 reactData.datePanelType = type;
@@ -18587,7 +18617,7 @@ var VxeDatePanelComponent = defineVxeComponent({
                     dateNowHandle();
                 }
             }
-            if (isDateTimeType) {
+            if (isTimeOrDateTimeType) {
                 let dtPanelValue = reactData.datePanelValue;
                 if (!dtPanelValue) {
                     dtPanelValue = XEUtils.getWhatDay(Date.now(), 0, 'first');
@@ -19194,6 +19224,12 @@ var VxeDatePanelComponent = defineVxeComponent({
         });
         initValue();
         dateOpenPanel();
+        onMounted(() => {
+            const { type, multiple } = props;
+            if (multiple && type === 'time') {
+                errLog$f('vxe.error.notSupportProp', [`type=${type}`, 'multiple=true', 'multiple=false']);
+            }
+        });
         $xeDatePanel.renderVN = renderVN;
         return $xeDatePanel;
     },
@@ -19428,20 +19464,25 @@ var VxeDatePickerComponent = defineVxeComponent({
             }
             return disabled;
         });
-        const computeIsDateTimeType = computed(() => {
+        const computeIsTimeType = computed(() => {
             const { type } = props;
-            return type === 'time' || type === 'datetime';
+            return type === 'time';
+        });
+        const computeIsTimeOrDateTimeType = computed(() => {
+            const { type } = props;
+            const isTimeType = computeIsTimeType.value;
+            return isTimeType || type === 'datetime';
         });
         const computeIsDatePickerType = computed(() => {
-            const isDateTimeType = computeIsDateTimeType.value;
-            return isDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(props.type) > -1;
+            const isTimeOrDateTimeType = computeIsTimeOrDateTimeType.value;
+            return isTimeOrDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(props.type) > -1;
         });
         const computeIsClearable = computed(() => {
             return props.clearable;
         });
         const computeIsDatePanelType = computed(() => {
-            const isDateTimeType = computeIsDateTimeType.value;
-            return isDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(props.type) > -1;
+            const isTimeOrDateTimeType = computeIsTimeOrDateTimeType.value;
+            return isTimeOrDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(props.type) > -1;
         });
         const computeDateListValue = computed(() => {
             const { modelValue, type, multiple } = props;
@@ -19655,7 +19696,7 @@ var VxeDatePickerComponent = defineVxeComponent({
         };
         const dateChange = (date, isReload) => {
             const { modelValue, multiple } = props;
-            const isDateTimeType = computeIsDateTimeType.value;
+            const isTimeOrDateTimeType = computeIsTimeOrDateTimeType.value;
             const dateValueFormat = computeDateValueFormat.value;
             const firstDayOfWeek = computeFirstDayOfWeek.value;
             if (props.type === 'week') {
@@ -19666,7 +19707,7 @@ var VxeDatePickerComponent = defineVxeComponent({
             if (multiple) {
                 const overCount = computeOverCount.value;
                 // 如果为多选
-                if (isDateTimeType) {
+                if (isTimeOrDateTimeType) {
                     // 如果是datetime特殊类型
                     const dateListValue = [...computeDateListValue.value];
                     const datetimeRest = [];
@@ -20219,9 +20260,9 @@ var VxeDatePickerComponent = defineVxeComponent({
         const panelChangeEvent = (params) => {
             const { multiple, autoClose } = props;
             const { value, $event } = params;
-            const isDateTimeType = computeIsDateTimeType.value;
+            const isTimeOrDateTimeType = computeIsTimeOrDateTimeType.value;
             handleChange(value, $event);
-            if (!multiple && !isDateTimeType) {
+            if (!multiple && !isTimeOrDateTimeType) {
                 if (autoClose) {
                     hidePanel();
                 }
@@ -20505,7 +20546,7 @@ var VxeDatePickerComponent = defineVxeComponent({
             const btnTransfer = computeBtnTransfer.value;
             const shortcutOpts = computeShortcutOpts.value;
             const isClearable = computeIsClearable.value;
-            const isDateTimeType = computeIsDateTimeType.value;
+            const isTimeOrDateTimeType = computeIsTimeOrDateTimeType.value;
             const shortcutList = computeShortcutList.value;
             const timeOpts = computeTimeOpts.value;
             const dateStartDate = computeDateStartDate.value;
@@ -20519,7 +20560,7 @@ var VxeDatePickerComponent = defineVxeComponent({
             const rightSlot = slots.right;
             const ppClassName = popupOpts.className;
             const hasShortcutBtn = shortcutList.length > 0;
-            const showConfirmBtn = (showConfirmButton === null ? (isDateTimeType || multiple) : showConfirmButton);
+            const showConfirmBtn = (showConfirmButton === null ? (isTimeOrDateTimeType || multiple) : showConfirmButton);
             const showClearBtn = (showClearButton === null ? (isClearable && showConfirmBtn && type !== 'time') : showClearButton);
             return h(Teleport, {
                 to: 'body',
@@ -20833,8 +20874,8 @@ function createReactData$d() {
         isActivated: false,
         selectStValue: '',
         selectEdValue: '',
-        paneStartVal: '',
-        paneEndVal: ''
+        paneStartVal: [],
+        paneEndVal: []
     };
 }
 function createInternalData$c() {
@@ -21067,9 +21108,14 @@ var VxeDateRangePickerComponent = defineVxeComponent({
             const { startValue, endValue } = props;
             return `${startValue || ''}${endValue || ''}`;
         });
-        const computeIsDateTimeType = computed(() => {
+        const computeIsTimeType = computed(() => {
             const { type } = props;
-            return type === 'time' || type === 'datetime';
+            return type === 'time';
+        });
+        const computeIsTimeOrDateTimeType = computed(() => {
+            const { type } = props;
+            const isTimeType = computeIsTimeType.value;
+            return isTimeType || type === 'datetime';
         });
         const computeIsDatePickerType = computed(() => {
             return ['date', 'week', 'month', 'quarter', 'year'].indexOf(props.type) > -1;
@@ -21221,7 +21267,7 @@ var VxeDateRangePickerComponent = defineVxeComponent({
             };
         };
         const updateModelValue = (isModel) => {
-            const { modelValue, startValue, endValue } = props;
+            const { modelValue, startValue, endValue, valueFormat } = props;
             let restObj = {
                 sValue: '',
                 eValue: ''
@@ -21242,8 +21288,20 @@ var VxeDateRangePickerComponent = defineVxeComponent({
                     restObj = paraeUpdateModel();
                 }
             }
-            reactData.selectStValue = restObj.sValue;
-            reactData.selectEdValue = restObj.eValue;
+            let startRest = restObj.sValue;
+            let endRest = restObj.eValue;
+            if (valueFormat === 'timestamp') {
+                if (XEUtils.isString(startRest) && /^\d+$/.test(startRest)) {
+                    startRest = Number(startRest);
+                }
+                if (XEUtils.isString(endRest) && /^\d+$/.test(endRest)) {
+                    endRest = Number(endRest);
+                }
+            }
+            reactData.selectStValue = startRest;
+            reactData.selectEdValue = endRest;
+            reactData.paneEndVal = [startRest, endRest];
+            reactData.paneStartVal = [startRest, endRest];
         };
         const triggerEvent = (evnt) => {
             const { selectStValue, selectEdValue } = reactData;
@@ -21407,12 +21465,17 @@ var VxeDateRangePickerComponent = defineVxeComponent({
             triggerEvent(evnt);
         };
         const confirmEvent = (evnt) => {
+            const isTimeType = computeIsTimeType.value;
             const $startDatePanel = refStartDatePanel.value;
             const $endDatePanel = refEndDatePanel.value;
             if ($startDatePanel && $endDatePanel) {
                 const startValue = $startDatePanel.getModelValue();
                 const endValue = $endDatePanel.getModelValue();
-                if ((startValue && !endValue) || (!startValue && endValue)) {
+                if (isTimeType) {
+                    $startDatePanel.confirmByEvent(evnt);
+                    $endDatePanel.confirmByEvent(evnt);
+                }
+                else if ((startValue && !endValue) || (!startValue && endValue)) {
                     handleChange('', '', evnt);
                 }
                 else {
@@ -21442,11 +21505,16 @@ var VxeDateRangePickerComponent = defineVxeComponent({
             else {
                 startValue = currValue || XEUtils.last(paneVals);
             }
-            reactData.paneEndVal = [startValue, endValue].join(',');
-            reactData.paneStartVal = [startValue, endValue].join(',');
+            reactData.paneEndVal = [startValue, endValue];
+            reactData.paneStartVal = [startValue, endValue];
             handleChange(startValue, endValue, $event);
             handleSelectClose();
-            if (!selectStatus) {
+            if (selectStatus) {
+                if (startValue && endValue) {
+                    internalData.selectStatus = false;
+                }
+            }
+            else {
                 internalData.selectStatus = true;
             }
             nextTick(() => {
@@ -21472,11 +21540,16 @@ var VxeDateRangePickerComponent = defineVxeComponent({
             else {
                 endValue = currValue || XEUtils.last(paneVals);
             }
-            reactData.paneEndVal = [startValue, endValue].join(',');
-            reactData.paneStartVal = [startValue, endValue].join(',');
+            reactData.paneEndVal = [startValue, endValue];
+            reactData.paneStartVal = [startValue, endValue];
             handleChange(startValue, endValue, $event);
             handleSelectClose();
-            if (!selectStatus) {
+            if (selectStatus) {
+                if (startValue && endValue) {
+                    internalData.selectStatus = false;
+                }
+            }
+            else {
                 internalData.selectStatus = true;
             }
             nextTick(() => {
@@ -21508,6 +21581,21 @@ var VxeDateRangePickerComponent = defineVxeComponent({
                     }
                     break;
                 }
+                case 'month':
+                case 'quarter': {
+                    if (endYear <= startYear) {
+                        $endDatePanel.setPanelDate(getNextYear(startPanelDate));
+                    }
+                    break;
+                }
+                case 'year': {
+                    const { computeYearList } = $startDatePanel.getComputeMaps();
+                    const yearList = computeYearList.value;
+                    if (yearList.some((item) => XEUtils.isDateSame(item.date, endPanelDate, 'yyyy'))) {
+                        $endDatePanel.setPanelDate(getNextYear(startPanelDate, yearList.length));
+                    }
+                    break;
+                }
             }
         };
         const startPanelDateBtnChangeEvent = () => {
@@ -21531,6 +21619,17 @@ var VxeDateRangePickerComponent = defineVxeComponent({
                         $endDatePanel.setPanelDate(getNextMonth(startPanelDate));
                         break;
                     }
+                    case 'month':
+                    case 'quarter': {
+                        $endDatePanel.setPanelDate(getNextYear(startPanelDate));
+                        break;
+                    }
+                    case 'year': {
+                        const { computeYearList } = $startDatePanel.getComputeMaps();
+                        const yearList = computeYearList.value;
+                        $endDatePanel.setPanelDate(getNextYear(startPanelDate, yearList.length));
+                        break;
+                    }
                 }
             }
             else {
@@ -21562,6 +21661,21 @@ var VxeDateRangePickerComponent = defineVxeComponent({
                     }
                     break;
                 }
+                case 'month':
+                case 'quarter': {
+                    if (startYear >= endYear) {
+                        $startDatePanel.setPanelDate(getPrevYear(endPanelDate));
+                    }
+                    break;
+                }
+                case 'year': {
+                    const { computeYearList } = $endDatePanel.getComputeMaps();
+                    const yearList = computeYearList.value;
+                    if (yearList.some((item) => XEUtils.isDateSame(item.date, startPanelDate, 'yyyy'))) {
+                        $startDatePanel.setPanelDate(getPrevYear(endPanelDate, yearList.length));
+                    }
+                    break;
+                }
             }
         };
         const endPanelDateBtnChangeEvent = () => {
@@ -21585,6 +21699,17 @@ var VxeDateRangePickerComponent = defineVxeComponent({
                         $startDatePanel.setPanelDate(getPrevMonth(endPanelDate));
                         break;
                     }
+                    case 'month':
+                    case 'quarter': {
+                        $startDatePanel.setPanelDate(getPrevYear(endPanelDate));
+                        break;
+                    }
+                    case 'year': {
+                        const { computeYearList } = $endDatePanel.getComputeMaps();
+                        const yearList = computeYearList.value;
+                        $startDatePanel.setPanelDate(getPrevYear(endPanelDate, yearList.length));
+                        break;
+                    }
                 }
             }
             else {
@@ -21877,7 +22002,8 @@ var VxeDateRangePickerComponent = defineVxeComponent({
             const isClearable = computeIsClearable.value;
             const panelLabelObj = computePanelLabelObj.value;
             const shortcutList = computeShortcutList.value;
-            const isDateTimeType = computeIsDateTimeType.value;
+            const isTimeType = computeIsTimeType.value;
+            const isTimeOrDateTimeType = computeIsTimeOrDateTimeType.value;
             const defaultDates = computeDefaultDates.value;
             const defaultTimes = computeDefaultTimes.value;
             const timeOpts = computeTimeOpts.value;
@@ -21893,7 +22019,7 @@ var VxeDateRangePickerComponent = defineVxeComponent({
             const [sdDate, edDate] = defaultDates;
             const [sdTime, edTime] = defaultTimes;
             const hasShortcutBtn = shortcutList.length > 0;
-            const showConfirmBtn = (showConfirmButton === null ? (isDateTimeType || !autoClose) : showConfirmButton);
+            const showConfirmBtn = (showConfirmButton === null ? (isTimeOrDateTimeType || !autoClose) : showConfirmButton);
             const showClearBtn = (showClearButton === null ? isClearable : showClearButton);
             return h(Teleport, {
                 to: 'body',
@@ -21948,7 +22074,7 @@ var VxeDateRangePickerComponent = defineVxeComponent({
                                         h(VxeDatePanel, {
                                             ref: refStartDatePanel,
                                             modelValue: paneStartVal,
-                                            multiple: true,
+                                            multiple: !isTimeType,
                                             valueSort: true,
                                             limitCount: 3,
                                             defaultMode: 'first',
@@ -21975,7 +22101,7 @@ var VxeDateRangePickerComponent = defineVxeComponent({
                                         h(VxeDatePanel, {
                                             ref: refEndDatePanel,
                                             modelValue: paneEndVal,
-                                            multiple: true,
+                                            multiple: !isTimeType,
                                             valueSort: true,
                                             limitCount: 3,
                                             defaultMode: 'last',