@aplus-frontend/ui 6.13.4 → 6.15.0

package/lib/src/ap-grid/hooks/use-row-selection.d.ts

@@ -1,7 +1,8 @@
 import { TableRowSelection } from '@aplus-frontend/antdv/lib/table/interface';
 import { ComputedRef, Ref } from 'vue';
-import { ApTableProps, ApTableRowSelection } from '../../ap-table';
+import { ApTableProps } from '../../ap-table';
 import { Recordable } from '../../type';
+import { ApGridRowSelection } from '../interface';
 export interface RowSelectionReturnType<RecordType = any> {
     rowSelection: ComputedRef<TableRowSelection<RecordType>>;
     selectedRows: Ref<Partial<RecordType>[]>;
@@ -58,12 +59,12 @@ export interface RowSelectionReturnType<RecordType = any> {
     unSelectMulti: (items: RecordType[]) => void;
     /**
      * VxeTable 表格checkbox-change事件
-     * @param item
      * @param select
-     * @param partRowData
+     * @param selectedRows
+     * @param reserveSelectedRows
      * @returns
      */
-    selectChange: (item: RecordType, select: boolean, partRowData: RecordType[]) => void;
+    selectChange: (select: boolean, selectedRows: RecordType[], reserveSelectedRows: RecordType[]) => void;
     /**
      * VxeTable 表格checkbox-all事件
      * @param item
@@ -86,7 +87,7 @@ export interface RowSelectionReturnType<RecordType = any> {
      */
     selectMultiByKeys: (keys: (string | number)[]) => void;
 }
-type RowSelectionParams<T> = Omit<ApTableRowSelection<T>, 'mode'> & {
+type RowSelectionParams<T> = ApGridRowSelection<T> & {
     /**
      * 数据源（如果是后端分页，则表示当页数据，否则是全量数据）
      */

package/lib/src/ap-grid/hooks/use-row-selection.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const u=require("vue"),r=require("lodash-unified");function b(o,c){return!(c!=null&&c.length)||r.isFunction(o)?[]:c.map(f=>({[o]:f}))}const D=o=>{o.defaultSelectedRowKeys;const c=u.ref(b(o.rowKey,o.defaultSelectedRowKeys));function f(e,t){c.value=t}const l=e=>r.isFunction(o.rowKey)?o.rowKey(e):e[o.rowKey],s=u.computed(()=>{const e=new Map;return u.unref(c).forEach(t=>{e.set(l(t),t)}),e});function v(e){return u.unref(s).has(l(e))}function M(e){const t=u.unref(s);t.set(l(e),e),c.value=[...t.values()]}function g(e){const t=u.unref(s);for(const n of e)t.set(l(n),n);c.value=[...t.values()]}function h(e){if(r.isFunction(o.rowKey))return;const t=u.unref(s);for(const n of e){const a=u.unref(o.dataSource).find(i=>l(i)===n),S={[o.rowKey]:n};t.set(String(n),a||S)}c.value=[...t.values()]}function w(e){const t=u.unref(s);t.delete(l(e)),c.value=[...t.values()]}function x(e){const t=u.unref(s);for(const n of e)t.delete(l(n));c.value=[...t.values()]}function d(e,t){const n=e;for(const a of t)n.set(l(a),a);return n}function y(e,t,n){const a=u.unref(s);t?a.set(l(e),e):a.delete(l(e)),d(a,n),c.value=[...a.values()]}function K(e,t){c.value=[...t]}function A(e,t){const n=r.cloneDeep(u.unref(s));u.unref(o.dataSource).forEach(a=>{e.find(i=>l(i)===l(a))?n.set(l(a),a):n.delete(l(a))}),d(n,t),c.value=[...n.values()]}function C(){const e=u.unref(s);u.unref(o.dataSource).forEach(t=>{e.set(l(t),t)}),c.value=[...e.values()]}function E(e){const t=u.unref(s),n=l(e);t.has(n)?t.delete(n):t.set(n,e),c.value=[...t.values()]}function R(){const e=u.unref(s);u.unref(o.dataSource).forEach(t=>{e.delete(l(t))}),c.value=[...e.values()]}function _(){c.value=[]}return{select:M,unSelect:w,isSelected:v,selectAll:C,unSelectAll:R,clearAll:_,toggleSelect:E,selectedRows:c,selectMulti:g,unSelectMulti:x,rowSelection:u.computed(()=>({...o,onChange:f,selectedRowKeys:u.unref(c).map(e=>l(e))})),selectChange:y,selectAllChange:K,selectRangeChange:A,selectMultiByKeys:h}};exports.default=D;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const c=require("vue"),d=require("lodash-unified");function _(o,u){return!(u!=null&&u.length)||d.isFunction(o)?[]:u.map(S=>({[o]:S}))}const q=o=>{const u=c.ref(_(o.rowKey,o.defaultSelectedRowKeys));function S(e,n){u.value=n}const a=e=>d.isFunction(o.rowKey)?o.rowKey(e):e[o.rowKey],s=c.computed(()=>{const e=new Map;return c.unref(u).forEach(n=>{e.set(a(n),n)}),e});function M(e){return c.unref(s).has(a(e))}function h(e){if(!r(e))return;const n=c.unref(s);n.set(a(e),e),u.value=[...n.values()]}function g(e){const n=c.unref(s);for(const t of e)r(t)&&n.set(a(t),t);u.value=[...n.values()]}function w(e){if(d.isFunction(o.rowKey))return;const n=c.unref(s);for(const t of e){const l=c.unref(o.dataSource).find(i=>a(i)===t),f={[o.rowKey]:t};r(l||f)&&n.set(t,l||f)}u.value=[...n.values()]}function x(e){if(!r(e))return;const n=c.unref(s);n.delete(a(e)),u.value=[...n.values()]}function y(e){const n=c.unref(s);for(const t of e)r(t)&&n.delete(a(t));u.value=[...n.values()]}function v(e,n){const t=e;for(const l of n)t.set(a(l),l);return t}function b(e,n,t){const l=c.unref(s);e?v(l,[...t,...n]):c.unref(o.dataSource).forEach(f=>{const i=a(f);n.some(R=>a(R)===i)?l.set(i,f):l.delete(i)}),u.value=[...l.values()]}function E(e,n){const t=d.cloneDeep(c.unref(s));e?v(t,n):c.unref(o.dataSource).forEach(l=>{r(l)&&t.delete(a(l))}),u.value=[...t.values()]}function r(e){const n=o.shown,t=o.disabled,l=n?n(e):!0,f=t?t(e):!1;return l&&!f}function K(e,n){const t=d.cloneDeep(c.unref(s));c.unref(o.dataSource).forEach(l=>{e.find(i=>a(i)===a(l))?t.set(a(l),l):t.delete(a(l))}),v(t,n),u.value=[...t.values()]}function D(){const e=c.unref(s);c.unref(o.dataSource).forEach(n=>{r(n)&&e.set(a(n),n)}),u.value=[...e.values()]}function A(e){if(!r(e))return;const n=c.unref(s),t=a(e);n.has(t)?n.delete(t):n.set(t,e),u.value=[...n.values()]}function C(){const e=c.unref(s);c.unref(o.dataSource).forEach(n=>{r(n)&&e.delete(a(n))}),u.value=[...e.values()]}function F(){u.value=[]}return{select:h,unSelect:x,isSelected:M,selectAll:D,unSelectAll:C,clearAll:F,toggleSelect:A,selectedRows:u,selectMulti:g,unSelectMulti:y,rowSelection:c.computed(()=>({...o,onChange:S,selectedRowKeys:c.unref(u).map(e=>a(e))})),selectChange:b,selectAllChange:E,selectRangeChange:K,selectMultiByKeys:w}};exports.default=q;

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

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

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

package/lib/src/ap-list/hooks/use-offline-list.d.ts

@@ -14,6 +14,9 @@ export declare const useOfflineList: <DataType = Recordable>(params: ApListProps
         total: number;
         showSizeChanger: boolean;
         showQuickJumper: boolean;
+        showLessItems: boolean | undefined;
+        size: "default" | "small";
+        pageSizeOptions: (string | number)[];
     }>;
     dataSource: ComputedRef<DataType[]>;
     onChange: (page: number, size: number) => void;

package/lib/src/ap-list/hooks/use-offline-list.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("vue"),c=n=>{const t=e.ref(n.pagination&&n.pagination.defaultCurrent||1),u=e.ref(n.pagination&&n.pagination.defaultPageSize||10);function i(r,a){t.value=r,u.value=a}const o=e.computed(()=>n.dataSource?n.pagination===!1?[...n.dataSource]:n.dataSource.slice((e.unref(t)-1)*e.unref(u),e.unref(t)*e.unref(u)):[]);return{pagination:e.computed(()=>{var r;return{current:e.unref(t),pageSize:e.unref(u),total:((r=n.dataSource)==null?void 0:r.length)||0,showSizeChanger:!0,showQuickJumper:!0}}),dataSource:o,onChange:i}};exports.useOfflineList=c;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("vue"),f=require("../../utils/index.js"),d=require("lodash-unified"),l=e=>{const i=n.ref(e.pagination&&e.pagination.defaultCurrent||1),u=n.ref(e.pagination&&e.pagination.defaultPageSize||10);function s(t,o){i.value=t,u.value=o}const g=n.computed(()=>e.dataSource?e.pagination===!1?[...e.dataSource]:e.dataSource.slice((n.unref(i)-1)*n.unref(u),n.unref(i)*n.unref(u)):[]);return{pagination:n.computed(()=>{var c;const{showLessItems:t,showSizeChanger:o,showQuickJumper:r,pageSizeOptions:a}=e.pagination||{};return{current:n.unref(i),pageSize:n.unref(u),total:((c=e.dataSource)==null?void 0:c.length)||0,showSizeChanger:f.isDef(o)?o:!t,showQuickJumper:f.isDef(r)?r:!t,showLessItems:t,size:"default",pageSizeOptions:d.isUndefined(a)?["10","20","50","100"]:a}}),dataSource:g,onChange:s}};exports.useOfflineList=l;

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

@@ -1,5 +1,5 @@
 import { StyleValue } from 'vue';
-import { RequestData } from '../ap-table';
+import { ApTablePaginationConfig, 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> = {
@@ -49,14 +49,12 @@ export type ApListProps<RecordType = any, ParamsType = Recordable> = {
     /**
      * 是否显示分页器（特定的分页器）或者指定默认的当前页和pageSize
      */
-    pagination?: false | {
-        defaultCurrent?: number;
-        defaultPageSize?: number;
+    pagination?: false | (Omit<ApTablePaginationConfig, 'showTotal'> & {
         /**
          * 只有一页时隐藏分页
          */
         hideOnSinglePage?: boolean;
-    };
+    });
     /**
      * 是否手动发起第一次网络请求
      */

package/lib/src/business/ap-export-group/ApExportGroup.vue.d.ts

@@ -1,7 +1,7 @@
 import { ApExportGroupProps } from './interface';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
 declare const _default: DefineComponent<ApExportGroupProps, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ApExportGroupProps> & Readonly<{}>, {
-    type: "button" | "dropdown";
+    type: "button" | "dropdown" | "group";
     exportField: boolean | {
         key?: string;
         convertField?: {

package/lib/src/business/ap-export-group/ApExportGroup.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),G=require("@ant-design/icons-vue"),i=require("@aplus-frontend/antdv");require("../../config-provider/index.js");const u=require("./interface.js"),L=require("@aplus-frontend/hooks"),F=require("./handleExportDownload.js"),M=require("../../ap-table/context.js"),N=require("./convertExportField.js");require("../../ap-button/index.js");const D=require("../../config-provider/hooks/use-namespace.js"),P=require("../../config-provider/hooks/use-locale.js"),V=require("../../config-provider/hooks/use-global-config.js"),E=require("../../ap-button/ap-button.vue.js"),I=e.defineComponent({__name:"ApExportGroup",props:{type:{default:"button"},selectedRowKeys:{},disabled:{type:Boolean},auth:{},ifShow:{},text:{},idKey:{},request:{},getRequestParams:{},getInitialParams:{},beforeRequest:{},successMessage:{type:[Boolean,String],default:!1},exportField:{type:[Boolean,Object],default:void 0}},setup(C){const{hasPermission:A}=L.usePermission(),t=C,{columns:s,dataSource:c}=M.useInjectApTable(),{b:_}=D.useNamespace("ap-export-group"),{t:l}=P.useLocale(),m=V.useGlobalConfig("exportField"),r=e.ref(!1),p=e.ref(!1),d=e.computed(()=>{var o;return!!(t!=null&&t.disabled)||(c!==void 0?!((o=c==null?void 0:c.value)!=null&&o.length):!1)||r.value});e.watch(()=>d.value,()=>{d.value&&(p.value=!1)},{immediate:!0});const q=e.computed(()=>(t==null?void 0:t.successMessage)===!0?l("ap.apExportGroup.exportSuccess"):t!=null&&t.successMessage?t.successMessage:""),x=e.computed(()=>{const o="exportFieldList",a=(t==null?void 0:t.exportField)??(m.value===""?!0:m.value)??!1;return a===!0?{key:o}:typeof a=="object"?{...a,key:a.key??o}:a}),B={textAlign:"center"},y=e.computed(()=>(t==null?void 0:t.selectedRowKeys)||[]),k=e.computed(()=>{let o=t==null?void 0:t.ifShow;return!(t!=null&&t.ifShow)&&(t!=null&&t.auth)&&(o=()=>A(t.auth)),(o==null?void 0:o())??!0});async function S(){y.value.length>0?v({key:u.ApExportGroupActionType.SELECT}):v({key:u.ApExportGroupActionType.ALL})}async function v({key:o}){var b,w,h;const{getRequestParams:a,request:n}=t||{};let g={};o===u.ApExportGroupActionType.SELECT?g={[(t==null?void 0:t.idKey)||"ids"]:y.value}:o===u.ApExportGroupActionType.ALL&&(g=(a==null?void 0:a())||{});const T=((b=t==null?void 0:t.getInitialParams)==null?void 0:b.call(t))||{};try{r.value=!0;let f=Object.assign({...g,...T},x.value&&(s!=null&&s.value)?{[x.value.key]:N.convertExportField(s.value,(w=x.value)==null?void 0:w.convertField)}:{});f=((h=t==null?void 0:t.beforeRequest)==null?void 0:h.call(t,f))||f,await F.handleExportDownload(async()=>await(n==null?void 0:n(f))),t!=null&&t.successMessage&&i.message.success(q.value)}finally{r.value=!1}}return(o,a)=>(e.openBlock(),e.createElementBlock(e.Fragment,null,[k.value&&t.type==="button"?(e.openBlock(),e.createBlock(e.unref(E.default),e.mergeProps({key:0},{...o.$attrs},{disabled:d.value,loading:r.value,"min-width":"",onClick:S}),{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString((t==null?void 0:t.text)??e.unref(l)("ap.apExportGroup.export")),1)]),_:1},16,["disabled","loading"])):e.createCommentVNode("",!0),k.value&&t.type==="dropdown"?(e.openBlock(),e.createBlock(e.unref(i.Dropdown),{key:1,open:p.value,"onUpdate:open":a[0]||(a[0]=n=>p.value=n),class:e.normalizeClass([e.unref(_)()]),"overlay-style":B,disabled:d.value},{overlay:e.withCtx(()=>[e.createVNode(e.unref(i.Menu),{onClick:v},{default:e.withCtx(()=>{var n;return[(e.openBlock(),e.createBlock(e.unref(i.MenuItem),{key:e.unref(u.ApExportGroupActionType).SELECT,disabled:((n=y.value)==null?void 0:n.length)===0},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(l)("ap.apExportGroup.exportSelected")),1)]),_:1},8,["disabled"])),(e.openBlock(),e.createBlock(e.unref(i.MenuItem),{key:e.unref(u.ApExportGroupActionType).ALL},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(l)("ap.apExportGroup.exportAll")),1)]),_:1}))]}),_:1})]),default:e.withCtx(()=>[e.createVNode(e.unref(E.default),e.mergeProps({...o.$attrs},{loading:r.value}),{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString((t==null?void 0:t.text)??e.unref(l)("ap.apExportGroup.export"))+" ",1),e.createVNode(e.unref(G.DownOutlined))]),_:1},16,["loading"])]),_:1},8,["open","class","disabled"])):e.createCommentVNode("",!0)],64))}});exports.default=I;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),M=require("@ant-design/icons-vue"),p=require("@aplus-frontend/antdv");require("../../config-provider/index.js");const n=require("./interface.js"),N=require("@aplus-frontend/hooks"),V=require("./handleExportDownload.js"),D=require("../../ap-table/context.js"),I=require("./convertExportField.js");require("../../ap-button/index.js");const K=require("../ap-batch-action-group/index.js"),_=require("../../config-provider/hooks/use-namespace.js"),j=require("../../config-provider/hooks/use-locale.js"),R=require("../../config-provider/hooks/use-global-config.js"),m=require("../../ap-button/ap-button.vue.js"),O=e.defineComponent({__name:"ApExportGroup",props:{type:{default:"button"},selectedRowKeys:{},groupList:{},buttonProps:{},disabled:{type:Boolean},auth:{},ifShow:{},text:{},idKey:{},request:{},getRequestParams:{},getInitialParams:{},beforeRequest:{},successMessage:{type:[Boolean,String],default:!1},exportField:{type:[Boolean,Object],default:void 0}},setup(B){const{hasPermission:L}=N.usePermission(),t=B,{columns:f,dataSource:y}=D.useInjectApTable(),{b:G}=_.useNamespace("ap-export-group"),{t:l}=j.useLocale(),E=R.useGlobalConfig("exportField"),s=e.ref(!1),g=e.ref(!1),i=e.computed(()=>{var r;return!!(t!=null&&t.disabled)||(y!==void 0?!((r=y==null?void 0:y.value)!=null&&r.length):!1)||s.value});e.watch(()=>i.value,()=>{i.value&&(g.value=!1)},{immediate:!0});const S=e.computed(()=>(t==null?void 0:t.successMessage)===!0?l("ap.apExportGroup.exportSuccess"):t!=null&&t.successMessage?t.successMessage:""),b=e.computed(()=>{const r="exportFieldList",o=(t==null?void 0:t.exportField)??(E.value===""?!0:E.value)??!1;return o===!0?{key:r}:typeof o=="object"?{...o,key:o.key??r}:o}),T={textAlign:"center"},x=e.computed(()=>(t==null?void 0:t.selectedRowKeys)||[]),k=e.computed(()=>{let r=t==null?void 0:t.ifShow;return!(t!=null&&t.ifShow)&&(t!=null&&t.auth)&&(r=()=>L(t.auth)),(r==null?void 0:r())??!0});async function q(){x.value.length>0?d({key:n.ApExportGroupActionType.SELECT}):d({key:n.ApExportGroupActionType.ALL})}async function d({key:r,option:o}){var w,A,C;const a=o||t,{getRequestParams:c,request:u}=a||{};let h={};r===n.ApExportGroupActionType.SELECT?h={[(a==null?void 0:a.idKey)||"ids"]:x.value}:r===n.ApExportGroupActionType.ALL&&(h=(c==null?void 0:c())||{});const F=((w=a==null?void 0:a.getInitialParams)==null?void 0:w.call(a))||{};try{s.value=!0;let v=Object.assign({...h,...F},b.value&&(f!=null&&f.value)?{[b.value.key]:I.convertExportField(f.value,(A=b.value)==null?void 0:A.convertField)}:{});v=((C=a==null?void 0:a.beforeRequest)==null?void 0:C.call(a,v))||v,await V.handleExportDownload(async()=>await(u==null?void 0:u(v))),a!=null&&a.successMessage&&p.message.success(S.value)}finally{s.value=!1}}const P=e.computed(()=>{var r;return((r=t==null?void 0:t.groupList)==null?void 0:r.map((o,a)=>({key:a,content:o==null?void 0:o.text,auth:o==null?void 0:o.auth,ifShow:o==null?void 0:o.ifShow,disabled:o==null?void 0:o.disabled,onClick:()=>{x.value.length>0?d({key:n.ApExportGroupActionType.SELECT,option:o}):d({key:n.ApExportGroupActionType.ALL,option:o})}})))||[]});return(r,o)=>{var a,c;return e.openBlock(),e.createElementBlock(e.Fragment,null,[k.value&&t.type==="button"?(e.openBlock(),e.createBlock(e.unref(m.default),e.mergeProps({key:0},{...r.$attrs},{disabled:i.value,loading:s.value,"min-width":"",onClick:q}),{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString((t==null?void 0:t.text)??e.unref(l)("ap.apExportGroup.export")),1)]),_:1},16,["disabled","loading"])):e.createCommentVNode("",!0),k.value&&t.type==="dropdown"?(e.openBlock(),e.createBlock(e.unref(p.Dropdown),{key:1,open:g.value,"onUpdate:open":o[0]||(o[0]=u=>g.value=u),class:e.normalizeClass([e.unref(G)()]),"overlay-style":T,disabled:i.value},{overlay:e.withCtx(()=>[e.createVNode(e.unref(p.Menu),{onClick:d},{default:e.withCtx(()=>{var u;return[(e.openBlock(),e.createBlock(e.unref(p.MenuItem),{key:e.unref(n.ApExportGroupActionType).SELECT,disabled:((u=x.value)==null?void 0:u.length)===0},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(l)("ap.apExportGroup.exportSelected")),1)]),_:1},8,["disabled"])),(e.openBlock(),e.createBlock(e.unref(p.MenuItem),{key:e.unref(n.ApExportGroupActionType).ALL},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(l)("ap.apExportGroup.exportAll")),1)]),_:1}))]}),_:1})]),default:e.withCtx(()=>[e.createVNode(e.unref(m.default),e.mergeProps({...r.$attrs},{loading:s.value}),{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString((t==null?void 0:t.text)??e.unref(l)("ap.apExportGroup.export"))+" ",1),e.createVNode(e.unref(M.DownOutlined))]),_:1},16,["loading"])]),_:1},8,["open","class","disabled"])):e.createCommentVNode("",!0),k.value&&t.type==="group"?(e.openBlock(),e.createBlock(e.unref(K.ApBatchActionGroup),e.mergeProps({key:2},{...r.$attrs},{disabled:i.value,loading:s.value,"button-props":{...t.buttonProps,content:((a=t==null?void 0:t.buttonProps)==null?void 0:a.content)??e.unref(l)("ap.apExportGroup.export"),type:((c=t==null?void 0:t.buttonProps)==null?void 0:c.type)??"default"},"menu-list":P.value}),null,16,["disabled","loading","button-props","menu-list"])):e.createCommentVNode("",!0)],64)}}});exports.default=O;

package/lib/src/business/ap-export-group/convertExportField.d.ts

@@ -1,4 +1,6 @@
+import { ApColumnType } from '../../ap-table/interface';
+import { ApGridColumnType } from './../../ap-grid/interface';
 import { ColumnType } from '@aplus-frontend/antdv/es/table';
-export declare const convertExportField: (columns: ColumnType[], convertField?: {
+export declare const convertExportField: (columns: ColumnType[] | ApGridColumnType[] | ApColumnType[], convertField?: {
     [key: string]: string[];
 }) => any[];

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

@@ -5,7 +5,7 @@ import { ApExportGroupProps } from './interface';
 export * from './interface';
 declare const ApExportGroup: {
     new (...args: any[]): CreateComponentPublicInstanceWithMixins<Readonly< ApExportGroupProps> & Readonly<{}>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, PublicProps, {
-        type: "button" | "dropdown";
+        type: "button" | "dropdown" | "group";
         exportField: boolean | {
             key?: string;
             convertField?: {
@@ -21,7 +21,7 @@ declare const ApExportGroup: {
         M: {};
         Defaults: {};
     }, Readonly< ApExportGroupProps> & Readonly<{}>, {}, {}, {}, {}, {
-        type: "button" | "dropdown";
+        type: "button" | "dropdown" | "group";
         exportField: boolean | {
             key?: string;
             convertField?: {
@@ -34,7 +34,7 @@ declare const ApExportGroup: {
     __isTeleport?: never;
     __isSuspense?: never;
 } & ComponentOptionsBase<Readonly< ApExportGroupProps> & Readonly<{}>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, {
-    type: "button" | "dropdown";
+    type: "button" | "dropdown" | "group";
     exportField: boolean | {
         key?: string;
         convertField?: {

package/lib/src/business/ap-export-group/interface.d.ts

@@ -1,12 +1,23 @@
-export interface ApExportGroupProps {
+import { ApBatchActionGroupButtonProps } from '../ap-batch-action-group';
+export type ApExportGroupProps = {
     /**
      * 类型
      */
-    type?: 'button' | 'dropdown';
+    type?: 'button' | 'dropdown' | 'group';
     /**
      * 选中行的Key列表
      */
     selectedRowKeys?: any[];
+    /**
+     * 类型为group时配置,适用于多导出
+     */
+    groupList?: ApExportGroupListItem[];
+    /**
+     * 类型为group时配置,和批量操作按钮组buttonProps一致
+     */
+    buttonProps?: ApBatchActionGroupButtonProps;
+} & ApExportGroupListItem;
+export interface ApExportGroupListItem {
     /**
      * 是否禁用
      */
@@ -57,5 +68,6 @@ export declare enum ApExportGroupActionType {
 }
 export type ApExportGroupAntMenuInfo = {
     key: string | number;
+    option?: ApExportGroupListItem;
 };
 export type ApExportGroupMixedParams<ParamsType> = Partial<ParamsType>;

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

@@ -1,4 +1,4 @@
-import { VNode, VNodeChild } from 'vue';
+import { StyleValue, VNode, VNodeChild } from 'vue';
 import { ApTableProps } from '../../ap-table';
 import { ModalProps, TableProps } from '@aplus-frontend/antdv';
 /** table-modal的props类型 */
@@ -75,6 +75,8 @@ export interface TableLayoutConfig {
     leftTitle?: string | VNodeChild;
     /** 右侧标题 */
     rightTitle?: (selectedCount: number) => string | VNodeChild;
+    /** 右侧内容样式 */
+    rightContentStyle?: StyleValue;
     /** 已经选择item渲染, renderSelectedItem有值才为复杂布局 */
     renderSelectedItem?: (record: any, actions: {
         deleteItem: (record: any) => void;

package/lib/src/business/ap-table-modal/table-layout/index.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue");require("../../../config-provider/index.js");const c=require("../../ap-title/index.js"),n=require("@aplus-frontend/antdv"),y=require("../../../config-provider/hooks/use-locale.js"),k=require("../../../config-provider/hooks/use-namespace.js"),g=e.defineComponent({__name:"index",props:{leftTitle:{type:[String,Object,Number,Boolean,null,Array],default:""},rightTitle:{},renderSelectedItem:{},selectedList:{default:()=>[]}},emits:["clear","deleteItem"],setup(d,{emit:u}){const{t:r}=y.useLocale(),o=d,a=u,m=()=>{a("clear")},p=t=>{a("deleteItem",t)},f=t=>typeof o.rightTitle=="function"?o.rightTitle(t):`${r("ap.apTableModal.selected")} (${t})`,{m:l}=k.useNamespace("ap-table-modal");return(t,h)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass([t.renderSelectedItem?e.unref(l)("table-layout"):"",{"complex-layout":!!t.renderSelectedItem}])},[t.renderSelectedItem?(e.openBlock(),e.createElementBlock(e.Fragment,{key:0},[t.leftTitle?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(e.unref(l)("table-layout-left"))},[e.createVNode(e.unref(c.ApTitle),{style:{"margin-bottom":"16px"}},{prefix:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(e.h(e.Fragment,[t.leftTitle]))))]),_:1}),e.createElementVNode("div",{class:e.normalizeClass(e.unref(l)("table-layout-left-content"))},[e.renderSlot(t.$slots,"default")],2)],2)):e.createCommentVNode("",!0),e.createElementVNode("div",{class:e.normalizeClass(e.unref(l)("table-layout-right"))},[e.createVNode(e.unref(c.ApTitle),{title:`${e.unref(r)("ap.apTableModal.selected")} (${t.selectedList.length})`},{prefix:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(e.h(e.Fragment,[f(t.selectedList.length)]))))]),suffix:e.withCtx(()=>[e.createVNode(e.unref(n.Button),{type:"link",style:{padding:"0px",height:"22px","border-width":"0px"},onClick:m},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(r)("ap.apTableModal.clear")),1)]),_:1})]),_:1},8,["title"]),e.createElementVNode("div",{class:e.normalizeClass(e.unref(l)("table-layout-right-content"))},[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(t.selectedList,s=>{var i;return e.openBlock(),e.createBlock(e.resolveDynamicComponent((i=t.renderSelectedItem)==null?void 0:i.call(t,s,{deleteItem:p})),{key:s})}),128)),t.selectedList.length===0?(e.openBlock(),e.createBlock(e.unref(n.Empty),{key:0,image:e.unref(n.Empty).PRESENTED_IMAGE_SIMPLE,style:{"margin-top":"100px"}},null,8,["image"])):e.createCommentVNode("",!0)],2)],2)],64)):e.renderSlot(t.$slots,"default",{key:1})],2))}});exports.default=g;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue");require("../../../config-provider/index.js");const c=require("../../ap-title/index.js"),n=require("@aplus-frontend/antdv"),y=require("../../../config-provider/hooks/use-locale.js"),g=require("../../../config-provider/hooks/use-namespace.js"),k=e.defineComponent({__name:"index",props:{leftTitle:{type:[String,Object,Number,Boolean,null,Array],default:""},rightTitle:{},rightContentStyle:{type:[Boolean,null,String,Object,Array]},renderSelectedItem:{},selectedList:{default:()=>[]}},emits:["clear","deleteItem"],setup(d,{emit:u}){const{t:r}=y.useLocale(),o=d,a=u,m=()=>{a("clear")},p=t=>{a("deleteItem",t)},f=t=>typeof o.rightTitle=="function"?o.rightTitle(t):`${r("ap.apTableModal.selected")} (${t})`,{m:l}=g.useNamespace("ap-table-modal");return(t,h)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass([t.renderSelectedItem?e.unref(l)("table-layout"):"",{"complex-layout":!!t.renderSelectedItem}])},[t.renderSelectedItem?(e.openBlock(),e.createElementBlock(e.Fragment,{key:0},[t.leftTitle?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(e.unref(l)("table-layout-left"))},[e.createVNode(e.unref(c.ApTitle),{style:{"margin-bottom":"16px"}},{prefix:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(e.h(e.Fragment,[t.leftTitle]))))]),_:1}),e.createElementVNode("div",{class:e.normalizeClass(e.unref(l)("table-layout-left-content"))},[e.renderSlot(t.$slots,"default")],2)],2)):e.createCommentVNode("",!0),e.createElementVNode("div",{class:e.normalizeClass(e.unref(l)("table-layout-right")),style:e.normalizeStyle(t.rightContentStyle)},[e.createVNode(e.unref(c.ApTitle),{title:`${e.unref(r)("ap.apTableModal.selected")} (${t.selectedList.length})`},{prefix:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(e.h(e.Fragment,[f(t.selectedList.length)]))))]),suffix:e.withCtx(()=>[e.createVNode(e.unref(n.Button),{type:"link",style:{padding:"0px",height:"22px","border-width":"0px"},onClick:m},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(r)("ap.apTableModal.clear")),1)]),_:1})]),_:1},8,["title"]),e.createElementVNode("div",{class:e.normalizeClass(e.unref(l)("table-layout-right-content"))},[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(t.selectedList,i=>{var s;return e.openBlock(),e.createBlock(e.resolveDynamicComponent((s=t.renderSelectedItem)==null?void 0:s.call(t,i,{deleteItem:p})),{key:i})}),128)),t.selectedList.length===0?(e.openBlock(),e.createBlock(e.unref(n.Empty),{key:0,image:e.unref(n.Empty).PRESENTED_IMAGE_SIMPLE,style:{"margin-top":"100px"}},null,8,["image"])):e.createCommentVNode("",!0)],2)],6)],64)):e.renderSlot(t.$slots,"default",{key:1})],2))}});exports.default=k;

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

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

package/lib/src/editable-table/hooks/use-get-columns.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const r=require("vue"),d=require("lodash-unified"),c=require("../utils.js"),s=require("../../ap-table/utils.js");require("../../config-provider/index.js");const N=require("@aplus-frontend/antdv/es/theme/internal"),T=require("../../config-provider/hooks/use-namespace.js"),v=(l,x)=>{const{em:h,be:F}=T.useNamespace("editable-table"),q=r.useSlots(),[,I]=N.useToken();return r.computed(()=>{const i=l.columns;if(!i)return[];function b(R){return R.map(e=>({...d.omit(e,["ellipsis"]),children:b(e.children||[]),title:c.getEditableTableTitle(e,F("table-header","title"),h("header-cell","required"),q.headerCell,r.unref(I).colorPrimary),customRender({value:t,...n}){const u=d.isFunction(e.editable)?e.editable(n.text,n.record,n.index):!!e.editable;if(!e.valueType&&!e.customRender&&!e.customRenderFormItem)return console.warn("can not render table cell because no `valueType` / `customRender` / `customRenderFormItem`"),null;let o;if(u){const a=s.updateFormProps(e,s.getFieldProps(e.fieldProps,{value:t,...n})),f={};l.onFieldChange&&(f[`onUpdate:${a.valuePropName||"value"}`]=C=>{var g;return(g=l.onFieldChange)==null?void 0:g.call(l,n.index,e.dataIndex,C)});const y=d.isArray(e.dataIndex)?e.dataIndex:[e.dataIndex];o={name:[...d.isArray(l.name)?l.name:[l.name],n.index,...y],...a||{},field:{style:"width: 100%",...(a==null?void 0:a.field)||{},...f,class:c.mergeClass("is-editable",a.class)}}}else o={field:s.getTableRenderProps(e,{value:t,...n})};const m=c.getFinalNode(e,u,o,t,n.record,r.unref(x));return e.customRender?e.customRender({value:t,...n,editable:u,originalNode:m}):m}}))}return b(i)})};exports.default=v;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const r=require("vue"),d=require("lodash-unified"),c=require("../utils.js"),s=require("../../ap-table/utils.js");require("../../config-provider/index.js");const C=require("@aplus-frontend/antdv/es/theme/internal"),N=require("../../config-provider/hooks/use-namespace.js"),v=(l,x)=>{const{em:h,be:F}=N.useNamespace("editable-table"),T=r.useSlots(),[,q]=C.useToken();return r.computed(()=>{const i=l.columns;if(!i)return[];function b(I){return I.map(e=>({...d.omit(e,["ellipsis"]),children:b(e.children||[]),title:c.getEditableTableTitle(e,F("table-header","title"),h("header-cell","required"),T.headerCell,r.unref(q).colorTextTertiary),customRender({value:a,...n}){const u=d.isFunction(e.editable)?e.editable(n.text,n.record,n.index):!!e.editable;if(!e.valueType&&!e.customRender&&!e.customRenderFormItem)return console.warn("can not render table cell because no `valueType` / `customRender` / `customRenderFormItem`"),null;let o;if(u){const t=s.updateFormProps(e,s.getFieldProps(e.fieldProps,{value:a,...n})),m={};l.onFieldChange&&(m[`onUpdate:${t.valuePropName||"value"}`]=y=>{var g;return(g=l.onFieldChange)==null?void 0:g.call(l,n.index,e.dataIndex,y)});const R=d.isArray(e.dataIndex)?e.dataIndex:[e.dataIndex];o={name:[...d.isArray(l.name)?l.name:[l.name],n.index,...R],...t||{},field:{style:"width: 100%",...(t==null?void 0:t.field)||{},...m,class:c.mergeClass("is-editable",t.class)}}}else o={field:s.getTableRenderProps(e,{value:a,...n})};const f=c.getFinalNode(e,u,o,a,n.record,r.unref(x));return e.customRender?e.customRender({value:a,...n,editable:u,originalNode:f}):f}}))}return b(i)})};exports.default=v;

package/lib/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.13.4";
+declare const _default: "6.15.0";
 export default _default;

package/lib/src/version.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="6.13.4";exports.default=e;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="6.15.0";exports.default=e;

package/package.json

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

package/theme/antdv-override.css

@@ -264,18 +264,6 @@
 [data-aplus-ui-mode='aplus'] .ant-input-number .ant-input-number-input-wrap > input::placeholder {
   color: #abb7cc;
 }
-[data-aplus-ui-mode='aplus'] input[disabled].ant-input {
-  color: var(--ap-text-color-1);
-}
-[data-aplus-ui-mode='aplus'] textarea[disabled].ant-input {
-  color: var(--ap-text-color-1);
-}
-[data-aplus-ui-mode='aplus'] .ant-picker.ant-picker-disabled .ant-picker-input > input[disabled] {
-  color: var(--ap-text-color-1);
-}
-[data-aplus-ui-mode='aplus'] .ant-select-disabled .ant-select-selection-item {
-  color: var(--ap-text-color-1) !important;
-}
 [data-aplus-ui-mode='aplus'] .ant-input-clear-icon {
   line-height: 18px;
 }
@@ -555,18 +543,6 @@
 [data-aplus-ui-mode='admin'] .ant-input-number .ant-input-number-input-wrap > input::placeholder {
   color: #bfbfbf;
 }
-[data-aplus-ui-mode='admin'] input[disabled].ant-input {
-  color: var(--ap-text-color-1);
-}
-[data-aplus-ui-mode='admin'] textarea[disabled].ant-input {
-  color: var(--ap-text-color-1);
-}
-[data-aplus-ui-mode='admin'] .ant-picker.ant-picker-disabled .ant-picker-input > input[disabled] {
-  color: var(--ap-text-color-1);
-}
-[data-aplus-ui-mode='admin'] .ant-select-disabled .ant-select-selection-item {
-  color: var(--ap-text-color-1) !important;
-}
 [data-aplus-ui-mode='admin'] .ant-input-clear-icon {
   line-height: 18px;
 }

package/theme/antdv-override.less

@@ -1,5 +1,4 @@
 @import './mixins/config.less';
-
 @tw: ~'@{ns}-ap-table__table-wrapper';
 @sb: ~'@{ns}-scroll-bar';
 
@@ -303,22 +302,6 @@
     color: #abb7cc;
   }
 
-  input[disabled].ant-input {
-    color: var(--ap-text-color-1);
-  }
-
-  textarea[disabled].ant-input {
-    color: var(--ap-text-color-1);
-  }
-
-  .ant-picker.ant-picker-disabled .ant-picker-input > input[disabled] {
-    color: var(--ap-text-color-1);
-  }
-
-  .ant-select-disabled .ant-select-selection-item {
-    color: var(--ap-text-color-1) !important;
-  }
-
   .ant-input-clear-icon {
     line-height: 18px;
   }
@@ -637,22 +620,6 @@
     color: #bfbfbf;
   }
 
-  input[disabled].ant-input {
-    color: var(--ap-text-color-1);
-  }
-
-  textarea[disabled].ant-input {
-    color: var(--ap-text-color-1);
-  }
-
-  .ant-picker.ant-picker-disabled .ant-picker-input > input[disabled] {
-    color: var(--ap-text-color-1);
-  }
-
-  .ant-select-disabled .ant-select-selection-item {
-    color: var(--ap-text-color-1) !important;
-  }
-
   .ant-input-clear-icon {
     line-height: 18px;
   }

package/theme/ap-grid/index.css

@@ -513,19 +513,26 @@
 .aplus-ap-grid ::-webkit-scrollbar-thumb:active {
   background-color: var(--ap-scrollbar-thumb-color-hover);
 }
-.aplus-ap-grid .vxe-table--render-default.size--medium .vxe-body--column.is--padding div.vxe-cell,
-.aplus-ap-grid .vxe-table--render-default.size--medium .vxe-header--column.is--padding div.vxe-cell {
+.aplus-ap-grid .vxe-table--render-default.size--medium .vxe-body--column.is--padding div.vxe-cell {
   min-height: unset !important;
   padding: 9px 12px;
   font-size: 12px;
   line-height: 18px;
 }
-.aplus-ap-grid .vxe-table--render-default.size--mini .vxe-body--column.is--padding div.vxe-cell,
-.aplus-ap-grid .vxe-table--render-default.size--mini .vxe-header--column.is--padding div.vxe-cell {
+.aplus-ap-grid .vxe-table--render-default.size--mini .vxe-body--column.is--padding div.vxe-cell {
   min-height: unset !important;
   padding: 6px 9px;
   line-height: 18px;
 }
+.aplus-ap-grid .vxe-table--render-default.size--medium .vxe-header--column.is--padding div.vxe-cell {
+  font-size: 12px;
+  line-height: 16px;
+  padding: 0px 12px;
+}
+.aplus-ap-grid .vxe-table--render-default.size--mini .vxe-header--column.is--padding div.vxe-cell {
+  line-height: 16px;
+  padding: 0 9px;
+}
 .aplus-ap-grid-adaptive {
   height: 100%;
   display: flex;

package/theme/ap-grid/index.less

@@ -11,17 +11,26 @@
 
 .b(ap-grid, {
   .reset-scrollbar();
-  .vxe-table--render-default.size--medium .vxe-body--column.is--padding div.vxe-cell, .vxe-table--render-default.size--medium .vxe-header--column.is--padding div.vxe-cell {
+  .vxe-table--render-default.size--medium .vxe-body--column.is--padding div.vxe-cell{
     min-height: unset !important;
     padding: 9px 12px;
     font-size: @font-size-base;
     line-height: @line-height-base;
   }
-  .vxe-table--render-default.size--mini .vxe-body--column.is--padding div.vxe-cell, .vxe-table--render-default.size--mini .vxe-header--column.is--padding div.vxe-cell {
+  .vxe-table--render-default.size--mini .vxe-body--column.is--padding div.vxe-cell {
     min-height: unset !important;
     padding: 6px 9px;
     line-height: @line-height-base;
   }
+  .vxe-table--render-default.size--medium .vxe-header--column.is--padding div.vxe-cell {
+    font-size: @font-size-base;
+    line-height: 16px;
+    padding: 0px 12px;
+  }
+  .vxe-table--render-default.size--mini .vxe-header--column.is--padding div.vxe-cell {
+    line-height: 16px;
+    padding: 0 9px;
+  }
   &-adaptive {
     height: 100%;
     display: flex;

package/theme/ap-table-modal/index.css

@@ -918,7 +918,8 @@
   position: relative;
 }
 .aplus-ap-table-modal--table-layout-left {
-  width: calc(100% - 410px);
+  flex: 1;
+  min-width: 0px;
   padding-right: 20px;
   box-sizing: border-box;
   display: flex;
@@ -931,6 +932,7 @@
   height: 100%;
 }
 .aplus-ap-table-modal--table-layout-right {
+  max-height: 643px;
   width: 410px;
   padding-left: 20px;
   position: relative;
@@ -939,7 +941,6 @@
 }
 .aplus-ap-table-modal--table-layout-right-content {
   flex: 1;
-  max-height: 540px;
   overflow-y: auto;
 }
 .aplus-ap-table-modal--table-layout-right::before {

package/theme/ap-table-modal/index.less

@@ -17,7 +17,8 @@
     
 
     &-left {
-     width: calc(100% - 410px);
+     flex: 1;
+     min-width: 0px;
      padding-right: 20px;
      box-sizing: border-box;
      display: flex;
@@ -31,6 +32,7 @@
     }
 
     &-right {
+      max-height: 643px;
       width: 410px;
       padding-left: 20px;
       position: relative;
@@ -38,7 +40,6 @@
       flex-direction: column;
       &-content {
         flex: 1;
-        max-height: 540px;
         overflow-y: auto;
       }
       &::before {

package/theme/css-var.css

@@ -23,6 +23,7 @@
   --ap-color-bg-2: #f3f5f8;
   --ap-scrollbar-thumb-color-base: #c8d1de;
   --ap-scrollbar-thumb-color-hover: #959ca7;
+  --ap-scrollbar-track-color-hover: #f2f6f9;
   --ap-text-color-4: #abb7cc;
   --batch-input-group-trigger-color-disabled: rgba(24, 41, 72, 0.25);
   --ap-radio-group-item-active-bg-color: rgba(0, 112, 255, 0.12);
@@ -54,6 +55,7 @@
   --ap-color-bg-2: #f5f5f5;
   --ap-scrollbar-thumb-color-base: #bfbfbf;
   --ap-scrollbar-thumb-color-hover: #787878;
+  --ap-scrollbar-track-color-hover: #f7f7f7;
   --ap-text-color-4: #bfbfbf;
   --batch-input-group-trigger-color-disabled: rgba(0, 0, 0, 0.25);
   --ap-radio-group-item-active-bg-color: rgba(52, 183, 124, 0.12);

package/theme/css-var.less

@@ -47,6 +47,8 @@
   --ap-scrollbar-thumb-color-base: #c8d1de;
   // 滚动条滑动块hover色
   --ap-scrollbar-thumb-color-hover: #959ca7;
+  // 滚动条轨道颜色
+  --ap-scrollbar-track-color-hover: #f2f6f9;
   // 文本颜色4号色（三级）
   --ap-text-color-4: #abb7cc;
   // 批量输入组禁用色
@@ -102,6 +104,8 @@
   --ap-scrollbar-thumb-color-base: #bfbfbf;
   // 滚动条滑动块基础色
   --ap-scrollbar-thumb-color-hover: #787878;
+  // 滚动条轨道颜色
+  --ap-scrollbar-track-color-hover: #f7f7f7;
   // 文本颜色4号色（三级）
   --ap-text-color-4: #bfbfbf;
   // 批量输入组禁用色