From d02422d030b46e61238224ae328241b27c98cd15 Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Wed, 15 Jan 2020 13:55:25 +0800 Subject: [PATCH] Requests the previous page when there is no data on the list page(#1768) (#1832) * fix udfs assignment and task instance page jump #1789 * jest add coverage display * Fix data echo, style, popup cannot be closed and license * Fix data echo, style, popup cannot be closed and license * fix * Requests the previous page when there is no data on the list page --- .../dag/_source/formModel/tasks/_source/sqlType.vue | 2 +- .../conf/home/pages/datasource/pages/list/index.vue | 12 ++++++++---- .../projects/pages/definition/pages/list/index.vue | 12 ++++++++---- .../projects/pages/instance/pages/list/index.vue | 12 ++++++++---- .../js/conf/home/pages/projects/pages/list/index.vue | 12 ++++++++---- .../pages/resource/pages/file/pages/list/index.vue | 10 +++++++--- .../resource/pages/udf/pages/function/index.vue | 12 ++++++++---- .../resource/pages/udf/pages/resource/index.vue | 12 ++++++++---- .../conf/home/pages/security/pages/queue/index.vue | 12 ++++++++---- .../home/pages/security/pages/tenement/index.vue | 12 ++++++++---- .../conf/home/pages/security/pages/users/index.vue | 12 ++++++++---- .../pages/security/pages/warningGroups/index.vue | 12 ++++++++---- .../home/pages/security/pages/workerGroups/index.vue | 12 ++++++++---- .../js/conf/home/pages/user/pages/token/index.vue | 12 ++++++++---- 14 files changed, 104 insertions(+), 52 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/sqlType.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/sqlType.vue index 49fb4a252..ecb7d2c85 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/sqlType.vue +++ b/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;"> { - 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 }) 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 d168ce765..1f2857850 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 @@ -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 }) 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 4bf169b85..7bcf9ac26 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 @@ -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 }) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue index 74121f5f5..d9828c030 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue +++ b/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 }) 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 de7f77386..8f1f93930 100644 --- 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 @@ -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 }) 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 c94a8dc59..df46d7f19 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 @@ -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 }) 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 8b8696651..732c5a237 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 @@ -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 }) 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 ed5bf2cb3..47ce14abd 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 @@ -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 }) 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 8063fd0c5..0c38f0a91 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 @@ -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 }) 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 b137de7f1..f8ad40df8 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 @@ -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 }) 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 76bbc32c7..e70ead46c 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 @@ -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 }) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue index 10f493261..54a0440c5 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue +++ b/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 }) 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 a9fbeb011..21d2becd3 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 @@ -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 }) -- GitLab