github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 11:32:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(数据源): 数据源树排序后，新建数据源保存时选择数据源文件夹没有按照设置的排序方式排列

Browse Source
This commit is contained in:
dataeaseShu 2025-01-03 14:06:11 +08:00 committed by Junjun
parent f824130160
commit af9de61aba
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue
View File

@ -1,11 +1,13 @@
<script lang="ts" setup>
import dvFolder from '@/assets/svg/dv-folder.svg'
import icon_searchOutline_outlined from '@/assets/svg/icon_search-outline_outlined.svg'
import { ref, reactive, computed, watch, nextTick } from 'vue'
import { ref, reactive, computed, watch, nextTick, shallowRef, unref } from 'vue'
import { useI18n } from '@/hooks/web/useI18n'
import { checkRepeat, listDatasources, save, update } from '@/api/datasource'
import { ElMessage, ElMessageBox, ElMessageBoxOptions } from 'element-plus-secondary'
import treeSort from '@/utils/treeSortUtils'
import type { DatasetOrFolder } from '@/api/dataset'
import { cloneDeep } from 'lodash-es'
import nothingTree from '@/assets/img/nothing-tree.png'
import { useCache } from '@/hooks/web/useCache'
@ -118,7 +120,11 @@ const filterMethod = (value, data) => {
const resetForm = () => {
createDataset.value = false
}
const originResourceTree = shallowRef([])
const sortTypeChange = sortType => {
state.tData = treeSort(originResourceTree.value, sortType)
}
const dfs = (arr: Tree[]) => {
arr.forEach(ele => {
ele.value = ele.id
@ -129,6 +135,7 @@ const dfs = (arr: Tree[]) => {
}
let request = null
let dsType = ''
const sortList = ['time_asc', 'time_desc', 'name_asc', 'name_desc']
const createInit = (type, data: Tree, exec, name: string) => {
pid.value = ''
id.value = ''
@ -151,6 +158,10 @@ const createInit = (type, data: Tree, exec, name: string) => {
if (state.tData.length && state.tData[0].name === 'root' && state.tData[0].id === '0') {
state.tData[0].name = t('data_source.data_source')
}
originResourceTree.value = cloneDeep(unref(state.tData))
let curSortType = sortList[Number(wsCache.get('TreeSort-backend')) ?? 1]
curSortType = wsCache.get('TreeSort-datasource') ?? curSortType
sortTypeChange(curSortType)
})
}
if (exec) {