@aplus-frontend/ui 0.0.2 → 0.0.4

package/es/src/theme/antd-global-overwrite/aplus/table.css

@@ -1,5 +1,12 @@
-.ant-table-wrapper .ant-table.ant-table.ant-table-small .ant-table-title,
-.ant-table-wrapper .ant-table.ant-table.ant-table-middle .ant-table-title {
+[class$='-basic-table'],
+[class$='-basic-table-form-container'] {
+  width: 100%;
+  height: 100%;
+}
+[class$='-basic-table'] .ant-table-wrapper .ant-table.ant-table.ant-table-small .ant-table-title,
+[class$='-basic-table-form-container'] .ant-table-wrapper .ant-table.ant-table.ant-table-small .ant-table-title,
+[class$='-basic-table'] .ant-table-wrapper .ant-table.ant-table.ant-table-middle .ant-table-title,
+[class$='-basic-table-form-container'] .ant-table-wrapper .ant-table.ant-table.ant-table-middle .ant-table-title {
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -7,15 +14,18 @@
   padding: 0 0 10px;
   border: none;
 }
-.ant-table-wrapper .ant-table {
+[class$='-basic-table'] .ant-table-wrapper .ant-table,
+[class$='-basic-table-form-container'] .ant-table-wrapper .ant-table {
   width: 100%;
   overflow-x: hidden;
   border-radius: 0;
 }
-.ant-table-wrapper .ant-table .ant-table-container .ant-table-header {
+[class$='-basic-table'] .ant-table-wrapper .ant-table .ant-table-container .ant-table-header,
+[class$='-basic-table-form-container'] .ant-table-wrapper .ant-table .ant-table-container .ant-table-header {
   border-radius: 0;
 }
-.ant-table-wrapper .ant-table .ant-table-container .ant-table-header .ant-table-thead > tr > th {
+[class$='-basic-table'] .ant-table-wrapper .ant-table .ant-table-container .ant-table-header .ant-table-thead > tr > th,
+[class$='-basic-table-form-container'] .ant-table-wrapper .ant-table .ant-table-container .ant-table-header .ant-table-thead > tr > th {
   color: #182948;
   font-weight: 700;
   font-size: 14px;
@@ -24,18 +34,22 @@
   text-transform: none;
   background: #f2f6f9;
 }
-.ant-table-wrapper .ant-table .ant-table-container .ant-table-header .ant-table-thead > tr > th::before {
+[class$='-basic-table'] .ant-table-wrapper .ant-table .ant-table-container .ant-table-header .ant-table-thead > tr > th::before,
+[class$='-basic-table-form-container'] .ant-table-wrapper .ant-table .ant-table-container .ant-table-header .ant-table-thead > tr > th::before {
   display: none;
   width: 0;
   visibility: hidden;
 }
-.ant-table-wrapper .ant-table-body .ant-table-tbody > tr.ant-table-row:hover {
+[class$='-basic-table'] .ant-table-wrapper .ant-table-body .ant-table-tbody > tr.ant-table-row:hover,
+[class$='-basic-table-form-container'] .ant-table-wrapper .ant-table-body .ant-table-tbody > tr.ant-table-row:hover {
   background: #f6f9fa;
 }
-.ant-table-wrapper .ant-table-body .ant-table-tbody > tr.ant-table-row:hover > td {
+[class$='-basic-table'] .ant-table-wrapper .ant-table-body .ant-table-tbody > tr.ant-table-row:hover > td,
+[class$='-basic-table-form-container'] .ant-table-wrapper .ant-table-body .ant-table-tbody > tr.ant-table-row:hover > td {
   background: #f6f9fa;
 }
-.ant-table-wrapper .ant-table-body .ant-table-tbody > tr.ant-table-row > td {
+[class$='-basic-table'] .ant-table-wrapper .ant-table-body .ant-table-tbody > tr.ant-table-row > td,
+[class$='-basic-table-form-container'] .ant-table-wrapper .ant-table-body .ant-table-tbody > tr.ant-table-row > td {
   color: #182948;
   font-weight: 400;
   font-size: 14px;
@@ -44,35 +58,36 @@
   text-transform: none;
   transition: unset;
 }
-.ant-table-wrapper .ant-table.ant-table-middle .ant-table-container .ant-table-thead tr > th {
+[class$='-basic-table'] .ant-table-wrapper .ant-table.ant-table-middle .ant-table-container .ant-table-thead tr > th,
+[class$='-basic-table-form-container'] .ant-table-wrapper .ant-table.ant-table-middle .ant-table-container .ant-table-thead tr > th {
   padding: 12px 16px;
   line-height: 22px;
 }
-.ant-table-wrapper .ant-table.ant-table-middle .ant-table-container .ant-table-tbody tr.ant-table-measure-row + tr > td {
+[class$='-basic-table'] .ant-table-wrapper .ant-table.ant-table-middle .ant-table-container .ant-table-tbody tr.ant-table-measure-row + tr > td,
+[class$='-basic-table-form-container'] .ant-table-wrapper .ant-table.ant-table-middle .ant-table-container .ant-table-tbody tr.ant-table-measure-row + tr > td {
   border-top: 1px solid;
   border-top-color: transparent;
 }
-.ant-table-wrapper .ant-table.ant-table-middle .ant-table-container .ant-table-tbody tr > .ant-table-cell {
+[class$='-basic-table'] .ant-table-wrapper .ant-table.ant-table-middle .ant-table-container .ant-table-tbody tr > .ant-table-cell,
+[class$='-basic-table-form-container'] .ant-table-wrapper .ant-table.ant-table-middle .ant-table-container .ant-table-tbody tr > .ant-table-cell {
   padding: 12px 16px;
   line-height: 22px;
 }
-.ant-table-wrapper .ant-table.ant-table-small .ant-table-container .ant-table-thead tr > th {
+[class$='-basic-table'] .ant-table-wrapper .ant-table.ant-table-small .ant-table-container .ant-table-thead tr > th,
+[class$='-basic-table-form-container'] .ant-table-wrapper .ant-table.ant-table-small .ant-table-container .ant-table-thead tr > th {
   padding: 10.5px 16px;
   line-height: 18px;
 }
-.ant-table-wrapper .ant-table.ant-table-small .ant-table-container .ant-table-tbody tr.ant-table-measure-row + tr > td {
+[class$='-basic-table'] .ant-table-wrapper .ant-table.ant-table-small .ant-table-container .ant-table-tbody tr.ant-table-measure-row + tr > td,
+[class$='-basic-table-form-container'] .ant-table-wrapper .ant-table.ant-table-small .ant-table-container .ant-table-tbody tr.ant-table-measure-row + tr > td {
   border-top: 1px solid;
   border-top-color: transparent;
 }
-.ant-table-wrapper .ant-table.ant-table-small .ant-table-container .ant-table-tbody tr > .ant-table-cell {
+[class$='-basic-table'] .ant-table-wrapper .ant-table.ant-table-small .ant-table-container .ant-table-tbody tr > .ant-table-cell,
+[class$='-basic-table-form-container'] .ant-table-wrapper .ant-table.ant-table-small .ant-table-container .ant-table-tbody tr > .ant-table-cell {
   padding: 10.5px 16px;
   line-height: 18px;
 }
-[class$='-basic-table'],
-[class$='-basic-table-form-container'] {
-  width: 100%;
-  height: 100%;
-}
 [class$='-basic-table-row__striped'] td {
   background-color: #f6f9fa;
 }

package/es/src/theme/ap-tag/ap-tag-group.css

@@ -2,5 +2,6 @@
   text-wrap: nowrap;
   display: flex;
   flex-wrap: nowrap;
+  white-space: nowrap;
   align-items: center;
 }

package/es/src/theme/ap-tag/ap-tag.css

@@ -1,5 +1,6 @@
 .aplus-tag-wrapper {
   text-wrap: nowrap;
+  white-space: nowrap;
   display: inline-block;
 }
 .aplus-tag-inner-wrapper {

package/es/src/theme/pro-table/pro-table.css

@@ -16,6 +16,9 @@
   border-radius: 2px;
   background-color: #fff;
 }
+.aplus-pro-table-form-container .ant-form .ant-form-item {
+  margin-bottom: 16px;
+}
 .aplus-pro-table-form-container-no-divide .ant-form {
   border-bottom-left-radius: 0 !important;
   border-bottom-right-radius: 0 !important;

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

@@ -140,11 +140,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
         };
         align: {
             type: PropType<AlignType>;
-            default: AlignType; /**
-             * tips
-             * 通常情况下，表格渲染是不需要请求网络数据的，因此这里删掉request，
-             * 如果需要做映射，可以在外部发起一次网络请求，然后使用valueEnum设置匹配枚举。
-             */
+            default: AlignType;
         };
         builtinPlacements: {
             type: PropType<BuildInPlacements>;

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

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),p=require("ant-design-vue"),z=require("../ap-form/index.js"),d=require("./constants.js");require("../config-provider/index.js");const L=require("./hooks/use-table-paging.js"),f=require("lodash-unified");require("./style/ap-table.css");const D=require("@ant-design/icons-vue"),O=require("../config-provider/hooks/use-namespace.js"),j=require("../config-provider/hooks/use-global-config.js"),M={key:0},_=e.defineComponent({name:"ApTable",__name:"ap-table",props:{dropdownPrefixCls:{},loading:{type:[Boolean,Object],default:void 0},bordered:{type:Boolean,default:!1},locale:{},onChange:{},onResizeColumn:{},rowSelection:{},getPopupContainer:{},scroll:{},sortDirections:{default:()=>["ascend","descend"]},showSorterTooltip:{type:[Boolean,Object],default:!0},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:{},card:{type:Boolean,default:!1},params:{},searchFormRender:{},request:{},onLoad:{},defaultData:{},onLoadingChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},manual:{type:Boolean,default:!1},size:{default:"middle"}},setup(S,{expose:w}){const o=S,{e:m,b:u}=O.useNamespace("ap-table"),x=j.useGlobalConfig("uiMode"),i=e.computed(()=>{var t;let n=((t=o.columns)==null?void 0:t.filter(a=>!a.hideInTable))||[];return n=n.map(a=>({...a,customRender({value:l,...s}){var C;let c;if(a.customRender)c=a.customRender({value:l,...s,column:a});else{const v=d.apTableRenderItemMap[a.valueType||"text"],q=((C=a.fieldProps)==null?void 0:C.field)||a.fieldProps||{},N=a.valueType==="switch",V=a.valueType==="index",E=N?{checked:l}:{value:V?s.index+1:l};c=e.createVNode(v,e.mergeProps(f.omit(q,["request"]),E,{mode:"read"}),null)}return k(a,l,c)}})),n}),g=e.computed(()=>{var n,t;return((t=(n=o.columns)==null?void 0:n.filter(a=>!a.hideInSearch&&a.dataIndex&&(a.valueType||a.customRenderFormItem)&&!d.noRenderAsFormItemValueList.includes(a.valueType)))==null?void 0:t.map(a=>({...a,fieldProps:{...a.fieldProps||{},label:a.title,name:a.dataIndex}})))||[]}),B=e.computed(()=>e.unref(i).filter(n=>n.sorter===!0).map(n=>n.dataIndex)),F=e.computed(()=>e.unref(i).filter(n=>n.filters&&!n.onFilter).map(n=>n.dataIndex)),{formRef:y,submit:b,reset:h,tableProps:r,handleTableChange:R,data:P}=L.useTablePaging({async request(n){var a,l;const t=await((a=o.request)==null?void 0:a.call(o,n));return(l=o.onLoad)==null||l.call(o,(t==null?void 0:t.data)||[]),{data:(t==null?void 0:t.data)||[],total:(t==null?void 0:t.total)||0}},filterFields:e.unref(F),sortFields:e.unref(B),defaultParams:o.params,defaultData:o.defaultData,manual:o.manual,defaultCurrent:o.pagination?o.pagination.defaultCurrent:void 0,defaultPageSize:o.pagination?o.pagination.defaultPageSize:void 0,formatParams:o.beforeSearchSubmit}),T=e.computed(()=>({...o,...e.unref(r),loading:f.isUndefined(o.loading)?e.unref(r).loading:o.loading,pagination:o.pagination===!1?!1:e.unref(r).pagination}));function k(n,t,a){return d.noRenderAsFormItemValueList.includes(n.valueType)?a:n.copyable||n.ellipsis?e.createVNode(p.Typography.Text,{copyable:n.copyable?{text:t,tooltip:!1}:!1,ellipsis:n.ellipsis?{tooltip:t}:!1,content:a},null):a}e.watch(()=>e.unref(P).loading,n=>{var t;(t=o.onLoadingChange)==null||t.call(o,n)});function I(n){var t,a,l;(l=(a=(t=y.value)==null?void 0:t.apForm)==null?void 0:a.setFieldsValue)==null||l.call(a,n)}return w({submit:()=>b(),reset:()=>h(),setSearchFormValues:I}),(n,t)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(n.card?null:e.unref(u)("wrapper"))},[n.searchForm!==!1&&g.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(n.card?e.unref(m)("search-wrapper"):null),style:e.normalizeStyle(n.searchFormWrapperStyle)},[e.createVNode(e.unref(z.ApForm).SearchForm,e.mergeProps(n.searchForm||{},{ref_key:"formRef",ref:y,"custom-reset":"",onSubmit:e.unref(b),onReset:e.unref(h),"submit-loading":e.unref(r).loading}),{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(g.value,a=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(a.customRenderFormItem?a.customRenderFormItem(a):e.unref(d.apTableFormItemMap)[a.valueType||"text"]),e.mergeProps({key:a.dataIndex,ref_for:!0},a.fieldProps||{},{span:a.span}),null,16,["span"]))),128))]),_:1},16,["onSubmit","onReset","submit-loading"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{class:e.normalizeClass(n.card?e.unref(m)("table-wrapper"):null),style:e.normalizeStyle(n.tableWrapperStyle)},[e.renderSlot(n.$slots,"title"),e.createVNode(e.unref(p.Table),e.mergeProps({class:e.unref(x)==="admin"?e.unref(u)("table-admin"):e.unref(u)("table")},T.value,{onChange:e.unref(R),columns:i.value}),e.createSlots({headerCell:e.withCtx(({column:a,title:l})=>[a.tooltip?(e.openBlock(),e.createElementBlock("span",M,[e.createElementVNode("span",null,e.toDisplayString(l),1),e.createVNode(e.unref(p.Tooltip),{title:a.tooltip,placement:"bottom"},{default:e.withCtx(()=>[e.createVNode(e.unref(D.QuestionCircleOutlined),{style:{color:"#0070ff","padding-left":"4px"}})]),_:2},1032,["title"])])):e.createCommentVNode("",!0)]),_:2},[e.renderList(e.unref(f.omit)(n.$slots,"title"),(a,l)=>({name:l,fn:e.withCtx(s=>[e.renderSlot(n.$slots,l,e.normalizeProps(e.guardReactiveProps(s||{})))])}))]),1040,["class","onChange","columns"])],6)],2))}});exports.default=_;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),f=require("ant-design-vue"),E=require("../ap-form/index.js"),i=require("./constants.js");require("../config-provider/index.js");const O=require("./hooks/use-table-paging.js"),S=require("lodash-unified");require("./style/ap-table.css");const z=require("@ant-design/icons-vue"),d=require("./utils.js"),L=require("../config-provider/hooks/use-locale.js"),D=require("../config-provider/hooks/use-namespace.js"),j=require("../config-provider/hooks/use-global-config.js"),M={key:0},_=e.defineComponent({name:"ApTable",__name:"ap-table",props:{dropdownPrefixCls:{},loading:{type:[Boolean,Object],default:void 0},bordered:{type:Boolean,default:!1},locale:{},onChange:{},onResizeColumn:{},rowSelection:{},getPopupContainer:{},scroll:{},sortDirections:{default:()=>["ascend","descend"]},showSorterTooltip:{type:[Boolean,Object],default:!0},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:{},card:{type:Boolean,default:!1},params:{},searchFormRender:{},request:{},onLoad:{},defaultData:{},onLoadingChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},manual:{type:Boolean,default:!1},size:{default:"middle"}},setup(w,{expose:F}){const r=w,{t:R}=L.useLocale(),{e:m,b:c}=D.useNamespace("ap-table"),B=j.useGlobalConfig("uiMode"),p=e.computed(()=>{var o;let a=((o=r.columns)==null?void 0:o.filter(t=>!t.hideInTable))||[];return a=a.map(t=>({...d.apColumnToColumn(t),customRender({value:n,...l}){let s;if(t.customRender)s=t.customRender({value:n,...l,column:t});else{const C=d.getTableRenderType(t),N=i.apTableRenderItemMap[C],V=d.getTableRenderProps(t,{value:n,...l});s=e.createVNode(N,e.mergeProps(V,{mode:"read"}),null)}return q(t,n,s)}})),a}),g=e.computed(()=>{var a,o,t;return((t=(o=(a=r.columns)==null?void 0:a.filter(n=>!n.hideInSearch&&n.dataIndex&&(n.valueType||n.customRenderFormItem)&&!i.noRenderAsFormItemValueList.includes(n.valueType)))==null?void 0:o.sort((n,l)=>{let s=d.getColumnOrder(n.order);return d.getColumnOrder(l.order)-s}))==null?void 0:t.map(n=>{const l=d.updateFormProps(n,d.getFieldProps(n.fieldProps));return{...n,fieldProps:{label:n.title,name:n.dataIndex,...l||{},placeholder:d.getPlaceholder(R,n.valueType,l==null?void 0:l.placeholder)}}}))||[]}),x=e.computed(()=>e.unref(p).filter(a=>a.sorter===!0).map(a=>a.dataIndex)),T=e.computed(()=>e.unref(p).filter(a=>a.filters&&!a.onFilter).map(a=>a.dataIndex)),{formRef:y,submit:b,reset:h,tableProps:u,handleTableChange:P,data:k}=O.useTablePaging({async request(a){var t,n;const o=await((t=r.request)==null?void 0:t.call(r,a));return(n=r.onLoad)==null||n.call(r,(o==null?void 0:o.data)||[]),{data:(o==null?void 0:o.data)||[],total:(o==null?void 0:o.total)||0}},filterFields:e.unref(T),sortFields:e.unref(x),defaultParams:r.params,defaultData:r.defaultData,manual:r.manual,defaultCurrent:r.pagination?r.pagination.defaultCurrent:void 0,defaultPageSize:r.pagination?r.pagination.defaultPageSize:void 0,formatParams:r.beforeSearchSubmit}),I=e.computed(()=>({...r,...e.unref(u),loading:S.isUndefined(r.loading)?e.unref(u).loading:r.loading,pagination:r.pagination===!1?!1:e.unref(u).pagination}));function q(a,o,t){return i.noRenderAsFormItemValueList.includes(a.valueType)?t:a.copyable||a.ellipsis?e.createVNode(f.Typography.Text,{copyable:a.copyable?{text:o,tooltip:!1}:!1,ellipsis:a.ellipsis?{tooltip:o}:!1,content:t},null):t}e.watch(()=>e.unref(k).loading,a=>{var o;(o=r.onLoadingChange)==null||o.call(r,a)});function v(a){var o,t,n;(n=(t=(o=y.value)==null?void 0:o.apForm)==null?void 0:t.setFieldsValue)==null||n.call(t,a)}return F({submit:()=>b(),reset:()=>h(),setSearchFormValues:v}),(a,o)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(a.card?null:e.unref(c)("wrapper"))},[a.searchForm!==!1&&g.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(a.card?e.unref(m)("search-wrapper"):null),style:e.normalizeStyle(a.searchFormWrapperStyle)},[e.createVNode(e.unref(E.ApForm).SearchForm,e.mergeProps(a.searchForm||{},{ref_key:"formRef",ref:y,"custom-reset":"",onSubmit:e.unref(b),onReset:e.unref(h),"submit-loading":e.unref(u).loading}),{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(g.value,t=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(t.customRenderFormItem?t.customRenderFormItem(t):e.unref(i.apTableFormItemMap)[t.valueType||"text"]),e.mergeProps({key:t.dataIndex,ref_for:!0},t.fieldProps||{},{span:t.span}),null,16,["span"]))),128))]),_:1},16,["onSubmit","onReset","submit-loading"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{class:e.normalizeClass(a.card?e.unref(m)("table-wrapper"):null),style:e.normalizeStyle(a.tableWrapperStyle)},[e.renderSlot(a.$slots,"title"),e.createVNode(e.unref(f.Table),e.mergeProps({class:e.unref(B)==="admin"?e.unref(c)("table-admin"):e.unref(c)("table")},I.value,{onChange:e.unref(P),columns:p.value}),e.createSlots({headerCell:e.withCtx(({column:t,title:n})=>[t.tooltip?(e.openBlock(),e.createElementBlock("span",M,[e.createElementVNode("span",null,e.toDisplayString(n),1),e.createVNode(e.unref(f.Tooltip),{title:t.tooltip,placement:"bottom"},{default:e.withCtx(()=>[e.createVNode(e.unref(z.QuestionCircleOutlined),{style:{color:"#0070ff","padding-left":"4px"}})]),_:2},1032,["title"])])):e.createCommentVNode("",!0)]),_:2},[e.renderList(e.unref(S.omit)(a.$slots,"title"),(t,n)=>({name:n,fn:e.withCtx(l=>[e.renderSlot(a.$slots,n,e.normalizeProps(e.guardReactiveProps(l||{})))])}))]),1040,["class","onChange","columns"])],6)],2))}});exports.default=_;

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

@@ -1,3 +1,5 @@
+import { ValueEnum } from '../interface';
+
 export type ApTablePaginationProps = {
     /** dataSource的总数量 */
     total?: number;
@@ -18,3 +20,13 @@ export type ApTableIndexProps = {
      */
     value?: any;
 };
+export type ApTableStatusProps = {
+    /**
+     * 配置的值到配置的枚举值
+     */
+    valueEnum: ValueEnum;
+    /**
+     * 当前的值
+     */
+    value?: any;
+};

package/lib/src/ap-table/components/status/index.vue.d.ts

@@ -0,0 +1,14 @@
+import { ApTableStatusProps } from '../interface';
+import { DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType } from 'vue';
+
+declare const _default: DefineComponent<__VLS_TypePropsToRuntimeProps<ApTableStatusProps>, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<__VLS_TypePropsToRuntimeProps<ApTableStatusProps>>>, {}, {}>;
+export default _default;
+type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
+type __VLS_TypePropsToRuntimeProps<T> = {
+    [K in keyof T]-?: {} extends Pick<T, K> ? {
+        type: PropType<__VLS_NonUndefinedable<T[K]>>;
+    } : {
+        type: PropType<T[K]>;
+        required: true;
+    };
+};

package/lib/src/ap-table/components/status/index.vue.js

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

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

@@ -0,0 +1 @@
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),r=require("ant-design-vue"),o=e.defineComponent({name:"_ApTableStatus",__name:"index",props:{valueEnum:{},value:{}},setup(n){const t=n,u=e.computed(()=>t.valueEnum[t.value]);return(a,l)=>u.value?(e.openBlock(),e.createBlock(e.unref(r.Badge),e.normalizeProps(e.mergeProps({key:0},u.value)),null,16)):e.createCommentVNode("",!0)}});exports.default=o;

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

@@ -1,4 +1,4 @@
-import { ApTableValueFields } from './interface';
+import { ApTableValueFields, ValueEnum } from './interface';
 import { CreateComponentPublicInstance, ExtractPropTypes, PropType, HTMLAttributes, ComponentOptionsMixin, VNodeProps, AllowedComponentProps, ComponentCustomProps, ComponentOptionsBase, DefineComponent, PublicProps, VNode, RendererNode, RendererElement, CSSProperties, ComputedRef } from 'vue';
 import { ColSize } from 'ant-design-vue/es/grid';
 import { ApFieldDateProps, ApFieldDateRangeProps, ApFieldNumberProps, ApFieldRadioProps, ApFieldSelectProps, ApFieldSwitchProps, ApFieldTextProps, ApFieldTextAreaProps, ApFieldCheckboxProps, FieldMode } from '../ap-field';
@@ -2482,9 +2482,6 @@ export declare const apTableFormItemMap: {
             addonAfter?: any;
             prefix?: any;
             default?: any;
-            /**
-             * 表格到查询表单的映射
-             */
             upIcon?: any;
             downIcon?: any;
         }> & {
@@ -2492,9 +2489,6 @@ export declare const apTableFormItemMap: {
             addonAfter?: any;
             prefix?: any;
             default?: any;
-            /**
-             * 表格到查询表单的映射
-             */
             upIcon?: any;
             downIcon?: any;
         };
@@ -5305,17 +5299,13 @@ export declare const apTableFormItemMap: {
         validateFirst: boolean;
     }, {}, string, {}> & VNodeProps & AllowedComponentProps & ComponentCustomProps & (new () => {
         $slots: Readonly<{
-            addonAfter: any; /**
-             * 表格到查询表单的映射
-             */
+            addonAfter: any;
             addonBefore: any;
             prefix: any;
             suffix: any;
             clearIcon: any;
         }> & {
-            addonAfter: any; /**
-             * 表格到查询表单的映射
-             */
+            addonAfter: any;
             addonBefore: any;
             prefix: any;
             suffix: any;
@@ -9820,9 +9810,6 @@ export declare const apTableRenderItemMap: {
                         default: any;
                         type: PropType<any>;
                     };
-                    /**
-                     * 表格自定义渲染
-                     */
                     icon: {
                         default: any;
                         type: PropType<any>;
@@ -10193,9 +10180,6 @@ export declare const apTableRenderItemMap: {
                         default: any;
                         type: PropType<any>;
                     };
-                    /**
-                     * 表格自定义渲染
-                     */
                     icon: {
                         default: any;
                         type: PropType<any>;
@@ -10577,9 +10561,6 @@ export declare const apTableRenderItemMap: {
                         default: any;
                         type: PropType<any>;
                     };
-                    /**
-                     * 表格自定义渲染
-                     */
                     icon: {
                         default: any;
                         type: PropType<any>;
@@ -10958,9 +10939,6 @@ export declare const apTableRenderItemMap: {
                     default: any;
                     type: PropType<any>;
                 };
-                /**
-                 * 表格自定义渲染
-                 */
                 icon: {
                     default: any;
                     type: PropType<any>;
@@ -12333,6 +12311,23 @@ export declare const apTableRenderItemMap: {
     }>>, {
         bordered: boolean;
     }, {}>;
+    status: DefineComponent<{
+        valueEnum: {
+            type: PropType<ValueEnum>;
+            required: true;
+        };
+        value: {
+            type: PropType<any>;
+        };
+    }, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<{
+        valueEnum: {
+            type: PropType<ValueEnum>;
+            required: true;
+        };
+        value: {
+            type: PropType<any>;
+        };
+    }>>, {}, {}>;
 };
 /**
  * 不需要渲染到Form表单的valueType字段

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../ap-action/index.js");require("../ap-field/index.js");require("../ap-form/index.js");require("./components/index/index.vue.js");const e=require("../ap-form/items/date/index.vue.js"),t=require("../ap-form/items/date-range/index.vue.js"),_=require("../ap-form/items/number/index.vue.js"),u=require("../ap-form/items/radio/index.vue.js"),r=require("../ap-form/items/select/index.vue.js"),n=require("../ap-form/items/switch/index.vue.js"),i=require("../ap-form/items/text/index.vue.js"),s=require("../ap-form/items/text-area/index.vue.js"),a=require("../ap-form/items/checkbox/index.vue.js"),p=require("../ap-field/date/index.vue.js"),c=require("../ap-field/date-range/index.vue.js"),d=require("../ap-field/number/index.vue.js"),l=require("../ap-field/radio/index.vue.js"),v=require("../ap-field/select/index.vue.js"),o=require("../ap-field/switch/index.vue.js"),x=require("../ap-field/text/index.vue.js"),g=require("../ap-field/text-area/index.vue.js"),q=require("../ap-field/checkbox/index.vue.js"),f=require("../ap-action/group/index.vue.js"),y=require("./components/index/index.vue2.js"),$={date:e.default,dateRange:t.default,number:_.default,radio:u.default,select:r.default,switch:n.default,text:i.default,textArea:s.default,checkbox:a.default},m={date:p.default,dateRange:c.default,number:d.default,radio:l.default,select:v.default,switch:o.default,text:x.default,textArea:g.default,checkbox:q.default,action:f.default,index:y.default},b=["action","index"];exports.apTableFormItemMap=$;exports.apTableRenderItemMap=m;exports.noRenderAsFormItemValueList=b;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../ap-action/index.js");require("../ap-field/index.js");require("../ap-form/index.js");require("./components/index/index.vue.js");require("./components/status/index.vue.js");const e=require("../ap-form/items/date/index.vue.js"),t=require("../ap-form/items/date-range/index.vue.js"),_=require("../ap-form/items/number/index.vue.js"),u=require("../ap-form/items/radio/index.vue.js"),r=require("../ap-form/items/select/index.vue.js"),i=require("../ap-form/items/switch/index.vue.js"),n=require("../ap-form/items/text/index.vue.js"),s=require("../ap-form/items/text-area/index.vue.js"),a=require("../ap-form/items/checkbox/index.vue.js"),p=require("../ap-field/date/index.vue.js"),c=require("../ap-field/date-range/index.vue.js"),d=require("../ap-field/number/index.vue.js"),l=require("../ap-field/radio/index.vue.js"),v=require("../ap-field/select/index.vue.js"),o=require("../ap-field/switch/index.vue.js"),x=require("../ap-field/text/index.vue.js"),g=require("../ap-field/text-area/index.vue.js"),q=require("../ap-field/checkbox/index.vue.js"),f=require("../ap-action/group/index.vue.js"),y=require("./components/index/index.vue2.js"),$=require("./components/status/index.vue2.js"),m={date:e.default,dateRange:t.default,number:_.default,radio:u.default,select:r.default,switch:i.default,text:n.default,textArea:s.default,checkbox:a.default},b={date:p.default,dateRange:c.default,number:d.default,radio:l.default,select:v.default,switch:o.default,text:x.default,textArea:g.default,checkbox:q.default,action:f.default,index:y.default,status:$.default},I=["action","index"];exports.apTableFormItemMap=m;exports.apTableRenderItemMap=b;exports.noRenderAsFormItemValueList=I;

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

@@ -1,7 +1,7 @@
 import { ColumnType, TableProps } from 'ant-design-vue/es/table';
 import { CompareFn, SortOrder } from 'ant-design-vue/es/table/interface';
 import { ApFormSearchFormProps } from '../ap-form';
-import { ApFormItemCheckboxProps, ApFormItemDateProps, ApFormItemDateRangeProps, ApFormItemNumberProps, ApFormItemRadioProps, ApFormItemSelectProps, ApFormItemSwitchProps, ApFormItemTextAreaProps, ApFormItemTextProps } from 'src/ap-form/items/interface';
+import { ApFormItemCheckboxProps, ApFormItemDateProps, ApFormItemDateRangeProps, ApFormItemNumberProps, ApFormItemRadioProps, ApFormItemSelectProps, ApFormItemSwitchProps, ApFormItemTextAreaProps, ApFormItemTextProps } from '../ap-form/items/interface';
 import { Recordable } from '../type';
 import { CSSProperties } from 'vue';
 import { ApActionGroupProps } from '../ap-action';
@@ -9,7 +9,13 @@ import { ApTableIndexProps } from './components/interface';
 
 export type ValueEnumType = {
     text: string;
-    status?: string;
+    /**
+     * 当前枚举值与定义的状态，等同于Badge的status
+     */
+    status?: 'success' | 'error' | 'processing' | 'warning' | 'default';
+    /**
+     * 如果status预定义的颜色无法满足需求，你可以自定义徽标的颜色，注意`color`比`status`的优先级更高
+     */
     color?: string;
     disabled?: boolean;
 };
@@ -45,15 +51,15 @@ export type ApTableValueFields = {
     index: ApTableIndexProps;
 };
 export type ValueEnum = Record<string, ValueEnumType>;
-export type ExtraProColumnType<T> = Omit<ColumnType<T>, 'children'> & {
+export type ExtraProColumnType<T> = Omit<ColumnType<T>, 'children' | 'filters'> & {
     sorter?: string | boolean | CompareFn<T> | {
         compare?: CompareFn<T>;
         /** Config multiple sorter order priority */
         multiple?: number;
     };
 };
-export type ApColumnType<ValueType extends keyof ApTableValueFields = 'text'> = ExtraProColumnType<any> & {
-    children?: ApColumnType[];
+export type ApColumnType<ValueType extends keyof ApTableValueFields = 'text', RecordType = any> = ExtraProColumnType<any> & {
+    children?: ApColumnType<any, RecordType>[];
     /**
      * 表单项所占据的格子数（1-24格）
      */
@@ -89,7 +95,23 @@ export type ApColumnType<ValueType extends keyof ApTableValueFields = 'text'> =
     /**
      * 值类型额外配置的参数（用于查询表单渲染）
      */
-    fieldProps?: ApTableValueFields[ValueType];
+    fieldProps?: ApTableValueFields[ValueType] | ((opt?: {
+        value: any;
+        text: any;
+        record: RecordType;
+        index: number;
+        renderIndex: number;
+        column: ApColumnType<ValueType, RecordType>;
+    }) => ApTableValueFields[ValueType]);
+    /**
+     * 用于表单项排序的字段
+     * @description 值越大，越排在前面，请设置正整数，设置为0或负数将会无效
+     */
+    order?: number;
+    /**
+     * 表头的菜单筛选项，设置为true后会尝试使用valueEnum生成filters
+     */
+    filters?: ColumnType<RecordType>['filters'] | true;
 };
 export type RequestData<T> = {
     data: T[] | undefined;
@@ -99,7 +121,7 @@ export type ApTableProps<RecordType = any, ParamsType = any, ValueType extends k
     /**
      * 列配置
      */
-    columns?: ApColumnType<any>[];
+    columns?: ApColumnType<any, RecordType>[];
     /**
      * 是否启用卡片样式
      */
@@ -178,3 +200,6 @@ export type ApTableExpose = {
     submit: () => void;
     reset: () => void;
 };
+export type FixedApColumnType<ValueType extends keyof ApTableValueFields = 'text', RecordType = any> = Omit<ApColumnType<ValueType, RecordType>, 'filters'> & {
+    filters?: ColumnType<RecordType>['filters'];
+};

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

@@ -1,4 +1,16 @@
-import { ValueEnum, ValueEnumType } from './interface';
+import { ApColumnType, ApTableValueFields, ValueEnum, ValueEnumType } from './interface';
+import { Translator } from '../config-provider';
+import { AlignType, FixedType, Key, CellEllipsisType, DataIndex, ColumnType, GetComponentProps, ColumnGroupType } from 'ant-design-vue/es/vc-table/interface';
+import { ColumnTitle, CompareFn, SortOrder, FilterDropdownProps, FilterValue, FilterSearchType, ColumnFilterItem } from 'ant-design-vue/es/table/interface';
+import { Breakpoint } from 'ant-design-vue/es/_util/responsiveObserve';
+import { ExtractPropTypes, PropType, CSSProperties } from 'vue';
+import { VueTypeValidableDef } from '../../node_modules/vue-types';
+import { TriggerType } from 'ant-design-vue/es/tooltip/abstractTooltipProps';
+import { TooltipPlacement, AdjustOverflow } from 'ant-design-vue/es/tooltip';
+import { LiteralUnion, VueNode } from 'ant-design-vue/es/_util/type';
+import { PresetColorType } from 'ant-design-vue/es/_util/colors';
+import { AlignType, BuildInPlacements } from 'ant-design-vue/es/vc-trigger/interface';
+import { TableColumnType } from 'ant-design-vue';
 
 export type FieldValueType = 'multiple' | 'multipleNumber' | 'dayjs' | 'dayjsRange' | 'dayjsDayRange' | 'number' | 'boolean' | 'object';
 export declare const formatParamsValueType: (type: FieldValueType | Record<string, FieldValueType>, value: any, cb: (t: FieldValueType, value: any) => any) => any;
@@ -28,5 +40,195 @@ export declare const objectToMap: (value: ValueEnum | undefined) => ValueEnumMap
  * @param valueEnumParams
  * @returns
  */
-export declare const valueEnumToArray: (valueEnumParams: ValueEnum) => OptionType;
+export declare const valueEnumToArray: (valueEnumParams: ValueEnum) => Partial<OptionType>[];
+/**
+ * 获取列在查询表单中的排序
+ * @param order
+ * @returns
+ */
+export declare const getColumnOrder: (order?: number) => number;
+/**
+ * 获取查询表单的placeholder
+ * @param t
+ * @param valueType
+ * @param placeholder
+ * @returns
+ */
+export declare const getPlaceholder: (t: Translator, valueType?: keyof ApTableValueFields, placeholder?: string) => string | string[] | undefined;
+/**
+ * 获取对象形式的FieldProps
+ * @param fieldProps
+ * @param record
+ * @returns
+ */
+export declare function getFieldProps<RecordType = any>(fieldProps: ApColumnType<any, any>['fieldProps'], opt?: {
+    value: any;
+    text: any;
+    record: any;
+    index: number;
+    renderIndex: number;
+    column: ApColumnType<any, RecordType>;
+}): any;
+/**
+ * 获取表格的渲染类型
+ * @param item
+ * @returns
+ */
+export declare function getTableRenderType(item: ApColumnType<any, any>): "number" | "text" | "select" | "switch" | "index" | "status" | "checkbox" | "radio" | "date" | "action" | "dateRange" | "textArea";
+/**
+ * 处理表格render组件的props
+ * @param item
+ * @param renderOption
+ * @returns
+ */
+export declare function getTableRenderProps(item: ApColumnType<any, any>, renderOption: any): any;
+/**
+ * 将apColumn转化为column
+ * @param column
+ * @returns
+ */
+export declare function apColumnToColumn(column: ApColumnType<any>): {
+    align?: AlignType | undefined;
+    class?: string | undefined;
+    title?: ColumnTitle<any>;
+    width?: string | number | undefined;
+    slots?: {
+        filterIcon?: string | undefined;
+        filterDropdown?: string | undefined;
+        customRender?: string | undefined;
+        title?: string | undefined;
+    } | undefined;
+    fixed?: FixedType | undefined;
+    key?: Key | undefined;
+    responsive?: Breakpoint[] | undefined;
+    maxWidth?: number | undefined;
+    minWidth?: number | undefined;
+    ellipsis?: CellEllipsisType | undefined;
+    colSpan?: number | undefined;
+    dataIndex?: DataIndex | undefined;
+    customRender?: ((opt: {
+        value: any;
+        text: any;
+        record: any;
+        index: number;
+        renderIndex: number;
+        column: ColumnType<any>;
+    }) => any) | undefined;
+    rowSpan?: number | undefined;
+    resizable?: boolean | undefined;
+    customCell?: GetComponentProps<any> | undefined;
+    onCellClick?: ((record: any, e: MouseEvent) => void) | undefined;
+    className?: string | undefined;
+    customHeaderCell?: GetComponentProps< ColumnType<any> | ColumnGroupType<any>> | undefined;
+    customFilterDropdown?: boolean | undefined;
+    __originColumn__?: any;
+    sorter?: ((boolean | CompareFn<any> | {
+        compare?: CompareFn<any> | undefined;
+        multiple?: number | undefined;
+    }) & (string | boolean | CompareFn<any> | {
+        compare?: CompareFn<any> | undefined;
+        multiple?: number | undefined;
+    })) | undefined;
+    sortOrder?: SortOrder | undefined;
+    defaultSortOrder?: SortOrder | undefined;
+    sortDirections?: SortOrder[] | undefined;
+    showSorterTooltip?: boolean | Partial< ExtractPropTypes<{
+        title: VueTypeValidableDef<any>;
+        trigger: PropType< TriggerType | TriggerType[]>;
+        open: {
+            type: BooleanConstructor;
+            default: any;
+        };
+        visible: {
+            type: BooleanConstructor;
+            default: any;
+        };
+        placement: PropType<TooltipPlacement>;
+        color: PropType<LiteralUnion<PresetColorType>>;
+        transitionName: StringConstructor;
+        overlayStyle: {
+            type: PropType<CSSProperties>;
+            default: CSSProperties;
+        };
+        overlayInnerStyle: {
+            type: PropType<CSSProperties>;
+            default: CSSProperties;
+        };
+        overlayClassName: StringConstructor;
+        openClassName: StringConstructor;
+        prefixCls: StringConstructor;
+        mouseEnterDelay: NumberConstructor;
+        mouseLeaveDelay: NumberConstructor;
+        getPopupContainer: PropType<(triggerNode: HTMLElement) => HTMLElement>;
+        arrowPointAtCenter: {
+            type: BooleanConstructor;
+            default: any;
+        };
+        arrow: {
+            type: PropType<boolean | {
+                pointAtCenter?: boolean | undefined;
+            }>;
+            default: boolean | {
+                pointAtCenter?: boolean | undefined;
+            };
+        };
+        autoAdjustOverflow: {
+            type: PropType<boolean | AdjustOverflow>;
+            default: boolean | AdjustOverflow;
+        };
+        destroyTooltipOnHide: {
+            type: BooleanConstructor;
+            default: any;
+        };
+        align: {
+            type: PropType<AlignType>;
+            default: AlignType;
+        };
+        builtinPlacements: {
+            type: PropType<BuildInPlacements>;
+            default: BuildInPlacements;
+        };
+        children: ArrayConstructor;
+        onVisibleChange: PropType<(vis: boolean) => void>;
+        'onUpdate:visible': PropType<(vis: boolean) => void>;
+        onOpenChange: PropType<(vis: boolean) => void>;
+        'onUpdate:open': PropType<(vis: boolean) => void>;
+    }>> | undefined;
+    filtered?: boolean | undefined;
+    filterDropdown?: VueNode | ((props: FilterDropdownProps<any>) => VueNode);
+    filterMultiple?: boolean | undefined;
+    filteredValue?: FilterValue | null | undefined;
+    defaultFilteredValue?: FilterValue | null | undefined;
+    filterIcon?: VueNode | ((opt: {
+        filtered: boolean;
+        column: TableColumnType<any>;
+    }) => VueNode);
+    filterMode?: "menu" | "tree" | undefined;
+    filterSearch?: FilterSearchType<ColumnFilterItem> | undefined;
+    onFilter?: ((value: string | number | boolean, record: any) => boolean) | undefined;
+    filterDropdownOpen?: boolean | undefined;
+    onFilterDropdownOpenChange?: ((visible: boolean) => void) | undefined;
+    filterResetToDefaultFilteredValue?: boolean | undefined;
+    filterDropdownVisible?: boolean | undefined;
+    onFilterDropdownVisibleChange?: ((visible: boolean) => void) | undefined;
+    children?: ApColumnType<any, any>[] | undefined;
+    span?: number | undefined;
+    tooltip?: string | undefined;
+    copyable?: boolean | undefined;
+    hideInSearch?: boolean | undefined;
+    hideInTable?: boolean | undefined;
+    valueEnum?: ValueEnum | undefined;
+    customRenderFormItem?: ((config: ApColumnType<"text", any>) => any) | undefined;
+    valueType?: keyof ApTableValueFields | undefined;
+    fieldProps?: any;
+    order?: number | undefined;
+    filters?: true | ColumnFilterItem[] | undefined;
+};
+/**
+ * 更新查询表单的的props
+ * @param item
+ * @param fieldProps
+ * @returns
+ */
+export declare function updateFormProps(item: ApColumnType<any, any>, fieldProps: any): any;
 export {};