Fix page number loading issue and dag not getting value(#1810) (#1815)

* merge dev branch front-end code

* fix udfs assignment

* Fix task instance page jump

* fix udfs assignment and task instance page jump #1789

* Fixed space and icon display issues before and after the input box

* add license

* add license

* Fix data echo, style and popup cannot be closed

* Fix page number loading issue and dag not getting value

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue

@@ -469,7 +469,7 @@
       JSP.removePaste()
       // Backfill data
       let taskList = this.store.state.dag.tasks
-
+      
       //fillback use cacheTasks
       let cacheTasks = this.store.state.dag.cacheTasks
       let o = {}
@@ -511,11 +511,13 @@
             this.workerGroupId = o.workerGroupId
           }
 
+          this.params = o.params || {}
+          this.dependence = o.dependence || {}
       }
       this.isContentBox = true
     },
     mounted () {
-
+      
     },
     updated () {
     },

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/sqlType.vue

@@ -20,7 +20,7 @@
             v-model="sqlTypeId"
             :disabled="isDetails"
             @on-change="_handleSqlTypeChanged"
-            style="width: 90px;">
+            style="width: 120px;">
       <x-option
               v-for="city in sqlTypeList"
               :key="city.id"

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

@@ -124,10 +124,14 @@
       _getList (flag) {
         this.isLoading = !flag
         this.getDatasourcesListP(this.searchParams).then(res => {
-          this.datasourcesList = []
-          this.datasourcesList = res.totalList
-          this.total = res.total
-          this.isLoading = false
+          if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
+            this.searchParams.pageNo = this.searchParams.pageNo -1
+          } else {
+            this.datasourcesList = []
+            this.datasourcesList = res.totalList
+            this.total = res.total
+            this.isLoading = false
+          }
         }).catch(e => {
           this.isLoading = false
         })

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

@@ -100,10 +100,14 @@
       _getList (flag) {
         this.isLoading = !flag
         this.getProcessListP(this.searchParams).then(res => {
-          this.processListP = []
-          this.processListP = res.totalList
-          this.total = res.total
-          this.isLoading = false
+          if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
+            this.searchParams.pageNo = this.searchParams.pageNo -1
+          } else {
+            this.processListP = []
+            this.processListP = res.totalList
+            this.total = res.total
+            this.isLoading = false
+          }
         }).catch(e => {
           this.isLoading = false
         })

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

@@ -105,10 +105,14 @@
       _getProcessInstanceListP (flag) {
         this.isLoading = !flag
         this.getProcessInstance(this.searchParams).then(res => {
-          this.processInstanceList = []
-          this.processInstanceList = res.totalList
-          this.total = res.total
-          this.isLoading = false
+          if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
+            this.searchParams.pageNo = this.searchParams.pageNo -1
+          } else {
+            this.processInstanceList = []
+            this.processInstanceList = res.totalList
+            this.total = res.total
+            this.isLoading = false
+          }
         }).catch(e => {
           this.isLoading = false
         })

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

@@ -110,10 +110,14 @@
       _getList (flag) {
         this.isLoading = !flag
         this.getProjectsList(this.searchParams).then(res => {
-          this.projectsList = []
-          this.projectsList = res.totalList
-          this.total = res.total
-          this.isLoading = false
+          if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
+            this.searchParams.pageNo = this.searchParams.pageNo -1
+          } else {
+            this.projectsList = []
+            this.projectsList = res.totalList
+            this.total = res.total
+            this.isLoading = false
+          }
         }).catch(e => {
           this.isLoading = false
         })

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

@@ -91,9 +91,13 @@
       _getList (flag) {
         this.isLoading = !flag
         this.getResourcesListP(this.searchParams).then(res => {
-          this.fileResourcesList = res.totalList
-          this.total = res.total
-          this.isLoading = false
+          if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
+            this.searchParams.pageNo = this.searchParams.pageNo -1
+          } else {
+            this.fileResourcesList = res.totalList
+            this.total = res.total
+            this.isLoading = false
+          }
         }).catch(e => {
           this.isLoading = false
         })

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

@@ -109,10 +109,14 @@
       _getList (flag) {
         this.isLoading = !flag
         this.getUdfFuncListP(this.searchParams).then(res => {
-          this.udfFuncList = []
-          this.udfFuncList = res.totalList
-          this.total = res.total
-          this.isLoading = false
+          if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
+            this.searchParams.pageNo = this.searchParams.pageNo -1
+          } else {
+            this.udfFuncList = []
+            this.udfFuncList = res.totalList
+            this.total = res.total
+            this.isLoading = false
+          }
         }).catch(e => {
           this.isLoading = false
         })

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

@@ -96,10 +96,14 @@
       _getList (flag) {
         this.isLoading = !flag
         this.getResourcesListP(this.searchParams).then(res => {
-          this.udfResourcesList = []
-          this.udfResourcesList = res.totalList
-          this.total = res.total
-          this.isLoading = false
+          if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
+            this.searchParams.pageNo = this.searchParams.pageNo -1
+          } else {
+            this.udfResourcesList = []
+            this.udfResourcesList = res.totalList
+            this.total = res.total
+            this.isLoading = false
+          }
         }).catch(e => {
           this.isLoading = false
         })

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

@@ -118,10 +118,14 @@
       _getList (flag) {
         this.isLoading = !flag
         this.getQueueListP(this.searchParams).then(res => {
-          this.queueList = []
-          this.queueList = res.totalList
-          this.total = res.total
-          this.isLoading = false
+          if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
+            this.searchParams.pageNo = this.searchParams.pageNo -1
+          } else {
+            this.queueList = []
+            this.queueList = res.totalList
+            this.total = res.total
+            this.isLoading = false
+          }
         }).catch(e => {
           this.isLoading = false
         })

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

@@ -122,10 +122,14 @@
       _getList (flag) {
         this.isLoading = !flag
         this.getTenantListP(this.searchParams).then(res => {
-          this.tenementList = []
-          this.tenementList = res.totalList
-          this.total = res.total
-          this.isLoading = false
+          if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
+            this.searchParams.pageNo = this.searchParams.pageNo -1
+          } else {
+            this.tenementList = []
+            this.tenementList = res.totalList
+            this.total = res.total
+            this.isLoading = false
+          }
         }).catch(e => {
           this.isLoading = false
         })

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

@@ -120,10 +120,14 @@
       _getList (flag) {
         this.isLoading = !flag
         this.getUsersListP(this.searchParams).then(res => {
-          this.userList = []
-          this.userList = res.totalList
-          this.total = res.total
-          this.isLoading = false
+          if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
+            this.searchParams.pageNo = this.searchParams.pageNo -1
+          } else {
+            this.userList = []
+            this.userList = res.totalList
+            this.total = res.total
+            this.isLoading = false
+          }
         }).catch(e => {
           this.isLoading = false
         })

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

@@ -122,10 +122,14 @@
       _getList (flag) {
         this.isLoading = !flag
         this.getAlertgroupP(this.searchParams).then(res => {
-          this.alertgroupList = []
-          this.alertgroupList = res.totalList
-          this.total = res.total
-          this.isLoading = false
+          if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
+            this.searchParams.pageNo = this.searchParams.pageNo -1
+          } else {
+            this.alertgroupList = []
+            this.alertgroupList = res.totalList
+            this.total = res.total
+            this.isLoading = false
+          }
         }).catch(e => {
           this.isLoading = false
         })

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

@@ -121,10 +121,14 @@
       _getList (flag) {
         this.isLoading = !flag
         this.getWorkerGroups(this.searchParams).then(res => {
-          this.workerGroupList = []
-          this.workerGroupList = res.totalList
-          this.total = res.total
-          this.isLoading = false
+          if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
+            this.searchParams.pageNo = this.searchParams.pageNo -1
+          } else {
+            this.workerGroupList = []
+            this.workerGroupList = res.totalList
+            this.total = res.total
+            this.isLoading = false
+          }
         }).catch(e => {
           this.isLoading = false
         })

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

@@ -122,10 +122,14 @@
       _getList (flag) {
         this.isLoading = !flag
         this.getTokenListP(this.searchParams).then(res => {
-          this.tokenList = []
-          this.tokenList = res.totalList
-          this.total = res.total
-          this.isLoading = false
+          if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
+            this.searchParams.pageNo = this.searchParams.pageNo -1
+          } else {
+            this.tokenList = []
+            this.tokenList = res.totalList
+            this.total = res.total
+            this.isLoading = false
+          }
         }).catch(e => {
           this.isLoading = false
         })

dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js

@@ -147,6 +147,11 @@ export default {
         let processInstanceJson = JSON.parse(res.data.processInstanceJson)
         // tasks info
         state.tasks = processInstanceJson.tasks
+        // tasks cache
+        state.cacheTasks = {}
+        processInstanceJson.tasks.forEach(v => {
+          state.cacheTasks[v.id] = v
+        })
         // global params
         state.globalParams = processInstanceJson.globalParams
         // timeout