vxe-pc-ui 4.14.37 → 4.14.39

package/packages/number-input/src/number-input.ts

@@ -1,6 +1,6 @@
 import { h, ref, Ref, computed, reactive, inject, nextTick, watch, onMounted, onBeforeUnmount, PropType } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
-import XEUtils from 'xe-utils'
+import XEUtils, { CommafyOptions } from 'xe-utils'
 import { getConfig, getIcon, getI18n, globalEvents, GLOBAL_EVENT_KEYS, createEvent, useSize, renderEmptyElement } from '../../ui'
 import { getFuncText, eqEmptyValue, isEnableConf } from '../../ui/src/utils'
 import { hasClass, getEventTargetNode, hasControlKey } from '../../ui/src/dom'
@@ -75,6 +75,11 @@ export default defineVxeComponent({
     },
     controlConfig: Object as PropType<VxeNumberInputPropTypes.ControlConfig>,
 
+    // float
+    roundingMode: {
+      type: String as PropType<VxeNumberInputPropTypes.RoundingMode>,
+      default: null
+    },
     // float
     digits: {
       type: [String, Number] as PropType<VxeNumberInputPropTypes.Digits>,
@@ -268,12 +273,20 @@ export default defineVxeComponent({
     })
 
     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: CommafyOptions = { 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) {
@@ -340,13 +353,13 @@ export default defineVxeComponent({
     }
 
     const getNumberValue = (val: any) => {
-      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))
         }
@@ -446,18 +459,18 @@ export default defineVxeComponent({
     }
 
     const updateModel = (val: any) => {
-      const { autoFill } = props
+      const { roundingMode, autoFill } = props
       const { inputValue } = reactData
       const digitsValue = computeDigitsValue.value
       const decimalsType = computeDecimalsType.value
       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 = `${XEUtils.toNumber(textValue)}`
+            textValue = '' + XEUtils.toNumber(textValue)
           }
         }
         if (textValue !== inputValue) {
@@ -470,7 +483,7 @@ export default defineVxeComponent({
      * 检查初始值
      */
     const initValue = () => {
-      const { autoFill } = props
+      const { roundingMode, autoFill } = props
       const { inputValue } = reactData
       const digitsValue = computeDigitsValue.value
       const decimalsType = computeDecimalsType.value
@@ -479,7 +492,7 @@ export default defineVxeComponent({
           let textValue = ''
           let validValue: number | null = null
           if (inputValue) {
-            textValue = toFloatValueFixed(inputValue, digitsValue)
+            textValue = toFloatValueFixed(inputValue, digitsValue, roundingMode)
             validValue = XEUtils.toNumber(textValue)
             if (!autoFill) {
               textValue = `${validValue}`

package/packages/number-input/src/util.ts

@@ -1,12 +1,25 @@
 import XEUtils from 'xe-utils'
 
+import type { VxeNumberInputPropTypes } from '../../../types'
+
 export function handleNumber (val: string | number | null | undefined) {
   return XEUtils.isString(val) ? val.replace(/[^0-9e.-]/g, '') : val
 }
 
-export function toFloatValueFixed (inputValue: string | number, digitsValue: number) {
-  if (/^-/.test('' + inputValue)) {
-    return XEUtils.toFixed(XEUtils.ceil(inputValue, digitsValue), digitsValue)
+export function toFloatValueFixed (inputValue: string | number, digitsValue: number, roundingMode: VxeNumberInputPropTypes.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/types/components/number-input.d.ts

@@ -68,6 +68,13 @@ export namespace VxeNumberInputPropTypes {
      */
     layout?: 'left' | 'right' | 'default' | ''
   }
+  /**
+   * 小数位数处理时的舍入方式
+   */
+  export type RoundingMode = 'round' | 'ceil' | 'floor' | 'default' | '' | null
+  /**
+   * 保留小数位数
+   */
   export type Digits = string | number | null
   export type AutoFill = boolean
   export type Editable = boolean
@@ -146,7 +153,11 @@ export interface VxeNumberInputProps {
   controlConfig?: VxeNumberInputPropTypes.ControlConfig
 
   /**
-   * 小数位数
+   * 小数位数处理时的舍入方式
+   */
+  roundingMode?: VxeNumberInputPropTypes.RoundingMode
+  /**
+   * 保留小数位数
    */
   digits?: VxeNumberInputPropTypes.Digits
   /**

package/types/components/table.d.ts

@@ -2968,13 +2968,7 @@ export namespace VxeTablePropTypes {
     field?: string
   }
 
-  /**
-   * 导出参数
-   */
-  export interface ExportConfig {
-    // 内置属性
-    _typeMaps?: Record<string, number>
-
+  interface ExportAndPrintConfig {
     /**
      * 文件名
      */
@@ -2993,14 +2987,6 @@ export namespace VxeTablePropTypes {
       $gantt: VxeGanttConstructor | null | undefined
       options: ExportOpts
     }) => string)
-    /**
-     * 文件类型
-     */
-    type?: string
-    /**
-     * 可选文件类型列表
-     */
-    types?: string[]
     /**
      * 导出数据的方式
      */
@@ -3092,6 +3078,37 @@ export namespace VxeTablePropTypes {
       items: any[]
       $rowIndex: number
     }): boolean
+    /**
+     * 自定义参数
+     */
+    params?: Record<string, any>
+
+    /**
+     * 自定义高级导出窗口的插槽模板
+     */
+    slots?: {
+      top?: string | ((params: VxeTableDefines.ExtortSlotParams) => VxeComponentSlotType | VxeComponentSlotType[])
+      bottom?: string | ((params: VxeTableDefines.ExtortSlotParams) => VxeComponentSlotType | VxeComponentSlotType[])
+      default?: string | ((params: VxeTableDefines.ExtortSlotParams) => VxeComponentSlotType | VxeComponentSlotType[])
+      footer?: string | ((params: VxeTableDefines.ExtortSlotParams) => VxeComponentSlotType | VxeComponentSlotType[])
+      parameter?: string | ((params: VxeTableDefines.ExtortSlotParams) => VxeComponentSlotType | VxeComponentSlotType[])
+    }
+  }
+
+  /**
+   * 导出参数
+   */
+  export interface ExportConfig extends ExportAndPrintConfig {
+    // 内置属性
+    _typeMaps?: Record<string, number>
+    /**
+     * 文件类型
+     */
+    type?: string
+    /**
+     * 可选文件类型列表
+     */
+    types?: string[]
     /**
      * 是否服务端导出
      */
@@ -3101,10 +3118,6 @@ export namespace VxeTablePropTypes {
      */
     useStyle?: boolean
     sheetMethod?(params: VxeTableDefines.ExtortSheetMethodParams): void
-    /**
-     * 自定义参数
-     */
-    params?: Record<string, any>
     /**
      * 只对 remote=true 有效，用于自定义导出逻辑
      */
@@ -3127,17 +3140,6 @@ export namespace VxeTablePropTypes {
       status: boolean
       options: ExportHandleOptions
     }): void
-
-    /**
-     * 自定义高级导出窗口的插槽模板
-     */
-    slots?: {
-      top?: string | ((params: VxeTableDefines.ExtortSlotParams) => VxeComponentSlotType | VxeComponentSlotType[])
-      bottom?: string | ((params: VxeTableDefines.ExtortSlotParams) => VxeComponentSlotType | VxeComponentSlotType[])
-      default?: string | ((params: VxeTableDefines.ExtortSlotParams) => VxeComponentSlotType | VxeComponentSlotType[])
-      footer?: string | ((params: VxeTableDefines.ExtortSlotParams) => VxeComponentSlotType | VxeComponentSlotType[])
-      parameter?: string | ((params: VxeTableDefines.ExtortSlotParams) => VxeComponentSlotType | VxeComponentSlotType[])
-    }
   }
   export interface ExportOpts extends ExportConfig { }
   export interface ExportHandleOptions extends Exclude<ExportConfig, 'filename' | 'sheetName'> {
@@ -3163,47 +3165,7 @@ export namespace VxeTablePropTypes {
   /**
    * 打印参数
    */
-  export interface PrintConfig {
-    /**
-     * 表名
-     */
-    sheetName?: string | ((params: {
-      $table: VxeTableConstructor
-      $grid: VxeGridConstructor | null | undefined
-      $gantt: VxeGanttConstructor | null | undefined
-      options: ExportOpts
-    }) => string)
-    /**
-     * 导出数据的方式
-     */
-    mode?: string
-    /**
-     * 导出数据的方式列表
-     */
-    modes?: (string | {
-      label?: string | number
-      value: string | number
-    })[]
-    /**
-     * 是否为源数据
-     */
-    original?: boolean
-    /**
-     * 是否需要表头
-     */
-    isHeader?: boolean
-    /**
-     * 是否需要表尾
-     */
-    isFooter?: boolean
-    /**
-     * 自定义数据
-     */
-    data?: any[]
-    /**
-     * 自定义列
-     */
-    columns?: VxeTableDefines.ColumnInfo[] | ExportOrPrintColumnOption[]
+  export interface PrintConfig extends ExportAndPrintConfig {
     /**
      * 打印样式
      */
@@ -3212,48 +3174,6 @@ export namespace VxeTablePropTypes {
      * 自定义打印内容
      */
     html?: string
-    /**
-     * 自定义参数
-     */
-    params?: Record<string, any>
-    /**
-     * 指定列
-     */
-    includeFields?: string[]
-    /**
-     * 排除列
-     */
-    excludeFields?: string[]
-    /**
-     * 列过滤方法
-     */
-    columnFilterMethod?(params: {
-      $table: VxeTableConstructor
-      $grid: VxeGridConstructor | null | undefined
-      $gantt: VxeGanttConstructor | null | undefined
-      column: VxeTableDefines.ColumnInfo
-      $columnIndex: number
-    }): boolean
-    /**
-     * 数据过滤方法
-     */
-    dataFilterMethod?(params: {
-      $table: VxeTableConstructor
-      $grid: VxeGridConstructor | null | undefined
-      $gantt: VxeGanttConstructor | null | undefined
-      row: any
-      $rowIndex: number
-    }): boolean
-    /**
-     * 表尾过滤方法
-     */
-    footerFilterMethod?(params: {
-      $table: VxeTableConstructor
-      $grid: VxeGridConstructor | null | undefined
-      $gantt: VxeGanttConstructor | null | undefined
-      items: any[]
-      $rowIndex: number
-    }): boolean
     /**
      * 打印之前的方法，可以通过返回自定义打印的内容
      */
@@ -3271,17 +3191,6 @@ export namespace VxeTablePropTypes {
       content: string
     }): string
 
-    /**
-     * 自定义高级导出窗口的插槽模板
-     */
-    slots?: {
-      top?: string | ((params: VxeTableDefines.PrintSlotParams) => VxeComponentSlotType | VxeComponentSlotType[])
-      bottom?: string | ((params: VxeTableDefines.PrintSlotParams) => VxeComponentSlotType | VxeComponentSlotType[])
-      default?: string | ((params: VxeTableDefines.PrintSlotParams) => VxeComponentSlotType | VxeComponentSlotType[])
-      footer?: string | ((params: VxeTableDefines.PrintSlotParams) => VxeComponentSlotType | VxeComponentSlotType[])
-      parameter?: string | ((params: VxeTableDefines.PrintSlotParams) => VxeComponentSlotType | VxeComponentSlotType[])
-    }
-
     /**
      * 已被 html 替换
      * @deprecated