vxe-pc-ui 3.15.7 → 3.15.9

package/lib/index.umd.js

@@ -13215,7 +13215,7 @@ function checkDynamic() {
 ;// ./packages/ui/src/log.ts
 
 var log_log = VxeUI.log;
-var uiVersion = "ui v".concat("3.15.7");
+var uiVersion = "ui v".concat("3.15.9");
 function createComponentLog(name) {
   var tableVersion = VxeUI.tableVersion ? "table v".concat(VxeUI.tableVersion) : '';
   var ganttVersion = VxeUI.ganttVersion ? "gantt v".concat(VxeUI.ganttVersion) : '';
@@ -13232,7 +13232,7 @@ var errLog = log_log.create('error', uiVersion);
 
 
 
-var ui_version = "3.15.7";
+var ui_version = "3.15.9";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -18635,7 +18635,7 @@ function isAllSameChar(str, char) {
   }
   return true;
 }
-function checkDateFormat(numStr, formatKey) {
+function checkDateInputFormat(numStr, formatKey) {
   var numVal = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(numStr);
   switch (formatKey) {
     case 'yyyy':
@@ -32416,12 +32416,12 @@ var Countdown = VxeCountdown;
       var isDateTimeType = $xeDatePanel.computeIsDateTimeType;
       return isDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(props.type) > -1;
     },
-    computeDateStartTime: function computeDateStartTime() {
+    computeDateStartDate: function computeDateStartDate() {
       var $xeDatePanel = this;
       var props = $xeDatePanel;
       return props.startDate ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toStringDate(props.startDate) : null;
     },
-    computeDateEndTime: function computeDateEndTime() {
+    computeDateEndDate: function computeDateEndDate() {
       var $xeDatePanel = this;
       var props = $xeDatePanel;
       return props.endDate ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toStringDate(props.endDate) : null;
@@ -32506,7 +32506,7 @@ var Countdown = VxeCountdown;
     computeIsDisabledPrevDateBtn: function computeIsDisabledPrevDateBtn() {
       var $xeDatePanel = this;
       var reactData = $xeDatePanel.reactData;
-      var dateStartTime = $xeDatePanel.computeDateStartTime;
+      var dateStartTime = $xeDatePanel.computeDateStartDate;
       var selectMonth = reactData.selectMonth;
       if (selectMonth && dateStartTime) {
         return selectMonth <= dateStartTime;
@@ -32516,7 +32516,7 @@ var Countdown = VxeCountdown;
     computeIsDisabledNextDateBtn: function computeIsDisabledNextDateBtn() {
       var $xeDatePanel = this;
       var reactData = $xeDatePanel.reactData;
-      var dateEndTime = $xeDatePanel.computeDateEndTime;
+      var dateEndTime = $xeDatePanel.computeDateEndDate;
       var selectMonth = reactData.selectMonth;
       if (selectMonth && dateEndTime) {
         return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatMonth(selectMonth, 0, 'last') >= dateEndTime;
@@ -33006,6 +33006,8 @@ var Countdown = VxeCountdown;
       var inputLabel = reactData.inputLabel,
         datetimePanelValue = reactData.datetimePanelValue;
       var dateLabelFormat = $xeDatePanel.computeDateLabelFormat;
+      var dateStartDate = $xeDatePanel.computeDateStartDate;
+      var dateEndDate = $xeDatePanel.computeDateEndDate;
       if (inpVal) {
         var inpDateVal = $xeDatePanel.parseDate(inpVal, dateLabelFormat);
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isValidDate(inpDateVal)) {
@@ -33018,6 +33020,12 @@ var Countdown = VxeCountdown;
             }
             reactData.inputLabel = inpDateVal;
           } else {
+            if (dateEndDate && inpDateVal > dateEndDate) {
+              inpDateVal = dateEndDate;
+            }
+            if (dateStartDate && inpDateVal < dateStartDate) {
+              inpDateVal = dateStartDate;
+            }
             var isChange = false;
             var firstDayOfWeek = $xeDatePanel.computeFirstDayOfWeek;
             if (type === 'datetime') {
@@ -33387,8 +33395,8 @@ var Countdown = VxeCountdown;
     },
     isRangeDisabled: function isRangeDisabled(item) {
       var $xeDatePanel = this;
-      var dateStartTime = $xeDatePanel.computeDateStartTime;
-      var dateEndTime = $xeDatePanel.computeDateEndTime;
+      var dateStartTime = $xeDatePanel.computeDateStartDate;
+      var dateEndTime = $xeDatePanel.computeDateEndDate;
       var date = item.date;
       if (dateStartTime && dateStartTime.getTime() > date.getTime()) {
         return true;
@@ -34408,6 +34416,7 @@ var DatePanel = VxeDatePanel;
 var date_picker_createComponentLog = createComponentLog('date-picker'),
   date_picker_warnLog = date_picker_createComponentLog.warnLog,
   date_picker_errLog = date_picker_createComponentLog.errLog;
+var defaultMaskPlaceholder = '*';
 var maskedTypes = ['year', 'month', 'date', 'datetime', 'time'];
 var inputMaskedKeys = ['y', 'M', 'd', 'H', 'm', 'n', 's'];
 var parseInputKayMaps = {};
@@ -34430,6 +34439,7 @@ function date_picker_createReactData() {
 function date_picker_createInternalData() {
   return {
     // hpTimeout: undefined,
+    // fsTimeout: undefined,
     inputLabel: '',
     laseFocusMasked: 0
   };
@@ -34837,7 +34847,7 @@ function date_picker_createInternalData() {
       var $xeDatePicker = this;
       var maskedOpts = $xeDatePicker.computeMaskedOpts;
       var maskPlaceholder = maskedOpts.maskPlaceholder;
-      return (maskPlaceholder ? ('' + maskPlaceholder)[0] : '') || '*';
+      return (maskPlaceholder ? ('' + maskPlaceholder)[0] : '') || defaultMaskPlaceholder;
     }
   }),
   methods: {
@@ -35074,6 +35084,8 @@ function date_picker_createInternalData() {
       var inputLabel = internalData.inputLabel;
       var dateLabelFormat = $xeDatePicker.computeDateLabelFormat;
       var maskedOpts = $xeDatePicker.computeMaskedOpts;
+      var dateStartDate = $xeDatePicker.computeDateStartDate;
+      var dateEndDate = $xeDatePicker.computeDateEndDate;
       if (!inpVal) {
         $xeDatePicker.handleChange('', {
           type: 'check'
@@ -35087,12 +35099,16 @@ function date_picker_createInternalData() {
           allMaskedKeys.forEach(function (formatKey) {
             var fkIndex = dateLabelFormat.indexOf(formatKey);
             if (fkIndex > -1) {
-              var val = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(inpVal.slice(fkIndex, formatKey.length).replace(/\D/g, ''));
+              var valStr = inpVal.slice(fkIndex, fkIndex + formatKey.length).replace(/\D/g, '');
+              if (!valStr) {
+                return;
+              }
+              var 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);
             }
           });
         }
@@ -35118,6 +35134,12 @@ function date_picker_createInternalData() {
         $xeDatePicker.handleInputLabel(inpDateVal, true);
         return;
       }
+      if (dateEndDate && inpDateVal > dateEndDate) {
+        inpDateVal = dateEndDate;
+      }
+      if (dateStartDate && inpDateVal < dateStartDate) {
+        inpDateVal = dateStartDate;
+      }
       var isChange = false;
       var firstDayOfWeek = $xeDatePicker.computeFirstDayOfWeek;
       if (type === 'datetime') {
@@ -35163,9 +35185,20 @@ function date_picker_createInternalData() {
       var maskedOpts = $xeDatePicker.computeMaskedOpts;
       var align = maskedOpts.align;
       var maskChar = $xeDatePicker.computeMaskChar;
-      var restVal = checkDateFormat(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(numStr), chunkFormat);
+      var numVal = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(numStr);
+      var restVal = checkDateInputFormat(numVal, chunkFormat);
       if (isFull) {
-        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().padStart(restVal, chunkFormat.length, '0');
+        // 自动纠错最小值
+        if (!restVal && ['MM', 'dd'].includes(chunkFormat)) {
+          restVal = 1;
+        }
+      }
+      var 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(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);
     },
@@ -35206,7 +35239,7 @@ function date_picker_createInternalData() {
         var chunkValue = inpValue.slice(chunkStartIndex, chunkEndIndex);
         if (parseInputKayMaps[selectKey]) {
           var chunkNum = (isAllSameChar(chunkValue, maskChar) ? getChunkDefaultNum(selectKey) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(chunkValue)) + (isUpArrow ? 1 : -1);
-          var restValue = inpValue.slice(0, chunkStartIndex) + $xeDatePicker.checkMaskedInputValue(chunkNum, chunkFormat, true) + inpValue.slice(chunkEndIndex);
+          var restValue = inpValue.slice(0, chunkStartIndex) + $xeDatePicker.checkMaskedInputValue('' + chunkNum, chunkFormat, true) + inpValue.slice(chunkEndIndex);
           evnt.preventDefault();
           if (restValue.indexOf(maskChar) === -1) {
             // 解析日期
@@ -35394,6 +35427,7 @@ function date_picker_createInternalData() {
       var type = props.type,
         multiple = props.multiple,
         modelValue = props.value;
+      internalData.fsTimeout = undefined;
       if (multiple) {
         return;
       }
@@ -35514,6 +35548,8 @@ function date_picker_createInternalData() {
       var $xeDatePicker = this;
       var props = $xeDatePicker;
       var reactData = $xeDatePicker.reactData;
+      var internalData = $xeDatePicker.internalData;
+      var fsTimeout = internalData.fsTimeout;
       var multiple = props.multiple,
         editable = props.editable,
         maskedConfig = props.maskedConfig;
@@ -35521,35 +35557,37 @@ function date_picker_createInternalData() {
       var popupOpts = $xeDatePicker.computePopupOpts;
       var trigger = popupOpts.trigger;
       reactData.isActivated = true;
+      if (fsTimeout) {
+        clearTimeout(fsTimeout);
+      }
       if (!trigger || trigger === 'default') {
         $xeDatePicker.datePickerOpenEvent(evnt);
-        setTimeout(function () {
-          if (editable && !multiple && (isEnableConf(maskedConfig) || maskedOpts.enabled)) {
-            $xeDatePicker.handleMaskedSelectedDate(evnt, true);
-          }
-        }, 15);
       } else if (trigger === 'icon') {
         $xeDatePicker.hidePanel();
-        setTimeout(function () {
-          if (editable && !multiple && (isEnableConf(maskedConfig) || maskedOpts.enabled)) {
-            $xeDatePicker.handleMaskedSelectedDate(evnt, true);
-          }
-        }, 15);
-      } else {
-        if (editable && !multiple && (isEnableConf(maskedConfig) || maskedOpts.enabled)) {
+      }
+      if (editable && !multiple && (isEnableConf(maskedConfig) || maskedOpts.enabled)) {
+        internalData.fsTimeout = setTimeout(function () {
           $xeDatePicker.handleMaskedSelectedDate(evnt, true);
-        }
+        }, 20);
       }
       $xeDatePicker.triggerEvent(evnt);
     },
     clickEvent: function clickEvent(evnt) {
       var $xeDatePicker = this;
       var props = $xeDatePicker;
-      var editable = props.editable,
+      var internalData = $xeDatePicker.internalData;
+      var multiple = props.multiple,
+        editable = props.editable,
         maskedConfig = props.maskedConfig;
+      var fsTimeout = internalData.fsTimeout;
       var maskedOpts = $xeDatePicker.computeMaskedOpts;
-      if (editable && (isEnableConf(maskedConfig) || maskedOpts.enabled)) {
-        $xeDatePicker.handleMaskedSelectedDate(evnt);
+      if (fsTimeout) {
+        clearTimeout(fsTimeout);
+      }
+      if (editable && !multiple && (isEnableConf(maskedConfig) || maskedOpts.enabled)) {
+        internalData.fsTimeout = setTimeout(function () {
+          $xeDatePicker.handleMaskedSelectedDate(evnt);
+        }, 10);
       }
       $xeDatePicker.triggerEvent(evnt);
     },
@@ -64525,7 +64563,6 @@ function upload_createInternalData() {
       var $xeForm = $xeUpload.$xeForm;
       var formItemInfo = $xeUpload.formItemInfo;
       var multiple = props.multiple,
-        urlMode = props.urlMode,
         showLimitSize = props.showLimitSize,
         limitSizeText = props.limitSizeText,
         showLimitCount = props.showLimitCount,
@@ -64645,7 +64682,7 @@ function upload_createInternalData() {
           option: item
         }, evnt);
       });
-      Promise.all(urlMode ? uploadPromiseRests : []).then(function () {
+      Promise.all(uploadPromiseRests).then(function () {
         var restFileList = reactData.fileList;
         $xeUpload.dispatchEvent('upload-queue-end', {
           options: restFileList,