vxe-pc-ui 4.14.38 → 4.14.39

package/dist/all.esm.js

@@ -80,11 +80,11 @@ function checkDynamic() {
     }
 }
 
-const version$1 = `ui v${"4.14.38"}`;
+const version$1 = `ui v${"4.14.39"}`;
 const warnLog = log.create('warn', version$1);
 const errLog = log.create('error', version$1);
 
-const version = "4.14.38";
+const version = "4.14.39";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -6702,11 +6702,23 @@ function calcTreeLine($xeTree, node, prevNode) {
 function handleNumber(val) {
     return XEUtils.isString(val) ? val.replace(/[^0-9e.-]/g, '') : val;
 }
-function toFloatValueFixed(inputValue, digitsValue) {
-    if (/^-/.test('' + inputValue)) {
-        return XEUtils.toFixed(XEUtils.ceil(inputValue, digitsValue), digitsValue);
+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);
 }
 
 var VxeInputComponent = defineVxeComponent({
@@ -7442,7 +7454,7 @@ var VxeInputComponent = defineVxeComponent({
             const { type, exponential } = props;
             const inpMaxLength = computeInpMaxLength.value;
             const digitsValue = computeDigitsValue.value;
-            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;
             }
@@ -7628,7 +7640,7 @@ var VxeInputComponent = defineVxeComponent({
             }
             else if (type === 'float') {
                 if (inputValue) {
-                    const validValue = toFloatValueFixed(inputValue, digitsValue);
+                    const validValue = toFloatValueFixed(inputValue, digitsValue, '');
                     if (inputValue !== validValue) {
                         handleChange(validValue, { type: 'init' });
                     }
@@ -11308,6 +11320,11 @@ var VxeNumberInputComponent = defineVxeComponent({
         },
         controlConfig: Object,
         // float
+        roundingMode: {
+            type: String,
+            default: null
+        },
+        // float
         digits: {
             type: [String, Number],
             default: null
@@ -11477,12 +11494,22 @@ var VxeNumberInputComponent = defineVxeComponent({
             return type === 'integer' ? XEUtils.toInteger(handleNumber(inputValue)) : XEUtils.toNumber(handleNumber(inputValue));
         });
         const computeNumLabel = computed(() => {
-            const { type, showCurrency, currencySymbol, autoFill } = props;
+            const { type, roundingMode, showCurrency, currencySymbol, autoFill } = props;
             const { inputValue } = reactData;
             const digitsValue = computeDigitsValue.value;
             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) {
@@ -11541,13 +11568,13 @@ var VxeNumberInputComponent = defineVxeComponent({
             return `${val}`;
         };
         const getNumberValue = (val) => {
-            const { exponential, autoFill } = props;
+            const { exponential, roundingMode, autoFill } = props;
             const inpMaxLength = computeInpMaxLength.value;
             const digitsValue = computeDigitsValue.value;
             const decimalsType = computeDecimalsType.value;
             let restVal = '';
             if (decimalsType) {
-                restVal = toFloatValueFixed(val, digitsValue);
+                restVal = toFloatValueFixed(val, digitsValue, roundingMode);
                 if (!autoFill) {
                     restVal = handleNumberString(XEUtils.toNumber(restVal));
                 }
@@ -11639,7 +11666,7 @@ var VxeNumberInputComponent = defineVxeComponent({
             }
         };
         const updateModel = (val) => {
-            const { autoFill } = props;
+            const { roundingMode, autoFill } = props;
             const { inputValue } = reactData;
             const digitsValue = computeDigitsValue.value;
             const decimalsType = computeDecimalsType.value;
@@ -11647,11 +11674,11 @@ var VxeNumberInputComponent = defineVxeComponent({
                 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) {
@@ -11663,7 +11690,7 @@ var VxeNumberInputComponent = defineVxeComponent({
          * 检查初始值
          */
         const initValue = () => {
-            const { autoFill } = props;
+            const { roundingMode, autoFill } = props;
             const { inputValue } = reactData;
             const digitsValue = computeDigitsValue.value;
             const decimalsType = computeDecimalsType.value;
@@ -11672,7 +11699,7 @@ var VxeNumberInputComponent = defineVxeComponent({
                     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/input/src/input.js

@@ -741,7 +741,7 @@ export default defineVxeComponent({
             const { type, exponential } = props;
             const inpMaxLength = computeInpMaxLength.value;
             const digitsValue = computeDigitsValue.value;
-            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;
             }
@@ -927,7 +927,7 @@ export default defineVxeComponent({
             }
             else if (type === 'float') {
                 if (inputValue) {
-                    const validValue = toFloatValueFixed(inputValue, digitsValue);
+                    const validValue = toFloatValueFixed(inputValue, digitsValue, '');
                     if (inputValue !== validValue) {
                         handleChange(validValue, { type: 'init' });
                     }

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

@@ -71,6 +71,11 @@ export default defineVxeComponent({
         },
         controlConfig: Object,
         // float
+        roundingMode: {
+            type: String,
+            default: null
+        },
+        // float
         digits: {
             type: [String, Number],
             default: null
@@ -240,12 +245,22 @@ export default defineVxeComponent({
             return type === 'integer' ? XEUtils.toInteger(handleNumber(inputValue)) : XEUtils.toNumber(handleNumber(inputValue));
         });
         const computeNumLabel = computed(() => {
-            const { type, showCurrency, currencySymbol, autoFill } = props;
+            const { type, roundingMode, showCurrency, currencySymbol, autoFill } = props;
             const { inputValue } = reactData;
             const digitsValue = computeDigitsValue.value;
             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) {
@@ -304,13 +319,13 @@ export default defineVxeComponent({
             return `${val}`;
         };
         const getNumberValue = (val) => {
-            const { exponential, autoFill } = props;
+            const { exponential, roundingMode, autoFill } = props;
             const inpMaxLength = computeInpMaxLength.value;
             const digitsValue = computeDigitsValue.value;
             const decimalsType = computeDecimalsType.value;
             let restVal = '';
             if (decimalsType) {
-                restVal = toFloatValueFixed(val, digitsValue);
+                restVal = toFloatValueFixed(val, digitsValue, roundingMode);
                 if (!autoFill) {
                     restVal = handleNumberString(XEUtils.toNumber(restVal));
                 }
@@ -402,7 +417,7 @@ export default defineVxeComponent({
             }
         };
         const updateModel = (val) => {
-            const { autoFill } = props;
+            const { roundingMode, autoFill } = props;
             const { inputValue } = reactData;
             const digitsValue = computeDigitsValue.value;
             const decimalsType = computeDecimalsType.value;
@@ -410,11 +425,11 @@ export default defineVxeComponent({
                 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) {
@@ -426,7 +441,7 @@ export default defineVxeComponent({
          * 检查初始值
          */
         const initValue = () => {
-            const { autoFill } = props;
+            const { roundingMode, autoFill } = props;
             const { inputValue } = reactData;
             const digitsValue = computeDigitsValue.value;
             const decimalsType = computeDecimalsType.value;
@@ -435,7 +450,7 @@ export default defineVxeComponent({
                     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

@@ -2,9 +2,21 @@ import XEUtils from 'xe-utils';
 export function handleNumber(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 = "4.14.38";
+export const version = "4.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${"4.14.38"}`;
+const version = `ui v${"4.14.39"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3338,7 +3338,7 @@ if (typeof window !== 'undefined') {
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(4114);
 ;// ./node_modules/@vxe-ui/core/es/src/core.js
-const coreVersion = "4.4.12";
+const coreVersion = "4.4.14";
 const VxeCore = {
   coreVersion,
   uiVersion: '',
@@ -3965,7 +3965,7 @@ function createLog(type, name) {
     return msg;
   };
 }
-const version = "4.4.12";
+const version = "4.4.14";
 const log = {
   create: createLog,
   warn: createLog('warn', `v${version}`),
@@ -4646,7 +4646,7 @@ function checkDynamic() {
 }
 ;// ./packages/ui/src/log.ts
 
-const log_version = `ui v${"4.14.38"}`;
+const log_version = `ui v${"4.14.39"}`;
 const warnLog = log.create('warn', log_version);
 const errLog = log.create('error', log_version);
 ;// ./packages/ui/index.ts
@@ -4654,7 +4654,7 @@ const errLog = log.create('error', log_version);
 
 
 
-const ui_version = "4.14.38";
+const ui_version = "4.14.39";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -11895,11 +11895,22 @@ function calcTreeLine($xeTree, node, prevNode) {
 function handleNumber(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
 
@@ -12719,7 +12730,7 @@ function toFloatValueFixed(inputValue, digitsValue) {
       } = props;
       const inpMaxLength = computeInpMaxLength.value;
       const digitsValue = computeDigitsValue.value;
-      const restVal = type === 'float' ? toFloatValueFixed(val, digitsValue) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(val);
+      const 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;
       }
@@ -12944,7 +12955,7 @@ function toFloatValueFixed(inputValue, digitsValue) {
         changeValue();
       } else if (type === 'float') {
         if (inputValue) {
-          const validValue = toFloatValueFixed(inputValue, digitsValue);
+          const validValue = toFloatValueFixed(inputValue, digitsValue, '');
           if (inputValue !== validValue) {
             handleChange(validValue, {
               type: 'init'
@@ -16886,6 +16897,11 @@ function hexToRgb(str) {
     },
     controlConfig: Object,
     // float
+    roundingMode: {
+      type: String,
+      default: null
+    },
+    // float
     digits: {
       type: [String, Number],
       default: null
@@ -17071,6 +17087,7 @@ function hexToRgb(str) {
     const computeNumLabel = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const {
         type,
+        roundingMode,
         showCurrency,
         currencySymbol,
         autoFill
@@ -17081,9 +17098,17 @@ function hexToRgb(str) {
       const digitsValue = computeDigitsValue.value;
       if (type === 'amount') {
         const num = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(inputValue);
-        let amountLabel = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(num, {
+        const cfyOpts = {
           digits: digitsValue
-        });
+        };
+        if (roundingMode === 'floor') {
+          cfyOpts.floor = true;
+        } else if (roundingMode === 'ceil') {
+          cfyOpts.ceil = true;
+        } else {
+          cfyOpts.round = true;
+        }
+        let amountLabel = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(num, cfyOpts);
         if (!autoFill) {
           const [iStr, dStr] = amountLabel.split('.');
           if (dStr) {
@@ -17152,6 +17177,7 @@ function hexToRgb(str) {
     const getNumberValue = val => {
       const {
         exponential,
+        roundingMode,
         autoFill
       } = props;
       const inpMaxLength = computeInpMaxLength.value;
@@ -17159,7 +17185,7 @@ function hexToRgb(str) {
       const decimalsType = computeDecimalsType.value;
       let 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));
         }
@@ -17276,6 +17302,7 @@ function hexToRgb(str) {
     };
     const updateModel = val => {
       const {
+        roundingMode,
         autoFill
       } = props;
       const {
@@ -17286,11 +17313,11 @@ function hexToRgb(str) {
       if (eqEmptyValue(val)) {
         reactData.inputValue = '';
       } else {
-        let textValue = `${val}`;
+        let textValue = '' + val;
         if (decimalsType) {
-          textValue = toFloatValueFixed(val, digitsValue);
+          textValue = toFloatValueFixed(val, digitsValue, roundingMode);
           if (!autoFill) {
-            textValue = `${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) {
@@ -17303,6 +17330,7 @@ function hexToRgb(str) {
      */
     const initValue = () => {
       const {
+        roundingMode,
         autoFill
       } = props;
       const {
@@ -17315,7 +17343,7 @@ function hexToRgb(str) {
           let textValue = '';
           let 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 = `${validValue}`;