vxe-pc-ui 3.12.34 → 3.12.36

package/lib/index.umd.js

@@ -12383,14 +12383,14 @@ function checkDynamic() {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-var log_version = "ui v".concat("3.12.34");
+var log_version = "ui v".concat("3.12.36");
 var warnLog = log.create('warn', log_version);
 var errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
 
-var ui_version = "3.12.34";
+var ui_version = "3.12.36";
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -12561,15 +12561,15 @@ setConfig({
   image: {
     draggable: null,
     showPreview: true,
-    showPrintButton: true,
-    maskClosable: true
+    showPrintButton: true
   },
   imageGroup: {
     showPreview: true,
     showPrintButton: true
   },
   imagePreview: {
-    showPrintButton: true
+    showPrintButton: true,
+    maskClosable: true
   },
   input: {
     // size: null,
@@ -12822,7 +12822,8 @@ setConfig({
     showLimitCount: true,
     autoSubmit: true,
     // urlArgs: false,
-    maxSimultaneousUploads: 5
+    maxSimultaneousUploads: 5,
+    previewImageConfig: {}
   },
   watermark: {
     rotate: -30,
@@ -47721,6 +47722,10 @@ var Print = VxePrint;
     value: Boolean,
     disabled: Boolean,
     placement: String,
+    /**
+     * 已废弃，请使用 popup-config.trigger
+     * @deprecated
+     */
     trigger: {
       type: String,
       default: getConfig().pulldown.trigger
@@ -47988,7 +47993,9 @@ var Print = VxePrint;
       var props = $xePulldown;
       var reactData = $xePulldown.reactData;
       var trigger = props.trigger;
-      if (trigger === 'click') {
+      var popupOpts = $xePulldown.computePopupOpts;
+      var currTrigger = trigger || popupOpts.trigger;
+      if (currTrigger === 'click') {
         if (reactData.visiblePanel) {
           $xePulldown.hideOptionPanel();
           $xePulldown.dispatchEvent('hide-panel', {}, evnt);
@@ -48005,16 +48012,21 @@ var Print = VxePrint;
       var $xePulldown = this;
       var props = $xePulldown;
       var reactData = $xePulldown.reactData;
-      var disabled = props.disabled;
+      var trigger = props.trigger,
+        disabled = props.disabled;
       var visiblePanel = reactData.visiblePanel;
+      var popupOpts = $xePulldown.computePopupOpts;
+      var currTrigger = trigger || popupOpts.trigger;
       var panelElem = $xePulldown.$refs.refPulldownPanel;
       if (!disabled) {
         if (visiblePanel) {
           if (getEventTargetNode(evnt, panelElem).flag) {
             $xePulldown.updatePlacement();
           } else {
-            $xePulldown.hideOptionPanel();
-            $xePulldown.dispatchEvent('hide-panel', {}, evnt);
+            if (currTrigger !== 'manual') {
+              $xePulldown.hideOptionPanel();
+              $xePulldown.dispatchEvent('hide-panel', {}, evnt);
+            }
           }
         }
       }
@@ -48023,26 +48035,37 @@ var Print = VxePrint;
       var $xePulldown = this;
       var props = $xePulldown;
       var reactData = $xePulldown.reactData;
-      var disabled = props.disabled;
+      var trigger = props.trigger,
+        disabled = props.disabled;
       var visiblePanel = reactData.visiblePanel;
+      var popupOpts = $xePulldown.computePopupOpts;
+      var currTrigger = trigger || popupOpts.trigger;
       var el = $xePulldown.$refs.refElem;
       var panelElem = $xePulldown.$refs.refPulldownPanel;
       if (!disabled) {
         reactData.isActivated = getEventTargetNode(evnt, el).flag || getEventTargetNode(evnt, panelElem).flag;
         if (visiblePanel && !reactData.isActivated) {
-          $xePulldown.hideOptionPanel();
-          $xePulldown.dispatchEvent('hide-panel', {}, evnt);
+          if (currTrigger !== 'manual') {
+            $xePulldown.hideOptionPanel();
+            $xePulldown.dispatchEvent('hide-panel', {}, evnt);
+          }
         }
       }
     },
     handleGlobalBlurEvent: function handleGlobalBlurEvent(evnt) {
       var $xePulldown = this;
+      var props = $xePulldown;
       var reactData = $xePulldown.reactData;
+      var trigger = props.trigger;
       var visiblePanel = reactData.visiblePanel,
         isActivated = reactData.isActivated;
+      var popupOpts = $xePulldown.computePopupOpts;
+      var currTrigger = trigger || popupOpts.trigger;
       if (visiblePanel) {
-        $xePulldown.hideOptionPanel();
-        $xePulldown.dispatchEvent('hide-panel', {}, evnt);
+        if (currTrigger !== 'manual') {
+          $xePulldown.hideOptionPanel();
+          $xePulldown.dispatchEvent('hide-panel', {}, evnt);
+        }
       }
       if (isActivated) {
         reactData.isActivated = false;
@@ -59494,6 +59517,7 @@ function upload_createInternalData() {
         return getConfig().upload.progressText;
       }
     },
+    previewImageConfig: Object,
     showSubmitButton: Boolean,
     autoHiddenButton: {
       type: Boolean,
@@ -59668,6 +59692,14 @@ function upload_createInternalData() {
       var props = $xeUpload;
       return props.multiple ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(props.limitCount) : 1;
     },
+    computePreviewImageOpts: function computePreviewImageOpts() {
+      var $xeUpload = this;
+      var props = $xeUpload;
+      var showDownloadButton = props.showDownloadButton;
+      return Object.assign({
+        showDownloadButton: showDownloadButton
+      }, getConfig().upload.previewImageConfig, props.previewImageConfig);
+    },
     computeOverCount: function computeOverCount() {
       var $xeUpload = this;
       var props = $xeUpload;
@@ -59968,9 +60000,9 @@ function upload_createInternalData() {
       var $xeUpload = this;
       var props = $xeUpload;
       var internalData = $xeUpload.internalData;
-      var imageTypes = props.imageTypes,
-        showDownloadButton = props.showDownloadButton;
+      var imageTypes = props.imageTypes;
       var typeProp = $xeUpload.computeTypeProp;
+      var previewImageOpts = $xeUpload.computePreviewImageOpts;
       var beforeDownloadFn = props.beforeDownloadMethod || getConfig().upload.beforeDownloadMethod;
       var imagePreviewTypes = internalData.imagePreviewTypes;
       // 如果是预览图片
@@ -59978,16 +60010,15 @@ function upload_createInternalData() {
         return "".concat(type).toLowerCase() === "".concat(item[typeProp]).toLowerCase();
       })) {
         if (index_esm_VxeUI.previewImage) {
-          index_esm_VxeUI.previewImage({
+          index_esm_VxeUI.previewImage(_objectSpread2(_objectSpread2({}, previewImageOpts), {}, {
             urlList: [$xeUpload.getFileUrl(item)],
-            showDownloadButton: showDownloadButton,
             beforeDownloadMethod: beforeDownloadFn ? function () {
               return beforeDownloadFn({
                 $upload: $xeUpload,
                 option: item
               });
             } : undefined
-          });
+          }));
         }
       }
     },
@@ -60010,8 +60041,8 @@ function upload_createInternalData() {
       var $xeUpload = this;
       var props = $xeUpload;
       var reactData = $xeUpload.reactData;
-      var showDownloadButton = props.showDownloadButton;
       var fileList = reactData.fileList;
+      var previewImageOpts = $xeUpload.computePreviewImageOpts;
       var previewFn = props.previewMethod || getConfig().upload.previewMethod;
       var beforeDownloadFn = props.beforeDownloadMethod || getConfig().upload.beforeDownloadMethod;
       if (props.showPreview) {
@@ -60021,12 +60052,11 @@ function upload_createInternalData() {
             option: item
           });
         } else if (index_esm_VxeUI.previewImage) {
-          index_esm_VxeUI.previewImage({
+          index_esm_VxeUI.previewImage(_objectSpread2(_objectSpread2({}, previewImageOpts), {}, {
             urlList: fileList.map(function (item) {
               return $xeUpload.getFileUrl(item);
             }),
             activeIndex: index,
-            showDownloadButton: showDownloadButton,
             beforeDownloadMethod: beforeDownloadFn ? function (_ref2) {
               var index = _ref2.index;
               return beforeDownloadFn({
@@ -60034,7 +60064,7 @@ function upload_createInternalData() {
                 option: fileList[index]
               });
             } : undefined
-          });
+          }));
         }
       }
     },