vxe-pc-ui 4.17.26 → 4.17.27

package/dist/all.esm.js

@@ -101,7 +101,7 @@ function checkDynamic() {
 }
 
 const { log } = VxeUI;
-const uiVersion = `ui v${"4.17.26"}`;
+const uiVersion = `ui v${"4.17.27"}`;
 function createComponentLog(name) {
     const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -115,7 +115,7 @@ function createComponentLog(name) {
 const warnLog$i = log.create('warn', uiVersion);
 log.create('error', uiVersion);
 
-const version = "4.17.26";
+const version = "4.17.27";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -2014,8 +2014,7 @@ function updatePanelPlacement(targetElem, panelElem, options) {
     const stys = {};
     if (panelElem && targetElem) {
         const bodyEl = document.body;
-        const parentEl = panelElem.parentElement;
-        const parentWrapperEl = parentEl === bodyEl ? document.documentElement : parentEl;
+        const parentWrapperEl = getPopupWrapperElement(panelElem);
         if (parentWrapperEl) {
             const targetWidth = targetElem.offsetWidth;
             const targetHeight = targetElem.offsetHeight;
@@ -2139,6 +2138,14 @@ function updatePanelPlacement(targetElem, panelElem, options) {
         placement: panelPlacement
     };
 }
+function getPopupWrapperElement(panelElem) {
+    if (!panelElem) {
+        return null;
+    }
+    const bodyEl = document.body;
+    const parentEl = panelElem.parentElement;
+    return (parentEl === bodyEl ? document.documentElement : parentEl) || null;
+}
 function getPopupContainer(appendTo) {
     const selectElem = appendTo && XEUtils.isFunction(appendTo) ? appendTo({}) : appendTo;
     return selectElem || 'body';
@@ -29916,6 +29923,10 @@ var VxeModalComponent = defineVxeComponent({
             type: [String, Function],
             default: () => getConfig$3().modal.appendTo
         },
+        isWithinAppendTo: {
+            type: Boolean,
+            default: () => getConfig$3().modal.isWithinAppendTo
+        },
         storage: {
             type: Boolean,
             default: () => getConfig$3().modal.storage
@@ -30070,14 +30081,20 @@ var VxeModalComponent = defineVxeComponent({
         };
         const updatePosition = () => {
             return nextTick().then(() => {
-                const { position } = props;
-                const marginSize = XEUtils.toNumber(props.marginSize);
+                const { position, isWithinAppendTo } = props;
+                const btnTransfer = computeBtnTransfer.value;
+                const el = refElem.value;
                 const boxElem = getBox();
                 if (!boxElem) {
                     return;
                 }
-                const clientVisibleWidth = document.documentElement.clientWidth || document.body.clientWidth;
-                const clientVisibleHeight = document.documentElement.clientHeight || document.body.clientHeight;
+                const parentWrapperEl = getPopupWrapperElement(isWithinAppendTo && btnTransfer ? el : document.body);
+                if (!parentWrapperEl) {
+                    return;
+                }
+                const clientVisibleWidth = parentWrapperEl.clientWidth;
+                const clientVisibleHeight = parentWrapperEl.clientHeight;
+                const marginSize = XEUtils.toNumber(props.marginSize);
                 const isPosCenter = position === 'center';
                 const { top, left } = XEUtils.isString(position) ? { top: position, left: position } : Object.assign({}, position);
                 const topCenter = isPosCenter || top === 'center';
@@ -30256,6 +30273,8 @@ var VxeModalComponent = defineVxeComponent({
             }
         };
         const handleMinimize = () => {
+            const { isWithinAppendTo } = props;
+            const btnTransfer = computeBtnTransfer.value;
             const zoomOpts = computeZoomOpts.value;
             const { minimizeLayout, minimizeMaxSize, minimizeHorizontalOffset, minimizeVerticalOffset, minimizeOffsetMethod } = zoomOpts;
             const isHorizontalLayout = minimizeLayout === 'horizontal';
@@ -30289,6 +30308,7 @@ var VxeModalComponent = defineVxeComponent({
             reactData.prevZoomStatus = prevZoomStatus;
             reactData.zoomStatus = 'minimize';
             return nextTick().then(() => {
+                const el = refElem.value;
                 const boxElem = getBox();
                 if (!boxElem) {
                     return {
@@ -30301,7 +30321,13 @@ var VxeModalComponent = defineVxeComponent({
                         status: false
                     };
                 }
-                const { visibleHeight } = getDomNode();
+                const parentWrapperEl = getPopupWrapperElement(isWithinAppendTo && btnTransfer ? el : document.body);
+                if (!parentWrapperEl) {
+                    return {
+                        status: false
+                    };
+                }
+                const visibleHeight = parentWrapperEl.clientHeight;
                 // 如果当前处于复原状态
                 if (!prevZoomStatus) {
                     reactData.revertLocat = {
@@ -30357,6 +30383,8 @@ var VxeModalComponent = defineVxeComponent({
             });
         };
         const handleMaximize = () => {
+            const { isWithinAppendTo } = props;
+            const btnTransfer = computeBtnTransfer.value;
             const prevZoomStatus = reactData.zoomStatus;
             reactData.prevZoomStatus = prevZoomStatus;
             reactData.zoomStatus = 'maximize';
@@ -30365,9 +30393,16 @@ var VxeModalComponent = defineVxeComponent({
                 if (boxElem) {
                     // 如果当前处于复原状态
                     if (!prevZoomStatus) {
+                        const el = refElem.value;
+                        const parentWrapperEl = getPopupWrapperElement(isWithinAppendTo && btnTransfer ? el : document.body);
+                        if (!parentWrapperEl) {
+                            return {
+                                status: false
+                            };
+                        }
+                        const clientVisibleWidth = parentWrapperEl.clientWidth;
+                        const clientVisibleHeight = parentWrapperEl.clientHeight;
                         const marginSize = XEUtils.toNumber(props.marginSize);
-                        const clientVisibleWidth = document.documentElement.clientWidth || document.body.clientWidth;
-                        const 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),
@@ -30640,8 +30675,9 @@ var VxeModalComponent = defineVxeComponent({
             }
         };
         const mousedownEvent = (evnt) => {
-            const { storage } = props;
+            const { resize, storage, isWithinAppendTo } = props;
             const { zoomStatus } = reactData;
+            const btnTransfer = computeBtnTransfer.value;
             const marginSize = XEUtils.toNumber(props.marginSize);
             const boxElem = getBox();
             if (!boxElem) {
@@ -30649,9 +30685,15 @@ var VxeModalComponent = defineVxeComponent({
             }
             if (zoomStatus !== 'maximize' && evnt.button === 0 && !getEventTargetNode(evnt, boxElem, 'trigger--btn').flag) {
                 evnt.preventDefault();
+                const el = refElem.value;
+                const parentWrapperEl = getPopupWrapperElement(isWithinAppendTo && btnTransfer ? el : document.body);
+                if (!parentWrapperEl) {
+                    return;
+                }
+                const visibleWidth = parentWrapperEl.clientWidth - (resize && isWithinAppendTo ? 8 : 0);
+                const visibleHeight = parentWrapperEl.clientHeight - (resize && isWithinAppendTo ? 8 : 0);
                 const disX = evnt.clientX - boxElem.offsetLeft;
                 const disY = evnt.clientY - boxElem.offsetTop;
-                const { visibleHeight, visibleWidth } = getDomNode();
                 document.onmousemove = evnt => {
                     evnt.preventDefault();
                     const offsetWidth = boxElem.offsetWidth;
@@ -30697,8 +30739,15 @@ var VxeModalComponent = defineVxeComponent({
         };
         const dragEvent = (evnt) => {
             evnt.preventDefault();
-            const { storage } = props;
-            const { visibleHeight, visibleWidth } = getDomNode();
+            const { resize, storage, isWithinAppendTo } = props;
+            const btnTransfer = computeBtnTransfer.value;
+            const el = refElem.value;
+            const parentWrapperEl = getPopupWrapperElement(isWithinAppendTo && btnTransfer ? el : document.body);
+            if (!parentWrapperEl) {
+                return;
+            }
+            const visibleWidth = parentWrapperEl.clientWidth - (resize && isWithinAppendTo ? 8 : 0);
+            const visibleHeight = parentWrapperEl.clientHeight - (resize && isWithinAppendTo ? 8 : 0);
             const marginSize = XEUtils.toNumber(props.marginSize);
             const targetElem = evnt.target;
             const type = targetElem.getAttribute('data-type');
@@ -31063,7 +31112,7 @@ var VxeModalComponent = defineVxeComponent({
             return renderEmptyElement($xeModal);
         };
         const renderVN = () => {
-            const { slots: propSlots = {}, className, type, animat, draggable, iconStatus, position, loading, destroyOnClose, status, lockScroll, padding, lockView, mask, resize, appendTo } = props;
+            const { slots: propSlots = {}, className, type, animat, draggable, iconStatus, position, loading, destroyOnClose, status, lockScroll, padding, lockView, mask, resize, appendTo, isWithinAppendTo } = props;
             const { initialized, modalTop, contentVisible, visible, zoomStatus } = reactData;
             const asideSlot = slots.aside || propSlots.aside;
             const vSize = computeSize.value;
@@ -31079,7 +31128,7 @@ var VxeModalComponent = defineVxeComponent({
                 to: getPopupContainer(appendTo),
                 disabled: btnTransfer ? !initialized : true
             }, [
-                h('div', Object.assign({ ref: refElem, class: ['vxe-modal--wrapper', `type--${type}`, `zoom--${zoomStatus || 'revert'}`, className || '', position ? `pos--${position}` : '', {
+                h('div', Object.assign({ ref: refElem, class: ['vxe-modal--wrapper', `type--${type}`, `zoom--${zoomStatus || 'revert'}`, className || '', position ? `pos--${position}` : '', isWithinAppendTo ? 'ctx--within' : 'ctx--free', {
                             [`size--${vSize}`]: vSize,
                             [`status--${status}`]: status,
                             'is--padding': padding,