Merge pull request #2549 from break60/dev

Fix page display incomplete

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue

@@ -35,7 +35,7 @@
       <template v-if="!processListP.length && total<=0">
         <m-no-data></m-no-data>
       </template>
-      <m-spin :is-spin="isLoading"></m-spin>
+      <m-spin :is-spin="isLoading" :is-left="isLeft"></m-spin>
     </template>
   </m-list-construction>
 </template>
@@ -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 }
   }
 </script>

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue

@@ -30,7 +30,7 @@
       <template v-if="!processInstanceList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
-      <m-spin :is-spin="isLoading"></m-spin>
+      <m-spin :is-spin="isLoading" :is-left="isLeft"></m-spin>
     </template>
   </m-list-construction>
 </template>
@@ -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 }
   }

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue

@@ -30,7 +30,7 @@
       <template v-if="!taskInstanceList.length">
         <m-no-data></m-no-data>
       </template>
-      <m-spin :is-spin="isLoading"></m-spin>
+      <m-spin :is-spin="isLoading" :is-left="isLeft"></m-spin>
     </template>
   </m-list-construction>
 </template>
@@ -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 }
   }

dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue

@@ -38,7 +38,7 @@
       <template v-if="!fileResourcesList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
-      <m-spin :is-spin="isLoading">
+      <m-spin :is-spin="isLoading" :is-left="isLeft">
       </m-spin>
     </template>
   </m-list-construction>
@@ -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 }
   }
 </script>

dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue

@@ -42,7 +42,7 @@
       <template v-if="!fileResourcesList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
-      <m-spin :is-spin="isLoading">
+      <m-spin :is-spin="isLoading" :is-left="isLeft">
       </m-spin>
    </div>
    </div>
@@ -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 }
   }
 </script>

dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue

@@ -36,8 +36,7 @@
       <template v-if="!udfFuncList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
-      <m-spin :is-spin="isLoading">
-      </m-spin>
+      <m-spin :is-spin="isLoading" :is-left="isLeft"></m-spin>
     </template>
   </m-list-construction>
 </template>
@@ -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 }
   }
 </script>

dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue

@@ -37,8 +37,7 @@
       <template v-if="!udfResourcesList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
-      <m-spin :is-spin="isLoading">
-      </m-spin>
+      <m-spin :is-spin="isLoading" :is-left="isLeft"></m-spin>
     </template>
   </m-list-construction>
 </template>
@@ -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 }
   }
 </script>

dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/index.vue

@@ -41,7 +41,7 @@
       <template v-if="!udfResourcesList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
-      <m-spin :is-spin="isLoading">
+      <m-spin :is-spin="isLoading" :is-left="isLeft">
       </m-spin>
     </div>
   </div>
@@ -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 }
   }
 </script>

dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue

@@ -38,7 +38,7 @@
       <template v-if="!queueList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
-      <m-spin :is-spin="isLoading"></m-spin>
+      <m-spin :is-spin="isLoading" :is-left="isLeft"></m-spin>
     </template>
   </m-list-construction>
 </template>
@@ -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 }
   }
 </script>

dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue

@@ -39,7 +39,7 @@
       <template v-if="!tenementList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
-      <m-spin :is-spin="isLoading"></m-spin>
+      <m-spin :is-spin="isLoading" :is-left="isLeft"></m-spin>
     </template>
   </m-list-construction>
 </template>
@@ -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 }
   }
 </script>

dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue

@@ -39,7 +39,7 @@
       <template v-if="!userList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
-      <m-spin :is-spin="isLoading"></m-spin>
+      <m-spin :is-spin="isLoading" :is-left="isLeft"></m-spin>
     </template>
   </m-list-construction>
 </template>
@@ -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 }
   }
 </script>

dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue

@@ -39,7 +39,7 @@
       <template v-if="!alertgroupList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
-      <m-spin :is-spin="isLoading"></m-spin>
+      <m-spin :is-spin="isLoading" :is-left="isLeft"></m-spin>
     </template>
   </m-list-construction>
 </template>
@@ -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 }
   }
 </script>

dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue

@@ -40,7 +40,7 @@
       <template v-if="!tokenList.length && total<=0">
         <m-no-data></m-no-data>
       </template>
-      <m-spin :is-spin="isLoading"></m-spin>
+      <m-spin :is-spin="isLoading" :is-left="isLeft"></m-spin>
     </template>
   </m-list-construction>
 </template>
@@ -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 }
   }
 </script>

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)

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 () {

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;
     }
   }

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,