@aplus-frontend/ui 7.13.9 → 7.13.10

package/es/src/ag-grid/hooks/use-columns.d.ts

@@ -1,4 +1,5 @@
 import { Ref, ComputedRef } from 'vue';
+import { DefaultSortOrderType } from '../../ap-table/hooks/use-sorted-filtered';
 import { AgGridColumnType, AgGridProps } from '../interface';
 /**
  * 维护/更新表格将要显示的类
@@ -8,4 +9,5 @@ export declare const useColumns: <RecordType>(props: AgGridProps<RecordType>) =>
     shownColumns: Ref<AgGridColumnType<RecordType>[], AgGridColumnType<RecordType>[]>;
     columnKeys: ComputedRef<string[]>;
     getTargetColumnByKey: (key?: string) => AgGridColumnType<RecordType> | undefined;
+    defaultSortOrder: ComputedRef<DefaultSortOrderType | undefined>;
 };

package/es/src/ag-grid/hooks/use-columns.mjs

@@ -1,31 +1,49 @@
-import { ref as u, computed as a, watch as i } from "vue";
-import { getStringKey as l } from "../utils.mjs";
-const g = (o) => {
-  const n = u([]), t = u([]);
+import { ref as c, computed as s, watch as y } from "vue";
+import { getStringKey as i } from "../utils.mjs";
+const g = (r) => {
+  const o = c([]), u = c([]);
   function m() {
-    return o.columns?.filter((e) => !e.hideInTable) || [];
+    return r.columns?.filter((e) => !e.hideInTable) || [];
   }
-  function r(e) {
-    return n.value.find((c) => l(c.key) === e);
+  function d(e) {
+    return o.value.find((n) => i(n.key) === e);
   }
-  const s = a(
-    () => n.value.map((e) => l(e.key)).filter(Boolean)
+  const f = s(
+    () => o.value.map((e) => i(e.key)).filter(Boolean)
   );
-  return i(
-    () => o.columns,
+  y(
+    () => r.columns,
     () => {
       const e = m();
-      n.value = e, t.value = e, o.onShownColumnsChange?.(e);
+      o.value = e, u.value = e, r.onShownColumnsChange?.(e);
     },
     {
       deep: !0,
       immediate: !0
     }
-  ), {
-    columns: n,
-    shownColumns: t,
-    columnKeys: s,
-    getTargetColumnByKey: r
+  );
+  function l(e) {
+    for (const n of e)
+      if (n.children) {
+        const t = l(n.children);
+        if (t)
+          return t;
+      } else if (n.defaultSortOrder) {
+        const t = n.field ?? n.dataIndex ?? n.key;
+        return {
+          colKey: n.key,
+          field: t,
+          order: n.defaultSortOrder
+        };
+      }
+  }
+  const a = s(() => l(o.value));
+  return {
+    columns: o,
+    shownColumns: u,
+    columnKeys: f,
+    getTargetColumnByKey: d,
+    defaultSortOrder: a
   };
 };
 export {