From e76080d1764c8a3cedc5d15697b0cd15771a3952 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Mon, 7 Nov 2022 17:52:03 +0800
Subject: [PATCH] =?UTF-8?q?getContainer=E9=97=AE=E9=A2=98=E5=B0=86?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E3=80=81=E6=97=A5=E6=9C=9F=E7=AD=89?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=8C=82=E8=BD=BD=E5=88=B0modal=E4=B8=8A?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=BC=B9=E7=AA=97=E9=81=AE=E7=9B=96?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Form/src/jeecg/components/JPopup.vue | 2 ++
 src/views/system/tenant/tenant.data.ts              | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/src/components/Form/src/jeecg/components/JPopup.vue b/src/components/Form/src/jeecg/components/JPopup.vue
index b881dd3..9ecefe0 100644
--- a/src/components/Form/src/jeecg/components/JPopup.vue
+++ b/src/components/Form/src/jeecg/components/JPopup.vue
@@ -21,6 +21,7 @@
       :groupId="uniqGroupId"
       :param="param"
       @ok="callBack"
+      :getContainer="getContainer"
     ></JPopupOnlReportModal>
   </div>
 </template>
@@ -50,6 +51,7 @@
       groupId: propTypes.string.def(''),
       formElRef: propTypes.object,
       setFieldsValue: propTypes.func,
+      getContainer: propTypes.func,
       fieldConfig: {
         type: Array,
         default: () => [],
diff --git a/src/views/system/tenant/tenant.data.ts b/src/views/system/tenant/tenant.data.ts
index b73df76..10366a3 100644
--- a/src/views/system/tenant/tenant.data.ts
+++ b/src/views/system/tenant/tenant.data.ts
@@ -1,4 +1,5 @@
 import { BasicColumn, FormSchema } from '/@/components/Table';
+import { getAutoScrollContainer } from '/@/utils/common/compUtils';
 
 export const columns: BasicColumn[] = [
   {
@@ -83,6 +84,7 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       showTime: true,
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      getPopupContainer: getAutoScrollContainer,
     },
   },
   {
@@ -92,6 +94,7 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       showTime: true,
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      getPopupContainer: getAutoScrollContainer,
     },
   },
   {