@aplus-frontend/ui 0.5.35 → 0.5.37

package/es/src/ap-grid/index.vue.mjs

@@ -1,4 +1,4 @@
-import { defineComponent as ke, useSlots as Fe, getCurrentInstance as Be, ref as k, computed as n, unref as o, watch as F, createElementBlock as B, openBlock as s, normalizeStyle as z, normalizeClass as g, createCommentVNode as S, createElementVNode as I, createVNode as U, mergeProps as h, createSlots as G, withCtx as v, Fragment as X, renderList as _, createBlock as p, resolveDynamicComponent as A, renderSlot as V, normalizeProps as Ie, guardReactiveProps as Ee } from "vue";
+import { defineComponent as ke, useSlots as Be, getCurrentInstance as Fe, ref as k, computed as n, unref as o, watch as B, createElementBlock as F, openBlock as s, normalizeStyle as z, normalizeClass as g, createCommentVNode as S, createElementVNode as I, createVNode as U, mergeProps as h, createSlots as G, withCtx as v, Fragment as X, renderList as _, createBlock as p, resolveDynamicComponent as A, renderSlot as V, normalizeProps as Ie, guardReactiveProps as Ee } from "vue";
 import { VxeTable as Pe, VxeColumn as J } from "vxe-table";
 import "vxe-table/es/style.css";
 import "vxe-pc-ui/es/style.css";
@@ -9,11 +9,11 @@ import "../config-provider/index.mjs";
 import { noRenderAsFormItemValueList as ze } from "../ap-table/constants.mjs";
 import { getColumnOrder as Y, updateFormProps as _e, getFieldProps as Ae, getSearchFormItemRenderNode as Ve, recursionApColumns as Z } from "../ap-table/utils.mjs";
 import { useTablePaging as Le } from "../ap-table/hooks/use-table-paging-ng.mjs";
-import { Empty as ee, Pagination as Oe } from "@aplus-frontend/antdv";
-import { useInnerParams as De } from "./hooks/use-inner-params.mjs";
-import { toVxeProps as Ke, getRowExpandProps as $e, getRowSelectionProps as He } from "./utils/table.mjs";
-import We from "../ap-table/hooks/use-table-row-selection.mjs";
-import { useProvideApTable as je } from "../ap-table/context.mjs";
+import { Empty as ee, Pagination as De } from "@aplus-frontend/antdv";
+import { useInnerParams as Oe } from "./hooks/use-inner-params.mjs";
+import { toVxeProps as $e, getRowExpandProps as Ke, getRowSelectionProps as We } from "./utils/table.mjs";
+import je from "../ap-table/hooks/use-table-row-selection.mjs";
+import { useProvideApTable as He } from "../ap-table/context.mjs";
 import { sizeReverseMap as Me, sizeMap as qe, ROW_SELECTION_FIELD as Ue } from "./constants.mjs";
 import { useRenderColumns as Ge } from "./hooks/use-render-columns.mjs";
 import { useToken as Xe } from "@aplus-frontend/antdv/es/theme/internal";
@@ -22,7 +22,7 @@ import { useNamespace as Je } from "../config-provider/hooks/use-namespace.mjs";
 import { useGlobalConfig as Qe } from "../config-provider/hooks/use-global-config.mjs";
 import { useLocale as Ye } from "../config-provider/hooks/use-locale.mjs";
 import Ze from "../scroll-bar/index.vue.mjs";
-const Fo = /* @__PURE__ */ ke({
+const Bo = /* @__PURE__ */ ke({
   name: "ApGrid",
   __name: "index",
   props: {
@@ -112,22 +112,22 @@ const Fo = /* @__PURE__ */ ke({
   },
   setup(oe, { expose: ae }) {
     var q;
-    const L = Fe(), a = oe, w = (q = Be()) == null ? void 0 : q.appContext.app;
+    const L = Be(), a = oe, w = (q = Fe()) == null ? void 0 : q.appContext.app;
     w && !w.__VXE_PC_UI_INSTALLED__ && (w.use(Q), w.__VXE_PC_UI_INSTALLED__ = !0);
-    const { e: E, b: d, be: re } = Je("ap-grid"), te = Qe("valueTypeMap"), i = k([]), O = k([]), m = k(), C = k(a.size), [, c] = Xe(), { t: le } = Ye();
+    const { e: E, b: c, be: re } = Je("ap-grid"), te = Qe("valueTypeMap"), d = k([]), D = k([]), m = k(), C = k(a.size), [, i] = Xe(), { t: le } = Ye();
     Q.setConfig({
       i18n: (e, r) => le(`ap.${e}`, r)
     });
-    const { renderConfig: ne, updateSignal: se } = Ge(i);
-    let D = 0;
-    const ie = n(() => {
+    const { renderConfig: ne, updateSignal: se } = Ge(d);
+    let O = 0;
+    const de = n(() => {
       if (m.value)
         return m.value.$el.querySelector(
           ".vxe-table--header-inner-wrapper"
         );
-    }), K = n(() => {
+    }), $ = n(() => {
       var e, r, l;
-      return D++, ((l = (r = (e = a.columns) == null ? void 0 : e.filter(
+      return O++, ((l = (r = (e = a.columns) == null ? void 0 : e.filter(
         (t) => !t.hideInSearch && t.dataIndex && (t.valueType || t.customRenderFormItem) && !ze.includes(t.valueType)
       )) == null ? void 0 : r.sort((t, u) => {
         let y = Y(t.order);
@@ -142,7 +142,7 @@ const Fo = /* @__PURE__ */ ke({
             label: t.title,
             name: t.dataIndex,
             ...u || {},
-            _signal: D
+            _signal: O
           },
           renderNode: void 0
         };
@@ -151,21 +151,21 @@ const Fo = /* @__PURE__ */ ke({
           o(te)
         ), y;
       })) || [];
-    }), de = n(() => [
-      d(),
-      a.card ? null : d("wrapper"),
-      a.adaptive ? d("adaptive") : null,
-      a.sticky ? d("sticky") : null
-    ].filter(Boolean)), $ = n(() => Z(o(i), (e) => {
+    }), ie = n(() => [
+      c(),
+      a.card ? null : c("wrapper"),
+      a.adaptive ? c("adaptive") : null,
+      a.sticky ? c("sticky") : null
+    ].filter(Boolean)), K = n(() => Z(o(d), (e) => {
       if (e.sorter === !0)
         return e.key || e.dataIndex;
-    }).filter(Boolean)), H = n(() => Z(o(i), (e) => {
+    }).filter(Boolean)), W = n(() => Z(o(d), (e) => {
       if (e.filters && !e.onFilter)
         return e.key || e.dataIndex;
     }).filter(Boolean)), {
       formRef: P,
-      submit: W,
-      reset: j,
+      submit: j,
+      reset: H,
       refresh: ce,
       data: f,
       tableProps: M,
@@ -188,40 +188,40 @@ const Fo = /* @__PURE__ */ ke({
         };
       },
       namespace: "ap-grid",
-      filterFields: H,
-      sortFields: $,
+      filterFields: W,
+      sortFields: K,
       defaultParams: a.params,
       defaultData: a.defaultData,
       manual: a.manual,
       formatParams: a.beforeSearchSubmit,
       pagination: a.pagination
-    }), { sortChangeEvent: me, filterChangeEvent: fe, paginationChangeEvent: ge } = De(pe);
-    je({
-      columns: n(() => i.value),
-      columnsBackup: n(() => O.value),
+    }), { sortChangeEvent: me, filterChangeEvent: fe, paginationChangeEvent: ge } = Oe(pe);
+    He({
+      columns: n(() => d.value),
+      columnsBackup: n(() => D.value),
       size: n(() => C.value ? qe[C.value] : "middle"),
       updateColumns(e) {
         var r;
-        i.value = e, (r = a.onShownColumnsChange) == null || r.call(a, e);
+        d.value = e, (r = a.onShownColumnsChange) == null || r.call(a, e);
       },
       updateSize(e) {
         C.value = Me[e];
       },
       renderConfig: n(() => ({
         className: re("table-header", "title"),
-        color: c.value.colorPrimary
+        color: i.value.colorPrimary
       })),
       dataSource: n(() => o(f).records)
     });
     const he = n(
-      () => i.value.some(
+      () => d.value.some(
         (e) => e.fixed === "left" || e.fixed === !0
       ) ? "left" : void 0
     ), ve = n(
       () => b(a.loading) ? f.loading : a.loading
     ), Ce = n(
       () => b(a.dataSource) ? f.records : a.dataSource
-    ), { selectedRows: x, rowSelection: R, ...ye } = We({
+    ), { selectedRows: x, rowSelection: R, ...ye } = je({
       ...a.rowSelection === !0 ? {} : a.rowSelection,
       dataSource: Ce,
       rowKey: a.rowKey
@@ -259,51 +259,52 @@ const Fo = /* @__PURE__ */ ke({
       if (l)
         return (t = m.value) == null ? void 0 : t.scrollToRow(l, r);
     }
-    return F(
+    return B(
       () => [a.columnResizable, a.columns],
       () => {
         var r;
         const e = be();
-        i.value = e, (r = a.onShownColumnsChange) == null || r.call(a, e), O.value = e;
+        d.value = e, (r = a.onShownColumnsChange) == null || r.call(a, e), D.value = e;
       },
       {
         deep: !0,
         immediate: !0
       }
-    ), F(
+    ), B(
       () => a.dataSource,
       (e) => {
         ue(e);
       },
       { immediate: !0, deep: !0 }
-    ), F(
+    ), B(
       () => o(f).loading,
       (e) => {
         var r;
         (r = a.onLoadingChange) == null || r.call(a, e);
       }
-    ), F(
+    ), B(
       () => a.size,
       (e) => {
         C.value = e;
       }
     ), ae({
-      submit: W,
-      reset: j,
+      submit: j,
+      reset: H,
       refresh: ce,
       setSearchFormValues: we,
       getSearchFormValues: xe,
-      getShowColumns: () => o(i),
+      getShowColumns: () => o(d),
       rowSelection: {
         selectedRows: n(() => x.value),
         clearAll: T
       },
-      scrollToRow: Re
-    }), (e, r) => (s(), B("div", {
-      class: g(de.value),
+      scrollToRow: Re,
+      getDataSource: () => o(f.records)
+    }), (e, r) => (s(), F("div", {
+      class: g(ie.value),
       style: z(e.wrapperStyle)
     }, [
-      o(b)(e.dataSource) && e.searchForm !== !1 && K.value.length > 0 ? (s(), B("div", {
+      o(b)(e.dataSource) && e.searchForm !== !1 && $.value.length > 0 ? (s(), F("div", {
         key: 0,
         class: g(e.card ? o(E)("search-wrapper") : null),
         style: z(e.searchFormWrapperStyle)
@@ -313,11 +314,11 @@ const Fo = /* @__PURE__ */ ke({
           ref: P,
           "custom-reset": "",
           "submit-loading": o(M).loading,
-          onSubmit: o(W),
-          onReset: o(j)
+          onSubmit: o(j),
+          onReset: o(H)
         }), G({
           default: v(() => [
-            (s(!0), B(X, null, _(K.value, (l) => (s(), p(A(l.renderNode.Comp), h({
+            (s(!0), F(X, null, _($.value, (l) => (s(), p(A(l.renderNode.Comp), h({
               key: l.dataIndex,
               item: l,
               ref_for: !0
@@ -342,41 +343,38 @@ const Fo = /* @__PURE__ */ ke({
         style: z(e.tableWrapperStyle)
       }, [
         I("div", {
-          class: g(o(d)("header-wrapper"))
+          class: g(o(c)("header-wrapper"))
         }, [
           V(e.$slots, "title", {
             selectedRows: o(x),
             selectedRowKeys: o(R).selectedRowKeys,
-            shownColumns: i.value,
+            shownColumns: d.value,
             clearAll: T
           })
         ], 2),
         I("div", {
-          class: g(o(d)("vxe-wrapper"))
+          class: g(o(c)("vxe-wrapper"))
         }, [
-          (s(), p(o(Pe), h(o(Ke)(a), {
+          (s(), p(o(Pe), h(o($e)(a), {
             ref_key: "tableRef",
             ref: m,
             key: o(se),
             data: o(f).records,
-            "sort-config": { remote: $.value.length > 0 },
-            "filter-config": { remote: H.value.length > 0 },
+            "sort-config": { remote: K.value.length > 0 },
+            "filter-config": { remote: W.value.length > 0 },
             loading: ve.value,
-            "row-config": {
-              isHover: !0,
-              keyField: a.rowKey
-            },
             style: {
-              "--vxe-ui-table-row-checkbox-checked-background-color": o(c).controlItemBgActive,
-              "--vxe-ui-table-row-hover-checkbox-checked-background-color": o(c).controlItemBgActiveHover,
-              "--vxe-ui-font-primary-color": o(c).colorPrimary,
+              "--vxe-ui-table-row-checkbox-checked-background-color": o(i).controlItemBgActive,
+              "--vxe-ui-table-row-hover-checkbox-checked-background-color": o(i).controlItemBgActiveHover,
+              "--vxe-ui-font-primary-color": o(i).colorPrimary,
               "--vxe-ui-table-header-background-color": "var(--ap-table-header-bg)",
               "--vxe-ui-table-cell-padding-default": "12px",
               "--vxe-ui-table-cell-padding-medium": "9px",
-              "--vxe-ui-table-row-radio-checked-background-color": o(c).controlItemBgActive,
-              "--vxe-ui-table-row-hover-radio-checked-background-color": o(c).controlItemBgActiveHover,
-              "--vxe-ui-font-color": o(c).colorTextBase,
-              "--vxe-ui-table-border-color": o(c).colorBorderSecondary
+              "--vxe-ui-table-row-radio-checked-background-color": o(i).controlItemBgActive,
+              "--vxe-ui-table-row-hover-radio-checked-background-color": o(i).controlItemBgActiveHover,
+              "--vxe-ui-font-color": o(i).colorTextBase,
+              "--vxe-ui-table-border-color": o(i).colorBorderSecondary,
+              "--vxe-ui-table-header-font-color": o(i).colorTextBase
             },
             size: C.value,
             onSortChange: o(me),
@@ -392,14 +390,14 @@ const Fo = /* @__PURE__ */ ke({
               }, null, 8, ["image"])
             ]),
             default: v(() => [
-              a.expandable ? (s(), p(o(J), h({ key: 0 }, o($e)(e.expandable), { fixed: he.value }), {
+              a.expandable ? (s(), p(o(J), h({ key: 0 }, o(Ke)(e.expandable), { fixed: he.value }), {
                 content: v((l) => [
                   (s(), p(A(a.expandable.renderContent(l))))
                 ]),
                 _: 1
               }, 16, ["fixed"])) : S("", !0),
-              a.rowSelection ? (s(), p(o(J), h({ key: 1 }, o(He)(o(R), i.value), { field: o(Ue) }), null, 16, ["field"])) : S("", !0),
-              (s(!0), B(X, null, _(o(ne), (l) => (s(), p(A(l), {
+              a.rowSelection ? (s(), p(o(J), h({ key: 1 }, o(We)(o(R), d.value), { field: o(Ue) }), null, 16, ["field"])) : S("", !0),
+              (s(!0), F(X, null, _(o(ne), (l) => (s(), p(A(l), {
                 key: l.props.colId
               }))), 128))
             ]),
@@ -411,20 +409,20 @@ const Fo = /* @__PURE__ */ ke({
                 V(e.$slots, t, Ie(Ee(u || {})))
               ])
             }))
-          ]), 1040, ["data", "sort-config", "filter-config", "loading", "row-config", "style", "size", "onSortChange", "onFilterChange"]))
+          ]), 1040, ["data", "sort-config", "filter-config", "loading", "style", "size", "onSortChange", "onFilterChange"]))
         ], 2),
         I("div", {
-          class: g(o(d)("pagination-wrapper"))
+          class: g(o(c)("pagination-wrapper"))
         }, [
           e.sticky ? (s(), p(o(Ze), {
             key: 0,
             direction: "horizontal",
-            "scroll-container": ie.value,
+            "scroll-container": de.value,
             "extra-size": -4.2
           }, null, 8, ["scroll-container"])) : S("", !0),
-          e.pagination !== !1 ? (s(), p(o(Oe), h({
+          e.pagination !== !1 ? (s(), p(o(De), h({
             key: 1,
-            class: o(d)("pagination")
+            class: o(c)("pagination")
           }, o(M).pagination, { onChange: o(ge) }), null, 16, ["class", "onChange"])) : S("", !0)
         ], 2)
       ], 6)
@@ -432,5 +430,5 @@ const Fo = /* @__PURE__ */ ke({
   }
 });
 export {
-  Fo as default
+  Bo as default
 };

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

@@ -298,4 +298,9 @@ export type ApGridExpose<SearchParamsType = Recordable, RecordType = any> = {
      * @returns
      */
     scrollToRow: (index: number, fieldOrColumn?: any) => Promise<any>;
+    /**
+     * 获取当前表格数据
+     * @returns
+     */
+    getDataSource: () => RecordType[];
 };

package/es/src/ap-grid/utils/table.mjs

@@ -1,6 +1,6 @@
-import { omit as l, isUndefined as u, isFunction as h, isNumber as b } from "lodash-unified";
-const w = 20, x = 50;
-function m(e) {
+import { omit as l, isUndefined as u, isFunction as h, isNumber as w } from "lodash-unified";
+const b = 20, y = 50;
+function R(e) {
   var i;
   const t = {
     ...l(e, [
@@ -47,22 +47,25 @@ function m(e) {
     enabled: !1
   }, t.virtualYConfig = {
     enabled: !1
-  }) : (a(t, "X", e.virtual), a(t, "Y", e.virtual)), t.round = !0, t;
+  }) : (a(t, "X", e.virtual), a(t, "Y", e.virtual)), t.rowConfig = {
+    isHover: !0,
+    keyField: e.rowKey
+  }, t.round = !0, t;
 }
 function a(e, t, i) {
-  const o = t === "X", r = o ? "x" : "y", n = o ? "virtualXConfig" : "virtualYConfig", s = i == null ? void 0 : i[r], f = s !== !1, d = o ? w : x, c = b(s) && s >= 0 ? s : d;
+  const o = t === "X", r = o ? "x" : "y", n = o ? "virtualXConfig" : "virtualYConfig", d = i == null ? void 0 : i[r], f = d !== !1, s = o ? b : y, c = w(d) && d >= 0 ? d : s;
   e[n] = {
     enabled: f,
     gt: c,
     oSize: (i == null ? void 0 : i.oSize) || 0
   };
 }
-function y(e) {
+function x(e) {
   return e === !0 ? "left" : e;
 }
-function C(e, t) {
+function m(e, t) {
   const i = e === !0 || !e.type ? "checkbox" : e.type, o = e === !0 ? 60 : e.columnWidth || 60;
-  let r = e === !0 ? void 0 : y(e.fixed);
+  let r = e === !0 ? void 0 : x(e.fixed);
   return r || (r === !1 ? r = void 0 : r = t.some(
     (n) => n.fixed === "left" || n.fixed === !0
   ) ? "left" : void 0), {
@@ -81,6 +84,6 @@ function g(e) {
 }
 export {
   g as getRowExpandProps,
-  C as getRowSelectionProps,
-  m as toVxeProps
+  m as getRowSelectionProps,
+  R as toVxeProps
 };