From 904649c7c810e4e03b0abb87f1f9b39879264450 Mon Sep 17 00:00:00 2001
From: chenghongxing <1126263215@qq.com>
Date: Sat, 3 Oct 2020 00:22:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20popup=20container=20problem=20of=20A?=
 =?UTF-8?q?dvanceTable.vue=20in=20full=20screen=20mode;=20:bug:=20fix?=
 =?UTF-8?q?=EF=BC=9A=E9=AB=98=E7=BA=A7=E8=A1=A8=E6=A0=BC=E5=85=A8=E5=B1=8F?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8B=E6=B5=AE=E5=B1=82=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/advance/AdvanceTable.vue |  6 +++++-
 src/components/table/advance/SearchArea.vue   | 17 +++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/components/table/advance/AdvanceTable.vue b/src/components/table/advance/AdvanceTable.vue
index cf36384..1dd73a2 100644
--- a/src/components/table/advance/AdvanceTable.vue
+++ b/src/components/table/advance/AdvanceTable.vue
@@ -131,6 +131,7 @@
       },
       inFullScreen() {
         const el = this.$refs.table
+        el.classList.add('beauty-scroll')
         if (el.requestFullscreen) {
           el.requestFullscreen()
           return true
@@ -145,6 +146,7 @@
           return true
         }
         this.$message.warn('对不起，您的浏览器不支持全屏模式')
+        el.classList.remove('beauty-scroll')
         return false
       },
       outFullScreen() {
@@ -157,6 +159,7 @@
         } else if (document.msExitFullscreen) {
           document.msExiFullscreen()
         }
+        this.$refs.table.classList.remove('beauty-scroll')
       },
       onColumnsReset(conditions) {
         this.$emit('reset', conditions)
@@ -193,6 +196,7 @@
 
 <style scoped lang="less">
 .advanced-table{
+  overflow-y: auto;
   background-color: @component-background;
   .header-bar{
     padding: 16px 24px;
@@ -236,4 +240,4 @@
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/table/advance/SearchArea.vue b/src/components/table/advance/SearchArea.vue
index ef1b2da..e611b95 100644
--- a/src/components/table/advance/SearchArea.vue
+++ b/src/components/table/advance/SearchArea.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="search-area" ref="root">
+    <div class="select-root" ref="selectRoot"></div>
     <div class="search-item" :key="index" v-for="(col, index) in searchCols">
       <div v-if="col.dataType === 'boolean'" class="title active">
         <template v-if="col.title">
@@ -13,28 +14,28 @@
           {{col.title}}:
         </template>
         <slot v-else-if="col.slots && col.slots.title" :name="col.slots.title"></slot>
-        <a-time-picker v-model="col.search.value" placeholder="选择时间" @change="(time, timeStr) => onCalendarChange(time, timeStr, col)" @openChange="open => onCalendarOpenChange(open, col)" class="time-picker" size="small" />
+        <a-time-picker v-model="col.search.value" placeholder="选择时间" @change="(time, timeStr) => onCalendarChange(time, timeStr, col)" @openChange="open => onCalendarOpenChange(open, col)" class="time-picker" size="small" :get-popup-container="() => $refs.root"/>
       </div>
       <div v-else-if="col.dataType === 'date'" class="title active">
         <template v-if="col.title">
           {{col.title}}:
         </template>
         <slot v-else-if="col.slots && col.slots.title" :name="col.slots.title"></slot>
-        <a-date-picker v-model="col.search.value" @change="onDateChange(col)" class="date-picker" size="small" />
+        <a-date-picker v-model="col.search.value" @change="onDateChange(col)" class="date-picker" size="small" :getCalendarContainer="() => $refs.root"/>
       </div>
       <div v-else-if="col.dataType === 'datetime'" class="title datetime active">
         <template v-if="col.title">
           {{col.title}}:
         </template>
         <slot v-else-if="col.slots && col.slots.title" :name="col.slots.title"></slot>
-        <a-date-picker v-model="col.search.value" @change="(date, dateStr) => onCalendarChange(date, dateStr, col)" @openChange="open => onCalendarOpenChange(open, col)" show-time class="datetime-picker" size="small" />
+        <a-date-picker v-model="col.search.value" @change="(date, dateStr) => onCalendarChange(date, dateStr, col)" @openChange="open => onCalendarOpenChange(open, col)" class="datetime-picker" size="small" show-time :getCalendarContainer="() => $refs.root"/>
       </div>
-      <div v-else-if="col.dataType === 'select'" class="title active">
+      <div v-else-if="col.dataType === 'select'" class="title active" >
         <template v-if="col.title">
           {{col.title}}:
         </template>
         <slot v-else-if="col.slots && col.slots.title" :name="col.slots.title"></slot>
-        <a-select :allowClear="true" :options="col.search.selectOptions" v-model="col.search.value" placeholder="请选择..." @change="onSelectChange(col)" class="select" slot="content" size="small">
+        <a-select :allowClear="true" :options="col.search.selectOptions" v-model="col.search.value" placeholder="请选择..." @change="onSelectChange(col)" class="select" slot="content" size="small" :get-popup-container="() => $refs.selectRoot">
         </a-select>
       </div>
       <a-popover v-else @visibleChange="onVisibleChange(col, index)" v-model="col.search.visible" placement="bottom" :trigger="['click']" :get-popup-container="() => $refs.root">
@@ -199,6 +200,9 @@
 
 <style scoped lang="less">
 .search-area{
+  .select-root{
+    text-align: left;
+  }
   margin: -4px 0;
   .search-item{
     margin: 4px 4px;
@@ -251,6 +255,7 @@
     margin-left: 4px;
     max-width: 144px;
     min-width: 96px;
+    text-align: left;
   }
   .operations{
     display: flex;
@@ -259,4 +264,4 @@
     }
   }
 }
-</style>
\ No newline at end of file
+</style>

From 9dcb132acd80203973bc0f98f7be6409896030b4 Mon Sep 17 00:00:00 2001
From: iczer <1126263215@qq.com>
Date: Sat, 3 Oct 2020 10:52:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20scroll=20problem=20of=20page;=20:bug?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=EF=BC=9A=E9=A1=B5=E9=9D=A2=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/AdminLayout.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/AdminLayout.vue b/src/layouts/AdminLayout.vue
index ab684b5..4c8640c 100644
--- a/src/layouts/AdminLayout.vue
+++ b/src/layouts/AdminLayout.vue
@@ -151,7 +151,7 @@ export default {
     }
     .admin-layout-content{
       padding: 24px 24px 0;
-      overflow-x: hidden;
+      /*overflow-x: hidden;*/
       min-height: calc(100vh - 64px - 122px);
     }
     .setting{