From 76b61c1542e6605eecc4ee7260a79d70c1246e23 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Tue, 28 Apr 2020 10:57:54 +0800
Subject: [PATCH] Fix page display incomplete
---
.../projects/pages/definition/pages/list/index.vue | 13 +++++++++++--
.../projects/pages/instance/pages/list/index.vue | 11 +++++++++--
.../pages/projects/pages/taskInstance/index.vue | 11 +++++++++--
.../pages/resource/pages/file/pages/list/index.vue | 13 +++++++++++--
.../pages/file/pages/subdirectory/index.vue | 11 ++++++++++-
.../resource/pages/udf/pages/function/index.vue | 14 +++++++++++---
.../resource/pages/udf/pages/resource/index.vue | 14 +++++++++++---
.../pages/udf/pages/subUdfDirectory/index.vue | 11 ++++++++++-
.../conf/home/pages/security/pages/queue/index.vue | 11 ++++++++++-
.../home/pages/security/pages/tenement/index.vue | 11 ++++++++++-
.../conf/home/pages/security/pages/users/index.vue | 13 +++++++++++--
.../pages/security/pages/warningGroups/index.vue | 11 ++++++++++-
.../js/conf/home/pages/user/pages/token/index.vue | 13 +++++++++++--
dolphinscheduler-ui/src/js/conf/login/App.vue | 1 +
.../components/secondaryMenu/secondaryMenu.vue | 8 +++++++-
.../src/js/module/components/spin/spin.vue | 8 ++++----
dolphinscheduler-ui/src/sass/conf/home/index.scss | 5 +++++
17 files changed, 151 insertions(+), 28 deletions(-)
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
index 1f28578504..5dd12b4355 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
@@ -35,7 +35,7 @@
-
+
@@ -64,7 +64,8 @@
pageNo: 1,
searchVal: '',
userId: ''
- }
+ },
+ isLeft: true
}
},
mixins: [listUrlParamHandle],
@@ -98,6 +99,11 @@
* get data list
*/
_getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this.isLoading = !flag
this.getProcessListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -133,6 +139,9 @@
mounted() {
this.$modal.destroy()
},
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
components: { mList, mConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
index b95d4ed720..891dc2e281 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
@@ -30,7 +30,7 @@
-
+
@@ -74,7 +74,8 @@
endDate: '',
// Exectuor Name
executorName: ''
- }
+ },
+ isLeft: true
}
},
props: {},
@@ -136,6 +137,11 @@
* @desc Prevent functions from being called multiple times
*/
_debounceGET: _.debounce(function (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this._getProcessInstanceListP(flag)
}, 100, {
'leading': false,
@@ -183,6 +189,7 @@
beforeDestroy () {
// Destruction wheel
clearInterval(this.setIntervalP)
+ sessionStorage.setItem('isLeft',1)
},
components: { mList, mInstanceConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
index 4cb166647e..594ffad14e 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
@@ -30,7 +30,7 @@
-
+
@@ -71,7 +71,8 @@
endDate: '',
// Exectuor Name
executorName: ''
- }
+ },
+ isLeft: true
}
},
mixins: [listUrlParamHandle],
@@ -118,6 +119,11 @@
* @desc Prevent functions from being called multiple times
*/
_debounceGET: _.debounce(function (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this._getList(flag)
}, 100, {
'leading': false,
@@ -146,6 +152,7 @@
beforeDestroy () {
// Destruction wheel
clearInterval(this.setIntervalP)
+ sessionStorage.setItem('isLeft',1)
},
components: { mList, mInstanceConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
index 73ce023ee7..5cf343ddda 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
@@ -38,7 +38,7 @@
-
+
@@ -67,7 +67,8 @@
pageNo: 1,
searchVal: '',
type: 'FILE'
- }
+ },
+ isLeft: true
}
},
mixins: [listUrlParamHandle],
@@ -91,6 +92,11 @@
this.searchParams.pageSize = val
},
_getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this.isLoading = !flag
this.getResourcesListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -125,6 +131,9 @@
mounted () {
this.$modal.destroy()
},
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
components: { mListConstruction, mConditions, mList, mSpin, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue
index 12be6b0bc8..dac5cc0a86 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue
@@ -42,7 +42,7 @@
-
+
@@ -73,6 +73,7 @@
searchVal: '',
type: 'FILE'
},
+ isLeft: true,
breadList: []
}
},
@@ -97,6 +98,11 @@
this.searchParams.pageSize = val
},
_getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this.isLoading = !flag
this.getResourcesListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -159,6 +165,9 @@
this.breadList = dir
this.$modal.destroy()
},
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
components: { mListConstruction, mConditions, mList, mSpin, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
index d6c79bd258..74b789fe93 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
@@ -36,8 +36,7 @@
-
-
+
@@ -64,7 +63,8 @@
pageSize: 10,
pageNo: 1,
searchVal: ''
- }
+ },
+ isLeft: true
}
},
mixins: [listUrlParamHandle],
@@ -110,6 +110,11 @@
this._debounceGET()
},
_getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this.isLoading = !flag
this.getUdfFuncListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -137,6 +142,9 @@
mounted () {
this.$modal.destroy()
},
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
components: { mListConstruction, mConditions, mList, mSpin, mCreateUdf, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
index b87b17800a..4058f267b7 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
@@ -37,8 +37,7 @@
-
-
+
@@ -66,7 +65,8 @@
pageNo: 1,
searchVal: '',
type: 'UDF'
- }
+ },
+ isLeft: true
}
},
mixins: [listUrlParamHandle],
@@ -98,6 +98,11 @@
this._debounceGET()
},
_getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this.isLoading = !flag
this.getResourcesListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -125,6 +130,9 @@
mounted () {
this.$modal.destroy()
},
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
components: { mListConstruction, mConditions, mList, mSpin, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/index.vue
index dd39716f9a..ea8c4d838f 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/index.vue
@@ -41,7 +41,7 @@
-
+
@@ -72,6 +72,7 @@
searchVal: '',
type: 'UDF'
},
+ isLeft: true,
breadList: []
}
},
@@ -106,6 +107,11 @@
this._debounceGET()
},
_getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this.isLoading = !flag
this.getResourcesListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -160,6 +166,9 @@
this.breadList = dir
this.$modal.destroy()
},
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
components: { mListConstruction, mConditions, mList, mSpin, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
index 47ce14abd7..8e559e45a7 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
@@ -38,7 +38,7 @@
-
+
@@ -66,6 +66,7 @@
pageNo: 1,
searchVal: ''
},
+ isLeft: true,
isADMIN: store.state.user.userInfo.userType === 'ADMIN_USER'
}
},
@@ -116,6 +117,11 @@
})
},
_getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this.isLoading = !flag
this.getQueueListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -143,6 +149,9 @@
mounted () {
this.$modal.destroy()
},
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
components: { mList, mListConstruction, mConditions, mSpin, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
index 0c38f0a911..ca180b1718 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
@@ -39,7 +39,7 @@
-
+
@@ -67,6 +67,7 @@
pageNo: 1,
searchVal: ''
},
+ isLeft: true,
isADMIN: store.state.user.userInfo.userType === 'ADMIN_USER'
}
},
@@ -120,6 +121,11 @@
})
},
_getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this.isLoading = !flag
this.getTenantListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -147,6 +153,9 @@
mounted () {
this.$modal.destroy()
},
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
components: { mList, mListConstruction, mConditions, mSpin, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
index f8ad40df85..b09b08bcf6 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
@@ -39,7 +39,7 @@
-
+
@@ -65,7 +65,8 @@
pageSize: 10,
pageNo: 1,
searchVal: ''
- }
+ },
+ isLeft: true
}
},
mixins: [listUrlParamHandle],
@@ -118,6 +119,11 @@
})
},
_getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this.isLoading = !flag
this.getUsersListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -145,6 +151,9 @@
mounted () {
this.$modal.destroy()
},
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
components: { mList, mListConstruction, mConditions, mSpin, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
index e70ead46ce..ad604ba3a6 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
@@ -39,7 +39,7 @@
-
+
@@ -67,6 +67,7 @@
pageNo: 1,
searchVal: ''
},
+ isLeft: true,
isADMIN: store.state.user.userInfo.userType === 'ADMIN_USER'
}
},
@@ -120,6 +121,11 @@
})
},
_getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this.isLoading = !flag
this.getAlertgroupP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -147,6 +153,9 @@
mounted () {
this.$modal.destroy()
},
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
components: { mList, mListConstruction, mConditions, mSpin, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue
index 21d2becd32..3398acca13 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue
@@ -40,7 +40,7 @@
-
+
@@ -67,7 +67,8 @@
pageSize: 10,
pageNo: 1,
searchVal: ''
- }
+ },
+ isLeft: true
}
},
mixins: [listUrlParamHandle],
@@ -120,6 +121,11 @@
})
},
_getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this.isLoading = !flag
this.getTokenListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -147,6 +153,9 @@
mounted () {
this.$modal.destroy()
},
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
components: { mSecondaryMenu, mList, mListConstruction, mConditions, mSpin, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/login/App.vue b/dolphinscheduler-ui/src/js/conf/login/App.vue
index a79743a262..8d065920a8 100644
--- a/dolphinscheduler-ui/src/js/conf/login/App.vue
+++ b/dolphinscheduler-ui/src/js/conf/login/App.vue
@@ -84,6 +84,7 @@
this._gLogin().then(res => {
setTimeout(() => {
this.spinnerLoading = false
+ sessionStorage.setItem('isLeft',1);
if (res.data.hasOwnProperty("sessionId")) {
let sessionId=res.data.sessionId
sessionStorage.setItem("sessionId", sessionId)
diff --git a/dolphinscheduler-ui/src/js/module/components/secondaryMenu/secondaryMenu.vue b/dolphinscheduler-ui/src/js/module/components/secondaryMenu/secondaryMenu.vue
index 102df8f910..5336555c21 100644
--- a/dolphinscheduler-ui/src/js/module/components/secondaryMenu/secondaryMenu.vue
+++ b/dolphinscheduler-ui/src/js/module/components/secondaryMenu/secondaryMenu.vue
@@ -63,7 +63,8 @@
menuList: menu(this.type),
index: 0,
id: this.$route.params.id,
- isTogHide: false
+ isTogHide: false,
+ isLeft: true
}
},
props: {
@@ -82,6 +83,11 @@
},
_toggleMenu () {
this.isTogHide = !this.isTogHide
+ if(this.isTogHide) {
+ sessionStorage.setItem('isLeft',0)
+ } else {
+ sessionStorage.setItem('isLeft',1)
+ }
}
},
mounted () {
diff --git a/dolphinscheduler-ui/src/js/module/components/spin/spin.vue b/dolphinscheduler-ui/src/js/module/components/spin/spin.vue
index 95fc8e924e..7c6a9c3acf 100644
--- a/dolphinscheduler-ui/src/js/module/components/spin/spin.vue
+++ b/dolphinscheduler-ui/src/js/module/components/spin/spin.vue
@@ -47,7 +47,7 @@
#spin-model {
position: fixed;
left: 20px;
- top: 80px;
+ top: 60px;
background: #fff;
z-index: 99;
border-radius: 3px;
@@ -69,11 +69,11 @@
}
&.spin-sp1 {
width: calc(100% - 40px);
- height: calc(100% - 100px);
+ height: calc(100% - 60px);
}
&.spin-sp2 {
- width: calc(100% - 240px);
- height: calc(100% - 100px);
+ width: calc(100% - 220px);
+ height: calc(100% - 60px);
left: 220px;
}
}
diff --git a/dolphinscheduler-ui/src/sass/conf/home/index.scss b/dolphinscheduler-ui/src/sass/conf/home/index.scss
index 76b9f6da01..16f588363d 100644
--- a/dolphinscheduler-ui/src/sass/conf/home/index.scss
+++ b/dolphinscheduler-ui/src/sass/conf/home/index.scss
@@ -24,8 +24,13 @@ body {
.ans-message-box,.ans-message-wrapper {
z-index: 121 !important;
}
+ &::-webkit-scrollbar {
+ width: 0;
+ height: 0;
+ }
}
+
@media screen and (max-width: 960px){
.nav-model {
.logo-box,