releases 4.3.23

x-extends · Dec 9, 2024 · 57b0ec1 · 57b0ec1
1 parent c52d0ef
commit 57b0ec1
Show file tree

Hide file tree

Showing 20 changed files with 62 additions and 31 deletions.
diff --git a/examples/views/number-input/NumberInputTest.vue b/examples/views/number-input/NumberInputTest.vue
@@ -45,6 +45,9 @@
     <p>
       <vxe-number-input v-model="demo1.value700" readonly></vxe-number-input>
     </p>
+    <p>
+      <vxe-number-input v-model="demo1.value800" type="amount"></vxe-number-input>
+    </p>
   </div>
 </template>
 
@@ -70,7 +73,8 @@ const demo1 = reactive({
   value601: null,
   value602: null,
   value603: null,
-  value700: 1234
+  value700: 1234,
+  value800: null
 })
 </script>
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-pc-ui",
-  "version": "4.3.22",
+  "version": "4.3.23",
   "description": "A vue based PC component library",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

diff --git a/packages/language/ar-EG.ts b/packages/language/ar-EG.ts
@@ -48,7 +48,7 @@ export default {
       impFields: '导入失败，请检查字段名和数据格式是否正确',
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级的数据',
-      treeDragChild: '父级数据不能拖拽到子级中',
+      treeDragChild: '父级数据不能拖拽到自己的子级中',
       reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {

diff --git a/packages/language/de-DE.ts b/packages/language/de-DE.ts
@@ -48,7 +48,7 @@ export default {
       impFields: '导入失败，请检查字段名和数据格式是否正确',
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级的数据',
-      treeDragChild: '父级数据不能拖拽到子级中',
+      treeDragChild: '父级数据不能拖拽到自己的子级中',
       reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {

diff --git a/packages/language/es-ES.ts b/packages/language/es-ES.ts
@@ -47,8 +47,8 @@ export default {
       notExp: 'El navegador no es compatible con la importación / exportación.',
       impFields: 'Error de importación, por favor revise que el nombre del campo y el formato de datos sean correctos.',
       treeNotImp: 'La tabla de árbol no soporta importación.',
-      treeCrossDrag: '只能拖拽第一层级的数据',
-      treeDragChild: '父级数据不能拖拽到子级中',
+      treeCrossDrag: 'Only the first level of data can be dragged',
+      treeDragChild: 'Parent data cannot be dragged into its own child',
       reqPlugin: 'Optional extension "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {

diff --git a/packages/language/fr-FR.ts b/packages/language/fr-FR.ts
@@ -48,7 +48,7 @@ export default {
       impFields: '导入失败，请检查字段名和数据格式是否正确',
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级的数据',
-      treeDragChild: '父级数据不能拖拽到子级中',
+      treeDragChild: '父级数据不能拖拽到自己的子级中',
       reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {

diff --git a/packages/language/hu-HU.ts b/packages/language/hu-HU.ts
@@ -48,7 +48,7 @@ export default {
       impFields: 'Az importálás nem sikerült, ellenőrizze, hogy a mezőnév és az adatformátum helyes-e',
       treeNotImp: 'A fatáblák nem támogatják az importálást',
       treeCrossDrag: '只能拖拽第一层级的数据',
-      treeDragChild: '父级数据不能拖拽到子级中',
+      treeDragChild: '父级数据不能拖拽到自己的子级中',
       reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {

diff --git a/packages/language/hy-AM.ts b/packages/language/hy-AM.ts
@@ -48,7 +48,7 @@ export default {
       impFields: '导入失败，请检查字段名和数据格式是否正确',
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级的数据',
-      treeDragChild: '父级数据不能拖拽到子级中',
+      treeDragChild: '父级数据不能拖拽到自己的子级中',
       reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {

diff --git a/packages/language/ja-JP.ts b/packages/language/ja-JP.ts
@@ -48,7 +48,7 @@ export default {
       impFields: 'インポートに失敗しました。フィールド名とデータ形式を確認してください',
       treeNotImp: 'ツリーテーブルはインポートをサポートしていません',
       treeCrossDrag: '只能拖拽第一层级的数据',
-      treeDragChild: '父级数据不能拖拽到子级中',
+      treeDragChild: '父级数据不能拖拽到自己的子级中',
       reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {

diff --git a/packages/language/ko-KR.ts b/packages/language/ko-KR.ts
@@ -48,7 +48,7 @@ export default {
       impFields: '导入失败，请检查字段名和数据格式是否正确',
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级的数据',
-      treeDragChild: '父级数据不能拖拽到子级中',
+      treeDragChild: '父级数据不能拖拽到自己的子级中',
       reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {

diff --git a/packages/language/nb-NO.ts b/packages/language/nb-NO.ts
@@ -48,7 +48,7 @@ export default {
       impFields: '导入失败，请检查字段名和数据格式是否正确',
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级的数据',
-      treeDragChild: '父级数据不能拖拽到子级中',
+      treeDragChild: '父级数据不能拖拽到自己的子级中',
       reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {

diff --git a/packages/language/pt-BR.ts b/packages/language/pt-BR.ts
@@ -48,7 +48,7 @@ export default {
       impFields: 'Falha na importação, verifique se o nome do campo e o formato dos dados estão corretos.',
       treeNotImp: 'A tabela de árvore não suporta importação.',
       treeCrossDrag: '只能拖拽第一层级的数据',
-      treeDragChild: '父级数据不能拖拽到子级中',
+      treeDragChild: '父级数据不能拖拽到自己的子级中',
       reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {

diff --git a/packages/language/ru-RU.ts b/packages/language/ru-RU.ts
@@ -48,7 +48,7 @@ export default {
       impFields: 'Не удалось выполнить импорт. Проверьте правильность имени поля и формата данных.',
       treeNotImp: 'Древовидные таблицы не поддерживают импорт.',
       treeCrossDrag: '只能拖拽第一层级的数据',
-      treeDragChild: '父级数据不能拖拽到子级中',
+      treeDragChild: '父级数据不能拖拽到自己的子级中',
       reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {

diff --git a/packages/language/ug-CN.ts b/packages/language/ug-CN.ts
@@ -48,7 +48,7 @@ export default {
       impFields: 'ئەكىرىشى مەغلۇپ بولدى،سۆز ھەم ئۇچۇر فورماتىنى تەكشۈرۈڭ',
       treeNotImp: 'دەرەخ شەكىللىك جەدىۋەلنى ئەكىرىشنى قوللىمايدۇ',
       treeCrossDrag: '只能拖拽第一层级的数据',
-      treeDragChild: '父级数据不能拖拽到子级中',
+      treeDragChild: '父级数据不能拖拽到自己的子级中',
       reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {

diff --git a/packages/language/uk-UA.ts b/packages/language/uk-UA.ts
@@ -48,7 +48,7 @@ export default {
       impFields: '导入失败，请检查字段名和数据格式是否正确',
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级的数据',
-      treeDragChild: '父级数据不能拖拽到子级中',
+      treeDragChild: '父级数据不能拖拽到自己的子级中',
       reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {

diff --git a/packages/language/vi-VN.ts b/packages/language/vi-VN.ts
@@ -48,7 +48,7 @@ export default {
       impFields: '导入失败，请检查字段名和数据格式是否正确',
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级的数据',
-      treeDragChild: '父级数据不能拖拽到子级中',
+      treeDragChild: '父级数据不能拖拽到自己的子级中',
       reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {

diff --git a/packages/language/zh-CHT.ts b/packages/language/zh-CHT.ts
@@ -48,7 +48,7 @@ export default {
       impFields: '匯入失敗，請檢查欄位名稱和資料格式是否正確',
       treeNotImp: '樹表格不支援導入',
       treeCrossDrag: '只能拖拽第一层级的数据',
-      treeDragChild: '父级数据不能拖拽到子级中',
+      treeDragChild: '父级数据不能拖拽到自己的子级中',
       reqPlugin: '可選擴展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {

diff --git a/packages/language/zh-CN.ts b/packages/language/zh-CN.ts
@@ -48,7 +48,7 @@ export default {
       impFields: '导入失败，请检查字段名和数据格式是否正确',
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级的数据',
-      treeDragChild: '父级数据不能拖拽到子级中',
+      treeDragChild: '父级数据不能拖拽到自己的子级中',
       reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {

diff --git a/packages/number-input/src/number-input.ts b/packages/number-input/src/number-input.ts
@@ -72,7 +72,7 @@ export default defineComponent({
     // float
     digits: {
       type: [String, Number] as PropType<VxeNumberInputPropTypes.Digits>,
-      default: () => getConfig().numberInput.digits
+      default: null
     },
 
     prefixIcon: String as PropType<VxeNumberInputPropTypes.PrefixIcon>,
@@ -110,6 +110,7 @@ export default defineComponent({
     const { computeSize } = useSize(props)
 
     const reactData = reactive<NumberInputReactData>({
+      isFocus: false,
       isActivated: false,
       inputValue: props.modelValue
     })
@@ -161,16 +162,32 @@ export default defineComponent({
     })
 
     const computeDigitsValue = computed(() => {
-      return XEUtils.toInteger(props.digits) || 1
+      const { type, digits } = props
+      let defDigits: any = digits
+      if (defDigits === null) {
+        defDigits = getConfig().numberInput.digits
+        if (defDigits === null) {
+          if (type === 'amount') {
+            defDigits = 2
+          }
+        }
+      }
+      return XEUtils.toInteger(defDigits) || 1
+    })
+
+    const computeDecimalsType = computed(() => {
+      const { type } = props
+      return type === 'float' || type === 'amount'
     })
 
     const computeStepValue = computed(() => {
       const { type } = props
       const digitsValue = computeDigitsValue.value
+      const decimalsType = computeDecimalsType.value
       const step = props.step
       if (type === 'integer') {
         return XEUtils.toInteger(step) || 1
-      } else if (type === 'float') {
+      } else if (decimalsType) {
         return XEUtils.toNumber(step) || (1 / Math.pow(10, digitsValue))
       }
       return XEUtils.toNumber(step) || 1
@@ -205,8 +222,8 @@ export default defineComponent({
     })
 
     const computeInpImmediate = computed(() => {
-      const { type, immediate } = props
-      return immediate || !(type === 'number' || type === 'integer' || type === 'float')
+      const { immediate } = props
+      return immediate
     })
 
     const computeNumValue = computed(() => {
@@ -216,7 +233,12 @@ export default defineComponent({
     })
 
     const computeNumLabel = computed(() => {
+      const { type } = props
       const { inputValue } = reactData
+      const digitsValue = computeDigitsValue.value
+      if (type === 'amount') {
+        return XEUtils.commafy(XEUtils.toNumber(inputValue), { digits: digitsValue })
+      }
       return XEUtils.toString(inputValue)
     })
 
@@ -250,10 +272,11 @@ export default defineComponent({
     }
 
     const getNumberValue = (val: any) => {
-      const { type, exponential } = props
+      const { exponential } = props
       const inpMaxLength = computeInpMaxLength.value
       const digitsValue = computeDigitsValue.value
-      const restVal = (type === 'float' ? toFloatValueFixed(val, digitsValue) : handleNumberString(val))
+      const decimalsType = computeDecimalsType.value
+      const restVal = (decimalsType ? toFloatValueFixed(val, digitsValue) : handleNumberString(val))
       if (exponential && (val === restVal || handleNumberString(val).toLowerCase() === XEUtils.toNumber(restVal).toExponential())) {
         return val
       }
@@ -311,6 +334,7 @@ export default defineComponent({
     }
 
     const focusEvent = (evnt: Event & { type: 'focus' }) => {
+      reactData.isFocus = true
       reactData.isActivated = true
       triggerEvent(evnt)
     }
@@ -341,10 +365,10 @@ export default defineComponent({
      * 检查初始值
      */
     const initValue = () => {
-      const { type } = props
       const { inputValue } = reactData
       const digitsValue = computeDigitsValue.value
-      if (type === 'float') {
+      const decimalsType = computeDecimalsType.value
+      if (decimalsType) {
         if (inputValue) {
           let textValue = ''
           let validValue: number | null = null
@@ -409,6 +433,7 @@ export default defineComponent({
         handleChange(value, handleNumberString(inputValue), evnt)
       }
       afterCheckValue()
+      reactData.isFocus = false
       reactData.isActivated = false
       numberInputMethods.dispatchEvent('blur', { value }, evnt)
       // 自动更新校验状态
@@ -738,7 +763,7 @@ export default defineComponent({
 
     const renderVN = () => {
       const { className, controls, type, align, name, autocomplete, autoComplete } = props
-      const { inputValue, isActivated } = reactData
+      const { inputValue, isFocus, isActivated } = reactData
       const vSize = computeSize.value
       const isDisabled = computeIsDisabled.value
       const formReadonly = computeFormReadonly.value
@@ -776,7 +801,7 @@ export default defineComponent({
           h('input', {
             ref: refInputTarget,
             class: 'vxe-number-input--inner',
-            value: inputValue,
+            value: !isFocus && type === 'amount' ? numLabel : inputValue,
             name,
             type: 'text',
             placeholder: inpPlaceholder,
@@ -819,6 +844,7 @@ export default defineComponent({
     })
 
     onBeforeUnmount(() => {
+      reactData.isFocus = false
       numberStopDown()
       afterCheckValue()
       globalEvents.off($xeNumberInput, 'mousedown')

diff --git a/types/components/number-input.d.ts b/types/components/number-input.d.ts
@@ -28,7 +28,7 @@ export namespace VxeNumberInputPropTypes {
   export type ClassName = string
   export type Immediate = boolean
   export type Name = string
-  export type Type = 'number' | 'integer' | 'float'
+  export type Type = 'number' | 'integer' | 'float' | 'amount'
   export type Clearable = boolean
   export type Readonly = boolean
   export type Disabled = boolean
@@ -108,6 +108,7 @@ export interface NumberInputPrivateComputed {
 export interface VxeNumberInputPrivateComputed extends NumberInputPrivateComputed { }
 
 export interface NumberInputReactData {
+  isFocus: boolean
   isActivated: boolean
   inputValue: VxeNumberInputPropTypes.ModelValue | undefined
 }