@aplus-frontend/ui 0.5.34 → 0.5.35

package/es/src/ap-grid/index.vue.mjs

@@ -114,13 +114,13 @@ const Fo = /* @__PURE__ */ ke({
     var q;
     const L = Fe(), a = oe, w = (q = Be()) == null ? void 0 : q.appContext.app;
     w && !w.__VXE_PC_UI_INSTALLED__ && (w.use(Q), w.__VXE_PC_UI_INSTALLED__ = !0);
-    const { e: E, b: i, be: re } = Je("ap-grid"), te = Qe("valueTypeMap"), d = k([]), O = k([]), m = k(), C = k(a.size), [, c] = Xe(), { t: le } = Ye();
+    const { e: E, b: d, be: re } = Je("ap-grid"), te = Qe("valueTypeMap"), i = k([]), O = k([]), m = k(), C = k(a.size), [, c] = Xe(), { t: le } = Ye();
     Q.setConfig({
       i18n: (e, r) => le(`ap.${e}`, r)
     });
-    const { renderConfig: ne, updateSignal: se } = Ge(d);
+    const { renderConfig: ne, updateSignal: se } = Ge(i);
     let D = 0;
-    const de = n(() => {
+    const ie = n(() => {
       if (m.value)
         return m.value.$el.querySelector(
           ".vxe-table--header-inner-wrapper"
@@ -151,15 +151,15 @@ const Fo = /* @__PURE__ */ ke({
           o(te)
         ), y;
       })) || [];
-    }), ie = n(() => [
-      i(),
-      a.card ? null : i("wrapper"),
-      a.adaptive ? i("adaptive") : null,
-      a.sticky ? i("sticky") : null
-    ].filter(Boolean)), $ = n(() => Z(o(d), (e) => {
+    }), de = n(() => [
+      d(),
+      a.card ? null : d("wrapper"),
+      a.adaptive ? d("adaptive") : null,
+      a.sticky ? d("sticky") : null
+    ].filter(Boolean)), $ = n(() => Z(o(i), (e) => {
       if (e.sorter === !0)
         return e.key || e.dataIndex;
-    }).filter(Boolean)), H = n(() => Z(o(d), (e) => {
+    }).filter(Boolean)), H = n(() => Z(o(i), (e) => {
       if (e.filters && !e.onFilter)
         return e.key || e.dataIndex;
     }).filter(Boolean)), {
@@ -197,12 +197,12 @@ const Fo = /* @__PURE__ */ ke({
       pagination: a.pagination
     }), { sortChangeEvent: me, filterChangeEvent: fe, paginationChangeEvent: ge } = De(pe);
     je({
-      columns: n(() => d.value),
+      columns: n(() => i.value),
       columnsBackup: n(() => O.value),
       size: n(() => C.value ? qe[C.value] : "middle"),
       updateColumns(e) {
         var r;
-        d.value = e, (r = a.onShownColumnsChange) == null || r.call(a, e);
+        i.value = e, (r = a.onShownColumnsChange) == null || r.call(a, e);
       },
       updateSize(e) {
         C.value = Me[e];
@@ -214,7 +214,7 @@ const Fo = /* @__PURE__ */ ke({
       dataSource: n(() => o(f).records)
     });
     const he = n(
-      () => d.value.some(
+      () => i.value.some(
         (e) => e.fixed === "left" || e.fixed === !0
       ) ? "left" : void 0
     ), ve = n(
@@ -264,7 +264,7 @@ const Fo = /* @__PURE__ */ ke({
       () => {
         var r;
         const e = be();
-        d.value = e, (r = a.onShownColumnsChange) == null || r.call(a, e), O.value = e;
+        i.value = e, (r = a.onShownColumnsChange) == null || r.call(a, e), O.value = e;
       },
       {
         deep: !0,
@@ -293,14 +293,14 @@ const Fo = /* @__PURE__ */ ke({
       refresh: ce,
       setSearchFormValues: we,
       getSearchFormValues: xe,
-      getShowColumns: () => o(d),
+      getShowColumns: () => o(i),
       rowSelection: {
         selectedRows: n(() => x.value),
         clearAll: T
       },
       scrollToRow: Re
     }), (e, r) => (s(), B("div", {
-      class: g(ie.value),
+      class: g(de.value),
       style: z(e.wrapperStyle)
     }, [
       o(b)(e.dataSource) && e.searchForm !== !1 && K.value.length > 0 ? (s(), B("div", {
@@ -342,17 +342,17 @@ const Fo = /* @__PURE__ */ ke({
         style: z(e.tableWrapperStyle)
       }, [
         I("div", {
-          class: g(o(i)("header-wrapper"))
+          class: g(o(d)("header-wrapper"))
         }, [
           V(e.$slots, "title", {
             selectedRows: o(x),
             selectedRowKeys: o(R).selectedRowKeys,
-            shownColumns: d.value,
+            shownColumns: i.value,
             clearAll: T
           })
         ], 2),
         I("div", {
-          class: g(o(i)("vxe-wrapper"))
+          class: g(o(d)("vxe-wrapper"))
         }, [
           (s(), p(o(Pe), h(o(Ke)(a), {
             ref_key: "tableRef",
@@ -398,7 +398,7 @@ const Fo = /* @__PURE__ */ ke({
                 ]),
                 _: 1
               }, 16, ["fixed"])) : S("", !0),
-              a.rowSelection ? (s(), p(o(J), h({ key: 1 }, o(He)(o(R), d.value), { field: o(Ue) }), null, 16, ["field"])) : S("", !0),
+              a.rowSelection ? (s(), p(o(J), h({ key: 1 }, o(He)(o(R), i.value), { field: o(Ue) }), null, 16, ["field"])) : S("", !0),
               (s(!0), B(X, null, _(o(ne), (l) => (s(), p(A(l), {
                 key: l.props.colId
               }))), 128))
@@ -414,16 +414,17 @@ const Fo = /* @__PURE__ */ ke({
           ]), 1040, ["data", "sort-config", "filter-config", "loading", "row-config", "style", "size", "onSortChange", "onFilterChange"]))
         ], 2),
         I("div", {
-          class: g(o(i)("pagination-wrapper"))
+          class: g(o(d)("pagination-wrapper"))
         }, [
           e.sticky ? (s(), p(o(Ze), {
             key: 0,
             direction: "horizontal",
-            "scroll-container": de.value
+            "scroll-container": ie.value,
+            "extra-size": -4.2
           }, null, 8, ["scroll-container"])) : S("", !0),
           e.pagination !== !1 ? (s(), p(o(Oe), h({
             key: 1,
-            class: o(i)("pagination")
+            class: o(d)("pagination")
           }, o(M).pagination, { onChange: o(ge) }), null, 16, ["class", "onChange"])) : S("", !0)
         ], 2)
       ], 6)

package/es/src/ap-grid/interface.d.ts

@@ -4,9 +4,9 @@ import { Recordable } from '../type';
 import { TableProps } from '@aplus-frontend/antdv';
 import { ColumnFilterItem, SortOrder, TableRowSelection } from '@aplus-frontend/antdv/es/table/interface';
 import { ComputedRef, CSSProperties, Ref, VNode } from 'vue';
-import { VxeTablePropTypes, VxeColumnPropTypes, VxeTableProps, VxeTableDefines, VxeColumnSlots } from 'vxe-table';
+import { VxeTablePropTypes, VxeColumnPropTypes, VxeTableProps, VxeTableDefines, VxeColumnSlots, VxeColumnProps } from 'vxe-table';
 export type ColConfigType = VxeTableDefines.ColumnOptions;
-export type ApGridColumnType<RecordType = any, ExtraValueType = 'text', ValueType extends ApTableValueTypes = ApTableValueTypes, MergedValueType extends ExtraValueType | ValueType = ExtraValueType | ValueType> = MergedValueType extends ExtraValueType | ValueType ? Omit<ExtraProColumnType<RecordType>, 'sorter' | 'rowSpan' | 'customCell' | 'customHeaderCell' | 'minWidth'> & {
+export type ApGridColumnType<RecordType = any, ExtraValueType = 'text', ValueType extends ApTableValueTypes = ApTableValueTypes, MergedValueType extends ExtraValueType | ValueType = ExtraValueType | ValueType> = MergedValueType extends ExtraValueType | ValueType ? Omit<ExtraProColumnType<RecordType>, 'sorter' | 'rowSpan' | 'customCell' | 'customHeaderCell' | 'minWidth' | 'className' | 'class'> & {
     children?: ApGridColumnType<RecordType, ExtraValueType, ValueType, MergedValueType>[];
     /**
      * 表单项所占据的格子数（1-24格）
@@ -100,7 +100,7 @@ export type ApGridColumnType<RecordType = any, ExtraValueType = 'text', ValueTyp
         originalNode?: VNode;
         originalText?: any;
     }) => any;
-} : never;
+} & Pick<VxeColumnProps, 'className' | 'headerClassName' | 'footerClassName'> : never;
 export type ApGridRowSelection<RecordType> = Pick<TableRowSelection<RecordType>, 'defaultSelectedRowKeys' | 'type' | 'preserveSelectedRowKeys' | 'onChange' | 'fixed' | 'columnWidth' | 'columnTitle'> & {
     /**
      * 设置禁用的列

package/es/src/ap-grid/utils/col.mjs

@@ -1,19 +1,19 @@
-import { createVNode as v, Fragment as S } from "vue";
-import { isUndefined as $, isArray as M, isString as x, isBoolean as A, isNumber as V, pick as R } from "lodash-unified";
-import { valueEnumToArray as j, objectToString as B, getTableTitle as c, getTableRenderType as N, getTableRenderProps as W, getTableCellRenderNode as _ } from "../../ap-table/utils.mjs";
+import { createVNode as v, Fragment as O } from "vue";
+import { isUndefined as S, isArray as $, isString as x, isBoolean as c, isNumber as M, pick as A } from "lodash-unified";
+import { valueEnumToArray as V, objectToString as j, getTableTitle as R, getTableRenderType as B, getTableRenderProps as W, getTableCellRenderNode as _ } from "../../ap-table/utils.mjs";
 import { noRenderAsFormItemValueList as k } from "../../ap-table/constants.mjs";
 import "../../ap-table/components/paragraph-ellipsis/index.vue.mjs";
 import z from "../../ap-table/components/paragraph-ellipsis/index.vue2.mjs";
 function b(e) {
-  if (!$(e))
-    return M(e) ? e.reduce((r, i) => x(i) ? `${r}.${i}` : `${r}[${i}]`, "") : String(e);
+  if (!S(e))
+    return $(e) ? e.reduce((r, i) => x(i) ? `${r}.${i}` : `${r}[${i}]`, "") : String(e);
 }
 function w(e) {
   if (e)
     return e === !0 ? "left" : e;
 }
 function G(e) {
-  return A(e) ? {
+  return c(e) ? {
     sortable: e
   } : e ? {
     sortable: !0,
@@ -25,7 +25,7 @@ function G(e) {
 }
 function I(e) {
   let r;
-  return A(e.filters) && e.valueEnum ? r = j(e.valueEnum) : r = e.filters, r == null ? void 0 : r.map((i) => ({
+  return c(e.filters) && e.valueEnum ? r = V(e.valueEnum) : r = e.filters, r == null ? void 0 : r.map((i) => ({
     label: x(i.text) ? i.text : "",
     value: i.value
   }));
@@ -35,7 +35,7 @@ function L(e) {
     return (r) => e(r.value, r.row);
 }
 function U(e, r) {
-  return e ? V(e) ? {
+  return e ? M(e) ? {
     tooltip: r,
     rows: e
   } : e === !0 || e === "tooltip" ? {
@@ -51,7 +51,7 @@ function q(e, r, i) {
   if (k.includes(e.valueType))
     return i;
   if (e.copyable || e.ellipsis) {
-    const l = U(e.ellipsis, r), t = B(r);
+    const l = U(e.ellipsis, r), t = j(r);
     return v(z, {
       rawValue: t,
       copyable: e.copyable,
@@ -62,73 +62,73 @@ function q(e, r, i) {
   return i;
 }
 function y(e, r, i) {
-  const l = R(e, ["width", "minWidth", "align"]);
+  const l = A(e, ["width", "minWidth", "align"]);
   return l.field = b(e.dataIndex), l.fixed = w(e.fixed), l.slots = {
-    header: () => c(e, i, void 0, r)
+    header: () => R(e, i, void 0, r)
   }, l.headerAlign = e.align, l.showOverflow = !1, l.showFooterOverflow = !1, l;
 }
 function F(e, r, i, l) {
-  const t = R(e, ["width", "minWidth", "align", "resizable"]);
+  const t = A(e, ["width", "minWidth", "align", "resizable", "className", "headerClassName", "footerClassName"]);
   t.field = b(e.dataIndex), t.fixed = w(e.fixed), t.headerAlign = e.align, t.footerAlign = e.align, t.showOverflow = !1, t.showFooterOverflow = !1, Object.assign(t, G(e.sorter)), t.filters = I(e), t.filterMultiple = e.filterMultiple, t.filterMethod = L(e.onFilter);
-  const a = ({
-    value: d,
-    ...n
+  const f = ({
+    value: n,
+    ...s
   }) => {
     var o, T;
-    const f = N(e), u = W({
+    const a = B(e), u = W({
       ...e,
-      valueType: f
+      valueType: a
     }, {
-      value: d,
-      ...n
-    }), E = _(f, u, n.record, l), h = ((o = e.renderText) == null ? void 0 : o.call(e, {
-      value: d,
-      ...n
-    })) || d, O = e.renderText ? v(S, null, [(T = e.renderText) == null ? void 0 : T.call(e, {
-      value: d,
-      ...n
+      value: n,
+      ...s
+    }), E = _(a, u, s.record, l), h = ((o = e.renderText) == null ? void 0 : o.call(e, {
+      value: n,
+      ...s
+    })) || n, N = e.renderText ? v(O, null, [(T = e.renderText) == null ? void 0 : T.call(e, {
+      value: n,
+      ...s
     })]) : E;
-    let p = q(e, h, O);
+    let p = q(e, h, N);
     return e.customRender && (p = e.customRender({
-      value: d,
-      ...n,
+      value: n,
+      ...s,
       column: e,
       originalNode: p,
       originalText: h
     })), p;
-  }, s = ({
-    row: d,
-    rowIndex: n
-  }) => a({
-    value: d[t.field],
-    text: d[t.field],
-    record: d,
-    index: n,
-    renderIndex: n,
+  }, d = ({
+    row: n,
+    rowIndex: s
+  }) => f({
+    value: n[t.field],
+    text: n[t.field],
+    record: n,
+    index: s,
+    renderIndex: s,
     column: e
   });
   return t.slots = {
-    header: () => c(e, i, void 0, r),
-    default: s,
-    footer: s
+    header: () => R(e, i, void 0, r),
+    default: d,
+    footer: d
   }, e.html && (delete t.slots.default, delete t.slots.footer, t.type = "html"), t;
 }
 function Y(e, r, i, l) {
-  var s;
-  if (!((s = e.children) != null && s.length))
+  var d;
+  if (!((d = e.children) != null && d.length))
     return F(e, r, i, l);
-  function t(d) {
-    return d.map((n) => {
-      var f;
-      if ((f = n.children) != null && f.length) {
-        const u = y(n, r, i);
-        return u.children = t(n.children), u;
+  function t(n) {
+    return n.map((s) => {
+      var a;
+      if ((a = s.children) != null && a.length) {
+        const u = y(s, r, i);
+        return u.children = t(s.children), u;
       }
-      return F(n, r, i, l);
+      return F(s, r, i, l);
     });
   }
-  const a = y(e, r, i);
-  return a.children = t(e.children), a;
+  const f = y(e, r, i);
+  return f.children = t(e.children), f;
 }
 export {
   Y as transformCol,

package/es/src/design-token/index.mjs

@@ -40,6 +40,7 @@ const o = {
   colorPrimaryHover: "#85D4B0",
   colorPrimaryActive: "#5DC596",
   colorBgContainerDisabled: "#f5f5f5",
+  colorTextBase: "#333333",
   // colorTextDisabled: '#666666',
   // 字体颜色
   colorText: "#333333",

package/lib/src/ap-grid/index.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),x=require("vxe-table");require("vxe-table/es/style.css");require("vxe-pc-ui/es/style.css");const A=require("vxe-pc-ui"),p=require("lodash-unified"),ue=require("../ap-form/index.js");require("../config-provider/index.js");const ce=require("../ap-table/constants.js"),i=require("../ap-table/utils.js"),de=require("../ap-table/hooks/use-table-paging-ng.js"),k=require("@aplus-frontend/antdv"),ie=require("./hooks/use-inner-params.js"),R=require("./utils/table.js"),fe=require("../ap-table/hooks/use-table-row-selection.js"),pe=require("../ap-table/context.js"),B=require("./constants.js"),me=require("./hooks/use-render-columns.js"),ge=require("@aplus-frontend/antdv/es/theme/internal");require("../scroll-bar/index.js");const Ce=require("../config-provider/hooks/use-namespace.js"),he=require("../config-provider/hooks/use-global-config.js"),ve=require("../config-provider/hooks/use-locale.js"),ye=require("../scroll-bar/index.vue.js"),Se=e.defineComponent({name:"ApGrid",__name:"index",props:{dropdownPrefixCls:{},bordered:{type:Boolean,default:!1},locale:{},onChange:{},onResizeColumn:{},getPopupContainer:{},scroll:{},sortDirections:{default:()=>["ascend","descend"]},showSorterTooltip:{type:[Boolean,Object],default:!1},prefixCls:{},tableLayout:{},title:{},id:{},showHeader:{type:Boolean,default:!0},components:{},customRow:{},customHeaderRow:{},direction:{},expandFixed:{type:[String,Boolean],default:!1},expandColumnWidth:{},expandedRowKeys:{},defaultExpandedRowKeys:{},expandedRowRender:{},expandRowByClick:{type:Boolean,default:!1},expandIcon:{},onExpand:{},onExpandedRowsChange:{},defaultExpandAllRows:{type:Boolean,default:!1},indentSize:{default:15},expandIconColumnIndex:{},showExpandColumn:{type:Boolean,default:!0},expandedRowClassName:{},childrenColumnName:{default:"children"},rowExpandable:{},sticky:{type:[Boolean,Object],default:!1},transformCellText:{},rowClassName:{},stripe:{type:Boolean},headerRowClassName:{},footerRowClassName:{},cellClassName:{},headerCellClassName:{},footerCellClassName:{},rowStyle:{},headerRowStyle:{},footerRowStyle:{},cellStyle:{},headerCellStyle:{},footerCellStyle:{},height:{},minHeight:{},maxHeight:{},mergeCells:{},mergeFooterItems:{},cellConfig:{},loading:{type:Boolean,default:void 0},loadingConfig:{},headerCellConfig:{},footerCellConfig:{},columns:{},rowSelection:{type:Boolean},card:{type:Boolean,default:!1},params:{},request:{},defaultData:{},dataSource:{},onLoadingChange:{},onShownColumnsChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},wrapperStyle:{},manual:{type:Boolean,default:!1},size:{default:void 0},adaptive:{type:Boolean,default:!1},columnResizable:{type:[Boolean,Object],default:!1},rowKey:{default:"key"},footer:{},virtual:{type:[Boolean,Object],default:void 0},expandable:{},value:{}},setup(L,{expose:O}){var T;const F=e.useSlots(),r=L,C=(T=e.getCurrentInstance())==null?void 0:T.appContext.app;C&&!C.__VXE_PC_UI_INSTALLED__&&(C.use(A.VxeUI),C.__VXE_PC_UI_INSTALLED__=!0);const{e:y,b:s,be:D}=Ce.useNamespace("ap-grid"),U=he.useGlobalConfig("valueTypeMap"),l=e.ref([]),E=e.ref([]),d=e.ref(),m=e.ref(r.size),[,u]=ge.useToken(),{t:K}=ve.useLocale();A.VxeUI.setConfig({i18n:(o,a)=>K(`ap.${o}`,a)});const{renderConfig:$,updateSignal:j}=me.useRenderColumns(l);let P=0;const H=e.computed(()=>{if(d.value)return d.value.$el.querySelector(".vxe-table--header-inner-wrapper")}),I=e.computed(()=>{var o,a,n;return P++,((n=(a=(o=r.columns)==null?void 0:o.filter(t=>!t.hideInSearch&&t.dataIndex&&(t.valueType||t.customRenderFormItem)&&!ce.noRenderAsFormItemValueList.includes(t.valueType)))==null?void 0:a.sort((t,c)=>{let g=i.getColumnOrder(t.order);return i.getColumnOrder(c.order)-g}))==null?void 0:n.map(t=>{const c=i.updateFormProps(t,i.getFieldProps(t.fieldProps,{})),g={...t,fieldProps:{label:t.title,name:t.dataIndex,...c||{},_signal:P},renderNode:void 0};return g.renderNode=i.getSearchFormItemRenderNode(g,e.unref(U)),g}))||[]}),M=e.computed(()=>[s(),r.card?null:s("wrapper"),r.adaptive?s("adaptive"):null,r.sticky?s("sticky"):null].filter(Boolean)),N=e.computed(()=>i.recursionApColumns(e.unref(l),o=>{if(o.sorter===!0)return o.key||o.dataIndex}).filter(Boolean)),q=e.computed(()=>i.recursionApColumns(e.unref(l),o=>{if(o.filters&&!o.onFilter)return o.key||o.dataIndex}).filter(Boolean)),{formRef:S,submit:z,reset:_,refresh:W,data:f,tableProps:V,setDataSource:G,handleTableChange:X}=de.useTablePaging({async request(o){var n;if(!v.value.preserveSelectedRowKeys&&p.isUndefined(r.dataSource)&&b(),!p.isUndefined(r.dataSource)){const t=o.pageSize*(o.current-1);return{data:(r.pagination===!1?r.dataSource:r.dataSource.slice(t,t+o.pageSize))||[],total:r.dataSource.length||0}}const a=await((n=r.request)==null?void 0:n.call(r,o));return{data:(a==null?void 0:a.data)||[],total:(a==null?void 0:a.total)||0}},namespace:"ap-grid",filterFields:q,sortFields:N,defaultParams:r.params,defaultData:r.defaultData,manual:r.manual,formatParams:r.beforeSearchSubmit,pagination:r.pagination}),{sortChangeEvent:J,filterChangeEvent:Q,paginationChangeEvent:Y}=ie.useInnerParams(X);pe.useProvideApTable({columns:e.computed(()=>l.value),columnsBackup:e.computed(()=>E.value),size:e.computed(()=>m.value?B.sizeMap[m.value]:"middle"),updateColumns(o){var a;l.value=o,(a=r.onShownColumnsChange)==null||a.call(r,o)},updateSize(o){m.value=B.sizeReverseMap[o]},renderConfig:e.computed(()=>({className:D("table-header","title"),color:u.value.colorPrimary})),dataSource:e.computed(()=>e.unref(f).records)});const Z=e.computed(()=>l.value.some(o=>o.fixed==="left"||o.fixed===!0)?"left":void 0),ee=e.computed(()=>p.isUndefined(r.loading)?f.loading:r.loading),oe=e.computed(()=>p.isUndefined(r.dataSource)?f.records:r.dataSource),{selectedRows:h,rowSelection:v,...re}=fe.default({...r.rowSelection===!0?{}:r.rowSelection,dataSource:oe,rowKey:r.rowKey}),w=()=>{const o=d.value;o&&(h.value=[...o.getCheckboxReserveRecords(),...o.getCheckboxRecords()])},ae=()=>{const o=d.value;o&&(h.value=[o.getRadioRecord()])};function te(){var o;return((o=r.columns)==null?void 0:o.filter(a=>!a.hideInTable))||[]}function ne(o){var a,n,t;(t=(n=(a=S.value)==null?void 0:a.apForm)==null?void 0:n.setFieldsValue)==null||t.call(n,o)}function le(o=!1){var n,t,c;const a=o?"getFieldsValueTransformed":"getFieldsValue";return(c=(t=(n=S.value)==null?void 0:n.apForm)==null?void 0:t[a])==null?void 0:c.call(t,!0)}function b(){re.clearAll();const o=d.value;o&&(v.value.type==="radio"?(o.clearRadioRow(),o.clearRadioReserve()):(o.clearCheckboxRow(),o.clearCheckboxReserve()))}async function se(o,a){var t;const n=f.records[o];if(n)return(t=d.value)==null?void 0:t.scrollToRow(n,a)}return e.watch(()=>[r.columnResizable,r.columns],()=>{var a;const o=te();l.value=o,(a=r.onShownColumnsChange)==null||a.call(r,o),E.value=o},{deep:!0,immediate:!0}),e.watch(()=>r.dataSource,o=>{G(o)},{immediate:!0,deep:!0}),e.watch(()=>e.unref(f).loading,o=>{var a;(a=r.onLoadingChange)==null||a.call(r,o)}),e.watch(()=>r.size,o=>{m.value=o}),O({submit:z,reset:_,refresh:W,setSearchFormValues:ne,getSearchFormValues:le,getShowColumns:()=>e.unref(l),rowSelection:{selectedRows:e.computed(()=>h.value),clearAll:b},scrollToRow:se}),(o,a)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(M.value),style:e.normalizeStyle(o.wrapperStyle)},[e.unref(p.isUndefined)(o.dataSource)&&o.searchForm!==!1&&I.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(o.card?e.unref(y)("search-wrapper"):null),style:e.normalizeStyle(o.searchFormWrapperStyle)},[e.createVNode(e.unref(ue.ApForm).SearchForm,e.mergeProps(o.searchForm||{},{ref_key:"formRef",ref:S,"custom-reset":"","submit-loading":e.unref(V).loading,onSubmit:e.unref(z),onReset:e.unref(_)}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(I.value,n=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n.renderNode.Comp),e.mergeProps({key:n.dataIndex,item:n,ref_for:!0},n.fieldProps||{},{span:n.span,"custom-render":n.renderNode.render}),null,16,["item","span","custom-render"]))),128))]),_:2},[F.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(o.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["submit-loading","onSubmit","onReset"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{class:e.normalizeClass([e.unref(y)("table-wrapper"),o.card?e.unref(y)("table-wrapper-card"):null]),style:e.normalizeStyle(o.tableWrapperStyle)},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(s)("header-wrapper"))},[e.renderSlot(o.$slots,"title",{selectedRows:e.unref(h),selectedRowKeys:e.unref(v).selectedRowKeys,shownColumns:l.value,clearAll:b})],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(s)("vxe-wrapper"))},[(e.openBlock(),e.createBlock(e.unref(x.VxeTable),e.mergeProps(e.unref(R.toVxeProps)(r),{ref_key:"tableRef",ref:d,key:e.unref(j),data:e.unref(f).records,"sort-config":{remote:N.value.length>0},"filter-config":{remote:q.value.length>0},loading:ee.value,"row-config":{isHover:!0,keyField:r.rowKey},style:{"--vxe-ui-table-row-checkbox-checked-background-color":e.unref(u).controlItemBgActive,"--vxe-ui-table-row-hover-checkbox-checked-background-color":e.unref(u).controlItemBgActiveHover,"--vxe-ui-font-primary-color":e.unref(u).colorPrimary,"--vxe-ui-table-header-background-color":"var(--ap-table-header-bg)","--vxe-ui-table-cell-padding-default":"12px","--vxe-ui-table-cell-padding-medium":"9px","--vxe-ui-table-row-radio-checked-background-color":e.unref(u).controlItemBgActive,"--vxe-ui-table-row-hover-radio-checked-background-color":e.unref(u).controlItemBgActiveHover,"--vxe-ui-font-color":e.unref(u).colorTextBase,"--vxe-ui-table-border-color":e.unref(u).colorBorderSecondary},size:m.value,onSortChange:e.unref(J),onFilterChange:e.unref(Q),onCheckboxChange:w,onCheckboxRangeChange:w,onCheckboxAll:w,onRadioChange:ae}),e.createSlots({empty:e.withCtx(()=>[e.createVNode(e.unref(k.Empty),{image:e.unref(k.Empty).PRESENTED_IMAGE_SIMPLE},null,8,["image"])]),default:e.withCtx(()=>[r.expandable?(e.openBlock(),e.createBlock(e.unref(x.VxeColumn),e.mergeProps({key:0},e.unref(R.getRowExpandProps)(o.expandable),{fixed:Z.value}),{content:e.withCtx(n=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(r.expandable.renderContent(n))))]),_:1},16,["fixed"])):e.createCommentVNode("",!0),r.rowSelection?(e.openBlock(),e.createBlock(e.unref(x.VxeColumn),e.mergeProps({key:1},e.unref(R.getRowSelectionProps)(e.unref(v),l.value),{field:e.unref(B.ROW_SELECTION_FIELD)}),null,16,["field"])):e.createCommentVNode("",!0),(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(e.unref($),n=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n),{key:n.props.colId}))),128))]),_:2},[e.renderList(e.unref(p.omit)(F,["searchFormExtra"]),(n,t)=>({name:t,fn:e.withCtx(c=>[e.renderSlot(o.$slots,t,e.normalizeProps(e.guardReactiveProps(c||{})))])}))]),1040,["data","sort-config","filter-config","loading","row-config","style","size","onSortChange","onFilterChange"]))],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(s)("pagination-wrapper"))},[o.sticky?(e.openBlock(),e.createBlock(e.unref(ye.default),{key:0,direction:"horizontal","scroll-container":H.value},null,8,["scroll-container"])):e.createCommentVNode("",!0),o.pagination!==!1?(e.openBlock(),e.createBlock(e.unref(k.Pagination),e.mergeProps({key:1,class:e.unref(s)("pagination")},e.unref(V).pagination,{onChange:e.unref(Y)}),null,16,["class","onChange"])):e.createCommentVNode("",!0)],2)],6)],6))}});exports.default=Se;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),x=require("vxe-table");require("vxe-table/es/style.css");require("vxe-pc-ui/es/style.css");const A=require("vxe-pc-ui"),p=require("lodash-unified"),ue=require("../ap-form/index.js");require("../config-provider/index.js");const ce=require("../ap-table/constants.js"),i=require("../ap-table/utils.js"),de=require("../ap-table/hooks/use-table-paging-ng.js"),k=require("@aplus-frontend/antdv"),ie=require("./hooks/use-inner-params.js"),R=require("./utils/table.js"),fe=require("../ap-table/hooks/use-table-row-selection.js"),pe=require("../ap-table/context.js"),B=require("./constants.js"),me=require("./hooks/use-render-columns.js"),ge=require("@aplus-frontend/antdv/es/theme/internal");require("../scroll-bar/index.js");const Ce=require("../config-provider/hooks/use-namespace.js"),he=require("../config-provider/hooks/use-global-config.js"),ve=require("../config-provider/hooks/use-locale.js"),ye=require("../scroll-bar/index.vue.js"),Se=e.defineComponent({name:"ApGrid",__name:"index",props:{dropdownPrefixCls:{},bordered:{type:Boolean,default:!1},locale:{},onChange:{},onResizeColumn:{},getPopupContainer:{},scroll:{},sortDirections:{default:()=>["ascend","descend"]},showSorterTooltip:{type:[Boolean,Object],default:!1},prefixCls:{},tableLayout:{},title:{},id:{},showHeader:{type:Boolean,default:!0},components:{},customRow:{},customHeaderRow:{},direction:{},expandFixed:{type:[String,Boolean],default:!1},expandColumnWidth:{},expandedRowKeys:{},defaultExpandedRowKeys:{},expandedRowRender:{},expandRowByClick:{type:Boolean,default:!1},expandIcon:{},onExpand:{},onExpandedRowsChange:{},defaultExpandAllRows:{type:Boolean,default:!1},indentSize:{default:15},expandIconColumnIndex:{},showExpandColumn:{type:Boolean,default:!0},expandedRowClassName:{},childrenColumnName:{default:"children"},rowExpandable:{},sticky:{type:[Boolean,Object],default:!1},transformCellText:{},rowClassName:{},stripe:{type:Boolean},headerRowClassName:{},footerRowClassName:{},cellClassName:{},headerCellClassName:{},footerCellClassName:{},rowStyle:{},headerRowStyle:{},footerRowStyle:{},cellStyle:{},headerCellStyle:{},footerCellStyle:{},height:{},minHeight:{},maxHeight:{},mergeCells:{},mergeFooterItems:{},cellConfig:{},loading:{type:Boolean,default:void 0},loadingConfig:{},headerCellConfig:{},footerCellConfig:{},columns:{},rowSelection:{type:Boolean},card:{type:Boolean,default:!1},params:{},request:{},defaultData:{},dataSource:{},onLoadingChange:{},onShownColumnsChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},wrapperStyle:{},manual:{type:Boolean,default:!1},size:{default:void 0},adaptive:{type:Boolean,default:!1},columnResizable:{type:[Boolean,Object],default:!1},rowKey:{default:"key"},footer:{},virtual:{type:[Boolean,Object],default:void 0},expandable:{},value:{}},setup(L,{expose:O}){var T;const F=e.useSlots(),r=L,C=(T=e.getCurrentInstance())==null?void 0:T.appContext.app;C&&!C.__VXE_PC_UI_INSTALLED__&&(C.use(A.VxeUI),C.__VXE_PC_UI_INSTALLED__=!0);const{e:y,b:s,be:D}=Ce.useNamespace("ap-grid"),U=he.useGlobalConfig("valueTypeMap"),l=e.ref([]),E=e.ref([]),d=e.ref(),m=e.ref(r.size),[,u]=ge.useToken(),{t:K}=ve.useLocale();A.VxeUI.setConfig({i18n:(o,a)=>K(`ap.${o}`,a)});const{renderConfig:$,updateSignal:j}=me.useRenderColumns(l);let P=0;const H=e.computed(()=>{if(d.value)return d.value.$el.querySelector(".vxe-table--header-inner-wrapper")}),I=e.computed(()=>{var o,a,n;return P++,((n=(a=(o=r.columns)==null?void 0:o.filter(t=>!t.hideInSearch&&t.dataIndex&&(t.valueType||t.customRenderFormItem)&&!ce.noRenderAsFormItemValueList.includes(t.valueType)))==null?void 0:a.sort((t,c)=>{let g=i.getColumnOrder(t.order);return i.getColumnOrder(c.order)-g}))==null?void 0:n.map(t=>{const c=i.updateFormProps(t,i.getFieldProps(t.fieldProps,{})),g={...t,fieldProps:{label:t.title,name:t.dataIndex,...c||{},_signal:P},renderNode:void 0};return g.renderNode=i.getSearchFormItemRenderNode(g,e.unref(U)),g}))||[]}),M=e.computed(()=>[s(),r.card?null:s("wrapper"),r.adaptive?s("adaptive"):null,r.sticky?s("sticky"):null].filter(Boolean)),N=e.computed(()=>i.recursionApColumns(e.unref(l),o=>{if(o.sorter===!0)return o.key||o.dataIndex}).filter(Boolean)),q=e.computed(()=>i.recursionApColumns(e.unref(l),o=>{if(o.filters&&!o.onFilter)return o.key||o.dataIndex}).filter(Boolean)),{formRef:S,submit:z,reset:_,refresh:W,data:f,tableProps:V,setDataSource:G,handleTableChange:X}=de.useTablePaging({async request(o){var n;if(!v.value.preserveSelectedRowKeys&&p.isUndefined(r.dataSource)&&b(),!p.isUndefined(r.dataSource)){const t=o.pageSize*(o.current-1);return{data:(r.pagination===!1?r.dataSource:r.dataSource.slice(t,t+o.pageSize))||[],total:r.dataSource.length||0}}const a=await((n=r.request)==null?void 0:n.call(r,o));return{data:(a==null?void 0:a.data)||[],total:(a==null?void 0:a.total)||0}},namespace:"ap-grid",filterFields:q,sortFields:N,defaultParams:r.params,defaultData:r.defaultData,manual:r.manual,formatParams:r.beforeSearchSubmit,pagination:r.pagination}),{sortChangeEvent:J,filterChangeEvent:Q,paginationChangeEvent:Y}=ie.useInnerParams(X);pe.useProvideApTable({columns:e.computed(()=>l.value),columnsBackup:e.computed(()=>E.value),size:e.computed(()=>m.value?B.sizeMap[m.value]:"middle"),updateColumns(o){var a;l.value=o,(a=r.onShownColumnsChange)==null||a.call(r,o)},updateSize(o){m.value=B.sizeReverseMap[o]},renderConfig:e.computed(()=>({className:D("table-header","title"),color:u.value.colorPrimary})),dataSource:e.computed(()=>e.unref(f).records)});const Z=e.computed(()=>l.value.some(o=>o.fixed==="left"||o.fixed===!0)?"left":void 0),ee=e.computed(()=>p.isUndefined(r.loading)?f.loading:r.loading),oe=e.computed(()=>p.isUndefined(r.dataSource)?f.records:r.dataSource),{selectedRows:h,rowSelection:v,...re}=fe.default({...r.rowSelection===!0?{}:r.rowSelection,dataSource:oe,rowKey:r.rowKey}),w=()=>{const o=d.value;o&&(h.value=[...o.getCheckboxReserveRecords(),...o.getCheckboxRecords()])},ae=()=>{const o=d.value;o&&(h.value=[o.getRadioRecord()])};function te(){var o;return((o=r.columns)==null?void 0:o.filter(a=>!a.hideInTable))||[]}function ne(o){var a,n,t;(t=(n=(a=S.value)==null?void 0:a.apForm)==null?void 0:n.setFieldsValue)==null||t.call(n,o)}function le(o=!1){var n,t,c;const a=o?"getFieldsValueTransformed":"getFieldsValue";return(c=(t=(n=S.value)==null?void 0:n.apForm)==null?void 0:t[a])==null?void 0:c.call(t,!0)}function b(){re.clearAll();const o=d.value;o&&(v.value.type==="radio"?(o.clearRadioRow(),o.clearRadioReserve()):(o.clearCheckboxRow(),o.clearCheckboxReserve()))}async function se(o,a){var t;const n=f.records[o];if(n)return(t=d.value)==null?void 0:t.scrollToRow(n,a)}return e.watch(()=>[r.columnResizable,r.columns],()=>{var a;const o=te();l.value=o,(a=r.onShownColumnsChange)==null||a.call(r,o),E.value=o},{deep:!0,immediate:!0}),e.watch(()=>r.dataSource,o=>{G(o)},{immediate:!0,deep:!0}),e.watch(()=>e.unref(f).loading,o=>{var a;(a=r.onLoadingChange)==null||a.call(r,o)}),e.watch(()=>r.size,o=>{m.value=o}),O({submit:z,reset:_,refresh:W,setSearchFormValues:ne,getSearchFormValues:le,getShowColumns:()=>e.unref(l),rowSelection:{selectedRows:e.computed(()=>h.value),clearAll:b},scrollToRow:se}),(o,a)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(M.value),style:e.normalizeStyle(o.wrapperStyle)},[e.unref(p.isUndefined)(o.dataSource)&&o.searchForm!==!1&&I.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(o.card?e.unref(y)("search-wrapper"):null),style:e.normalizeStyle(o.searchFormWrapperStyle)},[e.createVNode(e.unref(ue.ApForm).SearchForm,e.mergeProps(o.searchForm||{},{ref_key:"formRef",ref:S,"custom-reset":"","submit-loading":e.unref(V).loading,onSubmit:e.unref(z),onReset:e.unref(_)}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(I.value,n=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n.renderNode.Comp),e.mergeProps({key:n.dataIndex,item:n,ref_for:!0},n.fieldProps||{},{span:n.span,"custom-render":n.renderNode.render}),null,16,["item","span","custom-render"]))),128))]),_:2},[F.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(o.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["submit-loading","onSubmit","onReset"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{class:e.normalizeClass([e.unref(y)("table-wrapper"),o.card?e.unref(y)("table-wrapper-card"):null]),style:e.normalizeStyle(o.tableWrapperStyle)},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(s)("header-wrapper"))},[e.renderSlot(o.$slots,"title",{selectedRows:e.unref(h),selectedRowKeys:e.unref(v).selectedRowKeys,shownColumns:l.value,clearAll:b})],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(s)("vxe-wrapper"))},[(e.openBlock(),e.createBlock(e.unref(x.VxeTable),e.mergeProps(e.unref(R.toVxeProps)(r),{ref_key:"tableRef",ref:d,key:e.unref(j),data:e.unref(f).records,"sort-config":{remote:N.value.length>0},"filter-config":{remote:q.value.length>0},loading:ee.value,"row-config":{isHover:!0,keyField:r.rowKey},style:{"--vxe-ui-table-row-checkbox-checked-background-color":e.unref(u).controlItemBgActive,"--vxe-ui-table-row-hover-checkbox-checked-background-color":e.unref(u).controlItemBgActiveHover,"--vxe-ui-font-primary-color":e.unref(u).colorPrimary,"--vxe-ui-table-header-background-color":"var(--ap-table-header-bg)","--vxe-ui-table-cell-padding-default":"12px","--vxe-ui-table-cell-padding-medium":"9px","--vxe-ui-table-row-radio-checked-background-color":e.unref(u).controlItemBgActive,"--vxe-ui-table-row-hover-radio-checked-background-color":e.unref(u).controlItemBgActiveHover,"--vxe-ui-font-color":e.unref(u).colorTextBase,"--vxe-ui-table-border-color":e.unref(u).colorBorderSecondary},size:m.value,onSortChange:e.unref(J),onFilterChange:e.unref(Q),onCheckboxChange:w,onCheckboxRangeChange:w,onCheckboxAll:w,onRadioChange:ae}),e.createSlots({empty:e.withCtx(()=>[e.createVNode(e.unref(k.Empty),{image:e.unref(k.Empty).PRESENTED_IMAGE_SIMPLE},null,8,["image"])]),default:e.withCtx(()=>[r.expandable?(e.openBlock(),e.createBlock(e.unref(x.VxeColumn),e.mergeProps({key:0},e.unref(R.getRowExpandProps)(o.expandable),{fixed:Z.value}),{content:e.withCtx(n=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(r.expandable.renderContent(n))))]),_:1},16,["fixed"])):e.createCommentVNode("",!0),r.rowSelection?(e.openBlock(),e.createBlock(e.unref(x.VxeColumn),e.mergeProps({key:1},e.unref(R.getRowSelectionProps)(e.unref(v),l.value),{field:e.unref(B.ROW_SELECTION_FIELD)}),null,16,["field"])):e.createCommentVNode("",!0),(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(e.unref($),n=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n),{key:n.props.colId}))),128))]),_:2},[e.renderList(e.unref(p.omit)(F,["searchFormExtra"]),(n,t)=>({name:t,fn:e.withCtx(c=>[e.renderSlot(o.$slots,t,e.normalizeProps(e.guardReactiveProps(c||{})))])}))]),1040,["data","sort-config","filter-config","loading","row-config","style","size","onSortChange","onFilterChange"]))],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(s)("pagination-wrapper"))},[o.sticky?(e.openBlock(),e.createBlock(e.unref(ye.default),{key:0,direction:"horizontal","scroll-container":H.value,"extra-size":-4.2},null,8,["scroll-container"])):e.createCommentVNode("",!0),o.pagination!==!1?(e.openBlock(),e.createBlock(e.unref(k.Pagination),e.mergeProps({key:1,class:e.unref(s)("pagination")},e.unref(V).pagination,{onChange:e.unref(Y)}),null,16,["class","onChange"])):e.createCommentVNode("",!0)],2)],6)],6))}});exports.default=Se;

package/lib/src/ap-grid/interface.d.ts

@@ -4,9 +4,9 @@ import { Recordable } from '../type';
 import { TableProps } from '@aplus-frontend/antdv';
 import { ColumnFilterItem, SortOrder, TableRowSelection } from '@aplus-frontend/antdv/es/table/interface';
 import { ComputedRef, CSSProperties, Ref, VNode } from 'vue';
-import { VxeTablePropTypes, VxeColumnPropTypes, VxeTableProps, VxeTableDefines, VxeColumnSlots } from 'vxe-table';
+import { VxeTablePropTypes, VxeColumnPropTypes, VxeTableProps, VxeTableDefines, VxeColumnSlots, VxeColumnProps } from 'vxe-table';
 export type ColConfigType = VxeTableDefines.ColumnOptions;
-export type ApGridColumnType<RecordType = any, ExtraValueType = 'text', ValueType extends ApTableValueTypes = ApTableValueTypes, MergedValueType extends ExtraValueType | ValueType = ExtraValueType | ValueType> = MergedValueType extends ExtraValueType | ValueType ? Omit<ExtraProColumnType<RecordType>, 'sorter' | 'rowSpan' | 'customCell' | 'customHeaderCell' | 'minWidth'> & {
+export type ApGridColumnType<RecordType = any, ExtraValueType = 'text', ValueType extends ApTableValueTypes = ApTableValueTypes, MergedValueType extends ExtraValueType | ValueType = ExtraValueType | ValueType> = MergedValueType extends ExtraValueType | ValueType ? Omit<ExtraProColumnType<RecordType>, 'sorter' | 'rowSpan' | 'customCell' | 'customHeaderCell' | 'minWidth' | 'className' | 'class'> & {
     children?: ApGridColumnType<RecordType, ExtraValueType, ValueType, MergedValueType>[];
     /**
      * 表单项所占据的格子数（1-24格）
@@ -100,7 +100,7 @@ export type ApGridColumnType<RecordType = any, ExtraValueType = 'text', ValueTyp
         originalNode?: VNode;
         originalText?: any;
     }) => any;
-} : never;
+} & Pick<VxeColumnProps, 'className' | 'headerClassName' | 'footerClassName'> : never;
 export type ApGridRowSelection<RecordType> = Pick<TableRowSelection<RecordType>, 'defaultSelectedRowKeys' | 'type' | 'preserveSelectedRowKeys' | 'onChange' | 'fixed' | 'columnWidth' | 'columnTitle'> & {
     /**
      * 设置禁用的列

package/lib/src/ap-grid/utils/col.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const T=require("vue"),d=require("lodash-unified"),u=require("../../ap-table/utils.js"),_=require("../../ap-table/constants.js");require("../../ap-table/components/paragraph-ellipsis/index.vue.js");const q=require("../../ap-table/components/paragraph-ellipsis/index.vue2.js");function x(e){if(!d.isUndefined(e))return d.isArray(e)?e.reduce((r,i)=>d.isString(i)?`${r}.${i}`:`${r}[${i}]`,""):String(e)}function A(e){if(e)return e===!0?"left":e}function O(e){return d.isBoolean(e)?{sortable:e}:e?{sortable:!0,sortType:e==null?void 0:e.type,sortBy:e==null?void 0:e.by}:{sortable:!1}}function w(e){let r;return d.isBoolean(e.filters)&&e.valueEnum?r=u.valueEnumToArray(e.valueEnum):r=e.filters,r==null?void 0:r.map(i=>({label:d.isString(i.text)?i.text:"",value:i.value}))}function E(e){if(e)return r=>e(r.value,r.row)}function M(e,r){return e?d.isNumber(e)?{tooltip:r,rows:e}:e===!0||e==="tooltip"?{tooltip:r,rows:1}:{tooltip:null,rows:1,htmlTitle:e==="title"?r:""}:!1}function V(e,r,i){if(_.noRenderAsFormItemValueList.includes(e.valueType))return i;if(e.copyable||e.ellipsis){const n=M(e.ellipsis,r),t=u.objectToString(r);return T.createVNode(q.default,{rawValue:t,copyable:e.copyable,ellipsis:n,content:i},null)}return i}function y(e,r,i){const n=d.pick(e,["width","minWidth","align"]);return n.field=x(e.dataIndex),n.fixed=A(e.fixed),n.slots={header:()=>u.getTableTitle(e,i,void 0,r)},n.headerAlign=e.align,n.showOverflow=!1,n.showFooterOverflow=!1,n}function c(e,r,i,n){const t=d.pick(e,["width","minWidth","align","resizable"]);t.field=x(e.dataIndex),t.fixed=A(e.fixed),t.headerAlign=e.align,t.footerAlign=e.align,t.showOverflow=!1,t.showFooterOverflow=!1,Object.assign(t,O(e.sorter)),t.filters=w(e),t.filterMultiple=e.filterMultiple,t.filterMethod=E(e.onFilter);const o=({value:s,...l})=>{var F,b;const f=u.getTableRenderType(e),p=u.getTableRenderProps({...e,valueType:f},{value:s,...l}),R=u.getTableCellRenderNode(f,p,l.record,n),v=((F=e.renderText)==null?void 0:F.call(e,{value:s,...l}))||s,S=e.renderText?T.createVNode(T.Fragment,null,[(b=e.renderText)==null?void 0:b.call(e,{value:s,...l})]):R;let h=V(e,v,S);return e.customRender&&(h=e.customRender({value:s,...l,column:e,originalNode:h,originalText:v})),h},a=({row:s,rowIndex:l})=>o({value:s[t.field],text:s[t.field],record:s,index:l,renderIndex:l,column:e});return t.slots={header:()=>u.getTableTitle(e,i,void 0,r),default:a,footer:a},e.html&&(delete t.slots.default,delete t.slots.footer,t.type="html"),t}function $(e,r,i,n){var a;if(!((a=e.children)!=null&&a.length))return c(e,r,i,n);function t(s){return s.map(l=>{var f;if((f=l.children)!=null&&f.length){const p=y(l,r,i);return p.children=t(l.children),p}return c(l,r,i,n)})}const o=y(e,r,i);return o.children=t(e.children),o}exports.transformCol=$;exports.transformToColGroup=y;exports.transformToColumn=c;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const T=require("vue"),d=require("lodash-unified"),a=require("../../ap-table/utils.js"),_=require("../../ap-table/constants.js");require("../../ap-table/components/paragraph-ellipsis/index.vue.js");const q=require("../../ap-table/components/paragraph-ellipsis/index.vue2.js");function x(e){if(!d.isUndefined(e))return d.isArray(e)?e.reduce((r,i)=>d.isString(i)?`${r}.${i}`:`${r}[${i}]`,""):String(e)}function A(e){if(e)return e===!0?"left":e}function N(e){return d.isBoolean(e)?{sortable:e}:e?{sortable:!0,sortType:e==null?void 0:e.type,sortBy:e==null?void 0:e.by}:{sortable:!1}}function O(e){let r;return d.isBoolean(e.filters)&&e.valueEnum?r=a.valueEnumToArray(e.valueEnum):r=e.filters,r==null?void 0:r.map(i=>({label:d.isString(i.text)?i.text:"",value:i.value}))}function w(e){if(e)return r=>e(r.value,r.row)}function E(e,r){return e?d.isNumber(e)?{tooltip:r,rows:e}:e===!0||e==="tooltip"?{tooltip:r,rows:1}:{tooltip:null,rows:1,htmlTitle:e==="title"?r:""}:!1}function M(e,r,i){if(_.noRenderAsFormItemValueList.includes(e.valueType))return i;if(e.copyable||e.ellipsis){const l=E(e.ellipsis,r),t=a.objectToString(r);return T.createVNode(q.default,{rawValue:t,copyable:e.copyable,ellipsis:l,content:i},null)}return i}function c(e,r,i){const l=d.pick(e,["width","minWidth","align"]);return l.field=x(e.dataIndex),l.fixed=A(e.fixed),l.slots={header:()=>a.getTableTitle(e,i,void 0,r)},l.headerAlign=e.align,l.showOverflow=!1,l.showFooterOverflow=!1,l}function y(e,r,i,l){const t=d.pick(e,["width","minWidth","align","resizable","className","headerClassName","footerClassName"]);t.field=x(e.dataIndex),t.fixed=A(e.fixed),t.headerAlign=e.align,t.footerAlign=e.align,t.showOverflow=!1,t.showFooterOverflow=!1,Object.assign(t,N(e.sorter)),t.filters=O(e),t.filterMultiple=e.filterMultiple,t.filterMethod=w(e.onFilter);const o=({value:n,...s})=>{var F,b;const f=a.getTableRenderType(e),h=a.getTableRenderProps({...e,valueType:f},{value:n,...s}),R=a.getTableCellRenderNode(f,h,s.record,l),v=((F=e.renderText)==null?void 0:F.call(e,{value:n,...s}))||n,S=e.renderText?T.createVNode(T.Fragment,null,[(b=e.renderText)==null?void 0:b.call(e,{value:n,...s})]):R;let p=M(e,v,S);return e.customRender&&(p=e.customRender({value:n,...s,column:e,originalNode:p,originalText:v})),p},u=({row:n,rowIndex:s})=>o({value:n[t.field],text:n[t.field],record:n,index:s,renderIndex:s,column:e});return t.slots={header:()=>a.getTableTitle(e,i,void 0,r),default:u,footer:u},e.html&&(delete t.slots.default,delete t.slots.footer,t.type="html"),t}function V(e,r,i,l){var u;if(!((u=e.children)!=null&&u.length))return y(e,r,i,l);function t(n){return n.map(s=>{var f;if((f=s.children)!=null&&f.length){const h=c(s,r,i);return h.children=t(s.children),h}return y(s,r,i,l)})}const o=c(e,r,i);return o.children=t(e.children),o}exports.transformCol=V;exports.transformToColGroup=c;exports.transformToColumn=y;

package/lib/src/design-token/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o={borderRadius:4},r={...o,colorPrimary:"#0070FF",colorPrimaryHover:"#66A9FF",colorPrimaryActive:"#338CFF",colorTextBase:"#182948",colorText:"#182948",colorTextSecondary:"#526A90",colorTextTertiary:"#8896B0",colorTextPlaceholder:"#BFBFBF",colorBorder:"#DEE4ED",colorSplit:"#E9EDF3",colorInfo:"#0070FF",colorSuccess:"#2ED1A3",colorError:"#FF4D4F",colorWarning:"#FFA940",colorBgContainerDisabled:"#F2F6F9",wireframe:!1,colorBgLayout:"#F2F6F9",colorBgSpotlight:"#000000cc",controlItemBgActive:"#F5F9FF",controlItemBgActiveHover:"#EAF2FF",colorBorderSecondary:"#E9EDF3"},c={...o,colorPrimary:"#34B77C",colorPrimaryHover:"#85D4B0",colorPrimaryActive:"#5DC596",colorBgContainerDisabled:"#f5f5f5",colorText:"#333333",colorTextSecondary:"#666666",colorTextTertiary:"#999999",colorTextPlaceholder:"#ABB7CC",colorBorder:"#D9D9D9",colorSplit:"#E9E9E9",colorInfo:"#1890FF",colorSuccess:"#52C41A",colorError:"#FF4D4F",colorWarning:"#FAAD14",colorLink:"#1890FF",wireframe:!1,colorBgLayout:"#FAFAFA",colorBgSpotlight:"#000000cc",controlItemBgActive:"#f3fbf7",controlItemBgActiveHover:"#e6f6ef",colorBorderSecondary:"#E9E9E9"};exports.adminToken=c;exports.aplusToken=r;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o={borderRadius:4},r={...o,colorPrimary:"#0070FF",colorPrimaryHover:"#66A9FF",colorPrimaryActive:"#338CFF",colorTextBase:"#182948",colorText:"#182948",colorTextSecondary:"#526A90",colorTextTertiary:"#8896B0",colorTextPlaceholder:"#BFBFBF",colorBorder:"#DEE4ED",colorSplit:"#E9EDF3",colorInfo:"#0070FF",colorSuccess:"#2ED1A3",colorError:"#FF4D4F",colorWarning:"#FFA940",colorBgContainerDisabled:"#F2F6F9",wireframe:!1,colorBgLayout:"#F2F6F9",colorBgSpotlight:"#000000cc",controlItemBgActive:"#F5F9FF",controlItemBgActiveHover:"#EAF2FF",colorBorderSecondary:"#E9EDF3"},c={...o,colorPrimary:"#34B77C",colorPrimaryHover:"#85D4B0",colorPrimaryActive:"#5DC596",colorBgContainerDisabled:"#f5f5f5",colorTextBase:"#333333",colorText:"#333333",colorTextSecondary:"#666666",colorTextTertiary:"#999999",colorTextPlaceholder:"#ABB7CC",colorBorder:"#D9D9D9",colorSplit:"#E9E9E9",colorInfo:"#1890FF",colorSuccess:"#52C41A",colorError:"#FF4D4F",colorWarning:"#FAAD14",colorLink:"#1890FF",wireframe:!1,colorBgLayout:"#FAFAFA",colorBgSpotlight:"#000000cc",controlItemBgActive:"#f3fbf7",controlItemBgActiveHover:"#e6f6ef",colorBorderSecondary:"#E9E9E9"};exports.adminToken=c;exports.aplusToken=r;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "0.5.34",
+  "version": "0.5.35",
   "main": "./lib/index.js",
   "type": "module",
   "files": [

package/theme/ap-grid/index.css

@@ -268,9 +268,6 @@
   bottom: 0;
   padding-bottom: 16px;
 }
-.aplus-ap-grid-sticky:has(.aplus-scroll-bar) .aplus-ap-grid-pagination-wrapper {
-  padding-bottom: 0;
-}
 .aplus-ap-grid-sticky:has(.aplus-scroll-bar) .aplus-ap-grid-pagination-wrapper ul.ant-pagination {
   margin-top: 0;
   padding-top: 8px;
@@ -288,6 +285,9 @@
 .aplus-ap-grid-wrapper.aplus-ap-grid-sticky {
   padding-bottom: 0;
 }
+.aplus-ap-grid-sticky > .aplus-ap-grid__table-wrapper-card {
+  padding-bottom: 0;
+}
 .aplus-ap-grid__search-wrapper {
   padding: 16px;
   padding-bottom: 0;
@@ -336,12 +336,13 @@
   word-break: break-all;
   flex: 1;
 }
-.aplus-ap-grid .vxe-cell--wrapper {
+.aplus-ap-grid th .vxe-cell--wrapper {
   display: flex;
   flex-direction: row;
   flex-wrap: nowrap;
   align-items: center;
 }
-.aplus-ap-grid .vxe-cell--wrapper .vxe-cell--title {
+.aplus-ap-grid th .vxe-cell--wrapper .vxe-cell--title {
   flex-shrink: 1;
+  flex-grow: 1;
 }

package/theme/ap-grid/index.less

@@ -34,7 +34,6 @@
     }
     &:has(.@{sb}) {
       .@{pg} {
-        padding-bottom: 0;
         ul.ant-pagination {
           margin-top: 0;
           padding-top: 8px;
@@ -55,6 +54,9 @@
   &-wrapper&-sticky {
     padding-bottom: 0;
   }
+  &-sticky > &__table-wrapper-card {
+    padding-bottom: 0;
+  }
   &__search-wrapper {
     padding:16px;
     padding-bottom: 0;
@@ -109,13 +111,14 @@
     }
   }
 
-  .vxe-cell--wrapper {
+  th .vxe-cell--wrapper {
     display: flex;
     flex-direction: row;
     flex-wrap: nowrap;
     align-items: center;
     .vxe-cell--title {
       flex-shrink: 1;
+      flex-grow: 1;
     }
   }
 });

package/theme/index.css

@@ -2367,17 +2367,14 @@ div.aplus-ap-info-layout-admin__header-shadow.aplus-ap-info-layout-admin__sticky
   bottom: 0;
   padding-bottom: 16px;
 }
-.aplus-ap-grid-sticky:has(.aplus-splitter-bar) .aplus-ap-grid-pagination-wrapper {
-  padding-bottom: 0;
-}
-.aplus-ap-grid-sticky:has(.aplus-splitter-bar) .aplus-ap-grid-pagination-wrapper ul.ant-pagination {
+.aplus-ap-grid-sticky:has(.aplus-scroll-bar) .aplus-ap-grid-pagination-wrapper ul.ant-pagination {
   margin-top: 0;
   padding-top: 8px;
 }
-.aplus-ap-grid-sticky:has(.aplus-splitter-bar) .vxe-table--scroll-x-wrapper {
+.aplus-ap-grid-sticky:has(.aplus-scroll-bar) .vxe-table--scroll-x-wrapper {
   opacity: 0;
 }
-.aplus-ap-grid-sticky:has(.aplus-splitter-bar) .vxe-table .vxe-table--scroll-x-virtual {
+.aplus-ap-grid-sticky:has(.aplus-scroll-bar) .vxe-table .vxe-table--scroll-x-virtual {
   height: 0px !important;
 }
 .aplus-ap-grid-wrapper {
@@ -2387,6 +2384,9 @@ div.aplus-ap-info-layout-admin__header-shadow.aplus-ap-info-layout-admin__sticky
 .aplus-ap-grid-wrapper.aplus-ap-grid-sticky {
   padding-bottom: 0;
 }
+.aplus-ap-grid-sticky > .aplus-ap-grid__table-wrapper-card {
+  padding-bottom: 0;
+}
 .aplus-ap-grid__search-wrapper {
   padding: 16px;
   padding-bottom: 0;
@@ -2435,14 +2435,15 @@ div.aplus-ap-info-layout-admin__header-shadow.aplus-ap-info-layout-admin__sticky
   word-break: break-all;
   flex: 1;
 }
-.aplus-ap-grid .vxe-cell--wrapper {
+.aplus-ap-grid th .vxe-cell--wrapper {
   display: flex;
   flex-direction: row;
   flex-wrap: nowrap;
   align-items: center;
 }
-.aplus-ap-grid .vxe-cell--wrapper .vxe-cell--title {
+.aplus-ap-grid th .vxe-cell--wrapper .vxe-cell--title {
   flex-shrink: 1;
+  flex-grow: 1;
 }
 .aplus-editable-grid__header-cell--required {
   color: #FF4D4F;

package/theme/splitter/index.less

@@ -19,11 +19,11 @@
 }
 
 @s: ~'@{ns}-splitter';
-@sb: ~'@{s}-bar';
-@sbp: ~'@{sb}-preview';
+@spb: ~'@{s}-bar';
+@sbp: ~'@{spb}-preview';
 @sbpa: ~'@{sbp}-active';
-@sbd: ~'@{sb}-dragger';
-@sbcb: ~'@{sb}-collapse-bar';
+@sbd: ~'@{spb}-dragger';
+@sbcb: ~'@{spb}-collapse-bar';
 @sbda: ~'@{sbd}-active';
 @offset: ~'--@{ns}-splitter-bar-preview-offset';
 
@@ -129,7 +129,7 @@
 
   &-horizontal {
     flex-direction: row;
-    & > .@{sb} {
+    & > .@{spb} {
       width: 0;
       .@{sbp} {
         height: 100%;
@@ -177,7 +177,7 @@
 
   &-vertical {
     flex-direction: column;
-    & > .@{sb} {
+    & > .@{spb} {
       height: 0;
       .@{sbp} {
         height: @split-bar-size;