@aplus-frontend/ui 0.1.19 → 0.1.21

package/es/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/es/src/ap-table/ap-table.vue.mjs

@@ -1,4 +1,4 @@
-import { defineComponent as ie, useSlots as ce, ref as pe, unref as l, createVNode as m, Fragment as D, watchEffect as fe, computed as s, watch as me, openBlock as g, createElementBlock as x, normalizeClass as v, normalizeStyle as j, mergeProps as y, createSlots as A, withCtx as b, renderList as W, createBlock as ge, resolveDynamicComponent as ye, renderSlot as h, createCommentVNode as be, createElementVNode as he, normalizeProps as Se, guardReactiveProps as we } from "vue";
+import { defineComponent as ie, useSlots as ce, ref as pe, unref as l, createVNode as m, Fragment as D, watchEffect as fe, computed as s, watch as me, openBlock as g, createElementBlock as x, normalizeClass as v, normalizeStyle as j, mergeProps as y, createSlots as A, withCtx as h, renderList as W, createBlock as ge, resolveDynamicComponent as ye, renderSlot as b, createCommentVNode as he, createElementVNode as be, normalizeProps as Se, guardReactiveProps as we } from "vue";
 import { Typography as Re, Table as Ce } from "ant-design-vue";
 import { useToken as Te } from "ant-design-vue/es/theme/internal";
 import { ApForm as Fe } from "../ap-form/index.mjs";
@@ -7,7 +7,7 @@ import "../config-provider/index.mjs";
 import { useTablePaging as xe } from "./hooks/use-table-paging.mjs";
 import { omit as $, isUndefined as u, isBoolean as ve } from "lodash-unified";
 import "./style/ap-table.css";
-import { apColumnToColumn as Be, getTableTitle as Pe, getTableRenderType as ke, getTableRenderProps as Ie, getTableCellRenderNode as ze, getColumnOrder as q, updateFormProps as Ne, getFieldProps as Ee, getPlaceholder as Le, getSearchFormItemRenderNode as Ve, objectToString as Ke } from "./utils.mjs";
+import { apColumnToColumn as Be, getTableTitle as Pe, getTableRenderType as Ie, getTableRenderProps as ke, getTableCellRenderNode as ze, getColumnOrder as q, updateFormProps as Ne, getFieldProps as Le, getPlaceholder as Ee, getSearchFormItemRenderNode as Ve, objectToString as Ke } from "./utils.mjs";
 import Oe from "./hooks/use-table-content-height.mjs";
 import { getRawDisplayValue as De } from "../editable-table/utils.mjs";
 import je from "./hooks/use-table-row-selection.mjs";
@@ -138,7 +138,7 @@ const sa = /* @__PURE__ */ ie({
   setup(U, {
     expose: G
   }) {
-    const o = U;
+    const a = U;
     let B = 0;
     const S = ce(), [, M] = Te(), {
       t: J
@@ -149,35 +149,35 @@ const sa = /* @__PURE__ */ ie({
       height: Q,
       contentRef: X
     } = Oe(), i = pe([]), Y = () => {
-      var r;
-      let e = ((r = o.columns) == null ? void 0 : r.filter((a) => !a.hideInTable)) || [];
-      return e = e.map((a) => ({
-        resizable: Ae(a.resizable) ? a.resizable : o.columnResizable,
-        ...$(Be(a), ["ellipsis"]),
-        title: Pe(a, S.default, l(M).colorPrimary),
+      var t;
+      let e = ((t = a.columns) == null ? void 0 : t.filter((o) => !o.hideInTable)) || [];
+      return e = e.map((o) => ({
+        resizable: Ae(o.resizable) ? o.resizable : a.columnResizable,
+        ...$(Be(o), ["ellipsis"]),
+        title: Pe(o, S.headerCell, l(M).colorPrimary),
         customRender({
-          value: t,
+          value: r,
           ...n
         }) {
           var K, O;
-          const d = ke(a), L = Ie({
-            ...a,
+          const d = Ie(o), E = ke({
+            ...o,
             valueType: d
           }, {
-            value: t,
+            value: r,
             ...n
-          }), de = ze(d, L, n.record, l(P)), V = ((K = a.renderText) == null ? void 0 : K.call(a, {
-            value: t,
+          }), de = ze(d, E, n.record, l(P)), V = ((K = o.renderText) == null ? void 0 : K.call(o, {
+            value: r,
             ...n
-          })) || t, ue = a.renderText ? m(D, null, [(O = a.renderText) == null ? void 0 : O.call(a, {
-            value: t,
+          })) || r, ue = o.renderText ? m(D, null, [(O = o.renderText) == null ? void 0 : O.call(o, {
+            value: r,
             ...n
           })]) : de;
-          let F = le(a, V, ue);
-          return a.customRender && (F = a.customRender({
-            value: t,
+          let F = le(o, V, ue);
+          return o.customRender && (F = o.customRender({
+            value: r,
             ...n,
-            column: a,
+            column: o,
             originalNode: F,
             originalText: V
           })), F;
@@ -187,33 +187,33 @@ const sa = /* @__PURE__ */ ie({
     fe(() => {
       i.value = Y();
     });
-    const k = s(() => {
-      var e, r, a;
-      return B++, ((a = (r = (e = o.columns) == null ? void 0 : e.filter((t) => !t.hideInSearch && t.dataIndex && (t.valueType || t.customRenderFormItem) && !H.includes(t.valueType))) == null ? void 0 : r.sort((t, n) => {
-        let d = q(t.order);
+    const I = s(() => {
+      var e, t, o;
+      return B++, ((o = (t = (e = a.columns) == null ? void 0 : e.filter((r) => !r.hideInSearch && r.dataIndex && (r.valueType || r.customRenderFormItem) && !H.includes(r.valueType))) == null ? void 0 : t.sort((r, n) => {
+        let d = q(r.order);
         return q(n.order) - d;
-      })) == null ? void 0 : a.map((t) => {
-        const n = Ne(t, Ee(t.fieldProps, {})), d = {
-          ...t,
+      })) == null ? void 0 : o.map((r) => {
+        const n = Ne(r, Le(r.fieldProps, {})), d = {
+          ...r,
           fieldProps: {
-            label: t.title,
-            name: t.dataIndex,
+            label: r.title,
+            name: r.dataIndex,
             ...n || {},
             // 格式化placeholder
-            placeholder: Le(J, t.valueType, n == null ? void 0 : n.placeholder),
+            placeholder: Ee(J, r.valueType, n == null ? void 0 : n.placeholder),
             _signal: B
           },
           renderNode: void 0
         };
         return d.renderNode = Ve(d, l(P)), d;
       })) || [];
-    }), Z = s(() => l(i).filter((e) => e.sorter === !0).map((e) => e.dataIndex).filter(Boolean)), _ = s(() => l(i).filter((e) => e.filters && !e.onFilter).map((e) => e.dataIndex).filter(Boolean)), ee = s(() => u(o.dataSource) ? f.value.records : o.dataSource), {
+    }), Z = s(() => l(i).filter((e) => e.sorter === !0).map((e) => e.dataIndex).filter(Boolean)), _ = s(() => l(i).filter((e) => e.filters && !e.onFilter).map((e) => e.dataIndex).filter(Boolean)), ee = s(() => u(a.dataSource) ? f.value.records : a.dataSource), {
       rowSelection: R,
-      selectedRows: I,
+      selectedRows: k,
       ...C
     } = je({
-      ...o.rowSelection === !0 ? {} : o.rowSelection,
-      rowKey: o.rowKey,
+      ...a.rowSelection === !0 ? {} : a.rowSelection,
+      rowKey: a.rowKey,
       dataSource: ee
     }), {
       formRef: T,
@@ -224,86 +224,88 @@ const sa = /* @__PURE__ */ ie({
       data: f
     } = xe({
       async request(e) {
-        var a, t;
-        !R.value.preserveSelectedRowKeys && u(o.dataSource) && C.clearAll();
-        const r = await ((a = o.request) == null ? void 0 : a.call(o, e));
-        return (t = o.onLoad) == null || t.call(o, (r == null ? void 0 : r.data) || []), {
-          data: (r == null ? void 0 : r.data) || [],
-          total: (r == null ? void 0 : r.total) || 0
+        var o, r;
+        !R.value.preserveSelectedRowKeys && u(a.dataSource) && C.clearAll();
+        const t = await ((o = a.request) == null ? void 0 : o.call(a, e));
+        return (r = a.onLoad) == null || r.call(a, (t == null ? void 0 : t.data) || []), {
+          data: (t == null ? void 0 : t.data) || [],
+          total: (t == null ? void 0 : t.total) || 0
         };
       },
       filterFields: _,
       sortFields: Z,
-      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
+      defaultParams: a.params,
+      defaultData: a.defaultData,
+      manual: a.manual,
+      defaultCurrent: a.pagination ? a.pagination.defaultCurrent : void 0,
+      defaultPageSize: a.pagination ? a.pagination.defaultPageSize : void 0,
+      formatParams: a.beforeSearchSubmit,
+      showLessItems: a.pagination ? a.pagination.showLessItems : void 0,
+      showTotal: a.pagination ? a.pagination.showTotal : void 0
     }), oe = s(() => {
-      var r, a;
-      if (o.adaptive && (f.value.total > 0 || ((r = o.dataSource) == null ? void 0 : r.length)))
+      var t, o;
+      if (a.adaptive && (f.value.total > 0 || ((t = a.dataSource) == null ? void 0 : t.length)))
         return {
           y: l(Q),
-          x: ((a = o.scroll) == null ? void 0 : a.x) || "100%"
+          x: ((o = a.scroll) == null ? void 0 : o.x) || "100%"
         };
-      if (o.scroll)
-        return o.scroll;
-    }), re = s(() => {
+      if (a.scroll)
+        return a.scroll;
+    }), te = s(() => {
       var e;
-      if (o.tableLayout)
-        return o.tableLayout;
-      if ((e = o.columns) != null && e.some((r) => r.ellipsis))
+      if (a.tableLayout)
+        return a.tableLayout;
+      if ((e = a.columns) != null && e.some((t) => t.ellipsis))
         return "fixed";
-    }), E = s(() => {
-      var t;
-      const e = l(p), r = u(o.dataSource) ? e : {
+    }), L = s(() => {
+      var r;
+      const e = l(p), t = u(a.dataSource) ? e : {
         ...e,
-        dataSource: o.dataSource,
-        onChange: o.onChange
-      }, a = l(R);
+        dataSource: a.dataSource,
+        onChange: a.onChange
+      }, o = l(R);
       return {
-        ...o,
-        ...r,
-        rowSelection: o.rowSelection === !0 || ((t = o.rowSelection) == null ? void 0 : t.mode) === "internal" ? {
-          ...a,
+        ...a,
+        ...t,
+        rowSelection: a.rowSelection === !0 || ((r = a.rowSelection) == null ? void 0 : r.mode) === "internal" ? {
+          ...o,
           // tips 如果是前端分页，则默认会走缓存
-          preserveSelectedRowKeys: u(o.dataSource) ? a.preserveSelectedRowKeys : !0
-        } : o.rowSelection,
-        loading: u(o.loading) ? l(p).loading : o.loading,
-        pagination: o.pagination === !1 ? !1 : l(p).pagination,
+          preserveSelectedRowKeys: u(a.dataSource) ? o.preserveSelectedRowKeys : !0
+        } : a.rowSelection,
+        loading: u(a.loading) ? l(p).loading : a.loading,
+        pagination: a.pagination === !1 ? !1 : l(p).pagination,
         scroll: l(oe)
       };
-    }), te = s(() => [c(), o.card ? null : c("wrapper"), o.adaptive ? c("adaptive") : null].filter(Boolean));
-    function le(e, r, a) {
+    }), re = s(() => [c(), a.card ? null : c("wrapper"), a.adaptive ? c("adaptive") : null].filter(Boolean));
+    function le(e, t, o) {
       if (H.includes(e.valueType))
-        return a;
-      const t = Ke(r);
+        return o;
+      const r = Ke(t);
       return e.copyable || e.ellipsis ? m(Re.Paragraph, {
         copyable: e.copyable ? {
-          text: t,
+          text: r,
           tooltip: !1
         } : !1,
         ellipsis: e.ellipsis ? ve(e.ellipsis) ? {
-          tooltip: t
+          tooltip: r
         } : {
           ...e.ellipsis,
-          tooltip: t
+          tooltip: r
         } : !1,
-        content: e.ellipsis ? De(e, r) : a
-      }, null) : a;
+        content: e.ellipsis ? De(e, t) : o
+      }, null) : o;
     }
     me(() => l(f).loading, (e) => {
-      var r;
-      (r = o.onLoadingChange) == null || r.call(o, e);
+      var t;
+      (t = a.onLoadingChange) == null || t.call(a, e);
     });
     function ne(e) {
-      var r, a, t;
-      (t = (a = (r = T.value) == null ? void 0 : r.apForm) == null ? void 0 : a.setFieldsValue) == null || t.call(a, e);
+      var t, o, r;
+      (r = (o = (t = T.value) == null ? void 0 : t.apForm) == null ? void 0 : o.setFieldsValue) == null || r.call(o, e);
     }
     function se() {
-      var e, r, a;
-      return (a = (r = (e = T.value) == null ? void 0 : e.apForm) == null ? void 0 : r.getFieldsValue) == null ? void 0 : a.call(r, !0);
+      var e, t, o;
+      return (o = (t = (e = T.value) == null ? void 0 : e.apForm) == null ? void 0 : t.getFieldsValue) == null ? void 0 : o.call(t, !0);
     }
     return G({
       submit: () => z(),
@@ -312,12 +314,12 @@ const sa = /* @__PURE__ */ ie({
       getSearchFormValues: se,
       dataSource: s(() => l(f).records),
       rowSelection: {
-        selectedRows: s(() => l(I)),
+        selectedRows: s(() => l(k)),
         ...C
       }
-    }), (e, r) => (g(), x("div", {
-      class: v(te.value)
-    }, [l(u)(e.dataSource) && e.searchForm !== !1 && k.value.length > 0 ? (g(), x("div", {
+    }), (e, t) => (g(), x("div", {
+      class: v(re.value)
+    }, [l(u)(e.dataSource) && e.searchForm !== !1 && I.value.length > 0 ? (g(), x("div", {
       key: 0,
       class: v(e.card ? l(w)("search-wrapper") : null),
       style: j(e.searchFormWrapperStyle)
@@ -329,43 +331,41 @@ const sa = /* @__PURE__ */ ie({
       onReset: l(N),
       "submit-loading": l(p).loading
     }), A({
-      default: b(() => [(g(!0), x(D, null, W(k.value, (a) => (g(), ge(ye(a.renderNode), y({
-        key: a.dataIndex,
+      default: h(() => [(g(!0), x(D, null, W(I.value, (o) => (g(), ge(ye(o.renderNode), y({
+        key: o.dataIndex,
         ref_for: !0
-      }, a.fieldProps || {}, {
-        span: a.span
+      }, o.fieldProps || {}, {
+        span: o.span
       }), null, 16, ["span"]))), 128))]),
       _: 2
     }, [S.searchFormExtra ? {
       name: "extra",
-      fn: b(() => [h(e.$slots, "searchFormExtra")]),
+      fn: h(() => [b(e.$slots, "searchFormExtra")]),
       key: "0"
-    } : void 0]), 1040, ["onSubmit", "onReset", "submit-loading"])], 6)) : be("", !0), he("div", {
+    } : void 0]), 1040, ["onSubmit", "onReset", "submit-loading"])], 6)) : he("", !0), be("div", {
       ref_key: "contentRef",
       ref: X,
       class: v([l(w)("table-wrapper"), e.card ? l(w)("table-wrapper-card") : null]),
       style: j(e.tableWrapperStyle)
-    }, [h(e.$slots, "title", y({
-      selectedRows: l(I),
+    }, [b(e.$slots, "title", y({
+      selectedRows: l(k),
       selectedRowKeys: l(R).selectedRowKeys
     }, C)), m(l(Ce), y({
       class: l(c)("table")
-    }, E.value, {
-      "table-layout": re.value,
+    }, L.value, {
+      "table-layout": te.value,
       onChange: l(ae),
       columns: i.value,
-      onResizeColumn: r[0] || (r[0] = (a, t) => {
-        console.log("width is: ", a), t.width = a;
-      })
+      onResizeColumn: t[0] || (t[0] = (o, r) => r.width = o)
     }), A({
-      summary: b(() => [h(e.$slots, "summary", {
+      summary: h(() => [b(e.$slots, "summary", {
         columns: i.value,
-        records: E.value.dataSource
+        records: L.value.dataSource
       })]),
       _: 2
-    }, [W(l($)(S, ["title", "searchFormExtra", "headerCell"]), (a, t) => ({
-      name: t,
-      fn: b((n) => [h(e.$slots, t, Se(we(n || {})))])
+    }, [W(l($)(S, ["title", "searchFormExtra", "headerCell"]), (o, r) => ({
+      name: r,
+      fn: h((n) => [b(e.$slots, r, Se(we(n || {})))])
     }))]), 1040, ["class", "table-layout", "onChange", "columns"])], 6)], 2));
   }
 });

package/es/src/ap-table/constants.mjs

@@ -5,8 +5,8 @@ import "./components/index/index.vue.mjs";
 import "./components/status/index.vue.mjs";
 import i from "../ap-form/items/date/index.vue.mjs";
 import o from "../ap-form/items/date-range/index.vue.mjs";
-import t from "../ap-form/items/number/index.vue.mjs";
-import r from "../ap-form/items/radio/index.vue.mjs";
+import r from "../ap-form/items/number/index.vue.mjs";
+import t from "../ap-form/items/radio/index.vue.mjs";
 import e from "../ap-form/items/select/index.vue.mjs";
 import a from "../ap-form/items/switch/index.vue.mjs";
 import { ApFormItemText as m } from "../ap-form/items/text/index.mjs";
@@ -23,13 +23,13 @@ import x from "../ap-field/text-area/index.vue.mjs";
 import b from "../ap-field/checkbox/index.vue.mjs";
 import w from "../ap-action/group/index.vue.mjs";
 import h from "./components/index/index.vue2.mjs";
-import A from "./components/status/index.vue2.mjs";
-import k from "../ap-field/text/password.vue.mjs";
+import k from "./components/status/index.vue2.mjs";
+import A from "../ap-field/text/password.vue.mjs";
 const Q = {
   date: i,
   dateRange: o,
-  number: t,
-  radio: r,
+  number: r,
+  radio: t,
   select: e,
   switch: a,
   text: m,
@@ -48,8 +48,8 @@ const Q = {
   checkbox: b,
   action: w,
   index: h,
-  status: A,
-  password: k
+  status: k,
+  password: A
 }, X = [
   "action",
   "index"
@@ -61,7 +61,9 @@ const Q = {
   textOverflow: "ellipsis",
   whiteSpace: "normal",
   maxWidth: "100%",
-  verticalAlign: "middle"
+  verticalAlign: "middle",
+  wordBreak: "break-all",
+  flex: 1
 };
 export {
   Q as apTableFormItemMap,

package/es/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[];