vxe-pc-ui 3.3.37 → 3.3.39

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

@@ -77,6 +77,14 @@ export default defineVxeComponent({
       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: {
@@ -253,11 +261,15 @@ export default defineVxeComponent({
       const props = $xeNumberInput
       const reactData = $xeNumberInput.reactData
 
-      const { type } = props
+      const { type, showCurrency, currencySymbol } = props
       const { inputValue } = reactData
       const digitsValue = $xeNumberInput.computeDigitsValue
       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)
     },

package/packages/upload/src/upload.ts

@@ -3,7 +3,7 @@ import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { VxeUI, getConfig, getI18n, getIcon, globalMixins, createEvent, globalEvents, renderEmptyElement } from '../../ui'
 import { getSlotVNs } from '../..//ui/src/vn'
-import { errLog } from '../../ui/src/log'
+import { errLog, warnLog } from '../../ui/src/log'
 import { tpImg, getEventTargetNode, toCssUnit } from '../../ui/src/dom'
 import { readLocalFile } from './util'
 import VxeButtonComponent from '../../button/src/button'
@@ -30,12 +30,14 @@ function showDropTip ($xeUpload: VxeUploadConstructor, evnt: DragEvent, dragEl:
 
   const reactData = $xeUpload.reactData
 
+  const { showMorePopup } = reactData
   const el = $xeUpload.$refs.refElem as HTMLDivElement
-  if (!el) {
+  const popupEl = document.getElementById(`refPopupElem${xID}`) as HTMLDivElement
+  const wrapperEl = showMorePopup ? popupEl : el
+  if (!wrapperEl) {
     return
   }
-  const { showMorePopup } = reactData
-  const wrapperRect = el.getBoundingClientRect()
+  const wrapperRect = wrapperEl.getBoundingClientRect()
   const ddLineEl = $xeUpload.$refs.refDragLineElem as HTMLDivElement
   const mdLineEl = document.getElementById(`refModalDragLineElem${xID}`) as HTMLDivElement
   const currDLineEl = showMorePopup ? mdLineEl : ddLineEl
@@ -1018,6 +1020,9 @@ export default defineVxeComponent({
               }
 
               return h('div', {
+                attrs: {
+                  id: `refPopupElem${xID}`
+                },
                 class: ['vxe-upload--more-popup', {
                   'is--readonly': formReadonly,
                   'is--disabled': isDisabled,
@@ -1776,7 +1781,7 @@ export default defineVxeComponent({
         errLog('vxe.error.errConflicts', ['multiple', 'single-mode'])
       }
       if (props.imageStyle) {
-        errLog('vxe.error.delProp', ['image-style', 'image-config'])
+        warnLog('vxe.error.delProp', ['image-style', 'image-config'])
       }
     }
     globalEvents.on($xeUpload, 'paste', $xeUpload.handleGlobalPasteEvent)

package/styles/components/upload.scss

@@ -82,8 +82,7 @@
   flex-direction: row;
   align-items: center;
   line-height: 1.5em;
-  margin-bottom: var(--vxe-ui-layout-padding-half);
-  padding: 0.1em var(--vxe-ui-layout-padding-half);
+  padding: var(--vxe-ui-layout-padding-half);
   &:hover {
     background-color: var(--vxe-ui-base-hover-background-color);
     &:not(.is--loading) {

package/types/components/number-input.d.ts

@@ -40,6 +40,9 @@ export namespace VxeNumberInputPropTypes {
   export type PrefixIcon = string
   export type SuffixIcon = string
 
+  export type ShowCurrency = boolean
+  export type CurrencySymbol = string | null
+
   /**
    * 请使用 AutoComplete
    * @deprecated
@@ -84,6 +87,15 @@ export interface VxeNumberInputProps {
   prefixIcon?: VxeNumberInputPropTypes.PrefixIcon
   suffixIcon?: VxeNumberInputPropTypes.SuffixIcon
 
+  /**
+   * 只对 type=amount 有效，是否显示前缀货币符号
+   */
+  showCurrency?: VxeNumberInputPropTypes.ShowCurrency
+  /**
+   * 只对 type=amount 有效，自定义货币符号
+   */
+  currencySymbol?: VxeNumberInputPropTypes.CurrencySymbol
+
   /**
    * 请使用 autoComplete
    * @deprecated

package/types/components/table.d.ts

@@ -1908,6 +1908,14 @@ export namespace VxeTablePropTypes {
      * 自定义列
      */
     columns?: VxeTableDefines.ColumnInfo[] | ExportOrPrintColumnOption[]
+    /**
+     * 指定列
+     */
+    includeFields?: string[]
+    /**
+     * 排序列
+     */
+    excludeFields?: string[]
     /**
      * 列过滤方法
      */
@@ -2017,6 +2025,14 @@ export namespace VxeTablePropTypes {
      * 自定义参数
      */
     params?: Record<string, any>
+    /**
+     * 指定列
+     */
+    includeFields?: string[]
+    /**
+     * 排序列
+     */
+    excludeFields?: string[]
     /**
      * 列过滤方法
      */