vxe-pc-ui 3.3.32 → 3.3.35

package/lib/index.umd.js

@@ -12859,7 +12859,7 @@ function handleBooleanDefaultValue(value) {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-var log_version = "ui v".concat("3.3.32");
+var log_version = "ui v".concat("3.3.35");
 var warnLog = log.create('warn', log_version);
 var errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
@@ -12867,7 +12867,7 @@ var errLog = log.create('error', log_version);
 
 
 
-var ui_version = "3.3.32";
+var ui_version = "3.3.35";
 index_esm_VxeUI.version = ui_version;
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.tableVersion = '';
@@ -12990,7 +12990,8 @@ setConfig({
   },
   image: {
     showPreview: true,
-    showPrintButton: true
+    showPrintButton: true,
+    maskClosable: true
   },
   imageGroup: {
     showPreview: true,
@@ -13182,8 +13183,8 @@ setConfig({
     showRemoveButton: true,
     showButtonIcon: true,
     showPreview: true,
-    dragToUpload: true,
-    imageStyle: {}
+    dragToUpload: true
+    // imageConfig: {}
   },
   watermark: {
     rotate: -30,
@@ -27024,6 +27025,7 @@ var openPreviewImage = function openPreviewImage(options) {
     title: [String, Number],
     width: [String, Number],
     height: [String, Number],
+    circle: Boolean,
     maskClosable: {
       type: Boolean,
       default: function _default() {
@@ -27158,13 +27160,14 @@ var openPreviewImage = function openPreviewImage(options) {
       var $xeImage = this;
       var props = $xeImage;
       var alt = props.alt,
-        loading = props.loading;
+        loading = props.loading,
+        circle = props.circle;
       var imgStyle = $xeImage.computeImgStyle;
       var imgUrl = $xeImage.computeImgUrl;
       var vSize = $xeImage.computeSize;
       return h('img', {
         ref: 'refElem',
-        class: ['vxe-image', _defineProperty({}, "size--".concat(vSize), vSize)],
+        class: ['vxe-image', _defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--circle', circle)],
         style: imgStyle,
         attrs: {
           src: imgUrl,
@@ -34449,13 +34452,14 @@ var handleNumberString = function handleNumberString(val) {
       var reactData = $xeNumberInput.reactData;
       if (props.controls) {
         if (reactData.isActivated) {
+          evnt.stopPropagation();
+          evnt.preventDefault();
           var delta = evnt.deltaY;
           if (delta > 0) {
             $xeNumberInput.numberNextEvent(evnt);
           } else if (delta < 0) {
             $xeNumberInput.numberPrevEvent(evnt);
           }
-          evnt.preventDefault();
         }
       }
       $xeNumberInput.triggerEvent(evnt);
@@ -39315,6 +39319,19 @@ var RadioGroup = VxeRadioGroup;
       }
       return disabled;
     },
+    computeIsReadonly: function computeIsReadonly() {
+      var $xeRate = this;
+      var props = $xeRate;
+      var $xeForm = $xeRate.$xeForm;
+      var readonly = props.readonly;
+      if (readonly === null) {
+        if ($xeForm) {
+          return $xeForm.readonly || $xeForm.disabled;
+        }
+        return false;
+      }
+      return readonly;
+    },
     computeNumVal: function computeNumVal() {
       var $xeRate = this;
       var props = $xeRate;
@@ -39350,7 +39367,8 @@ var RadioGroup = VxeRadioGroup;
       var $xeRate = this;
       var reactData = $xeRate.reactData;
       var isDisabled = $xeRate.computeIsDisabled;
-      if (!isDisabled) {
+      var isReadonly = $xeRate.computeIsReadonly;
+      if (!(isDisabled || isReadonly)) {
         var value = item.value;
         reactData.activeValue = value;
       }
@@ -39365,7 +39383,8 @@ var RadioGroup = VxeRadioGroup;
       var $xeForm = $xeRate.$xeForm;
       var formItemInfo = $xeRate.formItemInfo;
       var isDisabled = $xeRate.computeIsDisabled;
-      if (!isDisabled) {
+      var isReadonly = $xeRate.computeIsReadonly;
+      if (!(isDisabled || isReadonly)) {
         var value = item.value;
         $xeRate.emitModel(value);
         $xeRate.dispatchEvent('change', {
@@ -39385,12 +39404,13 @@ var RadioGroup = VxeRadioGroup;
       var props = $xeRate;
       var status = props.status;
       var isDisabled = $xeRate.computeIsDisabled;
+      var isReadonly = $xeRate.computeIsReadonly;
       var itemList = $xeRate.computeItemList;
       var vSize = $xeRate.computeSize;
       var numVal = $xeRate.computeNumVal;
       return h('div', {
         ref: 'refElem',
-        class: ['vxe-rate', _defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), "theme--".concat(status), status), 'is--disabled', isDisabled)]
+        class: ['vxe-rate', _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), "theme--".concat(status), status), 'is--disabled', isDisabled), 'is--readonly', isReadonly)]
       }, itemList.map(function (item) {
         var isChecked = numVal >= item.value;
         return h('div', {
@@ -39399,13 +39419,13 @@ var RadioGroup = VxeRadioGroup;
           }],
           on: {
             mouseenter: function mouseenter(evnt) {
-              if (!isDisabled) {
+              if (!(isDisabled || isReadonly)) {
                 $xeRate.mouseenterEvent(evnt, item);
               }
             },
             mouseleave: $xeRate.mouseleaveEvent,
             click: function click(evnt) {
-              if (!isDisabled) {
+              if (!(isDisabled || isReadonly)) {
                 $xeRate.clickEvent(evnt, item);
               }
             }
@@ -40084,6 +40104,10 @@ var Steps = VxeSteps;
       type: Boolean,
       default: null
     },
+    readonly: {
+      type: Boolean,
+      default: null
+    },
     size: {
       type: String,
       default: function _default() {
@@ -40141,6 +40165,19 @@ var Steps = VxeSteps;
       }
       return disabled;
     },
+    computeIsReadonly: function computeIsReadonly() {
+      var $xeSwitch = this;
+      var props = $xeSwitch;
+      var $xeForm = $xeSwitch.$xeForm;
+      var readonly = props.readonly;
+      if (readonly === null) {
+        if ($xeForm) {
+          return $xeForm.readonly || $xeForm.disabled;
+        }
+        return false;
+      }
+      return readonly;
+    },
     computeOnShowLabel: function computeOnShowLabel() {
       var $xeSwitch = this;
       var props = $xeSwitch;
@@ -40205,7 +40242,8 @@ var Steps = VxeSteps;
       var $xeForm = $xeSwitch.$xeForm;
       var formItemInfo = $xeSwitch.formItemInfo;
       var isDisabled = $xeSwitch.computeIsDisabled;
-      if (!isDisabled) {
+      var isReadonly = $xeSwitch.computeIsReadonly;
+      if (!(isDisabled || isReadonly)) {
         var isChecked = $xeSwitch.computeIsChecked;
         clearTimeout(internalData.atTimeout);
         var value = isChecked ? props.closeValue : props.openValue;
@@ -40258,14 +40296,15 @@ var Steps = VxeSteps;
       var onShowLabel = $xeSwitch.computeOnShowLabel;
       var offShowLabel = $xeSwitch.computeOffShowLabel;
       var isDisabled = $xeSwitch.computeIsDisabled;
+      var isReadonly = $xeSwitch.computeIsReadonly;
       return h('div', {
-        class: ['vxe-switch', isChecked ? 'is--on' : 'is--off', _defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--disabled', isDisabled), 'is--animat', reactData.hasAnimat)]
+        class: ['vxe-switch', isChecked ? 'is--on' : 'is--off', _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--disabled', isDisabled), 'is--readonly', isReadonly), 'is--animat', reactData.hasAnimat)]
       }, [h('button', {
         ref: 'refButton',
         class: 'vxe-switch--button',
         attrs: {
           type: 'button',
-          disabled: isDisabled
+          disabled: isDisabled || isReadonly
         },
         on: {
           click: $xeSwitch.clickEvent,
@@ -45365,6 +45404,16 @@ function handleTransferFiles(items) {
         return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(getConfig().upload.imageTypes, true);
       }
     },
+    imageConfig: {
+      type: Object,
+      default: function _default() {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(getConfig().upload.imageConfig, true);
+      }
+    },
+    /**
+     * 已废弃，被 image-config 替换
+     * @deprecated
+     */
     imageStyle: {
       type: Object,
       default: function _default() {
@@ -45676,16 +45725,16 @@ function handleTransferFiles(items) {
       }
       return defHints.join(getI18n('vxe.base.comma'));
     },
-    computeImageStyleOpts: function computeImageStyleOpts() {
+    computeImageOpts: function computeImageOpts() {
       var $xeUpload = this;
       var props = $xeUpload;
-      return Object.assign({}, props.imageStyle);
+      return Object.assign({}, props.imageConfig || props.imageStyle);
     },
     computeImgStyle: function computeImgStyle() {
       var $xeUpload = this;
-      var _$xeUpload$computeIma = $xeUpload.computeImageStyleOpts,
-        width = _$xeUpload$computeIma.width,
-        height = _$xeUpload$computeIma.height;
+      var imageOpts = $xeUpload.computeImageOpts;
+      var width = imageOpts.width,
+        height = imageOpts.height;
       var stys = {};
       if (width) {
         stys.width = toCssUnit(width);
@@ -46532,6 +46581,7 @@ function handleTransferFiles(items) {
       var fileCacheMaps = reactData.fileCacheMaps;
       var isDisabled = $xeUpload.computeIsDisabled;
       var formReadonly = $xeUpload.computeFormReadonly;
+      var imageOpts = $xeUpload.computeImageOpts;
       var imgStyle = $xeUpload.computeImgStyle;
       var cornerSlot = slots.corner;
       return currList.map(function (item, index) {
@@ -46543,6 +46593,7 @@ function handleTransferFiles(items) {
           key: index,
           class: ['vxe-upload--image-item', {
             'is--preview': showPreview,
+            'is--circle': imageOpts.circle,
             'is--loading': isLoading,
             'is--error': isError
           }]
@@ -46583,12 +46634,14 @@ function handleTransferFiles(items) {
               $xeUpload.handleReUpload(item);
             }
           }
-        })]) : h('img', {
+        })]) : h('div', {
+          class: 'vxe-upload--image-item-img-wrapper'
+        }, [h('img', {
           class: 'vxe-upload--image-item-img',
           attrs: {
             src: $xeUpload.getThumbnailFileUrl(item)
           }
-        }) : renderEmptyElement($xeUpload), h('div', {
+        })]) : renderEmptyElement($xeUpload), h('div', {
           class: 'vxe-upload--image-item-btn-wrapper',
           on: {
             click: function click(evnt) {