releases 4.3.36

x-extends · Dec 17, 2024 · 9ea6929 · 9ea6929
1 parent f65dc1c
commit 9ea6929
Show file tree

Hide file tree

Showing 21 changed files with 94 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-pc-ui",
-  "version": "4.3.35",
+  "version": "4.3.36",
   "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
@@ -289,6 +289,9 @@ export default {
         }
       }
     },
+    numberInput: {
+      currencySymbol: '$'
+    },
     imagePreview: {
       popupTitle: '预览',
       operBtn: {

diff --git a/packages/language/de-DE.ts b/packages/language/de-DE.ts
@@ -289,6 +289,9 @@ export default {
         }
       }
     },
+    numberInput: {
+      currencySymbol: '$'
+    },
     imagePreview: {
       popupTitle: '预览',
       operBtn: {

diff --git a/packages/language/en-US.ts b/packages/language/en-US.ts
@@ -289,6 +289,9 @@ export default {
         }
       }
     },
+    numberInput: {
+      currencySymbol: '$'
+    },
     imagePreview: {
       popupTitle: 'Preview',
       operBtn: {

diff --git a/packages/language/es-ES.ts b/packages/language/es-ES.ts
@@ -289,6 +289,9 @@ export default {
         }
       }
     },
+    numberInput: {
+      currencySymbol: '$'
+    },
     imagePreview: {
       popupTitle: 'Preview',
       operBtn: {

diff --git a/packages/language/fr-FR.ts b/packages/language/fr-FR.ts
@@ -289,6 +289,9 @@ export default {
         }
       }
     },
+    numberInput: {
+      currencySymbol: '$'
+    },
     imagePreview: {
       popupTitle: '预览',
       operBtn: {

diff --git a/packages/language/hu-HU.ts b/packages/language/hu-HU.ts
@@ -289,6 +289,9 @@ export default {
         }
       }
     },
+    numberInput: {
+      currencySymbol: '$'
+    },
     imagePreview: {
       popupTitle: 'Előnézet',
       operBtn: {

diff --git a/packages/language/hy-AM.ts b/packages/language/hy-AM.ts
@@ -289,6 +289,9 @@ export default {
         }
       }
     },
+    numberInput: {
+      currencySymbol: '$'
+    },
     imagePreview: {
       popupTitle: '预览',
       operBtn: {

diff --git a/packages/language/ja-JP.ts b/packages/language/ja-JP.ts
@@ -289,6 +289,9 @@ export default {
         }
       }
     },
+    numberInput: {
+      currencySymbol: '$'
+    },
     imagePreview: {
       popupTitle: 'Preview',
       operBtn: {

diff --git a/packages/language/ko-KR.ts b/packages/language/ko-KR.ts
@@ -289,6 +289,9 @@ export default {
         }
       }
     },
+    numberInput: {
+      currencySymbol: '$'
+    },
     imagePreview: {
       popupTitle: '预览',
       operBtn: {

diff --git a/packages/language/nb-NO.ts b/packages/language/nb-NO.ts
@@ -289,6 +289,9 @@ export default {
         }
       }
     },
+    numberInput: {
+      currencySymbol: '$'
+    },
     imagePreview: {
       popupTitle: '预览',
       operBtn: {

diff --git a/packages/language/pt-BR.ts b/packages/language/pt-BR.ts
@@ -289,6 +289,9 @@ export default {
         }
       }
     },
+    numberInput: {
+      currencySymbol: '$'
+    },
     imagePreview: {
       popupTitle: 'Preview',
       operBtn: {

diff --git a/packages/language/ru-RU.ts b/packages/language/ru-RU.ts
@@ -289,6 +289,9 @@ export default {
         }
       }
     },
+    numberInput: {
+      currencySymbol: '$'
+    },
     imagePreview: {
       popupTitle: 'Предварительный просмотр',
       operBtn: {

diff --git a/packages/language/ug-CN.ts b/packages/language/ug-CN.ts
@@ -289,6 +289,9 @@ export default {
         }
       }
     },
+    numberInput: {
+      currencySymbol: '$'
+    },
     imagePreview: {
       popupTitle: 'كۆرۈش',
       operBtn: {

diff --git a/packages/language/uk-UA.ts b/packages/language/uk-UA.ts
@@ -289,6 +289,9 @@ export default {
         }
       }
     },
+    numberInput: {
+      currencySymbol: '$'
+    },
     imagePreview: {
       popupTitle: '预览',
       operBtn: {

diff --git a/packages/language/vi-VN.ts b/packages/language/vi-VN.ts
@@ -289,6 +289,9 @@ export default {
         }
       }
     },
+    numberInput: {
+      currencySymbol: '$'
+    },
     imagePreview: {
       popupTitle: '预览',
       operBtn: {

diff --git a/packages/language/zh-CHT.ts b/packages/language/zh-CHT.ts
@@ -289,6 +289,9 @@ export default {
         }
       }
     },
+    numberInput: {
+      currencySymbol: '￥'
+    },
     imagePreview: {
       popupTitle: '預覽',
       operBtn: {

diff --git a/packages/language/zh-CN.ts b/packages/language/zh-CN.ts
@@ -289,6 +289,9 @@ export default {
         }
       }
     },
+    numberInput: {
+      currencySymbol: '￥'
+    },
     imagePreview: {
       popupTitle: '预览',
       operBtn: {

diff --git a/packages/number-input/src/number-input.ts b/packages/number-input/src/number-input.ts
@@ -62,6 +62,14 @@ export default defineComponent({
       type: Boolean as PropType<VxeNumberInputPropTypes.Exponential>,
       default: () => getConfig().numberInput.exponential
     },
+    showCurrency: {
+      type: Boolean as PropType<VxeNumberInputPropTypes.ShowCurrency>,
+      default: () => getConfig().numberInput.showCurrency
+    },
+    currencySymbol: {
+      type: String as PropType<VxeNumberInputPropTypes.CurrencySymbol>,
+      default: () => getConfig().numberInput.currencySymbol
+    },
 
     // number、integer、float
     controls: {
@@ -234,11 +242,15 @@ export default defineComponent({
     })
 
     const computeNumLabel = computed(() => {
-      const { type } = props
+      const { type, showCurrency, currencySymbol } = props
       const { inputValue } = reactData
       const digitsValue = computeDigitsValue.value
       if (type === 'amount') {
-        return XEUtils.commafy(XEUtils.toNumber(inputValue), { digits: digitsValue })
+        const amountLabel = XEUtils.commafy(XEUtils.toNumber(inputValue), { digits: digitsValue })
+        if (showCurrency) {
+          return `${currencySymbol || getI18n('vxe.numberInput.currencySymbol') || ''}${amountLabel}`
+        }
+        return amountLabel
       }
       return XEUtils.toString(inputValue)
     })

diff --git a/types/components/number-input.d.ts b/types/components/number-input.d.ts
@@ -47,6 +47,9 @@ export namespace VxeNumberInputPropTypes {
   export type PrefixIcon = string
   export type SuffixIcon = string
 
+  export type ShowCurrency = boolean
+  export type CurrencySymbol = string | null
+
   /**
    * 请使用 AutoComplete
    * @deprecated
@@ -91,6 +94,15 @@ export interface VxeNumberInputProps {
   prefixIcon?: VxeNumberInputPropTypes.PrefixIcon
   suffixIcon?: VxeNumberInputPropTypes.SuffixIcon
 
+  /**
+   * 只对 type=amount 有效，是否显示前缀货币符号
+   */
+  showCurrency?: VxeNumberInputPropTypes.ShowCurrency
+  /**
+   * 只对 type=amount 有效，自定义货币符号
+   */
+  currencySymbol?: VxeNumberInputPropTypes.CurrencySymbol
+
   /**
    * 请使用 autoComplete
    * @deprecated

diff --git a/types/components/table.d.ts b/types/components/table.d.ts
@@ -1943,6 +1943,14 @@ export namespace VxeTablePropTypes {
      * 自定义列
      */
     columns?: VxeTableDefines.ColumnInfo[] | ExportOrPrintColumnOption[]
+    /**
+     * 指定列
+     */
+    includeFields?: string[]
+    /**
+     * 排序列
+     */
+    excludeFields?: string[]
     /**
      * 列过滤方法
      */
@@ -2052,6 +2060,14 @@ export namespace VxeTablePropTypes {
      * 自定义参数
      */
     params?: Record<string, any>
+    /**
+     * 指定列
+     */
+    includeFields?: string[]
+    /**
+     * 排序列
+     */
+    excludeFields?: string[]
     /**
      * 列过滤方法
      */