center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #5338 from dataease/pr@dev_st_fix

Browse Source 
Pr@dev st fix
This commit is contained in:
dataeaseShu 2023-05-26 15:43:59 +08:00 committed by GitHub
commit 2cb2b3e7a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frontend/src/views/system/task/FilterUserRecord.vue
View File

@ -139,7 +139,7 @@
import { filterDatasetRecord, dateFormat } from './options'
import { queryAuthModel } from '@/api/authModel/authModel'
import DeDatePick from '@/components/deCustomCm/DeDatePick.vue'
import _ from 'lodash'
export default {
components: {
DeDatePick
@ -162,7 +162,7 @@ export default {
},
computed: {
datasetComputed() {
return this.dfs(this.treeData)
return this.dfs(_.cloneDeep(this.treeData), this.activeDataset)
}
},
watch: {
@ -194,14 +194,13 @@ export default {
this.treeLoading = false
})
},
dfs(arr) {
dfs(arr, target) {
return arr.reduce((pre, ele) => {
if (!this.activeDataset.includes(ele.id)) {
if (!target.includes(ele.id)) {
if (ele.children?.length) {
pre.push(this.dfs(ele.children))
} else {
pre.push(ele)
ele.children = this.dfs(ele.children, target)
}
pre.push(ele)
}
return pre
}, [])