航站视图-改为单一排序

src/hooks/useTableFilterAndSort.ts

@@ -7,6 +7,7 @@ interface Options {
   extraFilterValueMap?: MaybeRef<{ [x: string]: string[] }> // 表头之外的额外筛选条件
   defaultSortRuleMap?: { [x: string]: string } // 默认排序
   extraSortRuleMap?: MaybeRef<{ [x: string]: string }> // 表头之外的额外排序条件
+  sortMode?: 'single' | 'multiple'
 }
 
 export function useTableFilterAndSort(
@@ -14,6 +15,10 @@ export function useTableFilterAndSort(
   tableData: Ref<CommonData[]>,
   options: Options = {}
 ) {
+  if (!options.sortMode) {
+    options.sortMode = 'single'
+  }
+
   watch([tableColumns, tableData], ([columns, records]) => {
     const tempSets = {}
     columns.forEach(column => {
@@ -82,10 +87,21 @@ export function useTableFilterAndSort(
     return _.orderBy(filtered, sortRules[0], sortRules[1])
   })
 
+  const sortChangeHandler = (currentKey: string) => {
+    if (options.sortMode === 'single') {
+      Object.getOwnPropertyNames(sortRuleMap).forEach(key => {
+        if (currentKey !== key) {
+          delete sortRuleMap[key]
+        }
+      })
+    }
+  }
+
   return {
     filterOptionMap,
     filterValueMap,
     sortRuleMap,
+    sortChangeHandler,
     dealedTableData,
   }
 }

src/store/keepAlive.ts

@@ -33,7 +33,10 @@ export const useKeepAlive = defineStore('keepAlive', () => {
     index > -1 && cachedViews.value.splice(index, 1)
   }
   const delCachedViewUntil = (viewName: string) => {
-    while (cachedViews.value.length && cachedViews.value.at(-1) !== viewName) {
+    while (
+      cachedViews.value.length &&
+      cachedViews.value[cachedViews.value.length - 1] !== viewName
+    ) {
       cachedViews.value.pop()
     }
   }

src/views/realTime/components/AirportView/index.vue

@@ -144,6 +144,7 @@ const customRendererColumns = computed(() => [
         filterOptions={filterOptionMap[column.columnName]}
         sortable={Boolean(column.needSort)}
         filterStyle="arrow"
+        onUpdate:sortRule={() => sortChangeHandler(column.columnName)}
       />
     ),
     cellRenderer: (cell: CellRenderProps) => (
@@ -275,6 +276,7 @@ const {
   filterOptionMap,
   filterValueMap,
   sortRuleMap,
+  sortChangeHandler,
   dealedTableData,
 } = useTableFilterAndSort(tableColumns, tableData, {
   defaultFilterValueMap,