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

Merge pull request #13875 from dataease/pr@dev-v2_dzz

Browse Source 
fix(系统设置): 基础设置-资源默认排序方式设置不生效
This commit is contained in:
fit2cloud-chenyw 2024-12-06 10:04:19 +08:00 committed by GitHub
commit 617b0f6c1a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/core-frontend/src/views/common/DeResourceTree.vue
View File

@ -520,12 +520,17 @@ const sortTypeTip = computed(() => {
return sortList.find(ele => ele.value === state.curSortType).name
})
const sortTypeChange = sortType => {
const handleSortTypeChange = sortType => {
state.resourceTree = treeSort(state.originResourceTree, sortType)
state.curSortType = sortType
wsCache.set('TreeSort-' + curCanvasType.value, state.curSortType)
}
const sortTypeChange = sortType => {
state.resourceTree = treeSort(state.originResourceTree, sortType)
state.curSortType = sortType
}
watch(filterText, val => {
resourceListTree.value.filter(val)
})
@ -628,7 +633,7 @@ defineExpose({
</el-icon>
</template>
</el-input>
<el-dropdown @command="sortTypeChange" trigger="click">
<el-dropdown @command="handleSortTypeChange" trigger="click">
<el-icon class="filter-icon-span">
<el-tooltip :offset="16" effect="dark" :content="sortTypeTip" placement="top">
<Icon v-if="state.curSortType.includes('asc')" name="dv-sort-asc" class="opt-icon"

9
core/core-frontend/src/views/visualized/data/dataset/index.vue
View File

@ -158,12 +158,17 @@ const resourceOptFinish = param => {
const originResourceTree = shallowRef([])
const sortTypeChange = sortType => {
const handleSortTypeChange = sortType => {
state.datasetTree = treeSort(originResourceTree.value, sortType)
state.curSortType = sortType
wsCache.set('TreeSort-dataset', state.curSortType)
}
const sortTypeChange = sortType => {
state.datasetTree = treeSort(originResourceTree.value, sortType)
state.curSortType = sortType
}
const resourceCreate = (pid, name) => {
// 新建基础信息
const newResourceId = guid()
@ -847,7 +852,7 @@ const getMenuList = (val: boolean) => {
</el-icon>
</template>
</el-input>
<el-dropdown @command="sortTypeChange" trigger="click">
<el-dropdown @command="handleSortTypeChange" trigger="click">
<el-icon class="filter-icon-span">
<el-tooltip :offset="16" effect="dark" :content="sortTypeTip" placement="top">
<Icon name="dv-sort-asc" class="opt-icon"

11
core/core-frontend/src/views/visualized/data/datasource/index.vue
View File

@ -213,11 +213,16 @@ const selectDataset = row => {
const originResourceTree = shallowRef([])
const sortTypeChange = sortType => {
const handleSortTypeChange = sortType => {
state.datasourceTree = treeSort(originResourceTree.value, sortType)
state.curSortType = sortType
wsCache.set('TreeSort-datasource', state.curSortType)
}
const sortTypeChange = sortType => {
state.datasourceTree = treeSort(originResourceTree.value, sortType)
state.curSortType = sortType
}
const handleSizeChange = pageSize => {
state.paginationConfig.currentPage = 1
state.paginationConfig.pageSize = pageSize
@ -473,7 +478,7 @@ const listDs = () => {
rawDatasourceList.value = []
dsLoading.value = true
let curSortType = sortList[Number(wsCache.get('TreeSort-backend')) ?? 1].value
curSortType = wsCache.get('TreeSort-dataset') ?? curSortType
curSortType = wsCache.get('TreeSort-datasource') ?? curSortType
const request = { busiFlag: 'datasource' } as BusiTreeRequest
interactiveStore
.setInteractive(request)
@ -1093,7 +1098,7 @@ const getMenuList = (val: boolean) => {
</el-icon>
</template>
</el-input>
<el-dropdown @command="sortTypeChange" trigger="click">
<el-dropdown @command="handleSortTypeChange" trigger="click">
<el-icon class="filter-icon-span">
<el-tooltip :offset="16" effect="dark" :content="sortTypeTip" placement="top">
<Icon name="dv-sort-asc" class="opt-icon"