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 @@
\ No newline at end of file
+
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 @@
+
@@ -13,28 +14,28 @@
{{col.title}}:
-
onCalendarChange(time, timeStr, col)" @openChange="open => onCalendarOpenChange(open, col)" class="time-picker" size="small" />
+ onCalendarChange(time, timeStr, col)" @openChange="open => onCalendarOpenChange(open, col)" class="time-picker" size="small" :get-popup-container="() => $refs.root"/>
{{col.title}}:
-
onCalendarChange(date, dateStr, col)" @openChange="open => onCalendarOpenChange(open, col)" show-time class="datetime-picker" size="small" />
+ onCalendarChange(date, dateStr, col)" @openChange="open => onCalendarOpenChange(open, col)" class="datetime-picker" size="small" show-time :getCalendarContainer="() => $refs.root"/>
-
+
@@ -199,6 +200,9 @@
\ No newline at end of file
+