@aplus-frontend/ui 0.5.19 → 0.5.21

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

@@ -1,33 +1,32 @@
-import { defineComponent as ke, useSlots as Fe, getCurrentInstance as Be, ref as R, computed as n, unref as o, watch as z, createElementBlock as k, openBlock as s, normalizeStyle as T, normalizeClass as f, createCommentVNode as C, createElementVNode as F, createVNode as U, mergeProps as g, createSlots as G, withCtx as h, Fragment as X, renderList as A, createBlock as u, resolveDynamicComponent as _, renderSlot as V, normalizeProps as J, guardReactiveProps as Ie } from "vue";
-import { VxeTable as Pe, VxeColumn as Q } from "vxe-table";
+import { defineComponent as Fe, useSlots as Be, getCurrentInstance as Ie, ref as k, computed as n, unref as o, watch as T, createElementBlock as F, openBlock as s, normalizeStyle as z, normalizeClass as f, createCommentVNode as C, createElementVNode as B, createVNode as U, mergeProps as g, createSlots as G, withCtx as v, Fragment as X, renderList as A, createBlock as u, resolveDynamicComponent as _, renderSlot as V, normalizeProps as J, guardReactiveProps as Pe } from "vue";
+import { VxeTable as Ee, VxeColumn as Q } from "vxe-table";
 import "vxe-table/es/style.css";
 import "vxe-pc-ui/es/style.css";
 import { VxeUI as Y } from "vxe-pc-ui";
-import { isUndefined as B, omit as Ee } from "lodash-unified";
-import { ApForm as Ne } from "../ap-form/index.mjs";
+import { isUndefined as b, omit as Ne } from "lodash-unified";
+import { ApForm as Te } from "../ap-form/index.mjs";
 import "../config-provider/index.mjs";
 import { noRenderAsFormItemValueList as ze } from "../ap-table/constants.mjs";
-import { getColumnOrder as Z, updateFormProps as Te, getFieldProps as Ae, getSearchFormItemRenderNode as _e, recursionApColumns as ee } from "../ap-table/utils.mjs";
-import { useTablePaging as Ve } from "../ap-table/hooks/use-table-paging-ng.mjs";
-import { Empty as oe, Pagination as Le } from "@aplus-frontend/antdv";
+import { getColumnOrder as Z, updateFormProps as Ae, getFieldProps as _e, getSearchFormItemRenderNode as Ve, recursionApColumns as ee } from "../ap-table/utils.mjs";
+import { useTablePaging as Le } from "../ap-table/hooks/use-table-paging-ng.mjs";
+import { Empty as oe, Pagination as De } from "@aplus-frontend/antdv";
 import { useInnerParams as Oe } from "./hooks/use-inner-params.mjs";
-import { toVxeProps as De, getRowExpandProps as Ke, getRowSelectionProps as $e } from "./utils/table.mjs";
+import { toVxeProps as Ke, getRowExpandProps as $e, getRowSelectionProps as He } 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 We, sizeMap as Me } from "./constants.mjs";
-import { useRenderColumns as qe } from "./hooks/use-render-columns.mjs";
-import { useToken as Ue } from "@aplus-frontend/antdv/es/theme/internal";
+import { useProvideApTable as We } from "../ap-table/context.mjs";
+import { sizeReverseMap as Me, sizeMap as qe } from "./constants.mjs";
+import { useRenderColumns as Ue } from "./hooks/use-render-columns.mjs";
+import { useToken as Ge } from "@aplus-frontend/antdv/es/theme/internal";
 import "../scroll-bar/index.mjs";
-import { useNamespace as Ge } from "../config-provider/hooks/use-namespace.mjs";
-import { useGlobalConfig as Xe } from "../config-provider/hooks/use-global-config.mjs";
-import { useLocale as Je } from "../config-provider/hooks/use-locale.mjs";
-import Qe from "../scroll-bar/index.vue.mjs";
-const Ro = /* @__PURE__ */ ke({
+import { useNamespace as Xe } from "../config-provider/hooks/use-namespace.mjs";
+import { useGlobalConfig as Je } from "../config-provider/hooks/use-global-config.mjs";
+import { useLocale as Qe } from "../config-provider/hooks/use-locale.mjs";
+import Ye from "../scroll-bar/index.vue.mjs";
+const ko = /* @__PURE__ */ Fe({
   name: "ApGrid",
   __name: "index",
   props: {
     dropdownPrefixCls: {},
-    loading: { type: [Boolean, Object], default: void 0 },
     bordered: { type: Boolean, default: !1 },
     locale: {},
     onChange: {},
@@ -82,6 +81,8 @@ const Ro = /* @__PURE__ */ ke({
     mergeCells: {},
     mergeFooterItems: {},
     cellConfig: {},
+    loading: { type: Boolean, default: void 0 },
+    loadingConfig: {},
     columns: {},
     rowSelection: { type: Boolean },
     card: { type: Boolean, default: !1 },
@@ -108,14 +109,14 @@ const Ro = /* @__PURE__ */ ke({
   },
   setup(ae, { expose: re }) {
     var q;
-    const L = Fe(), a = ae, b = (q = Be()) == null ? void 0 : q.appContext.app;
-    b && !b.__VXE_PC_UI_INSTALLED__ && (b.use(Y), b.__VXE_PC_UI_INSTALLED__ = !0);
-    const { e: I, b: d, be: te } = Ge("ap-grid"), le = Xe("valueTypeMap"), i = R([]), O = R([]), p = R(), w = R(a.size), [, m] = Ue(), { t: ne } = Je();
+    const L = Be(), a = ae, w = (q = Ie()) == null ? void 0 : q.appContext.app;
+    w && !w.__VXE_PC_UI_INSTALLED__ && (w.use(Y), w.__VXE_PC_UI_INSTALLED__ = !0);
+    const { e: I, b: d, be: te } = Xe("ap-grid"), le = Je("valueTypeMap"), i = k([]), D = k([]), p = k(), S = k(a.size), [, m] = Ge(), { t: ne } = Qe();
     Y.setConfig({
       i18n: (e, l) => ne(`ap.${e}`, l)
     });
-    const { renderConfig: se, updateSignal: ie } = qe(i);
-    let D = 0;
+    const { renderConfig: se, updateSignal: ie } = Ue(i);
+    let O = 0;
     const de = n(() => {
       if (p.value)
         return p.value.$el.querySelector(
@@ -123,26 +124,26 @@ const Ro = /* @__PURE__ */ ke({
         );
     }), K = n(() => {
       var e, l, t;
-      return D++, ((t = (l = (e = a.columns) == null ? void 0 : e.filter(
+      return O++, ((t = (l = (e = a.columns) == null ? void 0 : e.filter(
         (r) => !r.hideInSearch && r.dataIndex && (r.valueType || r.customRenderFormItem) && !ze.includes(r.valueType)
       )) == null ? void 0 : l.sort((r, c) => {
         let y = Z(r.order);
         return Z(c.order) - y;
       })) == null ? void 0 : t.map((r) => {
-        const c = Te(
+        const c = Ae(
           r,
-          Ae(r.fieldProps, {})
+          _e(r.fieldProps, {})
         ), y = {
           ...r,
           fieldProps: {
             label: r.title,
             name: r.dataIndex,
             ...c || {},
-            _signal: D
+            _signal: O
           },
           renderNode: void 0
         };
-        return y.renderNode = _e(
+        return y.renderNode = Ve(
           y,
           o(le)
         ), y;
@@ -155,22 +156,22 @@ const Ro = /* @__PURE__ */ ke({
     ].filter(Boolean)), $ = n(() => ee(o(i), (e) => {
       if (e.sorter === !0)
         return e.key || e.dataIndex;
-    }).filter(Boolean)), j = n(() => ee(o(i), (e) => {
+    }).filter(Boolean)), H = n(() => ee(o(i), (e) => {
       if (e.filters && !e.onFilter)
         return e.key || e.dataIndex;
     }).filter(Boolean)), {
       formRef: P,
-      submit: H,
+      submit: j,
       reset: W,
       refresh: ue,
-      data: v,
+      data: h,
       tableProps: M,
       setDataSource: pe,
       handleTableChange: me
-    } = Ve({
+    } = Le({
       async request(e) {
         var t;
-        if (!x.value.preserveSelectedRowKeys && B(a.dataSource) && N(), !B(a.dataSource)) {
+        if (!R.value.preserveSelectedRowKeys && b(a.dataSource) && N(), !b(a.dataSource)) {
           const r = e.pageSize * (e.current - 1);
           return {
             data: (a.pagination === !1 ? a.dataSource : a.dataSource.slice(r, r + e.pageSize)) || [],
@@ -184,126 +185,128 @@ const Ro = /* @__PURE__ */ ke({
         };
       },
       namespace: "ap-grid",
-      filterFields: j,
+      filterFields: H,
       sortFields: $,
       defaultParams: a.params,
       defaultData: a.defaultData,
       manual: a.manual,
       formatParams: a.beforeSearchSubmit,
       pagination: a.pagination
-    }), { sortChangeEvent: fe, filterChangeEvent: ge, paginationChangeEvent: he } = Oe(me);
-    He({
+    }), { sortChangeEvent: fe, filterChangeEvent: ge, paginationChangeEvent: ve } = Oe(me);
+    We({
       columns: n(() => i.value),
-      columnsBackup: n(() => O.value),
-      size: n(() => w.value ? Me[w.value] : "middle"),
+      columnsBackup: n(() => D.value),
+      size: n(() => S.value ? qe[S.value] : "middle"),
       updateColumns(e) {
         i.value = e;
       },
       updateSize(e) {
-        w.value = We[e];
+        S.value = Me[e];
       },
       renderConfig: n(() => ({
         className: te("table-header", "title"),
         color: m.value.colorPrimary
       }))
     });
-    const ve = n(
+    const he = n(
       () => i.value.some(
         (e) => e.fixed === "left" || e.fixed === !0
       ) ? "left" : void 0
     ), ye = n(
-      () => B(a.dataSource) ? v.records : a.dataSource
-    ), { selectedRows: S, rowSelection: x, ...Ce } = je({
+      () => b(a.loading) ? h.loading : a.loading
+    ), Ce = n(
+      () => b(a.dataSource) ? h.records : a.dataSource
+    ), { selectedRows: x, rowSelection: R, ...be } = je({
       ...a.rowSelection === !0 ? {} : a.rowSelection,
-      dataSource: ye,
+      dataSource: Ce,
       rowKey: a.rowKey
     }), E = () => {
       const e = p.value;
-      e && (S.value = [
+      e && (x.value = [
         ...e.getCheckboxReserveRecords(),
         ...e.getCheckboxRecords()
       ]);
-    }, be = () => {
+    }, we = () => {
       const e = p.value;
-      e && (S.value = [e.getRadioRecord()]);
+      e && (x.value = [e.getRadioRecord()]);
     };
-    function we() {
+    function Se() {
       var e;
       return ((e = a.columns) == null ? void 0 : e.filter((l) => !l.hideInTable)) || [];
     }
-    function Se(e) {
+    function xe(e) {
       var l, t, r;
       (r = (t = (l = P.value) == null ? void 0 : l.apForm) == null ? void 0 : t.setFieldsValue) == null || r.call(t, e);
     }
-    function xe(e = !1) {
+    function Re(e = !1) {
       var t, r, c;
       const l = e ? "getFieldsValueTransformed" : "getFieldsValue";
       return (c = (r = (t = P.value) == null ? void 0 : t.apForm) == null ? void 0 : r[l]) == null ? void 0 : c.call(r, !0);
     }
     function N() {
-      Ce.clearAll();
+      be.clearAll();
       const e = p.value;
-      e && (x.value.type === "radio" ? (e.clearRadioRow(), e.clearRadioReserve()) : (e.clearCheckboxRow(), e.clearCheckboxReserve()));
+      e && (R.value.type === "radio" ? (e.clearRadioRow(), e.clearRadioReserve()) : (e.clearCheckboxRow(), e.clearCheckboxReserve()));
     }
-    async function Re(e, l) {
+    async function ke(e, l) {
       var r;
-      const t = v.records[e];
+      const t = h.records[e];
       if (t)
         return (r = p.value) == null ? void 0 : r.scrollToRow(t, l);
     }
-    return z(
+    return T(
       () => [a.columnResizable, a.columns],
       () => {
-        const e = we();
-        i.value = e, O.value = e;
+        const e = Se();
+        i.value = e, D.value = e;
       },
       {
         deep: !0,
         immediate: !0
       }
-    ), z(
+    ), T(
       () => a.dataSource,
       (e) => {
         pe(e);
       },
       { immediate: !0 }
-    ), z(
-      () => o(v).loading,
+    ), T(
+      () => o(h).loading,
       (e) => {
         var l;
         (l = a.onLoadingChange) == null || l.call(a, e);
       }
     ), re({
-      submit: H,
+      submit: j,
       reset: W,
       refresh: ue,
-      setSearchFormValues: Se,
-      getSearchFormValues: xe,
+      setSearchFormValues: xe,
+      getSearchFormValues: Re,
       getShowColumns: () => o(i),
       rowSelection: {
-        selectedRows: n(() => S.value),
+        selectedRows: n(() => x.value),
         clearAll: N
       },
-      scrollToRow: Re
-    }), (e, l) => (s(), k("div", {
+      scrollToRow: ke
+    }), (e, l) => (s(), F("div", {
       class: f(ce.value),
-      style: T(e.wrapperStyle)
+      style: z(e.wrapperStyle)
     }, [
-      o(B)(e.dataSource) && e.searchForm !== !1 && K.value.length > 0 ? (s(), k("div", {
+      o(b)(e.dataSource) && e.searchForm !== !1 && K.value.length > 0 ? (s(), F("div", {
         key: 0,
         class: f(e.card ? o(I)("search-wrapper") : null),
-        style: T(e.searchFormWrapperStyle)
+        style: z(e.searchFormWrapperStyle)
       }, [
-        U(o(Ne).SearchForm, g(e.searchForm || {}, {
+        U(o(Te).SearchForm, g(e.searchForm || {}, {
           ref_key: "formRef",
           ref: P,
           "custom-reset": "",
           "submit-loading": o(M).loading,
-          onSubmit: o(H),
+          onSubmit: o(j),
           onReset: o(W)
         }), G({
-          default: h(() => [
-            (s(!0), k(X, null, A(K.value, (t) => (s(), u(_(t.renderNode.Comp), g({
+          default: v(() => [
+            (s(!0), F(X, null, A(K.value, (t) => (s(), u(_(t.renderNode.Comp), g({
               key: t.dataIndex,
               item: t,
               ref_for: !0
@@ -316,38 +319,38 @@ const Ro = /* @__PURE__ */ ke({
         }, [
           L.searchFormExtra ? {
             name: "extra",
-            fn: h(() => [
+            fn: v(() => [
               V(e.$slots, "searchFormExtra")
             ]),
             key: "0"
           } : void 0
         ]), 1040, ["submit-loading", "onSubmit", "onReset"])
       ], 6)) : C("", !0),
-      F("div", {
+      B("div", {
         class: f([o(I)("table-wrapper"), e.card ? o(I)("table-wrapper-card") : null]),
-        style: T(e.tableWrapperStyle)
+        style: z(e.tableWrapperStyle)
       }, [
-        F("div", {
+        B("div", {
           class: f(o(d)("header-wrapper"))
         }, [
           V(e.$slots, "title", {
-            selectedRows: o(S),
-            selectedRowKeys: o(x).selectedRowKeys,
+            selectedRows: o(x),
+            selectedRowKeys: o(R).selectedRowKeys,
             shownColumns: i.value,
             clearAll: N
           })
         ], 2),
-        F("div", {
+        B("div", {
           class: f(o(d)("vxe-wrapper"))
         }, [
-          (s(), u(o(Pe), g(o(De)(a), {
+          (s(), u(o(Ee), g(o(Ke)(a), {
             ref_key: "tableRef",
             ref: p,
             key: o(ie),
-            data: o(v).records,
+            data: o(h).records,
             "sort-config": { remote: $.value.length > 0 },
-            "filter-config": { remote: j.value.length > 0 },
-            loading: o(v).loading,
+            "filter-config": { remote: H.value.length > 0 },
+            loading: ye.value,
             "row-config": {
               isHover: !0,
               keyField: a.rowKey
@@ -362,58 +365,58 @@ const Ro = /* @__PURE__ */ ke({
               "--vxe-ui-table-row-radio-checked-background-color": o(m).controlItemBgActive,
               "--vxe-ui-table-row-hover-radio-checked-background-color": o(m).controlItemBgActiveHover
             },
-            size: w.value,
+            size: S.value,
             onSortChange: o(fe),
             onFilterChange: o(ge),
             onCheckboxChange: E,
             onCheckboxRangeChange: E,
             onCheckboxAll: E,
-            onRadioChange: be
+            onRadioChange: we
           }), G({
-            empty: h(() => [
+            empty: v(() => [
               U(o(oe), {
                 image: o(oe).PRESENTED_IMAGE_SIMPLE
               }, null, 8, ["image"])
             ]),
-            default: h(() => [
-              a.expandable ? (s(), u(o(Q), g({ key: 0 }, o(Ke)(e.expandable), { fixed: ve.value }), {
-                content: h((t) => [
+            default: v(() => [
+              a.expandable ? (s(), u(o(Q), g({ key: 0 }, o($e)(e.expandable), { fixed: he.value }), {
+                content: v((t) => [
                   (s(), u(_(a.expandable.renderContent(t))))
                 ]),
                 _: 1
               }, 16, ["fixed"])) : C("", !0),
-              a.rowSelection ? (s(), u(o(Q), J(g({ key: 1 }, o($e)(o(x), i.value))), null, 16)) : C("", !0),
-              (s(!0), k(X, null, A(o(se), (t) => (s(), u(_(t), {
+              a.rowSelection ? (s(), u(o(Q), J(g({ key: 1 }, o(He)(o(R), i.value))), null, 16)) : C("", !0),
+              (s(!0), F(X, null, A(o(se), (t) => (s(), u(_(t), {
                 key: t.props.colId
               }))), 128))
             ]),
             _: 2
           }, [
-            A(o(Ee)(L, ["searchFormExtra"]), (t, r) => ({
+            A(o(Ne)(L, ["searchFormExtra"]), (t, r) => ({
               name: r,
-              fn: h((c) => [
-                V(e.$slots, r, J(Ie(c || {})))
+              fn: v((c) => [
+                V(e.$slots, r, J(Pe(c || {})))
               ])
             }))
           ]), 1040, ["data", "sort-config", "filter-config", "loading", "row-config", "style", "size", "onSortChange", "onFilterChange"]))
         ], 2),
-        F("div", {
+        B("div", {
           class: f(o(d)("pagination-wrapper"))
         }, [
-          e.sticky ? (s(), u(o(Qe), {
+          e.sticky ? (s(), u(o(Ye), {
             key: 0,
             direction: "horizontal",
             "scroll-container": de.value
           }, null, 8, ["scroll-container"])) : C("", !0),
-          e.pagination !== !1 ? (s(), u(o(Le), g({
+          e.pagination !== !1 ? (s(), u(o(De), g({
             key: 1,
             class: o(d)("pagination")
-          }, o(M).pagination, { onChange: o(he) }), null, 16, ["class", "onChange"])) : C("", !0)
+          }, o(M).pagination, { onChange: o(ve) }), null, 16, ["class", "onChange"])) : C("", !0)
         ], 2)
       ], 6)
     ], 6));
   }
 });
 export {
-  Ro as default
+  ko as default
 };

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

@@ -115,7 +115,7 @@ export type ApGridRowSelection<RecordType> = Pick<TableRowSelection<RecordType>,
      */
     range?: boolean;
 };
-export type ApGridProps<RecordType = any, ParamsType = any> = Omit<TableProps<RecordType>, 'columns' | 'pagination' | 'dataSource' | 'size' | 'rowSelection' | 'rowKey' | 'rowClassName' | 'footer'> & Pick<VxeTableProps<RecordType>, 'rowClassName' | 'stripe' | 'headerRowClassName' | 'footerRowClassName' | 'cellClassName' | 'headerCellClassName' | 'footerCellClassName' | 'rowStyle' | 'headerRowStyle' | 'footerRowStyle' | 'cellStyle' | 'headerCellStyle' | 'footerCellStyle' | 'height' | 'minHeight' | 'maxHeight' | 'mergeCells' | 'mergeFooterItems' | 'cellConfig'> & {
+export type ApGridProps<RecordType = any, ParamsType = any> = Omit<TableProps<RecordType>, 'columns' | 'pagination' | 'dataSource' | 'size' | 'rowSelection' | 'rowKey' | 'rowClassName' | 'footer' | 'loading'> & Pick<VxeTableProps<RecordType>, 'rowClassName' | 'stripe' | 'headerRowClassName' | 'footerRowClassName' | 'cellClassName' | 'headerCellClassName' | 'footerCellClassName' | 'rowStyle' | 'headerRowStyle' | 'footerRowStyle' | 'cellStyle' | 'headerCellStyle' | 'footerCellStyle' | 'height' | 'minHeight' | 'maxHeight' | 'mergeCells' | 'mergeFooterItems' | 'cellConfig' | 'loading' | 'loadingConfig'> & {
     /**
      * 列配置
      */