@aplus-frontend/ui 0.4.34 → 0.5.0-beta.0

package/es/src/ap-table/components/setting/sortable/item.vue2.mjs

@@ -5,7 +5,7 @@ import "../../../../config-provider/index.mjs";
 import { useInjectSorterMethods as M } from "../sorter/context.mjs";
 import S from "../images/icon_carst_down.svg.mjs";
 import U from "../images/icon_fill_right.svg.mjs";
-import { cloneLabelNode as j } from "../utils.mjs";
+import { getLabelRenderNode as j } from "../utils.mjs";
 import { useNamespace as H } from "../../../../config-provider/hooks/use-namespace.mjs";
 import { useLocale as q } from "../../../../config-provider/hooks/use-locale.mjs";
 const G = ["src"], le = /* @__PURE__ */ E({
@@ -28,18 +28,18 @@ const G = ["src"], le = /* @__PURE__ */ E({
       const l = v("left");
       w(l);
     }
-    function F() {
+    function R() {
       const l = v("right");
       V(l);
     }
-    function L() {
+    function F() {
       const l = v(void 0);
       y(l);
     }
-    function N() {
+    function L() {
       C("update:open", !o.open);
     }
-    function R() {
+    function N() {
       var n;
       const l = o.value;
       l.show = !1, (n = l.children) == null || n.forEach((i) => i.show = !1);
@@ -58,7 +58,7 @@ const G = ["src"], le = /* @__PURE__ */ E({
           }, null, 8, ["class"]),
           p("span", {
             class: t(e(h)("left", "indicator")),
-            onClick: N
+            onClick: L
           }, [
             (i = l.value.children) != null && i.length ? (s(), g("img", {
               key: 0,
@@ -96,7 +96,7 @@ const G = ["src"], le = /* @__PURE__ */ E({
                 default: d(() => [
                   c(e(z), {
                     class: t(e(a)("action-icon")),
-                    onClick: L
+                    onClick: F
                   }, null, 8, ["class"])
                 ]),
                 _: 1
@@ -109,7 +109,7 @@ const G = ["src"], le = /* @__PURE__ */ E({
                   c(e(k), {
                     rotate: 90,
                     class: t(e(a)("action-icon")),
-                    onClick: F
+                    onClick: R
                   }, null, 8, ["class"])
                 ]),
                 _: 1
@@ -121,7 +121,7 @@ const G = ["src"], le = /* @__PURE__ */ E({
                 default: d(() => [
                   c(e(A), {
                     class: t(e(a)("action-icon")),
-                    onClick: R
+                    onClick: N
                   }, null, 8, ["class"])
                 ]),
                 _: 1

package/es/src/ap-table/components/setting/tree-select/index.vue2.mjs

@@ -1,64 +1,64 @@
-import { defineComponent as b, computed as x, unref as l, createElementBlock as i, openBlock as c, createVNode as s, withCtx as d, Fragment as m, renderList as w, createBlock as u, mergeProps as B, resolveDynamicComponent as I } from "vue";
-import { Row as L, Col as k, Checkbox as N } from "@aplus-frontend/antdv";
+import { defineComponent as x, computed as w, unref as o, createElementBlock as i, openBlock as c, createVNode as s, withCtx as d, Fragment as m, renderList as B, createBlock as u, mergeProps as I, resolveDynamicComponent as L } from "vue";
+import { Row as N, Col as k, Checkbox as P } from "@aplus-frontend/antdv";
 import "../select-group/index.vue.mjs";
-import { useInjectApTable as P } from "../../../context.mjs";
-import { cloneLabelNode as U } from "../utils.mjs";
-import j from "../select-group/index.vue2.mjs";
-const $ = /* @__PURE__ */ b({
+import { useInjectApTable as U } from "../../../context.mjs";
+import { getLabelNode as j } from "../utils.mjs";
+import A from "../select-group/index.vue2.mjs";
+const q = /* @__PURE__ */ x({
   __name: "index",
   props: {
     value: {}
   },
   setup(_) {
-    const a = _, { columnsBackup: g } = P(), y = x(() => [...l(g) || []].sort((e, n) => {
-      var t, o, p, h;
-      return (t = e.children) != null && t.length && !((o = n.children) != null && o.length) ? 1 : !((p = e.children) != null && p.length) && ((h = n.children) != null && h.length) ? -1 : 0;
+    const a = _, { columnsBackup: g, renderConfig: y } = U(), C = w(() => [...o(g) || []].sort((e, n) => {
+      var t, l, p, h;
+      return (t = e.children) != null && t.length && !((l = n.children) != null && l.length) ? 1 : !((p = e.children) != null && p.length) && ((h = n.children) != null && h.length) ? -1 : 0;
     }));
     function f(r) {
       return a.value.find((e) => e.key === r.key);
     }
-    function C(r) {
+    function v(r) {
       const e = f(r);
       return {
         checked: e == null ? void 0 : e.show,
         disabled: e == null ? void 0 : e.disabled
       };
     }
-    function v(r, e) {
-      const n = a.value, t = n == null ? void 0 : n.find((o) => o.key === r);
+    function b(r, e) {
+      const n = a.value, t = n == null ? void 0 : n.find((l) => l.key === r);
       t && (t.show = e);
     }
     return (r, e) => (c(), i("div", null, [
-      s(l(L), {
+      s(o(N), {
         gutter: [24, 16],
         align: "middle"
       }, {
         default: d(() => [
-          (c(!0), i(m, null, w(y.value, (n) => {
+          (c(!0), i(m, null, B(C.value, (n) => {
             var t;
             return c(), i(m, {
               key: n.key
             }, [
-              (t = n.children) != null && t.length ? (c(), u(l(k), {
+              (t = n.children) != null && t.length ? (c(), u(o(k), {
                 key: 1,
                 span: 24
               }, {
                 default: d(() => [
-                  s(j, {
+                  s(A, {
                     value: f(n)
                   }, null, 8, ["value"])
                 ]),
                 _: 2
-              }, 1024)) : (c(), u(l(k), {
+              }, 1024)) : (c(), u(o(k), {
                 key: 0,
                 span: 8
               }, {
                 default: d(() => [
-                  s(l(N), B({ ref_for: !0 }, C(n), {
-                    "onUpdate:checked": (o) => v(n.key, o)
+                  s(o(P), I({ ref_for: !0 }, v(n), {
+                    "onUpdate:checked": (l) => b(n.key, l)
                   }), {
                     default: d(() => [
-                      (c(), u(I(l(U)(n.title))))
+                      (c(), u(L(o(j)(n, o(y)))))
                     ]),
                     _: 2
                   }, 1040, ["onUpdate:checked"])
@@ -74,5 +74,5 @@ const $ = /* @__PURE__ */ b({
   }
 });
 export {
-  $ as default
+  q as default
 };

package/es/src/ap-table/components/setting/utils.d.ts

@@ -1,5 +1,8 @@
 import { ColumnsType } from '@aplus-frontend/antdv/es/table';
-import { ApColumnState, ApTableSettingDefaultValueType } from '../../interface';
+import { ApColumnState, ApTableContextRenderConfig, ApTableSettingDefaultValueType } from '../../interface';
+import { VNode, RendererNode, RendererElement, VNodeArrayChildren } from 'vue';
+import { ColumnTitleProps } from '@aplus-frontend/antdv/es/table/interface';
+import { VueNode } from '@aplus-frontend/antdv/es/_util/type';
 /**
  * 根据列状态重新生成表格列配置
  * @param columns 表格列数组
@@ -9,12 +12,21 @@ import { ApColumnState, ApTableSettingDefaultValueType } from '../../interface';
 export default function generateColumnsByColumnState(columns: ColumnsType, columnStateList: ApColumnState[]): ColumnsType;
 export declare function customCloneColumnStates<T extends ApColumnState | ApColumnState[]>(columnStates: T): T;
 /**
- * 克隆列设置用的label
+ * 获取基于title设置的label节点
  * @param node
  * @param overrideProps
  * @returns
  */
-export declare function cloneLabelNode(node: any): any;
+export declare function getLabelNode(column: any, renderConfig?: ApTableContextRenderConfig): number | boolean | void | VNode<RendererNode, RendererElement, {
+    [key: string]: any;
+}> | VNodeArrayChildren | ((props: ColumnTitleProps<any>) => VNodeArrayChildren | VueNode) | null;
+/**
+ * 获取最终用于渲染的节点
+ * @param node
+ * @param overrideProps
+ * @returns
+ */
+export declare function getLabelRenderNode(node: any): any;
 /**
  * 生成可用于缓存的列状态对象
  * @param columnStates

package/es/src/ap-table/components/setting/utils.mjs

@@ -1,54 +1,65 @@
-import { cloneDeepWith as f, isArray as c, omit as u } from "lodash-unified";
-import { isVNode as s } from "vue";
-function h(e, i) {
-  var o;
-  const n = [];
-  for (const t of i) {
-    const l = e.find((r) => r.key === t.key);
-    if ((o = t.children) != null && o.length) {
-      const r = h(
-        l.children,
-        t.children
+import { cloneDeepWith as s, isArray as c, omit as a } from "lodash-unified";
+import { isVNode as u } from "vue";
+import { getTableTitle as f } from "../../utils.mjs";
+function h(t, e) {
+  var l;
+  const i = [];
+  for (const r of e) {
+    const o = t.find((n) => n.key === r.key);
+    if ((l = r.children) != null && l.length) {
+      const n = h(
+        o.children,
+        r.children
       );
-      r.length && n.push({
-        ...l,
-        fixed: t.fixed,
-        children: r
+      n.length && i.push({
+        ...o,
+        fixed: r.fixed,
+        children: n
       });
     } else {
-      if (!t.show)
+      if (!r.show)
         continue;
-      n.push({ ...l, fixed: t.fixed });
+      i.push({ ...o, fixed: r.fixed });
     }
   }
-  return n;
+  return i;
 }
-function m(e) {
-  return f(e, (i, n) => {
-    if (n === "label")
-      return i;
+function y(t) {
+  return s(t, (e, i) => {
+    if (i === "label")
+      return e;
   });
 }
-function p(e) {
-  return s(e) ? e : c(e) ? e[0] : e;
+function b(t, e) {
+  const i = t.title, l = c(i) ? i[0] : i;
+  return u(l) ? l : f(
+    t,
+    (e == null ? void 0 : e.className) || "",
+    void 0,
+    e == null ? void 0 : e.color
+  );
 }
-function g(e) {
-  function i(n) {
-    const o = {};
-    return n.forEach((t, l) => {
-      var r;
-      o[t.key] = {
-        ...u(t, ["label", "key", "children"]),
-        order: l,
-        children: (r = t.children) != null && r.length ? i(t.children) : void 0
+function x(t) {
+  return u(t) ? t : c(t) ? t[0] : t;
+}
+function S(t) {
+  function e(i) {
+    const l = {};
+    return i.forEach((r, o) => {
+      var n;
+      l[r.key] = {
+        ...a(r, ["label", "key", "children"]),
+        order: o,
+        children: (n = r.children) != null && n.length ? e(r.children) : void 0
       };
-    }), o;
+    }), l;
   }
-  return i(e);
+  return e(t);
 }
 export {
-  p as cloneLabelNode,
-  m as customCloneColumnStates,
+  y as customCloneColumnStates,
   h as default,
-  g as getColumnStateString
+  S as getColumnStateString,
+  b as getLabelNode,
+  x as getLabelRenderNode
 };

package/es/src/ap-table/context.d.ts

@@ -1,6 +1,6 @@
 import { ColumnType } from '@aplus-frontend/antdv/es/table';
 import { ComputedRef, InjectionKey } from 'vue';
-import { ApTableProps } from './interface';
+import { ApTableContextRenderConfig, ApTableProps } from './interface';
 type TableSize = ApTableProps['size'];
 type ApTableContextProps<RecordType> = {
     /**
@@ -25,6 +25,7 @@ type ApTableContextProps<RecordType> = {
     size?: ComputedRef<TableSize>;
     updateSize?: (nextSize: TableSize) => void;
     dataSource?: ComputedRef<RecordType[]>;
+    renderConfig?: ComputedRef<ApTableContextRenderConfig>;
 };
 export declare const ApTableContextKey: InjectionKey<ApTableContextProps<any>>;
 export declare function useProvideApTable<ModelType>(state: ApTableContextProps<ModelType>): void;

package/es/src/ap-table/context.mjs

@@ -1,21 +1,22 @@
-import { provide as n, inject as u, computed as e } from "vue";
+import { provide as n, inject as i, computed as e } from "vue";
 const o = Symbol("apTableContextKey");
-function p(t) {
+function u(t) {
   n(o, t);
 }
-function a() {
-  return u(o, {
+function p() {
+  return i(o, {
     columns: e(() => []),
     updateColumns: () => {
     },
     size: e(() => "middle"),
     updateSize: () => {
     },
-    dataSource: void 0
+    dataSource: void 0,
+    renderConfig: void 0
   });
 }
 export {
   o as ApTableContextKey,
-  a as useInjectApTable,
-  p as useProvideApTable
+  p as useInjectApTable,
+  u as useProvideApTable
 };

package/es/src/ap-table/hooks/use-table-column-state.mjs

@@ -1,15 +1,19 @@
-import { ref as D, shallowRef as G, unref as f, computed as W, watchEffect as X } from "vue";
-import { isDef as q } from "../../utils/index.mjs";
-import H, { customCloneColumnStates as B, getColumnStateString as L } from "../components/setting/utils.mjs";
-import { useInjectApTable as P } from "../context.mjs";
-import { isObject as N, mergeWith as F, isBoolean as Q, omit as U, isNumber as b } from "lodash-unified";
+import { ref as P, shallowRef as W, unref as i, computed as X, watchEffect as q } from "vue";
+import { isDef as H } from "../../utils/index.mjs";
+import L, { customCloneColumnStates as T, getColumnStateString as Q } from "../components/setting/utils.mjs";
+import { useInjectApTable as U } from "../context.mjs";
+import { isObject as N, mergeWith as F, isBoolean as V, omit as Y, isString as Z, isNumber as B } from "lodash-unified";
+import "../../config-provider/index.mjs";
+import { useToken as $ } from "@aplus-frontend/antdv/es/theme/internal";
+import { getTableTitle as K } from "../utils.mjs";
+import { useNamespace as ee } from "../../config-provider/hooks/use-namespace.mjs";
 function u(r, o) {
   r.forEach((n) => {
-    var i;
-    o(n), (i = n.children) != null && i.length && u(n.children, o);
+    var a;
+    o(n), (a = n.children) != null && a.length && u(n.children, o);
   });
 }
-function V(r, o) {
+function te(r, o) {
   if (!o)
     return {};
   const n = r.getItem(o);
@@ -20,108 +24,113 @@ function I(r, o) {
     return F({}, r, o, I);
 }
 const E = Number.MAX_SAFE_INTEGER;
-function Y(r, o, n, i) {
-  return i ? i.fixed : o ? o.fixed : n && "fixed" in n ? n.fixed : Q(r.fixed) ? r.fixed ? "left" : void 0 : r.fixed;
+function re(r, o, n, a) {
+  return a ? a.fixed : o ? o.fixed : n && "fixed" in n ? n.fixed : V(r.fixed) ? r.fixed ? "left" : void 0 : r.fixed;
 }
-const re = (r, o, n) => {
-  const i = D(n), c = G(
-    B(n)
-  ), { columnsBackup: x, updateColumns: a } = P(), T = r.persistenceType || "localStorage", S = window[T];
-  function O() {
-    const e = V(
+const he = (r, o, n) => {
+  const { be: a } = ee("ap-table"), [oe, O] = $(), l = P(n), c = W(
+    T(n)
+  ), { columnsBackup: p, updateColumns: h } = U(), _ = r.persistenceType || "localStorage", S = window[_];
+  function J() {
+    const e = te(
       S,
-      f(o)
+      i(o)
     ), t = F(
       {},
       r.defaultValue || {},
       e,
       I
-    ), s = f(x);
-    function l(j, h, z) {
-      return j.map((d) => {
+    ), s = i(p);
+    function d(D, m, G) {
+      return D.map((f) => {
         var y, A;
-        const v = (h == null ? void 0 : h[d.key]) || {}, g = {
-          key: d.key,
-          label: d.title,
+        const b = (m == null ? void 0 : m[f.key]) || {}, g = {
+          key: f.key,
+          label: Z(f.title) ? K(
+            f,
+            a("table-header", "title"),
+            void 0,
+            O.value.colorPrimary
+          ) : f.title,
           show: !0,
-          fixed: Y(
-            d,
-            e[d.key],
-            (y = r.defaultValue) == null ? void 0 : y[d.key],
-            z
+          fixed: re(
+            f,
+            e[f.key],
+            (y = r.defaultValue) == null ? void 0 : y[f.key],
+            G
           ),
           disabled: !1,
-          ...U(v, ["children", "fixed"])
+          ...Y(b, ["children", "fixed"])
         };
-        return g.children = (A = d.children) != null && A.length ? l(
-          d.children,
-          v.children,
+        return g.children = (A = f.children) != null && A.length ? d(
+          f.children,
+          b.children,
           g
         ) : void 0, g;
-      }).sort(J);
+      }).sort(M);
     }
-    return l(s || [], t);
+    return d(s || [], t);
   }
-  function J(e, t) {
-    const s = b(e.order) ? e.order : E;
-    let l = b(t.order) ? t.order : E;
-    return e.fixed === "right" && t.fixed !== "right" && (l = s - 1), t.fixed === "left" && e.fixed !== "left" && (l = s - 1), s - l;
+  function M(e, t) {
+    const s = B(e.order) ? e.order : E;
+    let d = B(t.order) ? t.order : E;
+    return e.fixed === "right" && t.fixed !== "right" && (d = s - 1), t.fixed === "left" && e.fixed !== "left" && (d = s - 1), s - d;
   }
-  const m = W(() => f(i).every((e) => e.show));
+  const x = X(() => i(l).every((e) => e.show));
   function C() {
-    const e = f(i);
+    const e = i(l);
     u(e, (t) => {
       !t.disabled && (t.show = !0);
     });
   }
-  function p() {
-    const e = f(i);
+  function w() {
+    const e = i(l);
     u(e, (t) => {
       !t.disabled && (t.show = !1);
     });
   }
-  function M() {
-    f(m) ? p() : C();
+  function R() {
+    i(x) ? w() : C();
   }
-  function R(e, t) {
-    u(f(i), (s) => {
-      s.key === e && (s.show = q(t) ? t : !s.show);
+  function j(e, t) {
+    u(i(l), (s) => {
+      s.key === e && (s.show = H(t) ? t : !s.show);
     });
   }
-  function w(e) {
-    i.value = e;
+  function k(e) {
+    l.value = e;
   }
-  function _(e) {
+  function z(e) {
     c.value = e;
   }
-  function k(e) {
-    if (f(o)) {
-      const t = L(e);
-      S.setItem(f(o), JSON.stringify(t));
+  function v(e) {
+    if (i(o)) {
+      const t = Q(e);
+      S.setItem(i(o), JSON.stringify(t));
     }
   }
-  return X(() => {
+  return q(() => {
     var t;
-    const e = O();
-    w(e), (t = r.onChange) == null || t.call(r, e), a == null || a(
-      H(
-        f(x),
-        f(e)
+    const e = J();
+    k(e), (t = r.onChange) == null || t.call(r, e), h == null || h(
+      L(
+        i(p),
+        i(e)
       )
-    ), c.value = B(e), k(e);
+    ), c.value = T(e), v(e);
   }), {
-    columnState: i,
+    columnState: l,
     selectAll: C,
-    unSelectAll: p,
-    toggleSelect: R,
-    setColumnState: w,
-    isAllSelected: m,
-    toggleSelectAll: M,
+    unSelectAll: w,
+    toggleSelect: j,
+    setColumnState: k,
+    isAllSelected: x,
+    toggleSelectAll: R,
     columnStateBackup: c,
-    setColumnStateBackup: _,
-    cacheColumnStateIfNeeded: k
+    setColumnStateBackup: z,
+    cacheColumnStateIfNeeded: v
   };
 };
 export {
-  re as useTableColumnState
+  he as useTableColumnState
 };

package/es/src/ap-table/hooks/use-table-paging-ng.d.ts

@@ -49,13 +49,19 @@ export type UseTablePagingParams<DataType, ParamsType> = {
      * 分页相关
      */
     pagination?: boolean | ApTablePaginationConfig;
+    /**
+     * 样式命名空间
+     */
+    namespace?: 'ap-table' | 'ap-grid';
 };
 type InternalDataType<DataType = Recordable> = {
     total: number;
     records: DataType[];
     loading: boolean;
 };
-export declare const useTablePaging: <DataType = any, ParamsType = Record<string, any>>({ manual, request, defaultParams, defaultData, formatParams, paramsValueTypeMap, resetFieldsIgnores, filterFields, sortFields, pagination }: UseTablePagingParams<DataType, ParamsType>) => {
+export declare const DEFAULT_CURRENT = 1;
+export declare const DEFAULT_PAGE_SIZE = 10;
+export declare const useTablePaging: <DataType = any, ParamsType = Record<string, any>>({ manual, request, defaultParams, defaultData, formatParams, paramsValueTypeMap, resetFieldsIgnores, filterFields, sortFields, namespace, pagination }: UseTablePagingParams<DataType, ParamsType>) => {
     formRef: Ref<ApFormSearchFormExpose | undefined, ApFormSearchFormExpose | undefined>;
     submit: () => void;
     reset: () => void;
@@ -74,7 +80,7 @@ export declare const useTablePaging: <DataType = any, ParamsType = Record<string
             showSizeChanger: boolean;
             showQuickJumper: boolean;
             showLessItems: boolean | undefined;
-            size: string;
+            size: "default" | "small";
             showTotal: ((total: number) => import("vue/jsx-runtime").JSX.Element) | undefined;
         };
         onChange: (pagination: TablePaginationConfig, filters: Record<string, FilterValue | null>, sorter: SorterResult<any> | SorterResult<any>[], extra: TableCurrentDataSource<any>) => void;