vxe-pc-ui 4.5.29 → 4.5.30

package/lib/index.umd.js

@@ -4187,14 +4187,14 @@ function checkDynamic() {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-const log_version = `ui v${"4.5.29"}`;
+const log_version = `ui v${"4.5.30"}`;
 const warnLog = log.create('warn', log_version);
 const errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
 
-const ui_version = "4.5.29";
+const ui_version = "4.5.30";
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -10262,7 +10262,7 @@ function hexToRgb(str) {
 ;// CONCATENATED MODULE: ./packages/number-input/src/util.ts
 
 function handleNumber(val) {
-  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(val) ? val.replace(/,/g, '') : val;
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(val) ? val.replace(/[^0-9e.-]/g, '') : val;
 }
 function toFloatValueFixed(inputValue, digitsValue) {
   if (/^-/.test('' + inputValue)) {
@@ -11396,21 +11396,33 @@ function toFloatValueFixed(inputValue, digitsValue) {
       if (!inputReadonly) {
         if (isNumType) {
           if (inputValue) {
-            let inpNumVal = type === 'integer' ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(handleNumber(inputValue)) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(handleNumber(inputValue));
-            if (!validMinNum(inpNumVal)) {
-              inpNumVal = min;
-            } else if (!validMaxNum(inpNumVal)) {
-              inpNumVal = max;
-            }
-            if (exponential) {
-              const inpStringVal = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(inputValue).toLowerCase();
-              if (inpStringVal === external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(inpNumVal).toExponential()) {
-                inpNumVal = inpStringVal;
+            const inpVal = `${handleNumber(inputValue)}`;
+            if (inpVal) {
+              let inpNumVal = type === 'integer' ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(inpVal) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(inpVal);
+              if (!validMinNum(inpNumVal)) {
+                inpNumVal = min;
+              } else if (!validMaxNum(inpNumVal)) {
+                inpNumVal = max;
               }
+              if (exponential) {
+                const inpStringVal = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(inputValue).toLowerCase();
+                if (inpStringVal === external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(inpNumVal).toExponential()) {
+                  inpNumVal = inpStringVal;
+                }
+              }
+              handleChange(getNumberValue(inpNumVal), {
+                type: 'check'
+              });
+            } else {
+              // 输入错误字符，清空
+              let inpValue = '';
+              if (min || min === 0) {
+                inpValue = `${min}`;
+              }
+              handleChange(inpValue, {
+                type: 'check'
+              });
             }
-            handleChange(getNumberValue(inpNumVal), {
-              type: 'check'
-            });
           }
         } else if (isDatePickerType) {
           if (inputValue) {
@@ -11543,6 +11555,7 @@ function toFloatValueFixed(inputValue, digitsValue) {
     };
     const keydownEvent = evnt => {
       const {
+        type,
         exponential,
         controls
       } = props;
@@ -11555,8 +11568,10 @@ function toFloatValueFixed(inputValue, digitsValue) {
         const isEsc = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE);
         const isUpArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_UP);
         const isDwArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_DOWN);
-        if (!isControlKey && !isShiftKey && !isAltKey && (globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.SPACEBAR) || (!exponential || keyCode !== 69) && keyCode >= 65 && keyCode <= 90 || keyCode >= 186 && keyCode <= 188 || keyCode >= 191)) {
-          evnt.preventDefault();
+        if (!isControlKey && !isShiftKey && !isAltKey) {
+          if (globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.SPACEBAR) || type === 'integer' && keyCode === 110 || (!exponential || keyCode !== 69) && keyCode >= 65 && keyCode <= 90 || keyCode >= 186 && keyCode <= 188 || keyCode >= 191) {
+            evnt.preventDefault();
+          }
         }
         if (isEsc) {
           afterCheckValue();
@@ -30513,6 +30528,7 @@ const WidgetVxeNumberInputFormComponent = (0,external_commonjs_vue_commonjs2_vue
     };
     const keydownEvent = evnt => {
       const {
+        type,
         exponential,
         controls
       } = props;
@@ -30524,8 +30540,10 @@ const WidgetVxeNumberInputFormComponent = (0,external_commonjs_vue_commonjs2_vue
       const isEsc = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE);
       const isUpArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_UP);
       const isDwArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_DOWN);
-      if (!isControlKey && !isShiftKey && !isAltKey && (globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.SPACEBAR) || (!exponential || keyCode !== 69) && keyCode >= 65 && keyCode <= 90 || keyCode >= 186 && keyCode <= 188 || keyCode >= 191)) {
-        evnt.preventDefault();
+      if (!isControlKey && !isShiftKey && !isAltKey) {
+        if (globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.SPACEBAR) || type === 'integer' && keyCode === 110 || (!exponential || keyCode !== 69) && keyCode >= 65 && keyCode <= 90 || keyCode >= 186 && keyCode <= 188 || keyCode >= 191) {
+          evnt.preventDefault();
+        }
       }
       if (isEsc) {
         afterCheckValue();