This is an automated email from the ASF dual-hosted git repository.
chenxingchun pushed a commit to branch dev-resource-tree
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev-resource-tree by this push:
new 00cfb81 Delete file list update processing
new 3edb93c Merge pull request #2299 from break60/dev-resource-tree
00cfb81 is described below
commit 00cfb81e8999d25711f94252d06846b10b692aa7
Author: break60 <[email protected]>
AuthorDate: Tue Mar 24 14:39:51 2020 +0800
Delete file list update processing
---
.../pages/resource/pages/file/pages/subdirectory/_source/list.vue | 2 +-
.../conf/home/pages/resource/pages/file/pages/subdirectory/index.vue | 4 ++--
.../pages/resource/pages/udf/pages/subUdfDirectory/_source/list.vue | 2 +-
.../home/pages/resource/pages/udf/pages/subUdfDirectory/index.vue | 1 +
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue
index e83794a..f5e801a 100755
---
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue
@@ -178,7 +178,7 @@
id: item.id
}).then(res => {
this.$refs[`poptip-${i}`][0].doClose()
- this.$router.push({ path: `/resource/file/subdirectory/${item.id}` })
+ this.$emit('on-update')
this.$message.success(res.msg)
}).catch(e => {
this.$refs[`poptip-${i}`][0].doClose()
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 074bf40..12be6b0 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
@@ -116,8 +116,8 @@
this.searchParams.searchVal = ''
this._debounceGET()
},
- _onUpdate (data) {
- this.searchParams.id = data
+ _onUpdate () {
+ this.searchParams.id = this.$route.params.id
this._debounceGET()
},
_ckOperation(index) {
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/_source/list.vue
index 7dada47..ddb097e 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/_source/list.vue
@@ -166,7 +166,7 @@
id: item.id
}).then(res => {
this.$refs[`poptip-${i}`][0].doClose()
- this.$router.push({ path: `/resource/udf/subUdfDirectory/${item.id}`
})
+ this.$emit('on-update')
this.$message.success(res.msg)
}).catch(e => {
this.$refs[`poptip-${i}`][0].doClose()
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 d2114a9..14585ff 100644
---
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
@@ -96,6 +96,7 @@
this.searchParams.pageSize = val
},
_onUpdate () {
+ this.searchParams.id = this.$route.params.id
this._debounceGET()
},
_updateList (data) {
