@aplus-frontend/ui 0.5.4 → 0.5.6

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

@@ -1,23 +1,23 @@
-import { ref as te, reactive as I, unref as h, nextTick as re, onMounted as oe, watch as ne, computed as A, createVNode as C } from "vue";
-import { useTableSortedAndFiltered as ae } from "./use-sorted-filtered.mjs";
+import { ref as oe, reactive as q, unref as h, nextTick as ne, onMounted as ae, watch as se, computed as A, createVNode as C } from "vue";
+import { useTableSortedAndFiltered as ce } from "./use-sorted-filtered.mjs";
 import "../../config-provider/index.mjs";
-import { parseFieldValue as se, dataIndexToStr as ce, isEqualCustom as ie } from "../utils.mjs";
-import { isArray as N, isEqualWith as le } from "lodash-unified";
-import { useLocale as ue } from "../../config-provider/hooks/use-locale.mjs";
-import { useNamespace as fe } from "../../config-provider/hooks/use-namespace.mjs";
+import { parseFieldValue as ie, dataIndexToStr as le, isEqualCustom as ue } from "../utils.mjs";
+import { isArray as N, isEqualWith as fe } from "lodash-unified";
+import { useLocale as ge } from "../../config-provider/hooks/use-locale.mjs";
+import { useNamespace as pe } from "../../config-provider/hooks/use-namespace.mjs";
 const S = 1, L = 10;
-function ge(g) {
+function de(g) {
   const l = {};
   return g && (g === !0 ? (l.current = S, l.pageSize = L) : (l.current = g.defaultCurrent || S, l.pageSize = g.defaultPageSize || L)), l;
 }
-const Pe = ({
+const we = ({
   manual: g = !1,
   request: l,
   defaultParams: v = {},
   defaultData: y = [],
   formatParams: D,
   paramsValueTypeMap: R,
-  resetFieldsIgnores: V,
+  resetFieldsIgnores: I,
   filterFields: U,
   sortFields: B,
   namespace: K = "ap-table",
@@ -29,22 +29,24 @@ const Pe = ({
   }
 }) => {
   let b = 0, s = {};
-  const M = p ?? {}, $ = (e) => D ? D(e) : e, z = te(), c = I(ge(p)), {
+  const M = p ?? {}, $ = (e) => D ? D(e) : e, z = oe(), c = q(de(p)), {
     getColumnSFConfig: G,
     setSF: J,
-    clearAll: Q
-  } = ae(), {
+    clearAll: Q,
+    sortedInfo: W,
+    filteredInfo: Z
+  } = ce(), {
     t: T
-  } = ue(), {
+  } = ge(), {
     b: P
-  } = fe(K), o = I({
+  } = pe(K), o = q({
     total: y.length,
     records: y,
     loading: !1
   }), F = () => {
     var e, t;
     return ((t = (e = z.value) == null ? void 0 : e.apForm) == null ? void 0 : t.getFieldsValueTransformed(!0)) || {};
-  }, O = async (e) => {
+  }, V = async (e) => {
     var n;
     const t = $(e), r = Date.now();
     b = r, o.loading = !0;
@@ -59,27 +61,27 @@ const Pe = ({
     } finally {
       o.loading = !1;
     }
-  }, _ = (e) => {
+  }, O = (e) => {
     const t = {};
     return Object.entries(e).forEach(([r, n]) => {
       if (t[r] = n, R && n) {
         const a = R[r];
-        a && (t[r] = se(a, n));
+        a && (t[r] = ie(a, n));
       }
     }), t;
-  }, W = async (e) => {
+  }, H = async (e) => {
     var n, a, u, f, d;
     const t = F(), r = {};
     Object.entries(t).forEach(([m, x]) => {
-      V && V.indexOf(m) > -1 && (r[m] = x);
-    }), await ((a = (n = z.value) == null ? void 0 : n.apForm) == null ? void 0 : a.resetFields()), (d = (f = (u = z.value) == null ? void 0 : u.apForm) == null ? void 0 : f.setFieldsValue) == null || d.call(f, r), re(() => {
+      I && I.indexOf(m) > -1 && (r[m] = x);
+    }), await ((a = (n = z.value) == null ? void 0 : n.apForm) == null ? void 0 : a.resetFields()), (d = (f = (u = z.value) == null ? void 0 : u.apForm) == null ? void 0 : f.setFieldsValue) == null || d.call(f, r), ne(() => {
       e == null || e();
     });
   }, w = (e) => {
     s = e;
-    const t = _(e);
-    O(t);
-  }, Z = (e) => {
+    const t = O(e);
+    V(t);
+  }, X = (e) => {
     w({
       ...s,
       ...e
@@ -93,29 +95,29 @@ const Pe = ({
       current: p ? S : void 0,
       pageSize: p ? s.pageSize || c.pageSize : void 0
     });
-  }, H = () => {
-    Q(), s.sort = {}, s.filter = {}, W(E);
-  }, j = () => {
+  }, Y = () => {
+    Q(), s.sort = {}, s.filter = {}, H(E);
+  }, _ = () => {
     w(s);
-  }, X = (e) => {
+  }, k = (e) => {
     if (!p)
-      j();
+      _();
     else {
       const {
         current: t,
         pageSize: r
       } = c, n = o.total - e, a = Math.ceil(n / r), u = t > a ? a : t;
-      Z({
+      X({
         current: u > 0 ? u : 1
       });
     }
-  }, q = (e, t, r) => {
+  }, j = (e, t, r) => {
     var m, x;
     const n = F();
     c.current = e.current, c.pageSize = e.pageSize, J(t, r);
     const a = N(r) ? [...r] : [r], u = {};
     for (const i of a)
-      (m = h(B)) != null && m.includes(i.columnKey || i.field) && i.order && (u[ce(i.columnKey || i.field)] = i.order);
+      (m = h(B)) != null && m.includes(i.columnKey || i.field) && i.order && (u[le(i.columnKey || i.field)] = i.order);
     const f = {};
     for (const i of Object.keys(t))
       (x = h(U)) != null && x.includes(i) && t[i] && (f[i] = t[i]);
@@ -126,9 +128,9 @@ const Pe = ({
       current: e.current,
       pageSize: e.pageSize
     };
-    le(s, d, ie) || w(d);
+    fe(s, d, ue) || w(d);
   };
-  oe(() => {
+  ae(() => {
     const e = F(), {
       current: t,
       pageSize: r
@@ -140,15 +142,15 @@ const Pe = ({
       sort: {},
       ...e
     }, !g) {
-      const n = _(s);
-      O(n);
+      const n = O(s);
+      V(n);
     }
-  }), ne(() => h(v), () => {
+  }), se(() => h(v), () => {
     E();
   }, {
     deep: !0
   });
-  const Y = A(() => {
+  const ee = A(() => {
     if (o.total === 0)
       return "-";
     const {
@@ -157,10 +159,10 @@ const Pe = ({
     } = c;
     return `${e}/${Math.ceil(o.total / t)}`;
   });
-  function k(e) {
+  function te(e) {
     N(e) && (o.records = e, o.total = e.length);
   }
-  const ee = A(() => {
+  const re = A(() => {
     const {
       showLessItems: e,
       showTotal: t
@@ -183,30 +185,32 @@ const Pe = ({
           class: P("pagination--total-right")
         }, [T("ap.apTable.pagination.totalRightPrefix"), " ", C("span", {
           class: P("pagination-count-text")
-        }, [h(Y)]), " ", T("ap.apTable.pagination.totalRightSuffix")])]) : void 0
+        }, [h(ee)]), " ", T("ap.apTable.pagination.totalRightSuffix")])]) : void 0
       },
-      onChange: q,
+      onChange: j,
       dataSource: o.records
     };
   });
   return {
     formRef: z,
     submit: E,
-    reset: H,
-    refresh: j,
-    refreshByDelete: X,
+    reset: Y,
+    refresh: _,
+    refreshByDelete: k,
     data: o,
     current: c.current,
     pageSize: c.pageSize,
-    handleTableChange: q,
-    tableProps: ee,
+    handleTableChange: j,
+    tableProps: re,
     dataSource: A(() => o.records),
-    setDataSource: k,
-    getColumnSFConfig: G
+    setDataSource: te,
+    getColumnSFConfig: G,
+    sortedInfo: W,
+    filteredInfo: Z
   };
 };
 export {
   S as DEFAULT_CURRENT,
   L as DEFAULT_PAGE_SIZE,
-  Pe as useTablePaging
+  we as useTablePaging
 };

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

@@ -108,5 +108,5 @@ export declare const useTablePaging: <DataType = any, ParamsType = Record<string
     }>;
     dataSource: ComputedRef<DataType[]>;
     setDataSource: (dataSource?: DataType[]) => void;
-    getColumnSFConfig: (column: ApColumnType) => Recordable;
+    getColumnSFConfig: (column: ApColumnType, append?: boolean) => Recordable;
 };

package/es/src/business/ap-batch-action-group/ApBatchActionGroup.vue.d.ts

@@ -1,9 +1,9 @@
 import { ApBatchActionGroupProps } from './interface';
 import { DefineComponent, ComputedRef, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
-import { TableColumnType } from '@aplus-frontend/antdv';
+import { TableColumnsType } from '@aplus-frontend/antdv';
 type __VLS_Props = ApBatchActionGroupProps;
 declare const _default: DefineComponent<__VLS_Props, {
-    columns: ComputedRef< TableColumnType<any>[]> | undefined;
+    columns: ComputedRef<TableColumnsType<any>> | undefined;
     dataSource: ComputedRef<any[]> | undefined;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, ComponentProvideOptions, false, {}, any>;
 export default _default;

package/es/src/business/ap-batch-action-group/index.d.ts

@@ -4,7 +4,7 @@ import { ButtonHTMLType } from '@aplus-frontend/antdv/es/button/buttonTypes';
 import { VueTypeValidableDef } from '../../../node_modules/vue-types';
 import { MouseEventHandler, FocusEventHandler } from '@aplus-frontend/antdv/es/_util/EventInterface';
 import { DropdownArrowOptions, Trigger, Align } from '@aplus-frontend/antdv/es/dropdown/props';
-import { ItemType, MenuTheme, MenuMode, TableColumnType, ButtonProps } from '@aplus-frontend/antdv';
+import { ItemType, MenuTheme, MenuMode, TableColumnsType, ButtonProps } from '@aplus-frontend/antdv';
 import { Key } from '@aplus-frontend/antdv/es/_util/type';
 import { CSSMotionProps } from '@aplus-frontend/antdv/es/_util/transition';
 import { BuiltinPlacements, TriggerSubMenuAction, SelectEventHandler, MenuClickEventHandler } from '@aplus-frontend/antdv/es/menu/src/interface';
@@ -303,7 +303,7 @@ declare const ApBatchActionGroup: {
         }) | undefined;
         menuList?: ApBatchActionGroupMenuProps<any>[] | undefined;
     }> & Readonly<{}>, {
-        columns: ComputedRef< TableColumnType<any>[]> | undefined;
+        columns: ComputedRef<TableColumnsType<any>> | undefined;
         dataSource: ComputedRef<any[]> | undefined;
     }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, PublicProps, {}, false, {}, {}, GlobalComponents, GlobalDirectives, string, {}, any, ComponentProvideOptions, {
         P: {};
@@ -604,7 +604,7 @@ declare const ApBatchActionGroup: {
         }) | undefined;
         menuList?: ApBatchActionGroupMenuProps<any>[] | undefined;
     }> & Readonly<{}>, {
-        columns: ComputedRef< TableColumnType<any>[]> | undefined;
+        columns: ComputedRef<TableColumnsType<any>> | undefined;
         dataSource: ComputedRef<any[]> | undefined;
     }, {}, {}, {}, {}>;
     __isFragment?: never;
@@ -902,7 +902,7 @@ declare const ApBatchActionGroup: {
     }) | undefined;
     menuList?: ApBatchActionGroupMenuProps<any>[] | undefined;
 }> & Readonly<{}>, {
-    columns: ComputedRef< TableColumnType<any>[]> | undefined;
+    columns: ComputedRef<TableColumnsType<any>> | undefined;
     dataSource: ComputedRef<any[]> | undefined;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, {}, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & ( Plugin & (new (...args: any[]) => {
     $props: {

package/es/src/config-provider/hooks/use-namespace.d.ts

@@ -2,7 +2,11 @@ import { InjectionKey, Ref, ComputedRef } from 'vue';
 export declare const defaultNamespace = "aplus";
 export declare const namespaceContextKey: InjectionKey<Ref<string | undefined>>;
 export declare const useGetDerivedNamespace: (namespaceOverrides?: Ref<string | undefined>) => ComputedRef<string>;
-export declare const useNamespace: (block: string, namespaceOverrides?: Ref<string | undefined>) => {
+export declare const useNamespace: (
+/**
+ * 块 一般是指组件名
+ */
+block: string, namespaceOverrides?: Ref<string | undefined>) => {
     namespace: ComputedRef<string>;
     b: (blockSuffix?: string) => string;
     e: (element?: string) => string;

package/es/src/locale/lang/en.mjs

@@ -1,4 +1,5 @@
-const e = {
+import e from "vxe-table/lib/locale/lang/en-US";
+const a = {
   name: "en",
   ap: {
     common: {
@@ -153,9 +154,10 @@ const e = {
     },
     apSummary: {
       total: "Total"
-    }
+    },
+    ...e
   }
 };
 export {
-  e as default
+  a as default
 };

package/es/src/locale/lang/zh-cn.mjs

@@ -1,4 +1,5 @@
-const e = {
+import e from "vxe-table/lib/locale/lang/zh-CN";
+const a = {
   name: "zh-cn",
   ap: {
     common: {
@@ -161,9 +162,10 @@ const e = {
     },
     apSummary: {
       total: "合计"
-    }
+    },
+    ...e
   }
 };
 export {
-  e as default
+  a as default
 };

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

package/lib/src/ap-grid/utils/table.d.ts

@@ -1,10 +1,11 @@
 import { VxeTableEventProps, VxeTableProps } from 'vxe-table';
-import { ApGridProps, ApGridRowSelection } from '../interface';
+import { ApGridColumnType, ApGridProps, ApGridRowSelection } from '../interface';
 import { RowSelectionType } from '@aplus-frontend/antdv/es/table/interface';
 export declare function toVxeProps<RecordType>(props: any): VxeTableProps<RecordType> & VxeTableEventProps<RecordType>;
-export declare function getRowSelectionProps(rowSelection: ApGridRowSelection<any> | true): {
+export declare function getRowSelectionProps(rowSelection: ApGridRowSelection<any> | true, columns: ApGridColumnType[]): {
     type: RowSelectionType;
     width: string | number;
+    fixed: "left" | "right" | undefined;
 };
 export declare function getRowExpandProps(config: ApGridProps['expandable']): {
     readonly type: "expand";

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("lodash-unified"),a=30,c=50;function f(e){var i,n,u;const t={...l.omit(e,["columns","request","searchForm","dataSource","rowKey","value"])};if(e.adaptive&&(t.autoResize=!0,t.height="100%"),e.columnResizable&&(t.columnConfig?t.columnConfig.resizable=!0:t.columnConfig={resizable:!0}),e.rowSelection){const o=e.rowSelection===!0?{}:e.rowSelection;o.type==="radio"?t.radioConfig={highlight:!0,checkMethod({row:r}){return o.disabled?!o.disabled(r):!0},checkRowKey:(i=o.defaultSelectedRowKeys)==null?void 0:i[0],reserve:l.isUndefined(o.preserveSelectedRowKeys)?!0:o.preserveSelectedRowKeys}:t.checkboxConfig={highlight:!0,checkMethod({row:r}){return o.disabled?!o.disabled(r):!0},checkRowKeys:o.defaultSelectedRowKeys,reserve:l.isUndefined(o.preserveSelectedRowKeys)?!0:o.preserveSelectedRowKeys}}return t.border=e.bordered,e.expandable&&(t.expandConfig=l.omit(e.expandable,["renderContent","width","title"])),e.footer&&(t.showFooter=!0,l.isFunction(e.footer)?t.footerMethod=e.footer:t.footerData=e.footer),e.virtual===!1?(t.virtualXConfig={enabled:!1},t.virtualYConfig={enabled:!1}):(d(t,"X",(n=e.virtual)==null?void 0:n.x),d(t,"Y",(u=e.virtual)==null?void 0:u.y)),t}function d(e,t,i){const n=t==="X",u=n?"virtualXConfig":"virtualYConfig",o=i!==!1,r=n?a:c,s=l.isNumber(i)&&i>=0?i:r;e[u]={enabled:o,gt:s}}function h(e){const t=e===!0||!e.type?"checkbox":e.type,i=e===!0?60:e.columnWidth||60;return{type:t,width:i}}function b(e){const t=(e==null?void 0:e.width)||"auto";return{type:"expand",title:e==null?void 0:e.title,width:t}}exports.getRowExpandProps=b;exports.getRowSelectionProps=h;exports.toVxeProps=f;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("lodash-unified"),a=30,f=50;function c(e){var r,l,o;const t={...n.omit(e,["columns","request","searchForm","dataSource","rowKey","value"])};if(e.adaptive&&(t.autoResize=!0,t.height="100%"),e.columnResizable&&(t.columnConfig?t.columnConfig.resizable=!0:t.columnConfig={resizable:!0}),e.rowSelection){const i=e.rowSelection===!0?{}:e.rowSelection;i.type==="radio"?t.radioConfig={highlight:!0,checkMethod({row:d}){return i.disabled?!i.disabled(d):!0},checkRowKey:(r=i.defaultSelectedRowKeys)==null?void 0:r[0],reserve:n.isUndefined(i.preserveSelectedRowKeys)?!0:i.preserveSelectedRowKeys}:t.checkboxConfig={highlight:!0,checkMethod({row:d}){return i.disabled?!i.disabled(d):!0},checkRowKeys:i.defaultSelectedRowKeys,reserve:n.isUndefined(i.preserveSelectedRowKeys)?!0:i.preserveSelectedRowKeys}}return t.border=e.bordered,e.expandable&&(t.expandConfig=n.omit(e.expandable,["renderContent","width","title"])),e.footer&&(t.showFooter=!0,n.isFunction(e.footer)?t.footerMethod=e.footer:t.footerData=e.footer),e.virtual===!1?(t.virtualXConfig={enabled:!1},t.virtualYConfig={enabled:!1}):(u(t,"X",(l=e.virtual)==null?void 0:l.x),u(t,"Y",(o=e.virtual)==null?void 0:o.y)),t}function u(e,t,r){const l=t==="X",o=l?"virtualXConfig":"virtualYConfig",i=r!==!1,d=l?a:f,s=n.isNumber(r)&&r>=0?r:d;e[o]={enabled:i,gt:s}}function h(e){return e===!0?"left":e}function b(e,t){const r=e===!0||!e.type?"checkbox":e.type,l=e===!0?60:e.columnWidth||60;let o=e===!0?void 0:h(e.fixed);return o||(o===!1?o=void 0:o=t.some(i=>i.fixed==="left"||i.fixed===!0)?"left":void 0),{type:r,width:l,fixed:o}}function v(e){const t=(e==null?void 0:e.width)||"auto";return{type:"expand",title:e==null?void 0:e.title,width:t}}exports.getRowExpandProps=v;exports.getRowSelectionProps=b;exports.toVxeProps=c;

package/lib/src/ap-table/ap-table.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),U=require("@aplus-frontend/antdv"),me=require("@aplus-frontend/antdv/es/theme/internal"),ye=require("../ap-form/index.js"),$=require("./constants.js");require("../config-provider/index.js");const ge=require("./hooks/use-table-paging-ng.js"),c=require("lodash-unified"),s=require("./utils.js"),Se=require("./hooks/use-table-content-height.js"),be=require("./hooks/use-table-row-selection.js"),D=require("../utils/index.js");require("./components/setting/modal/index.vue.js");require("./components/paragraph-ellipsis/index.vue.js");const he=require("./context.js");require("../scroll-bar/index.js");const we=require("./hooks/use-sticky-scroll.js"),ve=require("../config-provider/hooks/use-namespace.js"),Ce=require("../config-provider/hooks/use-global-config.js"),Re=require("./components/setting/modal/index.vue2.js"),xe=require("../scroll-bar/index.vue.js"),ke=require("./components/paragraph-ellipsis/index.vue2.js"),Te=e.defineComponent({name:"ApTable",__name:"ap-table",props:{dropdownPrefixCls:{},loading:{type:[Boolean,Object],default:void 0},bordered:{type:Boolean,default:!1},locale:{},onChange:{},onResizeColumn:{},getPopupContainer:{},scroll:{},sortDirections:{default:()=>["ascend","descend"]},showSorterTooltip:{type:[Boolean,Object],default:!1},prefixCls:{},rowKey:{default:"key"},tableLayout:{},rowClassName:{},title:{},footer:{},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]},transformCellText:{},columns:{},rowSelection:{type:[Boolean,Object]},card:{type:Boolean,default:!1},params:{},searchFormRender:{},request:{},onLoad:{},defaultData:{},dataSource:{},onLoadingChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},manual:{type:Boolean,default:!1},size:{default:"middle"},adaptive:{type:Boolean,default:!1},columnResizable:{type:Boolean,default:!1},settings:{type:[Boolean,Object],default:void 0}},setup(j,{expose:W}){const t=j;let x=0;const g=e.useSlots(),[,H]=me.useToken(),{e:w,b:f,be:k,m:M,cssVar:G}=ve.useNamespace("ap-table"),T=Ce.useGlobalConfig("valueTypeMap"),{height:J,contentRef:Q}=Se.default(),B=e.ref(),F=e.ref(),{isStickyMode:z,scrollBarRef:i}=we.useStickyScroll(B),v=e.ref(t.size),d=e.ref([]),N=e.ref([]),q=D.getScrollbarSize();he.useProvideApTable({columns:e.computed(()=>d.value),columnsBackup:e.computed(()=>N.value),size:e.computed(()=>v.value),updateColumns(r){d.value=r},updateSize(r){v.value=r},dataSource:e.computed(()=>e.unref(m).records)});const P=e.computed(()=>{var r,n,o;return x++,((o=(n=(r=t.columns)==null?void 0:r.filter(a=>!a.hideInSearch&&a.dataIndex&&(a.valueType||a.customRenderFormItem)&&!$.noRenderAsFormItemValueList.includes(a.valueType)))==null?void 0:n.sort((a,u)=>{let l=s.getColumnOrder(a.order);return s.getColumnOrder(u.order)-l}))==null?void 0:o.map(a=>{const u=s.updateFormProps(a,s.getFieldProps(a.fieldProps,{})),l={...a,fieldProps:{label:a.title,name:a.dataIndex,...u||{},_signal:x},renderNode:void 0};return l.renderNode=s.getSearchFormItemRenderNode(l,e.unref(T)),l}))||[]}),X=e.computed(()=>s.recursionApColumns(e.unref(d),r=>{if(r.sorter===!0)return r.key||r.dataIndex}).filter(Boolean)),Y=e.computed(()=>s.recursionApColumns(e.unref(d),r=>{if(r.filters&&!r.onFilter)return r.key||r.dataIndex}).filter(Boolean)),Z=e.computed(()=>c.isUndefined(t.dataSource)?m.records:t.dataSource),{rowSelection:S,selectedRows:b,...h}=be.default({fixed:!0,...t.rowSelection===!0?{}:t.rowSelection,rowKey:t.rowKey,dataSource:Z}),{formRef:C,submit:_,reset:V,tableProps:E,refresh:ee,data:m,setDataSource:re,getColumnSFConfig:te}=ge.useTablePaging({async request(r){var o,a;if(!S.value.preserveSelectedRowKeys&&c.isUndefined(t.dataSource)&&h.clearAll(),!c.isUndefined(t.dataSource))return{data:t.dataSource||[],total:t.dataSource.length||0};const n=await((o=t.request)==null?void 0:o.call(t,r));return(a=t.onLoad)==null||a.call(t,(n==null?void 0:n.data)||[]),{data:(n==null?void 0:n.data)||[],total:(n==null?void 0:n.total)||0}},filterFields:Y,sortFields:X,defaultParams:t.params,defaultData:t.defaultData,manual:t.manual,formatParams:t.beforeSearchSubmit,pagination:t.pagination}),oe=()=>{var o;let r=((o=t.columns)==null?void 0:o.filter(a=>!a.hideInTable))||[];function n(a,u){return a.map(l=>({resizable:D.isDef(l.resizable)?l.resizable:t.columnResizable,...c.omit(s.apColumnToColumn(l),["ellipsis"]),...te(l),fixed:u?u.fixed:l.fixed,title:s.getTableTitle(l,k("table-header","title"),g.headerCell,e.unref(H).colorPrimary),customRender({value:p,...y}){var L,A;const O=s.getTableRenderType(l),ie=s.getTableRenderProps({...l,valueType:O},{value:p,...y}),fe=s.getTableCellRenderNode(O,ie,y.record,e.unref(T)),K=((L=l.renderText)==null?void 0:L.call(l,{value:p,...y}))||p,pe=l.renderText?e.createVNode(e.Fragment,null,[(A=l.renderText)==null?void 0:A.call(l,{value:p,...y})]):fe;let R=se(l,K,pe);return l.customRender&&(R=l.customRender({value:p,...y,column:l,originalNode:R,originalText:K})),R},children:n(l.children||[],u||l)}))}return n(r)};e.watch(()=>[t.columnResizable,t.columns],()=>{const r=oe();d.value=r,N.value=r},{deep:!0,immediate:!0});const ne=e.computed(()=>{var n,o;if(t.adaptive&&(m.total>0||((n=t.dataSource)==null?void 0:n.length)))return{y:e.unref(J),x:((o=t.scroll)==null?void 0:o.x)||"100%"};if(t.scroll)return t.scroll}),ae=e.computed(()=>{var r;if(t.tableLayout)return t.tableLayout;if((r=t.columns)!=null&&r.some(n=>n.ellipsis))return"fixed"}),I=e.computed(()=>{var o;const r=e.unref(E),n=e.unref(S);return{...t,...r,rowSelection:t.rowSelection===!0||((o=t.rowSelection)==null?void 0:o.mode)==="internal"?{...n,preserveSelectedRowKeys:c.isUndefined(t.dataSource)?n.preserveSelectedRowKeys:!0}:s.falseToUndefined(t.rowSelection),loading:c.isUndefined(t.loading)?r.loading:t.loading,pagination:t.pagination===!1?!1:r.pagination,scroll:e.unref(ne)}}),le=e.computed(()=>{var r;return[f(),t.card?null:f("wrapper"),t.adaptive?f("adaptive"):null,z.value&&((r=i.value)!=null&&r.visible)?M(`sticky-${q===0?"absolute":"relative"}`):null].filter(Boolean)});function se(r,n,o){return $.noRenderAsFormItemValueList.includes(r.valueType)?o:r.copyable||r.ellipsis?e.createVNode(ke.default,{copyable:r.copyable,ellipsis:r.ellipsis?c.isBoolean(r.ellipsis)?{tooltip:o,rows:1}:{...r.ellipsis,tooltip:o}:!1,content:o},null):o}e.watch(()=>e.unref(m).loading,r=>{var n;(n=t.onLoadingChange)==null||n.call(t,r)}),e.watch(()=>t.dataSource,r=>{re(r)},{immediate:!0});function ue(r){var n,o,a;(a=(o=(n=C.value)==null?void 0:n.apForm)==null?void 0:o.setFieldsValue)==null||a.call(o,r)}function de(r=!1){var o,a,u;const n=r?"getFieldsValueTransformed":"getFieldsValue";return(u=(a=(o=C.value)==null?void 0:o.apForm)==null?void 0:a[n])==null?void 0:u.call(a,!0)}function ce(){return e.unref(d)}return W({submit:()=>_(),reset:()=>V(),refresh:()=>ee(),setSearchFormValues:ue,getSearchFormValues:de,getShownColumns:ce,dataSource:e.computed(()=>e.unref(m).records),rowSelection:{selectedRows:e.computed(()=>e.unref(b)),...h},scrollBar:{x:{getCurrentScroll:()=>{var r;return((r=i==null?void 0:i.value)==null?void 0:r.currentScroll)??0},scroll:r=>{var n,o;return(o=(n=i==null?void 0:i.value)==null?void 0:n.scroll)==null?void 0:o.call(n,r)}},y:void 0}}),(r,n)=>(e.openBlock(),e.createElementBlock("div",{ref_key:"tableWrapperRef",ref:B,class:e.normalizeClass(le.value),style:e.normalizeStyle(e.unref(G)({"scroll-bar-width":`${e.unref(q)}px`}))},[e.unref(c.isUndefined)(r.dataSource)&&r.searchForm!==!1&&P.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(r.card?e.unref(w)("search-wrapper"):null),style:e.normalizeStyle(r.searchFormWrapperStyle)},[e.createVNode(e.unref(ye.ApForm).SearchForm,e.mergeProps(r.searchForm||{},{ref_key:"formRef",ref:C,"custom-reset":"","submit-loading":e.unref(E).loading,onSubmit:e.unref(_),onReset:e.unref(V)}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(P.value,o=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(o.renderNode.Comp),e.mergeProps({key:o.dataIndex,item:o,ref_for:!0},o.fieldProps||{},{span:o.span,"custom-render":o.renderNode.render}),null,16,["item","span","custom-render"]))),128))]),_:2},[g.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(r.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["submit-loading","onSubmit","onReset"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{ref_key:"contentRef",ref:Q,class:e.normalizeClass([e.unref(w)("table-wrapper"),r.card?e.unref(w)("table-wrapper-card"):null]),style:e.normalizeStyle(r.tableWrapperStyle)},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(f)("header-wrapper"))},[r.settings?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(e.unref(f)("header"))},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(k)("header","title"))},[e.renderSlot(r.$slots,"title",e.mergeProps({selectedRows:e.unref(b),selectedRowKeys:e.unref(S).selectedRowKeys,shownColumns:d.value},h))],2),g.title?(e.openBlock(),e.createBlock(e.unref(U.Divider),{key:0,type:"vertical"})):e.createCommentVNode("",!0),e.createVNode(Re.default,{config:r.settings===!0?{}:r.settings},null,8,["config"])],2)):e.renderSlot(r.$slots,"title",e.mergeProps({key:1,selectedRows:e.unref(b),selectedRowKeys:e.unref(S).selectedRowKeys,shownColumns:d.value},h))],2),e.createVNode(e.unref(U.Table),e.mergeProps({ref_key:"antdTableRef",ref:F,class:e.unref(f)("table")},I.value,{size:v.value,"table-layout":ae.value,columns:d.value,onResizeColumn:n[0]||(n[0]=(o,a)=>a.width=o)}),e.createSlots({summary:e.withCtx(()=>[e.renderSlot(r.$slots,"summary",{columns:d.value,records:I.value.dataSource,selectedRows:e.unref(b)})]),_:2},[e.unref(z)?{name:"bottomPaginationTop",fn:e.withCtx(()=>{var o,a;return[e.createVNode(e.unref(xe.default),{ref_key:"scrollBarRef",ref:i,"scroll-container":(a=(o=F.value)==null?void 0:o.table)==null?void 0:a.scrollBodyRef,direction:"horizontal"},null,8,["scroll-container"])]}),key:"0"}:void 0,e.renderList(e.unref(c.omit)(g,["title","searchFormExtra","headerCell","summary"]),(o,a)=>({name:a,fn:e.withCtx(u=>[e.renderSlot(r.$slots,a,e.normalizeProps(e.guardReactiveProps(u||{})))])}))]),1040,["class","size","table-layout","columns"])],6)],6))}});exports.default=Te;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),$=require("@aplus-frontend/antdv"),Se=require("@aplus-frontend/antdv/es/theme/internal"),be=require("../ap-form/index.js"),D=require("./constants.js");require("../config-provider/index.js");const he=require("./hooks/use-table-paging-ng.js"),i=require("lodash-unified"),s=require("./utils.js"),we=require("./hooks/use-table-content-height.js"),ve=require("./hooks/use-table-row-selection.js"),j=require("../utils/index.js");require("./components/setting/modal/index.vue.js");require("./components/paragraph-ellipsis/index.vue.js");const Ce=require("./context.js");require("../scroll-bar/index.js");const Re=require("./hooks/use-sticky-scroll.js"),xe=require("../config-provider/hooks/use-namespace.js"),ke=require("../config-provider/hooks/use-global-config.js"),Te=require("./components/setting/modal/index.vue2.js"),Be=require("../scroll-bar/index.vue.js"),Fe=require("./components/paragraph-ellipsis/index.vue2.js"),ze=e.defineComponent({name:"ApTable",__name:"ap-table",props:{dropdownPrefixCls:{},loading:{type:[Boolean,Object],default:void 0},bordered:{type:Boolean,default:!1},locale:{},onChange:{},onResizeColumn:{},getPopupContainer:{},scroll:{},sortDirections:{default:()=>["ascend","descend"]},showSorterTooltip:{type:[Boolean,Object],default:!1},prefixCls:{},rowKey:{default:"key"},tableLayout:{},rowClassName:{},title:{},footer:{},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]},transformCellText:{},columns:{},rowSelection:{type:[Boolean,Object]},card:{type:Boolean,default:!1},params:{},searchFormRender:{},request:{},onLoad:{},defaultData:{},dataSource:{},onLoadingChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},manual:{type:Boolean,default:!1},size:{default:"middle"},adaptive:{type:Boolean,default:!1},columnResizable:{type:Boolean,default:!1},settings:{type:[Boolean,Object],default:void 0}},setup(W,{expose:H}){const t=W;let x=0;const g=e.useSlots(),[,M]=Se.useToken(),{e:w,b:f,be:k,m:G,cssVar:J}=xe.useNamespace("ap-table"),T=ke.useGlobalConfig("valueTypeMap"),{height:Q,contentRef:X}=we.default(),B=e.ref(),F=e.ref(),{isStickyMode:z,scrollBarRef:c}=Re.useStickyScroll(B),v=e.ref(t.size),d=e.ref([]),N=e.ref([]),q=j.getScrollbarSize();Ce.useProvideApTable({columns:e.computed(()=>d.value),columnsBackup:e.computed(()=>N.value),size:e.computed(()=>v.value),updateColumns(r){d.value=r},updateSize(r){v.value=r},dataSource:e.computed(()=>e.unref(m).records)});const P=e.computed(()=>{var r,n,o;return x++,((o=(n=(r=t.columns)==null?void 0:r.filter(a=>!a.hideInSearch&&a.dataIndex&&(a.valueType||a.customRenderFormItem)&&!D.noRenderAsFormItemValueList.includes(a.valueType)))==null?void 0:n.sort((a,u)=>{let l=s.getColumnOrder(a.order);return s.getColumnOrder(u.order)-l}))==null?void 0:o.map(a=>{const u=s.updateFormProps(a,s.getFieldProps(a.fieldProps,{})),l={...a,fieldProps:{label:a.title,name:a.dataIndex,...u||{},_signal:x},renderNode:void 0};return l.renderNode=s.getSearchFormItemRenderNode(l,e.unref(T)),l}))||[]}),Y=e.computed(()=>s.recursionApColumns(e.unref(d),r=>{if(r.sorter===!0)return r.key||(r==null?void 0:r.dataIndex)}).filter(Boolean)),Z=e.computed(()=>s.recursionApColumns(e.unref(d),r=>{if(r.filters&&!r.onFilter)return r.key||(r==null?void 0:r.dataIndex)}).filter(Boolean)),ee=e.computed(()=>i.isUndefined(t.dataSource)?m.records:t.dataSource),{rowSelection:S,selectedRows:b,...h}=ve.default({fixed:!0,...t.rowSelection===!0?{}:t.rowSelection,rowKey:t.rowKey,dataSource:ee}),{formRef:C,submit:_,reset:V,tableProps:I,refresh:re,data:m,setDataSource:te,getColumnSFConfig:E,sortedInfo:oe,filteredInfo:ne}=he.useTablePaging({async request(r){var o,a;if(!S.value.preserveSelectedRowKeys&&i.isUndefined(t.dataSource)&&h.clearAll(),!i.isUndefined(t.dataSource))return{data:t.dataSource||[],total:t.dataSource.length||0};const n=await((o=t.request)==null?void 0:o.call(t,r));return(a=t.onLoad)==null||a.call(t,(n==null?void 0:n.data)||[]),{data:(n==null?void 0:n.data)||[],total:(n==null?void 0:n.total)||0}},filterFields:Z,sortFields:Y,defaultParams:t.params,defaultData:t.defaultData,manual:t.manual,formatParams:t.beforeSearchSubmit,pagination:t.pagination}),ae=()=>{var o;let r=((o=t.columns)==null?void 0:o.filter(a=>!a.hideInTable))||[];function n(a,u){return a.map(l=>({resizable:j.isDef(l.resizable)?l.resizable:t.columnResizable,...i.omit(s.apColumnToColumn(l),["ellipsis"]),...E(l),fixed:u?u.fixed:l.fixed,title:s.getTableTitle(l,k("table-header","title"),g.headerCell,e.unref(M).colorPrimary),customRender({value:p,...y}){var A,U;const K=s.getTableRenderType(l),me=s.getTableRenderProps({...l,valueType:K},{value:p,...y}),ye=s.getTableCellRenderNode(K,me,y.record,e.unref(T)),L=((A=l.renderText)==null?void 0:A.call(l,{value:p,...y}))||p,ge=l.renderText?e.createVNode(e.Fragment,null,[(U=l.renderText)==null?void 0:U.call(l,{value:p,...y})]):ye;let R=ie(l,L,ge);return l.customRender&&(R=l.customRender({value:p,...y,column:l,originalNode:R,originalText:L})),R},children:n(l.children||[],u||l)}))}return n(r)},le=()=>{function r(n){var o;for(const a of n)(o=a.children)!=null&&o.length?r(a.children):E(a,!0)}r(d.value)};e.watch(()=>[t.columns,t.columnResizable],()=>{const r=ae();d.value=r,N.value=r},{deep:!0,immediate:!0}),e.watch(()=>[oe.value,ne.value],()=>{le()},{deep:!0});const se=e.computed(()=>{var n,o;if(t.adaptive&&(m.total>0||((n=t.dataSource)==null?void 0:n.length)))return{y:e.unref(Q),x:((o=t.scroll)==null?void 0:o.x)||"100%"};if(t.scroll)return t.scroll}),ue=e.computed(()=>{var r;if(t.tableLayout)return t.tableLayout;if((r=t.columns)!=null&&r.some(n=>n.ellipsis))return"fixed"}),O=e.computed(()=>{var o;const r=e.unref(I),n=e.unref(S);return{...t,...r,rowSelection:t.rowSelection===!0||((o=t.rowSelection)==null?void 0:o.mode)==="internal"?{...n,preserveSelectedRowKeys:i.isUndefined(t.dataSource)?n.preserveSelectedRowKeys:!0}:s.falseToUndefined(t.rowSelection),loading:i.isUndefined(t.loading)?r.loading:t.loading,pagination:t.pagination===!1?!1:r.pagination,scroll:e.unref(se)}}),de=e.computed(()=>{var r;return[f(),t.card?null:f("wrapper"),t.adaptive?f("adaptive"):null,z.value&&((r=c.value)!=null&&r.visible)?G(`sticky-${q===0?"absolute":"relative"}`):null].filter(Boolean)});function ie(r,n,o){return D.noRenderAsFormItemValueList.includes(r.valueType)?o:r.copyable||r.ellipsis?e.createVNode(Fe.default,{copyable:r.copyable,ellipsis:r.ellipsis?i.isBoolean(r.ellipsis)?{tooltip:o,rows:1}:{...r.ellipsis,tooltip:o}:!1,content:o},null):o}e.watch(()=>e.unref(m).loading,r=>{var n;(n=t.onLoadingChange)==null||n.call(t,r)}),e.watch(()=>t.dataSource,r=>{te(r)},{immediate:!0});function ce(r){var n,o,a;(a=(o=(n=C.value)==null?void 0:n.apForm)==null?void 0:o.setFieldsValue)==null||a.call(o,r)}function fe(r=!1){var o,a,u;const n=r?"getFieldsValueTransformed":"getFieldsValue";return(u=(a=(o=C.value)==null?void 0:o.apForm)==null?void 0:a[n])==null?void 0:u.call(a,!0)}function pe(){return e.unref(d)}return H({submit:()=>_(),reset:()=>V(),refresh:()=>re(),setSearchFormValues:ce,getSearchFormValues:fe,getShownColumns:pe,dataSource:e.computed(()=>e.unref(m).records),rowSelection:{selectedRows:e.computed(()=>e.unref(b)),...h},scrollBar:{x:{getCurrentScroll:()=>{var r;return((r=c==null?void 0:c.value)==null?void 0:r.currentScroll)??0},scroll:r=>{var n,o;return(o=(n=c==null?void 0:c.value)==null?void 0:n.scroll)==null?void 0:o.call(n,r)}},y:void 0}}),(r,n)=>(e.openBlock(),e.createElementBlock("div",{ref_key:"tableWrapperRef",ref:B,class:e.normalizeClass(de.value),style:e.normalizeStyle(e.unref(J)({"scroll-bar-width":`${e.unref(q)}px`}))},[e.unref(i.isUndefined)(r.dataSource)&&r.searchForm!==!1&&P.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(r.card?e.unref(w)("search-wrapper"):null),style:e.normalizeStyle(r.searchFormWrapperStyle)},[e.createVNode(e.unref(be.ApForm).SearchForm,e.mergeProps(r.searchForm||{},{ref_key:"formRef",ref:C,"custom-reset":"","submit-loading":e.unref(I).loading,onSubmit:e.unref(_),onReset:e.unref(V)}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(P.value,o=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(o.renderNode.Comp),e.mergeProps({key:o.dataIndex,item:o,ref_for:!0},o.fieldProps||{},{span:o.span,"custom-render":o.renderNode.render}),null,16,["item","span","custom-render"]))),128))]),_:2},[g.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(r.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["submit-loading","onSubmit","onReset"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{ref_key:"contentRef",ref:X,class:e.normalizeClass([e.unref(w)("table-wrapper"),r.card?e.unref(w)("table-wrapper-card"):null]),style:e.normalizeStyle(r.tableWrapperStyle)},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(f)("header-wrapper"))},[r.settings?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(e.unref(f)("header"))},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(k)("header","title"))},[e.renderSlot(r.$slots,"title",e.mergeProps({selectedRows:e.unref(b),selectedRowKeys:e.unref(S).selectedRowKeys,shownColumns:d.value},h))],2),g.title?(e.openBlock(),e.createBlock(e.unref($.Divider),{key:0,type:"vertical"})):e.createCommentVNode("",!0),e.createVNode(Te.default,{config:r.settings===!0?{}:r.settings},null,8,["config"])],2)):e.renderSlot(r.$slots,"title",e.mergeProps({key:1,selectedRows:e.unref(b),selectedRowKeys:e.unref(S).selectedRowKeys,shownColumns:d.value},h))],2),e.createVNode(e.unref($.Table),e.mergeProps({ref_key:"antdTableRef",ref:F,class:e.unref(f)("table")},O.value,{size:v.value,"table-layout":ue.value,columns:d.value,onResizeColumn:n[0]||(n[0]=(o,a)=>a.width=o)}),e.createSlots({summary:e.withCtx(()=>[e.renderSlot(r.$slots,"summary",{columns:d.value,records:O.value.dataSource,selectedRows:e.unref(b)})]),_:2},[e.unref(z)?{name:"bottomPaginationTop",fn:e.withCtx(()=>{var o,a;return[e.createVNode(e.unref(Be.default),{ref_key:"scrollBarRef",ref:c,"scroll-container":(a=(o=F.value)==null?void 0:o.table)==null?void 0:a.scrollBodyRef,direction:"horizontal"},null,8,["scroll-container"])]}),key:"0"}:void 0,e.renderList(e.unref(i.omit)(g,["title","searchFormExtra","headerCell","summary"]),(o,a)=>({name:a,fn:e.withCtx(u=>[e.renderSlot(r.$slots,a,e.normalizeProps(e.guardReactiveProps(u||{})))])}))]),1040,["class","size","table-layout","columns"])],6)],6))}});exports.default=ze;

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

@@ -1,4 +1,4 @@
-import { ColumnType } from '@aplus-frontend/antdv/es/table';
+import { ColumnsType } from '@aplus-frontend/antdv/es/table';
 import { ComputedRef, InjectionKey } from 'vue';
 import { ApTableContextRenderConfig, ApTableProps } from './interface';
 type TableSize = ApTableProps['size'];
@@ -6,11 +6,11 @@ type ApTableContextProps<RecordType> = {
     /**
      * 表格列配置
      */
-    columns?: ComputedRef<ColumnType<RecordType>[]>;
+    columns?: ComputedRef<ColumnsType<RecordType>>;
     /**
      * 表格列配置备份（只有在props变更后才会变更）
      */
-    columnsBackup?: ComputedRef<ColumnType<RecordType>[]>;
+    columnsBackup?: ComputedRef<ColumnsType<RecordType>>;
     /**
      * 更新数据源的方法
      * @param name
@@ -18,7 +18,7 @@ type ApTableContextProps<RecordType> = {
      * @param triggerChange 是否触发外部的`onValuesChange`函数
      * @returns
      */
-    updateColumns?: (nextColumns: ColumnType<RecordType>[]) => void;
+    updateColumns?: (nextColumns: ColumnsType<RecordType>) => void;
     /**
      * ApForm内部实例
      */

package/lib/src/ap-table/hooks/use-sorted-filtered.d.ts

@@ -1,9 +1,12 @@
 import { ApColumnType } from '../interface';
 import { Recordable } from '../../type';
+import { Ref } from 'vue';
 export declare const useTableSortedAndFiltered: () => {
-    getColumnSFConfig: (column: ApColumnType) => Recordable;
+    getColumnSFConfig: (column: ApColumnType, append?: boolean) => Recordable;
     setSF: (filters: any, sorter: any) => void;
     clearSorter: () => void;
     clearFilters: () => void;
     clearAll: () => void;
+    sortedInfo: Ref<any, any>;
+    filteredInfo: Ref<any, any>;
 };

package/lib/src/ap-table/hooks/use-sorted-filtered.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("vue"),a=()=>{const t=r.ref(),n=r.ref();function s(e){const l=r.unref(n)||{},i=r.unref(t)||{},o={};return e.filters&&(o.filteredValue=l[e.key]||null),e.sorter&&(o.sortOrder=i.columnKey===e.key?i.order:null),o}function c(e,l){n.value=e,t.value=l}function u(){t.value=null}function f(){n.value=null}function d(){u(),f()}return{getColumnSFConfig:s,setSF:c,clearSorter:u,clearFilters:f,clearAll:d}};exports.useTableSortedAndFiltered=a;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("vue"),S=()=>{const r=n.ref(),t=n.ref();function s(e,l=!1){const a=n.unref(t)||{},i=n.unref(r)||{},o=l?e:{};return e.filters&&(o.filteredValue=a[e.key]||null),e.sorter&&(o.sortOrder=i.columnKey===e.key?i.order:null),o}function d(e,l){t.value=e,r.value=l}function u(){r.value=null}function f(){t.value=null}function c(){u(),f()}return{getColumnSFConfig:s,setSF:d,clearSorter:u,clearFilters:f,clearAll:c,sortedInfo:r,filteredInfo:t}};exports.useTableSortedAndFiltered=S;

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

@@ -88,6 +88,8 @@ export declare const useTablePaging: <DataType = any, ParamsType = Record<string
     }>;
     dataSource: ComputedRef<DataType[]>;
     setDataSource: (dataSource?: DataType[]) => void;
-    getColumnSFConfig: (column: ApColumnType) => Recordable;
+    getColumnSFConfig: (column: ApColumnType, append?: boolean) => Recordable;
+    sortedInfo: Ref<any, any>;
+    filteredInfo: Ref<any, any>;
 };
 export {};

package/lib/src/ap-table/hooks/use-table-paging-ng.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("vue"),k=require("./use-sorted-filtered.js");require("../../config-provider/index.js");const q=require("../utils.js"),x=require("lodash-unified"),ee=require("../../config-provider/hooks/use-locale.js"),te=require("../../config-provider/hooks/use-namespace.js"),S=1,w=10;function re(g){const l={};return g&&(g===!0?(l.current=S,l.pageSize=w):(l.current=g.defaultCurrent||S,l.pageSize=g.defaultPageSize||w)),l}const ne=({manual:g=!1,request:l,defaultParams:L={},defaultData:v=[],formatParams:y,paramsValueTypeMap:D,resetFieldsIgnores:N,filterFields:O,sortFields:j,namespace:I="ap-table",pagination:p={defaultCurrent:S,defaultPageSize:w,showLessItems:!1,showTotal:!0}})=>{let C=0,c={};const M=p??{},B=e=>y?y(e):e,T=n.ref(),i=n.reactive(re(p)),{getColumnSFConfig:G,setSF:K,clearAll:Z}=k.useTableSortedAndFiltered(),{t:z}=ee.useLocale(),{b:P}=te.useNamespace(I),a=n.reactive({total:v.length,records:v,loading:!1}),F=()=>{var e,t;return((t=(e=T.value)==null?void 0:e.apForm)==null?void 0:t.getFieldsValueTransformed(!0))||{}},R=async e=>{var o;const t=B(e),r=Date.now();C=r,a.loading=!0;try{const s=await l({...n.unref(L),...t});C===r&&(a.total=s.total||((o=s.data)==null?void 0:o.length)||0,a.records=[...s.data||[]])}catch{C===r&&(a.records=[],a.total=0)}finally{a.loading=!1}},V=e=>{const t={};return Object.entries(e).forEach(([r,o])=>{if(t[r]=o,D&&o){const s=D[r];s&&(t[r]=q.parseFieldValue(s,o))}}),t},$=async e=>{var o,s,f,d,h;const t=F(),r={};Object.entries(t).forEach(([m,b])=>{N&&N.indexOf(m)>-1&&(r[m]=b)}),await((s=(o=T.value)==null?void 0:o.apForm)==null?void 0:s.resetFields()),(h=(d=(f=T.value)==null?void 0:f.apForm)==null?void 0:d.setFieldsValue)==null||h.call(d,r),n.nextTick(()=>{e==null||e()})},E=e=>{c=e;const t=V(e);R(t)},J=e=>{E({...c,...e})},A=()=>{const e=F();p&&(i.current=S),E({...e,filter:c.filter,sort:c.sort,current:p?S:void 0,pageSize:p?c.pageSize||i.pageSize:void 0})},Q=()=>{Z(),c.sort={},c.filter={},$(A)},U=()=>{E(c)},W=e=>{if(!p)U();else{const{current:t,pageSize:r}=i,o=a.total-e,s=Math.ceil(o/r),f=t>s?s:t;J({current:f>0?f:1})}},_=(e,t,r)=>{var m,b;const o=F();i.current=e.current,i.pageSize=e.pageSize,K(t,r);const s=x.isArray(r)?[...r]:[r],f={};for(const u of s)(m=n.unref(j))!=null&&m.includes(u.columnKey||u.field)&&u.order&&(f[q.dataIndexToStr(u.columnKey||u.field)]=u.order);const d={};for(const u of Object.keys(t))(b=n.unref(O))!=null&&b.includes(u)&&t[u]&&(d[u]=t[u]);const h={...o,filter:d,sort:f,current:e.current,pageSize:e.pageSize};x.isEqualWith(c,h,q.isEqualCustom)||E(h)};n.onMounted(()=>{const e=F(),{current:t,pageSize:r}=i;if(c={current:t,pageSize:r,filter:{},sort:{},...e},!g){const o=V(c);R(o)}}),n.watch(()=>n.unref(L),()=>{A()},{deep:!0});const H=n.computed(()=>{if(a.total===0)return"-";const{current:e,pageSize:t}=i;return`${e}/${Math.ceil(a.total/t)}`});function X(e){x.isArray(e)&&(a.records=e,a.total=e.length)}const Y=n.computed(()=>{const{showLessItems:e,showTotal:t}=M;return{loading:a.loading,pagination:{current:i.current,pageSize:i.pageSize,total:a.total,showSizeChanger:!e,showQuickJumper:!e,showLessItems:e,size:"default",showTotal:t?r=>n.createVNode("span",{class:P("pagination-total-wrapper")},[z("ap.apTable.pagination.totalLeftPrefix")," ",n.createVNode("span",{class:P("pagination-count-text")},[r])," ",z("ap.apTable.pagination.totalLeftSuffix"),n.createVNode("span",{class:P("pagination--total-right")},[z("ap.apTable.pagination.totalRightPrefix")," ",n.createVNode("span",{class:P("pagination-count-text")},[n.unref(H)])," ",z("ap.apTable.pagination.totalRightSuffix")])]):void 0},onChange:_,dataSource:a.records}});return{formRef:T,submit:A,reset:Q,refresh:U,refreshByDelete:W,data:a,current:i.current,pageSize:i.pageSize,handleTableChange:_,tableProps:Y,dataSource:n.computed(()=>a.records),setDataSource:X,getColumnSFConfig:G}};exports.DEFAULT_CURRENT=S;exports.DEFAULT_PAGE_SIZE=w;exports.useTablePaging=ne;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("vue"),te=require("./use-sorted-filtered.js");require("../../config-provider/index.js");const q=require("../utils.js"),x=require("lodash-unified"),re=require("../../config-provider/hooks/use-locale.js"),ne=require("../../config-provider/hooks/use-namespace.js"),S=1,w=10;function ae(g){const l={};return g&&(g===!0?(l.current=S,l.pageSize=w):(l.current=g.defaultCurrent||S,l.pageSize=g.defaultPageSize||w)),l}const oe=({manual:g=!1,request:l,defaultParams:L={},defaultData:v=[],formatParams:y,paramsValueTypeMap:D,resetFieldsIgnores:N,filterFields:I,sortFields:O,namespace:j="ap-table",pagination:p={defaultCurrent:S,defaultPageSize:w,showLessItems:!1,showTotal:!0}})=>{let C=0,c={};const M=p??{},B=e=>y?y(e):e,T=n.ref(),i=n.reactive(ae(p)),{getColumnSFConfig:G,setSF:K,clearAll:Z,sortedInfo:$,filteredInfo:J}=te.useTableSortedAndFiltered(),{t:z}=re.useLocale(),{b:P}=ne.useNamespace(j),a=n.reactive({total:v.length,records:v,loading:!1}),F=()=>{var e,t;return((t=(e=T.value)==null?void 0:e.apForm)==null?void 0:t.getFieldsValueTransformed(!0))||{}},R=async e=>{var o;const t=B(e),r=Date.now();C=r,a.loading=!0;try{const s=await l({...n.unref(L),...t});C===r&&(a.total=s.total||((o=s.data)==null?void 0:o.length)||0,a.records=[...s.data||[]])}catch{C===r&&(a.records=[],a.total=0)}finally{a.loading=!1}},V=e=>{const t={};return Object.entries(e).forEach(([r,o])=>{if(t[r]=o,D&&o){const s=D[r];s&&(t[r]=q.parseFieldValue(s,o))}}),t},Q=async e=>{var o,s,f,d,h;const t=F(),r={};Object.entries(t).forEach(([m,b])=>{N&&N.indexOf(m)>-1&&(r[m]=b)}),await((s=(o=T.value)==null?void 0:o.apForm)==null?void 0:s.resetFields()),(h=(d=(f=T.value)==null?void 0:f.apForm)==null?void 0:d.setFieldsValue)==null||h.call(d,r),n.nextTick(()=>{e==null||e()})},E=e=>{c=e;const t=V(e);R(t)},W=e=>{E({...c,...e})},A=()=>{const e=F();p&&(i.current=S),E({...e,filter:c.filter,sort:c.sort,current:p?S:void 0,pageSize:p?c.pageSize||i.pageSize:void 0})},H=()=>{Z(),c.sort={},c.filter={},Q(A)},U=()=>{E(c)},X=e=>{if(!p)U();else{const{current:t,pageSize:r}=i,o=a.total-e,s=Math.ceil(o/r),f=t>s?s:t;W({current:f>0?f:1})}},_=(e,t,r)=>{var m,b;const o=F();i.current=e.current,i.pageSize=e.pageSize,K(t,r);const s=x.isArray(r)?[...r]:[r],f={};for(const u of s)(m=n.unref(O))!=null&&m.includes(u.columnKey||u.field)&&u.order&&(f[q.dataIndexToStr(u.columnKey||u.field)]=u.order);const d={};for(const u of Object.keys(t))(b=n.unref(I))!=null&&b.includes(u)&&t[u]&&(d[u]=t[u]);const h={...o,filter:d,sort:f,current:e.current,pageSize:e.pageSize};x.isEqualWith(c,h,q.isEqualCustom)||E(h)};n.onMounted(()=>{const e=F(),{current:t,pageSize:r}=i;if(c={current:t,pageSize:r,filter:{},sort:{},...e},!g){const o=V(c);R(o)}}),n.watch(()=>n.unref(L),()=>{A()},{deep:!0});const Y=n.computed(()=>{if(a.total===0)return"-";const{current:e,pageSize:t}=i;return`${e}/${Math.ceil(a.total/t)}`});function k(e){x.isArray(e)&&(a.records=e,a.total=e.length)}const ee=n.computed(()=>{const{showLessItems:e,showTotal:t}=M;return{loading:a.loading,pagination:{current:i.current,pageSize:i.pageSize,total:a.total,showSizeChanger:!e,showQuickJumper:!e,showLessItems:e,size:"default",showTotal:t?r=>n.createVNode("span",{class:P("pagination-total-wrapper")},[z("ap.apTable.pagination.totalLeftPrefix")," ",n.createVNode("span",{class:P("pagination-count-text")},[r])," ",z("ap.apTable.pagination.totalLeftSuffix"),n.createVNode("span",{class:P("pagination--total-right")},[z("ap.apTable.pagination.totalRightPrefix")," ",n.createVNode("span",{class:P("pagination-count-text")},[n.unref(Y)])," ",z("ap.apTable.pagination.totalRightSuffix")])]):void 0},onChange:_,dataSource:a.records}});return{formRef:T,submit:A,reset:H,refresh:U,refreshByDelete:X,data:a,current:i.current,pageSize:i.pageSize,handleTableChange:_,tableProps:ee,dataSource:n.computed(()=>a.records),setDataSource:k,getColumnSFConfig:G,sortedInfo:$,filteredInfo:J}};exports.DEFAULT_CURRENT=S;exports.DEFAULT_PAGE_SIZE=w;exports.useTablePaging=oe;

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

@@ -108,5 +108,5 @@ export declare const useTablePaging: <DataType = any, ParamsType = Record<string
     }>;
     dataSource: ComputedRef<DataType[]>;
     setDataSource: (dataSource?: DataType[]) => void;
-    getColumnSFConfig: (column: ApColumnType) => Recordable;
+    getColumnSFConfig: (column: ApColumnType, append?: boolean) => Recordable;
 };

package/lib/src/business/ap-batch-action-group/ApBatchActionGroup.vue.d.ts

@@ -1,9 +1,9 @@
 import { ApBatchActionGroupProps } from './interface';
 import { DefineComponent, ComputedRef, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
-import { TableColumnType } from '@aplus-frontend/antdv';
+import { TableColumnsType } from '@aplus-frontend/antdv';
 type __VLS_Props = ApBatchActionGroupProps;
 declare const _default: DefineComponent<__VLS_Props, {
-    columns: ComputedRef< TableColumnType<any>[]> | undefined;
+    columns: ComputedRef<TableColumnsType<any>> | undefined;
     dataSource: ComputedRef<any[]> | undefined;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, ComponentProvideOptions, false, {}, any>;
 export default _default;

package/lib/src/business/ap-batch-action-group/index.d.ts

@@ -4,7 +4,7 @@ import { ButtonHTMLType } from '@aplus-frontend/antdv/es/button/buttonTypes';
 import { VueTypeValidableDef } from '../../../node_modules/vue-types';
 import { MouseEventHandler, FocusEventHandler } from '@aplus-frontend/antdv/es/_util/EventInterface';
 import { DropdownArrowOptions, Trigger, Align } from '@aplus-frontend/antdv/es/dropdown/props';
-import { ItemType, MenuTheme, MenuMode, TableColumnType, ButtonProps } from '@aplus-frontend/antdv';
+import { ItemType, MenuTheme, MenuMode, TableColumnsType, ButtonProps } from '@aplus-frontend/antdv';
 import { Key } from '@aplus-frontend/antdv/es/_util/type';
 import { CSSMotionProps } from '@aplus-frontend/antdv/es/_util/transition';
 import { BuiltinPlacements, TriggerSubMenuAction, SelectEventHandler, MenuClickEventHandler } from '@aplus-frontend/antdv/es/menu/src/interface';
@@ -303,7 +303,7 @@ declare const ApBatchActionGroup: {
         }) | undefined;
         menuList?: ApBatchActionGroupMenuProps<any>[] | undefined;
     }> & Readonly<{}>, {
-        columns: ComputedRef< TableColumnType<any>[]> | undefined;
+        columns: ComputedRef<TableColumnsType<any>> | undefined;
         dataSource: ComputedRef<any[]> | undefined;
     }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, PublicProps, {}, false, {}, {}, GlobalComponents, GlobalDirectives, string, {}, any, ComponentProvideOptions, {
         P: {};
@@ -604,7 +604,7 @@ declare const ApBatchActionGroup: {
         }) | undefined;
         menuList?: ApBatchActionGroupMenuProps<any>[] | undefined;
     }> & Readonly<{}>, {
-        columns: ComputedRef< TableColumnType<any>[]> | undefined;
+        columns: ComputedRef<TableColumnsType<any>> | undefined;
         dataSource: ComputedRef<any[]> | undefined;
     }, {}, {}, {}, {}>;
     __isFragment?: never;
@@ -902,7 +902,7 @@ declare const ApBatchActionGroup: {
     }) | undefined;
     menuList?: ApBatchActionGroupMenuProps<any>[] | undefined;
 }> & Readonly<{}>, {
-    columns: ComputedRef< TableColumnType<any>[]> | undefined;
+    columns: ComputedRef<TableColumnsType<any>> | undefined;
     dataSource: ComputedRef<any[]> | undefined;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, {}, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & ( Plugin & (new (...args: any[]) => {
     $props: {