vxe-pc-ui 4.15.7 → 4.15.9

package/lib/index.umd.js

@@ -4649,7 +4649,7 @@ function checkDynamic() {
 const {
   log: log_log
 } = VxeUI;
-const uiVersion = `ui v${"4.15.7"}`;
+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}` : '';
@@ -4666,7 +4666,7 @@ const errLog = log_log.create('error', uiVersion);
 
 
 
-const ui_version = "4.15.7";
+const ui_version = "4.15.9";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -9663,7 +9663,7 @@ function isAllSameChar(str, char) {
   }
   return true;
 }
-function checkDateFormat(numStr, formatKey) {
+function checkDateInputFormat(numStr, formatKey) {
   const numVal = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(numStr);
   switch (formatKey) {
     case 'yyyy':
@@ -22182,10 +22182,10 @@ const Countdown = VxeCountdown;
       const isDateTimeType = computeIsDateTimeType.value;
       return isDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(props.type) > -1;
     });
-    const computeDateStartTime = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+    const computeDateStartDate = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return props.startDate ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toStringDate(props.startDate) : null;
     });
-    const computeDateEndTime = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+    const computeDateEndDate = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return props.endDate ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toStringDate(props.endDate) : null;
     });
     const computeDateListValue = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
@@ -22256,7 +22256,7 @@ const Countdown = VxeCountdown;
       return val;
     });
     const computeIsDisabledPrevDateBtn = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
-      const dateStartTime = computeDateStartTime.value;
+      const dateStartTime = computeDateStartDate.value;
       const {
         selectMonth
       } = reactData;
@@ -22266,7 +22266,7 @@ const Countdown = VxeCountdown;
       return false;
     });
     const computeIsDisabledNextDateBtn = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
-      const dateEndTime = computeDateEndTime.value;
+      const dateEndTime = computeDateEndDate.value;
       const {
         selectMonth
       } = reactData;
@@ -22730,6 +22730,8 @@ const Countdown = VxeCountdown;
         datetimePanelValue
       } = reactData;
       const dateLabelFormat = computeDateLabelFormat.value;
+      const dateStartDate = computeDateStartDate.value;
+      const dateEndDate = computeDateEndDate.value;
       if (inpVal) {
         let inpDateVal = parseDate(inpVal, dateLabelFormat);
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isValidDate(inpDateVal)) {
@@ -22742,6 +22744,12 @@ const Countdown = VxeCountdown;
             }
             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') {
@@ -23095,8 +23103,8 @@ const Countdown = VxeCountdown;
       }
     };
     const isRangeDisabled = item => {
-      const dateStartTime = computeDateStartTime.value;
-      const dateEndTime = computeDateEndTime.value;
+      const dateStartTime = computeDateStartDate.value;
+      const dateEndTime = computeDateEndDate.value;
       const {
         date
       } = item;
@@ -24009,6 +24017,7 @@ const {
   warnLog: date_picker_warnLog,
   errLog: date_picker_errLog
 } = createComponentLog('date-picker');
+const defaultMaskPlaceholder = '*';
 const maskedTypes = ['year', 'month', 'date', 'datetime', 'time'];
 const inputMaskedKeys = ['y', 'M', 'd', 'H', 'm', 'n', 's'];
 const parseInputKayMaps = {};
@@ -24031,6 +24040,7 @@ function date_picker_createReactData() {
 function date_picker_createInternalData() {
   return {
     // hpTimeout: undefined,
+    // fsTimeout: undefined,
     inputLabel: '',
     laseFocusMasked: 0
   };
@@ -24383,7 +24393,7 @@ function date_picker_createInternalData() {
       const {
         maskPlaceholder
       } = maskedOpts;
-      return (maskPlaceholder ? ('' + maskPlaceholder)[0] : '') || '*';
+      return (maskPlaceholder ? ('' + maskPlaceholder)[0] : '') || defaultMaskPlaceholder;
     });
     const updateModelValue = () => {
       const {
@@ -24579,6 +24589,8 @@ function date_picker_createInternalData() {
       } = internalData;
       const dateLabelFormat = computeDateLabelFormat.value;
       const maskedOpts = computeMaskedOpts.value;
+      const dateStartDate = computeDateStartDate.value;
+      const dateEndDate = computeDateEndDate.value;
       if (!inpVal) {
         handleChange('', {
           type: 'check'
@@ -24592,12 +24604,16 @@ function date_picker_createInternalData() {
           allMaskedKeys.forEach(formatKey => {
             const fkIndex = dateLabelFormat.indexOf(formatKey);
             if (fkIndex > -1) {
-              let val = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(valStr);
               // 自动纠错最小值
-              if (!val && ['MM', 'dd'].includes(formatKey)) {
-                val = 1;
+              if (!valNum && ['MM', 'dd'].includes(formatKey)) {
+                valNum = 1;
               }
-              inpVal = inpVal.slice(0, fkIndex) + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().padStart(checkDateFormat(val, formatKey), formatKey.length, '0') + inpVal.slice(fkIndex + formatKey.length);
+              inpVal = inpVal.slice(0, fkIndex) + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().padStart(checkDateInputFormat(valNum, formatKey), formatKey.length, '0') + inpVal.slice(fkIndex + formatKey.length);
             }
           });
         }
@@ -24623,6 +24639,12 @@ function date_picker_createInternalData() {
         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') {
@@ -24668,11 +24690,22 @@ function date_picker_createInternalData() {
         align
       } = maskedOpts;
       const maskChar = computeMaskChar.value;
-      const restVal = checkDateFormat(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(numStr), chunkFormat);
+      const numVal = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(numStr);
+      let restVal = checkDateInputFormat(numVal, chunkFormat);
+      if (isFull) {
+        // 自动纠错最小值
+        if (!restVal && ['MM', 'dd'].includes(chunkFormat)) {
+          restVal = 1;
+        }
+      }
+      let restStr = '' + restVal;
+      if (numStr.length > restStr.length) {
+        restStr = restStr.padStart(numStr.length, '0');
+      }
       if (isFull) {
-        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().padStart(restVal, chunkFormat.length, '0');
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().padStart(restStr, chunkFormat.length, '0');
       }
-      return (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[align === 'right' ? 'padStart' : 'padEnd'](restVal, chunkFormat.length, maskChar);
+      return (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[align === 'right' ? 'padStart' : 'padEnd'](restStr, chunkFormat.length, maskChar);
     };
     const handleArrowInputDate = (evnt, isUpArrow, isDwArrow, isLtArrow, isRtArrow) => {
       const {
@@ -24710,7 +24743,7 @@ function date_picker_createInternalData() {
         const chunkValue = inpValue.slice(chunkStartIndex, chunkEndIndex);
         if (parseInputKayMaps[selectKey]) {
           const chunkNum = (isAllSameChar(chunkValue, maskChar) ? getChunkDefaultNum(selectKey) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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) {
             // 解析日期
@@ -24889,6 +24922,7 @@ function date_picker_createInternalData() {
       internalData.isTriggerMasked = false;
     };
     const handleMaskedSelectedDate = (evnt, isFocus) => {
+      internalData.fsTimeout = undefined;
       const {
         type,
         multiple,
@@ -24968,7 +25002,7 @@ function date_picker_createInternalData() {
         selectKey = dateMaskedFormat[selectionStart - 1];
       }
       if (selectKey) {
-        evnt.preventDefault();
+        evnt.stopPropagation();
         const skRest = dateMaskedFormat.match(new RegExp(selectKey + '+'));
         if (skRest) {
           const chunkFormat = skRest[0] || '';
@@ -25011,41 +25045,47 @@ function date_picker_createInternalData() {
         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 {
+        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);
     };
@@ -51728,7 +51768,6 @@ function upload_createInternalData() {
     const handleUploadFile = (files, evnt) => {
       const {
         multiple,
-        urlMode,
         showLimitSize,
         limitSizeText,
         showLimitCount,
@@ -51860,7 +51899,7 @@ function upload_createInternalData() {
           option: item
         }, evnt);
       });
-      Promise.all(urlMode ? uploadPromiseRests : []).then(() => {
+      Promise.all(uploadPromiseRests).then(() => {
         const restFileList = reactData.fileList;
         dispatchEvent('upload-queue-end', {
           options: restFileList,