vxe-pc-ui 3.17.28 → 3.17.29

package/lib/index.umd.js

@@ -13284,7 +13284,7 @@ var es_array_join = __webpack_require__(8598);
 
 
 var log_log = VxeUI.log;
-var uiVersion = "ui v".concat("3.17.28");
+var uiVersion = "ui v".concat("3.17.29");
 function createComponentLog(name) {
   var tableVersion = VxeUI.tableVersion ? "table v".concat(VxeUI.tableVersion) : '';
   var ganttVersion = VxeUI.ganttVersion ? "gantt v".concat(VxeUI.ganttVersion) : '';
@@ -13304,7 +13304,7 @@ var errLog = log_log.create('error', uiVersion);
 
 
 
-var ui_version = "3.17.28";
+var ui_version = "3.17.29";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -13440,6 +13440,8 @@ setConfig({
   drawer: {
     // size: null,
     // useHtml: false,
+    minWidth: 40,
+    minHeight: 40,
     position: 'right',
     showHeader: true,
     // showTitleBackground: false,
@@ -41124,6 +41126,8 @@ dynamicApp.use(VxeDateRangePicker);
 VxeUI.component(date_range_picker);
 var DateRangePicker = VxeDateRangePicker;
 /* harmony default export */ var packages_date_range_picker = (VxeDateRangePicker);
+;// ./packages/drawer/src/store.ts
+var allActiveDrawers = [];
 ;// ./packages/loading/index.ts
 
 
@@ -41175,7 +41179,9 @@ var Loading = VxeLoading;
 
 
 
-var allActiveDrawers = [];
+
+
+
 /* harmony default export */ var drawer = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeDrawer',
   mixins: [globalMixins.sizeMixin, globalMixins.permissionMixin],
@@ -41291,8 +41297,30 @@ var allActiveDrawers = [];
       }
     },
     preload: Boolean,
-    width: [Number, String],
-    height: [Number, String],
+    width: {
+      type: [Number, String],
+      default: function _default() {
+        return getConfig().drawer.width;
+      }
+    },
+    height: {
+      type: [Number, String],
+      default: function _default() {
+        return getConfig().drawer.height;
+      }
+    },
+    minWidth: {
+      type: [Number, String],
+      default: function _default() {
+        return getConfig().drawer.minWidth;
+      }
+    },
+    minHeight: {
+      type: [Number, String],
+      default: function _default() {
+        return getConfig().drawer.minHeight;
+      }
+    },
     resize: {
       type: Boolean,
       default: function _default() {
@@ -41324,6 +41352,12 @@ var allActiveDrawers = [];
         return getConfig().drawer.appendTo;
       }
     },
+    isWithinAppendTo: {
+      type: Boolean,
+      default: function _default() {
+        return getConfig().drawer.isWithinAppendTo;
+      }
+    },
     padding: {
       type: Boolean,
       default: function _default() {
@@ -41375,7 +41409,8 @@ var allActiveDrawers = [];
     };
     return {
       xID: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId(),
-      reactData: reactData
+      reactData: reactData,
+      reFlag: 0
     };
   },
   computed: _objectSpread2(_objectSpread2({}, {}), {}, {
@@ -41461,12 +41496,16 @@ var allActiveDrawers = [];
     recalculate: function recalculate() {
       var $xeDrawer = this;
       var props = $xeDrawer;
-      var width = props.width,
+      var position = props.position,
+        width = props.width,
         height = props.height;
       var boxElem = $xeDrawer.getBox();
       if (boxElem) {
-        boxElem.style.width = toCssUnit(width);
-        boxElem.style.height = toCssUnit(height);
+        if (position === 'top' || position === 'bottom') {
+          boxElem.style.height = toCssUnit(height);
+        } else {
+          boxElem.style.width = toCssUnit(width);
+        }
       }
       return $xeDrawer.$nextTick();
     },
@@ -41502,6 +41541,10 @@ var allActiveDrawers = [];
       if (visible) {
         Promise.resolve(beforeHideMethod ? beforeHideMethod(params) : null).then(function (rest) {
           if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isError(rest)) {
+            var el = $xeDrawer.$refs.refElem;
+            if (el) {
+              el.setAttribute('data-effect', 'y');
+            }
             reactData.contentVisible = false;
             $xeDrawer.removeActiveQueue();
             $xeDrawer.dispatchEvent('before-hide', params, null);
@@ -41510,6 +41553,12 @@ var allActiveDrawers = [];
               $xeDrawer.emitModel(false);
               $xeDrawer.dispatchEvent('hide', params, null);
             }, 200);
+            setTimeout(function () {
+              var el = $xeDrawer.$refs.refElem;
+              if (el) {
+                el.removeAttribute('data-effect');
+              }
+            }, 350);
           }
         }).catch(function (e) {
           return e;
@@ -41570,6 +41619,12 @@ var allActiveDrawers = [];
         reactData.contentVisible = false;
         $xeDrawer.updateZindex();
         allActiveDrawers.push($xeDrawer);
+        $xeDrawer.$nextTick(function () {
+          var el = $xeDrawer.$refs.refElem;
+          if (el) {
+            el.setAttribute('data-effect', 'y');
+          }
+        });
         setTimeout(function () {
           $xeDrawer.recalculate();
           reactData.contentVisible = true;
@@ -41590,6 +41645,12 @@ var allActiveDrawers = [];
             $xeDrawer.dispatchEvent('show', params, null);
           });
         }, 10);
+        setTimeout(function () {
+          var el = $xeDrawer.$refs.refElem;
+          if (el) {
+            el.removeAttribute('data-effect');
+          }
+        }, 350);
       }
       return $xeDrawer.$nextTick();
     },
@@ -41634,20 +41695,26 @@ var allActiveDrawers = [];
       }
     },
     dragEvent: function dragEvent(evnt) {
-      var $xeModal = this;
-      var reactData = $xeModal.reactData;
+      var $xeDrawer = this;
+      var props = $xeDrawer;
+      var reactData = $xeDrawer.reactData;
       evnt.preventDefault();
-      var _getDomNode = getDomNode(),
-        visibleHeight = _getDomNode.visibleHeight,
-        visibleWidth = _getDomNode.visibleWidth;
+      var isWithinAppendTo = props.isWithinAppendTo;
+      var el = $xeDrawer.$refs.refElem;
+      var parentWrapperEl = getPopupWrapperElement(isWithinAppendTo ? el : document.body);
+      if (!parentWrapperEl) {
+        return;
+      }
+      var visibleWidth = parentWrapperEl.clientWidth;
+      var visibleHeight = parentWrapperEl.clientHeight;
       var marginSize = 0;
       var targetElem = evnt.target;
       var type = targetElem.getAttribute('type');
-      var minWidth = 0;
-      var minHeight = 0;
+      var minWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(props.minWidth);
+      var minHeight = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(props.minHeight);
       var maxWidth = visibleWidth;
       var maxHeight = visibleHeight;
-      var boxElem = $xeModal.getBox();
+      var boxElem = $xeDrawer.getBox();
       var clientWidth = boxElem.clientWidth;
       var clientHeight = boxElem.clientHeight;
       var disX = evnt.clientX;
@@ -41702,7 +41769,7 @@ var allActiveDrawers = [];
             break;
         }
         boxElem.className = boxElem.className.replace(/\s?is--drag/, '') + ' is--drag';
-        $xeModal.dispatchEvent('resize', params, evnt);
+        $xeDrawer.dispatchEvent('resize', params, evnt);
         reactData.resizeFlag++;
       };
       document.onmouseup = function () {
@@ -41891,7 +41958,8 @@ var allActiveDrawers = [];
         lockView = props.lockView,
         mask = props.mask,
         resize = props.resize,
-        destroyOnClose = props.destroyOnClose;
+        destroyOnClose = props.destroyOnClose,
+        isWithinAppendTo = props.isWithinAppendTo;
       var initialized = reactData.initialized,
         contentVisible = reactData.contentVisible,
         visible = reactData.visible;
@@ -41900,7 +41968,7 @@ var allActiveDrawers = [];
       var dragType = $xeDrawer.computeDragType;
       return h('div', {
         ref: 'refElem',
-        class: ['vxe-drawer--wrapper', "pos--".concat(position), className || '', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--padding', padding), 'is--border', border), 'is--title-bg', showTitleBackground), 'lock--scroll', lockScroll), 'lock--view', lockView), 'is--mask', mask), 'is--visible', contentVisible), 'is--active', visible), 'is--loading', loading)],
+        class: ['vxe-drawer--wrapper', "pos--".concat(position), isWithinAppendTo ? 'ctx--within' : 'ctx--free', className || '', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--padding', padding), 'is--border', border), 'is--title-bg', showTitleBackground), 'lock--scroll', lockScroll), 'lock--view', lockView), 'is--mask', mask), 'is--visible', contentVisible), 'is--active', visible), 'is--loading', loading)],
         style: {
           zIndex: reactData.drawerZIndex
         },
@@ -41935,9 +42003,17 @@ var allActiveDrawers = [];
   watch: {
     width: function width() {
       var $xeDrawer = this;
-      $xeDrawer.recalculate();
+      $xeDrawer.reFlag++;
     },
     height: function height() {
+      var $xeDrawer = this;
+      $xeDrawer.reFlag++;
+    },
+    position: function position() {
+      var $xeDrawer = this;
+      $xeDrawer.reFlag++;
+    },
+    reFlag: function reFlag() {
       var $xeDrawer = this;
       $xeDrawer.recalculate();
     },
@@ -41997,6 +42073,7 @@ var allActiveDrawers = [];
 
 
 
+
 
 
 function handleDrawer(options) {
@@ -48748,6 +48825,8 @@ dynamicApp.use(VxeMenu);
 VxeUI.component(menu);
 var Menu = VxeMenu;
 /* harmony default export */ var packages_menu = (VxeMenu);
+;// ./packages/modal/src/store.ts
+var allActiveModals = [];
 ;// ./packages/modal/src/modal.ts
 
 
@@ -48772,6 +48851,10 @@ var Menu = VxeMenu;
 
 
 
+
+
+
+
 
 
 
@@ -48780,7 +48863,27 @@ var Menu = VxeMenu;
 var modal_createComponentLog = createComponentLog('modal'),
   modal_warnLog = modal_createComponentLog.warnLog,
   modal_errLog = modal_createComponentLog.errLog;
-var allActiveModals = [];
+function modal_createInternalData() {
+  return {
+    // msgTimeout: undefined,
+    isMoveStatus: false
+  };
+}
+function modal_createReactData() {
+  return {
+    initialized: false,
+    visible: false,
+    contentVisible: false,
+    modalTop: 0,
+    modalZindex: 0,
+    prevZoomStatus: '',
+    zoomStatus: '',
+    revertLocat: null,
+    prevLocat: null,
+    firstOpen: true,
+    resizeFlag: 1
+  };
+}
 var msgQueue = [];
 var notifyQueue = [];
 var lockScrollAttrKey = 'data-vxe-lock-scroll';
@@ -49073,27 +49176,11 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
   },
   data: function data() {
     var xID = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId();
-    var reactData = {
-      initialized: false,
-      visible: false,
-      contentVisible: false,
-      modalTop: 0,
-      modalZindex: 0,
-      prevZoomStatus: '',
-      zoomStatus: '',
-      revertLocat: null,
-      prevLocat: null,
-      firstOpen: true,
-      resizeFlag: 1
-    };
-    var internalData = {
-      msgTimeout: undefined
-    };
-    return {
+    var reactData = modal_createReactData();
+    return _objectSpread2(_objectSpread2({}, {}), {}, {
       xID: xID,
-      reactData: reactData,
-      internalData: internalData
-    };
+      reactData: reactData
+    });
   },
   computed: _objectSpread2(_objectSpread2({}, {}), {}, {
     computeBtnTransfer: function computeBtnTransfer() {
@@ -49407,6 +49494,10 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
       if (visible) {
         Promise.resolve(beforeHideFn ? beforeHideFn(params) : null).then(function (rest) {
           if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isError(rest)) {
+            var el = $xeModal.$refs.refElem;
+            if (el) {
+              el.setAttribute('data-effect', 'y');
+            }
             if (isMsg) {
               $xeModal.removeMsgQueue();
             }
@@ -49422,6 +49513,12 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
               $xeModal.dispatchEvent('hide', params, null);
             }, 200);
             $xeModal.removeBodyLockScroll();
+            setTimeout(function () {
+              var el = $xeModal.$refs.refElem;
+              if (el) {
+                el.removeAttribute('data-effect');
+              }
+            }, 350);
           }
         }).catch(function (e) {
           return e;
@@ -49762,6 +49859,7 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
       var $xeModal = this;
       var props = $xeModal;
       var reactData = $xeModal.reactData;
+      var internalData = $xeModal.internalData;
       var remember = props.remember,
         showFooter = props.showFooter,
         appendTo = props.appendTo;
@@ -49778,6 +49876,7 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
       }
       if (!visible) {
         $xeModal.addBodyLockScroll();
+        internalData.isMoveStatus = false;
         reactData.visible = true;
         reactData.contentVisible = false;
         $xeModal.updateZindex();
@@ -49810,6 +49909,10 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
         } else {
           $xeModal.$nextTick(function () {
             var firstOpen = reactData.firstOpen;
+            var el = $xeModal.$refs.refElem;
+            if (el) {
+              el.setAttribute('data-effect', 'y');
+            }
             if (firstOpen) {
               reactData.firstOpen = false;
               if ($xeModal.hasPosStorage()) {
@@ -49839,6 +49942,12 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
               }
             }
           });
+          setTimeout(function () {
+            var el = $xeModal.$refs.refElem;
+            if (el) {
+              el.removeAttribute('data-effect');
+            }
+          }, 350);
         }
       }
       return $xeModal.$nextTick();
@@ -49897,6 +50006,13 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
         }
       }
     },
+    handleGlobalResizeEvent: function handleGlobalResizeEvent() {
+      var $xeModal = this;
+      var internalData = $xeModal.internalData;
+      if (!internalData.isMoveStatus) {
+        $xeModal.updatePosition();
+      }
+    },
     handleRevert: function handleRevert() {
       var $xeModal = this;
       var reactData = $xeModal.reactData;
@@ -49984,8 +50100,8 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
       var $xeModal = this;
       var props = $xeModal;
       var reactData = $xeModal.reactData;
-      var resize = props.resize,
-        storage = props.storage,
+      var internalData = $xeModal.internalData;
+      var storage = props.storage,
         isWithinAppendTo = props.isWithinAppendTo;
       var zoomStatus = reactData.zoomStatus;
       var marginSize = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(props.marginSize);
@@ -50000,8 +50116,8 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
         if (!parentWrapperEl) {
           return;
         }
-        var visibleWidth = parentWrapperEl.clientWidth - (resize && isWithinAppendTo ? 8 : 0);
-        var visibleHeight = parentWrapperEl.clientHeight - (resize && isWithinAppendTo ? 8 : 0);
+        var visibleWidth = parentWrapperEl.clientWidth;
+        var visibleHeight = parentWrapperEl.clientHeight;
         var disX = evnt.clientX - boxElem.offsetLeft;
         var disY = evnt.clientY - boxElem.offsetTop;
         document.onmousemove = function (evnt) {
@@ -50032,6 +50148,7 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
           $xeModal.$emit('move', createEvent(evnt, {
             type: 'move'
           }));
+          internalData.isMoveStatus = true;
           reactData.resizeFlag++;
         };
         document.onmouseup = function () {
@@ -50054,16 +50171,15 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
       var props = $xeModal;
       var reactData = $xeModal.reactData;
       evnt.preventDefault();
-      var resize = props.resize,
-        storage = props.storage,
+      var storage = props.storage,
         isWithinAppendTo = props.isWithinAppendTo;
       var el = $xeModal.$refs.refElem;
       var parentWrapperEl = getPopupWrapperElement(isWithinAppendTo ? el : document.body);
       if (!parentWrapperEl) {
         return;
       }
-      var visibleWidth = parentWrapperEl.clientWidth - (resize && isWithinAppendTo ? 8 : 0);
-      var visibleHeight = parentWrapperEl.clientHeight - (resize && isWithinAppendTo ? 8 : 0);
+      var visibleWidth = parentWrapperEl.clientWidth;
+      var visibleHeight = parentWrapperEl.clientHeight;
       var marginSize = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(props.marginSize);
       var targetElem = evnt.target;
       var type = targetElem.getAttribute('data-type');
@@ -50466,7 +50582,7 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
       }
       return h('div', {
         ref: 'refElem',
-        class: ['vxe-modal--wrapper', "type--".concat(type), "zoom--".concat(zoomStatus || 'revert'), className || '', position ? "pos--".concat(position) : '', isWithinAppendTo ? 'ctx--within' : 'ctx--free', (_ref2 = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref2, "size--".concat(vSize), vSize), "status--".concat(status), status), 'is--padding', padding), 'is--border', border), 'is--title-bg', showTitleBackground), 'is--animat', animat), 'lock--scroll', lockScroll), 'lock--view', lockView), 'is--draggable', draggable), 'is--resize', resize), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref2, 'is--mask', mask), 'is--visible', contentVisible), 'is--active', visible), 'is--loading', loading))],
+        class: ['vxe-modal--wrapper', "type--".concat(type), "zoom--".concat(zoomStatus || 'revert'), position ? "pos--".concat(position) : '', isWithinAppendTo ? 'ctx--within' : 'ctx--free', className || '', (_ref2 = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref2, "size--".concat(vSize), vSize), "status--".concat(status), status), 'is--padding', padding), 'is--border', border), 'is--title-bg', showTitleBackground), 'is--animat', animat), 'lock--scroll', lockScroll), 'lock--view', lockView), 'is--draggable', draggable), 'is--resize', resize), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref2, 'is--mask', mask), 'is--visible', contentVisible), 'is--active', visible), 'is--loading', loading))],
         style: {
           zIndex: reactData.modalZindex,
           top: modalTop ? "".concat(modalTop, "px") : null
@@ -50505,6 +50621,10 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
       })) : renderEmptyElement($xeModal)])])] : []);
     }
   },
+  created: function created() {
+    var $xeModal = this;
+    $xeModal.internalData = modal_createInternalData();
+  },
   mounted: function mounted() {
     var $xeModal = this;
     var slots = $xeModal.$scopedSlots;
@@ -50516,7 +50636,7 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
     reactData.initialized = !!props.preload;
     $xeModal.$nextTick(function () {
       if (props.storage && !props.id) {
-        modal_errLog('vxe.error.reqProp', ['[modal] id']);
+        modal_errLog('vxe.error.reqProp', ['id']);
       }
       if (props.value) {
         $xeModal.openModal();
@@ -50526,17 +50646,23 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
     if (props.escClosable) {
       globalEvents.on($xeModal, 'keydown', $xeModal.handleGlobalKeydownEvent);
     }
+    globalEvents.on($xeModal, 'resize', $xeModal.handleGlobalResizeEvent);
   },
   beforeDestroy: function beforeDestroy() {
     var $xeModal = this;
+    var reactData = $xeModal.reactData;
+    var internalData = $xeModal.internalData;
     var panelElem = $xeModal.$refs.refElem;
     if (panelElem && panelElem.parentNode) {
       panelElem.parentNode.removeChild(panelElem);
     }
     globalEvents.off($xeModal, 'keydown');
+    globalEvents.off($xeModal, 'resize');
     $xeModal.removeMsgQueue();
     $xeModal.removeActiveQueue();
     $xeModal.removeBodyLockScroll();
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign(reactData, modal_createReactData());
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign(internalData, modal_createInternalData());
   },
   render: function render(h) {
     return this.renderVN(h);
@@ -50563,6 +50689,7 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
 
 
 
+
 
 
 function handleModal(options) {