vxe-pc-ui 3.13.29 → 3.14.1

package/lib/index.umd.js

@@ -11642,7 +11642,7 @@ var es_regexp_exec = __webpack_require__(7495);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.match.js
 var es_string_match = __webpack_require__(1761);
 ;// ./node_modules/@vxe-ui/core/es/src/core.js
-var coreVersion = "3.4.6";
+var coreVersion = "3.4.9";
 var VxeCore = {
   coreVersion: coreVersion,
   uiVersion: '',
@@ -12003,9 +12003,10 @@ function _createClass(e, r, t) {
 
 var GLOBAL_EVENT_KEYS = {
   F2: 'F2',
+  F10: 'F10',
+  TAB: 'Tab',
   ESCAPE: 'Escape',
   ENTER: 'Enter',
-  TAB: 'Tab',
   DELETE: 'Delete',
   BACKSPACE: 'Backspace',
   SPACEBAR: ' ',
@@ -12016,14 +12017,20 @@ var GLOBAL_EVENT_KEYS = {
   ARROW_RIGHT: 'ArrowRight',
   PAGE_UP: 'PageUp',
   PAGE_DOWN: 'PageDown',
-  Control: 'Control',
-  R: 'R',
-  P: 'P',
-  Z: 'Z',
+  HOME: 'Home',
+  END: 'End',
+  A: 'A',
   X: 'X',
   C: 'C',
   V: 'V',
-  M: 'M'
+  D: 'D',
+  F: 'F',
+  H: 'H',
+  M: 'M',
+  Y: 'Y',
+  Z: 'Z',
+  R: 'R',
+  P: 'P'
 };
 var browse = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().browse();
 var convertEventKeys = {
@@ -12148,6 +12155,9 @@ var globalEvents = {
     });
   },
   hasKey: function hasKey(evnt, targetKey) {
+    if (!targetKey) {
+      return false;
+    }
     var key = evnt.key;
     targetKey = targetKey.toLowerCase();
     return key ? targetKey === key.toLowerCase() || !!(convertEventKeys[key] && convertEventKeys[key].toLowerCase() === targetKey) : false;
@@ -12392,7 +12402,7 @@ function createLog(type, name) {
     return msg;
   };
 }
-var version = "3.4.6";
+var version = "3.4.9";
 var log = {
   create: createLog,
   warn: createLog('warn', "v".concat(version)),
@@ -13118,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 || {};
@@ -13165,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) {
@@ -13174,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) {
@@ -13203,7 +13214,7 @@ function checkDynamic() {
 }
 ;// ./packages/ui/src/log.ts
 
-var log_version = "ui v".concat("3.13.29");
+var log_version = "ui v".concat("3.14.1");
 var warnLog = log.create('warn', log_version);
 var errLog = log.create('error', log_version);
 ;// ./packages/ui/index.ts
@@ -13211,7 +13222,7 @@ var errLog = log.create('error', log_version);
 
 
 
-var ui_version = "3.13.29";
+var ui_version = "3.14.1";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -40207,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,
@@ -40263,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;