vxe-pc-ui 3.14.38 → 3.14.39

package/es/input/src/input.js

@@ -882,7 +882,7 @@ export default {
             const { type, exponential } = props;
             const inpMaxLength = $xeInput.computeInpMaxLength;
             const digitsValue = $xeInput.computeDigitsValue;
-            const restVal = (type === 'float' ? toFloatValueFixed(val, digitsValue) : XEUtils.toValueString(val));
+            const restVal = (type === 'float' ? toFloatValueFixed(val, digitsValue, '') : XEUtils.toValueString(val));
             if (exponential && (val === restVal || XEUtils.toValueString(val).toLowerCase() === XEUtils.toNumber(restVal).toExponential())) {
                 return val;
             }
@@ -1105,7 +1105,7 @@ export default {
             }
             else if (type === 'float') {
                 if (inputValue) {
-                    const validValue = toFloatValueFixed(inputValue, digitsValue);
+                    const validValue = toFloatValueFixed(inputValue, digitsValue, '');
                     if (inputValue !== validValue) {
                         $xeInput.handleChange(validValue, { type: 'init' });
                     }

package/es/number-input/src/number-input.js

@@ -83,6 +83,11 @@ export default {
         },
         controlConfig: Object,
         // float
+        roundingMode: {
+            type: String,
+            default: null
+        },
+        // float
         digits: {
             type: [String, Number],
             default: null
@@ -274,12 +279,22 @@ export default {
             const $xeNumberInput = this;
             const props = $xeNumberInput;
             const reactData = $xeNumberInput.reactData;
-            const { type, showCurrency, currencySymbol, autoFill } = props;
+            const { type, roundingMode, showCurrency, currencySymbol, autoFill } = props;
             const { inputValue } = reactData;
             const digitsValue = $xeNumberInput.computeDigitsValue;
             if (type === 'amount') {
                 const num = XEUtils.toNumber(inputValue);
-                let amountLabel = XEUtils.commafy(num, { digits: digitsValue });
+                const cfyOpts = { digits: digitsValue };
+                if (roundingMode === 'floor') {
+                    cfyOpts.floor = true;
+                }
+                else if (roundingMode === 'ceil') {
+                    cfyOpts.ceil = true;
+                }
+                else {
+                    cfyOpts.round = true;
+                }
+                let amountLabel = XEUtils.commafy(num, cfyOpts);
                 if (!autoFill) {
                     const [iStr, dStr] = amountLabel.split('.');
                     if (dStr) {
@@ -368,13 +383,13 @@ export default {
         getNumberValue(val) {
             const $xeNumberInput = this;
             const props = $xeNumberInput;
-            const { exponential, autoFill } = props;
+            const { exponential, roundingMode, autoFill } = props;
             const inpMaxLength = $xeNumberInput.computeInpMaxLength;
             const digitsValue = $xeNumberInput.computeDigitsValue;
             const decimalsType = $xeNumberInput.computeDecimalsType;
             let restVal = '';
             if (decimalsType) {
-                restVal = toFloatValueFixed(val, digitsValue);
+                restVal = toFloatValueFixed(val, digitsValue, roundingMode);
                 if (!autoFill) {
                     restVal = handleNumberString(XEUtils.toNumber(restVal));
                 }
@@ -489,7 +504,7 @@ export default {
             const $xeNumberInput = this;
             const props = $xeNumberInput;
             const reactData = $xeNumberInput.reactData;
-            const { autoFill } = props;
+            const { roundingMode, autoFill } = props;
             const { inputValue } = reactData;
             const digitsValue = $xeNumberInput.computeDigitsValue;
             const decimalsType = $xeNumberInput.computeDecimalsType;
@@ -497,11 +512,11 @@ export default {
                 reactData.inputValue = '';
             }
             else {
-                let textValue = `${val}`;
+                let textValue = '' + val;
                 if (decimalsType) {
-                    textValue = toFloatValueFixed(val, digitsValue);
+                    textValue = toFloatValueFixed(val, digitsValue, roundingMode);
                     if (!autoFill) {
-                        textValue = `${XEUtils.toNumber(textValue)}`;
+                        textValue = '' + XEUtils.toNumber(textValue);
                     }
                 }
                 if (textValue !== inputValue) {
@@ -516,7 +531,7 @@ export default {
             const $xeNumberInput = this;
             const props = $xeNumberInput;
             const reactData = $xeNumberInput.reactData;
-            const { autoFill } = props;
+            const { roundingMode, autoFill } = props;
             const { inputValue } = reactData;
             const digitsValue = $xeNumberInput.computeDigitsValue;
             const decimalsType = $xeNumberInput.computeDecimalsType;
@@ -525,7 +540,7 @@ export default {
                     let textValue = '';
                     let validValue = null;
                     if (inputValue) {
-                        textValue = toFloatValueFixed(inputValue, digitsValue);
+                        textValue = toFloatValueFixed(inputValue, digitsValue, roundingMode);
                         validValue = XEUtils.toNumber(textValue);
                         if (!autoFill) {
                             textValue = `${validValue}`;

package/es/number-input/src/util.js

@@ -1,10 +1,22 @@
 import XEUtils from 'xe-utils';
 export function handleNumber(val) {
-    return XEUtils.isString(val) ? val.replace(/,/g, '') : val;
+    return XEUtils.isString(val) ? val.replace(/[^0-9e.-]/g, '') : val;
 }
-export function toFloatValueFixed(inputValue, digitsValue) {
-    if (/^-/.test('' + inputValue)) {
-        return XEUtils.toFixed(XEUtils.ceil(inputValue, digitsValue), digitsValue);
+export function toFloatValueFixed(inputValue, digitsValue, roundingMode) {
+    if (!roundingMode || roundingMode === 'default') {
+        // 默认截取忽略
+        if (/^-/.test('' + inputValue)) {
+            return XEUtils.toFixed(XEUtils.ceil(inputValue, digitsValue), digitsValue);
+        }
+        return XEUtils.toFixed(XEUtils.floor(inputValue, digitsValue), digitsValue);
+    }
+    else {
+        if (roundingMode === 'ceil') {
+            return XEUtils.toFixed(XEUtils.ceil(inputValue, digitsValue), digitsValue);
+        }
+        if (roundingMode === 'floor') {
+            return XEUtils.toFixed(XEUtils.floor(inputValue, digitsValue), digitsValue);
+        }
+        return XEUtils.toFixed(XEUtils.round(inputValue, digitsValue), digitsValue);
     }
-    return XEUtils.toFixed(XEUtils.floor(inputValue, digitsValue), digitsValue);
 }

package/es/ui/index.js

@@ -1,7 +1,7 @@
 import { VxeUI, setConfig, setIcon } from '@vxe-ui/core';
 import { dynamicApp } from '../dynamics';
 import { warnLog } from './src/log';
-export const version = "3.14.38";
+export const version = "3.14.39";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 export function config(options) {

package/es/ui/src/log.js

@@ -1,4 +1,4 @@
 import { log } from '@vxe-ui/core';
-const version = `ui v${"3.14.38"}`;
+const version = `ui v${"3.14.39"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -11642,7 +11642,7 @@ var es_regexp_exec = __webpack_require__(7495);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.match.js
 var es_string_match = __webpack_require__(1761);
 ;// ./node_modules/@vxe-ui/core/es/src/core.js
-var coreVersion = "3.4.12";
+var coreVersion = "3.4.14";
 var VxeCore = {
   coreVersion: coreVersion,
   uiVersion: '',
@@ -12402,7 +12402,7 @@ function createLog(type, name) {
     return msg;
   };
 }
-var version = "3.4.12";
+var version = "3.4.14";
 var log = {
   create: createLog,
   warn: createLog('warn', "v".concat(version)),
@@ -13214,7 +13214,7 @@ function checkDynamic() {
 }
 ;// ./packages/ui/src/log.ts
 
-var log_version = "ui v".concat("3.14.38");
+var log_version = "ui v".concat("3.14.39");
 var warnLog = log.create('warn', log_version);
 var errLog = log.create('error', log_version);
 ;// ./packages/ui/index.ts
@@ -13222,7 +13222,7 @@ var errLog = log.create('error', log_version);
 
 
 
-var ui_version = "3.14.38";
+var ui_version = "3.14.39";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -21121,13 +21121,24 @@ var es_number_to_fixed = __webpack_require__(9868);
 
 
 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)) {
-    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().ceil(inputValue, digitsValue), digitsValue);
+function toFloatValueFixed(inputValue, digitsValue, roundingMode) {
+  if (!roundingMode || roundingMode === 'default') {
+    // 默认截取忽略
+    if (/^-/.test('' + inputValue)) {
+      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().ceil(inputValue, digitsValue), digitsValue);
+    }
+    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(inputValue, digitsValue), digitsValue);
+  } else {
+    if (roundingMode === 'ceil') {
+      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().ceil(inputValue, digitsValue), digitsValue);
+    }
+    if (roundingMode === 'floor') {
+      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(inputValue, digitsValue), digitsValue);
+    }
+    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().round(inputValue, digitsValue), digitsValue);
   }
-  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(inputValue, digitsValue), digitsValue);
 }
 ;// ./packages/input/src/input.ts
 
@@ -22085,7 +22096,7 @@ function toFloatValueFixed(inputValue, digitsValue) {
         exponential = props.exponential;
       var inpMaxLength = $xeInput.computeInpMaxLength;
       var digitsValue = $xeInput.computeDigitsValue;
-      var restVal = type === 'float' ? toFloatValueFixed(val, digitsValue) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(val);
+      var restVal = type === 'float' ? toFloatValueFixed(val, digitsValue, '') : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(val);
       if (exponential && (val === restVal || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(val).toLowerCase() === external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(restVal).toExponential())) {
         return val;
       }
@@ -22327,7 +22338,7 @@ function toFloatValueFixed(inputValue, digitsValue) {
         $xeInput.changeValue();
       } else if (type === 'float') {
         if (inputValue) {
-          var validValue = toFloatValueFixed(inputValue, digitsValue);
+          var validValue = toFloatValueFixed(inputValue, digitsValue, '');
           if (inputValue !== validValue) {
             $xeInput.handleChange(validValue, {
               type: 'init'
@@ -26798,6 +26809,11 @@ var handleNumberString = function handleNumberString(val) {
     },
     controlConfig: Object,
     // float
+    roundingMode: {
+      type: String,
+      default: null
+    },
+    // float
     digits: {
       type: [String, Number],
       default: null
@@ -26997,6 +27013,7 @@ var handleNumberString = function handleNumberString(val) {
       var props = $xeNumberInput;
       var reactData = $xeNumberInput.reactData;
       var type = props.type,
+        roundingMode = props.roundingMode,
         showCurrency = props.showCurrency,
         currencySymbol = props.currencySymbol,
         autoFill = props.autoFill;
@@ -27004,9 +27021,17 @@ var handleNumberString = function handleNumberString(val) {
       var digitsValue = $xeNumberInput.computeDigitsValue;
       if (type === 'amount') {
         var num = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(inputValue);
-        var amountLabel = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(num, {
+        var cfyOpts = {
           digits: digitsValue
-        });
+        };
+        if (roundingMode === 'floor') {
+          cfyOpts.floor = true;
+        } else if (roundingMode === 'ceil') {
+          cfyOpts.ceil = true;
+        } else {
+          cfyOpts.round = true;
+        }
+        var amountLabel = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(num, cfyOpts);
         if (!autoFill) {
           var _amountLabel$split = amountLabel.split('.'),
             _amountLabel$split2 = _slicedToArray(_amountLabel$split, 2),
@@ -27101,13 +27126,14 @@ var handleNumberString = function handleNumberString(val) {
       var $xeNumberInput = this;
       var props = $xeNumberInput;
       var exponential = props.exponential,
+        roundingMode = props.roundingMode,
         autoFill = props.autoFill;
       var inpMaxLength = $xeNumberInput.computeInpMaxLength;
       var digitsValue = $xeNumberInput.computeDigitsValue;
       var decimalsType = $xeNumberInput.computeDecimalsType;
       var restVal = '';
       if (decimalsType) {
-        restVal = toFloatValueFixed(val, digitsValue);
+        restVal = toFloatValueFixed(val, digitsValue, roundingMode);
         if (!autoFill) {
           restVal = handleNumberString(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(restVal));
         }
@@ -27238,18 +27264,19 @@ var handleNumberString = function handleNumberString(val) {
       var $xeNumberInput = this;
       var props = $xeNumberInput;
       var reactData = $xeNumberInput.reactData;
-      var autoFill = props.autoFill;
+      var roundingMode = props.roundingMode,
+        autoFill = props.autoFill;
       var inputValue = reactData.inputValue;
       var digitsValue = $xeNumberInput.computeDigitsValue;
       var decimalsType = $xeNumberInput.computeDecimalsType;
       if (eqEmptyValue(val)) {
         reactData.inputValue = '';
       } else {
-        var textValue = "".concat(val);
+        var textValue = '' + val;
         if (decimalsType) {
-          textValue = toFloatValueFixed(val, digitsValue);
+          textValue = toFloatValueFixed(val, digitsValue, roundingMode);
           if (!autoFill) {
-            textValue = "".concat(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(textValue));
+            textValue = '' + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(textValue);
           }
         }
         if (textValue !== inputValue) {
@@ -27264,7 +27291,8 @@ var handleNumberString = function handleNumberString(val) {
       var $xeNumberInput = this;
       var props = $xeNumberInput;
       var reactData = $xeNumberInput.reactData;
-      var autoFill = props.autoFill;
+      var roundingMode = props.roundingMode,
+        autoFill = props.autoFill;
       var inputValue = reactData.inputValue;
       var digitsValue = $xeNumberInput.computeDigitsValue;
       var decimalsType = $xeNumberInput.computeDecimalsType;
@@ -27273,7 +27301,7 @@ var handleNumberString = function handleNumberString(val) {
           var textValue = '';
           var validValue = null;
           if (inputValue) {
-            textValue = toFloatValueFixed(inputValue, digitsValue);
+            textValue = toFloatValueFixed(inputValue, digitsValue, roundingMode);
             validValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(textValue);
             if (!autoFill) {
               textValue = "".concat(validValue);