vxe-pc-ui 4.15.5 → 4.15.6

package/dist/all.esm.js

@@ -81,7 +81,7 @@ function checkDynamic() {
 }
 
 const { log } = VxeUI;
-const uiVersion = `ui v${"4.15.5"}`;
+const uiVersion = `ui v${"4.15.6"}`;
 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.5";
+const version = "4.15.6";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -197,6 +197,8 @@ setConfig$1({
     datePicker: {
         // size: null,
         // transfer: false,
+        startDate: new Date(1900, 0, 1),
+        endDate: new Date(2100, 0, 1),
         shortcutConfig: {
             // position: 'left',
             align: 'left',
@@ -4668,6 +4670,22 @@ function isAllSameChar(str, char) {
     }
     return true;
 }
+function checkDateFormat(numStr, formatKey) {
+    const numVal = XEUtils.toNumber(numStr);
+    switch (formatKey) {
+        case 'yyyy':
+            return (numVal >= 9999 ? 9999 : (numVal < 1 ? 1 : numVal));
+        case 'MM':
+            return (numVal >= 12 ? 12 : (numVal < 1 ? 1 : numVal));
+        case 'dd':
+            return (numVal >= 31 ? 31 : (numVal < 1 ? 1 : numVal));
+        case 'HH':
+        case 'mm':
+        case 'ss':
+            return (numVal >= 59 ? 59 : (numVal <= 0 ? 0 : numVal));
+    }
+    return numVal;
+}
 
 const { errLog: errLog$f } = createComponentLog('calendar');
 const { menus: menus$2, getConfig: getConfig$2, getI18n: getI18n$1 } = VxeUI;
@@ -9884,11 +9902,11 @@ var VxeCascaderComponent = defineVxeComponent({
         filterConfig: Object,
         showFullLabel: {
             type: Boolean,
-            default: getConfig$3().cascader.showFullLabel
+            default: () => getConfig$3().cascader.showFullLabel
         },
         separator: {
             type: String,
-            default: getConfig$3().cascader.separator
+            default: () => getConfig$3().cascader.separator
         },
         multiple: Boolean,
         className: [String, Function],
@@ -18003,6 +18021,12 @@ var VxeDatePickerComponent = defineVxeComponent({
             }
             return [];
         });
+        const computeDateStartDate = computed(() => {
+            return props.startDate ? XEUtils.toStringDate(props.startDate) : null;
+        });
+        const computeDateEndDate = computed(() => {
+            return props.endDate ? XEUtils.toStringDate(props.endDate) : null;
+        });
         const computeLimitMaxCount = computed(() => {
             return props.multiple ? XEUtils.toNumber(props.limitCount) : 0;
         });
@@ -18252,13 +18276,31 @@ var VxeDatePickerComponent = defineVxeComponent({
             handleInputLabel(panelLabel, true);
         };
         const afterCheckValue = (inpVal) => {
-            const { type } = props;
+            const { type, editable, multiple, maskedConfig } = props;
             const { inputLabel } = internalData;
             const dateLabelFormat = computeDateLabelFormat.value;
+            const maskedOpts = computeMaskedOpts.value;
             if (!inpVal) {
                 handleChange('', { type: 'check' });
                 return;
             }
+            // 掩码格式处理
+            if (editable && !multiple && (isEnableConf(maskedConfig) || maskedOpts.enabled)) {
+                const allMaskedKeys = dateLabelFormat.match(new RegExp(`(${inputMaskedKeys.join('|')})+`, 'g'));
+                if (allMaskedKeys) {
+                    allMaskedKeys.forEach(formatKey => {
+                        const fkIndex = dateLabelFormat.indexOf(formatKey);
+                        if (fkIndex > -1) {
+                            const val = XEUtils.toNumber(inpVal.slice(fkIndex, formatKey.length).replace(/\D/g, ''));
+                            inpVal = inpVal.slice(0, fkIndex) + XEUtils.padStart(checkDateFormat(val, formatKey), formatKey.length, '0') + inpVal.slice(fkIndex + formatKey.length);
+                        }
+                    });
+                }
+            }
+            const $datePanel = refDatePanel.value;
+            if ($datePanel) {
+                return $datePanel.checkValue(inpVal);
+            }
             let inpDateVal = parseDateValue(inpVal, type, {
                 valueFormat: dateLabelFormat
             });
@@ -18306,6 +18348,16 @@ var VxeDatePickerComponent = defineVxeComponent({
                 dispatchEvent('suffix-click', { value: inputValue }, evnt);
             }
         };
+        const checkMaskedInputValue = (numStr, chunkFormat, isFull) => {
+            const maskedOpts = computeMaskedOpts.value;
+            const { align } = maskedOpts;
+            const maskChar = computeMaskChar.value;
+            const restVal = checkDateFormat(XEUtils.toNumber(numStr), chunkFormat);
+            if (isFull) {
+                return XEUtils.padStart(restVal, chunkFormat.length, '0');
+            }
+            return XEUtils[align === 'right' ? 'padStart' : 'padEnd'](restVal, chunkFormat.length, maskChar);
+        };
         const handleArrowInputDate = (evnt, isUpArrow, isDwArrow, isLtArrow, isRtArrow) => {
             const { type, multiple } = props;
             if (multiple) {
@@ -18339,7 +18391,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) + XEUtils.padStart(chunkNum, chunkFormat.length, '0') + inpValue.slice(chunkEndIndex);
+                    const restValue = inpValue.slice(0, chunkStartIndex) + checkMaskedInputValue(chunkNum, chunkFormat, true) + inpValue.slice(chunkEndIndex);
                     evnt.preventDefault();
                     if (restValue.indexOf(maskChar) === -1) {
                         // 解析日期
@@ -18400,6 +18452,8 @@ var VxeDatePickerComponent = defineVxeComponent({
                 return;
             }
             const { isTriggerMasked } = internalData;
+            const maskedOpts = computeMaskedOpts.value;
+            const { align } = maskedOpts;
             const dateMaskedFormat = computeDateMaskedFormat.value;
             const maskChar = computeMaskChar.value;
             let inpValue = targetElem.value || dateMaskedFormat;
@@ -18419,7 +18473,7 @@ var VxeDatePickerComponent = defineVxeComponent({
             const chunkEndIndex = chunkStartIndex + chunkFormat.length;
             const currKeyIndex = allMaskedKeys.indexOf(selectKey);
             // 全选 | 如果无效字符
-            const isAllSelected = !selectionStart && selectionEnd === inpValue.length;
+            const isAllSelected = !selectionStart && selectionEnd === inpValue.length && allMaskedKeys.length > 1;
             const isNotMasked = inpValue && inpValue.length !== dateMaskedFormat.length;
             if (isAllSelected || isNotMasked) {
                 inpValue = dateMaskedFormat;
@@ -18429,11 +18483,12 @@ var VxeDatePickerComponent = defineVxeComponent({
             const chunkNumList = isTriggerMasked && !isBackspaceKey ? [] : chunkNums.slice(0);
             if (isNumKey) {
                 chunkNumList.push(numKey);
+                chunkValue = checkMaskedInputValue(chunkNumList.join(''), chunkFormat, false);
             }
             else if (isBackspaceKey) {
                 chunkNumList.pop();
+                chunkValue = XEUtils[align === 'right' ? 'padStart' : 'padEnd'](chunkNumList.join(''), chunkFormat.length, maskChar);
             }
-            chunkValue = chunkNumList.join('').padEnd(chunkFormat.length, maskChar);
             let restValue = inpValue.slice(0, chunkStartIndex) + chunkValue + inpValue.slice(chunkEndIndex);
             restValue = restValue.replace(new RegExp(`(${inputMaskedKeys.join('|')})`, 'g'), maskChar);
             targetElem.value = restValue;
@@ -18465,7 +18520,7 @@ var VxeDatePickerComponent = defineVxeComponent({
                             const prveChunkNums = (prveChunkValue.match(/\d/g) || []);
                             if (prveChunkNums.length) {
                                 prveChunkNums.pop();
-                                prveChunkValue = prveChunkNums.join('').padEnd(prveChunkFormat.length, maskChar);
+                                prveChunkValue = XEUtils[align === 'right' ? 'padStart' : 'padEnd'](prveChunkNums.join(''), prveChunkFormat.length, maskChar);
                                 restValue = restValue.slice(0, prveChunkStartIndex) + prveChunkValue + restValue.slice(prveChunkEndIndex);
                                 targetElem.value = restValue;
                                 handleInputLabel(restValue, false);
@@ -18555,7 +18610,7 @@ var VxeDatePickerComponent = defineVxeComponent({
                 }
             }
             // 全选 | 如果无效字符
-            const isAllSelected = !selectionStart && selectionEnd === inpValue.length;
+            const isAllSelected = !selectionStart && selectionEnd === inpValue.length && allMaskedKeys.length > 1;
             const isNotMasked = inpValue && inpValue.length !== dateMaskedFormat.length;
             if (isAllSelected || isNotMasked) {
                 let restValue = '';
@@ -18599,7 +18654,6 @@ var VxeDatePickerComponent = defineVxeComponent({
             }
         };
         const blurEvent = (evnt) => {
-            const $datePanel = refDatePanel.value;
             const { inputValue } = reactData;
             const inpImmediate = computeInpImmediate.value;
             const value = inputValue;
@@ -18610,12 +18664,7 @@ var VxeDatePickerComponent = defineVxeComponent({
                 const { inputLabel } = internalData;
                 reactData.isActivated = false;
                 // 未打开面板时才校验
-                if ($datePanel) {
-                    $datePanel.checkValue(inputLabel);
-                }
-                else {
-                    afterCheckValue(inputLabel);
-                }
+                afterCheckValue(inputLabel);
             }
             dispatchEvent('blur', { value }, evnt);
             // 自动更新校验状态
@@ -18671,18 +18720,12 @@ var VxeDatePickerComponent = defineVxeComponent({
             const isEnter = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ENTER);
             if (editable) {
                 if (isEnter) {
-                    const $datePanel = refDatePanel.value;
                     const { inputLabel } = internalData;
                     const targetElem = refInputTarget.value;
                     if (visiblePanel) {
                         hidePanel();
                     }
-                    if ($datePanel) {
-                        $datePanel.checkValue(inputLabel);
-                    }
-                    else {
-                        afterCheckValue(inputLabel);
-                    }
+                    afterCheckValue(inputLabel);
                     if (targetElem) {
                         targetElem.blur();
                     }
@@ -18729,7 +18772,6 @@ var VxeDatePickerComponent = defineVxeComponent({
         };
         // 全局事件
         const handleGlobalMousedownEvent = (evnt) => {
-            const $datePanel = refDatePanel.value;
             const { visiblePanel, isActivated } = reactData;
             const el = refElem.value;
             const panelWrapperElem = refPanelWrapper.value;
@@ -18743,12 +18785,7 @@ var VxeDatePickerComponent = defineVxeComponent({
                     if (visiblePanel) {
                         hidePanel();
                         const { inputLabel } = internalData;
-                        if ($datePanel) {
-                            $datePanel.checkValue(inputLabel);
-                        }
-                        else {
-                            afterCheckValue(inputLabel);
-                        }
+                        afterCheckValue(inputLabel);
                     }
                 }
             }
@@ -18787,7 +18824,6 @@ var VxeDatePickerComponent = defineVxeComponent({
             }
         };
         const handleGlobalBlurEvent = () => {
-            const $datePanel = refDatePanel.value;
             const { isActivated, visiblePanel } = reactData;
             if (visiblePanel) {
                 hidePanel();
@@ -18796,9 +18832,7 @@ var VxeDatePickerComponent = defineVxeComponent({
                 reactData.isActivated = false;
             }
             if (visiblePanel || isActivated) {
-                if ($datePanel) {
-                    $datePanel.checkValue(internalData.inputLabel);
-                }
+                afterCheckValue(internalData.inputLabel);
                 const targetElem = refInputTarget.value;
                 if (targetElem) {
                     targetElem.blur();
@@ -19011,6 +19045,8 @@ var VxeDatePickerComponent = defineVxeComponent({
             const isDateTimeType = computeIsDateTimeType.value;
             const shortcutList = computeShortcutList.value;
             const timeOpts = computeTimeOpts.value;
+            const dateStartDate = computeDateStartDate.value;
+            const dateEndDate = computeDateEndDate.value;
             const { position } = shortcutOpts;
             const headerSlot = slots.header;
             const footerSlot = slots.footer;
@@ -19079,8 +19115,8 @@ var VxeDatePickerComponent = defineVxeComponent({
                                             className: props.className,
                                             multiple: props.multiple,
                                             limitCount: props.limitCount,
-                                            startDate: props.startDate,
-                                            endDate: props.endDate,
+                                            startDate: dateStartDate,
+                                            endDate: dateEndDate,
                                             defaultDate: props.defaultDate,
                                             defaultTime: props.defaultTime,
                                             minDate: props.minDate,
@@ -31751,7 +31787,7 @@ var VxePulldownComponent = defineVxeComponent({
          */
         trigger: {
             type: String,
-            default: getConfig$3().pulldown.trigger
+            default: () => getConfig$3().pulldown.trigger
         },
         /**
          * 已废弃，请使用 popupConfig.zIndex
@@ -31765,7 +31801,7 @@ var VxePulldownComponent = defineVxeComponent({
         options: Array,
         className: {
             type: [String, Function],
-            default: getConfig$3().pulldown.className
+            default: () => getConfig$3().pulldown.className
         },
         /**
          * 已废弃，请使用 popupConfig.className
@@ -31776,7 +31812,7 @@ var VxePulldownComponent = defineVxeComponent({
         popupConfig: Object,
         destroyOnClose: {
             type: Boolean,
-            default: getConfig$3().pulldown.destroyOnClose
+            default: () => getConfig$3().pulldown.destroyOnClose
         },
         transfer: {
             type: Boolean,
@@ -35144,7 +35180,7 @@ var VxeTableSelectComponent = defineVxeComponent({
         modelValue: [String, Number, Array],
         clearable: {
             type: Boolean,
-            default: getConfig$3().tableSelect.clearable
+            default: () => getConfig$3().tableSelect.clearable
         },
         placeholder: {
             type: String,
@@ -40625,7 +40661,7 @@ var VxeTreeSelectComponent = defineVxeComponent({
         modelValue: [String, Number, Array],
         clearable: {
             type: Boolean,
-            default: getConfig$3().treeSelect.clearable
+            default: () => getConfig$3().treeSelect.clearable
         },
         placeholder: {
             type: String,
@@ -40642,11 +40678,11 @@ var VxeTreeSelectComponent = defineVxeComponent({
         },
         showFullLabel: {
             type: Boolean,
-            default: getConfig$3().treeSelect.showFullLabel
+            default: () => getConfig$3().treeSelect.showFullLabel
         },
         separator: {
             type: String,
-            default: getConfig$3().treeSelect.separator
+            default: () => getConfig$3().treeSelect.separator
         },
         filterable: Boolean,
         filterConfig: Object,