vxe-pc-ui 3.17.26 → 3.17.27

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.26");
+var uiVersion = "ui v".concat("3.17.27");
 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.26";
+var ui_version = "3.17.27";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -15296,8 +15296,7 @@ function updatePanelPlacement(targetElem, panelElem, options) {
   var stys = {};
   if (panelElem && targetElem) {
     var bodyEl = document.body;
-    var parentEl = panelElem.parentElement;
-    var parentWrapperEl = parentEl === bodyEl ? document.documentElement : parentEl;
+    var parentWrapperEl = getPopupWrapperElement(panelElem);
     if (parentWrapperEl) {
       var targetWidth = targetElem.offsetWidth;
       var targetHeight = targetElem.offsetHeight;
@@ -15415,6 +15414,14 @@ function updatePanelPlacement(targetElem, panelElem, options) {
     placement: panelPlacement
   };
 }
+function getPopupWrapperElement(panelElem) {
+  if (!panelElem) {
+    return null;
+  }
+  var bodyEl = document.body;
+  var parentEl = panelElem.parentElement;
+  return (parentEl === bodyEl ? document.documentElement : parentEl) || null;
+}
 function getPopupContainer(appendTo) {
   var selectElem = appendTo && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(appendTo) ? appendTo({}) : appendTo;
   return selectElem || 'body';
@@ -48963,6 +48970,12 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
         return getConfig().modal.appendTo;
       }
     },
+    isWithinAppendTo: {
+      type: Boolean,
+      default: function _default() {
+        return getConfig().modal.isWithinAppendTo;
+      }
+    },
     storage: {
       type: Boolean,
       default: function _default() {
@@ -49272,14 +49285,21 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
       var $xeModal = this;
       var props = $xeModal;
       return $xeModal.$nextTick().then(function () {
-        var position = props.position;
-        var marginSize = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(props.marginSize);
+        var position = props.position,
+          isWithinAppendTo = props.isWithinAppendTo;
+        var btnTransfer = $xeModal.computeBtnTransfer;
+        var el = $xeModal.$refs.refElem;
         var boxElem = $xeModal.getBox();
         if (!boxElem) {
           return;
         }
-        var clientVisibleWidth = document.documentElement.clientWidth || document.body.clientWidth;
-        var clientVisibleHeight = document.documentElement.clientHeight || document.body.clientHeight;
+        var parentWrapperEl = getPopupWrapperElement(isWithinAppendTo && btnTransfer ? el : document.body);
+        if (!parentWrapperEl) {
+          return;
+        }
+        var clientVisibleWidth = parentWrapperEl.clientWidth;
+        var clientVisibleHeight = parentWrapperEl.clientHeight;
+        var marginSize = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(props.marginSize);
         var isPosCenter = position === 'center';
         var _ref = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(position) ? {
             top: position,
@@ -49507,7 +49527,10 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
     },
     handleMinimize: function handleMinimize() {
       var $xeModal = this;
+      var props = $xeModal;
       var reactData = $xeModal.reactData;
+      var isWithinAppendTo = props.isWithinAppendTo;
+      var btnTransfer = $xeModal.computeBtnTransfer;
       var zoomOpts = $xeModal.computeZoomOpts;
       var minimizeLayout = zoomOpts.minimizeLayout,
         minimizeMaxSize = zoomOpts.minimizeMaxSize,
@@ -49544,6 +49567,7 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
       reactData.prevZoomStatus = prevZoomStatus;
       reactData.zoomStatus = 'minimize';
       return $xeModal.$nextTick().then(function () {
+        var el = $xeModal.$refs.refElem;
         var boxElem = $xeModal.getBox();
         if (!boxElem) {
           return {
@@ -49556,8 +49580,13 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
             status: false
           };
         }
-        var _getDomNode = getDomNode(),
-          visibleHeight = _getDomNode.visibleHeight;
+        var parentWrapperEl = getPopupWrapperElement(isWithinAppendTo && btnTransfer ? el : document.body);
+        if (!parentWrapperEl) {
+          return {
+            status: false
+          };
+        }
+        var visibleHeight = parentWrapperEl.clientHeight;
         // 如果当前处于复原状态
         if (!prevZoomStatus) {
           reactData.revertLocat = {
@@ -49615,6 +49644,8 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
       var $xeModal = this;
       var props = $xeModal;
       var reactData = $xeModal.reactData;
+      var isWithinAppendTo = props.isWithinAppendTo;
+      var btnTransfer = $xeModal.computeBtnTransfer;
       var prevZoomStatus = reactData.zoomStatus;
       reactData.prevZoomStatus = prevZoomStatus;
       reactData.zoomStatus = 'maximize';
@@ -49623,9 +49654,16 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
         if (boxElem) {
           // 如果当前处于复原状态
           if (!prevZoomStatus) {
+            var el = $xeModal.$refs.refElem;
+            var parentWrapperEl = getPopupWrapperElement(isWithinAppendTo && btnTransfer ? el : document.body);
+            if (!parentWrapperEl) {
+              return {
+                status: false
+              };
+            }
+            var clientVisibleWidth = parentWrapperEl.clientWidth;
+            var clientVisibleHeight = parentWrapperEl.clientHeight;
             var marginSize = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(props.marginSize);
-            var clientVisibleWidth = document.documentElement.clientWidth || document.body.clientWidth;
-            var clientVisibleHeight = document.documentElement.clientHeight || document.body.clientHeight;
             reactData.revertLocat = {
               top: Math.max(marginSize, clientVisibleHeight / 2 - boxElem.offsetHeight / 2),
               left: Math.max(marginSize, clientVisibleWidth / 2 - boxElem.offsetWidth / 2),
@@ -49917,8 +49955,11 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
       var $xeModal = this;
       var props = $xeModal;
       var reactData = $xeModal.reactData;
-      var storage = props.storage;
+      var resize = props.resize,
+        storage = props.storage,
+        isWithinAppendTo = props.isWithinAppendTo;
       var zoomStatus = reactData.zoomStatus;
+      var btnTransfer = $xeModal.computeBtnTransfer;
       var marginSize = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(props.marginSize);
       var boxElem = $xeModal.getBox();
       if (!boxElem) {
@@ -49926,11 +49967,15 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
       }
       if (zoomStatus !== 'maximize' && evnt.button === 0 && !getEventTargetNode(evnt, boxElem, 'trigger--btn').flag) {
         evnt.preventDefault();
+        var el = $xeModal.$refs.refElem;
+        var parentWrapperEl = getPopupWrapperElement(isWithinAppendTo && btnTransfer ? el : document.body);
+        if (!parentWrapperEl) {
+          return;
+        }
+        var visibleWidth = parentWrapperEl.clientWidth - (resize && isWithinAppendTo ? 8 : 0);
+        var visibleHeight = parentWrapperEl.clientHeight - (resize && isWithinAppendTo ? 8 : 0);
         var disX = evnt.clientX - boxElem.offsetLeft;
         var disY = evnt.clientY - boxElem.offsetTop;
-        var _getDomNode2 = getDomNode(),
-          visibleHeight = _getDomNode2.visibleHeight,
-          visibleWidth = _getDomNode2.visibleWidth;
         document.onmousemove = function (evnt) {
           evnt.preventDefault();
           var offsetWidth = boxElem.offsetWidth;
@@ -49981,10 +50026,17 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
       var props = $xeModal;
       var reactData = $xeModal.reactData;
       evnt.preventDefault();
-      var storage = props.storage;
-      var _getDomNode3 = getDomNode(),
-        visibleHeight = _getDomNode3.visibleHeight,
-        visibleWidth = _getDomNode3.visibleWidth;
+      var resize = props.resize,
+        storage = props.storage,
+        isWithinAppendTo = props.isWithinAppendTo;
+      var btnTransfer = $xeModal.computeBtnTransfer;
+      var el = $xeModal.$refs.refElem;
+      var parentWrapperEl = getPopupWrapperElement(isWithinAppendTo && btnTransfer ? el : document.body);
+      if (!parentWrapperEl) {
+        return;
+      }
+      var visibleWidth = parentWrapperEl.clientWidth - (resize && isWithinAppendTo ? 8 : 0);
+      var visibleHeight = parentWrapperEl.clientHeight - (resize && isWithinAppendTo ? 8 : 0);
       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');
@@ -50367,7 +50419,8 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
         padding = props.padding,
         lockView = props.lockView,
         mask = props.mask,
-        resize = props.resize;
+        resize = props.resize,
+        isWithinAppendTo = props.isWithinAppendTo;
       var initialized = reactData.initialized,
         modalTop = reactData.modalTop,
         contentVisible = reactData.contentVisible,
@@ -50384,7 +50437,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) : '', (_ref2 = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref2, "size--".concat(vSize), vSize), "status--".concat(status), status), 'is--padding', padding), 'is--animat', animat), 'lock--scroll', lockScroll), 'lock--view', lockView), 'is--draggable', draggable), 'is--resize', resize), 'is--mask', mask), 'is--visible', contentVisible), _defineProperty(_defineProperty(_ref2, 'is--active', visible), 'is--loading', loading))],
+        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--animat', animat), 'lock--scroll', lockScroll), 'lock--view', lockView), 'is--draggable', draggable), 'is--resize', resize), 'is--mask', mask), 'is--visible', contentVisible), _defineProperty(_defineProperty(_ref2, 'is--active', visible), 'is--loading', loading))],
         style: {
           zIndex: reactData.modalZindex,
           top: modalTop ? "".concat(modalTop, "px") : null