vxe-pc-ui 3.15.23 → 3.15.25

package/es/date-panel/src/date-panel.js

@@ -2,6 +2,8 @@ import { defineVxeComponent } from '../../ui/src/comp';
 import XEUtils from 'xe-utils';
 import { getConfig, getI18n, createEvent, globalMixins, renderEmptyElement } from '../../ui';
 import { toStringTimeDate, getDateQuarter, parseDateValue, parseDateObj, handleValueFormat, hasDateValueType, hasTimestampValueType } from './util';
+import { createComponentLog } from '../../ui/src/log';
+const { errLog } = createComponentLog('date-panel');
 export default {
     name: 'VxeDatePanel',
     mixins: [
@@ -12,7 +14,7 @@ export default {
         event: 'modelValue'
     },
     props: {
-        value: [String, Number, Date],
+        value: [String, Number, Date, Array],
         type: {
             type: String,
             default: 'date'
@@ -37,6 +39,7 @@ export default {
             type: [String, Number, Date],
             default: () => getConfig().datePanel.endDate
         },
+        defaultMode: String,
         defaultDate: [String, Number, Date],
         defaultTime: [String, Number, Date],
         minDate: [String, Number, Date],
@@ -48,6 +51,7 @@ export default {
         labelFormat: String,
         valueFormat: String,
         timeFormat: String,
+        valueSort: Boolean,
         festivalMethod: {
             type: Function,
             default: () => getConfig().datePanel.festivalMethod
@@ -79,9 +83,9 @@ export default {
             currentDate: null
         };
         const internalData = {
-            yearSize: 12,
-            monthSize: 20,
-            quarterSize: 8,
+            yearSize: 16,
+            monthSize: 12,
+            quarterSize: 4,
             hpTimeout: undefined
         };
         return {
@@ -90,17 +94,24 @@ export default {
             internalData
         };
     },
-    computed: Object.assign(Object.assign({}, {}), { computeIsDateTimeType() {
+    computed: Object.assign(Object.assign({}, {}), { computeIsTimeType() {
             const $xeDatePanel = this;
             const props = $xeDatePanel;
             const { type } = props;
-            return type === 'time' || type === 'datetime';
+            return type === 'time';
+        },
+        computeIsTimeOrDateTimeType() {
+            const $xeDatePanel = this;
+            const props = $xeDatePanel;
+            const { type } = props;
+            const isTimeType = $xeDatePanel.computeIsTimeType;
+            return isTimeType || type === 'datetime';
         },
         computeIsDatePanelType() {
             const $xeDatePanel = this;
             const props = $xeDatePanel;
-            const isDateTimeType = $xeDatePanel.computeIsDateTimeType;
-            return isDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(props.type) > -1;
+            const isTimeOrDateTimeType = $xeDatePanel.computeIsTimeOrDateTimeType;
+            return isTimeOrDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(props.type) > -1;
         },
         computeDateStartDate() {
             const $xeDatePanel = this;
@@ -115,19 +126,25 @@ export default {
         computeDateListValue() {
             const $xeDatePanel = this;
             const props = $xeDatePanel;
-            const { value: modelValue, multiple } = props;
+            const { value: modelValue, valueFormat } = props;
             const isDatePanelType = $xeDatePanel.computeIsDatePanelType;
             const dateValueFormat = $xeDatePanel.computeDateValueFormat;
-            if (multiple && modelValue && isDatePanelType) {
-                return XEUtils.toValueString(modelValue).split(',').map(item => {
-                    const date = $xeDatePanel.parseDate(item, dateValueFormat);
-                    if (XEUtils.isValidDate(date)) {
-                        return date;
+            const restList = [];
+            if (modelValue && isDatePanelType) {
+                (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 = $xeDatePanel.parseDate(strVal, dateValueFormat);
+                        restList.push(date);
                     }
-                    return date;
                 });
             }
-            return [];
+            return restList;
         },
         computeDateMultipleValue() {
             const $xeDatePanel = this;
@@ -171,12 +188,14 @@ export default {
         computeDateValue() {
             const $xeDatePanel = this;
             const props = $xeDatePanel;
-            const { value: modelValue } = props;
+            const { value: modelValue, defaultMode } = props;
             const isDatePanelType = $xeDatePanel.computeIsDatePanelType;
             const dateValueFormat = $xeDatePanel.computeDateValueFormat;
             let val = null;
             if (modelValue && isDatePanelType) {
-                const date = $xeDatePanel.parseDate(modelValue, dateValueFormat);
+                const vals = XEUtils.isString(modelValue) ? modelValue.split(',') : modelValue;
+                const currVal = defaultMode === 'last' ? XEUtils.last(vals) : XEUtils.first(vals);
+                const date = $xeDatePanel.parseDate(currVal, dateValueFormat);
                 if (XEUtils.isValidDate(date)) {
                     val = date;
                 }
@@ -217,8 +236,8 @@ export default {
         computeDateHMSTime() {
             const $xeDatePanel = this;
             const dateValue = $xeDatePanel.computeDateValue;
-            const isDateTimeType = $xeDatePanel.computeIsDateTimeType;
-            return dateValue && isDateTimeType ? (dateValue.getHours() * 3600 + dateValue.getMinutes() * 60 + dateValue.getSeconds()) * 1000 : 0;
+            const isTimeOrDateTimeType = $xeDatePanel.computeIsTimeOrDateTimeType;
+            return dateValue && isTimeOrDateTimeType ? (dateValue.getHours() * 3600 + dateValue.getMinutes() * 60 + dateValue.getSeconds()) * 1000 : 0;
         },
         computeDateLabelFormat() {
             const $xeDatePanel = this;
@@ -241,7 +260,7 @@ export default {
                 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({
@@ -352,7 +371,7 @@ export default {
                 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);
@@ -385,7 +404,7 @@ export default {
                 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();
@@ -469,8 +488,8 @@ export default {
             const timeOpts = $xeDatePanel.computeTimeOpts;
             const { hours: hourOptions, hourDisabledMethod } = timeOpts;
             const list = [];
-            const isDateTimeType = $xeDatePanel.computeIsDateTimeType;
-            if (isDateTimeType) {
+            const isTimeOrDateTimeType = $xeDatePanel.computeIsTimeOrDateTimeType;
+            if (isTimeOrDateTimeType) {
                 if (hourOptions && hourOptions.length) {
                     hourOptions.forEach(item => {
                         if (XEUtils.isNumber(item) || XEUtils.isString(item)) {
@@ -509,8 +528,8 @@ export default {
             const timeOpts = $xeDatePanel.computeTimeOpts;
             const { minutes: minuteOptions, minuteDisabledMethod } = timeOpts;
             const list = [];
-            const isDateTimeType = $xeDatePanel.computeIsDateTimeType;
-            if (isDateTimeType) {
+            const isTimeOrDateTimeType = $xeDatePanel.computeIsTimeOrDateTimeType;
+            if (isTimeOrDateTimeType) {
                 if (minuteOptions && minuteOptions.length) {
                     minuteOptions.forEach(item => {
                         if (XEUtils.isNumber(item) || XEUtils.isString(item)) {
@@ -563,8 +582,8 @@ export default {
             const timeOpts = $xeDatePanel.computeTimeOpts;
             const { seconds: secondOptions, secondDisabledMethod } = timeOpts;
             const list = [];
-            const isDateTimeType = $xeDatePanel.computeIsDateTimeType;
-            if (isDateTimeType) {
+            const isTimeOrDateTimeType = $xeDatePanel.computeIsTimeOrDateTimeType;
+            if (isTimeOrDateTimeType) {
                 if (secondOptions && secondOptions.length) {
                     secondOptions.forEach(item => {
                         if (XEUtils.isNumber(item) || XEUtils.isString(item)) {
@@ -634,10 +653,10 @@ export default {
             const props = $xeDatePanel;
             const { type, multiple } = props;
             if (type === 'time') {
-                return toStringTimeDate(value);
+                return toStringTimeDate(XEUtils.isArray(value) ? XEUtils.last(value) : value);
             }
             if (XEUtils.isArray(value)) {
-                return XEUtils.toStringDate(value[0], format);
+                return XEUtils.toStringDate(XEUtils.last(value), format);
             }
             if (XEUtils.isString(value)) {
                 return XEUtils.toStringDate(multiple ? XEUtils.last(value.split(',')) : value, format);
@@ -708,7 +727,7 @@ export default {
                 $xeDatePanel.handleChange('', { type: 'check' });
             }
         },
-        handleChange(value, evnt) {
+        handleChange(value, evnt, params) {
             const $xeDatePanel = this;
             const props = $xeDatePanel;
             const reactData = $xeDatePanel.reactData;
@@ -720,20 +739,20 @@ export default {
                 const timeNum = dateVal ? dateVal.getTime() : null;
                 $xeDatePanel.emitModel(timeNum);
                 if (modelValue !== timeNum) {
-                    $xeDatePanel.dispatchEvent('change', { value: timeNum }, evnt);
+                    $xeDatePanel.dispatchEvent('change', { value: timeNum, currValue: params ? params.currValue : '' }, evnt);
                 }
             }
             else if (hasDateValueType(valueFormat)) {
                 const dateVal = parseDateValue(value, type, { valueFormat: dateValueFormat });
                 $xeDatePanel.emitModel(dateVal);
                 if (modelValue && dateVal ? XEUtils.toStringDate(modelValue).getTime() !== dateVal.getTime() : modelValue !== dateVal) {
-                    $xeDatePanel.dispatchEvent('change', { value: dateVal }, evnt);
+                    $xeDatePanel.dispatchEvent('change', { value: dateVal, currValue: params ? params.currValue : '' }, evnt);
                 }
             }
             else {
                 $xeDatePanel.emitModel(value);
                 if (XEUtils.toValueString(modelValue) !== value) {
-                    $xeDatePanel.dispatchEvent('change', { value }, evnt);
+                    $xeDatePanel.dispatchEvent('change', { value, currValue: params ? params.currValue : '' }, evnt);
                 }
             }
         },
@@ -807,16 +826,17 @@ export default {
             const $xeDatePanel = this;
             const props = $xeDatePanel;
             const reactData = $xeDatePanel.reactData;
-            const { value: modelValue, multiple } = props;
+            const { value: modelValue, multiple, valueSort } = props;
             const { datetimePanelValue } = reactData;
-            const isDateTimeType = $xeDatePanel.computeIsDateTimeType;
+            const isTimeType = $xeDatePanel.computeIsTimeType;
+            const isTimeOrDateTimeType = $xeDatePanel.computeIsTimeOrDateTimeType;
             const dateValueFormat = $xeDatePanel.computeDateValueFormat;
             const firstDayOfWeek = $xeDatePanel.computeFirstDayOfWeek;
             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());
@@ -825,13 +845,13 @@ export default {
             }
             const inpVal = XEUtils.toDateString(date, dateValueFormat, { firstDay: firstDayOfWeek });
             $xeDatePanel.dateCheckMonth(date);
-            if (multiple) {
+            if (!isTimeType && multiple) {
                 const overCount = $xeDatePanel.computeOverCount;
                 // 如果为多选
-                if (isDateTimeType) {
+                if (isTimeOrDateTimeType) {
                     // 如果是datetime特殊类型
                     const dateListValue = isReload ? [] : [...$xeDatePanel.computeDateListValue];
-                    const datetimeRest = [];
+                    let datetimeRest = [];
                     const eqIndex = XEUtils.findIndexOf(dateListValue, val => XEUtils.isDateSame(date, val, 'yyyyMMdd'));
                     if (eqIndex === -1) {
                         if (overCount) {
@@ -853,27 +873,37 @@ export default {
                             datetimeRest.push(item);
                         }
                     });
-                    $xeDatePanel.handleChange(datetimeRest.map(date => XEUtils.toDateString(date, dateValueFormat)).join(','), { type: 'update' });
+                    // 排序
+                    if (valueSort) {
+                        datetimeRest = datetimeRest.sort((a, b) => a.getTime() - b.getTime());
+                    }
+                    $xeDatePanel.handleChange(datetimeRest.map(date => XEUtils.toDateString(date, dateValueFormat)).join(','), { type: 'update' }, { currValue: inpVal });
                 }
                 else {
                     const dateMultipleValue = isReload ? [] : $xeDatePanel.computeDateMultipleValue;
+                    let dateRest = [];
                     // 如果是日期类型
                     if (dateMultipleValue.some(val => XEUtils.isEqual(val, inpVal))) {
-                        $xeDatePanel.handleChange(dateMultipleValue.filter(val => !XEUtils.isEqual(val, inpVal)).join(','), { type: 'update' });
+                        dateRest = dateMultipleValue.filter(val => !XEUtils.isEqual(val, inpVal));
                     }
                     else {
                         if (overCount) {
                             // 如果超出最大多选数量
                             return;
                         }
-                        $xeDatePanel.handleChange(dateMultipleValue.concat([inpVal]).join(','), { type: 'update' });
+                        dateRest = dateMultipleValue.concat([inpVal]);
                     }
+                    // 排序
+                    if (valueSort) {
+                        dateRest = dateRest.sort();
+                    }
+                    $xeDatePanel.handleChange(dateRest.join(','), { type: 'update' }, { currValue: inpVal });
                 }
             }
             else {
                 // 如果为单选
                 if (!XEUtils.isEqual(modelValue, inpVal)) {
-                    $xeDatePanel.handleChange(inpVal, { type: 'update' });
+                    $xeDatePanel.handleChange(inpVal, { type: 'update' }, { currValue: inpVal });
                 }
             }
         },
@@ -1202,17 +1232,19 @@ export default {
             const { multiple } = props;
             const { datetimePanelValue } = reactData;
             const dateValue = $xeDatePanel.computeDateValue;
-            const isDateTimeType = $xeDatePanel.computeIsDateTimeType;
-            if (isDateTimeType) {
+            const isTimeType = $xeDatePanel.computeIsTimeType;
+            const isTimeOrDateTimeType = $xeDatePanel.computeIsTimeOrDateTimeType;
+            if (isTimeOrDateTimeType) {
                 const dateValueFormat = $xeDatePanel.computeDateValueFormat;
-                if (multiple) {
+                if (!isTimeType && multiple) {
                     // 如果为多选
                     const dateMultipleValue = $xeDatePanel.computeDateMultipleValue;
-                    if (isDateTimeType) {
+                    const dateListValue = $xeDatePanel.computeDateListValue;
+                    if (isTimeOrDateTimeType) {
                         // 如果是datetime特殊类型
-                        const dateListValue = [...$xeDatePanel.computeDateListValue];
+                        const listVals = dateListValue.length ? [...dateListValue] : [];
                         const datetimeRest = [];
-                        dateListValue.forEach(item => {
+                        listVals.forEach(item => {
                             if (item) {
                                 if (datetimePanelValue) {
                                     item.setHours(datetimePanelValue.getHours());
@@ -1263,7 +1295,7 @@ export default {
             const props = $xeDatePanel;
             const reactData = $xeDatePanel.reactData;
             const { type, defaultDate, defaultTime } = props;
-            const isDateTimeType = $xeDatePanel.computeIsDateTimeType;
+            const isTimeOrDateTimeType = $xeDatePanel.computeIsTimeOrDateTimeType;
             const dateValue = $xeDatePanel.computeDateValue;
             if (['year', 'quarter', 'month', 'week'].indexOf(type) > -1) {
                 reactData.datePanelType = type;
@@ -1291,7 +1323,7 @@ export default {
                     $xeDatePanel.dateNowHandle();
                 }
             }
-            if (isDateTimeType) {
+            if (isTimeOrDateTimeType) {
                 let dtPanelValue = reactData.datePanelValue;
                 if (!dtPanelValue) {
                     dtPanelValue = XEUtils.getWhatDay(Date.now(), 0, 'first');
@@ -1318,6 +1350,12 @@ export default {
             const reactData = $xeDatePanel.reactData;
             return reactData.inputValue;
         },
+        getViewType() {
+            const $xeDatePanel = this;
+            const reactData = $xeDatePanel.reactData;
+            const { datePanelType } = reactData;
+            return datePanelType;
+        },
         setPanelDate(date) {
             const $xeDatePanel = this;
             if (date) {
@@ -1961,6 +1999,11 @@ export default {
     },
     created() {
         const $xeDatePanel = this;
+        const props = $xeDatePanel;
+        const { type, multiple } = props;
+        if (multiple && type === 'time') {
+            errLog('vxe.error.notSupportProp', [`type=${type}`, 'multiple=true', 'multiple=false']);
+        }
         $xeDatePanel.initValue();
         $xeDatePanel.dateOpenPanel();
     },

package/es/date-panel/src/util.js

@@ -74,11 +74,11 @@ export function getDateQuarter(date) {
     }
     return 4;
 }
-export const parseDateValue = (val, type, options) => {
+export function parseDateValue(val, type, options) {
     const { valueFormat } = options;
     if (val) {
         if (type === 'time') {
-            return toStringTimeDate(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));
@@ -86,10 +86,13 @@ export const parseDateValue = (val, type, options) => {
         if (XEUtils.isString(val)) {
             return XEUtils.toStringDate(XEUtils.last(val.split(',')), valueFormat);
         }
+        if (XEUtils.isArray(val)) {
+            return XEUtils.toStringDate(XEUtils.last(val), valueFormat);
+        }
         return XEUtils.toStringDate(val, valueFormat);
     }
     return null;
-};
+}
 export function parseDateString(val, type, options) {
     const dValue = parseDateValue(val, type, options);
     return dValue ? XEUtils.toDateString(dValue, options.valueFormat) : '';
@@ -256,3 +259,37 @@ export function checkDateInputFormat(numStr, formatKey) {
     }
     return numVal;
 }
+export const getPrevYear = (date, size = 1) => {
+    const currtYear = date.getFullYear();
+    date.setFullYear(currtYear - size);
+    return date;
+};
+export const getNextYear = (date, size = 1) => {
+    const currtYear = date.getFullYear();
+    date.setFullYear(currtYear + size);
+    return date;
+};
+export const getPrevMonth = (date) => {
+    const currtYear = date.getFullYear();
+    const currMonth = date.getMonth();
+    if (currMonth) {
+        date.setMonth(currMonth - 1);
+    }
+    else {
+        date.setFullYear(currtYear - 1);
+        date.setMonth(11);
+    }
+    return date;
+};
+export const getNextMonth = (date) => {
+    const currtYear = date.getFullYear();
+    const currMonth = date.getMonth();
+    if (currMonth < 11) {
+        date.setMonth(currMonth + 1);
+    }
+    else {
+        date.setFullYear(currtYear + 1);
+        date.setMonth(0);
+    }
+    return date;
+};

package/es/date-picker/src/date-picker.js

@@ -48,7 +48,7 @@ export default {
         event: 'modelValue'
     },
     props: {
-        value: [String, Number, Date],
+        value: [String, Number, Date, Array],
         immediate: {
             type: Boolean,
             default: true
@@ -229,17 +229,24 @@ export default {
             }
             return disabled;
         },
-        computeIsDateTimeType() {
+        computeIsTimeType() {
             const $xeDatePicker = this;
             const props = $xeDatePicker;
             const { type } = props;
-            return type === 'time' || type === 'datetime';
+            return type === 'time';
+        },
+        computeIsTimeOrDateTimeType() {
+            const $xeDatePicker = this;
+            const props = $xeDatePicker;
+            const { type } = props;
+            const isTimeType = $xeDatePicker.computeIsTimeType;
+            return isTimeType || type === 'datetime';
         },
         computeIsDatePickerType() {
             const $xeDatePicker = this;
             const props = $xeDatePicker;
-            const isDateTimeType = $xeDatePicker.computeIsDateTimeType;
-            return isDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(props.type) > -1;
+            const isTimeOrDateTimeType = $xeDatePicker.computeIsTimeOrDateTimeType;
+            return isTimeOrDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(props.type) > -1;
         },
         computeIsClearable() {
             const $xeDatePicker = this;
@@ -249,8 +256,8 @@ export default {
         computeIsDatePanelType() {
             const $xeDatePicker = this;
             const props = $xeDatePicker;
-            const isDateTimeType = $xeDatePicker.computeIsDateTimeType;
-            return isDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(props.type) > -1;
+            const isTimeOrDateTimeType = $xeDatePicker.computeIsTimeOrDateTimeType;
+            return isTimeOrDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(props.type) > -1;
         },
         computeDateListValue() {
             const $xeDatePicker = this;
@@ -541,7 +548,7 @@ export default {
             const $xeDatePicker = this;
             const props = $xeDatePicker;
             const { value: modelValue, multiple } = props;
-            const isDateTimeType = $xeDatePicker.computeIsDateTimeType;
+            const isTimeOrDateTimeType = $xeDatePicker.computeIsTimeOrDateTimeType;
             const dateValueFormat = $xeDatePicker.computeDateValueFormat;
             const firstDayOfWeek = $xeDatePicker.computeFirstDayOfWeek;
             if (props.type === 'week') {
@@ -552,7 +559,7 @@ export default {
             if (multiple) {
                 const overCount = $xeDatePicker.computeOverCount;
                 // 如果为多选
-                if (isDateTimeType) {
+                if (isTimeOrDateTimeType) {
                     // 如果是datetime特殊类型
                     const dateListValue = isReload ? [] : [...$xeDatePicker.computeDateListValue];
                     const datetimeRest = [];
@@ -1143,9 +1150,9 @@ export default {
             const props = $xeDatePicker;
             const { multiple, autoClose } = props;
             const { value, $event } = params;
-            const isDateTimeType = $xeDatePicker.computeIsDateTimeType;
+            const isTimeOrDateTimeType = $xeDatePicker.computeIsTimeOrDateTimeType;
             $xeDatePicker.handleChange(value, $event);
-            if (!multiple && !isDateTimeType) {
+            if (!multiple && !isTimeOrDateTimeType) {
                 if (autoClose) {
                     $xeDatePicker.hidePanel();
                 }
@@ -1472,7 +1479,7 @@ export default {
             const btnTransfer = $xeDatePicker.computeBtnTransfer;
             const shortcutOpts = $xeDatePicker.computeShortcutOpts;
             const isClearable = $xeDatePicker.computeIsClearable;
-            const isDateTimeType = $xeDatePicker.computeIsDateTimeType;
+            const isTimeOrDateTimeType = $xeDatePicker.computeIsTimeOrDateTimeType;
             const shortcutList = $xeDatePicker.computeShortcutList;
             const timeOpts = $xeDatePicker.computeTimeOpts;
             const dateStartDate = $xeDatePicker.computeDateStartDate;
@@ -1486,7 +1493,7 @@ export default {
             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('div', {
                 ref: 'refInputPanel',