vxe-pc-ui 3.14.0 → 3.14.2

package/lib/index.umd.js

@@ -13128,16 +13128,17 @@ var DynamicApp = external_commonjs_vue_commonjs2_vue_root_Vue_default().extend({
   },
   methods: {
     renderVN: function renderVN(h) {
+      var $xeDynamicApp = this;
       var VxeUIModalComponent = VxeUI.getComponent('vxe-modal');
       var VxeUIDrawerComponent = VxeUI.getComponent('vxe-drawer');
       var VxeUILoadingComponent = VxeUI.getComponent('vxe-loading');
       var VxeUIWatermarkComponent = VxeUI.getComponent('vxe-watermark');
       var VxeUIContextMenuComponent = VxeUI.getComponent('vxe-context-menu');
-      var modals = this.modals,
-        drawers = this.drawers,
-        globalLoading = this.globalLoading,
-        globalWatermark = this.globalWatermark,
-        globalContextMenu = this.globalContextMenu;
+      var modals = $xeDynamicApp.modals,
+        drawers = $xeDynamicApp.drawers,
+        globalLoading = $xeDynamicApp.globalLoading,
+        globalWatermark = $xeDynamicApp.globalWatermark,
+        globalContextMenu = $xeDynamicApp.globalContextMenu;
       var cmOns;
       if (globalContextMenu) {
         var events = globalContextMenu.events || {};
@@ -13175,7 +13176,7 @@ var DynamicApp = external_commonjs_vue_commonjs2_vue_root_Vue_default().extend({
           props: item.props,
           on: item.on
         });
-      })) : renderEmptyElement(this), drawers.length ? h('div', {
+      })) : renderEmptyElement($xeDynamicApp), drawers.length ? h('div', {
         key: 2,
         class: 'vxe-dynamics--drawer'
       }, drawers.map(function (item) {
@@ -13184,17 +13185,17 @@ var DynamicApp = external_commonjs_vue_commonjs2_vue_root_Vue_default().extend({
           props: item.props,
           on: item.on
         });
-      })) : renderEmptyElement(this), globalWatermark ? h(VxeUIWatermarkComponent, {
+      })) : renderEmptyElement($xeDynamicApp), globalWatermark ? h(VxeUIWatermarkComponent, {
         key: 'gw',
         props: globalWatermark
-      }) : renderEmptyElement(this), globalLoading ? h(VxeUILoadingComponent, {
+      }) : renderEmptyElement($xeDynamicApp), globalLoading ? h(VxeUILoadingComponent, {
         key: 'gl',
         props: globalLoading
-      }) : renderEmptyElement(this), globalContextMenu ? h(VxeUIContextMenuComponent, {
+      }) : renderEmptyElement($xeDynamicApp), globalContextMenu ? h(VxeUIContextMenuComponent, {
         key: 'cm',
         props: globalContextMenu,
         on: cmOns
-      }) : renderEmptyElement(this)]);
+      }) : renderEmptyElement($xeDynamicApp)]);
     }
   },
   render: function render(h) {
@@ -13213,7 +13214,7 @@ function checkDynamic() {
 }
 ;// ./packages/ui/src/log.ts
 
-var log_version = "ui v".concat("3.14.0");
+var log_version = "ui v".concat("3.14.2");
 var warnLog = log.create('warn', log_version);
 var errLog = log.create('error', log_version);
 ;// ./packages/ui/index.ts
@@ -13221,7 +13222,7 @@ var errLog = log.create('error', log_version);
 
 
 
-var ui_version = "3.14.0";
+var ui_version = "3.14.2";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -40217,6 +40218,10 @@ function image_createReactData() {
     title: [String, Number],
     width: [String, Number],
     height: [String, Number],
+    minWidth: [String, Number],
+    minHeight: [String, Number],
+    maxWidth: [String, Number],
+    maxHeight: [String, Number],
     circle: Boolean,
     draggable: {
       type: Boolean,
@@ -40273,20 +40278,37 @@ function image_createReactData() {
       var props = $xeImage;
       var width = props.width,
         height = props.height,
+        minWidth = props.minWidth,
+        minHeight = props.minHeight,
+        maxWidth = props.maxWidth,
+        maxHeight = props.maxHeight,
         circle = props.circle;
       var stys = {};
-      if (width) {
-        stys.width = toCssUnit(width);
-      } else if (circle) {
-        if (height) {
-          stys.width = toCssUnit(height);
-        }
+      if (minWidth) {
+        stys.minWidth = toCssUnit(minWidth);
       }
-      if (height) {
-        stys.height = toCssUnit(height);
-      } else if (circle) {
+      if (minHeight) {
+        stys.minHeight = toCssUnit(minHeight);
+      }
+      if (maxWidth) {
+        stys.maxWidth = toCssUnit(maxWidth);
+      }
+      if (maxHeight) {
+        stys.maxHeight = toCssUnit(maxHeight);
+      }
+      if (circle) {
+        // 圆形只能生效一个
         if (width) {
           stys.height = toCssUnit(width);
+        } else if (height) {
+          stys.width = toCssUnit(height);
+        }
+      } else {
+        if (width) {
+          stys.width = toCssUnit(width);
+        }
+        if (height) {
+          stys.height = toCssUnit(height);
         }
       }
       return stys;