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

fix: 【系统管理】任务管理-数据同步-执行记录筛选，选择数据集没有内容

Browse Source
This commit is contained in:
dataeaseShu 2023-05-26 15:40:14 +08:00
parent 89304ac9af
commit 00b143c0f6
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 { filterDatasetRecord, dateFormat } from './options'
import { queryAuthModel } from '@/api/authModel/authModel' import { queryAuthModel } from '@/api/authModel/authModel'
import DeDatePick from '@/components/deCustomCm/DeDatePick.vue' import DeDatePick from '@/components/deCustomCm/DeDatePick.vue'
import _ from 'lodash'
export default { export default {
components: { components: {
DeDatePick DeDatePick
@ -162,7 +162,7 @@ export default {
}, },
computed: { computed: {
datasetComputed() { datasetComputed() {
return this.dfs(this.treeData) return this.dfs(_.cloneDeep(this.treeData), this.activeDataset)
} }
}, },
watch: { watch: {
@ -194,14 +194,13 @@ export default {
this.treeLoading = false this.treeLoading = false
}) })
}, },
dfs(arr) { dfs(arr, target) {
return arr.reduce((pre, ele) => { return arr.reduce((pre, ele) => {
if (!this.activeDataset.includes(ele.id)) { if (!target.includes(ele.id)) {
if (ele.children?.length) { if (ele.children?.length) {
pre.push(this.dfs(ele.children)) ele.children = this.dfs(ele.children, target)
} else {
pre.push(ele)
} }
pre.push(ele)
} }
return pre return pre
}, []) }, [])