github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Fix delete operation, no query interface request is made on the list page #1768 (#1777) 

* Fix api url

* Fixed DAG zoom in and zoom out nodes separated from arrows

* Fix front-end code specifications

* Fix front-end code specifications

* Fix front-end code specifications

* jest unit test demo

* jest unit test demo

* Fix delete operation, no query interface request is made on the list page

* Fix delete operation, no query interface request is made on the list page
pull/2/head
break60 5 years ago committed by lgcareer
parent
03ef394399
commit
74a5506b9a
27 changed files with 79 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
  2. 11
      dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
  3. 2
      dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss
  4. 4
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/index.vue
  5. 4
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
  6. 4
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
  7. 5
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
  8. 4
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue
  9. 2
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
  10. 9
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
  11. 2
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
  12. 6
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
  13. 2
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
  14. 9
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
  15. 4
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
  16. 2
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
  17. 8
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
  18. 2
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
  19. 8
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
  20. 2
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
  21. 8
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
  22. 2
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue
  23. 10
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue
  24. 2
      dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue
  25. 11
      dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue
  26. 2
      dolphinscheduler-ui/src/js/module/components/listBoxF/listBoxF.vue
  27. 2
      dolphinscheduler-ui/src/js/module/components/nav/nav.vue

2
dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
Unescape View File

@ -148,7 +148,7 @@
this.deleteDatasource({
id: item.id
}).then(res => {
this.list.splice(i, 1)
this.$emit('on-update')
this.$message.success(res.msg)
}).catch(e => {
this.$message.error(e.msg || '')

11
dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
Unescape View File

@ -24,13 +24,13 @@
</m-conditions>
</template>
<template slot="content">
<template v-if="datasourcesList.length">
<m-list :datasources-list="datasourcesList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize"></m-list>
<template v-if="datasourcesList.length || total>0">
<m-list @on-update="_onUpdate" :datasources-list="datasourcesList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize"></m-list>
<div class="page-box">
<x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
</div>
</template>
<template v-if="!datasourcesList.length">
<template v-if="!datasourcesList.length && total<=0">
<m-no-data></m-no-data>
</template>
<m-spin :is-spin="isLoading" :is-left="false">
@ -131,7 +131,10 @@
}).catch(e => {
this.isLoading = false
})
}
},
_onUpdate () {
this._debounceGET('false')
},
},
watch: {
// router

2
dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss
Unescape View File

@ -60,7 +60,7 @@
height: 276px;
line-height: 276px;
text-align: center;
>b {
>strong {
font-size: 100px;
color: #333;
}

4
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/index.vue
Unescape View File

@ -20,14 +20,14 @@
<m-conditions @on-query="_onQuery"></m-conditions>
</template>
<template slot="content">
<template v-if="taskRecordList.length">
<template v-if="taskRecordList.length || total>0">
<m-list :task-record-list="taskRecordList" @on-update="_onUpdate" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize">
</m-list>
<div class="page-box">
<x-page :current="parseInt(searchParams.pageNo)" :total="total" show-elevator @on-change="_page"></x-page>
</div>
</template>
<template v-if="!taskRecordList.length">
<template v-if="!taskRecordList.length && total<=0">
<m-no-data></m-no-data>
</template>
<m-spin :is-spin="isLoading"></m-spin>

4
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
Unescape View File

@ -26,13 +26,13 @@
</m-conditions>
</template>
<template slot="content">
<template v-if="processListP.length">
<template v-if="processListP.length || total>0">
<m-list :process-list="processListP" @on-update="_onUpdate" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize"></m-list>
<div class="page-box">
<x-page :current="parseInt(searchParams.pageNo)" :total="total" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
</div>
</template>
<template v-if="!processListP.length">
<template v-if="!processListP.length && total<=0">
<m-no-data></m-no-data>
</template>
<m-spin :is-spin="isLoading"></m-spin>

4
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
Unescape View File

@ -20,14 +20,14 @@
<m-instance-conditions @on-query="_onQuery"></m-instance-conditions>
</template>
<template slot="content">
<template v-if="processInstanceList.length">
<template v-if="processInstanceList.length || total>0">
<m-list :process-instance-list="processInstanceList" @on-update="_onUpdate" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize">
</m-list>
<div class="page-box">
<x-page :current="parseInt(searchParams.pageNo)" :total="total" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
</div>
</template>
<template v-if="!processInstanceList.length">
<template v-if="!processInstanceList.length && total<=0">
<m-no-data></m-no-data>
</template>
<m-spin :is-spin="isLoading"></m-spin>

5
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
Unescape View File

@ -152,7 +152,7 @@
projectId: item.id
}).then(res => {
this.$refs[`poptip-${i}`][0].doClose()
this.list.splice(i, 1)
this.$emit('on-update')
this.$message.success(res.msg)
}).catch(e => {
this.$refs[`poptip-${i}`][0].doClose()
@ -165,7 +165,8 @@
*/
_edit (item) {
findComponentDownward(this.$root, 'projects-list')._create(item)
}
},
},
watch: {
projectsList (a) {

4
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue
Unescape View File

@ -24,13 +24,13 @@
</m-conditions>
</template>
<template slot="content">
<template v-if="projectsList.length">
<template v-if="projectsList.length || total>0">
<m-list :projects-list="projectsList" @on-update="_onUpdate" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize"></m-list>
<div class="page-box">
<x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
</div>
</template>
<template v-if="!projectsList.length">
<template v-if="!projectsList.length && total<=0">
<m-no-data></m-no-data>
</template>
<m-spin :is-spin="isLoading" :is-left="false"></m-spin>

2
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
Unescape View File

@ -166,7 +166,7 @@
id: item.id
}).then(res => {
this.$refs[`poptip-${i}`][0].doClose()
this.list.splice(i, 1)
this.$emit('on-update')
this.$message.success(res.msg)
}).catch(e => {
this.$refs[`poptip-${i}`][0].doClose()

9
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
Unescape View File

@ -27,14 +27,14 @@
</m-conditions>
</template>
<template slot="content">
<template v-if="fileResourcesList.length">
<m-list :file-resources-list="fileResourcesList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize">
<template v-if="fileResourcesList.length || total>0">
<m-list @on-update="_onUpdate" :file-resources-list="fileResourcesList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize">
</m-list>
<div class="page-box">
<x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
</div>
</template>
<template v-if="!fileResourcesList.length">
<template v-if="!fileResourcesList.length && total<=0">
<m-no-data></m-no-data>
</template>
<m-spin :is-spin="isLoading">
@ -102,6 +102,9 @@
this.searchParams.pageNo = 1
this.searchParams.searchVal = ''
this._debounceGET()
},
_onUpdate () {
this._debounceGET()
}
},
watch: {

2
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
Unescape View File

@ -142,7 +142,7 @@ v-ps<template>
id: item.id
}).then(res => {
this.$refs[`poptip-${i}`][0].doClose()
this.list.splice(i, 1)
this.$emit('_updateList')
this.$message.success(res.msg)
}).catch(e => {
this.$refs[`poptip-${i}`][0].doClose()

6
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
Unescape View File

@ -24,14 +24,14 @@
</m-conditions>
</template>
<template slot="content">
<template v-if="udfFuncList.length">
<template v-if="udfFuncList.length || total>0">
<m-list :udf-func-list="udfFuncList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize" @on-update="_updateList">
</m-list>
<div class="page-box">
<x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
</div>
</template>
<template v-if="!udfFuncList.length">
<template v-if="!udfFuncList.length && total<=0">
<m-no-data></m-no-data>
</template>
<m-spin :is-spin="isLoading">
@ -104,8 +104,6 @@
})
},
_updateList () {
this.searchParams.pageNo = 1
this.searchParams.searchVal = ''
this._debounceGET()
},
_getList (flag) {

2
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
Unescape View File

@ -151,7 +151,7 @@
id: item.id
}).then(res => {
this.$refs[`poptip-${i}`][0].doClose()
this.list.splice(i, 1)
this.$emit('on-update')
this.$message.success(res.msg)
}).catch(e => {
this.$refs[`poptip-${i}`][0].doClose()

9
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
Unescape View File

@ -24,14 +24,14 @@
</m-conditions>
</template>
<template slot="content">
<template v-if="udfResourcesList.length">
<m-list :udf-resources-list="udfResourcesList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize">
<template v-if="udfResourcesList.length || total>0">
<m-list @on-update="_onUpdate" :udf-resources-list="udfResourcesList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize">
</m-list>
<div class="page-box">
<x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
</div>
</template>
<template v-if="!udfResourcesList.length">
<template v-if="!udfResourcesList.length && total<=0">
<m-no-data></m-no-data>
</template>
<m-spin :is-spin="isLoading">
@ -85,6 +85,9 @@
_pageSize (val) {
this.searchParams.pageSize = val
},
_onUpdate () {
this._debounceGET()
},
_updateList () {
this.searchParams.pageNo = 1
this.searchParams.searchVal = ''

4
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
Unescape View File

@ -24,7 +24,7 @@
</m-conditions>
</template>
<template slot="content">
<template v-if="queueList.length">
<template v-if="queueList.length || total>0">
<m-list @on-edit="_onEdit"
:queue-list="queueList"
:page-no="searchParams.pageNo"
@ -35,7 +35,7 @@
<x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
</div>
</template>
<template v-if="!queueList.length">
<template v-if="!queueList.length && total<=0">
<m-no-data></m-no-data>
</template>
<m-spin :is-spin="isLoading"></m-spin>

2
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
Unescape View File

@ -135,7 +135,7 @@
id: item.id
}).then(res => {
this.$refs[`poptip-${i}`][0].doClose()
this.list.splice(i, 1)
this.$emit('on-update')
this.$message.success(res.msg)
}).catch(e => {
this.$refs[`poptip-${i}`][0].doClose()

8
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
Unescape View File

@ -24,8 +24,9 @@
</m-conditions>
</template>
<template slot="content">
<template v-if="tenementList.length">
<template v-if="tenementList.length || total>0">
<m-list @on-edit="_onEdit"
@on-update="_onUpdate"
:tenement-list="tenementList"
:page-no="searchParams.pageNo"
:page-size="searchParams.pageSize">
@ -35,7 +36,7 @@
<x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
</div>
</template>
<template v-if="!tenementList.length">
<template v-if="!tenementList.length && total<=0">
<m-no-data></m-no-data>
</template>
<m-spin :is-spin="isLoading"></m-spin>
@ -86,6 +87,9 @@
_pageSize (val) {
this.searchParams.pageSize = val
},
_onUpdate () {
this._debounceGET()
},
_onEdit (item) {
this._create(item)
},

2
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
Unescape View File

@ -153,7 +153,7 @@
id: item.id
}).then(res => {
this.$refs[`poptip-delete-${i}`][0].doClose()
this.list.splice(i, 1)
this.$emit('on-update')
this.$message.success(res.msg)
}).catch(e => {
this.$refs[`poptip-delete-${i}`][0].doClose()

8
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
Unescape View File

@ -24,8 +24,9 @@
</m-conditions>
</template>
<template slot="content">
<template v-if="userList.length">
<template v-if="userList.length || total>0">
<m-list @on-edit="_onEdit"
@on-update="_onUpdate"
:user-list="userList"
:page-no="searchParams.pageNo"
:page-size="searchParams.pageSize">
@ -35,7 +36,7 @@
<x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
</div>
</template>
<template v-if="!userList.length">
<template v-if="!userList.length && total<=0">
<m-no-data></m-no-data>
</template>
<m-spin :is-spin="isLoading"></m-spin>
@ -84,6 +85,9 @@
_pageSize (val) {
this.searchParams.pageSize = val
},
_onUpdate () {
this._debounceGET()
},
_onEdit (item) {
this._create(item)
},

2
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
Unescape View File

@ -115,7 +115,7 @@
id: item.id
}).then(res => {
this.$refs[`poptip-delete-${i}`][0].doClose()
this.list.splice(i, 1)
this.$emit('on-update')
this.$message.success(res.msg)
}).catch(e => {
this.$refs[`poptip-delete-${i}`][0].doClose()

8
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
Unescape View File

@ -24,8 +24,9 @@
</m-conditions>
</template>
<template slot="content">
<template v-if="alertgroupList.length">
<template v-if="alertgroupList.length || total>0">
<m-list @on-edit="_onEdit"
@on-update="_onUpdate"
:alertgroup-list="alertgroupList"
:page-no="searchParams.pageNo"
:page-size="searchParams.pageSize">
@ -35,7 +36,7 @@
<x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
</div>
</template>
<template v-if="!alertgroupList.length">
<template v-if="!alertgroupList.length && total<=0">
<m-no-data></m-no-data>
</template>
<m-spin :is-spin="isLoading"></m-spin>
@ -86,6 +87,9 @@
_pageSize (val) {
this.searchParams.pageSize = val
},
_onUpdate () {
this._debounceGET()
},
_onEdit (item) {
this._create(item)
},

2
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue
Unescape View File

@ -106,7 +106,7 @@
id: item.id
}).then(res => {
this.$refs[`poptip-delete-${i}`][0].doClose()
this.list.splice(i, 1)
this.$emit('on-update')
this.$message.success(res.msg)
}).catch(e => {
this.$refs[`poptip-delete-${i}`][0].doClose()

10
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue
Unescape View File

@ -24,8 +24,9 @@
</m-conditions>
</template>
<template slot="content">
<template v-if="workerGroupList.length">
<m-list @on-edit="_onEdit"
<template v-if="workerGroupList.length || total>0">
<m-list @on-update="_onUpdate"
@on-edit="_onEdit"
:worker-group-list="workerGroupList"
:page-no="searchParams.pageNo"
:page-size="searchParams.pageSize">
@ -34,7 +35,7 @@
<x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
</div>
</template>
<template v-if="!workerGroupList.length">
<template v-if="!workerGroupList.length && total<=0">
<m-no-data></m-no-data>
</template>
<m-spin :is-spin="isLoading"></m-spin>
@ -85,6 +86,9 @@
_pageSize (val) {
this.searchParams.pageSize = val
},
_onUpdate () {
this._debounceGET()
},
_onEdit (item) {
this._create(item)
},

2
dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue
Unescape View File

@ -111,7 +111,7 @@
id: item.id
}).then(res => {
this.$refs[`poptip-delete-${i}`][0].doClose()
this.list.splice(i, 1)
this.$emit('on-update')
this.$message.success(res.msg)
}).catch(e => {
this.$refs[`poptip-delete-${i}`][0].doClose()

11
dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue
Unescape View File

@ -24,8 +24,10 @@
</m-conditions>
</template>
<template slot="content">
<template v-if="tokenList.length">
<m-list @on-edit="_onEdit"
<template v-if="tokenList.length || total>0">
<m-list
@on-update="_onUpdate"
@on-edit="_onEdit"
:token-list="tokenList"
:page-no="searchParams.pageNo"
:page-size="searchParams.pageSize">
@ -35,7 +37,7 @@
<x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
</div>
</template>
<template v-if="!tokenList.length">
<template v-if="!tokenList.length && total<=0">
<m-no-data></m-no-data>
</template>
<m-spin :is-spin="isLoading"></m-spin>
@ -88,6 +90,9 @@
_onEdit (item) {
this._create(item)
},
_onUpdate () {
this._debounceGET()
},
_create (item) {
let self = this
let modal = this.$modal.dialog({

2
dolphinscheduler-ui/src/js/module/components/listBoxF/listBoxF.vue
Unescape View File

@ -42,7 +42,7 @@
text-align: right;
line-height: 32px;
padding-right: 8px;
>b {
>strong {
color: #ff0000;
padding-right: 4px;
}

2
dolphinscheduler-ui/src/js/module/components/nav/nav.vue
Unescape View File

@ -431,7 +431,7 @@
margin-right: 20px;
cursor: pointer;
margin-top: 16px;
i {
em {
font-size: 18px;
vertical-align: middle;
color: #fff;

Write Preview
Loading…
Cancel
Save