feat(系统设置): 增加资源默认排序方式的配置项

core/core-frontend/src/api/common.ts

@@ -6,3 +6,10 @@ export const getRoleRouters = async (): Promise<Array<AppCustomRouteRecordRaw>>
     return res?.data
   })
 }
+
+// 获取默认排序
+export const getDefaultSettings = async (): Promise<IResponse> => {
+  return request.get({ url: '/sysParameter/defaultSettings' }).then(res => {
+    return res?.data
+  })
+}

core/core-frontend/src/pages/panel/main.ts

@@ -63,6 +63,8 @@ import { setupStore } from '@/store'
 import { useEmbedded } from '@/store/modules/embedded'
 import { setupElementPlus, setupElementPlusIcons } from '@/plugins/element-plus'
 import { setupRouter } from '@/router/embedded'
+import { getDefaultSettings } from '@/api/common'
+import { useCache } from '@/hooks/web/useCache'
 
 const setupAll = async (
   dom: string,
@@ -116,6 +118,9 @@ const setupAll = async (
   const appearanceRes = await import('@/store/modules/appearance')
   const appearanceStore = appearanceRes.useAppearanceStoreWithOut()
   appearanceStore.setAppearance(true)
+  const defaultSort = await getDefaultSettings()
+  const { wsCache } = useCache()
+  wsCache.set('TreeSort-backend', defaultSort['basic.defaultSort'] ?? '1')
   app.mount(dom)
   return app
 }

core/core-frontend/src/permission.ts

@@ -2,6 +2,7 @@ import router from './router'
 import { useUserStoreWithOut } from '@/store/modules/user'
 import { useAppStoreWithOut } from '@/store/modules/app'
 import type { RouteRecordRaw } from 'vue-router'
+import { getDefaultSettings } from '@/api/common'
 import { useNProgress } from '@/hooks/web/useNProgress'
 import { usePermissionStoreWithOut, pathValid, getFirstAuthMenu } from '@/store/modules/permission'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
@@ -60,6 +61,8 @@ router.beforeEach(async (to, from, next) => {
   }
   await appearanceStore.setAppearance()
   await appearanceStore.setFontList()
+  const defaultSort = await getDefaultSettings()
+  wsCache.set('TreeSort-backend', defaultSort['basic.defaultSort'] ?? '1')
   if ((wsCache.get('user.token') || isDesktop) && !to.path.startsWith('/de-link/')) {
     if (!userStore.getUid) {
       await userStore.setUser()

core/core-frontend/src/views/common/DeResourceTree.vue

@@ -233,14 +233,16 @@ const getTree = async () => {
   ) {
     dvMainStore.resetDvInfo()
   }
+  let curSortType = sortList[Number(wsCache.get('TreeSort-backend')) ?? 1].value
+  curSortType = wsCache.get(`TreeSort-${curCanvasType.value}`) ?? curSortType
   if (nodeData.length && nodeData[0]['id'] === '0' && nodeData[0]['name'] === 'root') {
     state.originResourceTree = nodeData[0]['children'] || []
-    sortTypeChange(state.curSortType)
+    sortTypeChange(curSortType)
     afterTreeInit()
     return
   }
   state.originResourceTree = nodeData
-  sortTypeChange(state.curSortType)
+  sortTypeChange(curSortType)
   afterTreeInit()
 }
 

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

@@ -283,6 +283,8 @@ const dtLoading = ref(false)
 const isCreated = ref(false)
 const getData = () => {
   dtLoading.value = true
+  let curSortType = sortList[Number(wsCache.get('TreeSort-backend')) ?? 1].value
+  curSortType = wsCache.get('TreeSort-dataset') ?? curSortType
   const request = { busiFlag: 'dataset' } as BusiTreeRequest
   interactiveStore
     .setInteractive(request)
@@ -292,12 +294,12 @@ const getData = () => {
         rootManage.value = nodeData[0]['weight'] >= 7
         state.datasetTree = nodeData[0]['children'] || []
         originResourceTree = cloneDeep(unref(state.datasetTree))
-        sortTypeChange(state.curSortType)
+        sortTypeChange(curSortType)
         return
       }
       state.datasetTree = nodeData
       originResourceTree = cloneDeep(unref(state.datasetTree))
-      sortTypeChange(state.curSortType)
+      sortTypeChange(curSortType)
     })
     .finally(() => {
       dtLoading.value = false

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

@@ -471,6 +471,8 @@ const symmetricKey = ref('')
 const listDs = () => {
   rawDatasourceList.value = []
   dsLoading.value = true
+  let curSortType = sortList[Number(wsCache.get('TreeSort-backend')) ?? 1].value
+  curSortType = wsCache.get('TreeSort-dataset') ?? curSortType
   const request = { busiFlag: 'datasource' } as BusiTreeRequest
   interactiveStore
     .setInteractive(request)
@@ -480,12 +482,12 @@ const listDs = () => {
         rootManage.value = nodeData[0]['weight'] >= 7
         state.datasourceTree = nodeData[0]['children'] || []
         originResourceTree = cloneDeep(unref(state.datasourceTree))
-        sortTypeChange(state.curSortType)
+        sortTypeChange(curSortType)
         return
       }
       originResourceTree = cloneDeep(unref(state.datasourceTree))
       state.datasourceTree = nodeData
-      sortTypeChange(state.curSortType)
+      sortTypeChange(curSortType)
     })
     .finally(() => {
       mounted.value = true