@aplus-frontend/ui 0.1.19 → 0.1.21

package/es/src/business/ap-image/ApImage.vue2.mjs

@@ -1,59 +1,59 @@
-import { defineComponent as b, computed as c, ref as h, watchEffect as O, openBlock as _, createBlock as P, unref as w, normalizeProps as C, guardReactiveProps as F } from "vue";
-import { Image as I } from "ant-design-vue";
-import { injectLocaleToOss as M, getOssInstance as S, getSignatureUrl as U } from "./hooks/useOss.mjs";
+import { defineComponent as b, computed as c, ref as k, watchEffect as A, openBlock as O, createBlock as h, unref as l, normalizeProps as _, guardReactiveProps as w } from "vue";
+import { Image as y } from "ant-design-vue";
+import { injectLocaleToOss as F, getOssInstance as U, getSignatureUrl as B } from "./hooks/useOss.mjs";
 import "../../config-provider/index.mjs";
-import { imageProps as x } from "ant-design-vue/es/image";
-import y from "./imgs/admin-fallback.jpg.mjs";
-import B from "./imgs/aplus-fallback.jpg.mjs";
-import { useGlobalConfig as u } from "../../config-provider/hooks/use-global-config.mjs";
-import { useLocale as L } from "../../config-provider/hooks/use-locale.mjs";
-const H = /* @__PURE__ */ b({
+import C from "./imgs/admin-fallback.jpg.mjs";
+import I from "./imgs/aplus-fallback.jpg.mjs";
+import { omit as M } from "lodash-unified";
+import { useGlobalConfig as n } from "../../config-provider/hooks/use-global-config.mjs";
+import { useLocale as S } from "../../config-provider/hooks/use-locale.mjs";
+const T = /* @__PURE__ */ b({
   __name: "ApImage",
   props: {
-    ...x(),
-    path: String,
-    getOssAccess: Function
+    getOssAccess: { type: Function },
+    width: {},
+    height: {},
+    alt: {},
+    fallback: {},
+    src: {},
+    preview: { type: [Boolean, Object] }
   },
   setup(i) {
-    const a = i, o = {
-      aplus: B,
-      admin: y
-    }, m = u("uiMode"), p = u("apUpload"), { t: f, lang: g } = L(), r = c(() => a.path), v = c(
+    const e = i, s = {
+      aplus: I,
+      admin: C
+    }, u = n("uiMode"), m = n("apUpload"), { t: f, lang: p } = S(), g = c(
       () => {
-        var e;
-        return a.getOssAccess || ((e = p.value) == null ? void 0 : e.getOssAccess);
+        var t;
+        return e.getOssAccess || ((t = m.value) == null ? void 0 : t.getOssAccess);
       }
-    ), l = c(
-      () => o[m.value] || o.aplus
-    ), n = c(() => (a == null ? void 0 : a.fallback) || l.value), s = h(l.value);
-    M(f, g);
-    function d(e) {
-      const { path: t, getOssAccess: k, ...A } = e;
-      return A;
-    }
-    return O(async () => {
-      if (a != null && a.src) {
-        s.value = a.src;
-        return;
-      }
-      try {
-        if (r.value) {
-          const e = await S(v.value), t = await U({
-            oss: e,
-            fileName: r.value
+    ), d = c(
+      () => s[u.value] || s.aplus
+    ), v = c(() => (e == null ? void 0 : e.fallback) || d.value), a = k("");
+    return F(f, p), A(async () => {
+      var t;
+      if (e != null && e.src) {
+        if (!((t = e.src) != null && t.startsWith("Frontend-Upload"))) {
+          a.value = e.src;
+          return;
+        }
+        try {
+          const o = await U(g.value), r = await B({
+            oss: o,
+            fileName: e.src
           });
-          t && (s.value = t);
+          r && (a.value = r);
+        } catch {
+          a.value = "";
         }
-      } catch {
-        s.value = n.value;
       }
-    }), (e, t) => (_(), P(w(I), C(F({
-      ...d(a),
-      fallback: n.value,
-      src: s.value
+    }), (t, o) => (O(), h(l(y), _(w({
+      ...l(M)(e, ["src", "getOssAccess"]),
+      fallback: v.value,
+      src: a.value
     })), null, 16));
   }
 });
 export {
-  H as default
+  T as default
 };

package/es/src/business/ap-image/interface.d.ts

@@ -0,0 +1,17 @@
+import { accessCreate } from '@aplus-frontend/oss';
+export interface ApImageProps {
+    getOssAccess?: () => Promise<accessCreate>;
+    width?: number | string;
+    height?: number | string;
+    alt?: string;
+    fallback?: string;
+    src?: string;
+    preview?: boolean | {
+        visible?: boolean;
+        onVisibleChange?: (visible: boolean, prevVisible: boolean) => void;
+        getContainer: string | HTMLElement | (() => HTMLElement);
+        src?: string;
+        maskClassName?: string;
+        current?: number;
+    };
+}

package/es/src/business/index.d.ts

@@ -17,7 +17,6 @@ import { CSSMotionProps } from 'ant-design-vue/es/_util/transition';
 import { BuiltinPlacements, TriggerSubMenuAction, SelectEventHandler, MenuClickEventHandler } from 'ant-design-vue/es/menu/src/interface';
 import { ApBatchActionGroupMenuProps } from './ap-batch-action-group/interface';
 import { accessCreate } from '@aplus-frontend/oss';
-import { ImagePreviewType } from 'ant-design-vue/es/vc-image';
 export type { ApTitleProps } from './title/interface';
 export type { ApExpandAlertProps } from './expandAlert/interface';
 export type { ApLabelProps, ApLabelGroupProps, ApLabelGroupItemProps } from './ap-label/interface';
@@ -1905,64 +1904,62 @@ export declare const ApBatchActionGroup: DefineComponent<{
     };
 }>>, {}, {}>;
 export declare const ApImage: DefineComponent<{
-    path: StringConstructor;
-    getOssAccess: PropType<() => Promise< accessCreate>>;
-    src: StringConstructor;
-    wrapperClassName: StringConstructor;
-    wrapperStyle: {
-        type: PropType<CSSProperties>;
-        default: CSSProperties;
+    getOssAccess: {
+        type: PropType<() => Promise< accessCreate>>;
     };
-    rootClassName: StringConstructor;
-    prefixCls: StringConstructor;
-    previewPrefixCls: StringConstructor;
-    previewMask: {
-        type: PropType<false | (() => any)>;
-        default: any;
+    width: {
+        type: PropType<string | number>;
     };
-    placeholder: VueTypeValidableDef<any>;
-    fallback: StringConstructor;
-    preview: {
-        type: PropType<boolean | ImagePreviewType>;
-        default: boolean | ImagePreviewType;
+    height: {
+        type: PropType<string | number>;
     };
-    onClick: {
-        type: PropType<MouseEventHandler>;
+    alt: {
+        type: PropType<string>;
     };
-    onError: {
-        type: PropType<OnErrorEventHandlerNonNull>;
+    fallback: {
+        type: PropType<string>;
+    };
+    src: {
+        type: PropType<string>;
+    };
+    preview: {
+        type: PropType<boolean | {
+            visible?: boolean;
+            onVisibleChange?: (visible: boolean, prevVisible: boolean) => void;
+            getContainer: string | HTMLElement | (() => HTMLElement);
+            src?: string;
+            maskClassName?: string;
+            current?: number;
+        }>;
     };
 }, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<{
-    path: StringConstructor;
-    getOssAccess: PropType<() => Promise< accessCreate>>;
-    src: StringConstructor;
-    wrapperClassName: StringConstructor;
-    wrapperStyle: {
-        type: PropType<CSSProperties>;
-        default: CSSProperties;
+    getOssAccess: {
+        type: PropType<() => Promise< accessCreate>>;
     };
-    rootClassName: StringConstructor;
-    prefixCls: StringConstructor;
-    previewPrefixCls: StringConstructor;
-    previewMask: {
-        type: PropType<false | (() => any)>;
-        default: any;
+    width: {
+        type: PropType<string | number>;
     };
-    placeholder: VueTypeValidableDef<any>;
-    fallback: StringConstructor;
-    preview: {
-        type: PropType<boolean | ImagePreviewType>;
-        default: boolean | ImagePreviewType;
+    height: {
+        type: PropType<string | number>;
+    };
+    alt: {
+        type: PropType<string>;
     };
-    onClick: {
-        type: PropType<MouseEventHandler>;
+    fallback: {
+        type: PropType<string>;
     };
-    onError: {
-        type: PropType<OnErrorEventHandlerNonNull>;
+    src: {
+        type: PropType<string>;
     };
-}>>, {
-    preview: boolean | ImagePreviewType;
-    wrapperStyle: CSSProperties;
-    previewMask: false | (() => any);
-}, {}>;
+    preview: {
+        type: PropType<boolean | {
+            visible?: boolean;
+            onVisibleChange?: (visible: boolean, prevVisible: boolean) => void;
+            getContainer: string | HTMLElement | (() => HTMLElement);
+            src?: string;
+            maskClassName?: string;
+            current?: number;
+        }>;
+    };
+}>>, {}, {}>;
 export { ApTransformDataHelper };

package/es/src/config-provider/config-provider.mjs

@@ -1,20 +1,20 @@
-import { isVNode as n, ref as u, defineComponent as d, computed as f, watch as a, createVNode as m, renderSlot as c } from "vue";
+import { isVNode as n, ref as d, defineComponent as f, computed as u, watch as a, createVNode as m, renderSlot as c } from "vue";
 import { ConfigProvider as p } from "ant-design-vue";
 import { provideGlobalConfig as s } from "./hooks/use-global-config.mjs";
 import { configProviderProps as g } from "./config-provider-props.mjs";
 import { tableDefaultConfig as C } from "./constants.mjs";
 import { mergeAntdProvideConfig as v } from "../utils/config-provider-preset.mjs";
-import { setCSSVariables as b, aplusCssVar as P, adminCssVar as M } from "../theme/css-var/index.mjs";
-function S(e) {
+import { setCSSVariables as b, aplusCssVar as P, adminCssVar as y } from "../theme/css-var/index.mjs";
+function M(e) {
   return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !n(e);
 }
-const i = u({}), N = /* @__PURE__ */ d({
+const i = d({}), L = /* @__PURE__ */ f({
   name: "AplusConfigProvider",
   props: g(),
   setup(e, {
     slots: r
   }) {
-    const l = f(() => ({
+    const l = u(() => ({
       namespace: e.namespace,
       aplusLocale: e.aplusLocale,
       api: e.api,
@@ -33,13 +33,13 @@ const i = u({}), N = /* @__PURE__ */ d({
     }, {
       deep: !0,
       immediate: !0
-    }), a(() => e.uiMode, (o) => {
-      b(o === "aplus" ? P : M);
+    }), typeof window < "u" && a(() => e.uiMode, (o) => {
+      b(o === "aplus" ? P : y);
     }, {
       immediate: !0
     }), () => {
       let o;
-      return m(p, i.value, S(o = c(r, "default", {
+      return m(p, i.value, M(o = c(r, "default", {
         config: t == null ? void 0 : t.value
       })) ? o : {
         default: () => [o]
@@ -48,6 +48,6 @@ const i = u({}), N = /* @__PURE__ */ d({
   }
 });
 export {
-  N as ConfigProvider,
+  L as ConfigProvider,
   i as globalConfigCached
 };

package/es/src/locale/lang/en.mjs

@@ -81,8 +81,10 @@ const e = {
     },
     apTable: {
       pagination: {
-        totalLeft: "Total {total} items",
-        totalRight: "Page {page}"
+        totalLeftPrefix: "Total",
+        totalLeftSuffix: "items",
+        totalRightPrefix: "Page",
+        totalRightSuffix: ""
       }
     },
     apUpload: {

package/es/src/locale/lang/zh-cn.mjs

@@ -81,8 +81,10 @@ const e = {
     },
     apTable: {
       pagination: {
-        totalLeft: "共 {total} 条记录",
-        totalRight: "第 {page} 页"
+        totalLeftPrefix: "共",
+        totalLeftSuffix: "条记录",
+        totalRightPrefix: "第",
+        totalRightSuffix: "页"
       }
     },
     apUpload: {

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

@@ -86,3 +86,12 @@
 .aplus-ap-table .ant-table-cell .ant-typography {
   margin-bottom: 0;
 }
+.aplus-ap-table-pagination-count-text {
+  color: var(--ap-table-pagination-total-count-color, #182948);
+}
+.aplus-ap-table-pagination--total-right {
+  padding-left: 12px;
+}
+.aplus-ap-table-pagination-total-wrapper {
+  color: var(--ap-table-pagination-total-color, #526A90);
+}

package/es/src/theme/css-var/index.mjs

@@ -39,6 +39,14 @@ const i = {
   "ap-table": {
     header: {
       bg: "#F2F6F9"
+    },
+    pagination: {
+      total: {
+        color: "#526A90",
+        count: {
+          color: "#182948"
+        }
+      }
     }
   },
   "ap-batch-action": {
@@ -88,6 +96,14 @@ const i = {
   "ap-table": {
     header: {
       bg: "#FAFAFA"
+    },
+    pagination: {
+      total: {
+        color: "#666666",
+        count: {
+          color: "#333333"
+        }
+      }
     }
   },
   "ap-batch-action": {
@@ -97,18 +113,18 @@ const i = {
     }
   }
 };
-function n(c) {
+function s(c) {
   const o = {};
-  function e(t, F) {
-    const l = Object.keys(t);
-    for (const a of l) {
-      const r = t[a], s = [...F, a];
-      r !== null && typeof r == "object" ? e(r, s) : o[`--${s.join("-")}`] = r;
+  function e(t, l) {
+    const F = Object.keys(t);
+    for (const a of F) {
+      const r = t[a], n = [...l, a];
+      r !== null && typeof r == "object" ? e(r, n) : o[`--${n.join("-")}`] = r;
     }
   }
   return e(c, []), o;
 }
-const u = n(i), d = n(b);
+const u = s(i), d = s(b);
 function h(c) {
   Object.entries(c).forEach(([o, e]) => {
     document.documentElement.style.setProperty(o, e);

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

@@ -1,7 +1,7 @@
 import { ModalProps } from 'ant-design-vue';
-export type CreateModalFuncProps<ContentRecord = any> = Omit<ModalProps, 'open' | 'onUpdate:open' | 'destroyOnClose' | 'onCancel' | 'onOk' | 'getContainer'> & Partial<{
-    onCancel: (params: ContentRecord) => void | Promise<unknown>;
-    onOk: (params: ContentRecord) => void | Promise<unknown>;
+export type CreateModalFuncProps<ContentRecord = any> = Omit<ModalProps, 'open' | 'onUpdate:open' | 'destroyOnClose' | 'onCancel' | 'onOk' | 'getContainer' | 'icon'> & Partial<{
+    onCancel: (params: ContentRecord) => any | Promise<any>;
+    onOk: (params: ContentRecord) => any | Promise<any>;
     getContainer: HTMLElement;
     content: any;
 }>;

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"),N=require("ant-design-vue"),Y=require("ant-design-vue/es/theme/internal"),Z=require("../ap-form/index.js"),z=require("./constants.js");require("../config-provider/index.js");const ee=require("./hooks/use-table-paging.js"),u=require("lodash-unified");require("./style/ap-table.css");const s=require("./utils.js"),ae=require("./hooks/use-table-content-height.js"),re=require("../editable-table/utils.js"),oe=require("./hooks/use-table-row-selection.js"),ne=require("../utils/index.js"),te=require("../config-provider/hooks/use-locale.js"),le=require("../config-provider/hooks/use-namespace.js"),se=require("../config-provider/hooks/use-global-config.js"),ue=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:!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:{},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:!1},size:{default:"middle"},adaptive:{type:Boolean,default:!1},columnResizable:{type:Boolean,default:!1}},setup(I,{expose:V}){const o=I;let w=0;const m=e.useSlots(),[,E]=Y.useToken(),{t:L}=te.useLocale(),{e:g,b:i}=le.useNamespace("ap-table"),C=se.useGlobalConfig("valueTypeMap"),{height:O,contentRef:K}=ae.default(),c=e.ref([]),D=()=>{var n;let a=((n=o.columns)==null?void 0:n.filter(r=>!r.hideInTable))||[];return a=a.map(r=>({resizable:ne.isDef(r.resizable)?r.resizable:o.columnResizable,...u.omit(s.apColumnToColumn(r),["ellipsis"]),title:s.getTableTitle(r,m.default,e.unref(E).colorPrimary),customRender({value:t,...l}){var k,q;const d=s.getTableRenderType(r),B=s.getTableRenderProps({...r,valueType:d},{value:t,...l}),Q=s.getTableCellRenderNode(d,B,l.record,e.unref(C)),P=((k=r.renderText)==null?void 0:k.call(r,{value:t,...l}))||t,X=r.renderText?e.createVNode(e.Fragment,null,[(q=r.renderText)==null?void 0:q.call(r,{value:t,...l})]):Q;let h=G(r,P,X);return r.customRender&&(h=r.customRender({value:t,...l,column:r,originalNode:h,originalText:P})),h}})),a};e.watchEffect(()=>{c.value=D()});const R=e.computed(()=>{var a,n,r;return w++,((r=(n=(a=o.columns)==null?void 0:a.filter(t=>!t.hideInSearch&&t.dataIndex&&(t.valueType||t.customRenderFormItem)&&!z.noRenderAsFormItemValueList.includes(t.valueType)))==null?void 0:n.sort((t,l)=>{let d=s.getColumnOrder(t.order);return s.getColumnOrder(l.order)-d}))==null?void 0:r.map(t=>{const l=s.updateFormProps(t,s.getFieldProps(t.fieldProps,{})),d={...t,fieldProps:{label:t.title,name:t.dataIndex,...l||{},placeholder:s.getPlaceholder(L,t.valueType,l==null?void 0:l.placeholder),_signal:w},renderNode:void 0};return d.renderNode=s.getSearchFormItemRenderNode(d,e.unref(C)),d}))||[]}),U=e.computed(()=>e.unref(c).filter(a=>a.sorter===!0).map(a=>a.dataIndex).filter(Boolean)),j=e.computed(()=>e.unref(c).filter(a=>a.filters&&!a.onFilter).map(a=>a.dataIndex).filter(Boolean)),A=e.computed(()=>u.isUndefined(o.dataSource)?p.value.records:o.dataSource),{rowSelection:y,selectedRows:T,...S}=oe.default({...o.rowSelection===!0?{}:o.rowSelection,rowKey:o.rowKey,dataSource:A}),{formRef:b,submit:x,reset:F,tableProps:f,handleTableChange:W,data:p}=ee.useTablePaging({async request(a){var r,t;!y.value.preserveSelectedRowKeys&&u.isUndefined(o.dataSource)&&S.clearAll();const n=await((r=o.request)==null?void 0:r.call(o,a));return(t=o.onLoad)==null||t.call(o,(n==null?void 0:n.data)||[]),{data:(n==null?void 0:n.data)||[],total:(n==null?void 0:n.total)||0}},filterFields:j,sortFields:U,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}),$=e.computed(()=>{var n,r;if(o.adaptive&&(p.value.total>0||((n=o.dataSource)==null?void 0:n.length)))return{y:e.unref(O),x:((r=o.scroll)==null?void 0:r.x)||"100%"};if(o.scroll)return o.scroll}),H=e.computed(()=>{var a;if(o.tableLayout)return o.tableLayout;if((a=o.columns)!=null&&a.some(n=>n.ellipsis))return"fixed"}),v=e.computed(()=>{var t;const a=e.unref(f),n=u.isUndefined(o.dataSource)?a:{...a,dataSource:o.dataSource,onChange:o.onChange},r=e.unref(y);return{...o,...n,rowSelection:o.rowSelection===!0||((t=o.rowSelection)==null?void 0:t.mode)==="internal"?{...r,preserveSelectedRowKeys:u.isUndefined(o.dataSource)?r.preserveSelectedRowKeys:!0}:o.rowSelection,loading:u.isUndefined(o.loading)?e.unref(f).loading:o.loading,pagination:o.pagination===!1?!1:e.unref(f).pagination,scroll:e.unref($)}}),M=e.computed(()=>[i(),o.card?null:i("wrapper"),o.adaptive?i("adaptive"):null].filter(Boolean));function G(a,n,r){if(z.noRenderAsFormItemValueList.includes(a.valueType))return r;const t=s.objectToString(n);return a.copyable||a.ellipsis?e.createVNode(N.Typography.Paragraph,{copyable:a.copyable?{text:t,tooltip:!1}:!1,ellipsis:a.ellipsis?u.isBoolean(a.ellipsis)?{tooltip:t}:{...a.ellipsis,tooltip:t}:!1,content:a.ellipsis?re.getRawDisplayValue(a,n):r},null):r}e.watch(()=>e.unref(p).loading,a=>{var n;(n=o.onLoadingChange)==null||n.call(o,a)});function _(a){var n,r,t;(t=(r=(n=b.value)==null?void 0:n.apForm)==null?void 0:r.setFieldsValue)==null||t.call(r,a)}function J(){var a,n,r;return(r=(n=(a=b.value)==null?void 0:a.apForm)==null?void 0:n.getFieldsValue)==null?void 0:r.call(n,!0)}return V({submit:()=>x(),reset:()=>F(),setSearchFormValues:_,getSearchFormValues:J,dataSource:e.computed(()=>e.unref(p).records),rowSelection:{selectedRows:e.computed(()=>e.unref(T)),...S}}),(a,n)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(M.value)},[e.unref(u.isUndefined)(a.dataSource)&&a.searchForm!==!1&&R.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(a.card?e.unref(g)("search-wrapper"):null),style:e.normalizeStyle(a.searchFormWrapperStyle)},[e.createVNode(e.unref(Z.ApForm).SearchForm,e.mergeProps(a.searchForm||{},{ref_key:"formRef",ref:b,"custom-reset":"",onSubmit:e.unref(x),onReset:e.unref(F),"submit-loading":e.unref(f).loading}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(R.value,r=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(r.renderNode),e.mergeProps({key:r.dataIndex,ref_for:!0},r.fieldProps||{},{span:r.span}),null,16,["span"]))),128))]),_:2},[m.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:K,class:e.normalizeClass([e.unref(g)("table-wrapper"),a.card?e.unref(g)("table-wrapper-card"):null]),style:e.normalizeStyle(a.tableWrapperStyle)},[e.renderSlot(a.$slots,"title",e.mergeProps({selectedRows:e.unref(T),selectedRowKeys:e.unref(y).selectedRowKeys},S)),e.createVNode(e.unref(N.Table),e.mergeProps({class:e.unref(i)("table")},v.value,{"table-layout":H.value,onChange:e.unref(W),columns:c.value,onResizeColumn:n[0]||(n[0]=(r,t)=>{console.log("width is: ",r),t.width=r})}),e.createSlots({summary:e.withCtx(()=>[e.renderSlot(a.$slots,"summary",{columns:c.value,records:v.value.dataSource})]),_:2},[e.renderList(e.unref(u.omit)(m,["title","searchFormExtra","headerCell"]),(r,t)=>({name:t,fn:e.withCtx(l=>[e.renderSlot(a.$slots,t,e.normalizeProps(e.guardReactiveProps(l||{})))])}))]),1040,["class","table-layout","onChange","columns"])],6)],2))}});exports.default=ue;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),I=require("ant-design-vue"),Y=require("ant-design-vue/es/theme/internal"),Z=require("../ap-form/index.js"),N=require("./constants.js");require("../config-provider/index.js");const ee=require("./hooks/use-table-paging.js"),u=require("lodash-unified");require("./style/ap-table.css");const s=require("./utils.js"),ae=require("./hooks/use-table-content-height.js"),oe=require("../editable-table/utils.js"),re=require("./hooks/use-table-row-selection.js"),ne=require("../utils/index.js"),te=require("../config-provider/hooks/use-locale.js"),le=require("../config-provider/hooks/use-namespace.js"),se=require("../config-provider/hooks/use-global-config.js"),ue=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:!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:{},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:!1},size:{default:"middle"},adaptive:{type:Boolean,default:!1},columnResizable:{type:Boolean,default:!1}},setup(z,{expose:L}){const o=z;let w=0;const m=e.useSlots(),[,V]=Y.useToken(),{t:E}=te.useLocale(),{e:g,b:c}=le.useNamespace("ap-table"),C=se.useGlobalConfig("valueTypeMap"),{height:O,contentRef:K}=ae.default(),i=e.ref([]),D=()=>{var n;let a=((n=o.columns)==null?void 0:n.filter(r=>!r.hideInTable))||[];return a=a.map(r=>({resizable:ne.isDef(r.resizable)?r.resizable:o.columnResizable,...u.omit(s.apColumnToColumn(r),["ellipsis"]),title:s.getTableTitle(r,m.headerCell,e.unref(V).colorPrimary),customRender({value:t,...l}){var k,q;const d=s.getTableRenderType(r),B=s.getTableRenderProps({...r,valueType:d},{value:t,...l}),Q=s.getTableCellRenderNode(d,B,l.record,e.unref(C)),P=((k=r.renderText)==null?void 0:k.call(r,{value:t,...l}))||t,X=r.renderText?e.createVNode(e.Fragment,null,[(q=r.renderText)==null?void 0:q.call(r,{value:t,...l})]):Q;let b=G(r,P,X);return r.customRender&&(b=r.customRender({value:t,...l,column:r,originalNode:b,originalText:P})),b}})),a};e.watchEffect(()=>{i.value=D()});const R=e.computed(()=>{var a,n,r;return w++,((r=(n=(a=o.columns)==null?void 0:a.filter(t=>!t.hideInSearch&&t.dataIndex&&(t.valueType||t.customRenderFormItem)&&!N.noRenderAsFormItemValueList.includes(t.valueType)))==null?void 0:n.sort((t,l)=>{let d=s.getColumnOrder(t.order);return s.getColumnOrder(l.order)-d}))==null?void 0:r.map(t=>{const l=s.updateFormProps(t,s.getFieldProps(t.fieldProps,{})),d={...t,fieldProps:{label:t.title,name:t.dataIndex,...l||{},placeholder:s.getPlaceholder(E,t.valueType,l==null?void 0:l.placeholder),_signal:w},renderNode:void 0};return d.renderNode=s.getSearchFormItemRenderNode(d,e.unref(C)),d}))||[]}),U=e.computed(()=>e.unref(i).filter(a=>a.sorter===!0).map(a=>a.dataIndex).filter(Boolean)),j=e.computed(()=>e.unref(i).filter(a=>a.filters&&!a.onFilter).map(a=>a.dataIndex).filter(Boolean)),A=e.computed(()=>u.isUndefined(o.dataSource)?f.value.records:o.dataSource),{rowSelection:y,selectedRows:T,...h}=re.default({...o.rowSelection===!0?{}:o.rowSelection,rowKey:o.rowKey,dataSource:A}),{formRef:S,submit:x,reset:F,tableProps:p,handleTableChange:W,data:f}=ee.useTablePaging({async request(a){var r,t;!y.value.preserveSelectedRowKeys&&u.isUndefined(o.dataSource)&&h.clearAll();const n=await((r=o.request)==null?void 0:r.call(o,a));return(t=o.onLoad)==null||t.call(o,(n==null?void 0:n.data)||[]),{data:(n==null?void 0:n.data)||[],total:(n==null?void 0:n.total)||0}},filterFields:j,sortFields:U,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,showLessItems:o.pagination?o.pagination.showLessItems:void 0,showTotal:o.pagination?o.pagination.showTotal:void 0}),$=e.computed(()=>{var n,r;if(o.adaptive&&(f.value.total>0||((n=o.dataSource)==null?void 0:n.length)))return{y:e.unref(O),x:((r=o.scroll)==null?void 0:r.x)||"100%"};if(o.scroll)return o.scroll}),H=e.computed(()=>{var a;if(o.tableLayout)return o.tableLayout;if((a=o.columns)!=null&&a.some(n=>n.ellipsis))return"fixed"}),v=e.computed(()=>{var t;const a=e.unref(p),n=u.isUndefined(o.dataSource)?a:{...a,dataSource:o.dataSource,onChange:o.onChange},r=e.unref(y);return{...o,...n,rowSelection:o.rowSelection===!0||((t=o.rowSelection)==null?void 0:t.mode)==="internal"?{...r,preserveSelectedRowKeys:u.isUndefined(o.dataSource)?r.preserveSelectedRowKeys:!0}:o.rowSelection,loading:u.isUndefined(o.loading)?e.unref(p).loading:o.loading,pagination:o.pagination===!1?!1:e.unref(p).pagination,scroll:e.unref($)}}),M=e.computed(()=>[c(),o.card?null:c("wrapper"),o.adaptive?c("adaptive"):null].filter(Boolean));function G(a,n,r){if(N.noRenderAsFormItemValueList.includes(a.valueType))return r;const t=s.objectToString(n);return a.copyable||a.ellipsis?e.createVNode(I.Typography.Paragraph,{copyable:a.copyable?{text:t,tooltip:!1}:!1,ellipsis:a.ellipsis?u.isBoolean(a.ellipsis)?{tooltip:t}:{...a.ellipsis,tooltip:t}:!1,content:a.ellipsis?oe.getRawDisplayValue(a,n):r},null):r}e.watch(()=>e.unref(f).loading,a=>{var n;(n=o.onLoadingChange)==null||n.call(o,a)});function _(a){var n,r,t;(t=(r=(n=S.value)==null?void 0:n.apForm)==null?void 0:r.setFieldsValue)==null||t.call(r,a)}function J(){var a,n,r;return(r=(n=(a=S.value)==null?void 0:a.apForm)==null?void 0:n.getFieldsValue)==null?void 0:r.call(n,!0)}return L({submit:()=>x(),reset:()=>F(),setSearchFormValues:_,getSearchFormValues:J,dataSource:e.computed(()=>e.unref(f).records),rowSelection:{selectedRows:e.computed(()=>e.unref(T)),...h}}),(a,n)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(M.value)},[e.unref(u.isUndefined)(a.dataSource)&&a.searchForm!==!1&&R.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(a.card?e.unref(g)("search-wrapper"):null),style:e.normalizeStyle(a.searchFormWrapperStyle)},[e.createVNode(e.unref(Z.ApForm).SearchForm,e.mergeProps(a.searchForm||{},{ref_key:"formRef",ref:S,"custom-reset":"",onSubmit:e.unref(x),onReset:e.unref(F),"submit-loading":e.unref(p).loading}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(R.value,r=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(r.renderNode),e.mergeProps({key:r.dataIndex,ref_for:!0},r.fieldProps||{},{span:r.span}),null,16,["span"]))),128))]),_:2},[m.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:K,class:e.normalizeClass([e.unref(g)("table-wrapper"),a.card?e.unref(g)("table-wrapper-card"):null]),style:e.normalizeStyle(a.tableWrapperStyle)},[e.renderSlot(a.$slots,"title",e.mergeProps({selectedRows:e.unref(T),selectedRowKeys:e.unref(y).selectedRowKeys},h)),e.createVNode(e.unref(I.Table),e.mergeProps({class:e.unref(c)("table")},v.value,{"table-layout":H.value,onChange:e.unref(W),columns:i.value,onResizeColumn:n[0]||(n[0]=(r,t)=>t.width=r)}),e.createSlots({summary:e.withCtx(()=>[e.renderSlot(a.$slots,"summary",{columns:i.value,records:v.value.dataSource})]),_:2},[e.renderList(e.unref(u.omit)(m,["title","searchFormExtra","headerCell"]),(r,t)=>({name:t,fn:e.withCtx(l=>[e.renderSlot(a.$slots,t,e.normalizeProps(e.guardReactiveProps(l||{})))])}))]),1040,["class","table-layout","onChange","columns"])],6)],2))}});exports.default=ue;

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");require("./components/status/index.vue.js");const t=require("../ap-form/items/date/index.vue.js"),_=require("../ap-form/items/date-range/index.vue.js"),u=require("../ap-form/items/number/index.vue.js"),r=require("../ap-form/items/radio/index.vue.js"),i=require("../ap-form/items/select/index.vue.js"),s=require("../ap-form/items/switch/index.vue.js"),e=require("../ap-form/items/text/index.js"),n=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"),l=require("../ap-field/date-range/index.vue.js"),d=require("../ap-field/number/index.vue.js"),c=require("../ap-field/radio/index.vue.js"),o=require("../ap-field/select/index.vue.js"),v=require("../ap-field/switch/index.vue.js"),x=require("../ap-field/text/index.js"),q=require("../ap-field/text-area/index.vue.js"),g=require("../ap-field/checkbox/index.vue.js"),y=require("../ap-action/group/index.vue.js"),f=require("./components/index/index.vue2.js"),m=require("./components/status/index.vue2.js"),$=require("../ap-field/text/password.vue.js"),b={date:t.default,dateRange:_.default,number:u.default,radio:r.default,select:i.default,switch:s.default,text:e.ApFormItemText,textArea:n.default,checkbox:a.default,password:e.ApFormItemText.Password},w={date:p.default,dateRange:l.default,number:d.default,radio:c.default,select:o.default,switch:v.default,text:x.ApFieldText,textArea:q.default,checkbox:g.default,action:y.default,index:f.default,status:m.default,password:$.default},T=["action","index"],h={display:"-webkit-inline-box","-webkit-line-clamp":2,"-webkit-box-orient":"vertical",overflow:"hidden",textOverflow:"ellipsis",whiteSpace:"normal",maxWidth:"100%",verticalAlign:"middle"};exports.apTableFormItemMap=b;exports.apTableRenderItemMap=w;exports.ellipsisTitleStyle=h;exports.noRenderAsFormItemValueList=T;
+"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 t=require("../ap-form/items/date/index.vue.js"),_=require("../ap-form/items/date-range/index.vue.js"),u=require("../ap-form/items/number/index.vue.js"),r=require("../ap-form/items/radio/index.vue.js"),i=require("../ap-form/items/select/index.vue.js"),s=require("../ap-form/items/switch/index.vue.js"),e=require("../ap-form/items/text/index.js"),n=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"),l=require("../ap-field/date-range/index.vue.js"),d=require("../ap-field/number/index.vue.js"),c=require("../ap-field/radio/index.vue.js"),o=require("../ap-field/select/index.vue.js"),v=require("../ap-field/switch/index.vue.js"),x=require("../ap-field/text/index.js"),q=require("../ap-field/text-area/index.vue.js"),g=require("../ap-field/checkbox/index.vue.js"),f=require("../ap-action/group/index.vue.js"),y=require("./components/index/index.vue2.js"),m=require("./components/status/index.vue2.js"),$=require("../ap-field/text/password.vue.js"),b={date:t.default,dateRange:_.default,number:u.default,radio:r.default,select:i.default,switch:s.default,text:e.ApFormItemText,textArea:n.default,checkbox:a.default,password:e.ApFormItemText.Password},w={date:p.default,dateRange:l.default,number:d.default,radio:c.default,select:o.default,switch:v.default,text:x.ApFieldText,textArea:q.default,checkbox:g.default,action:f.default,index:y.default,status:m.default,password:$.default},T=["action","index"],h={display:"-webkit-inline-box","-webkit-line-clamp":2,"-webkit-box-orient":"vertical",overflow:"hidden",textOverflow:"ellipsis",whiteSpace:"normal",maxWidth:"100%",verticalAlign:"middle",wordBreak:"break-all",flex:1};exports.apTableFormItemMap=b;exports.apTableRenderItemMap=w;exports.ellipsisTitleStyle=h;exports.noRenderAsFormItemValueList=T;

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

@@ -51,8 +51,16 @@ export type UseTablePagingParams<DataType, ParamsType> = {
      * 需要后端筛选的排序字段列表
      */
     sortFields?: ComputedRef<DataIndex[]>;
+    /**
+     * 是否显示基础分页（较少的现实内容）
+     */
+    showLessItems?: boolean;
+    /**
+     * 用于显示数据总量和当前数据顺序
+     */
+    showTotal?: boolean;
 };
-export declare const useTablePaging: <DataType = any, ParamsType = Record<string, any>>({ manual, defaultCurrent, defaultPageSize, request, defaultParams, defaultData, formatParams, paramsValueTypeMap, resetFieldsIgnores, filterFields, sortFields }: UseTablePagingParams<DataType, ParamsType>) => {
+export declare const useTablePaging: <DataType = any, ParamsType = Record<string, any>>({ manual, defaultCurrent, defaultPageSize, request, defaultParams, defaultData, formatParams, paramsValueTypeMap, resetFieldsIgnores, filterFields, sortFields, showLessItems, showTotal }: UseTablePagingParams<DataType, ParamsType>) => {
     formRef: Ref<ApFormSearchFormExpose | undefined>;
     submit: () => void;
     reset: () => void;
@@ -74,7 +82,9 @@ export declare const useTablePaging: <DataType = any, ParamsType = Record<string
             total: number;
             showSizeChanger: boolean;
             showQuickJumper: boolean;
-            showTotal: (total: number) => string;
+            showLessItems: boolean;
+            size: string;
+            showTotal: ((total: number) => import("vue/jsx-runtime").JSX.Element) | undefined;
         };
         onChange: (pagination: TablePaginationConfig, filters: Record<string, FilterValue | null>, sorter: SorterResult<any> | SorterResult<any>[], extra: TableCurrentDataSource<any>) => void;
         dataSource: DataType[];

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("vue"),O=require("../utils.js"),I=require("lodash-unified");require("../../config-provider/index.js");const K=require("../../config-provider/hooks/use-locale.js"),N=({manual:j=!1,defaultCurrent:$=1,defaultPageSize:T=10,request:x,defaultParams:D={},defaultData:L=[],formatParams:P,paramsValueTypeMap:b,resetFieldsIgnores:z,filterFields:M,sortFields:R})=>{let F=0,f={};const A=e=>P?P(e):e,i=t.ref(),c=t.ref($),d=t.ref(T),{t:q}=K.useLocale(),o=t.ref({total:0,records:L,loading:!1}),w=async e=>{var n;const a=A(e),r=Date.now();F=r,o.value.loading=!0;try{const s=await x({...D,...a});F===r&&(o.value.total=s.total||((n=s.data)==null?void 0:n.length)||0,o.value.records=[...s.data||[]])}catch{F===r&&(o.value.records=[],o.value.total=0)}finally{o.value.loading=!1}},y=e=>{const a={};return Object.entries(e).forEach(([r,n])=>{if(a[r]=n,b&&n){const s=b[r];s&&(a[r]=O.parseFieldValue(s,n))}}),a},B=async e=>{var n,s,g,p,h,l,m;const a=((s=(n=i.value)==null?void 0:n.apForm)==null?void 0:s.getFieldsValue())||{},r={};Object.entries(a).forEach(([v,u])=>{z&&z.indexOf(v)>-1&&(r[v]=u)}),await((p=(g=i.value)==null?void 0:g.apForm)==null?void 0:p.resetFields()),(m=(l=(h=i.value)==null?void 0:h.apForm)==null?void 0:l.setFieldsValue)==null||m.call(l,r),t.nextTick(()=>{e==null||e()})},S=e=>{f=e;const a=y(e);w(a)},E=e=>{S({...f,...e})},V=()=>{var a,r;const e=((r=(a=i.value)==null?void 0:a.apForm)==null?void 0:r.getFieldsValue(!0))||{};c.value=1,S({...e,current:1,pageSize:f.pageSize||T})},J=()=>{B(V)},Q=()=>{S(f)},U=e=>{const a=t.unref(o).total-e,r=Math.ceil(a/t.unref(d)),n=t.unref(c)>r?r:t.unref(c);E({current:n>0?n:1})},C=(e,a,r)=>{var h,l,m,v;const n=((l=(h=i.value)==null?void 0:h.apForm)==null?void 0:l.getFieldsValue(!0))||{};c.value=e.current,d.value=e.pageSize;const s=I.isArray(r)?[...r]:[r],g={};for(const u of s)(m=t.unref(R))!=null&&m.includes(u.field)&&(g[O.dataIndexToStr(u.field)]=u.order);const p={};for(const u of Object.keys(a))(v=t.unref(M))!=null&&v.includes(u)&&(p[u]=a[u]);S({...n,filter:p,sort:g,current:e.current,pageSize:e.pageSize})};t.onMounted(()=>{var a,r;const e=((r=(a=i.value)==null?void 0:a.apForm)==null?void 0:r.getFieldsValue(!0))||{};if(f={current:t.unref(c),pageSize:t.unref(d),...e},!j){const n=y(f);w(n)}});const G=t.computed(()=>t.unref(o).total===0?"-":`${t.unref(c.value)}/${Math.ceil(t.unref(o).total/t.unref(d))}`),H=t.computed(()=>({loading:t.unref(o).loading,pagination:{current:t.unref(c),pageSize:t.unref(d),total:t.unref(o).total,showSizeChanger:!0,showQuickJumper:!0,showTotal:e=>`${q("ap.apTable.pagination.totalLeft",{total:e})} ${q("ap.apTable.pagination.totalRight",{page:t.unref(G)})}`},onChange:C,dataSource:t.unref(o).records}));return{formRef:i,submit:V,reset:J,refresh:Q,refreshByDelete:U,data:o,current:c,pageSize:d,handleTableChange:C,tableProps:H,dataSource:t.computed(()=>t.unref(o).records)}};exports.useTablePaging=N;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("vue"),O=require("../utils.js"),X=require("lodash-unified");require("../../config-provider/index.js");const Y=require("../../config-provider/hooks/use-locale.js"),Z=require("../../config-provider/hooks/use-namespace.js"),_=({manual:j=!1,defaultCurrent:R=1,defaultPageSize:V=10,request:D,defaultParams:M={},defaultData:A=[],formatParams:x,paramsValueTypeMap:z,resetFieldsIgnores:q,filterFields:B,sortFields:E,showLessItems:b=!1,showTotal:L=!0})=>{let P=0,f={};const $=t=>x?x(t):t,c=e.ref(),i=e.ref(R),d=e.ref(V),{t:S}=Y.useLocale(),{b:T}=Z.useNamespace("ap-table"),o=e.ref({total:0,records:A,loading:!1}),y=async t=>{var r;const n=$(t),a=Date.now();P=a,o.value.loading=!0;try{const s=await D({...M,...n});P===a&&(o.value.total=s.total||((r=s.data)==null?void 0:r.length)||0,o.value.records=[...s.data||[]])}catch{P===a&&(o.value.records=[],o.value.total=0)}finally{o.value.loading=!1}},N=t=>{const n={};return Object.entries(t).forEach(([a,r])=>{if(n[a]=r,z&&r){const s=z[a];s&&(n[a]=O.parseFieldValue(s,r))}}),n},J=async t=>{var r,s,g,p,h,l,m;const n=((s=(r=c.value)==null?void 0:r.apForm)==null?void 0:s.getFieldsValue())||{},a={};Object.entries(n).forEach(([v,u])=>{q&&q.indexOf(v)>-1&&(a[v]=u)}),await((p=(g=c.value)==null?void 0:g.apForm)==null?void 0:p.resetFields()),(m=(l=(h=c.value)==null?void 0:h.apForm)==null?void 0:l.setFieldsValue)==null||m.call(l,a),e.nextTick(()=>{t==null||t()})},F=t=>{f=t;const n=N(t);y(n)},Q=t=>{F({...f,...t})},w=()=>{var n,a;const t=((a=(n=c.value)==null?void 0:n.apForm)==null?void 0:a.getFieldsValue(!0))||{};i.value=1,F({...t,current:1,pageSize:f.pageSize||V})},U=()=>{J(w)},G=()=>{F(f)},H=t=>{const n=e.unref(o).total-t,a=Math.ceil(n/e.unref(d)),r=e.unref(i)>a?a:e.unref(i);Q({current:r>0?r:1})},C=(t,n,a)=>{var h,l,m,v;const r=((l=(h=c.value)==null?void 0:h.apForm)==null?void 0:l.getFieldsValue(!0))||{};i.value=t.current,d.value=t.pageSize;const s=X.isArray(a)?[...a]:[a],g={};for(const u of s)(m=e.unref(E))!=null&&m.includes(u.field)&&(g[O.dataIndexToStr(u.field)]=u.order);const p={};for(const u of Object.keys(n))(v=e.unref(B))!=null&&v.includes(u)&&(p[u]=n[u]);F({...r,filter:p,sort:g,current:t.current,pageSize:t.pageSize})};e.onMounted(()=>{var n,a;const t=((a=(n=c.value)==null?void 0:n.apForm)==null?void 0:a.getFieldsValue(!0))||{};if(f={current:e.unref(i),pageSize:e.unref(d),...t},!j){const r=N(f);y(r)}});const K=e.computed(()=>e.unref(o).total===0?"-":`${e.unref(i.value)}/${Math.ceil(e.unref(o).total/e.unref(d))}`),W=e.computed(()=>({loading:e.unref(o).loading,pagination:{current:e.unref(i),pageSize:e.unref(d),total:e.unref(o).total,showSizeChanger:!b,showQuickJumper:!b,showLessItems:b,size:"default",showTotal:L?t=>e.createVNode("span",{class:T("pagination-total-wrapper")},[S("ap.apTable.pagination.totalLeftPrefix")," ",e.createVNode("span",{class:T("pagination-count-text")},[t])," ",S("ap.apTable.pagination.totalLeftSuffix"),e.createVNode("span",{class:T("pagination--total-right")},[S("ap.apTable.pagination.totalRightPrefix")," ",e.createVNode("span",{class:T("pagination-count-text")},[e.unref(K)])," ",S("ap.apTable.pagination.totalRightSuffix")])]):void 0},onChange:C,dataSource:e.unref(o).records}));return{formRef:c,submit:w,reset:U,refresh:G,refreshByDelete:H,data:o,current:i,pageSize:d,handleTableChange:C,tableProps:W,dataSource:e.computed(()=>e.unref(o).records)}};exports.useTablePaging=_;

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

@@ -162,6 +162,18 @@ export type RequestData<T> = {
     data: T[] | undefined;
     total: number;
 } & Record<string, any>;
+export type ApTablePaginationConfig = {
+    defaultCurrent?: number;
+    defaultPageSize?: number;
+    /**
+     * 是否显示较少页面内容
+     */
+    showLessItems?: boolean;
+    /**
+     * 用于显示数据总量和当前数据顺序
+     */
+    showTotal?: boolean;
+};
 export type ApTableProps<RecordType = any, ParamsType = any> = Omit<TableProps<RecordType>, 'columns' | 'pagination' | 'dataSource' | 'size' | 'rowSelection'> & {
     /**
      * 列配置
@@ -230,10 +242,7 @@ export type ApTableProps<RecordType = any, ParamsType = any> = Omit<TableProps<R
     /**
      * 是否显示分页器（特定的分页器）或者指定默认的当前页和pageSize
      */
-    pagination?: false | {
-        defaultCurrent?: number;
-        defaultPageSize?: number;
-    };
+    pagination?: false | ApTablePaginationConfig;
     /**
      * 自定义查询表单容器样式
      */

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

@@ -86,3 +86,12 @@
 .aplus-ap-table .ant-table-cell .ant-typography {
   margin-bottom: 0;
 }
+.aplus-ap-table-pagination-count-text {
+  color: var(--ap-table-pagination-total-count-color, #182948);
+}
+.aplus-ap-table-pagination--total-right {
+  padding-left: 12px;
+}
+.aplus-ap-table-pagination-total-wrapper {
+  color: var(--ap-table-pagination-total-color, #526A90);
+}

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

@@ -1,13 +1,15 @@
 import { ApColumnType, ApTableValueFields, ValueEnum, ValueEnumType } from './interface';
 import { Translator, ValueTypeRenderConfig } from '../config-provider';
 import { apTableRenderItemMap } from './constants';
-import { VNode, CreateComponentPublicInstance, ExtractPropTypes, PropType, HTMLAttributes, ComponentOptionsMixin, VNodeProps, AllowedComponentProps, ComponentCustomProps, ComponentOptionsBase, RendererNode, RendererElement } from 'vue';
+import { VNode, CreateComponentPublicInstance, ExtractPropTypes, PropType, HTMLAttributes, ComponentOptionsMixin, VNodeProps, AllowedComponentProps, ComponentCustomProps, ComponentOptionsBase, VNodeArrayChildren } from 'vue';
 import { ColSize } from 'ant-design-vue/es/grid';
 import { ApFieldTextPasswordProps, ApFieldTextProps, ApFieldTextAreaProps, ApFieldNumberProps, ApFieldDateProps, ApFieldDateRangeProps, ApFieldRadioProps, ApFieldSelectProps, ApFieldSwitchProps, ApFieldCheckboxProps } from '..';
 import { RuleObject } from 'ant-design-vue/es/form';
 import { FormLabelAlign } from 'ant-design-vue/es/form/interface';
 import { ApFormItemSlots, ApFormItemTextPassword } from '../ap-form';
 import { InputFocusOptions } from 'ant-design-vue/es/vc-input/utils/commonUtils';
+import { ColumnTitleProps } from 'ant-design-vue/es/table/interface';
+import { VueNode } from 'ant-design-vue/es/_util/type';
 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;
 /**
@@ -8425,7 +8427,5 @@ export declare function objectToString(value: any): any;
 export declare function getTableTitle(column: ApColumnType<any>, slot?: (props: {
     title: any;
     column: ApColumnType<any>;
-}) => any, tooltipColor?: string): VNode< RendererNode, RendererElement, {
-    [key: string]: any;
-}>[] | import("vue/jsx-runtime").JSX.Element | (() => import("vue/jsx-runtime").JSX.Element);
+}) => any, tooltipColor?: string): number | boolean | void | VNodeArrayChildren | import("vue/jsx-runtime").JSX.Element | ((props: ColumnTitleProps<any>) => VNodeArrayChildren | VueNode) | null;
 export {};

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("vue"),l=require("lodash-unified"),c=require("./constants.js"),T=require("@fruits-chain/utils");require("../ap-form/index.js");const g=require("ant-design-vue"),b=require("@ant-design/icons-vue"),y=require("../ap-form/ap-form-item.vue.js");function h(e){return typeof e=="function"||Object.prototype.toString.call(e)==="[object Object]"&&!s.isVNode(e)}const d=(e,t,n)=>{let r={};return l.isObject(e)?Object.keys(e).forEach(u=>{l.isObject(e[u])?r[u]=d(e[u],t[u],n):r[u]=n(e[u],t)}):r=n(e,t),r},j=(e,t)=>{switch(e){case"dayjs":return t.valueOf();case"dayjsRange":return t.map(n=>n.valueOf());case"dayjsDayRange":{const[n,r]=t;return[n.startOf("day").valueOf(),r.endOf("day").valueOf()]}case"multiple":case"multipleNumber":return l.isArray(t)?t:[t];case"boolean":return t;case"object":return t;default:return t}};function F(e){return l.isArray(e)?e.join("."):e}function N(e){const t=Object.prototype.toString.call(e).match(/^\[object (.*)\]$/)[1].toLowerCase();return t==="string"&&typeof e=="object"?"object":e===null?"null":e===void 0?"undefined":t}const f=e=>N(e)==="map"?e:new Map(Object.entries(e||{})),a=e=>{const t=[],n=f(e);return n.forEach((r,u)=>{const o=n.get(u)||n.get(`${u}`);if(o){if(typeof o=="object"&&(o!=null&&o.text)){t.push({text:o==null?void 0:o.text,value:u,label:o==null?void 0:o.text,disabled:o.disabled});return}t.push({text:o,label:o,value:u})}}),t},O=e=>l.isUndefined(e)||e<0?0:e,S=(e,t,n)=>{if(n)return n;const r=["select","date"],u=["text","textArea","number"];if(t==="dateRange")return[e("ap.common.chooseText"),e("ap.common.chooseText")];if(r.includes(t))return e("ap.common.chooseText");if(u.includes(t))return e("ap.common.inputText")};function p(e,t){return!e||!l.isFunction(e)?e:e(t)}function V(e){let t=e.valueType||"text";return e.valueEnum&&(t="status"),t}function E(e,t,n,r){var i;const u=c.apTableRenderItemMap[e];if(u)return s.createVNode(u,s.mergeProps(t,{mode:"read"}),null);const o=r==null?void 0:r[e];return((i=o==null?void 0:o.render)==null?void 0:i.call(o,t.value,n,t))||t.value}function P(e,t){if(e.customRenderFormItem)return()=>{const u=e.customRenderFormItem(e);return s.cloneVNode(u,{...e.fieldProps,span:e.span,...u.props||{}})};const n=c.apTableFormItemMap[e.valueType];if(n)return n;const r=t==null?void 0:t[e.valueType];return()=>{var o;const u=(o=r==null?void 0:r.renderFormItem)==null?void 0:o.call(r,e.fieldProps.field);return u?s.createVNode(y.default,s.mergeProps(e.fieldProps,{span:e.span}),h(u)?u:{default:()=>[u]}):null}}function v(e,t){const n=p(e.fieldProps,t),r=(n==null?void 0:n.field)||n||{},u=e.valueType==="switch",o=e.valueType==="index",i=u?{checked:t.value}:{value:o?t.index+1:t.value};return e.valueEnum&&(r.valueEnum=e.valueEnum),{...l.omit(r,["request"]),...i}}function I(e){const t={...e};return l.isBoolean(e.filters)&&e.filters&&e.valueEnum&&(t.filters=a(e.valueEnum)),t}function C(e,t){var r;const n=t||{};return e.valueEnum&&!((r=n.field)!=null&&r.options)&&(n.field={...n.field,options:a(e.valueEnum)}),n}function q(e){if(!T.isType("Object")(e))return e;try{return JSON.stringify(e)}catch{return e}}function _(e,t,n){const r=t==null?void 0:t({title:e.title,column:e});if(r&&(r.length>1||r[0].children!=="v-if"))return r;const o=s.createVNode("span",{style:c.ellipsisTitleStyle,title:e.title},[e.title]),i=e.tooltip?l.isString(e.tooltip)?s.createVNode(s.Fragment,null,[e.tooltip]):e.tooltip(e):null,m=()=>s.createVNode(s.Fragment,null,[o,s.createVNode(g.Tooltip,{title:i,placement:"bottom"},{default:()=>[s.createVNode(b.QuestionCircleOutlined,{style:{padding:"4px",color:n,verticalAlign:"middle"}},null)]})]);return i?m:o}exports.apColumnToColumn=I;exports.dataIndexToStr=F;exports.formatParamsValueType=d;exports.getColumnOrder=O;exports.getFieldProps=p;exports.getPlaceholder=S;exports.getSearchFormItemRenderNode=P;exports.getTableCellRenderNode=E;exports.getTableRenderProps=v;exports.getTableRenderType=V;exports.getTableTitle=_;exports.objectToMap=f;exports.objectToString=q;exports.parseFieldValue=j;exports.updateFormProps=C;exports.valueEnumToArray=a;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("vue"),i=require("lodash-unified"),c=require("./constants.js"),T=require("@fruits-chain/utils");require("../ap-form/index.js");const g=require("ant-design-vue"),b=require("@ant-design/icons-vue"),y=require("../ap-form/ap-form-item.vue.js");function h(e){return typeof e=="function"||Object.prototype.toString.call(e)==="[object Object]"&&!u.isVNode(e)}const d=(e,t,n)=>{let r={};return i.isObject(e)?Object.keys(e).forEach(s=>{i.isObject(e[s])?r[s]=d(e[s],t[s],n):r[s]=n(e[s],t)}):r=n(e,t),r},j=(e,t)=>{switch(e){case"dayjs":return t.valueOf();case"dayjsRange":return t.map(n=>n.valueOf());case"dayjsDayRange":{const[n,r]=t;return[n.startOf("day").valueOf(),r.endOf("day").valueOf()]}case"multiple":case"multipleNumber":return i.isArray(t)?t:[t];case"boolean":return t;case"object":return t;default:return t}};function F(e){return i.isArray(e)?e.join("."):e}function N(e){const t=Object.prototype.toString.call(e).match(/^\[object (.*)\]$/)[1].toLowerCase();return t==="string"&&typeof e=="object"?"object":e===null?"null":e===void 0?"undefined":t}const f=e=>N(e)==="map"?e:new Map(Object.entries(e||{})),a=e=>{const t=[],n=f(e);return n.forEach((r,s)=>{const o=n.get(s)||n.get(`${s}`);if(o){if(typeof o=="object"&&(o!=null&&o.text)){t.push({text:o==null?void 0:o.text,value:s,label:o==null?void 0:o.text,disabled:o.disabled});return}t.push({text:o,label:o,value:s})}}),t},O=e=>i.isUndefined(e)||e<0?0:e,S=(e,t,n)=>{if(n)return n;const r=["select","date"],s=["text","textArea","number"];if(t==="dateRange")return[e("ap.common.chooseText"),e("ap.common.chooseText")];if(r.includes(t))return e("ap.common.chooseText");if(s.includes(t))return e("ap.common.inputText")};function p(e,t){return!e||!i.isFunction(e)?e:e(t)}function V(e){let t=e.valueType||"text";return e.valueEnum&&(t="status"),t}function E(e,t,n,r){var l;const s=c.apTableRenderItemMap[e];if(s)return u.createVNode(s,u.mergeProps(t,{mode:"read"}),null);const o=r==null?void 0:r[e];return((l=o==null?void 0:o.render)==null?void 0:l.call(o,t.value,n,t))||t.value}function P(e,t){if(e.customRenderFormItem)return()=>{const s=e.customRenderFormItem(e);return u.cloneVNode(s,{...e.fieldProps,span:e.span,...s.props||{}})};const n=c.apTableFormItemMap[e.valueType];if(n)return n;const r=t==null?void 0:t[e.valueType];return()=>{var o;const s=(o=r==null?void 0:r.renderFormItem)==null?void 0:o.call(r,e.fieldProps.field);return s?u.createVNode(y.default,u.mergeProps(e.fieldProps,{span:e.span}),h(s)?s:{default:()=>[s]}):null}}function v(e,t){const n=p(e.fieldProps,t),r=(n==null?void 0:n.field)||n||{},s=e.valueType==="switch",o=e.valueType==="index",l=s?{checked:t.value}:{value:o?t.index+1:t.value};return e.valueEnum&&(r.valueEnum=e.valueEnum),{...i.omit(r,["request"]),...l}}function I(e){const t={...e};return i.isBoolean(e.filters)&&e.filters&&e.valueEnum&&(t.filters=a(e.valueEnum)),t}function C(e,t){var r;const n=t||{};return e.valueEnum&&!((r=n.field)!=null&&r.options)&&(n.field={...n.field,options:a(e.valueEnum)}),n}function q(e){if(!T.isType("Object")(e))return e;try{return JSON.stringify(e)}catch{return e}}function x(e,t,n){const r=t==null?void 0:t({title:e.title,column:e});if(r&&(r.length>1||r[0].children!=="v-if"))return r;const o=i.isString(e.title)?u.createVNode("span",{style:c.ellipsisTitleStyle,title:e.title},[e.title]):e.title,l=e.tooltip?i.isString(e.tooltip)?u.createVNode(u.Fragment,null,[e.tooltip]):e.tooltip(e):null,m=()=>u.createVNode("span",{style:{display:"inline-flex",alignItems:"center"}},[o,u.createVNode(g.Tooltip,{title:l,placement:"bottom"},{default:()=>[u.createVNode(b.QuestionCircleOutlined,{style:{padding:"4px",color:n,verticalAlign:"middle"}},null)]})]);return l?m:o}exports.apColumnToColumn=I;exports.dataIndexToStr=F;exports.formatParamsValueType=d;exports.getColumnOrder=O;exports.getFieldProps=p;exports.getPlaceholder=S;exports.getSearchFormItemRenderNode=P;exports.getTableCellRenderNode=E;exports.getTableRenderProps=v;exports.getTableRenderType=V;exports.getTableTitle=x;exports.objectToMap=f;exports.objectToString=q;exports.parseFieldValue=j;exports.updateFormProps=C;exports.valueEnumToArray=a;