@aplus-frontend/ui 0.6.3 → 0.6.5

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"),h=require("vxe-table");require("vxe-table/es/style.css");const i=require("lodash-unified"),ve=require("../ap-form/index.js");require("../config-provider/index.js");const ye=require("../ap-table/constants.js"),p=require("../ap-table/utils.js"),we=require("../ap-table/hooks/use-table-paging-ng.js"),S=require("@aplus-frontend/antdv"),Se=require("./hooks/use-inner-params.js"),F=require("./utils/table.js"),be=require("./hooks/use-row-selection.js"),Re=require("../ap-table/context.js"),E=require("./constants.js"),xe=require("./hooks/use-render-columns.js"),ke=require("@aplus-frontend/antdv/es/theme/internal");require("../scroll-bar/index.js");const Be=require("../utils/index.js"),Fe=require("../utils/slot.js"),Ee=require("./hooks/use-table-style.js"),Ne=require("../config-provider/hooks/use-namespace.js"),Pe=require("../config-provider/hooks/use-global-config.js"),Ie=require("../config-provider/hooks/use-locale.js"),Ve=require("../scroll-bar/index.vue.js"),qe=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}},setup(K,{expose:D}){var L;const m=e.useSlots(),o=K,v=(L=e.getCurrentInstance())==null?void 0:L.appContext.app;v&&!v.__VXE_PC_UI_INSTALLED__&&(v.use(h.VxeUI),v.__VXE_PC_UI_INSTALLED__=!0);const{e:y,b:u,be:O}=Ne.useNamespace("ap-grid"),$=Pe.useGlobalConfig("valueTypeMap"),s=e.ref([]),N=e.ref([]),l=e.ref(),w=e.ref(o.size),U=Ee.useTableStyle(),[,M]=ke.useToken(),{t:j}=Ie.useLocale();h.VxeUI.setConfig({i18n:(t,r)=>j(`ap.${t}`,r)});const{renderConfig:W,updateSignal:H}=xe.useRenderColumns(s);let P=0;const G=e.computed(()=>{if(l.value)return l.value.$el.querySelector(".vxe-table--header-inner-wrapper")}),I=e.computed(()=>{var t,r,a;return P++,((a=(r=(t=o.columns)==null?void 0:t.filter(n=>!n.hideInSearch&&n.dataIndex&&(n.valueType||n.customRenderFormItem)&&!ye.noRenderAsFormItemValueList.includes(n.valueType)))==null?void 0:r.sort((n,c)=>{let C=p.getColumnOrder(n.order);return p.getColumnOrder(c.order)-C}))==null?void 0:a.map(n=>{const c=p.updateFormProps(n,p.getFieldProps(n.fieldProps,{})),C={...n,fieldProps:{label:n.title,name:n.dataIndex,bordered:!0,...c||{},_signal:P},renderNode:void 0};return C.renderNode=p.getSearchFormItemRenderNode(C,e.unref($)),C}))||[]}),X=e.computed(()=>{var r;return Be.isDef(o.manual)?o.manual:Fe.getValidVNodeList(((r=m.searchFormExtra)==null?void 0:r.call(m))||[]).some(a=>{var n;return((n=a.type)==null?void 0:n.name)==="ApView"})}),J=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:b,submit:R,reset:x,refresh:Q,data:d,tableProps:z,setDataSource:Y,handleTableChangeOptional:Z,getPaging:ee,setPaging:te}=we.useTablePaging({async request(t){var a;if(!f.value.preserveSelectedRowKeys&&i.isUndefined(o.dataSource)&&B(),!i.isUndefined(o.dataSource)){const n=t.pageSize*(t.current-1);return{data:(o.pagination===!1?o.dataSource:o.dataSource.slice(n,n+t.pageSize))||[],total:o.dataSource.length||0}}const r=await((a=o.request)==null?void 0:a.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(X),formatParams:o.beforeSearchSubmit,pagination:o.pagination,onClickReset:Ce,onAfterRequest:A}),{sortChangeEvent:re,filterChangeEvent:oe,paginationChangeEvent:ae}=Se.useInnerParams(Z);Re.useProvideApTable({columns:e.computed(()=>s.value),columnsBackup:e.computed(()=>N.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:O("table-header","title"),color:M.value.colorTextTertiary})),dataSource:e.computed(()=>e.unref(d).records),getSearchFormValues:_,setSearchFormValues:T,submit:R,reset:x});const ne=e.computed(()=>s.value.some(t=>t.fixed==="left"||t.fixed===!0)?"left":void 0),le=e.computed(()=>i.isUndefined(o.loading)?d.loading:o.loading),se=e.computed(()=>i.isUndefined(o.dataSource)?d.records:o.dataSource),{selectedRows:k,rowSelection:f,...g}=be.default({...o.rowSelection===!0?{}:o.rowSelection,dataSource:se,rowKey:o.rowKey}),ue=({checked:t,row:r})=>{const a=l.value;if(a&&a){const n=[...a.getCheckboxReserveRecords(),...a.getCheckboxRecords()];g.selectChange(r,t,n)}},ce=({checked:t})=>{const r=l.value;r&&g.selectAllChange(t,[...r.getCheckboxReserveRecords(),...r.getCheckboxRecords()])},ie=()=>{const t=l.value;t&&g.selectRangeChange(t.getCheckboxRecords(),[...t.getCheckboxReserveRecords(),...t.getCheckboxRecords()])},de=()=>{const t=l.value;t&&(k.value=[t.getRadioRecord()])},fe=({row:t})=>{const r=o.rowHighlightable;i.isFunction(r)&&r(t)};function pe(){var t;return((t=o.columns)==null?void 0:t.filter(r=>!r.hideInTable))||[]}function T(t){var r,a,n;(n=(a=(r=b.value)==null?void 0:r.apForm)==null?void 0:a.setFieldsValue)==null||n.call(a,t)}function _(t=!1){var a,n,c;const r=t?"getFieldsValueTransformed":"getFieldsValue";return(c=(n=(a=b.value)==null?void 0:a.apForm)==null?void 0:n[r])==null?void 0:c.call(n,!0)}function B(){g.clearAll();const t=l.value;t&&(f.value.type==="radio"?(t.clearRadioRow(),t.clearRadioReserve()):(t.clearCheckboxRow(),t.clearCheckboxReserve()))}function me(t){i.isFunction(o.rowKey)||(g.selectMultiByKeys(t),A())}function ge(t){const r=l.value;if(!r)return;const a=String(t[o.rowKey]),n=r.getRowById(a);r.setCurrentRow(n)}function Ce(){const t=l.value;t&&(t.clearSort(),t.clearFilter())}function A(){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 he(t,r){var n;const a=d.records[t];if(a)return(n=l.value)==null?void 0:n.scrollToRow(a,r)}return e.watch(()=>[o.columnResizable,o.columns],()=>{var r;const t=pe();s.value=t,(r=o.onShownColumnsChange)==null||r.call(o,t),N.value=t},{deep:!0,immediate:!0}),e.watch(()=>o.dataSource,t=>{Y(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}),D({submit:R,reset:x,refresh:Q,setSearchFormValues:T,getSearchFormValues:_,getShowColumns:()=>e.unref(s),rowSelection:{selectedRows:e.computed(()=>k.value),setSelectedRowKeys:me,clearAll:B},scrollToRow:he,getDataSource:()=>e.unref(d.records),setCurrentRow:ge,getPaging:ee,setPaging:te}),(t,r)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(J.value),style:e.normalizeStyle(t.wrapperStyle)},[e.unref(i.isUndefined)(t.dataSource)&&t.searchForm!==!1&&I.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(t.card?e.unref(y)("search-wrapper"):null),style:e.normalizeStyle(t.searchFormWrapperStyle)},[e.createVNode(e.unref(ve.ApForm).SearchForm,e.mergeProps(t.searchForm||{},{ref_key:"formRef",ref:b,"custom-reset":"","submit-loading":e.unref(z).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,a=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(a.renderNode.Comp),e.mergeProps({key:a.dataIndex,item:a,ref_for:!0},a.fieldProps||{},{span:a.span,"custom-render":a.renderNode.render}),null,16,["item","span","custom-render"]))),128))]),_:2},[m.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(y)("table-wrapper"),t.card?e.unref(y)("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(h.VxeTable),e.mergeProps(e.unref(F.toVxeProps)(o),{ref_key:"tableRef",ref:l,key:e.unref(H),data:e.unref(d).records,"sort-config":{remote:V.value.length>0,trigger:"cell"},"filter-config":{remote:q.value.length>0},loading:le.value,style:e.unref(U),size:w.value,onSortChange:e.unref(re),onFilterChange:e.unref(oe),onCheckboxChange:ue,onCheckboxRangeChange:ie,onCheckboxAll:ce,onRadioChange:de,onCurrentChange:fe}),e.createSlots({empty:e.withCtx(()=>[e.createVNode(e.unref(S.Empty),{image:e.unref(S.Empty).PRESENTED_IMAGE_SIMPLE},null,8,["image"])]),loading:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass(e.unref(y)("table-loading-wrapper"))},[e.createVNode(e.unref(S.Spin))],2)]),default:e.withCtx(()=>[o.expandable&&s.value.length?(e.openBlock(),e.createBlock(e.unref(h.VxeColumn),e.mergeProps({key:0},e.unref(F.getRowExpandProps)(t.expandable),{fixed:ne.value}),{content:e.withCtx(a=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(o.expandable.renderContent(a))))]),_:1},16,["fixed"])):e.createCommentVNode("",!0),o.rowSelection&&s.value.length?(e.openBlock(),e.createBlock(e.unref(h.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(W),a=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(a),{key:a.props.colId}))),128))]),_:2},[e.renderList(e.unref(i.omit)(m,["searchFormExtra"]),(a,n)=>({name:n,fn:e.withCtx(c=>[e.renderSlot(t.$slots,n,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(Ve.default),{key:0,direction:"horizontal","scroll-container":G.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(S.Pagination),e.mergeProps({key:1,class:e.unref(u)("pagination")},e.unref(z).pagination,{onChange:e.unref(ae)}),null,16,["class","onChange"])):e.createCommentVNode("",!0)],2)],6)],6))}});exports.default=qe;
+"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"),we=require("../ap-form/index.js");require("../config-provider/index.js");const be=require("../ap-table/constants.js"),p=require("../ap-table/utils.js"),Re=require("../ap-table/hooks/use-table-paging-ng.js"),b=require("@aplus-frontend/antdv"),xe=require("./hooks/use-inner-params.js"),F=require("./utils/table.js"),ke=require("./hooks/use-row-selection.js"),Be=require("../ap-table/context.js"),E=require("./constants.js"),Fe=require("./hooks/use-render-columns.js"),Ee=require("@aplus-frontend/antdv/es/theme/internal");require("../scroll-bar/index.js");const Ie=require("../utils/index.js"),Ne=require("../utils/slot.js"),Pe=require("./hooks/use-table-style.js"),Ve=require("../config-provider/hooks/use-namespace.js"),qe=require("../config-provider/hooks/use-global-config.js"),ze=require("../config-provider/hooks/use-locale.js"),Te=require("../scroll-bar/index.vue.js"),_e=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}},setup($,{expose:U}){var O;const g=e.useSlots(),o=$,y=(O=e.getCurrentInstance())==null?void 0:O.appContext.app;y&&!y.__VXE_PC_UI_INSTALLED__&&(y.use(v.VxeUI),y.__VXE_PC_UI_INSTALLED__=!0);const{e:S,b:u,be:M}=Ve.useNamespace("ap-grid"),j=qe.useGlobalConfig("valueTypeMap"),s=e.ref([]),I=e.ref([]),l=e.ref(),w=e.ref(o.size),W=Pe.useTableStyle(),[,H]=Ee.useToken(),{t:G}=ze.useLocale();v.VxeUI.setConfig({i18n:(t,r)=>G(`ap.${t}`,r)});const{renderConfig:X,updateSignal:J}=Fe.useRenderColumns(s);let N=0;const Q=e.computed(()=>{if(l.value)return l.value.$el.querySelector(".vxe-table--header-inner-wrapper")}),P=e.computed(()=>{var t,r,a;return N++,((a=(r=(t=o.columns)==null?void 0:t.filter(n=>!n.hideInSearch&&n.dataIndex&&(n.valueType||n.customRenderFormItem)&&!be.noRenderAsFormItemValueList.includes(n.valueType)))==null?void 0:r.sort((n,c)=>{let h=p.getColumnOrder(n.order);return p.getColumnOrder(c.order)-h}))==null?void 0:a.map(n=>{const c=p.updateFormProps(n,p.getFieldProps(n.fieldProps,{})),h={...n,fieldProps:{label:n.title,name:n.dataIndex,bordered:!0,...c||{},_signal:N},renderNode:void 0};return h.renderNode=p.getSearchFormItemRenderNode(h,e.unref(j)),h}))||[]}),Y=e.computed(()=>{var r;return Ie.isDef(o.manual)?o.manual:Ne.getValidVNodeList(((r=g.searchFormExtra)==null?void 0:r.call(g))||[]).some(a=>{var n;return((n=a.type)==null?void 0:n.name)==="ApView"})}),Z=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:ee,data:d,tableProps:z,setDataSource:te,handleTableChangeOptional:re,getPaging:oe,setPaging:ae}=Re.useTablePaging({async request(t){var a;if(!f.value.preserveSelectedRowKeys&&i.isUndefined(o.dataSource)&&B(),!i.isUndefined(o.dataSource)){const n=t.pageSize*(t.current-1);return{data:(o.pagination===!1?o.dataSource:o.dataSource.slice(n,n+t.pageSize))||[],total:o.dataSource.length||0}}const r=await((a=o.request)==null?void 0:a.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(Y),formatParams:o.beforeSearchSubmit,pagination:o.pagination,onClickReset:ye,onAfterRequest:D}),{sortChangeEvent:ne,filterChangeEvent:le,paginationChangeEvent:se}=xe.useInnerParams(re);Be.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:M("table-header","title"),color:H.value.colorTextTertiary})),dataSource:e.computed(()=>e.unref(d).records),getSearchFormValues:_,setSearchFormValues:T,submit:R,reset:x,getSearchFormSorterItems:A,setSearchFormSorterItems:L,resetSearchFormSorterItems:K});const ue=e.computed(()=>s.value.some(t=>t.fixed==="left"||t.fixed===!0)?"left":void 0),ce=e.computed(()=>i.isUndefined(o.loading)?d.loading:o.loading),ie=e.computed(()=>i.isUndefined(o.dataSource)?d.records:o.dataSource),{selectedRows:k,rowSelection:f,...C}=ke.default({...o.rowSelection===!0?{}:o.rowSelection,dataSource:ie,rowKey:o.rowKey}),de=({checked:t,row:r})=>{const a=l.value;if(a&&a){const n=[...a.getCheckboxReserveRecords(),...a.getCheckboxRecords()];C.selectChange(r,t,n)}},fe=({checked:t})=>{const r=l.value;r&&C.selectAllChange(t,[...r.getCheckboxReserveRecords(),...r.getCheckboxRecords()])},pe=()=>{const t=l.value;t&&C.selectRangeChange(t.getCheckboxRecords(),[...t.getCheckboxReserveRecords(),...t.getCheckboxRecords()])},me=()=>{const t=l.value;t&&(k.value=[t.getRadioRecord()])},ge=({row:t})=>{const r=o.rowHighlightable;i.isFunction(r)&&r(t)};function Ce(){var t;return((t=o.columns)==null?void 0:t.filter(r=>!r.hideInTable))||[]}function T(t){var r,a,n;(n=(a=(r=m.value)==null?void 0:r.apForm)==null?void 0:a.setFieldsValue)==null||n.call(a,t)}function _(t=!1){var a,n,c;const r=t?"getFieldsValueTransformed":"getFieldsValue";return(c=(n=(a=m.value)==null?void 0:a.apForm)==null?void 0:n[r])==null?void 0:c.call(n,!0)}function A(){var t;return((t=m.value)==null?void 0:t.getSorterItems())||[]}function L(t){var r;(r=m.value)==null||r.setSorterItems(t)}function K(){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 he(t){i.isFunction(o.rowKey)||(C.selectMultiByKeys(t),D())}function ve(t){const r=l.value;if(!r)return;const a=String(t[o.rowKey]),n=r.getRowById(a);r.setCurrentRow(n)}function ye(){const t=l.value;t&&(t.clearSort(),t.clearFilter())}function D(){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 Se(t,r){var n;const a=d.records[t];if(a)return(n=l.value)==null?void 0:n.scrollToRow(a,r)}return e.watch(()=>[o.columnResizable,o.columns],()=>{var r;const t=Ce();s.value=t,(r=o.onShownColumnsChange)==null||r.call(o,t),I.value=t},{deep:!0,immediate:!0}),e.watch(()=>o.dataSource,t=>{te(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}),U({submit:R,reset:x,refresh:ee,setSearchFormValues:T,getSearchFormValues:_,getShowColumns:()=>e.unref(s),rowSelection:{selectedRows:e.computed(()=>k.value),setSelectedRowKeys:he,clearAll:B},scrollToRow:Se,getDataSource:()=>e.unref(d.records),setCurrentRow:ve,getPaging:oe,setPaging:ae,getSearchFormSorterItems:A,setSearchFormSorterItems:L,resetSearchFormSorterItems:K}),(t,r)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(Z.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(we.ApForm).SearchForm,e.mergeProps(t.searchForm||{},{ref_key:"formRef",ref:m,"custom-reset":"","submit-loading":e.unref(z).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,a=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(a.renderNode.Comp),e.mergeProps({key:a.dataIndex,item:a,ref_for:!0},a.fieldProps||{},{span:a.span,"custom-render":a.renderNode.render}),null,16,["item","span","custom-render"]))),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(J),data:e.unref(d).records,"sort-config":{remote:V.value.length>0,trigger:"cell"},"filter-config":{remote:q.value.length>0},loading:ce.value,style:e.unref(W),size:w.value,onSortChange:e.unref(ne),onFilterChange:e.unref(le),onCheckboxChange:de,onCheckboxRangeChange:pe,onCheckboxAll:fe,onRadioChange:me,onCurrentChange:ge}),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:ue.value}),{content:e.withCtx(a=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(o.expandable.renderContent(a))))]),_: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(X),a=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(a),{key:a.props.colId}))),128))]),_:2},[e.renderList(e.unref(i.omit)(g,["searchFormExtra"]),(a,n)=>({name:n,fn:e.withCtx(c=>[e.renderSlot(t.$slots,n,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(Te.default),{key:0,direction:"horizontal","scroll-container":Q.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(z).pagination,{onChange:e.unref(se)}),null,16,["class","onChange"])):e.createCommentVNode("",!0)],2)],6)],6))}});exports.default=_e;

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

@@ -1,4 +1,4 @@
-import { ApFormSearchFormProps } from '../ap-form/interface';
+import { ApFormSearchFormPopoverSorterItem, ApFormSearchFormProps } from '../ap-form/interface';
 import { ApTablePaginationConfig, ApTableValueFields, ApTableValueTypes, CommonFieldReturnType, ExtraProColumnType, FieldPropsType, RequestData, ValueEnum } from '../ap-table/interface';
 import { Recordable } from '../type';
 import { TableProps } from '@aplus-frontend/antdv';
@@ -332,4 +332,20 @@ export type ApGridExpose<SearchParamsType = Recordable, RecordType = any> = {
      * @returns
      */
     setPaging: (nextPaging: InternalPagingType, refreshImmediately?: boolean) => void;
+    /**
+     * 获取查询排序
+     * @returns
+     */
+    getSearchFormSorterItems: () => ApFormSearchFormPopoverSorterItem[];
+    /**
+     * 设置查询表单排序
+     * @param sortedItems
+     * @returns
+     */
+    setSearchFormSorterItems: (sortedItems: ApFormSearchFormPopoverSorterItem[]) => void;
+    /**
+     * 重设查询表单排序
+     * @returns
+     */
+    resetSearchFormSorterItems: () => void;
 };

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

@@ -1,4 +1,5 @@
 import { ApColumnType, ApTableProps } from './interface';
+import { ApFormSearchFormPopoverSorterItem } from '../ap-form';
 import { ColumnsType, ColumnType } from '@aplus-frontend/antdv/es/table';
 import { RowSelectionReturnType } from './hooks/use-table-row-selection';
 import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, ComputedRef, VNode } from 'vue';
@@ -39,6 +40,9 @@ declare const _default: <RecordType>(__VLS_props: NonNullable<Awaited<typeof __V
             };
             y: undefined;
         };
+        getSearchFormSorterItems: () => ApFormSearchFormPopoverSorterItem[];
+        setSearchFormSorterItems: (sortedItems: ApFormSearchFormPopoverSorterItem[]) => void;
+        resetSearchFormSorterItems: () => void;
     }>): void;
     attrs: any;
     slots: Readonly<{

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

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

@@ -1644,8 +1644,8 @@ export declare const apTableFormItemMap: {
                     readonly bordered?: boolean | undefined;
                     readonly suffix?: any;
                     readonly focused?: boolean | undefined;
-                    readonly placeholder?: string | number | undefined;
                     readonly handleReset?: MouseEventHandler | undefined;
+                    readonly placeholder?: string | number | undefined;
                     readonly defaultValue?: string | number | undefined;
                     readonly id?: string | undefined;
                     readonly autocomplete?: string | undefined;
@@ -2255,8 +2255,8 @@ export declare const apTableFormItemMap: {
                     readonly bordered?: boolean | undefined;
                     readonly suffix?: any;
                     readonly focused?: boolean | undefined;
-                    readonly placeholder?: string | number | undefined;
                     readonly handleReset?: MouseEventHandler | undefined;
+                    readonly placeholder?: string | number | undefined;
                     readonly defaultValue?: string | number | undefined;
                     readonly id?: string | undefined;
                     readonly autocomplete?: string | undefined;

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

@@ -2,6 +2,7 @@ import { ColumnsType } from '@aplus-frontend/antdv/es/table';
 import { ComputedRef, InjectionKey } from 'vue';
 import { ApTableContextRenderConfig, ApTableProps } from './interface';
 import { Recordable } from '../type';
+import { ApFormSearchFormPopoverSorterItem } from '../ap-form';
 type TableSize = ApTableProps['size'];
 type ApTableContextProps<RecordType> = {
     /**
@@ -31,6 +32,9 @@ type ApTableContextProps<RecordType> = {
     setSearchFormValues?: (values: Partial<Recordable>) => void;
     submit?: () => void;
     reset?: () => void;
+    getSearchFormSorterItems?: () => ApFormSearchFormPopoverSorterItem[];
+    setSearchFormSorterItems?: (sortedItems: ApFormSearchFormPopoverSorterItem[]) => void;
+    resetSearchFormSorterItems: () => void;
 };
 export declare const ApTableContextKey: InjectionKey<ApTableContextProps<any>>;
 export declare function useProvideApTable<ModelType>(state: ApTableContextProps<ModelType>): void;

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("vue"),t=Symbol("apTableContextKey");function u(o){e.provide(t,o)}function n(){return e.inject(t,{columns:e.computed(()=>[]),updateColumns:()=>{},size:e.computed(()=>"middle"),updateSize:()=>{},dataSource:void 0,renderConfig:void 0,getSearchFormValues:()=>{},setSearchFormValues:()=>{},submit:()=>{},reset:()=>{}})}exports.ApTableContextKey=t;exports.useInjectApTable=n;exports.useProvideApTable=u;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("vue"),o=Symbol("apTableContextKey");function s(r){t.provide(o,r)}const e=()=>{};function u(){return t.inject(o,{columns:t.computed(()=>[]),updateColumns:e,size:t.computed(()=>"middle"),updateSize:e,dataSource:void 0,renderConfig:void 0,getSearchFormValues:()=>{},setSearchFormValues:e,submit:e,reset:e,getSearchFormSorterItems:()=>[],setSearchFormSorterItems:e,resetSearchFormSorterItems:e})}exports.ApTableContextKey=o;exports.useInjectApTable=u;exports.useProvideApTable=s;

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

@@ -1,6 +1,6 @@
 import { ColumnType, TableProps, ColumnsType } from '@aplus-frontend/antdv/es/table';
 import { CompareFn, SortOrder, TableRowSelection } from '@aplus-frontend/antdv/es/table/interface';
-import { ApFormItemProps, ApFormSearchFormProps } from '../ap-form';
+import { ApFormItemProps, ApFormSearchFormPopoverSorterItem, 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, VNode } from 'vue';
@@ -406,6 +406,22 @@ export type ApTableExpose<SearchParamsType = Recordable, RecordType = any> = {
      * @returns
      */
     setPaging: (nextPaging: InternalPagingType, refreshImmediately?: boolean) => void;
+    /**
+     * 获取查询排序
+     * @returns
+     */
+    getSearchFormSorterItems: () => ApFormSearchFormPopoverSorterItem[];
+    /**
+     * 设置查询表单排序
+     * @param sortedItems
+     * @returns
+     */
+    setSearchFormSorterItems: (sortedItems: ApFormSearchFormPopoverSorterItem[]) => void;
+    /**
+     * 重设查询表单排序
+     * @returns
+     */
+    resetSearchFormSorterItems: () => void;
 };
 export type ApTableContextRenderConfig = {
     color: string;

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

@@ -141,8 +141,8 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                     readonly bordered?: boolean | undefined;
                     readonly suffix?: any;
                     readonly focused?: boolean | undefined;
-                    readonly placeholder?: string | number | undefined;
                     readonly handleReset?: MouseEventHandler | undefined;
+                    readonly placeholder?: string | number | undefined;
                     readonly defaultValue?: string | number | undefined;
                     readonly id?: string | undefined;
                     readonly autocomplete?: string | undefined;
@@ -352,8 +352,8 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                     readonly bordered?: boolean | undefined;
                     readonly suffix?: any;
                     readonly focused?: boolean | undefined;
-                    readonly placeholder?: string | number | undefined;
                     readonly handleReset?: MouseEventHandler | undefined;
+                    readonly placeholder?: string | number | undefined;
                     readonly defaultValue?: string | number | undefined;
                     readonly id?: string | undefined;
                     readonly autocomplete?: string | undefined;

package/lib/src/business/ap-table-modal/hooks/use-create-table-modal.d.ts

@@ -2,6 +2,7 @@ import { OpenOptions, UseCreateTableModalProps, OpenReturnType } from '../interf
 import { Recordable } from '../../../type';
 import { TableColumnsType } from '@aplus-frontend/antdv';
 import { InternalPagingType } from '../../../ap-table/hooks/use-table-paging-ng';
+import { ApFormSearchFormPopoverSorterItem } from '../../..';
 export declare function useCreateTableModal(props: UseCreateTableModalProps): {
     readonly openModal: <T>(selected?: any[], options?: OpenOptions) => Promise< OpenReturnType<T> | undefined>;
     readonly closeModal: () => void;
@@ -37,6 +38,9 @@ export declare function useCreateTableModal(props: UseCreateTableModalProps): {
         };
         getPaging: () => InternalPagingType;
         setPaging: (nextPaging: InternalPagingType, refreshImmediately?: boolean) => void;
+        getSearchFormSorterItems: () => ApFormSearchFormPopoverSorterItem[];
+        setSearchFormSorterItems: (sortedItems: ApFormSearchFormPopoverSorterItem[]) => void;
+        resetSearchFormSorterItems: () => void;
     } | null | undefined;
     readonly isDestroyed: true;
 };

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

@@ -2,6 +2,7 @@ import { ApTableModalProps, OpenOptions } from '../interface';
 import { Recordable } from '../../../type';
 import { TableColumnsType } from '@aplus-frontend/antdv';
 import { InternalPagingType } from '../../../ap-table/hooks/use-table-paging-ng';
+import { ApFormSearchFormPopoverSorterItem } from '../../..';
 /** 函数式调用弹框表格 */
 export declare function useTableModal<TableRowType = Record<string, any>>(props: ApTableModalProps<TableRowType>): {
     reloadApTableData: () => void;
@@ -35,6 +36,9 @@ export declare function useTableModal<TableRowType = Record<string, any>>(props:
         };
         getPaging: () => InternalPagingType;
         setPaging: (nextPaging: InternalPagingType, refreshImmediately?: boolean) => void;
+        getSearchFormSorterItems: () => ApFormSearchFormPopoverSorterItem[];
+        setSearchFormSorterItems: (sortedItems: ApFormSearchFormPopoverSorterItem[]) => void;
+        resetSearchFormSorterItems: () => void;
     } | null | undefined;
     isDestroyed: true;
     open: (options?: OpenOptions) => Promise<void>;

package/lib/src/business/ap-table-modal/hooks/use-table-select-modal.d.ts

@@ -2,6 +2,7 @@ import { OpenOptions, UseTableSelectModalProps } from '../interface';
 import { Recordable } from '../../../type';
 import { TableColumnsType } from '@aplus-frontend/antdv';
 import { InternalPagingType } from '../../../ap-table/hooks/use-table-paging-ng';
+import { ApFormSearchFormPopoverSorterItem } from '../../..';
 export declare function useTableSelectModal<TableRowType = Record<string, any>>(props: UseTableSelectModalProps<TableRowType>): {
     reloadApTableData: () => void;
     resetApTableData: () => void;
@@ -34,6 +35,9 @@ export declare function useTableSelectModal<TableRowType = Record<string, any>>(
         };
         getPaging: () => InternalPagingType;
         setPaging: (nextPaging: InternalPagingType, refreshImmediately?: boolean) => void;
+        getSearchFormSorterItems: () => ApFormSearchFormPopoverSorterItem[];
+        setSearchFormSorterItems: (sortedItems: ApFormSearchFormPopoverSorterItem[]) => void;
+        resetSearchFormSorterItems: () => void;
     } | null | undefined;
     isDestroyed: true;
     open: (selected?: any[], options?: OpenOptions) => Promise<{

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

@@ -4,6 +4,7 @@ import { CreateComponentPublicInstanceWithMixins, ComponentOptionsMixin, PublicP
 import { ApTableModalProps, OpenOptions, OpenReturnType } from './interface';
 import { Recordable } from '../../type';
 import { TableColumnsType } from '@aplus-frontend/antdv';
+import { ApFormSearchFormPopoverSorterItem } from '../..';
 import { InternalPagingType } from '../../ap-table/hooks/use-table-paging-ng';
 /**
  *
@@ -49,6 +50,9 @@ declare const ApTableModal: {
                 current: number;
                 pageSize: number;
             }>, refreshImmediately?: boolean) => void;
+            getSearchFormSorterItems: () => ApFormSearchFormPopoverSorterItem[];
+            setSearchFormSorterItems: (sortedItems: ApFormSearchFormPopoverSorterItem[]) => void;
+            resetSearchFormSorterItems: () => void;
         } | null;
     }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
         finish: (selectedRowKeys: (string | number)[], selectedRows: any[]) => any;
@@ -105,6 +109,9 @@ declare const ApTableModal: {
                 };
                 y: undefined;
             };
+            getSearchFormSorterItems: () => ApFormSearchFormPopoverSorterItem[];
+            setSearchFormSorterItems: (sortedItems: ApFormSearchFormPopoverSorterItem[]) => void;
+            resetSearchFormSorterItems: () => void;
         }> | null;
     }, any, ComponentProvideOptions, {
         P: {};
@@ -153,6 +160,9 @@ declare const ApTableModal: {
                 current: number;
                 pageSize: number;
             }>, refreshImmediately?: boolean) => void;
+            getSearchFormSorterItems: () => ApFormSearchFormPopoverSorterItem[];
+            setSearchFormSorterItems: (sortedItems: ApFormSearchFormPopoverSorterItem[]) => void;
+            resetSearchFormSorterItems: () => void;
         } | null;
     }, {}, {}, {}, {
         mask: boolean;
@@ -209,6 +219,9 @@ declare const ApTableModal: {
         };
         getPaging: () => InternalPagingType;
         setPaging: (nextPaging: InternalPagingType, refreshImmediately?: boolean) => void;
+        getSearchFormSorterItems: () => ApFormSearchFormPopoverSorterItem[];
+        setSearchFormSorterItems: (sortedItems: ApFormSearchFormPopoverSorterItem[]) => void;
+        resetSearchFormSorterItems: () => void;
     } | null;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     finish: (selectedRowKeys: (string | number)[], selectedRows: any[]) => any;

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

@@ -3,6 +3,7 @@ import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOp
 import { Recordable } from '../../type';
 import { TableColumnsType } from '@aplus-frontend/antdv';
 import { InternalPagingType } from '../../ap-table/hooks/use-table-paging-ng';
+import { ApFormSearchFormPopoverSorterItem } from '../..';
 type __VLS_Props = ApTableModalProps;
 declare const _default: DefineComponent<__VLS_Props, {
     open: <T>(selected?: any[], options?: OpenOptions) => Promise<OpenReturnType<T>>;
@@ -36,6 +37,9 @@ declare const _default: DefineComponent<__VLS_Props, {
         };
         getPaging: () => InternalPagingType;
         setPaging: (nextPaging: InternalPagingType, refreshImmediately?: boolean) => void;
+        getSearchFormSorterItems: () => ApFormSearchFormPopoverSorterItem[];
+        setSearchFormSorterItems: (sortedItems: ApFormSearchFormPopoverSorterItem[]) => void;
+        resetSearchFormSorterItems: () => void;
     } | null;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     finish: (selectedRowKeys: (string | number)[], selectedRows: any[]) => any;
@@ -94,6 +98,9 @@ declare const _default: DefineComponent<__VLS_Props, {
             };
             y: undefined;
         };
+        getSearchFormSorterItems: () => ApFormSearchFormPopoverSorterItem[];
+        setSearchFormSorterItems: (sortedItems: ApFormSearchFormPopoverSorterItem[]) => void;
+        resetSearchFormSorterItems: () => void;
     }> | null;
 }, any>;
 export default _default;

package/lib/src/business/ap-view/ap-view.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const s=require("vue");require("../../config-provider/index.js");const k=require("./icons/line-down.vue.js"),L=require("../ap-batch-action-group/index.js");require("./components/main-button-content.vue.js");require("./components/menu-list-content.vue.js");const G=require("./hooks/use-view-provide.js"),z=require("../../ap-table/context.js"),V=require("./utils/enum.js"),$=require("@aplus-frontend/utils");require("../ap-keep-alive/index.js");const C=require("../../config-provider/hooks/use-global-config.js"),H=require("../../config-provider/hooks/use-namespace.js"),J=require("../../config-provider/hooks/use-locale.js"),Q=require("./components/main-button-content.vue2.js"),X=require("./components/menu-list-content.vue2.js"),Z=require("../ap-keep-alive/hook.js"),U=s.defineComponent({name:"ApView",__name:"ap-view",props:{tableKey:{},saveDataSource:{},viewCacheOption:{},maxViewNum:{default:20},isDefaultSystemView:{type:Boolean,default:!1},isFirstDefaultSystemView:{type:Boolean,default:!1}},setup(Y,{expose:T}){const c=Y,F=C.useGlobalConfig("viewCacheOption"),{b:_}=H.useNamespace("ap-view"),{t:M}=J.useLocale(),K=s.computed(()=>({viewKey:V.SYSTEM_VIEW_KEY,viewName:M("ap.apView.systemView")})),{getSearchFormValues:I,setSearchFormValues:S,submit:x,reset:h}=z.useInjectApTable(),A=s.ref(!1),b=s.ref(!1),p=s.ref("");let v=!1,g=!1;const B={dropdownType:"dropdown",content:s.createVNode(Q.default,{maxViewNum:c.maxViewNum},null)},u=s.ref([K.value]),P=s.computed(()=>u.value.map(t=>({id:t.viewKey,content:s.createVNode(X.default,{view:t},null)}))),e={getSearchFormValues:I,setSearchFormValues:S,submit:x,reset:h,...c.saveDataSource},i={...F.value,...c.viewCacheOption},E=()=>{if(c.isDefaultSystemView||(c.isFirstDefaultSystemView||g)&&v)return V.SYSTEM_VIEW_KEY;const t=u.value.find(n=>n.isDefault);return(t==null?void 0:t.viewKey)??V.SYSTEM_VIEW_KEY},w=t=>{p.value=t;const n=u.value.find(l=>l.viewKey===p.value);n&&setTimeout(()=>{var l,r,o,f,a,m;n.viewKey===V.SYSTEM_VIEW_KEY?v?(l=e==null?void 0:e.submit)==null||l.call(e):(r=e==null?void 0:e.reset)==null||r.call(e):((a=e==null?void 0:e.setSearchFormValues)==null||a.call(e,{...Object.fromEntries(Object.keys(((o=e==null?void 0:e.getSearchFormValues)==null?void 0:o.call(e))??{}).map(d=>[d,void 0]))??{},...((f=n.viewConfig)==null?void 0:f.searchForm)??{}}),(m=e==null?void 0:e.submit)==null||m.call(e)),v=!1})},y={getViewList:async t=>{var n;try{const{tableKey:l}=t,r=await((n=i==null?void 0:i.getViewList)==null?void 0:n.call(i,{tableKey:l}));return u.value=[K.value,...r??[]],w(E()),u.value}catch{return u.value=[K.value],w(V.SYSTEM_VIEW_KEY),u.value}},addView:async t=>{var a;const{tableKey:n,viewKey:l,viewName:r,isDefault:o,viewConfig:f}=t;await((a=i==null?void 0:i.addView)==null?void 0:a.call(i,{tableKey:n,viewKey:l,viewName:r,isDefault:o,viewConfig:f})),o&&(u.value=u.value.map(m=>({...m,isDefault:!1}))),u.value=[...u.value,{viewKey:l,viewName:r,isDefault:o,viewConfig:f}],w(l)},changeView:async t=>{var m;const{tableKey:n,viewKey:l,viewName:r,isDefault:o,viewConfig:f}=t;await((m=i==null?void 0:i.changeView)==null?void 0:m.call(i,{tableKey:n,viewKey:l,viewName:r,isDefault:o,viewConfig:f})),o&&(u.value=u.value.map(d=>({...d,isDefault:!1})));const a=u.value.find(d=>d.viewKey===l);a&&(a.viewName=r,a.isDefault=o,a.viewConfig=f),w(l)},removeView:async t=>{var r;const{tableKey:n,viewKey:l}=t;await((r=i==null?void 0:i.removeView)==null?void 0:r.call(i,{tableKey:n,viewKey:l})),u.value=u.value.filter(o=>o.viewKey!==l),l===p.value&&w(E())}},W={tableKey:c.tableKey,currentViewKey:p,changeCurrentViewKey:w,popoverOpen:A,menuOpen:b,viewList:u,viewListCRUD:y,saveDataSource:e};G.useViewProvide(W);const{has:j}=Z.useApKeepAliveInject(),q=t=>{g=t},N=t=>{var n;$.isValid(t)&&(v=!0,(n=y==null?void 0:y.getViewList)==null||n.call(y,{tableKey:t}))};return s.onMounted(async()=>{await j()&&q(!0),N(c.tableKey)}),s.watch(()=>c.tableKey,t=>{N(t)}),T({setFirstDefaultSystemView:q}),(t,n)=>(s.openBlock(),s.createBlock(s.unref(L.ApBatchActionGroup),s.mergeProps({...t.$attrs},{open:b.value,"onUpdate:open":n[0]||(n[0]=l=>b.value=l),class:[s.unref(_)()],"button-props":B,"menu-list":P.value,"overlay-class-name":[s.unref(_)("overlay")],trigger:"click",placement:"bottom"}),{icon:s.withCtx(()=>[s.createElementVNode("div",{class:s.normalizeClass([s.unref(_)("icon")])},[s.createVNode(k.default)],2)]),_:1},16,["open","class","menu-list","overlay-class-name"]))}});exports.default=U;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const i=require("vue");require("../../config-provider/index.js");const z=require("./icons/line-down.vue.js"),$=require("../ap-batch-action-group/index.js");require("./components/main-button-content.vue.js");require("./components/menu-list-content.vue.js");const H=require("./hooks/use-view-provide.js"),J=require("../../ap-table/context.js"),d=require("./utils/enum.js"),Q=require("@aplus-frontend/utils"),X=require("../../config-provider/hooks/use-global-config.js"),Z=require("../../config-provider/hooks/use-namespace.js"),C=require("../../config-provider/hooks/use-locale.js"),U=require("./components/main-button-content.vue2.js"),R=require("./components/menu-list-content.vue2.js"),O=i.defineComponent({name:"ApView",__name:"ap-view",props:{tableKey:{},saveDataSource:{},viewCacheOption:{},maxViewNum:{default:20},isDefaultSystemView:{type:Boolean,default:!1},isFirstDefaultSystemView:{type:Boolean,default:!1}},setup(I,{expose:N}){const f=I,Y=X.useGlobalConfig("viewCacheOption"),{b:K}=Z.useNamespace("ap-view"),{t:S}=C.useLocale(),v=i.computed(()=>({viewKey:d.SYSTEM_VIEW_KEY,viewName:S("ap.apView.systemView")})),{getSearchFormValues:T,setSearchFormValues:M,submit:x,reset:B,getSearchFormSorterItems:P,setSearchFormSorterItems:W,resetSearchFormSorterItems:h}=J.useInjectApTable(),L=i.ref(!1),b=i.ref(!1),p=i.ref("");let _=!1,g=!1;const j={dropdownType:"dropdown",content:i.createVNode(U.default,{maxViewNum:f.maxViewNum},null)},r=i.ref([v.value]),k=i.computed(()=>r.value.map(t=>({id:t.viewKey,content:i.createVNode(R.default,{view:t},null)}))),e={getSearchFormValues:T,setSearchFormValues:M,submit:x,reset:B,getSearchFormSorterItems:P,setSearchFormSorterItems:W,resetSearchFormSorterItems:h,...f.saveDataSource},l={...Y.value,...f.viewCacheOption},E=()=>{if(f.isDefaultSystemView||(f.isFirstDefaultSystemView||g)&&_)return d.SYSTEM_VIEW_KEY;const t=r.value.find(s=>s.isDefault);return(t==null?void 0:t.viewKey)??d.SYSTEM_VIEW_KEY},w=t=>{p.value=t;const s=r.value.find(n=>n.viewKey===p.value);s&&setTimeout(()=>{var n,u,o,m,a,c,V,q,F;s.viewKey===d.SYSTEM_VIEW_KEY?((n=e==null?void 0:e.resetSearchFormSorterItems)==null||n.call(e),_?(u=e==null?void 0:e.submit)==null||u.call(e):(o=e==null?void 0:e.reset)==null||o.call(e)):((c=e==null?void 0:e.setSearchFormValues)==null||c.call(e,{...Object.fromEntries(Object.keys(((m=e==null?void 0:e.getSearchFormValues)==null?void 0:m.call(e))??{}).map(G=>[G,void 0]))??{},...((a=s.viewConfig)==null?void 0:a.searchForm)??{}}),(q=e==null?void 0:e.setSearchFormSorterItems)==null||q.call(e,((V=s.viewConfig)==null?void 0:V.sorterItems)??[]),(F=e==null?void 0:e.submit)==null||F.call(e)),_=!1})},y={getViewList:async t=>{var s;try{const{tableKey:n}=t,u=await((s=l==null?void 0:l.getViewList)==null?void 0:s.call(l,{tableKey:n}));return r.value=[v.value,...u??[]],w(E()),r.value}catch{return r.value=[v.value],w(d.SYSTEM_VIEW_KEY),r.value}},addView:async t=>{var a;const{tableKey:s,viewKey:n,viewName:u,isDefault:o,viewConfig:m}=t;await((a=l==null?void 0:l.addView)==null?void 0:a.call(l,{tableKey:s,viewKey:n,viewName:u,isDefault:o,viewConfig:m})),o&&(r.value=r.value.map(c=>({...c,isDefault:!1}))),r.value=[...r.value,{viewKey:n,viewName:u,isDefault:o,viewConfig:m}],w(n)},changeView:async t=>{var c;const{tableKey:s,viewKey:n,viewName:u,isDefault:o,viewConfig:m}=t;await((c=l==null?void 0:l.changeView)==null?void 0:c.call(l,{tableKey:s,viewKey:n,viewName:u,isDefault:o,viewConfig:m})),o&&(r.value=r.value.map(V=>({...V,isDefault:!1})));const a=r.value.find(V=>V.viewKey===n);a&&(a.viewName=u,a.isDefault=o,a.viewConfig=m),w(n)},removeView:async t=>{var u;const{tableKey:s,viewKey:n}=t;await((u=l==null?void 0:l.removeView)==null?void 0:u.call(l,{tableKey:s,viewKey:n})),r.value=r.value.filter(o=>o.viewKey!==n),n===p.value&&w(E())}},A={tableKey:f.tableKey,currentViewKey:p,changeCurrentViewKey:w,popoverOpen:L,menuOpen:b,viewList:r,viewListCRUD:y,saveDataSource:e};return H.useViewProvide(A),i.watch(()=>f.tableKey,t=>{var s;Q.isValid(t)&&(_=!0,(s=y==null?void 0:y.getViewList)==null||s.call(y,{tableKey:t}))},{immediate:!0}),N({setFirstDefaultSystemView:t=>{g=t}}),(t,s)=>(i.openBlock(),i.createBlock(i.unref($.ApBatchActionGroup),i.mergeProps({...t.$attrs},{open:b.value,"onUpdate:open":s[0]||(s[0]=n=>b.value=n),class:[i.unref(K)()],"button-props":j,"menu-list":k.value,"overlay-class-name":[i.unref(K)("overlay")],trigger:"click",placement:"bottom"}),{icon:i.withCtx(()=>[i.createElementVNode("div",{class:i.normalizeClass([i.unref(K)("icon")])},[i.createVNode(z.default)],2)]),_:1},16,["open","class","menu-list","overlay-class-name"]))}});exports.default=O;

package/lib/src/business/ap-view/components/main-button-content.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),s=require("@aplus-frontend/antdv");require("../../../config-provider/index.js");const y=require("../icons/line-eye.vue.js");require("../../../ap-form/ap-form.vue.js");const C=require("../../../ap-field/index.js");require("../../../ap-button/index.js");const q=require("dayjs"),b=require("../hooks/use-view-provide.js"),F=require("../utils/uuid.js"),z=require("lodash-unified"),T=require("../../../config-provider/hooks/use-locale.js"),k=require("../../../config-provider/hooks/use-namespace.js"),p=require("../../../ap-form/ap-form.vue2.js"),N=require("../../../ap-button/ap-button.vue.js"),D=e.defineComponent({__name:"main-button-content",props:{maxViewNum:{}},setup(h){const c=h,{t}=T.useLocale(),{b:r}=k.useNamespace("ap-view"),d=e.ref(),{tableKey:x,popoverOpen:o,viewList:u,saveDataSource:n,viewListCRUD:m}=b.useViewInject(),w=e.computed({get:()=>o.value&&u.value.length<c.maxViewNum+1,set:l=>{u.value.length<c.maxViewNum+1&&(o.value=l)}});e.watch(o,l=>{var a;l&&((a=d.value)==null||a.resetFields(),setTimeout(()=>{var i;(i=d.value)==null||i.setFieldsValue({isDefault:!u.value.some(f=>f.isDefault)})}))});const _=async l=>{var v,V;const{viewName:a,isDefault:i}=l,f=F.generateUniqueKey(),g={searchForm:z.cloneDeep((v=n==null?void 0:n.getSearchFormValues)==null?void 0:v.call(n,!!(n!=null&&n.searchFormTransform)))};await((V=m.addView)==null?void 0:V.call(m,{tableKey:x,viewKey:f,viewName:a,isDefault:i,viewConfig:g})),o.value=!1};return(l,a)=>(e.openBlock(),e.createBlock(e.unref(s.Popover),{open:w.value,"onUpdate:open":a[1]||(a[1]=i=>w.value=i),placement:"bottom",trigger:"click",arrow:!1,"overlay-inner-style":{padding:"12px 16px"}},{content:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass([e.unref(r)("main-content-popover")])},[e.createVNode(p.default,{ref_key:"formRef",ref:d,layout:"vertical","initial-values":{viewName:`${e.unref(t)("ap.apView.newView")} ${e.unref(q)().format("YYYY-MM-DD").toString()}`},onFinish:_},{default:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass([e.unref(r)("main-content-popover-title-content")])},[e.createElementVNode("div",{class:e.normalizeClass([e.unref(r)("main-content-popover-title-content-title")])},e.toDisplayString(e.unref(t)("ap.apView.saveNewView")),3),e.createVNode(p.default.FormItem,{name:"isDefault","value-prop-name":"checked"},{default:e.withCtx(()=>[e.createVNode(e.unref(s.Checkbox),null,{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(t)("ap.apView.setDefault")),1)]),_:1})]),_:1})],2),e.createVNode(p.default.FormItem,{label:e.unref(t)("ap.apView.viewName"),name:"viewName",rules:[{required:!0,message:e.unref(t)("ap.apView.notEmpty")}]},{default:e.withCtx(()=>[e.createVNode(e.unref(C.ApField).Text,{placeholder:e.unref(t)("ap.apView.viewName"),maxlength:20,"show-count":""},null,8,["placeholder"])]),_:1},8,["label","rules"]),e.createVNode(p.default.FormItem,{class:e.normalizeClass([e.unref(r)("main-content-popover-btn")])},{default:e.withCtx(()=>[e.createVNode(e.unref(s.Space),{size:8},{default:e.withCtx(()=>[e.createVNode(e.unref(N.default),{size:"small",onClick:a[0]||(a[0]=i=>o.value=!1)},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(t)("ap.apView.cancel")),1)]),_:1}),e.createVNode(e.unref(N.default),{type:"primary",size:"small","html-type":"submit"},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(t)("ap.apView.save")),1)]),_:1})]),_:1})]),_:1},8,["class"])]),_:1},8,["initial-values"])],2)]),default:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass({[e.unref(r)("main-content")]:!0,[e.unref(r)("main-content-disabled")]:e.unref(u).length>=c.maxViewNum+1})},[e.createVNode(e.unref(s.Tooltip),{placement:"bottom"},e.createSlots({default:e.withCtx(()=>[e.createVNode(e.unref(s.Space),{size:4},{default:e.withCtx(()=>[e.createVNode(y.default,{class:e.normalizeClass([e.unref(r)("icon")])},null,8,["class"]),e.createElementVNode("div",null,e.toDisplayString(e.unref(t)("ap.apView.saveView")),1)]),_:1})]),_:2},[e.unref(u).length>=c.maxViewNum+1?{name:"title",fn:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(t)("ap.apView.maxTip")),1)]),key:"0"}:void 0]),1024)],2)]),_:1},8,["open"]))}});exports.default=D;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),s=require("@aplus-frontend/antdv");require("../../../config-provider/index.js");const F=require("../icons/line-eye.vue.js");require("../../../ap-form/ap-form.vue.js");const z=require("../../../ap-field/index.js");require("../../../ap-button/index.js");const T=require("dayjs"),k=require("../hooks/use-view-provide.js"),E=require("../utils/uuid.js"),h=require("lodash-unified"),I=require("../../../config-provider/hooks/use-locale.js"),S=require("../../../config-provider/hooks/use-namespace.js"),p=require("../../../ap-form/ap-form.vue2.js"),x=require("../../../ap-button/ap-button.vue.js"),D=e.defineComponent({__name:"main-button-content",props:{maxViewNum:{}},setup(_){const c=_,{t:n}=I.useLocale(),{b:r}=S.useNamespace("ap-view"),m=e.ref(),{tableKey:g,popoverOpen:o,viewList:u,saveDataSource:t,viewListCRUD:d}=k.useViewInject(),w=e.computed({get:()=>o.value&&u.value.length<c.maxViewNum+1,set:l=>{u.value.length<c.maxViewNum+1&&(o.value=l)}});e.watch(o,l=>{var a;l&&((a=m.value)==null||a.resetFields(),setTimeout(()=>{var i;(i=m.value)==null||i.setFieldsValue({isDefault:!u.value.some(f=>f.isDefault)})}))});const y=async l=>{var V,v,N;const{viewName:a,isDefault:i}=l,f=E.generateUniqueKey(),C=h.cloneDeep((V=t==null?void 0:t.getSearchFormValues)==null?void 0:V.call(t,!!(t!=null&&t.searchFormTransform))),q=h.cloneDeep((v=t==null?void 0:t.getSearchFormSorterItems)==null?void 0:v.call(t)),b={searchForm:C,sorterItems:q};await((N=d.addView)==null?void 0:N.call(d,{tableKey:g,viewKey:f,viewName:a,isDefault:i,viewConfig:b})),o.value=!1};return(l,a)=>(e.openBlock(),e.createBlock(e.unref(s.Popover),{open:w.value,"onUpdate:open":a[1]||(a[1]=i=>w.value=i),placement:"bottom",trigger:"click",arrow:!1,"overlay-inner-style":{padding:"12px 16px"}},{content:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass([e.unref(r)("main-content-popover")])},[e.createVNode(p.default,{ref_key:"formRef",ref:m,layout:"vertical","initial-values":{viewName:`${e.unref(n)("ap.apView.newView")} ${e.unref(T)().format("YYYY-MM-DD").toString()}`},onFinish:y},{default:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass([e.unref(r)("main-content-popover-title-content")])},[e.createElementVNode("div",{class:e.normalizeClass([e.unref(r)("main-content-popover-title-content-title")])},e.toDisplayString(e.unref(n)("ap.apView.saveNewView")),3),e.createVNode(p.default.FormItem,{name:"isDefault","value-prop-name":"checked"},{default:e.withCtx(()=>[e.createVNode(e.unref(s.Checkbox),null,{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(n)("ap.apView.setDefault")),1)]),_:1})]),_:1})],2),e.createVNode(p.default.FormItem,{label:e.unref(n)("ap.apView.viewName"),name:"viewName",rules:[{required:!0,message:e.unref(n)("ap.apView.notEmpty")}]},{default:e.withCtx(()=>[e.createVNode(e.unref(z.ApField).Text,{placeholder:e.unref(n)("ap.apView.viewName"),maxlength:20,"show-count":""},null,8,["placeholder"])]),_:1},8,["label","rules"]),e.createVNode(p.default.FormItem,{class:e.normalizeClass([e.unref(r)("main-content-popover-btn")])},{default:e.withCtx(()=>[e.createVNode(e.unref(s.Space),{size:8},{default:e.withCtx(()=>[e.createVNode(e.unref(x.default),{size:"small",onClick:a[0]||(a[0]=i=>o.value=!1)},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(n)("ap.apView.cancel")),1)]),_:1}),e.createVNode(e.unref(x.default),{type:"primary",size:"small","html-type":"submit"},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(n)("ap.apView.save")),1)]),_:1})]),_:1})]),_:1},8,["class"])]),_:1},8,["initial-values"])],2)]),default:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass({[e.unref(r)("main-content")]:!0,[e.unref(r)("main-content-disabled")]:e.unref(u).length>=c.maxViewNum+1})},[e.createVNode(e.unref(s.Tooltip),{placement:"bottom"},e.createSlots({default:e.withCtx(()=>[e.createVNode(e.unref(s.Space),{size:4},{default:e.withCtx(()=>[e.createVNode(F.default,{class:e.normalizeClass([e.unref(r)("icon")])},null,8,["class"]),e.createElementVNode("div",null,e.toDisplayString(e.unref(n)("ap.apView.saveView")),1)]),_:1})]),_:2},[e.unref(u).length>=c.maxViewNum+1?{name:"title",fn:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(e.unref(n)("ap.apView.maxTip")),1)]),key:"0"}:void 0]),1024)],2)]),_:1},8,["open"]))}});exports.default=D;

package/lib/src/business/ap-view/interface.d.ts

@@ -1,9 +1,13 @@
+import { ApFormSearchFormPopoverSorterItem } from '../../ap-form';
 import { Recordable } from '../../type';
 export interface SaveDataSource {
     getSearchFormValues?: (transform?: boolean) => (Partial<Recordable> & Recordable<any>) | undefined;
     setSearchFormValues?: (values: Partial<Recordable>) => void;
     submit?: () => void;
     reset?: () => void;
+    getSearchFormSorterItems?: () => ApFormSearchFormPopoverSorterItem[];
+    setSearchFormSorterItems?: (sortedItems: ApFormSearchFormPopoverSorterItem[]) => void;
+    resetSearchFormSorterItems?: () => void;
     /**
      * 是否转换搜索表单,默认为 false
      */

package/lib/src/business/batch-input-group/index.vue.d.ts

@@ -51,8 +51,8 @@ declare const _default: DefineComponent<BatchInputGroupProps, {}, {}, {}, {}, Co
             readonly bordered?: boolean | undefined;
             readonly suffix?: any;
             readonly focused?: boolean | undefined;
-            readonly placeholder?: string | number | undefined;
             readonly handleReset?: MouseEventHandler | undefined;
+            readonly placeholder?: string | number | undefined;
             readonly defaultValue?: string | number | undefined;
             readonly id?: string | undefined;
             readonly autocomplete?: string | undefined;

package/lib/src/business/hooks/usePageListApTable.d.ts

@@ -3,6 +3,7 @@ import { UseTableRefreshOption } from './useTableRefresh';
 import { Recordable } from '../../type';
 import { TableColumnsType } from '@aplus-frontend/antdv';
 import { InternalPagingType } from '../../ap-table/hooks/use-table-paging-ng';
+import { ApFormSearchFormPopoverSorterItem } from '../../ap-form';
 export interface UsePageListApTable extends ApTableProps {
     /** 是否显示默认的行选择配置
      * @default true
@@ -61,6 +62,9 @@ export declare function usePageListApTable(props?: UsePageListApTable): [ApTable
         };
         getPaging: () => InternalPagingType;
         setPaging: (nextPaging: InternalPagingType, refreshImmediately?: boolean) => void;
+        getSearchFormSorterItems: () => ApFormSearchFormPopoverSorterItem[];
+        setSearchFormSorterItems: (sortedItems: ApFormSearchFormPopoverSorterItem[]) => void;
+        resetSearchFormSorterItems: () => void;
     } | null | undefined;
     getSearchFormValuesAndSorted: (transform?: boolean) => any;
     clearSelection: () => void;

package/lib/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.6.3";
+declare const _default: "0.6.5";
 export default _default;

package/lib/src/version.js

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

package/package.json

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

package/theme/ap-form/ap-form-item.css

@@ -87,6 +87,10 @@
 .aplus-ap-form-item--bordered:has(.ant-select) .ant-form-item-label > label {
   padding-right: 4px;
 }
+.aplus-ap-form-item--bordered div.ant-form-item-control {
+  flex: 1 1 0;
+  min-width: 0;
+}
 .aplus-ap-form-item--bordered .ant-form-item-label > label {
   padding-right: 12px;
   height: 30px;

package/theme/ap-form/ap-form-item.less

@@ -57,6 +57,10 @@
         padding-right: @spacing-xs;
       }
     }
+    div.ant-form-item-control {
+      flex: 1 1 0;
+      min-width: 0;
+    }
     .ant-form-item-label > label {
       padding-right: @spacing-lg;
       height: 30px;

package/theme/ap-form/index.css

@@ -96,6 +96,10 @@
 .aplus-ap-form-item--bordered:has(.ant-select) .ant-form-item-label > label {
   padding-right: 4px;
 }
+.aplus-ap-form-item--bordered div.ant-form-item-control {
+  flex: 1 1 0;
+  min-width: 0;
+}
 .aplus-ap-form-item--bordered .ant-form-item-label > label {
   padding-right: 12px;
   height: 30px;

package/theme/ap-form/search-form.css

@@ -87,6 +87,10 @@
 .aplus-ap-form-item--bordered:has(.ant-select) .ant-form-item-label > label {
   padding-right: 4px;
 }
+.aplus-ap-form-item--bordered div.ant-form-item-control {
+  flex: 1 1 0;
+  min-width: 0;
+}
 .aplus-ap-form-item--bordered .ant-form-item-label > label {
   padding-right: 12px;
   height: 30px;

package/theme/ap-grid/index.css

@@ -96,6 +96,10 @@
 .aplus-ap-form-item--bordered:has(.ant-select) .ant-form-item-label > label {
   padding-right: 4px;
 }
+.aplus-ap-form-item--bordered div.ant-form-item-control {
+  flex: 1 1 0;
+  min-width: 0;
+}
 .aplus-ap-form-item--bordered .ant-form-item-label > label {
   padding-right: 12px;
   height: 30px;
@@ -586,6 +590,21 @@
   display: flex;
   align-items: center;
 }
+.aplus-ap-grid .vxe-loading.vxe-table--loading {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  z-index: 99;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+          user-select: none;
+}
+.aplus-ap-grid .vxe-loading.vxe-table--loading .vxe-loading--wrapper {
+  width: 100%;
+  height: 100%;
+}
 .aplus-ap-grid__table-loading-wrapper {
   height: 100%;
   display: flex;