@aplus-frontend/ui 0.0.20 → 0.0.21

package/es/src/editable-table/hooks/use-get-columns.d.ts

@@ -1,28 +1,6 @@
+import { ComputedRef } from 'vue';
 import { EditableTableFormItemProps, EditableTableProps } from '../interface';
-import { ComputedRef, VNode, RendererNode, RendererElement } from 'vue';
-import { TableColumnType } from 'ant-design-vue';
-import { ValueEnum } from '../..';
+import { ColumnType } from 'ant-design-vue/es/table';
 
-declare const useGetColumns: (props: EditableTableProps | EditableTableFormItemProps) => ComputedRef<(Omit< TableColumnType<any>, "children" | "customRender"> & {
-    children?: (Omit< TableColumnType<any>, "children" | "customRender"> & any) | undefined;
-    tooltip?: string | undefined;
-    copyable?: boolean | undefined;
-    editable?: boolean | ((text: any, record: any, index: number) => boolean) | undefined;
-    valueEnum?: ValueEnum | undefined;
-    customRenderFormItem?: ((config: Omit< TableColumnType<any>, "children" | "customRender"> & any) => any) | undefined;
-    valueType?: any;
-    fieldProps?: any;
-    customRender?: ((opt: {
-        value: any;
-        text: any;
-        record: any;
-        index: number;
-        renderIndex: number;
-        column: TableColumnType<any>;
-        editable?: boolean | undefined;
-        originalNode?: VNode<RendererNode, RendererElement, {
-            [key: string]: any;
-        }> | undefined;
-    }) => any) | undefined;
-})[]>;
+declare const useGetColumns: (props: EditableTableProps | EditableTableFormItemProps) => ComputedRef<ColumnType<any>[]>;
 export default useGetColumns;

package/es/src/editable-table/hooks/use-get-columns.mjs

@@ -1,78 +1,80 @@
-import { computed as g, createVNode as c, mergeProps as x } from "vue";
-import { isFunction as C } from "lodash-unified";
-import { getEditableComponent as T } from "../utils.mjs";
-import { updateFormProps as h, getFieldProps as F, getPlaceholder as R, getTableRenderProps as I } from "../../ap-table/utils.mjs";
+import { computed as y, createVNode as i, mergeProps as x } from "vue";
+import { omit as h, isFunction as C, isBoolean as F } from "lodash-unified";
+import { getEditableComponent as R } from "../utils.mjs";
+import { updateFormProps as T, getFieldProps as I, getPlaceholder as N, getTableRenderProps as L } from "../../ap-table/utils.mjs";
 import "../../config-provider/index.mjs";
-import { apTableRenderItemMap as N, noRenderAsFormItemValueList as v } from "../../ap-table/constants.mjs";
-import { Typography as L } from "ant-design-vue";
-import { useLocale as M } from "../../config-provider/hooks/use-locale.mjs";
-const k = (a) => {
+import { apTableRenderItemMap as M, noRenderAsFormItemValueList as V } from "../../ap-table/constants.mjs";
+import { Typography as w } from "ant-design-vue";
+import { useLocale as A } from "../../config-provider/hooks/use-locale.mjs";
+const q = (t) => {
   const {
-    t: s
-  } = M(), f = g(() => {
-    let o = a.columns;
+    t: u
+  } = A(), f = y(() => {
+    let o = t.columns;
     return o ? (o = o.map((e) => ({
-      ...e,
+      ...h(e, ["ellipsis"]),
       customRender({
-        value: l,
-        ...t
+        value: n,
+        ...a
       }) {
-        const u = C(e.editable) ? e.editable(t.text, t.record, t.index) : !!e.editable;
-        let d;
-        if (u) {
-          const r = T(e.valueType), n = h(e, F(e.fieldProps, {
-            value: l,
-            ...t
-          })), i = {};
-          a.onFieldChange && (i[`onUpdate:${n.valuePropName || "value"}`] = (y) => {
+        const c = C(e.editable) ? e.editable(a.text, a.record, a.index) : !!e.editable;
+        let r;
+        if (c) {
+          const d = R(e.valueType), l = T(e, I(e.fieldProps, {
+            value: n,
+            ...a
+          })), s = {};
+          t.onFieldChange && (s[`onUpdate:${l.valuePropName || "value"}`] = (g) => {
             var p;
-            return (p = a.onFieldChange) == null ? void 0 : p.call(a, t.index, e.dataIndex, y);
+            return (p = t.onFieldChange) == null ? void 0 : p.call(t, a.index, e.dataIndex, g);
           });
           const b = {
-            name: [a.name, t.index, e.dataIndex],
-            ...n || {},
+            name: [t.name, a.index, e.dataIndex],
+            ...l || {},
             // 格式化placeholder
-            placeholder: R(s, e.valueType, n == null ? void 0 : n.placeholder),
+            placeholder: N(u, e.valueType, l == null ? void 0 : l.placeholder),
             field: {
               style: "width: 100%",
-              ...(n == null ? void 0 : n.field) || {},
-              ...i
+              ...(l == null ? void 0 : l.field) || {},
+              ...s
             }
           };
-          d = c(r, b, null);
+          r = i(d, b, null);
         } else {
-          const r = N[e.valueType], n = I(e, {
-            value: l,
-            ...t
+          const d = M[e.valueType], l = L(e, {
+            value: n,
+            ...a
           });
-          d = m(e, l, c(r, x(n, {
+          r = m(e, n, i(d, x(l, {
             mode: "read"
           }), null));
         }
         return e.customRender ? e.customRender({
-          value: l,
-          ...t,
-          column: e,
-          editable: u,
-          originalNode: d
-        }) : d;
+          value: n,
+          ...a,
+          editable: c,
+          originalNode: r
+        }) : r;
       }
     })), o) : [];
   });
-  function m(o, e, l) {
-    return v.includes(o.valueType) ? l : o.copyable || o.ellipsis ? c(L.Text, {
+  function m(o, e, n) {
+    return V.includes(o.valueType) ? n : o.copyable || o.ellipsis ? i(w.Paragraph, {
       copyable: o.copyable ? {
         text: e,
         tooltip: !1
       } : !1,
-      ellipsis: o.ellipsis ? {
+      ellipsis: o.ellipsis ? F(o.ellipsis) ? {
+        tooltip: e
+      } : {
+        ...o.ellipsis,
         tooltip: e
       } : !1,
-      content: l
-    }, null) : l;
+      content: o.ellipsis ? e : n
+    }, null) : n;
   }
   return f;
 };
 export {
-  k as default
+  q as default
 };

package/es/src/editable-table/interface.d.ts

@@ -4,8 +4,9 @@ import { NamePath, ValidateOptions } from 'ant-design-vue/es/form/interface';
 import { DataIndex } from 'ant-design-vue/es/vc-table/interface';
 import { FormItemProps } from 'ant-design-vue';
 import { VNode } from 'vue';
+import { EllipsisConfig } from 'ant-design-vue/es/typography/Base';
 
-export type EditableColumnType<RecordType = any, ValueType extends ApTableValueTypes = ApTableValueTypes> = ValueType extends ApTableValueTypes ? Omit<ColumnType<RecordType>, 'children' | 'customRender'> & {
+export type EditableColumnType<RecordType = any, ValueType extends ApTableValueTypes = ApTableValueTypes> = ValueType extends ApTableValueTypes ? Omit<ColumnType<RecordType>, 'children' | 'customRender' | 'ellipsis'> & {
     children?: EditableColumnType<RecordType, ValueType>;
     /**
      * 在title之后展示一个icon并触发tooltip
@@ -15,6 +16,10 @@ export type EditableColumnType<RecordType = any, ValueType extends ApTableValueT
      * 是否可以复制（不可编辑模式下可用）
      */
     copyable?: boolean;
+    /**
+     * 是否省略自动溢出，自动溢出省略，为对象时可设置省略行数、是否可展开、添加后缀等
+     */
+    ellipsis?: boolean | EllipsisConfig;
     /**
      * 是否可编辑
      */

package/es/src/editable-table/style/index.css

@@ -43,3 +43,6 @@
 .aplus-editable-table .ant-table-small .ant-table-cell {
   padding: 9px 16px !important;
 }
+.aplus-editable-table .ant-table-cell .ant-typography {
+  margin-bottom: 0;
+}

package/es/src/theme/ap-list/index.css

@@ -0,0 +1,6 @@
+.aplus-ap-list {
+  padding: 16px 24px;
+}
+.aplus-ap-list__footer {
+  margin-top: 16px;
+}

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

@@ -85,3 +85,22 @@
 .aplus-ap-table .ant-table-small .ant-table-placeholder .ant-table-cell {
   padding: 0 !important;
 }
+.aplus-ap-table .ant-table-column-sorters {
+  justify-content: unset;
+}
+.aplus-ap-table .ant-table-column-sorters .ant-table-column-title {
+  flex: unset;
+}
+.aplus-ap-table .ant-table-filter-column {
+  justify-content: unset;
+}
+.aplus-ap-table .ant-table-filter-column .ant-table-column-title {
+  flex: unset;
+}
+.aplus-ap-table .ant-table-filter-column .ant-table-filter-trigger {
+  margin-left: 2px;
+  padding-left: 2px;
+}
+.aplus-ap-table .ant-table-cell .ant-typography {
+  margin-bottom: 0;
+}

package/es/src/theme/editable-table/index.css

@@ -43,3 +43,6 @@
 .aplus-editable-table .ant-table-small .ant-table-cell {
   padding: 9px 16px !important;
 }
+.aplus-editable-table .ant-table-cell .ant-typography {
+  margin-bottom: 0;
+}

package/lib/src/ap-form/hooks/use-watch.d.ts

@@ -2,6 +2,6 @@ import { NamePath } from 'ant-design-vue/es/form/interface';
 import { ApFormExpose } from '../interface';
 import { Ref } from 'vue';
 
-type ApFormIns = ApFormExpose;
-declare const useWatch: <ValueType = any>(name: NamePath, form?: Ref<ApFormIns | undefined>) => Ref<ValueType | undefined>;
+type ApFormIns<T> = ApFormExpose<T>;
+declare const useWatch: <ValueType = any>(name: NamePath, form?: Ref<ApFormIns<ValueType> | undefined> | undefined) => Ref<ValueType | undefined>;
 export default useWatch;

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

@@ -0,0 +1,67 @@
+import { CSSProperties } from 'vue';
+import { RequestData } from '../ap-table';
+import { Recordable } from '../type';
+
+export type ApListProps<RecordType = any, ParamsType = Recordable> = {
+    /**
+     * 列表数据源，传入后`request`和`defaultData`都将失效
+     */
+    dataSource?: RecordType[];
+    /**
+     * 是否是加载中
+     */
+    loading?: boolean;
+    /**
+     * 当点击列表项时触发
+     * @deprecated 暂未实现
+     */
+    onItem?: (record: RecordType, index: number) => void;
+    /**
+     * 依赖的额外的参数（该参数变更不会触发网络请求）
+     */
+    params?: ParamsType;
+    /**
+     * 请求数据
+     * @param params
+     * @returns
+     */
+    request?: (params: Partial<ParamsType> & {
+        pageSize?: number;
+        current?: number;
+    }) => Promise<Partial<RequestData<RecordType>>>;
+    /**
+     * 表格的默认数据源，这些数据源将会在第一次请求后被替换
+     */
+    defaultData?: RecordType[];
+    /**
+     * 表格loading状态变更后触发
+     * @param loading
+     * @returns
+     */
+    onLoadingChange?: (loading: boolean) => void;
+    /**
+     * 查询表单提交之前，一般用于自定义对查询数据进行变更
+     * @param params
+     * @returns
+     */
+    beforeSearchSubmit?: (params: Partial<ParamsType>) => any;
+    /**
+     * 是否显示分页器（特定的分页器）或者指定默认的当前页和pageSize
+     */
+    pagination?: false | {
+        defaultCurrent?: number;
+        defaultPageSize?: number;
+    };
+    /**
+     * 是否手动发起第一次网络请求
+     */
+    manual?: boolean;
+    /**
+     * List容器的自定义样式
+     */
+    containerStyle?: CSSProperties;
+    /**
+     *  底部分页器容器的样式
+     */
+    footerWarpperStyle?: CSSProperties;
+};

package/lib/src/ap-list/style/index.css

@@ -0,0 +1,6 @@
+.aplus-ap-list {
+  padding: 16px 24px;
+}
+.aplus-ap-list__footer {
+  margin-top: 16px;
+}

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

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

@@ -6,6 +6,7 @@ import { Recordable } from '../type';
 import { ComputedRef, CSSProperties, VNode } from 'vue';
 import { ApActionGroupProps } from '../ap-action';
 import { ApTableIndexProps } from './components/interface';
+import { EllipsisConfig } from 'ant-design-vue/es/typography/Base';
 
 export type ValueEnumType = {
     text: string;
@@ -56,7 +57,7 @@ export type ApTableValueFields = {
 };
 export type ApTableValueTypes = keyof ApTableValueFields;
 export type ValueEnum = Record<string, ValueEnumType>;
-export type ExtraProColumnType<T> = Omit<ColumnType<T>, 'children' | 'filters' | 'customRender'> & {
+export type ExtraProColumnType<T> = Omit<ColumnType<T>, 'children' | 'filters' | 'customRender' | 'ellipsis'> & {
     sorter?: string | boolean | CompareFn<T> | {
         compare?: CompareFn<T>;
         /** Config multiple sorter order priority */
@@ -77,6 +78,10 @@ export type ApColumnType<RecordType = any, ValueType extends ApTableValueTypes =
      * 是否可以复制
      */
     copyable?: boolean;
+    /**
+     * 是否省略自动溢出，自动溢出省略，为对象时可设置省略行数、是否可展开、添加后缀等
+     */
+    ellipsis?: boolean | EllipsisConfig;
     /**
      * 是否搜索表单中隐藏
      */
@@ -248,6 +253,3 @@ export type ApTableExpose<SearchParamsType = Recordable, RecordType = any> = {
      */
     dataSource: ComputedRef<RecordType>;
 };
-export type FixedApColumnType<RecordType = any, ValueType extends ApTableValueTypes = ApTableValueTypes> = Omit<ApColumnType<RecordType, ValueType>, 'filters'> & {
-    filters?: ColumnType<RecordType>['filters'];
-};

package/lib/src/ap-table/style/ap-table.css

@@ -85,3 +85,22 @@
 .aplus-ap-table .ant-table-small .ant-table-placeholder .ant-table-cell {
   padding: 0 !important;
 }
+.aplus-ap-table .ant-table-column-sorters {
+  justify-content: unset;
+}
+.aplus-ap-table .ant-table-column-sorters .ant-table-column-title {
+  flex: unset;
+}
+.aplus-ap-table .ant-table-filter-column {
+  justify-content: unset;
+}
+.aplus-ap-table .ant-table-filter-column .ant-table-column-title {
+  flex: unset;
+}
+.aplus-ap-table .ant-table-filter-column .ant-table-filter-trigger {
+  margin-left: 2px;
+  padding-left: 2px;
+}
+.aplus-ap-table .ant-table-cell .ant-typography {
+  margin-bottom: 0;
+}