vxe-pc-ui 4.16.17 → 4.16.19

package/es/modal/src/modal.js

@@ -1,7 +1,7 @@
 import { h, Teleport, ref, inject, computed, reactive, provide, nextTick, watch, onMounted, onUnmounted } from 'vue';
 import { defineVxeComponent } from '../../ui/src/comp';
 import XEUtils from 'xe-utils';
-import { getDomNode, getEventTargetNode, toCssUnit } from '../../ui/src/dom';
+import { getDomNode, getEventTargetNode, getPopupContainer, toCssUnit } from '../../ui/src/dom';
 import { getLastZIndex, nextZIndex, getSubLastZIndex, nextSubZIndex, getFuncText, handleBooleanDefaultValue } from '../../ui/src/utils';
 import { VxeUI, getConfig, getIcon, getI18n, globalEvents, GLOBAL_EVENT_KEYS, createEvent, useSize, renderEmptyElement } from '../../ui';
 import VxeButtonComponent from '../../button';
@@ -156,6 +156,10 @@ export default defineVxeComponent({
             type: Boolean,
             default: () => getConfig().modal.transfer
         },
+        appendTo: {
+            type: [String, Function],
+            default: () => getConfig().modal.appendTo
+        },
         storage: {
             type: Boolean,
             default: () => getConfig().modal.storage
@@ -941,7 +945,7 @@ export default defineVxeComponent({
             const { visibleHeight, visibleWidth } = getDomNode();
             const marginSize = XEUtils.toNumber(props.marginSize);
             const targetElem = evnt.target;
-            const type = targetElem.getAttribute('type');
+            const type = targetElem.getAttribute('data-type');
             const minWidth = XEUtils.toNumber(props.minWidth);
             const minHeight = XEUtils.toNumber(props.minHeight);
             const maxWidth = visibleWidth;
@@ -1303,7 +1307,7 @@ export default defineVxeComponent({
             return renderEmptyElement($xeModal);
         };
         const renderVN = () => {
-            const { slots: propSlots = {}, className, type, animat, draggable, iconStatus, position, loading, destroyOnClose, status, lockScroll, padding, lockView, mask, resize } = props;
+            const { slots: propSlots = {}, className, type, animat, draggable, iconStatus, position, loading, destroyOnClose, status, lockScroll, padding, lockView, mask, resize, appendTo } = props;
             const { initialized, modalTop, contentVisible, visible, zoomStatus } = reactData;
             const asideSlot = slots.aside || propSlots.aside;
             const vSize = computeSize.value;
@@ -1316,7 +1320,7 @@ export default defineVxeComponent({
                 ons.onMouseout = selfMouseoutEvent;
             }
             return h(Teleport, {
-                to: 'body',
+                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}` : '', {
@@ -1372,7 +1376,7 @@ export default defineVxeComponent({
                                     }, ['wl', 'wr', 'swst', 'sest', 'st', 'swlb', 'selb', 'sb'].map(type => {
                                         return h('span', {
                                             class: `${type}-resize`,
-                                            type: type,
+                                            'data-type': type,
                                             onMousedown: dragEvent
                                         });
                                     }))

package/es/select/src/select.js

@@ -2,7 +2,7 @@ import { h, Teleport, ref, inject, computed, provide, onUnmounted, reactive, nex
 import { defineVxeComponent } from '../../ui/src/comp';
 import XEUtils from 'xe-utils';
 import { VxeUI, getConfig, getIcon, getI18n, globalEvents, GLOBAL_EVENT_KEYS, createEvent, useSize, renderEmptyElement } from '../../ui';
-import { getEventTargetNode, toCssUnit, updatePanelPlacement } from '../../ui/src/dom';
+import { getEventTargetNode, getPopupContainer, toCssUnit, updatePanelPlacement } from '../../ui/src/dom';
 import { getLastZIndex, nextZIndex, getFuncText, eqEmptyValue } from '../../ui/src/utils';
 import { getSlotVNs } from '../../ui/src/vn';
 import { createComponentLog } from '../../ui/src/log';
@@ -1516,6 +1516,7 @@ export default defineVxeComponent({
             const inpPlaceholder = computeInpPlaceholder.value;
             const popupWrapperStyle = computePopupWrapperStyle.value;
             const popupOpts = computePopupOpts.value;
+            const { appendTo } = popupOpts;
             const defaultSlot = slots.default;
             const headerSlot = slots.header;
             const footerSlot = slots.footer;
@@ -1575,7 +1576,7 @@ export default defineVxeComponent({
                     }
                     : {}),
                 h(Teleport, {
-                    to: 'body',
+                    to: getPopupContainer(appendTo),
                     disabled: btnTransfer ? !initialized : true
                 }, [
                     h('div', {