vxe-pc-ui 3.3.49 → 3.3.51

package/lib/index.umd.js

@@ -12874,7 +12874,7 @@ function handleBooleanDefaultValue(value) {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-var log_version = "ui v".concat("3.3.49");
+var log_version = "ui v".concat("3.3.51");
 var warnLog = log.create('warn', log_version);
 var errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
@@ -12882,7 +12882,7 @@ var errLog = log.create('error', log_version);
 
 
 
-var ui_version = "3.3.49";
+var ui_version = "3.3.51";
 index_esm_VxeUI.version = ui_version;
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.tableVersion = '';
@@ -13560,7 +13560,20 @@ var es_string_match = __webpack_require__(1761);
 
 
 var dom_browse = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().browse();
-var tpImg = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
+var tpImgEl;
+function initTpImg() {
+  if (!tpImgEl) {
+    tpImgEl = new Image();
+    tpImgEl.src = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
+  }
+  return tpImgEl;
+}
+function getTpImg() {
+  if (!tpImgEl) {
+    return initTpImg();
+  }
+  return tpImgEl;
+}
 var reClsMap = {};
 function getClsRE(cls) {
   if (!reClsMap[cls]) {
@@ -47088,6 +47101,9 @@ function hideDropTip($xeUpload) {
     formItemInfo: {
       from: 'xeFormItemInfo',
       default: null
+    },
+    $xeTable: {
+      default: null
     }
   },
   data: function data() {
@@ -47315,8 +47331,9 @@ function hideDropTip($xeUpload) {
       var fileList = value ? (value ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(value) ? value : [value] : []).map(function (item) {
         if (!item || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(item)) {
           var url = "".concat(item || '');
-          var _name = $xeUpload.parseFileName(url);
-          return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, nameProp, _name), typeProp, $xeUpload.parseFileType(_name)), urlProp, url), sizeProp, 0), keyField, getUniqueKey());
+          var urlObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().parseUrl(item);
+          var _name = (urlObj ? urlObj.searchQuery[nameProp] : '') || $xeUpload.parseFileName(url);
+          return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, nameProp, _name), typeProp, (urlObj ? urlObj.searchQuery[typeProp] : '') || $xeUpload.parseFileType(_name)), urlProp, url), sizeProp, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(urlObj ? urlObj.searchQuery[sizeProp] : 0) || 0), keyField, getUniqueKey());
         }
         var name = item[nameProp] || '';
         item[nameProp] = name;
@@ -47344,10 +47361,18 @@ function hideDropTip($xeUpload) {
       var singleMode = props.singleMode,
         urlMode = props.urlMode;
       var urlProp = $xeUpload.computeUrlProp;
+      var nameProp = $xeUpload.computeNameProp;
       var restList = value ? value.slice(0) : [];
       if (urlMode) {
         restList = restList.map(function (item) {
-          return item[urlProp];
+          var url = item[urlProp];
+          if (url) {
+            var urlObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().parseUrl(url);
+            if (!urlObj.searchQuery[nameProp]) {
+              return "".concat(url).concat(url.indexOf('?') === -1 ? '?' : '&').concat(encodeURIComponent(item[nameProp] || ''));
+            }
+          }
+          return url;
         });
       }
       $xeUpload.emitModel(singleMode ? restList[0] || null : restList);
@@ -47908,10 +47933,9 @@ function hideDropTip($xeUpload) {
     handleDragSortDragstartEvent: function handleDragSortDragstartEvent(evnt) {
       var $xeUpload = this;
       var reactData = $xeUpload.reactData;
+      evnt.stopPropagation();
       if (evnt.dataTransfer) {
-        var img = new Image();
-        img.src = tpImg;
-        evnt.dataTransfer.setDragImage(img, 0, 0);
+        evnt.dataTransfer.setDragImage(getTpImg(), 0, 0);
       }
       var dragEl = evnt.currentTarget;
       var parentEl = dragEl.parentElement;
@@ -47928,6 +47952,7 @@ function hideDropTip($xeUpload) {
       var $xeUpload = this;
       var reactData = $xeUpload.reactData;
       var internalData = $xeUpload.internalData;
+      evnt.stopPropagation();
       evnt.preventDefault();
       var dragIndex = reactData.dragIndex;
       if (dragIndex === -1) {
@@ -47989,6 +48014,15 @@ function hideDropTip($xeUpload) {
       hideDropTip($xeUpload);
       reactData.dragIndex = -1;
     },
+    handleItemMousedownEvent: function handleItemMousedownEvent(evnt) {
+      var $xeUpload = this;
+      var $xeTable = $xeUpload.$xeTable;
+      var reactData = $xeUpload.reactData;
+      if ($xeTable) {
+        evnt.stopPropagation();
+      }
+      reactData.isActivated = true;
+    },
     handleGlobalPasteEvent: function handleGlobalPasteEvent(evnt) {
       var $xeUpload = this;
       var props = $xeUpload;
@@ -48052,7 +48086,7 @@ function hideDropTip($xeUpload) {
       var typeProp = $xeUpload.computeTypeProp;
       var cornerSlot = slots.corner;
       var ons = {};
-      if (dragSort) {
+      if (dragSort && currList.length > 1) {
         ons.dragstart = $xeUpload.handleDragSortDragstartEvent;
         ons.dragover = $xeUpload.handleDragSortDragoverEvent;
         ons.dragend = $xeUpload.handleDragSortDragendEvent;
@@ -48244,7 +48278,7 @@ function hideDropTip($xeUpload) {
       var imgStyle = $xeUpload.computeImgStyle;
       var cornerSlot = slots.corner;
       var ons = {};
-      if (dragSort) {
+      if (dragSort && currList.length > 1) {
         ons.dragstart = $xeUpload.handleDragSortDragstartEvent;
         ons.dragover = $xeUpload.handleDragSortDragoverEvent;
         ons.dragend = $xeUpload.handleDragSortDragendEvent;
@@ -48482,6 +48516,9 @@ function hideDropTip($xeUpload) {
         warnLog('vxe.error.delProp', ['image-style', 'image-config']);
       }
     }
+    if (props.dragSort) {
+      initTpImg();
+    }
     globalEvents.on($xeUpload, 'paste', $xeUpload.handleGlobalPasteEvent);
     globalEvents.on($xeUpload, 'mousedown', $xeUpload.handleGlobalMousedownEvent);
     globalEvents.on($xeUpload, 'blur', $xeUpload.handleGlobalBlurEvent);