vxe-pc-ui 3.3.37 → 3.3.39

package/lib/index.umd.js

@@ -12370,6 +12370,9 @@ setTheme();
         }
       }
     },
+    numberInput: {
+      currencySymbol: '￥'
+    },
     imagePreview: {
       popupTitle: '预览',
       operBtn: {
@@ -12859,7 +12862,7 @@ function handleBooleanDefaultValue(value) {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-var log_version = "ui v".concat("3.3.37");
+var log_version = "ui v".concat("3.3.39");
 var warnLog = log.create('warn', log_version);
 var errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
@@ -12867,7 +12870,7 @@ var errLog = log.create('error', log_version);
 
 
 
-var ui_version = "3.3.37";
+var ui_version = "3.3.39";
 index_esm_VxeUI.version = ui_version;
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.tableVersion = '';
@@ -33765,6 +33768,7 @@ var NoticeBar = VxeNoticeBar;
 
 
 
+
 var handleNumberString = function handleNumberString(val) {
   if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(val)) {
     return '';
@@ -33835,6 +33839,18 @@ var handleNumberString = function handleNumberString(val) {
         return getConfig().numberInput.exponential;
       }
     },
+    showCurrency: {
+      type: Boolean,
+      default: function _default() {
+        return getConfig().numberInput.showCurrency;
+      }
+    },
+    currencySymbol: {
+      type: String,
+      default: function _default() {
+        return getConfig().numberInput.currencySymbol;
+      }
+    },
     // number、integer、float
     controls: {
       type: Boolean,
@@ -33994,13 +34010,19 @@ var handleNumberString = function handleNumberString(val) {
       var $xeNumberInput = this;
       var props = $xeNumberInput;
       var reactData = $xeNumberInput.reactData;
-      var type = props.type;
+      var type = props.type,
+        showCurrency = props.showCurrency,
+        currencySymbol = props.currencySymbol;
       var inputValue = reactData.inputValue;
       var digitsValue = $xeNumberInput.computeDigitsValue;
       if (type === 'amount') {
-        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(inputValue), {
+        var amountLabel = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(inputValue), {
           digits: digitsValue
         });
+        if (showCurrency) {
+          return "".concat(currencySymbol || getI18n('vxe.numberInput.currencySymbol') || '').concat(amountLabel);
+        }
+        return amountLabel;
       }
       return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toString(inputValue);
     },
@@ -45379,12 +45401,14 @@ function handleTransferFiles(items) {
 function showDropTip($xeUpload, evnt, dragEl, dragPos) {
   var xID = $xeUpload.xID;
   var reactData = $xeUpload.reactData;
+  var showMorePopup = reactData.showMorePopup;
   var el = $xeUpload.$refs.refElem;
-  if (!el) {
+  var popupEl = document.getElementById("refPopupElem".concat(xID));
+  var wrapperEl = showMorePopup ? popupEl : el;
+  if (!wrapperEl) {
     return;
   }
-  var showMorePopup = reactData.showMorePopup;
-  var wrapperRect = el.getBoundingClientRect();
+  var wrapperRect = wrapperEl.getBoundingClientRect();
   var ddLineEl = $xeUpload.$refs.refDragLineElem;
   var mdLineEl = document.getElementById("refModalDragLineElem".concat(xID));
   var currDLineEl = showMorePopup ? mdLineEl : ddLineEl;
@@ -46381,6 +46405,9 @@ function hideDropTip($xeUpload) {
                 ons.drop = $xeUpload.handleUploadDropEvent;
               }
               return h('div', {
+                attrs: {
+                  id: "refPopupElem".concat(xID)
+                },
                 class: ['vxe-upload--more-popup', {
                   'is--readonly': formReadonly,
                   'is--disabled': isDisabled,
@@ -46996,7 +47023,7 @@ function hideDropTip($xeUpload) {
         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);