@aplus-frontend/ui 0.6.0-beta.9 → 0.6.1

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

@@ -3,8 +3,9 @@ import { ApTablePaginationConfig, ApTableValueFields, ApTableValueTypes, CommonF
 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 { ComputedRef, CSSProperties, VNode } from 'vue';
 import { VxeTablePropTypes, VxeColumnPropTypes, VxeTableProps, VxeTableDefines, VxeColumnSlots, VxeColumnProps } from 'vxe-table';
+import { InternalPagingType } from '../ap-table/hooks/use-table-paging-ng';
 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' | 'className' | 'class'> & {
     children?: ApGridColumnType<RecordType, ExtraValueType, ValueType, MergedValueType>[];
@@ -134,9 +135,9 @@ export type ApGridProps<RecordType = any, ParamsType = any> = Omit<TableProps<Re
     card?: boolean;
     /**
      * request额外请求的参数
-     * 如果传入响应式数据，将会在变更后重新执行
+     * 数据变化后将会重新发起网络请求
      */
-    params?: ParamsType | Ref<ParamsType>;
+    params?: ParamsType;
     /**
      * 请求获取dataSource
      * @param params
@@ -239,6 +240,10 @@ export type ApGridProps<RecordType = any, ParamsType = any> = Omit<TableProps<Re
      * 作为表单项时内部传递，请勿使用
      */
     value?: any;
+    /**
+     * 行是否可以被高亮（传入函数可以获取当前被选中的行）
+     */
+    rowHighlightable?: boolean | ((current: RecordType) => void);
 };
 export type ApGridVirtualConfig = {
     x?: false | number;
@@ -289,6 +294,12 @@ export type ApGridExpose<SearchParamsType = Recordable, RecordType = any> = {
      */
     rowSelection: {
         selectedRows: ComputedRef<RecordType[]>;
+        /**
+         * 通过API调用设置行选中
+         * @param keys
+         * @returns
+         */
+        setSelectedRowKeys: (keys: (string | number)[]) => void;
         clearAll: () => void;
     };
     /**
@@ -303,4 +314,22 @@ export type ApGridExpose<SearchParamsType = Recordable, RecordType = any> = {
      * @returns
      */
     getDataSource: () => RecordType[];
+    /**
+     * 设置某一行被选中
+     * @param nextRow
+     * @returns
+     */
+    setCurrentRow: (nextRow: Partial<RecordType>) => void;
+    /**
+     * 获取分页参数
+     * @returns
+     */
+    getPaging: () => InternalPagingType;
+    /**
+     * 设置表格分页参数
+     * @param nextPaging 新的分页参数
+     * @param refreshImmediately 是否立刻刷新数据，默认为`true`
+     * @returns
+     */
+    setPaging: (nextPaging: InternalPagingType, refreshImmediately?: boolean) => void;
 };

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

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

package/lib/src/ap-list/index.vue.d.ts

@@ -1,17 +1,10 @@
-import { ApListProps } from './interface';
+import { ApListExpose, ApListProps } from './interface';
 import { Recordable } from '../type';
 import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, Ref, VNode } from 'vue';
 import { ApFormSearchFormExpose } from '..';
 declare const _default: <RecordType extends Recordable>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{} & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>, never> & ApListProps<RecordType> & Partial<{}>> & PublicProps;
-    expose(exposed: ShallowUnwrapRef<{
-        submit: () => void;
-        reset: () => void;
-        refresh: () => void;
-        refreshByDelete: (n: number) => void;
-        scrollToFirstRow: (selector?: string) => void;
-        getSearchFormValuesIfSetted: (transform?: boolean) => Partial<any>;
-    }>): void;
+    expose(exposed: ShallowUnwrapRef<ApListExpose>): void;
     attrs: any;
     slots: {
         header?(_: {

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

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),c=require("@aplus-frontend/antdv"),j=require("../ap-table/hooks/use-table-paging-ng.js");require("../config-provider/index.js");const d=require("lodash-unified"),A=require("./hooks/use-offline-list.js");require("vue-virtual-scroller/dist/vue-virtual-scroller.css");const p=require("vue-virtual-scroller"),M=require("../config-provider/hooks/use-namespace.js"),U=e.defineComponent({__name:"index",props:{dataSource:{},loading:{type:Boolean,default:void 0},onItem:{},params:{},request:{},defaultData:{},onLoadingChange:{},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},manual:{type:Boolean},containerStyle:{type:[Boolean,null,String,Object,Array]},contentStyle:{type:[Boolean,null,String,Object,Array]},footerWarpperStyle:{type:[Boolean,null,String,Object,Array]},virtual:{default:void 0},rowKey:{},adaptive:{type:Boolean,default:!1}},setup(C,{expose:z}){const w=c.Empty.PRESENTED_IMAGE_SIMPLE,a=C,{b:u,e:f,bm:E,m:q}=M.useNamespace("ap-list"),g=e.ref(),{formRef:y,submit:S,reset:v,handleTableChange:P,data:m,refresh:D,refreshByDelete:N,tableProps:h}=j.useTablePaging({async request(n){var r;const t=await((r=a.request)==null?void 0:r.call(a,n));return{data:(t==null?void 0:t.data)||[],total:(t==null?void 0:t.total)||0}},defaultParams:a.params,defaultData:a.defaultData,manual:a.manual,pagination:a.pagination,formatParams:a.beforeSearchSubmit}),V={form:y},{pagination:k,dataSource:I,onChange:O}=A.useOfflineList(a);function T(n,t){if(e.unref(s)){O(n,t);return}P({current:n,pageSize:t},{},{},{currentDataSource:[],action:"paginate"})}const l=e.computed(()=>e.unref(s)?e.unref(I):e.unref(m).records),i=e.computed(()=>d.isUndefined(a.loading)?e.unref(m).loading:a.loading),F=e.computed(()=>{var n,t;return a.pagination===!1||a.virtual?!1:((n=a.pagination)==null?void 0:n.hideOnSinglePage)!==!0?!0:e.unref(s)?(((t=a.dataSource)==null?void 0:t.length)||0)>e.unref(k).pageSize:e.unref(m).total>e.unref(h).pagination.pageSize}),s=e.computed(()=>!d.isUndefined(a.dataSource));e.watch(()=>e.unref(i),n=>{var t;(t=a.onLoadingChange)==null||t.call(a,n)});function L(n){var t,r;(r=(t=g.value)==null?void 0:t.querySelector(n||":first-child"))==null||r.scrollIntoView({behavior:"smooth",block:"center"})}function R(n=!1){var o;const t=(o=y.value)==null?void 0:o.apForm,r=n?t==null?void 0:t.getFieldsValueTransformed:t==null?void 0:t.getFieldsValue;return(r==null?void 0:r())||{}}return z({submit:()=>S(),reset:()=>v(),refresh:()=>D(),refreshByDelete:n=>N(n),scrollToFirstRow:L,getSearchFormValuesIfSetted:R}),(n,t)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass([e.unref(u)(),{[e.unref(q)("adaptive")]:n.adaptive}]),style:e.normalizeStyle(n.containerStyle)},[e.renderSlot(n.$slots,"header",{formIns:V,submit:e.unref(S),reset:e.unref(v)}),e.createElementVNode("div",{class:e.normalizeClass([e.unref(u)("content-container"),{[e.unref(E)("content-container","spinning")]:i.value}])},[i.value?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(e.unref(f)("spin-wrapper"))},[e.createVNode(e.unref(c.Spin),{spinning:i.value},null,8,["spinning"])],2)):e.createCommentVNode("",!0),l.value.length===0?e.renderSlot(n.$slots,"empty",{key:1,loading:i.value},()=>[e.createVNode(e.unref(c.Empty),{image:e.unref(w)},null,8,["image"])]):(e.openBlock(),e.createElementBlock("div",{key:2,ref_key:"contentRef",ref:g,style:e.normalizeStyle(n.contentStyle),class:e.normalizeClass(e.unref(f)("content"))},[n.virtual?(e.openBlock(),e.createElementBlock(e.Fragment,{key:0},[e.unref(d.isNumber)(n.virtual)?(e.openBlock(),e.createBlock(e.unref(p.RecycleScroller),{key:0,class:e.normalizeClass(e.unref(u)("scroll-wrapper")),items:l.value,"item-size":n.virtual,"key-field":a.rowKey||"id"},{default:e.withCtx(({item:r,index:o})=>[e.renderSlot(n.$slots,"renderItem",{item:r,index:o})]),_:3},8,["class","items","item-size","key-field"])):(e.openBlock(),e.createBlock(e.unref(p.DynamicScroller),{key:1,items:l.value,"min-item-size":n.virtual.minItemSize,class:e.normalizeClass(e.unref(u)("scroll-wrapper"))},{default:e.withCtx(({item:r,index:o,active:$})=>{var B,b;return[e.createVNode(e.unref(p.DynamicScrollerItem),{item:r,active:$,"data-index":o,"size-dependencies":(b=(B=n.virtual).sizeDependencies)==null?void 0:b.call(B,r)},{default:e.withCtx(()=>[e.renderSlot(n.$slots,"renderItem",{item:r,index:o})]),_:2},1032,["item","active","data-index","size-dependencies"])]}),_:3},8,["items","min-item-size","class"]))],64)):e.renderSlot(n.$slots,"renderContent",{key:1,dataSource:l.value},()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(l.value,(r,o)=>e.renderSlot(n.$slots,"renderItem",{item:r,index:o})),256))])],6))],2),F.value?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(e.unref(f)("footer")),style:e.normalizeStyle(n.footerWarpperStyle)},[e.createVNode(e.unref(c.Pagination),e.mergeProps(s.value?e.unref(k):e.unref(d.omit)(e.unref(h).pagination,["showTotal"]),{onChange:T}),null,16)],6)):e.createCommentVNode("",!0)],6))}});exports.default=U;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),c=require("@aplus-frontend/antdv"),U=require("../ap-table/hooks/use-table-paging-ng.js");require("../config-provider/index.js");const d=require("lodash-unified"),K=require("./hooks/use-offline-list.js");require("vue-virtual-scroller/dist/vue-virtual-scroller.css");const g=require("vue-virtual-scroller"),W=require("../config-provider/hooks/use-namespace.js"),G=e.defineComponent({name:"ApList",__name:"index",props:{dataSource:{},loading:{type:Boolean,default:void 0},onItem:{},params:{},request:{},defaultData:{},onLoadingChange:{},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},manual:{type:Boolean},containerStyle:{type:[Boolean,null,String,Object,Array]},contentStyle:{type:[Boolean,null,String,Object,Array]},footerWarpperStyle:{type:[Boolean,null,String,Object,Array]},virtual:{default:void 0},rowKey:{},adaptive:{type:Boolean,default:!1}},setup(C,{expose:z}){const w=c.Empty.PRESENTED_IMAGE_SIMPLE,r=C,{b:u,e:f,bm:E,m:P}=W.useNamespace("ap-list"),S=e.ref(),{formRef:m,submit:y,reset:v,handleTableChange:V,data:p,refresh:q,refreshByDelete:D,tableProps:h,getPaging:N,setPaging:F}=U.useTablePaging({async request(t){var a;const n=await((a=r.request)==null?void 0:a.call(r,t));return{data:(n==null?void 0:n.data)||[],total:(n==null?void 0:n.total)||0}},params:e.toRef(r,"params"),defaultData:r.defaultData,manual:r.manual,pagination:r.pagination,formatParams:r.beforeSearchSubmit}),I={form:m},{pagination:k,dataSource:O,onChange:L}=K.useOfflineList(r);function T(t,n){if(e.unref(s)){L(t,n);return}V({current:t,pageSize:n},{},{},{currentDataSource:[],action:"paginate"})}const l=e.computed(()=>e.unref(s)?e.unref(O):e.unref(p).records),i=e.computed(()=>d.isUndefined(r.loading)?e.unref(p).loading:r.loading),R=e.computed(()=>{var t,n;return r.pagination===!1||r.virtual?!1:((t=r.pagination)==null?void 0:t.hideOnSinglePage)!==!0?!0:e.unref(s)?(((n=r.dataSource)==null?void 0:n.length)||0)>e.unref(k).pageSize:e.unref(p).total>e.unref(h).pagination.pageSize}),s=e.computed(()=>!d.isUndefined(r.dataSource));e.watch(()=>e.unref(i),t=>{var n;(n=r.onLoadingChange)==null||n.call(r,t)});function $(t){var n,a;(a=(n=S.value)==null?void 0:n.querySelector(t||":first-child"))==null||a.scrollIntoView({behavior:"smooth",block:"center"})}function j(t=!1){var o;const n=(o=m.value)==null?void 0:o.apForm,a=t?n==null?void 0:n.getFieldsValueTransformed:n==null?void 0:n.getFieldsValue;return(a==null?void 0:a())||{}}function A(t){var n,a,o;(o=(a=(n=m.value)==null?void 0:n.apForm)==null?void 0:a.setFieldsValue)==null||o.call(a,t)}return z({submit:()=>y(),reset:()=>v(),refresh:()=>q(),refreshByDelete:t=>D(t),scrollToFirstRow:$,getSearchFormValuesIfSetted:j,setPaging:F,getPaging:N,setSearchFormValuesIfSetted:A}),(t,n)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass([e.unref(u)(),{[e.unref(P)("adaptive")]:t.adaptive}]),style:e.normalizeStyle(t.containerStyle)},[e.renderSlot(t.$slots,"header",{formIns:I,submit:e.unref(y),reset:e.unref(v)}),e.createElementVNode("div",{class:e.normalizeClass([e.unref(u)("content-container"),{[e.unref(E)("content-container","spinning")]:i.value}])},[i.value?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(e.unref(f)("spin-wrapper"))},[e.createVNode(e.unref(c.Spin),{spinning:i.value},null,8,["spinning"])],2)):e.createCommentVNode("",!0),l.value.length===0?e.renderSlot(t.$slots,"empty",{key:1,loading:i.value},()=>[e.createVNode(e.unref(c.Empty),{image:e.unref(w)},null,8,["image"])]):(e.openBlock(),e.createElementBlock("div",{key:2,ref_key:"contentRef",ref:S,style:e.normalizeStyle(t.contentStyle),class:e.normalizeClass(e.unref(f)("content"))},[t.virtual?(e.openBlock(),e.createElementBlock(e.Fragment,{key:0},[e.unref(d.isNumber)(t.virtual)?(e.openBlock(),e.createBlock(e.unref(g.RecycleScroller),{key:0,class:e.normalizeClass(e.unref(u)("scroll-wrapper")),items:l.value,"item-size":t.virtual,"key-field":r.rowKey||"id"},{default:e.withCtx(({item:a,index:o})=>[e.renderSlot(t.$slots,"renderItem",{item:a,index:o})]),_:3},8,["class","items","item-size","key-field"])):(e.openBlock(),e.createBlock(e.unref(g.DynamicScroller),{key:1,items:l.value,"min-item-size":t.virtual.minItemSize,class:e.normalizeClass(e.unref(u)("scroll-wrapper"))},{default:e.withCtx(({item:a,index:o,active:M})=>{var B,b;return[e.createVNode(e.unref(g.DynamicScrollerItem),{item:a,active:M,"data-index":o,"size-dependencies":(b=(B=t.virtual).sizeDependencies)==null?void 0:b.call(B,a)},{default:e.withCtx(()=>[e.renderSlot(t.$slots,"renderItem",{item:a,index:o})]),_:2},1032,["item","active","data-index","size-dependencies"])]}),_:3},8,["items","min-item-size","class"]))],64)):e.renderSlot(t.$slots,"renderContent",{key:1,dataSource:l.value},()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(l.value,(a,o)=>e.renderSlot(t.$slots,"renderItem",{item:a,index:o})),256))])],6))],2),R.value?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(e.unref(f)("footer")),style:e.normalizeStyle(t.footerWarpperStyle)},[e.createVNode(e.unref(c.Pagination),e.mergeProps(s.value?e.unref(k):e.unref(d.omit)(e.unref(h).pagination,["showTotal"]),{onChange:T}),null,16)],6)):e.createCommentVNode("",!0)],6))}});exports.default=G;

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

@@ -1,6 +1,7 @@
-import { Ref, StyleValue } from 'vue';
+import { StyleValue } from 'vue';
 import { RequestData } from '../ap-table';
 import { Recordable } from '../type';
+import { InternalPagingType } from '../ap-table/hooks/use-table-paging-ng';
 export type ApListProps<RecordType = any, ParamsType = Recordable> = {
     /**
      * 列表数据源，传入后`request`和`defaultData`都将失效
@@ -16,9 +17,10 @@ export type ApListProps<RecordType = any, ParamsType = Recordable> = {
      */
     onItem?: (record: RecordType, index: number) => void;
     /**
-     * 依赖的额外的参数，传入响应式参数会在变更后重新执行
+     * 依赖的额外的参数
+     * 变更后会重新发起网络请求
      */
-    params?: ParamsType | Ref<ParamsType>;
+    params?: ParamsType;
     /**
      * 请求数据
      * @param params
@@ -126,4 +128,23 @@ export type ApListExpose = {
      * @returns
      */
     getSearchFormValuesIfSetted: (transform?: boolean) => Recordable;
+    /**
+     * 设置查询表单的值
+     * @description 只有在自定义查询表单并且绑定了formRef才能设置查询表单的值
+     * @param fields 将要设置的值
+     * @returns
+     */
+    setSearchFormValuesIfSetted: (fields: any) => void;
+    /**
+     * 获取分页参数
+     * @returns
+     */
+    getPaging: () => InternalPagingType;
+    /**
+     * 设置表格分页参数
+     * @param nextPaging 新的分页参数
+     * @param refreshImmediately 是否立刻刷新数据，默认为`true`
+     * @returns
+     */
+    setPaging: (nextPaging: InternalPagingType, refreshImmediately?: boolean) => void;
 };

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

@@ -134,9 +134,10 @@ export type CreateModalStreamProps<ModalType extends ModalStreamTypeKey = ModalS
     /**
      * 弹框属性
      * @param params 上一步弹框传递的参数
+     * @param next 下一步
      * @returns
      */
-    props: (params: any) => Promise<ModalStreamType[ModalType]>;
+    props: (params: any, next: ModalStreamNextFunc<ModalType>) => Promise<ModalStreamType[ModalType]>;
 } : never;
 export type CreateModalStreamFunc<ModalType extends ModalStreamTypeKey = ModalStreamTypeKey> = (streamList: CreateModalStreamProps<ModalType>[], firstModalId?: string) => void;
 export type ApModalType = keyof Omit<ModalStaticFunctions, 'warn'>;

package/lib/src/ap-modal/utils/createModalStream.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const b=require("@aplus-frontend/utils"),z=require("./createModal.js"),P=require("@aplus-frontend/antdv"),m=require("../enums/modalMessage.js"),j=(N,M)=>{var k;const I=M??(Array.isArray(N)?(k=N[0])==null?void 0:k.modalId:void 0),w=new Map;let y,S,l=1e3;const C=async({modalId:i,params:f,handleCurrentModal:t})=>{y=f;const d=N.find(s=>s.modalId===i);let n=!1;if(S){const s=w.get(S),o={...s,destroy:()=>{var a;(a=s==null?void 0:s.destroy)==null||a.call(s),w.delete(S)},open:()=>{n=!0}};await(t==null?void 0:t(o))}return d&&setTimeout(()=>{T(d)}),n},g=()=>{var i;for(const[f,t]of w)(i=t==null?void 0:t.destroy)==null||i.call(t)},T=async i=>{var q,D,_,A;const{modalId:f,modalType:t="createModal",props:d}=i;S=f;const n=w.get(f),s=await(d==null?void 0:d(y));l=Math.max((s==null?void 0:s.zIndex)??0,l),l+=1;let o,a=!1;if(t==="createModal"){const e=s,u=async r=>(a=!0,await C(r));o={...e,destroyOnClose:!1,zIndex:l,onOk:async r=>{var E;const c=await((E=e==null?void 0:e.onOk)==null?void 0:E.call(e,r,u));if(a||g(),c)throw new Error(m.ModalMessage.NOT_NEED_CLOSE)},onCancel:async r=>{var E;const c=await((E=e==null?void 0:e.onCancel)==null?void 0:E.call(e,r,u));if(a||g(),c)throw new Error(m.ModalMessage.NOT_NEED_CLOSE)}}}else{const e=s,u=async r=>(a=!0,await C(r));o={...e,zIndex:l,onOk:async()=>{var c;const r=await((c=e==null?void 0:e.onOk)==null?void 0:c.call(e,u));if(a||g(),r)throw new Error(m.ModalMessage.NOT_NEED_CLOSE)},onCancel:async()=>{var c;const r=await((c=e==null?void 0:e.onCancel)==null?void 0:c.call(e,u));if(a||g(),r)throw new Error(m.ModalMessage.NOT_NEED_CLOSE)}}}if(n){n==null||n.update(o),(q=n==null?void 0:n.open)==null||q.call(n);return}else if(t==="createModal"){const e=z.createModal(o);(D=e==null?void 0:e.open)==null||D.call(e),w.set(f,e)}else(A=(_=P.Modal)==null?void 0:_[t])==null||A.call(_,o)},O=N.find(i=>b.isValid(I)&&i.modalId===I);O!==void 0&&T(O)};exports.createModalStream=j;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const b=require("@aplus-frontend/utils"),z=require("./createModal.js"),P=require("@aplus-frontend/antdv"),m=require("../enums/modalMessage.js"),j=(N,M)=>{var k;const I=M??(Array.isArray(N)?(k=N[0])==null?void 0:k.modalId:void 0),u=new Map;let C,S,w=1e3;const y=async({modalId:i,params:f,handleCurrentModal:t})=>{C=f;const d=N.find(s=>s.modalId===i);let n=!1;if(S){const s=u.get(S),o={...s,destroy:()=>{var a;(a=s==null?void 0:s.destroy)==null||a.call(s),u.delete(S)},open:()=>{n=!0}};await(t==null?void 0:t(o))}return d&&setTimeout(()=>{T(d)}),n},g=()=>{var i;for(const[f,t]of u)(i=t==null?void 0:t.destroy)==null||i.call(t)},T=async i=>{var q,D,_,A;const{modalId:f,modalType:t="createModal",props:d}=i;S=f;const n=u.get(f),s=await(d==null?void 0:d(C,async e=>(a=!0,await y(e))));w=Math.max((s==null?void 0:s.zIndex)??0,w),w+=1;let o,a=!1;if(t==="createModal"){const e=s,l=async r=>(a=!0,await y(r));o={...e,destroyOnClose:!1,zIndex:w,onOk:async r=>{var E;const c=await((E=e==null?void 0:e.onOk)==null?void 0:E.call(e,r,l));if(a||g(),c)throw new Error(m.ModalMessage.NOT_NEED_CLOSE)},onCancel:async r=>{var E;const c=await((E=e==null?void 0:e.onCancel)==null?void 0:E.call(e,r,l));if(a||g(),c)throw new Error(m.ModalMessage.NOT_NEED_CLOSE)}}}else{const e=s,l=async r=>(a=!0,await y(r));o={...e,zIndex:w,onOk:async()=>{var c;const r=await((c=e==null?void 0:e.onOk)==null?void 0:c.call(e,l));if(a||g(),r)throw new Error(m.ModalMessage.NOT_NEED_CLOSE)},onCancel:async()=>{var c;const r=await((c=e==null?void 0:e.onCancel)==null?void 0:c.call(e,l));if(a||g(),r)throw new Error(m.ModalMessage.NOT_NEED_CLOSE)}}}if(n){n==null||n.update(o),(q=n==null?void 0:n.open)==null||q.call(n);return}else if(t==="createModal"){const e=z.createModal(o);(D=e==null?void 0:e.open)==null||D.call(e),u.set(f,e)}else(A=(_=P.Modal)==null?void 0:_[t])==null||A.call(_,o)},O=N.find(i=>b.isValid(I)&&i.modalId===I);O!==void 0&&T(O)};exports.createModalStream=j;

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

@@ -1,7 +1,7 @@
 import { ApColumnType, ApTableProps } from './interface';
 import { ColumnsType, ColumnType } from '@aplus-frontend/antdv/es/table';
 import { RowSelectionReturnType } from './hooks/use-table-row-selection';
-import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, ComputedRef, Ref, VNode } from 'vue';
+import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, ComputedRef, VNode } from 'vue';
 declare const _default: <RecordType>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{} & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>, never> & ApTableProps<RecordType> & Partial<{}>> & PublicProps;
     expose(exposed: ShallowUnwrapRef<{
@@ -10,6 +10,14 @@ declare const _default: <RecordType>(__VLS_props: NonNullable<Awaited<typeof __V
         refresh: () => void;
         setSearchFormValues: (fields: any) => void;
         getSearchFormValues: (transform?: boolean) => Partial<any> | undefined;
+        setPaging: (nextPaging: Partial<{
+            current: number;
+            pageSize: number;
+        }>, refreshImmediately?: boolean) => void;
+        getPaging: () => {
+            current?: number | undefined;
+            pageSize?: number | undefined;
+        };
         getShownColumns: () => ColumnsType<RecordType>;
         dataSource: ComputedRef<RecordType[]>;
         rowSelection: {
@@ -26,7 +34,7 @@ declare const _default: <RecordType>(__VLS_props: NonNullable<Awaited<typeof __V
         };
         scrollBar: {
             x: {
-                getCurrentScroll: () => 0 | Ref<number, number>;
+                getCurrentScroll: () => number;
                 scroll: (percent: number) => void | undefined;
             };
             y: undefined;

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

package/lib/src/ap-table/components/setting/modal/index.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),l=require("@aplus-frontend/antdv"),D=require("../../../../utils/slot.js"),E=require("../../../context.js");require("../tree-select/index.vue.js");const A=require("../../../hooks/use-table-column-state.js");require("../../../../config-provider/index.js");require("../sorter/index.vue.js");const f=require("../utils.js"),R=require("@ant-design/icons-vue"),O=require("../../../../config-provider/hooks/use-locale.js"),N=require("../../../../config-provider/hooks/use-namespace.js"),I=require("../tree-select/index.vue2.js"),M=require("../sorter/index.vue2.js"),U={style:{lineHeight:"22px",color:"#8896B0"}},j=e.defineComponent({__name:"index",props:{config:{default:()=>({})}},setup(C){const s=C,{columnsBackup:S,size:V,updateSize:i,updateColumns:c}=E.useInjectApTable(),d=e.ref(e.unref(V)),_=e.computed(()=>s.config.persistenceKey),{columnState:a,setColumnState:x,isAllSelected:b,toggleSelectAll:y,columnStateBackup:k,setColumnStateBackup:h,cacheColumnStateIfNeeded:q}=A.useTableColumnState(s.config,_,[]),{t:o}=O.useLocale(),{b:p,be:m}=N.useNamespace("ap-column-setting"),{b:T}=N.useNamespace("ap-table"),r=e.ref(!1),B=e.useSlots(),g=D.getSingleVNode(B.trigger)||e.createVNode(l.Button,{icon:e.createVNode(R.SettingOutlined,null,null),class:T("setting-trigger-button")},null),v=g?e.cloneVNode(g,{onClick:()=>{r.value=!0}}):null;function z(){x(f.customCloneColumnStates(e.unref(k)))}function w(){var t,n;c==null||c(f.default(e.unref(S),e.unref(a))),i==null||i(e.unref(d)),r.value=!1;const u=f.customCloneColumnStates(a.value);h(u),q(u),(n=(t=s.config)==null?void 0:t.onChange)==null||n.call(t,u)}return(u,t)=>(e.openBlock(),e.createElementBlock(e.Fragment,null,[e.unref(v)?(e.openBlock(),e.createBlock(e.resolveDynamicComponent(e.unref(v)),{key:0})):e.createCommentVNode("",!0),e.createVNode(e.unref(l.Modal),{open:r.value,"onUpdate:open":t[2]||(t[2]=n=>r.value=n),title:e.unref(o)("ap.apTable.setting.title"),width:900,centered:!0,"body-style":{padding:"0px !important",height:"450px"},onOk:w},{default:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass(e.unref(p)("wrapper"))},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(p)("left"))},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(m)("left","header"))},[e.createElementVNode("div",null,[e.createElementVNode("span",U,e.toDisplayString(e.unref(o)("ap.apTable.setting.selectAllTip")),1),e.createVNode(e.unref(l.Button),{type:"link",size:"small",onClick:e.unref(y)},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(b)?e.unref(o)("ap.apTable.setting.unSelectAll"):e.unref(o)("ap.apTable.setting.selectAll")),1)]),_:1},8,["onClick"])]),e.createVNode(e.unref(l.RadioGroup),{value:d.value,"onUpdate:value":t[0]||(t[0]=n=>d.value=n)},{default:e.withCtx(()=>[e.createVNode(e.unref(l.RadioButton),{value:"small"},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(o)("ap.apTable.setting.sizeSmall")),1)]),_:1}),e.createVNode(e.unref(l.RadioButton),{value:"middle"},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(o)("ap.apTable.setting.sizeNormal")),1)]),_:1})]),_:1},8,["value"])],2),e.createVNode(e.unref(l.Divider),{dashed:"",style:{margin:"0px"}}),e.createVNode(I.default,{class:e.normalizeClass(e.unref(m)("left","content")),value:e.unref(a)},null,8,["class","value"])],2),e.createVNode(e.unref(l.Divider),{type:"vertical",style:{height:"100%",margin:"0px"}}),e.createElementVNode("div",{class:e.normalizeClass(e.unref(p)("right"))},[e.createVNode(M.default,{value:e.unref(a),"onUpdate:value":t[1]||(t[1]=n=>e.isRef(a)?a.value=n:null),onReset:z},null,8,["value"])],2)],2)]),_:1},8,["open","title"])],64))}});exports.default=j;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),l=require("@aplus-frontend/antdv"),A=require("../../../../utils/slot.js"),D=require("../../../context.js");require("../tree-select/index.vue.js");const E=require("../../../hooks/use-table-column-state.js");require("../../../../config-provider/index.js");require("../sorter/index.vue.js");const m=require("../utils.js"),R=require("@ant-design/icons-vue"),O=require("../../../../config-provider/hooks/use-locale.js"),N=require("../../../../config-provider/hooks/use-namespace.js"),I=require("../tree-select/index.vue2.js"),M=require("../sorter/index.vue2.js"),U=e.defineComponent({name:"ApTableSetting",__name:"index",props:{config:{default:()=>({})}},setup(C){const s=C,{columnsBackup:S,size:V,updateSize:i,updateColumns:c}=D.useInjectApTable(),d=e.ref(e.unref(V)),_=e.computed(()=>s.config.persistenceKey),{columnState:a,setColumnState:b,isAllSelected:x,toggleSelectAll:y,columnStateBackup:k,setColumnStateBackup:T,cacheColumnStateIfNeeded:q}=E.useTableColumnState(s.config,_,[]),{t:o}=O.useLocale(),{b:p,be:f}=N.useNamespace("ap-column-setting"),{b:h}=N.useNamespace("ap-table"),r=e.ref(!1),B=e.useSlots(),g=A.getSingleVNode(B.trigger)||e.createVNode(l.Button,{icon:e.createVNode(R.SettingOutlined,null,null),class:h("setting-trigger-button")},null),v=g?e.cloneVNode(g,{onClick:()=>{r.value=!0}}):null;function z(){b(m.customCloneColumnStates(e.unref(k)))}function w(){var t,n;c==null||c(m.default(e.unref(S),e.unref(a))),i==null||i(e.unref(d)),r.value=!1;const u=m.customCloneColumnStates(a.value);T(u),q(u),(n=(t=s.config)==null?void 0:t.onChange)==null||n.call(t,u)}return(u,t)=>(e.openBlock(),e.createElementBlock(e.Fragment,null,[e.unref(v)?(e.openBlock(),e.createBlock(e.resolveDynamicComponent(e.unref(v)),{key:0})):e.createCommentVNode("",!0),e.createVNode(e.unref(l.Modal),{open:r.value,"onUpdate:open":t[2]||(t[2]=n=>r.value=n),title:e.unref(o)("ap.apTable.setting.title"),width:900,centered:!0,"body-style":{padding:"0px !important",height:"450px"},onOk:w},{default:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass(e.unref(p)("wrapper"))},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(p)("left"))},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(f)("left","header"))},[e.createElementVNode("div",null,[e.createElementVNode("span",{class:e.normalizeClass(e.unref(f)("left","header-tips"))},e.toDisplayString(e.unref(o)("ap.apTable.setting.selectAllTip")),3),e.createVNode(e.unref(l.Button),{type:"link",size:"small",onClick:e.unref(y)},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(x)?e.unref(o)("ap.apTable.setting.unSelectAll"):e.unref(o)("ap.apTable.setting.selectAll")),1)]),_:1},8,["onClick"])]),e.createVNode(e.unref(l.RadioGroup),{value:d.value,"onUpdate:value":t[0]||(t[0]=n=>d.value=n)},{default:e.withCtx(()=>[e.createVNode(e.unref(l.RadioButton),{value:"small"},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(o)("ap.apTable.setting.sizeSmall")),1)]),_:1}),e.createVNode(e.unref(l.RadioButton),{value:"middle"},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(o)("ap.apTable.setting.sizeNormal")),1)]),_:1})]),_:1},8,["value"])],2),e.createVNode(e.unref(l.Divider),{dashed:"",style:{margin:"0px"}}),e.createVNode(I.default,{class:e.normalizeClass(e.unref(f)("left","content")),value:e.unref(a)},null,8,["class","value"])],2),e.createVNode(e.unref(l.Divider),{type:"vertical",style:{height:"100%",margin:"0px"}}),e.createElementVNode("div",{class:e.normalizeClass(e.unref(p)("right"))},[e.createVNode(M.default,{value:e.unref(a),"onUpdate:value":t[1]||(t[1]=n=>e.isRef(a)?a.value=n:null),onReset:z},null,8,["value"])],2)],2)]),_:1},8,["open","title"])],64))}});exports.default=U;

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

@@ -1,6 +1,6 @@
 import { ApFieldPassword } from '../ap-field';
 import { ApTableValueFields } from './interface';
-import { CreateComponentPublicInstanceWithMixins, ComponentOptionsMixin, PublicProps, GlobalComponents, GlobalDirectives, ComponentProvideOptions, ComponentOptionsBase, VNodeProps, AllowedComponentProps, ComponentCustomProps, ComponentInternalInstance, ExtractPropTypes, PropType, Slot, ComponentPublicInstance, DebuggerEvent, nextTick, WatchOptions, WatchStopHandle, ShallowUnwrapRef, ComponentCustomProperties, CSSProperties, ComputedRef, VNode, RendererNode, RendererElement, DefineComponent } from 'vue';
+import { CreateComponentPublicInstanceWithMixins, ComponentOptionsMixin, PublicProps, GlobalComponents, GlobalDirectives, ComponentProvideOptions, ComponentOptionsBase, VNodeProps, AllowedComponentProps, ComponentCustomProps, ComponentInternalInstance, ExtractPropTypes, PropType, Slot, ComponentPublicInstance, DebuggerEvent, nextTick, WatchOptions, WatchStopHandle, ShallowUnwrapRef, ComponentCustomProperties, CSSProperties, VNode, RendererNode, RendererElement, DefineComponent } from 'vue';
 import { ApFormItemDateProps, ApFormItemDateRangeProps, ApFormItemNumberProps, ApFormItemRadioProps, ApFormItemSelectProps, ApFormItemSwitchProps, ApFormItemTextProps, ApFormItemTextAreaProps, ApFormItemCheckboxProps, ApFormItemTextPasswordProps, ApFormItemTreeSelectProps } from '../ap-form/items/interface';
 import { ApFieldDateProps, ApFormItemSlots, ApFieldDateRangeProps, ApFieldNumberProps, FieldMode, ApFieldRadioProps, ApFieldSelectProps, ApFieldSwitchProps, ApFieldTextProps, ApFormItemTextPassword, ApFieldTextAreaProps, ApFieldCheckboxProps, ApFieldTextPasswordProps, ApFieldTreeSelectProps, ApActionGroupProps, GroupActionTypes } from '..';
 import { ButtonSize, SizeType } from '@aplus-frontend/antdv/es/button';
@@ -847,13 +847,13 @@ export declare const apTableFormItemMap: {
         field: Omit< ApFieldRadioProps, "value" | "onUpdate:value">;
     }, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & (new () => {
         $slots: Readonly<{
-            label: any;
-            help: any;
-            extra: any;
+            label?: any;
+            help?: any;
+            extra?: any;
         }> & {
-            label: any;
-            help: any;
-            extra: any;
+            label?: any;
+            help?: any;
+            extra?: any;
         };
     });
     select: {
@@ -1827,7 +1827,7 @@ export declare const apTableFormItemMap: {
             }>, {
                 focus: (options?: InputFocusOptions) => void;
                 blur: () => void;
-                resizableTextArea: ComputedRef<any>;
+                resizableTextArea: any;
             }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
                 "update:value": (...args: any[]) => void;
             }, PublicProps, {
@@ -2109,7 +2109,7 @@ export declare const apTableFormItemMap: {
             }>, {
                 focus: (options?: InputFocusOptions) => void;
                 blur: () => void;
-                resizableTextArea: ComputedRef<any>;
+                resizableTextArea: any;
             }, {}, {}, {}, {
                 type: "number" | "reset" | "submit" | "button" | "search" | "time" | "month" | "date" | "week" | "hidden" | "checkbox" | "radio" | "color" | "text" | "range" | "tel" | "url" | "email" | "image" | "datetime-local" | "file" | "password";
                 mode: FieldMode;
@@ -2156,13 +2156,13 @@ export declare const apTableFormItemMap: {
         field: Omit< ApFieldTextAreaProps, "value" | "onUpdate:value">;
     }, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & (new () => {
         $slots: Readonly<{
-            label: any;
-            help: any;
-            extra: any;
+            label?: any;
+            help?: any;
+            extra?: any;
         }> & {
-            label: any;
-            help: any;
-            extra: any;
+            label?: any;
+            help?: any;
+            extra?: any;
         };
     });
     checkbox: {
@@ -2203,13 +2203,13 @@ export declare const apTableFormItemMap: {
         field: Omit< ApFieldCheckboxProps, "value" | "onUpdate:value">;
     }, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & (new () => {
         $slots: Readonly<{
-            label: any;
-            help: any;
-            extra: any;
+            label?: any;
+            help?: any;
+            extra?: any;
         }> & {
-            label: any;
-            help: any;
-            extra: any;
+            label?: any;
+            help?: any;
+            extra?: any;
         };
     });
     password: {
@@ -4708,7 +4708,7 @@ export declare const apTableRenderItemMap: {
     textArea: DefineComponent<ApFieldTextAreaProps, {
         focus: (options?: InputFocusOptions) => void;
         blur: () => void;
-        resizableTextArea: ComputedRef<any>;
+        resizableTextArea: any;
     }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
         "update:value": (...args: any[]) => void;
     }, string, PublicProps, Readonly< ApFieldTextAreaProps> & Readonly<{

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

@@ -15,10 +15,10 @@ export type UseTablePagingParams<DataType, ParamsType> = {
      */
     manual?: boolean;
     /**
-     * 额外的默认请求参数
+     * 额外的请求参数
      * @description 如果传入响应式数据，将会在数据改变后重新请求
      */
-    defaultParams?: ParamsType | Ref<ParamsType>;
+    params?: ParamsType | Ref<ParamsType>;
     /**
      * 默认的数据源（只生效一次）
      */
@@ -53,7 +53,21 @@ export type UseTablePagingParams<DataType, ParamsType> = {
      * 样式命名空间
      */
     namespace?: 'ap-table' | 'ap-grid';
+    /**
+     * 当点击重置时的回调
+     * @returns
+     */
+    onClickReset?: () => void;
+    /**
+     * 当请求结束后触发的事件
+     * @returns
+     */
+    onAfterRequest?: () => void;
 };
+export type InternalPagingType = Partial<{
+    current: number;
+    pageSize: number;
+}>;
 type InternalDataType<DataType = Recordable> = {
     total: number;
     records: DataType[];
@@ -61,16 +75,16 @@ type InternalDataType<DataType = Recordable> = {
 };
 export declare const DEFAULT_CURRENT = 1;
 export declare const DEFAULT_PAGE_SIZE = 20;
-export declare const useTablePaging: <DataType = any, ParamsType = Record<string, any>>({ manual, request, defaultParams, defaultData, formatParams, paramsValueTypeMap, resetFieldsIgnores, filterFields, sortFields, namespace, pagination }: UseTablePagingParams<DataType, ParamsType>) => {
+export type OptionalOnTableChange<T extends (...args: any[]) => any> = (...args: Partial<Parameters<T>>) => ReturnType<T>;
+export declare const useTablePaging: <DataType = any, ParamsType = Record<string, any>>({ manual, request, params, defaultData, formatParams, paramsValueTypeMap, resetFieldsIgnores, filterFields, sortFields, namespace, pagination, onClickReset, onAfterRequest }: UseTablePagingParams<DataType, ParamsType>) => {
     formRef: Ref<ApFormSearchFormExpose | undefined, ApFormSearchFormExpose | undefined>;
     submit: () => void;
     reset: () => void;
     refresh: () => void;
     refreshByDelete: (n: number) => void;
     data: InternalDataType<DataType>;
-    current: number | undefined;
-    pageSize: number | undefined;
     handleTableChange: (pagination: TablePaginationConfig, filters: Record<string, FilterValue | null>, sorter: SorterResult<any> | SorterResult<any>[], extra: TableCurrentDataSource<any>) => void;
+    handleTableChangeOptional: OptionalOnTableChange<(pagination: TablePaginationConfig, filters: Record<string, FilterValue | null>, sorter: SorterResult<any> | SorterResult<any>[], extra: TableCurrentDataSource<any>) => void>;
     tableProps: ComputedRef<{
         loading: boolean;
         pagination: {
@@ -92,5 +106,10 @@ export declare const useTablePaging: <DataType = any, ParamsType = Record<string
     getColumnSFConfig: (column: ApColumnType, append?: boolean) => Recordable;
     sortedInfo: Ref<any, any>;
     filteredInfo: Ref<any, any>;
+    getPaging: () => {
+        current?: number | undefined;
+        pageSize?: number | undefined;
+    };
+    setPaging: (nextPaging: InternalPagingType, refreshImmediately?: boolean) => void;
 };
 export {};

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

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

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

@@ -3,12 +3,13 @@ import { CompareFn, SortOrder, TableRowSelection } from '@aplus-frontend/antdv/e
 import { ApFormItemProps, ApFormSearchFormProps } from '../ap-form';
 import { ApFormItemCheckboxProps, ApFormItemDateProps, ApFormItemDateRangeProps, ApFormItemNumberProps, ApFormItemRadioProps, ApFormItemSelectProps, ApFormItemSwitchProps, ApFormItemTextAreaProps, ApFormItemTextPasswordProps, ApFormItemTextProps, ApFormItemTreeSelectProps } from '../ap-form/items/interface';
 import { Recordable } from '../type';
-import { ComputedRef, CSSProperties, Ref, VNode } from 'vue';
+import { ComputedRef, CSSProperties, VNode } from 'vue';
 import { ApActionGroupProps } from '../ap-action';
 import { ApTableIndexProps } from './components/interface';
 import { EllipsisConfig } from '@aplus-frontend/antdv/es/typography/Base';
 import { RowSelectionReturnType } from './hooks/use-table-row-selection';
 import { PaginationProps } from '@aplus-frontend/antdv';
+import { InternalPagingType } from './hooks/use-table-paging-ng';
 export type ValueEnumType = {
     text: string;
     /**
@@ -259,9 +260,9 @@ export type ApTableProps<RecordType = any, ParamsType = any> = Omit<TableProps<R
     card?: boolean;
     /**
      * request额外请求的参数
-     * 如果传入响应式数据，将会在变更后重新执行
+     * 数据变化后将会重新执行网络请求
      */
-    params?: ParamsType | Ref<ParamsType>;
+    params?: ParamsType;
     /**
      * 自定义渲染搜索表单
      * @deprecated 未实现 暂不可用
@@ -371,7 +372,7 @@ export type ApTableExpose<SearchParamsType = Recordable, RecordType = any> = {
     /**
      * 表格数据源
      */
-    dataSource: ComputedRef<RecordType>;
+    dataSource: RecordType;
     /**
      * 行选中相关的数据和API
      */
@@ -393,6 +394,18 @@ export type ApTableExpose<SearchParamsType = Recordable, RecordType = any> = {
         };
         y: undefined;
     };
+    /**
+     * 获取分页参数
+     * @returns
+     */
+    getPaging: () => InternalPagingType;
+    /**
+     * 设置表格分页参数
+     * @param nextPaging 新的分页参数
+     * @param refreshImmediately 是否立刻刷新数据，默认为`true`
+     * @returns
+     */
+    setPaging: (nextPaging: InternalPagingType, refreshImmediately?: boolean) => void;
 };
 export type ApTableContextRenderConfig = {
     color: string;