vxe-pc-ui 4.15.8 → 4.15.9

package/dist/all.esm.js

@@ -81,7 +81,7 @@ function checkDynamic() {
 }
 
 const { log } = VxeUI;
-const uiVersion = `ui v${"4.15.8"}`;
+const uiVersion = `ui v${"4.15.9"}`;
 function createComponentLog(name) {
     const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -94,7 +94,7 @@ function createComponentLog(name) {
 const warnLog$b = log.create('warn', uiVersion);
 log.create('error', uiVersion);
 
-const version = "4.15.8";
+const version = "4.15.9";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -4670,7 +4670,7 @@ function isAllSameChar(str, char) {
     }
     return true;
 }
-function checkDateFormat(numStr, formatKey) {
+function checkDateInputFormat(numStr, formatKey) {
     const numVal = XEUtils.toNumber(numStr);
     switch (formatKey) {
         case 'yyyy':
@@ -16129,10 +16129,10 @@ var VxeDatePanelComponent = defineVxeComponent({
             const isDateTimeType = computeIsDateTimeType.value;
             return isDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(props.type) > -1;
         });
-        const computeDateStartTime = computed(() => {
+        const computeDateStartDate = computed(() => {
             return props.startDate ? XEUtils.toStringDate(props.startDate) : null;
         });
-        const computeDateEndTime = computed(() => {
+        const computeDateEndDate = computed(() => {
             return props.endDate ? XEUtils.toStringDate(props.endDate) : null;
         });
         const computeDateListValue = computed(() => {
@@ -16193,7 +16193,7 @@ var VxeDatePanelComponent = defineVxeComponent({
             return val;
         });
         const computeIsDisabledPrevDateBtn = computed(() => {
-            const dateStartTime = computeDateStartTime.value;
+            const dateStartTime = computeDateStartDate.value;
             const { selectMonth } = reactData;
             if (selectMonth && dateStartTime) {
                 return selectMonth <= dateStartTime;
@@ -16201,7 +16201,7 @@ var VxeDatePanelComponent = defineVxeComponent({
             return false;
         });
         const computeIsDisabledNextDateBtn = computed(() => {
-            const dateEndTime = computeDateEndTime.value;
+            const dateEndTime = computeDateEndDate.value;
             const { selectMonth } = reactData;
             if (selectMonth && dateEndTime) {
                 return XEUtils.getWhatMonth(selectMonth, 0, 'last') >= dateEndTime;
@@ -16598,6 +16598,8 @@ var VxeDatePanelComponent = defineVxeComponent({
             const { type } = props;
             const { inputLabel, datetimePanelValue } = reactData;
             const dateLabelFormat = computeDateLabelFormat.value;
+            const dateStartDate = computeDateStartDate.value;
+            const dateEndDate = computeDateEndDate.value;
             if (inpVal) {
                 let inpDateVal = parseDate(inpVal, dateLabelFormat);
                 if (XEUtils.isValidDate(inpDateVal)) {
@@ -16609,6 +16611,12 @@ var VxeDatePanelComponent = defineVxeComponent({
                         reactData.inputLabel = inpDateVal;
                     }
                     else {
+                        if (dateEndDate && inpDateVal > dateEndDate) {
+                            inpDateVal = dateEndDate;
+                        }
+                        if (dateStartDate && inpDateVal < dateStartDate) {
+                            inpDateVal = dateStartDate;
+                        }
                         let isChange = false;
                         const firstDayOfWeek = computeFirstDayOfWeek.value;
                         if (type === 'datetime') {
@@ -16910,8 +16918,8 @@ var VxeDatePanelComponent = defineVxeComponent({
             }
         };
         const isRangeDisabled = (item) => {
-            const dateStartTime = computeDateStartTime.value;
-            const dateEndTime = computeDateEndTime.value;
+            const dateStartTime = computeDateStartDate.value;
+            const dateEndTime = computeDateEndDate.value;
             const { date } = item;
             if (dateStartTime && dateStartTime.getTime() > date.getTime()) {
                 return true;
@@ -17775,6 +17783,7 @@ VxeUI.component(VxeDatePanelComponent);
 const DatePanel = VxeDatePanel;
 
 const { warnLog: warnLog$8, errLog: errLog$e } = createComponentLog('date-picker');
+const defaultMaskPlaceholder = '*';
 const maskedTypes = ['year', 'month', 'date', 'datetime', 'time'];
 const inputMaskedKeys = ['y', 'M', 'd', 'H', 'm', 'n', 's'];
 const parseInputKayMaps = {};
@@ -17797,6 +17806,7 @@ function createReactData$a() {
 function createInternalData$9() {
     return {
         // hpTimeout: undefined,
+        // fsTimeout: undefined,
         inputLabel: '',
         laseFocusMasked: 0
     };
@@ -18123,7 +18133,7 @@ var VxeDatePickerComponent = defineVxeComponent({
         const computeMaskChar = computed(() => {
             const maskedOpts = computeMaskedOpts.value;
             const { maskPlaceholder } = maskedOpts;
-            return (maskPlaceholder ? ('' + maskPlaceholder)[0] : '') || '*';
+            return (maskPlaceholder ? ('' + maskPlaceholder)[0] : '') || defaultMaskPlaceholder;
         });
         const updateModelValue = () => {
             const { modelValue } = props;
@@ -18280,6 +18290,8 @@ var VxeDatePickerComponent = defineVxeComponent({
             const { inputLabel } = internalData;
             const dateLabelFormat = computeDateLabelFormat.value;
             const maskedOpts = computeMaskedOpts.value;
+            const dateStartDate = computeDateStartDate.value;
+            const dateEndDate = computeDateEndDate.value;
             if (!inpVal) {
                 handleChange('', { type: 'check' });
                 return;
@@ -18291,12 +18303,16 @@ var VxeDatePickerComponent = defineVxeComponent({
                     allMaskedKeys.forEach(formatKey => {
                         const fkIndex = dateLabelFormat.indexOf(formatKey);
                         if (fkIndex > -1) {
-                            let val = XEUtils.toNumber(inpVal.slice(fkIndex, formatKey.length).replace(/\D/g, ''));
+                            const valStr = inpVal.slice(fkIndex, fkIndex + formatKey.length).replace(/\D/g, '');
+                            if (!valStr) {
+                                return;
+                            }
+                            let valNum = XEUtils.toNumber(valStr);
                             // 自动纠错最小值
-                            if (!val && ['MM', 'dd'].includes(formatKey)) {
-                                val = 1;
+                            if (!valNum && ['MM', 'dd'].includes(formatKey)) {
+                                valNum = 1;
                             }
-                            inpVal = inpVal.slice(0, fkIndex) + XEUtils.padStart(checkDateFormat(val, formatKey), formatKey.length, '0') + inpVal.slice(fkIndex + formatKey.length);
+                            inpVal = inpVal.slice(0, fkIndex) + XEUtils.padStart(checkDateInputFormat(valNum, formatKey), formatKey.length, '0') + inpVal.slice(fkIndex + formatKey.length);
                         }
                     });
                 }
@@ -18320,6 +18336,12 @@ var VxeDatePickerComponent = defineVxeComponent({
                 handleInputLabel(inpDateVal, true);
                 return;
             }
+            if (dateEndDate && inpDateVal > dateEndDate) {
+                inpDateVal = dateEndDate;
+            }
+            if (dateStartDate && inpDateVal < dateStartDate) {
+                inpDateVal = dateStartDate;
+            }
             let isChange = false;
             const firstDayOfWeek = computeFirstDayOfWeek.value;
             if (type === 'datetime') {
@@ -18356,11 +18378,22 @@ var VxeDatePickerComponent = defineVxeComponent({
             const maskedOpts = computeMaskedOpts.value;
             const { align } = maskedOpts;
             const maskChar = computeMaskChar.value;
-            const restVal = checkDateFormat(XEUtils.toNumber(numStr), chunkFormat);
+            const numVal = XEUtils.toNumber(numStr);
+            let restVal = checkDateInputFormat(numVal, chunkFormat);
             if (isFull) {
-                return XEUtils.padStart(restVal, chunkFormat.length, '0');
+                // 自动纠错最小值
+                if (!restVal && ['MM', 'dd'].includes(chunkFormat)) {
+                    restVal = 1;
+                }
             }
-            return XEUtils[align === 'right' ? 'padStart' : 'padEnd'](restVal, chunkFormat.length, maskChar);
+            let restStr = '' + restVal;
+            if (numStr.length > restStr.length) {
+                restStr = restStr.padStart(numStr.length, '0');
+            }
+            if (isFull) {
+                return XEUtils.padStart(restStr, chunkFormat.length, '0');
+            }
+            return XEUtils[align === 'right' ? 'padStart' : 'padEnd'](restStr, chunkFormat.length, maskChar);
         };
         const handleArrowInputDate = (evnt, isUpArrow, isDwArrow, isLtArrow, isRtArrow) => {
             const { type, multiple } = props;
@@ -18395,7 +18428,7 @@ var VxeDatePickerComponent = defineVxeComponent({
                 const chunkValue = inpValue.slice(chunkStartIndex, chunkEndIndex);
                 if (parseInputKayMaps[selectKey]) {
                     const chunkNum = (isAllSameChar(chunkValue, maskChar) ? getChunkDefaultNum(selectKey) : XEUtils.toNumber(chunkValue)) + (isUpArrow ? 1 : -1);
-                    const restValue = inpValue.slice(0, chunkStartIndex) + checkMaskedInputValue(chunkNum, chunkFormat, true) + inpValue.slice(chunkEndIndex);
+                    const restValue = inpValue.slice(0, chunkStartIndex) + checkMaskedInputValue('' + chunkNum, chunkFormat, true) + inpValue.slice(chunkEndIndex);
                     evnt.preventDefault();
                     if (restValue.indexOf(maskChar) === -1) {
                         // 解析日期
@@ -18571,6 +18604,7 @@ var VxeDatePickerComponent = defineVxeComponent({
             internalData.isTriggerMasked = false;
         };
         const handleMaskedSelectedDate = (evnt, isFocus) => {
+            internalData.fsTimeout = undefined;
             const { type, multiple, modelValue } = props;
             if (multiple) {
                 return;
@@ -18645,7 +18679,7 @@ var VxeDatePickerComponent = defineVxeComponent({
                 selectKey = dateMaskedFormat[selectionStart - 1];
             }
             if (selectKey) {
-                evnt.preventDefault();
+                evnt.stopPropagation();
                 const skRest = dateMaskedFormat.match(new RegExp(selectKey + '+'));
                 if (skRest) {
                     const chunkFormat = skRest[0] || '';
@@ -18678,38 +18712,38 @@ var VxeDatePickerComponent = defineVxeComponent({
         };
         const focusEvent = (evnt) => {
             const { multiple, editable, maskedConfig } = props;
+            const { fsTimeout } = internalData;
             const maskedOpts = computeMaskedOpts.value;
             const popupOpts = computePopupOpts.value;
             const { trigger } = popupOpts;
             reactData.isActivated = true;
+            if (fsTimeout) {
+                clearTimeout(fsTimeout);
+            }
             if (!trigger || trigger === 'default') {
                 datePickerOpenEvent(evnt);
-                setTimeout(() => {
-                    if (editable && !multiple && (isEnableConf(maskedConfig) || maskedOpts.enabled)) {
-                        handleMaskedSelectedDate(evnt, true);
-                    }
-                }, 15);
             }
             else if (trigger === 'icon') {
                 hidePanel();
-                setTimeout(() => {
-                    if (editable && !multiple && (isEnableConf(maskedConfig) || maskedOpts.enabled)) {
-                        handleMaskedSelectedDate(evnt, true);
-                    }
-                }, 15);
             }
-            else {
-                if (editable && !multiple && (isEnableConf(maskedConfig) || maskedOpts.enabled)) {
+            if (editable && !multiple && (isEnableConf(maskedConfig) || maskedOpts.enabled)) {
+                internalData.fsTimeout = setTimeout(() => {
                     handleMaskedSelectedDate(evnt, true);
-                }
+                }, 20);
             }
             triggerEvent(evnt);
         };
         const clickEvent = (evnt) => {
-            const { editable, maskedConfig } = props;
+            const { multiple, editable, maskedConfig } = props;
+            const { fsTimeout } = internalData;
             const maskedOpts = computeMaskedOpts.value;
-            if (editable && (isEnableConf(maskedConfig) || maskedOpts.enabled)) {
-                handleMaskedSelectedDate(evnt);
+            if (fsTimeout) {
+                clearTimeout(fsTimeout);
+            }
+            if (editable && !multiple && (isEnableConf(maskedConfig) || maskedOpts.enabled)) {
+                internalData.fsTimeout = setTimeout(() => {
+                    handleMaskedSelectedDate(evnt);
+                }, 10);
             }
             triggerEvent(evnt);
         };