@aplus-frontend/ui 6.29.1 → 6.29.3

package/es/src/ag-grid/components/header-cell/index.vue2.mjs

@@ -1,5 +1,5 @@
-import { defineComponent as w, computed as d, createElementBlock as f, openBlock as s, normalizeClass as r, unref as e, createBlock as B, createCommentVNode as O, resolveDynamicComponent as _, createVNode as C } from "vue";
-import { useToken as D } from "@aplus-frontend/antdv/es/theme/internal";
+import { defineComponent as w, computed as d, createElementBlock as f, openBlock as s, normalizeClass as r, unref as e, createBlock as B, createCommentVNode as _, resolveDynamicComponent as D, createVNode as C } from "vue";
+import { useToken as O } from "@aplus-frontend/antdv/es/theme/internal";
 import { CaretUpOutlined as V, CaretDownOutlined as j } from "@ant-design/icons-vue";
 import { getTableTitle as z } from "../../../ap-table/utils.mjs";
 import "../../../config-provider/index.mjs";
@@ -11,28 +11,27 @@ const K = /* @__PURE__ */ w({
     params: {}
   },
   setup(S) {
-    const o = S, { b: v, e: a } = g("ag-custom-header"), { be: b, bem: k } = g("ap-grid"), [, I] = D(), { sorter: c, setSorter: T } = A(), n = d(() => o.params.column.sorter);
+    const o = S, { b: v, e: n } = g("ag-custom-header"), { be: b, bem: k } = g("ap-grid"), [, I] = O(), { sorter: c, setSorter: T } = A(), a = d(() => o.params.column.sorter);
     function h(t) {
       return t ? t === "asc" ? "desc" : null : "asc";
     }
     const m = d(() => o.params?.column?.getColId?.());
-    function y() {
-      if (!n.value)
+    function x() {
+      if (!a.value)
         return;
-      const l = o.params.column.getColId(), x = o.params.column.getSort(), u = h(x), p = o.params.api, N = p.getColumnState().map((i) => ({
+      const l = o.params.column.getColId(), y = o.params.column.getSort(), u = h(y), p = o.params.api, N = p.getColumnState().map((i) => ({
         ...i,
         sort: i.colId === l ? u : null
       }));
       p.applyColumnState({
-        state: N,
-        applyOrder: !0
+        state: N
       }), T({ [l]: u });
     }
     return (t, l) => (s(), f("div", {
-      class: r([e(v)(), { sortable: n.value }, `align-${t.params.column.align || "left"}`]),
-      onClick: y
+      class: r([e(v)(), { sortable: a.value }, `align-${t.params.column.align || "left"}`]),
+      onClick: x
     }, [
-      (s(), B(_(
+      (s(), B(D(
         e(z)(
           t.params.column,
           [
@@ -43,17 +42,17 @@ const K = /* @__PURE__ */ w({
           e(I).colorTextTertiary
         )
       ))),
-      n.value ? (s(), f("span", {
+      a.value ? (s(), f("span", {
         key: 0,
-        class: r(e(a)("sort-wrapper"))
+        class: r(e(n)("sort-wrapper"))
       }, [
         C(e(V), {
-          class: r({ [e(a)("sorter-up")]: !0, active: e(c)[m.value] === "asc" })
+          class: r({ [e(n)("sorter-up")]: !0, active: e(c)[m.value] === "asc" })
         }, null, 8, ["class"]),
         C(e(j), {
-          class: r({ [e(a)("sorter-down")]: !0, active: e(c)[m.value] === "desc" })
+          class: r({ [e(n)("sorter-down")]: !0, active: e(c)[m.value] === "desc" })
         }, null, 8, ["class"])
-      ], 2)) : O("", !0)
+      ], 2)) : _("", !0)
     ], 2));
   }
 });

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

@@ -7,4 +7,5 @@ export declare const useColumns: <RecordType>(props: AgGridProps<RecordType>) =>
     columns: Ref<AgGridColumnType<RecordType>[], AgGridColumnType<RecordType>[]>;
     shownColumns: Ref<AgGridColumnType<RecordType>[], AgGridColumnType<RecordType>[]>;
     columnKeys: ComputedRef<string[]>;
+    getTargetColumnByKey: (key?: string) => AgGridColumnType<RecordType> | undefined;
 };

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

@@ -1,28 +1,33 @@
-import { ref as u, computed as s, watch as r } from "vue";
-const a = (n) => {
-  const o = u([]), t = u([]);
+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([]);
   function m() {
-    return n.columns?.filter((e) => !e.hideInTable) || [];
+    return o.columns?.filter((e) => !e.hideInTable) || [];
   }
-  const l = s(
-    () => o.value.map((e) => e.key ? String(e.key) : e.key).filter(Boolean)
+  function r(e) {
+    return n.value.find((c) => l(c.key) === e);
+  }
+  const s = a(
+    () => n.value.map((e) => l(e.key)).filter(Boolean)
   );
-  return r(
-    () => n.columns,
+  return i(
+    () => o.columns,
     () => {
       const e = m();
-      o.value = e, t.value = e, n.onShownColumnsChange?.(e);
+      n.value = e, t.value = e, o.onShownColumnsChange?.(e);
     },
     {
       deep: !0,
       immediate: !0
     }
   ), {
-    columns: o,
+    columns: n,
     shownColumns: t,
-    columnKeys: l
+    columnKeys: s,
+    getTargetColumnByKey: r
   };
 };
 export {
-  a as useColumns
+  g as useColumns
 };

package/es/src/ag-grid/hooks/use-search-form.mjs

@@ -1,35 +1,35 @@
 import { noRenderAsFormItemValueList as s } from "../../ap-table/constants.mjs";
 import { computed as p, unref as l } from "vue";
-import { getColumnOrder as d, updateFormProps as u, getFieldProps as m, getSearchFormItemRenderNode as i } from "../../ap-table/utils.mjs";
+import { getColumnOrder as t, updateFormProps as u, getFieldProps as i, getSearchFormItemRenderNode as m } from "../../ap-table/utils.mjs";
 import "../../config-provider/index.mjs";
-import { useGlobalConfig as c } from "../../config-provider/hooks/use-global-config.mjs";
-const P = (n) => {
-  let t = 0;
-  const a = c("valueTypeMap");
-  return p(() => (t++, n.columns?.filter(
-    (e) => !e.hideInSearch && (e.dataIndex || e.key) && (e.valueType || e.customRenderFormItem) && !s.includes(e.valueType)
+import { useGlobalConfig as f } from "../../config-provider/hooks/use-global-config.mjs";
+const P = (a) => {
+  let d = 0;
+  const n = f("valueTypeMap");
+  return p(() => (d++, a.columns?.filter(
+    (e) => !e.hideInSearch && (e.field ?? e.dataIndex ?? e.key) && (e.valueType || e.customRenderFormItem) && !s.includes(e.valueType)
   )?.sort((e, o) => {
-    const r = d(e.order);
-    return d(o.order) - r;
+    const r = t(e.order);
+    return t(o.order) - r;
   })?.map((e) => {
     const o = u(
       e,
-      m(e.fieldProps, {})
+      i(e.fieldProps, {})
     ), r = {
       ...e,
       fieldProps: {
         label: e.title,
-        name: e.dataIndex || e.key,
+        name: e.field ?? e.dataIndex ?? e.key,
         // tips: 在表格中的查询表单项默认是带边框的
         bordered: !0,
         ...o || {},
-        _signal: t
+        _signal: d
       },
       renderNode: void 0
     };
-    return r.renderNode = i(
+    return r.renderNode = m(
       r,
-      l(a)
+      l(n)
     ), r;
   }) || []));
 };