@aplus-frontend/ui 0.5.5 → 0.5.7

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

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

package/es/src/ap-grid/utils/table.d.ts

@@ -1,10 +1,11 @@
 import { VxeTableEventProps, VxeTableProps } from 'vxe-table';
-import { ApGridProps, ApGridRowSelection } from '../interface';
+import { ApGridColumnType, ApGridProps, ApGridRowSelection } from '../interface';
 import { RowSelectionType } from '@aplus-frontend/antdv/es/table/interface';
 export declare function toVxeProps<RecordType>(props: any): VxeTableProps<RecordType> & VxeTableEventProps<RecordType>;
-export declare function getRowSelectionProps(rowSelection: ApGridRowSelection<any> | true): {
+export declare function getRowSelectionProps(rowSelection: ApGridRowSelection<any> | true, columns: ApGridColumnType[]): {
     type: RowSelectionType;
     width: string | number;
+    fixed: "left" | "right" | undefined;
 };
 export declare function getRowExpandProps(config: ApGridProps['expandable']): {
     readonly type: "expand";

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

@@ -1,9 +1,9 @@
-import { omit as u, isUndefined as d, isFunction as c, isNumber as f } from "lodash-unified";
-const h = 30, b = 50;
-function v(e) {
-  var r, l, n;
+import { omit as d, isUndefined as n, isFunction as f, isNumber as c } from "lodash-unified";
+const h = 30, v = 50;
+function R(e) {
+  var r, l, o;
   const t = {
-    ...u(e, [
+    ...d(e, [
       "columns",
       "request",
       "searchForm",
@@ -15,48 +15,55 @@ function v(e) {
   if (e.adaptive && (t.autoResize = !0, t.height = "100%"), e.columnResizable && (t.columnConfig ? t.columnConfig.resizable = !0 : t.columnConfig = {
     resizable: !0
   }), e.rowSelection) {
-    const o = e.rowSelection === !0 ? {} : e.rowSelection;
-    o.type === "radio" ? t.radioConfig = {
+    const i = e.rowSelection === !0 ? {} : e.rowSelection;
+    i.type === "radio" ? t.radioConfig = {
       highlight: !0,
-      checkMethod({ row: i }) {
-        return o.disabled ? !o.disabled(i) : !0;
+      checkMethod({ row: u }) {
+        return i.disabled ? !i.disabled(u) : !0;
       },
-      checkRowKey: (r = o.defaultSelectedRowKeys) == null ? void 0 : r[0],
-      reserve: d(o.preserveSelectedRowKeys) ? !0 : o.preserveSelectedRowKeys
+      checkRowKey: (r = i.defaultSelectedRowKeys) == null ? void 0 : r[0],
+      reserve: n(i.preserveSelectedRowKeys) ? !0 : i.preserveSelectedRowKeys
     } : t.checkboxConfig = {
       highlight: !0,
-      checkMethod({ row: i }) {
-        return o.disabled ? !o.disabled(i) : !0;
+      checkMethod({ row: u }) {
+        return i.disabled ? !i.disabled(u) : !0;
       },
-      checkRowKeys: o.defaultSelectedRowKeys,
-      reserve: d(o.preserveSelectedRowKeys) ? !0 : o.preserveSelectedRowKeys
+      checkRowKeys: i.defaultSelectedRowKeys,
+      reserve: n(i.preserveSelectedRowKeys) ? !0 : i.preserveSelectedRowKeys
     };
   }
-  return t.border = e.bordered, e.expandable && (t.expandConfig = u(e.expandable, [
+  return t.border = e.bordered, e.expandable && (t.expandConfig = d(e.expandable, [
     "renderContent",
     "width",
     "title"
-  ])), e.footer && (t.showFooter = !0, c(e.footer) ? t.footerMethod = e.footer : t.footerData = e.footer), e.virtual === !1 ? (t.virtualXConfig = {
+  ])), e.footer && (t.showFooter = !0, f(e.footer) ? t.footerMethod = e.footer : t.footerData = e.footer), e.virtual === !1 ? (t.virtualXConfig = {
     enabled: !1
   }, t.virtualYConfig = {
     enabled: !1
-  }) : (a(t, "X", (l = e.virtual) == null ? void 0 : l.x), a(t, "Y", (n = e.virtual) == null ? void 0 : n.y)), t;
+  }) : (a(t, "X", (l = e.virtual) == null ? void 0 : l.x), a(t, "Y", (o = e.virtual) == null ? void 0 : o.y)), t;
 }
 function a(e, t, r) {
-  const l = t === "X", n = l ? "virtualXConfig" : "virtualYConfig", o = r !== !1, i = l ? h : b, s = f(r) && r >= 0 ? r : i;
-  e[n] = {
-    enabled: o,
+  const l = t === "X", o = l ? "virtualXConfig" : "virtualYConfig", i = r !== !1, u = l ? h : v, s = c(r) && r >= 0 ? r : u;
+  e[o] = {
+    enabled: i,
     gt: s
   };
 }
-function y(e) {
-  const t = e === !0 || !e.type ? "checkbox" : e.type, r = e === !0 ? 60 : e.columnWidth || 60;
-  return {
-    type: t,
-    width: r
+function b(e) {
+  return e === !0 ? "left" : e;
+}
+function w(e, t) {
+  const r = e === !0 || !e.type ? "checkbox" : e.type, l = e === !0 ? 60 : e.columnWidth || 60;
+  let o = e === !0 ? void 0 : b(e.fixed);
+  return o || (o === !1 ? o = void 0 : o = t.some(
+    (i) => i.fixed === "left" || i.fixed === !0
+  ) ? "left" : void 0), {
+    type: r,
+    width: l,
+    fixed: o
   };
 }
-function R(e) {
+function x(e) {
   const t = (e == null ? void 0 : e.width) || "auto";
   return {
     type: "expand",
@@ -65,7 +72,7 @@ function R(e) {
   };
 }
 export {
-  R as getRowExpandProps,
-  y as getRowSelectionProps,
-  v as toVxeProps
+  x as getRowExpandProps,
+  w as getRowSelectionProps,
+  R as toVxeProps
 };

package/es/src/config-provider/hooks/use-namespace.d.ts

@@ -2,7 +2,11 @@ import { InjectionKey, Ref, ComputedRef } from 'vue';
 export declare const defaultNamespace = "aplus";
 export declare const namespaceContextKey: InjectionKey<Ref<string | undefined>>;
 export declare const useGetDerivedNamespace: (namespaceOverrides?: Ref<string | undefined>) => ComputedRef<string>;
-export declare const useNamespace: (block: string, namespaceOverrides?: Ref<string | undefined>) => {
+export declare const useNamespace: (
+/**
+ * 块 一般是指组件名
+ */
+block: string, namespaceOverrides?: Ref<string | undefined>) => {
     namespace: ComputedRef<string>;
     b: (blockSuffix?: string) => string;
     e: (element?: string) => string;

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

@@ -1,4 +1,5 @@
-const e = {
+import e from "vxe-table/es/locale/lang/en-US";
+const a = {
   name: "en",
   ap: {
     common: {
@@ -153,9 +154,10 @@ const e = {
     },
     apSummary: {
       total: "Total"
-    }
+    },
+    ...e
   }
 };
 export {
-  e as default
+  a as default
 };

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

@@ -1,4 +1,5 @@
-const e = {
+import e from "vxe-table/es/locale/lang/zh-CN";
+const a = {
   name: "zh-cn",
   ap: {
     common: {
@@ -161,9 +162,10 @@ const e = {
     },
     apSummary: {
       total: "合计"
-    }
+    },
+    ...e
   }
 };
 export {
-  e as default
+  a as default
 };

package/lib/src/ap-grid/index.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),b=require("vxe-table"),m=require("lodash-unified"),ae=require("../ap-form/index.js");require("../config-provider/index.js");const te=require("../ap-table/constants.js"),d=require("../ap-table/utils.js"),ne=require("../ap-table/hooks/use-table-paging-ng.js"),S=require("@aplus-frontend/antdv"),le=require("./hooks/use-inner-params.js"),x=require("./utils/table.js"),se=require("../ap-table/hooks/use-table-row-selection.js"),ue=require("../ap-table/context.js"),V=require("./constants.js"),ce=require("./hooks/use-render-columns.js"),de=require("@aplus-frontend/antdv/es/theme/internal");require("../scroll-bar/index.js");const ie=require("./hooks/use-load-vxe.js"),fe=require("../config-provider/hooks/use-namespace.js"),pe=require("../config-provider/hooks/use-global-config.js"),me=require("../scroll-bar/index.vue.js"),ge=e.defineComponent({name:"ApGrid",__name:"index",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:!1},prefixCls:{},tableLayout:{},title:{},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],default:!1},transformCellText:{},rowClassName:{},stripe:{type:Boolean},headerRowClassName:{},footerRowClassName:{},cellClassName:{},headerCellClassName:{},footerCellClassName:{},rowStyle:{},headerRowStyle:{},footerRowStyle:{},cellStyle:{},headerCellStyle:{},footerCellStyle:{},height:{},minHeight:{},maxHeight:{},mergeCells:{},mergeFooterItems:{},cellConfig:{},columns:{},rowSelection:{type:Boolean},card:{type:Boolean,default:!1},params:{},request:{},defaultData:{},dataSource:{},onLoadingChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},wrapperStyle:{},manual:{type:Boolean,default:!1},size:{default:void 0},adaptive:{type:Boolean,default:!1},columnResizable:{type:[Boolean,Object],default:!1},rowKey:{default:"key"},footer:{},virtual:{type:[Boolean,Object],default:void 0},expandable:{},value:{}},setup(T,{expose:A}){const k=e.useSlots(),o=T,{e:C,b:s,be:O}=fe.useNamespace("ap-grid"),L=pe.useGlobalConfig("valueTypeMap");ie.useLoadVxe();const l=e.ref([]),R=e.ref([]),c=e.ref(),g=e.ref(o.size),[,i]=de.useToken(),{renderConfig:_,updateSignal:D}=ce.useRenderColumns(l);let B=0;const K=e.computed(()=>{if(c.value)return c.value.$el.querySelector(".vxe-table--header-inner-wrapper")}),F=e.computed(()=>{var r,n,t;return B++,((t=(n=(r=o.columns)==null?void 0:r.filter(a=>!a.hideInSearch&&a.dataIndex&&(a.valueType||a.customRenderFormItem)&&!te.noRenderAsFormItemValueList.includes(a.valueType)))==null?void 0:n.sort((a,u)=>{let p=d.getColumnOrder(a.order);return d.getColumnOrder(u.order)-p}))==null?void 0:t.map(a=>{const u=d.updateFormProps(a,d.getFieldProps(a.fieldProps,{})),p={...a,fieldProps:{label:a.title,name:a.dataIndex,...u||{},_signal:B},renderNode:void 0};return p.renderNode=d.getSearchFormItemRenderNode(p,e.unref(L)),p}))||[]}),j=e.computed(()=>[s(),o.card?null:s("wrapper"),o.adaptive?s("adaptive"):null,o.sticky?s("sticky"):null].filter(Boolean)),P=e.computed(()=>d.recursionApColumns(e.unref(l),r=>{if(r.sorter===!0)return r.key||r.dataIndex}).filter(Boolean)),E=e.computed(()=>d.recursionApColumns(e.unref(l),r=>{if(r.filters&&!r.onFilter)return r.key||r.dataIndex}).filter(Boolean)),{formRef:y,submit:N,reset:z,refresh:$,data:f,tableProps:H,setDataSource:M,handleTableChange:W}=ne.useTablePaging({async request(r){var t;if(!h.value.preserveSelectedRowKeys&&m.isUndefined(o.dataSource)&&w(),!m.isUndefined(o.dataSource)){const a=r.pageSize*(r.current-1);return{data:(o.pagination===!1?o.dataSource:o.dataSource.slice(a,a+r.pageSize))||[],total:o.dataSource.length||0}}const n=await((t=o.request)==null?void 0:t.call(o,r));return{data:(n==null?void 0:n.data)||[],total:(n==null?void 0:n.total)||0}},namespace:"ap-grid",filterFields:E,sortFields:P,defaultParams:o.params,defaultData:o.defaultData,manual:o.manual,formatParams:o.beforeSearchSubmit,pagination:o.pagination}),{sortChangeEvent:U,filterChangeEvent:G,paginationChangeEvent:J}=le.useInnerParams(W);ue.useProvideApTable({columns:e.computed(()=>l.value),columnsBackup:e.computed(()=>R.value),size:e.computed(()=>g.value?V.sizeMap[g.value]:"middle"),updateColumns(r){l.value=r},updateSize(r){g.value=V.sizeReverseMap[r]},renderConfig:e.computed(()=>({className:O("table-header","title"),color:i.value.colorPrimary}))});const I=e.computed(()=>l.value.some(r=>r.fixed==="left"||r.fixed===!0)?"left":void 0),Q=e.computed(()=>m.isUndefined(o.dataSource)?f.records:o.dataSource),{selectedRows:v,rowSelection:h,...X}=se.default({...o.rowSelection===!0?{}:o.rowSelection,dataSource:Q,rowKey:o.rowKey}),q=()=>{const r=c.value;r&&(v.value=[...r.getCheckboxReserveRecords(),...r.getCheckboxRecords()])},Y=()=>{const r=c.value;r&&(v.value=[r.getRadioRecord()])};function Z(){var r;return((r=o.columns)==null?void 0:r.filter(n=>!n.hideInTable))||[]}function ee(r){var n,t,a;(a=(t=(n=y.value)==null?void 0:n.apForm)==null?void 0:t.setFieldsValue)==null||a.call(t,r)}function re(r=!1){var t,a,u;const n=r?"getFieldsValueTransformed":"getFieldsValue";return(u=(a=(t=y.value)==null?void 0:t.apForm)==null?void 0:a[n])==null?void 0:u.call(a,!0)}function w(){X.clearAll();const r=c.value;r&&(h.value.type==="radio"?(r.clearRadioRow(),r.clearRadioReserve()):(r.clearCheckboxRow(),r.clearCheckboxReserve()))}async function oe(r,n){var a;const t=f.records[r];if(t)return(a=c.value)==null?void 0:a.scrollToRow(t,n)}return e.watch(()=>[o.columnResizable,o.columns],()=>{const r=Z();l.value=r,R.value=r},{deep:!0,immediate:!0}),e.watch(()=>o.dataSource,r=>{M(r)},{immediate:!0}),e.watch(()=>e.unref(f).loading,r=>{var n;(n=o.onLoadingChange)==null||n.call(o,r)}),A({submit:N,reset:z,refresh:$,setSearchFormValues:ee,getSearchFormValues:re,getShowColumns:()=>e.unref(l),rowSelection:{selectedRows:e.computed(()=>v.value),clearAll:w},scrollToRow:oe}),(r,n)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(j.value),style:e.normalizeStyle(r.wrapperStyle)},[e.unref(m.isUndefined)(r.dataSource)&&r.searchForm!==!1&&F.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(r.card?e.unref(C)("search-wrapper"):null),style:e.normalizeStyle(r.searchFormWrapperStyle)},[e.createVNode(e.unref(ae.ApForm).SearchForm,e.mergeProps(r.searchForm||{},{ref_key:"formRef",ref:y,"custom-reset":"","submit-loading":!1,onSubmit:e.unref(N),onReset:e.unref(z)}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(F.value,t=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(t.renderNode.Comp),e.mergeProps({key:t.dataIndex,item:t,ref_for:!0},t.fieldProps||{},{span:t.span,"custom-render":t.renderNode.render}),null,16,["item","span","custom-render"]))),128))]),_:2},[k.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(r.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["onSubmit","onReset"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{class:e.normalizeClass([e.unref(C)("table-wrapper"),r.card?e.unref(C)("table-wrapper-card"):null]),style:e.normalizeStyle(r.tableWrapperStyle)},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(s)("header-wrapper"))},[e.renderSlot(r.$slots,"title",{selectedRows:e.unref(v),selectedRowKeys:e.unref(h).selectedRowKeys,shownColumns:l.value,clearAll:w})],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(s)("vxe-wrapper"))},[(e.openBlock(),e.createBlock(e.unref(b.VxeTable),e.mergeProps(e.unref(x.toVxeProps)(o),{ref_key:"tableRef",ref:c,key:e.unref(D),data:e.unref(f).records,"sort-config":{remote:P.value.length>0},"filter-config":{remote:E.value.length>0},loading:e.unref(f).loading,"row-config":{isHover:!0,keyField:o.rowKey},style:{"--vxe-ui-table-row-checkbox-checked-background-color":e.unref(i).controlItemBgActive,"--vxe-ui-table-row-hover-checkbox-checked-background-color":e.unref(i).controlItemBgActiveHover,"--vxe-ui-font-primary-color":e.unref(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":e.unref(i).controlItemBgActive,"--vxe-ui-table-row-hover-radio-checked-background-color":e.unref(i).controlItemBgActiveHover},size:g.value,onSortChange:e.unref(U),onFilterChange:e.unref(G),onCheckboxChange:q,onCheckboxAll:q,onRadioChange:Y}),e.createSlots({empty:e.withCtx(()=>[e.createVNode(e.unref(S.Empty),{image:e.unref(S.Empty).PRESENTED_IMAGE_SIMPLE},null,8,["image"])]),default:e.withCtx(()=>[o.expandable?(e.openBlock(),e.createBlock(e.unref(b.VxeColumn),e.mergeProps({key:0},e.unref(x.getRowExpandProps)(r.expandable),{fixed:I.value}),{content:e.withCtx(t=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(o.expandable.renderContent(t))))]),_:1},16,["fixed"])):e.createCommentVNode("",!0),o.rowSelection?(e.openBlock(),e.createBlock(e.unref(b.VxeColumn),e.mergeProps({key:1},e.unref(x.getRowSelectionProps)(e.unref(h)),{fixed:I.value}),null,16,["fixed"])):e.createCommentVNode("",!0),(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(e.unref(_),t=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(t),{key:t.props.colId}))),128))]),_:2},[e.renderList(e.unref(m.omit)(k,["searchFormExtra"]),(t,a)=>({name:a,fn:e.withCtx(u=>[e.renderSlot(r.$slots,a,e.normalizeProps(e.guardReactiveProps(u||{})))])}))]),1040,["data","sort-config","filter-config","loading","row-config","style","size","onSortChange","onFilterChange"]))],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(s)("pagination-wrapper"))},[r.sticky?(e.openBlock(),e.createBlock(e.unref(me.default),{key:0,direction:"horizontal","scroll-container":K.value},null,8,["scroll-container"])):e.createCommentVNode("",!0),r.pagination!==!1?(e.openBlock(),e.createBlock(e.unref(S.Pagination),e.mergeProps({key:1,class:e.unref(s)("pagination")},e.unref(H).pagination,{onChange:e.unref(J)}),null,16,["class","onChange"])):e.createCommentVNode("",!0)],2)],6)],6))}});exports.default=ge;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),b=require("vxe-table");require("vxe-table/es/style.css");require("vxe-pc-ui/es/style.css");const _=require("vxe-pc-ui"),m=require("lodash-unified"),se=require("../ap-form/index.js");require("../config-provider/index.js");const ue=require("../ap-table/constants.js"),d=require("../ap-table/utils.js"),ce=require("../ap-table/hooks/use-table-paging-ng.js"),x=require("@aplus-frontend/antdv"),de=require("./hooks/use-inner-params.js"),k=require("./utils/table.js"),ie=require("../ap-table/hooks/use-table-row-selection.js"),pe=require("../ap-table/context.js"),T=require("./constants.js"),fe=require("./hooks/use-render-columns.js"),me=require("@aplus-frontend/antdv/es/theme/internal");require("../scroll-bar/index.js");const ge=require("../config-provider/hooks/use-namespace.js"),ve=require("../config-provider/hooks/use-global-config.js"),Ce=require("../config-provider/hooks/use-locale.js"),he=require("../scroll-bar/index.vue.js"),ye=e.defineComponent({name:"ApGrid",__name:"index",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:!1},prefixCls:{},tableLayout:{},title:{},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],default:!1},transformCellText:{},rowClassName:{},stripe:{type:Boolean},headerRowClassName:{},footerRowClassName:{},cellClassName:{},headerCellClassName:{},footerCellClassName:{},rowStyle:{},headerRowStyle:{},footerRowStyle:{},cellStyle:{},headerCellStyle:{},footerCellStyle:{},height:{},minHeight:{},maxHeight:{},mergeCells:{},mergeFooterItems:{},cellConfig:{},columns:{},rowSelection:{type:Boolean},card:{type:Boolean,default:!1},params:{},request:{},defaultData:{},dataSource:{},onLoadingChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},wrapperStyle:{},manual:{type:Boolean,default:!1},size:{default:void 0},adaptive:{type:Boolean,default:!1},columnResizable:{type:[Boolean,Object],default:!1},rowKey:{default:"key"},footer:{},virtual:{type:[Boolean,Object],default:void 0},expandable:{},value:{}},setup(A,{expose:L}){var V;const R=e.useSlots(),o=A,g=(V=e.getCurrentInstance())==null?void 0:V.appContext.app;g&&!g.__VXE_PC_UI_INSTALLED__&&(g.use(_.VxeUI),g.__VXE_PC_UI_INSTALLED__=!0);const{e:y,b:s,be:O}=ge.useNamespace("ap-grid"),D=ve.useGlobalConfig("valueTypeMap"),l=e.ref([]),B=e.ref([]),c=e.ref(),v=e.ref(o.size),[,i]=me.useToken(),{t:U}=Ce.useLocale();_.VxeUI.setConfig({i18n:(r,n)=>U(`ap.${r}`,n)});const{renderConfig:K,updateSignal:$}=fe.useRenderColumns(l);let P=0;const j=e.computed(()=>{if(c.value)return c.value.$el.querySelector(".vxe-table--header-inner-wrapper")}),F=e.computed(()=>{var r,n,t;return P++,((t=(n=(r=o.columns)==null?void 0:r.filter(a=>!a.hideInSearch&&a.dataIndex&&(a.valueType||a.customRenderFormItem)&&!ue.noRenderAsFormItemValueList.includes(a.valueType)))==null?void 0:n.sort((a,u)=>{let f=d.getColumnOrder(a.order);return d.getColumnOrder(u.order)-f}))==null?void 0:t.map(a=>{const u=d.updateFormProps(a,d.getFieldProps(a.fieldProps,{})),f={...a,fieldProps:{label:a.title,name:a.dataIndex,...u||{},_signal:P},renderNode:void 0};return f.renderNode=d.getSearchFormItemRenderNode(f,e.unref(D)),f}))||[]}),H=e.computed(()=>[s(),o.card?null:s("wrapper"),o.adaptive?s("adaptive"):null,o.sticky?s("sticky"):null].filter(Boolean)),E=e.computed(()=>d.recursionApColumns(e.unref(l),r=>{if(r.sorter===!0)return r.key||r.dataIndex}).filter(Boolean)),I=e.computed(()=>d.recursionApColumns(e.unref(l),r=>{if(r.filters&&!r.onFilter)return r.key||r.dataIndex}).filter(Boolean)),{formRef:w,submit:N,reset:q,refresh:M,data:p,tableProps:W,setDataSource:G,handleTableChange:X}=ce.useTablePaging({async request(r){var t;if(!h.value.preserveSelectedRowKeys&&m.isUndefined(o.dataSource)&&S(),!m.isUndefined(o.dataSource)){const a=r.pageSize*(r.current-1);return{data:(o.pagination===!1?o.dataSource:o.dataSource.slice(a,a+r.pageSize))||[],total:o.dataSource.length||0}}const n=await((t=o.request)==null?void 0:t.call(o,r));return{data:(n==null?void 0:n.data)||[],total:(n==null?void 0:n.total)||0}},namespace:"ap-grid",filterFields:I,sortFields:E,defaultParams:o.params,defaultData:o.defaultData,manual:o.manual,formatParams:o.beforeSearchSubmit,pagination:o.pagination}),{sortChangeEvent:J,filterChangeEvent:Q,paginationChangeEvent:Y}=de.useInnerParams(X);pe.useProvideApTable({columns:e.computed(()=>l.value),columnsBackup:e.computed(()=>B.value),size:e.computed(()=>v.value?T.sizeMap[v.value]:"middle"),updateColumns(r){l.value=r},updateSize(r){v.value=T.sizeReverseMap[r]},renderConfig:e.computed(()=>({className:O("table-header","title"),color:i.value.colorPrimary}))});const Z=e.computed(()=>l.value.some(r=>r.fixed==="left"||r.fixed===!0)?"left":void 0),ee=e.computed(()=>m.isUndefined(o.dataSource)?p.records:o.dataSource),{selectedRows:C,rowSelection:h,...re}=ie.default({...o.rowSelection===!0?{}:o.rowSelection,dataSource:ee,rowKey:o.rowKey}),z=()=>{const r=c.value;r&&(C.value=[...r.getCheckboxReserveRecords(),...r.getCheckboxRecords()])},oe=()=>{const r=c.value;r&&(C.value=[r.getRadioRecord()])};function ae(){var r;return((r=o.columns)==null?void 0:r.filter(n=>!n.hideInTable))||[]}function te(r){var n,t,a;(a=(t=(n=w.value)==null?void 0:n.apForm)==null?void 0:t.setFieldsValue)==null||a.call(t,r)}function ne(r=!1){var t,a,u;const n=r?"getFieldsValueTransformed":"getFieldsValue";return(u=(a=(t=w.value)==null?void 0:t.apForm)==null?void 0:a[n])==null?void 0:u.call(a,!0)}function S(){re.clearAll();const r=c.value;r&&(h.value.type==="radio"?(r.clearRadioRow(),r.clearRadioReserve()):(r.clearCheckboxRow(),r.clearCheckboxReserve()))}async function le(r,n){var a;const t=p.records[r];if(t)return(a=c.value)==null?void 0:a.scrollToRow(t,n)}return e.watch(()=>[o.columnResizable,o.columns],()=>{const r=ae();l.value=r,B.value=r},{deep:!0,immediate:!0}),e.watch(()=>o.dataSource,r=>{G(r)},{immediate:!0}),e.watch(()=>e.unref(p).loading,r=>{var n;(n=o.onLoadingChange)==null||n.call(o,r)}),L({submit:N,reset:q,refresh:M,setSearchFormValues:te,getSearchFormValues:ne,getShowColumns:()=>e.unref(l),rowSelection:{selectedRows:e.computed(()=>C.value),clearAll:S},scrollToRow:le}),(r,n)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(H.value),style:e.normalizeStyle(r.wrapperStyle)},[e.unref(m.isUndefined)(r.dataSource)&&r.searchForm!==!1&&F.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(r.card?e.unref(y)("search-wrapper"):null),style:e.normalizeStyle(r.searchFormWrapperStyle)},[e.createVNode(e.unref(se.ApForm).SearchForm,e.mergeProps(r.searchForm||{},{ref_key:"formRef",ref:w,"custom-reset":"","submit-loading":!1,onSubmit:e.unref(N),onReset:e.unref(q)}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(F.value,t=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(t.renderNode.Comp),e.mergeProps({key:t.dataIndex,item:t,ref_for:!0},t.fieldProps||{},{span:t.span,"custom-render":t.renderNode.render}),null,16,["item","span","custom-render"]))),128))]),_:2},[R.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(r.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["onSubmit","onReset"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{class:e.normalizeClass([e.unref(y)("table-wrapper"),r.card?e.unref(y)("table-wrapper-card"):null]),style:e.normalizeStyle(r.tableWrapperStyle)},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(s)("header-wrapper"))},[e.renderSlot(r.$slots,"title",{selectedRows:e.unref(C),selectedRowKeys:e.unref(h).selectedRowKeys,shownColumns:l.value,clearAll:S})],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(s)("vxe-wrapper"))},[(e.openBlock(),e.createBlock(e.unref(b.VxeTable),e.mergeProps(e.unref(k.toVxeProps)(o),{ref_key:"tableRef",ref:c,key:e.unref($),data:e.unref(p).records,"sort-config":{remote:E.value.length>0},"filter-config":{remote:I.value.length>0},loading:e.unref(p).loading,"row-config":{isHover:!0,keyField:o.rowKey},style:{"--vxe-ui-table-row-checkbox-checked-background-color":e.unref(i).controlItemBgActive,"--vxe-ui-table-row-hover-checkbox-checked-background-color":e.unref(i).controlItemBgActiveHover,"--vxe-ui-font-primary-color":e.unref(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":e.unref(i).controlItemBgActive,"--vxe-ui-table-row-hover-radio-checked-background-color":e.unref(i).controlItemBgActiveHover},size:v.value,onSortChange:e.unref(J),onFilterChange:e.unref(Q),onCheckboxChange:z,onCheckboxAll:z,onRadioChange:oe}),e.createSlots({empty:e.withCtx(()=>[e.createVNode(e.unref(x.Empty),{image:e.unref(x.Empty).PRESENTED_IMAGE_SIMPLE},null,8,["image"])]),default:e.withCtx(()=>[o.expandable?(e.openBlock(),e.createBlock(e.unref(b.VxeColumn),e.mergeProps({key:0},e.unref(k.getRowExpandProps)(r.expandable),{fixed:Z.value}),{content:e.withCtx(t=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(o.expandable.renderContent(t))))]),_:1},16,["fixed"])):e.createCommentVNode("",!0),o.rowSelection?(e.openBlock(),e.createBlock(e.unref(b.VxeColumn),e.normalizeProps(e.mergeProps({key:1},e.unref(k.getRowSelectionProps)(e.unref(h),l.value))),null,16)):e.createCommentVNode("",!0),(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(e.unref(K),t=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(t),{key:t.props.colId}))),128))]),_:2},[e.renderList(e.unref(m.omit)(R,["searchFormExtra"]),(t,a)=>({name:a,fn:e.withCtx(u=>[e.renderSlot(r.$slots,a,e.normalizeProps(e.guardReactiveProps(u||{})))])}))]),1040,["data","sort-config","filter-config","loading","row-config","style","size","onSortChange","onFilterChange"]))],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(s)("pagination-wrapper"))},[r.sticky?(e.openBlock(),e.createBlock(e.unref(he.default),{key:0,direction:"horizontal","scroll-container":j.value},null,8,["scroll-container"])):e.createCommentVNode("",!0),r.pagination!==!1?(e.openBlock(),e.createBlock(e.unref(x.Pagination),e.mergeProps({key:1,class:e.unref(s)("pagination")},e.unref(W).pagination,{onChange:e.unref(Y)}),null,16,["class","onChange"])):e.createCommentVNode("",!0)],2)],6)],6))}});exports.default=ye;

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

@@ -1,10 +1,11 @@
 import { VxeTableEventProps, VxeTableProps } from 'vxe-table';
-import { ApGridProps, ApGridRowSelection } from '../interface';
+import { ApGridColumnType, ApGridProps, ApGridRowSelection } from '../interface';
 import { RowSelectionType } from '@aplus-frontend/antdv/es/table/interface';
 export declare function toVxeProps<RecordType>(props: any): VxeTableProps<RecordType> & VxeTableEventProps<RecordType>;
-export declare function getRowSelectionProps(rowSelection: ApGridRowSelection<any> | true): {
+export declare function getRowSelectionProps(rowSelection: ApGridRowSelection<any> | true, columns: ApGridColumnType[]): {
     type: RowSelectionType;
     width: string | number;
+    fixed: "left" | "right" | undefined;
 };
 export declare function getRowExpandProps(config: ApGridProps['expandable']): {
     readonly type: "expand";

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("lodash-unified"),a=30,c=50;function f(e){var i,n,u;const t={...l.omit(e,["columns","request","searchForm","dataSource","rowKey","value"])};if(e.adaptive&&(t.autoResize=!0,t.height="100%"),e.columnResizable&&(t.columnConfig?t.columnConfig.resizable=!0:t.columnConfig={resizable:!0}),e.rowSelection){const o=e.rowSelection===!0?{}:e.rowSelection;o.type==="radio"?t.radioConfig={highlight:!0,checkMethod({row:r}){return o.disabled?!o.disabled(r):!0},checkRowKey:(i=o.defaultSelectedRowKeys)==null?void 0:i[0],reserve:l.isUndefined(o.preserveSelectedRowKeys)?!0:o.preserveSelectedRowKeys}:t.checkboxConfig={highlight:!0,checkMethod({row:r}){return o.disabled?!o.disabled(r):!0},checkRowKeys:o.defaultSelectedRowKeys,reserve:l.isUndefined(o.preserveSelectedRowKeys)?!0:o.preserveSelectedRowKeys}}return t.border=e.bordered,e.expandable&&(t.expandConfig=l.omit(e.expandable,["renderContent","width","title"])),e.footer&&(t.showFooter=!0,l.isFunction(e.footer)?t.footerMethod=e.footer:t.footerData=e.footer),e.virtual===!1?(t.virtualXConfig={enabled:!1},t.virtualYConfig={enabled:!1}):(d(t,"X",(n=e.virtual)==null?void 0:n.x),d(t,"Y",(u=e.virtual)==null?void 0:u.y)),t}function d(e,t,i){const n=t==="X",u=n?"virtualXConfig":"virtualYConfig",o=i!==!1,r=n?a:c,s=l.isNumber(i)&&i>=0?i:r;e[u]={enabled:o,gt:s}}function h(e){const t=e===!0||!e.type?"checkbox":e.type,i=e===!0?60:e.columnWidth||60;return{type:t,width:i}}function b(e){const t=(e==null?void 0:e.width)||"auto";return{type:"expand",title:e==null?void 0:e.title,width:t}}exports.getRowExpandProps=b;exports.getRowSelectionProps=h;exports.toVxeProps=f;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("lodash-unified"),a=30,f=50;function c(e){var r,l,o;const t={...n.omit(e,["columns","request","searchForm","dataSource","rowKey","value"])};if(e.adaptive&&(t.autoResize=!0,t.height="100%"),e.columnResizable&&(t.columnConfig?t.columnConfig.resizable=!0:t.columnConfig={resizable:!0}),e.rowSelection){const i=e.rowSelection===!0?{}:e.rowSelection;i.type==="radio"?t.radioConfig={highlight:!0,checkMethod({row:d}){return i.disabled?!i.disabled(d):!0},checkRowKey:(r=i.defaultSelectedRowKeys)==null?void 0:r[0],reserve:n.isUndefined(i.preserveSelectedRowKeys)?!0:i.preserveSelectedRowKeys}:t.checkboxConfig={highlight:!0,checkMethod({row:d}){return i.disabled?!i.disabled(d):!0},checkRowKeys:i.defaultSelectedRowKeys,reserve:n.isUndefined(i.preserveSelectedRowKeys)?!0:i.preserveSelectedRowKeys}}return t.border=e.bordered,e.expandable&&(t.expandConfig=n.omit(e.expandable,["renderContent","width","title"])),e.footer&&(t.showFooter=!0,n.isFunction(e.footer)?t.footerMethod=e.footer:t.footerData=e.footer),e.virtual===!1?(t.virtualXConfig={enabled:!1},t.virtualYConfig={enabled:!1}):(u(t,"X",(l=e.virtual)==null?void 0:l.x),u(t,"Y",(o=e.virtual)==null?void 0:o.y)),t}function u(e,t,r){const l=t==="X",o=l?"virtualXConfig":"virtualYConfig",i=r!==!1,d=l?a:f,s=n.isNumber(r)&&r>=0?r:d;e[o]={enabled:i,gt:s}}function h(e){return e===!0?"left":e}function b(e,t){const r=e===!0||!e.type?"checkbox":e.type,l=e===!0?60:e.columnWidth||60;let o=e===!0?void 0:h(e.fixed);return o||(o===!1?o=void 0:o=t.some(i=>i.fixed==="left"||i.fixed===!0)?"left":void 0),{type:r,width:l,fixed:o}}function v(e){const t=(e==null?void 0:e.width)||"auto";return{type:"expand",title:e==null?void 0:e.title,width:t}}exports.getRowExpandProps=v;exports.getRowSelectionProps=b;exports.toVxeProps=c;

package/lib/src/config-provider/hooks/use-namespace.d.ts

@@ -2,7 +2,11 @@ import { InjectionKey, Ref, ComputedRef } from 'vue';
 export declare const defaultNamespace = "aplus";
 export declare const namespaceContextKey: InjectionKey<Ref<string | undefined>>;
 export declare const useGetDerivedNamespace: (namespaceOverrides?: Ref<string | undefined>) => ComputedRef<string>;
-export declare const useNamespace: (block: string, namespaceOverrides?: Ref<string | undefined>) => {
+export declare const useNamespace: (
+/**
+ * 块 一般是指组件名
+ */
+block: string, namespaceOverrides?: Ref<string | undefined>) => {
     namespace: ComputedRef<string>;
     b: (blockSuffix?: string) => string;
     e: (element?: string) => string;

package/lib/src/locale/lang/en.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e={name:"en",ap:{common:{okText:"OK",cancelText:"Cancel",resetText:"Reset",queryText:"Search",expandText:"Unfold",closeText:"Put away",inputText:"Please enter",chooseText:"Please choose",redo:"Refresh",back:"Back",more:"More",all:"All"},field:{startDateText:"Start date",endDateText:"End date",today:"Today",yesterday:"Yesterday",thisWeek:"This week",lastWeek:"Last week",thisMonth:"This month",lastMonth:"Last month",thisYear:"This year",lastYear:"Last year",lastXDays:"Last {day} days"},apForm:{search:{search:"Search",reset:"Reset"}},apTable:{pagination:{totalLeftPrefix:"Total",totalLeftSuffix:"items",totalRightPrefix:"Page",totalRightSuffix:" "},setting:{title:"Custom Table",selectAll:"Select All",unSelectAll:"Deselect All",selectAllTip:"Please select the columns to display in the table.",sizeSmall:"Small",sizeNormal:"Normal",selectCount:"Selected fields ({count})",reset:"Reset",fixToLeft:"Fixed on the left",fixToRight:"Fixed on the right",unFixed:"Not fixed",delete:"Delete"},paragraphEllipsis:{copy:"Copy",copySuccess:"Copied successfully"}},apUpload:{update:"Upload",pictureType:"Image type",videoType:"Video type",audioType:"Audio type",documentType:"Document type",allTypes:"All types",networkAnomaly:"Network abnormality",FailedToObtainOssTemporaryPermissions:"Failed to obtain temporary OSS permissions",pleasePass:"Please pass in",supportExtension:"Support extensions",uploadFile:"Upload files",fileInitializationException:"If the initial number of initialized files exceeds {maxCount}, subsequent uploaded files will be out of sync with the data",maxUploadFiles:"Upload a maximum of {maxCount} files",maxUploadPicture:"Upload a maximum of {maxCount} images",maxUploadFileSize:"The file size does not exceed {maxSize}MB",maxWarnUploadFileSize:"The file size is smaller than {maxSize}MB",maxUploadPictureSize:"The image size is smaller than {maxSize}MB",fileFormatNotSupported:"Files in this format are not supported",pictureFormatNotSupported:"Images in this format are not supported",imageParsingFailed:"Image parsing failed",clickOrDragUpload:"Click or drag the file",foldersNotSupported:"Do not support uploading folders"},apExportGroup:{exportError:"Export error",exportSelected:"Export selected",exportAll:"Export all",export:"Export Excel",exportSuccess:"The task has been submitted,please go to the download center to check the progress"},apBatchAction:{selected:"Selected",piecesOfData:"Pieces of data",empty:"Empty"},apApBatchActionGroup:{batchOperation:"Batch operation"},workOrderModal:{createTickets:"Create ticket",submit:"Confirm",cancel:"Cancel",ticketsTitle:"Ticket Title",noEmpty:"No empty",pleaseEntry:"please enter （Within 300 words）",ticketsType:"Ticket Type",ticketsDetail:"Ticket Detail",ticketsLevel:"Priority",operationSuccess:"operate successfully",fileSizeMax:"Single file size limit",fileCountMax:"Limit the number to {x} at a time",fileLabel:"File Upload"},apTableModal:{titleSuffixOne:"You can add up to {maxCount},",titleSuffixTwo:"Added",titleSuffixThree:"",messageMaxCount:"You can select up to {maxCount} data entries",clear:"Clear",selected:"Selected"},apAttachment:{downloadall:"Download All",more:"More"},apSizeInput:{length:"Length",width:"Width",height:"Height"},apExpandAlert:{expand:"Expand",collapse:"Collapse"},apAppendix:{downloadAll:"Download All",downloadFile:"Download file",appendix:"Appendix"},apGroupSearch:{defaultPlaceholder:"Please input",close:"Close",clear:"Clear",confirm:"Confirm",tokenSeparatorsPlaceholder:"A maximum of 200 entries can be entered in batches, separated by commas and newlines"},batchInputGroup:{popoverInputPlaceholder:"A maximum of 200 entries can be entered in batches, separated by newlines"},apSummary:{total:"Total"}}};exports.default=e;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vxe-table/es/locale/lang/en-US"),t={name:"en",ap:{common:{okText:"OK",cancelText:"Cancel",resetText:"Reset",queryText:"Search",expandText:"Unfold",closeText:"Put away",inputText:"Please enter",chooseText:"Please choose",redo:"Refresh",back:"Back",more:"More",all:"All"},field:{startDateText:"Start date",endDateText:"End date",today:"Today",yesterday:"Yesterday",thisWeek:"This week",lastWeek:"Last week",thisMonth:"This month",lastMonth:"Last month",thisYear:"This year",lastYear:"Last year",lastXDays:"Last {day} days"},apForm:{search:{search:"Search",reset:"Reset"}},apTable:{pagination:{totalLeftPrefix:"Total",totalLeftSuffix:"items",totalRightPrefix:"Page",totalRightSuffix:" "},setting:{title:"Custom Table",selectAll:"Select All",unSelectAll:"Deselect All",selectAllTip:"Please select the columns to display in the table.",sizeSmall:"Small",sizeNormal:"Normal",selectCount:"Selected fields ({count})",reset:"Reset",fixToLeft:"Fixed on the left",fixToRight:"Fixed on the right",unFixed:"Not fixed",delete:"Delete"},paragraphEllipsis:{copy:"Copy",copySuccess:"Copied successfully"}},apUpload:{update:"Upload",pictureType:"Image type",videoType:"Video type",audioType:"Audio type",documentType:"Document type",allTypes:"All types",networkAnomaly:"Network abnormality",FailedToObtainOssTemporaryPermissions:"Failed to obtain temporary OSS permissions",pleasePass:"Please pass in",supportExtension:"Support extensions",uploadFile:"Upload files",fileInitializationException:"If the initial number of initialized files exceeds {maxCount}, subsequent uploaded files will be out of sync with the data",maxUploadFiles:"Upload a maximum of {maxCount} files",maxUploadPicture:"Upload a maximum of {maxCount} images",maxUploadFileSize:"The file size does not exceed {maxSize}MB",maxWarnUploadFileSize:"The file size is smaller than {maxSize}MB",maxUploadPictureSize:"The image size is smaller than {maxSize}MB",fileFormatNotSupported:"Files in this format are not supported",pictureFormatNotSupported:"Images in this format are not supported",imageParsingFailed:"Image parsing failed",clickOrDragUpload:"Click or drag the file",foldersNotSupported:"Do not support uploading folders"},apExportGroup:{exportError:"Export error",exportSelected:"Export selected",exportAll:"Export all",export:"Export Excel",exportSuccess:"The task has been submitted,please go to the download center to check the progress"},apBatchAction:{selected:"Selected",piecesOfData:"Pieces of data",empty:"Empty"},apApBatchActionGroup:{batchOperation:"Batch operation"},workOrderModal:{createTickets:"Create ticket",submit:"Confirm",cancel:"Cancel",ticketsTitle:"Ticket Title",noEmpty:"No empty",pleaseEntry:"please enter （Within 300 words）",ticketsType:"Ticket Type",ticketsDetail:"Ticket Detail",ticketsLevel:"Priority",operationSuccess:"operate successfully",fileSizeMax:"Single file size limit",fileCountMax:"Limit the number to {x} at a time",fileLabel:"File Upload"},apTableModal:{titleSuffixOne:"You can add up to {maxCount},",titleSuffixTwo:"Added",titleSuffixThree:"",messageMaxCount:"You can select up to {maxCount} data entries",clear:"Clear",selected:"Selected"},apAttachment:{downloadall:"Download All",more:"More"},apSizeInput:{length:"Length",width:"Width",height:"Height"},apExpandAlert:{expand:"Expand",collapse:"Collapse"},apAppendix:{downloadAll:"Download All",downloadFile:"Download file",appendix:"Appendix"},apGroupSearch:{defaultPlaceholder:"Please input",close:"Close",clear:"Clear",confirm:"Confirm",tokenSeparatorsPlaceholder:"A maximum of 200 entries can be entered in batches, separated by commas and newlines"},batchInputGroup:{popoverInputPlaceholder:"A maximum of 200 entries can be entered in batches, separated by newlines"},apSummary:{total:"Total"},...e}};exports.default=t;

package/lib/src/locale/lang/zh-cn.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e={name:"zh-cn",ap:{common:{okText:"确认",cancelText:"取消",resetText:"重置",queryText:"查询",expandText:"展开",closeText:"收起",inputText:"请输入",chooseText:"请选择",redo:"刷新",back:"返回",more:"更多",all:"全部"},field:{startDateText:"开始日期",endDateText:"结束日期",today:"今天",yesterday:"昨天",thisWeek:"本周",lastWeek:"上周",thisMonth:"本月",lastMonth:"上月",thisYear:"今年",lastYear:"去年",lastXDays:"近{day}天"},modal:{restore:"还原",maximize:"最大化",close:"关闭"},countdown:{normalText:"获取验证码",sendText:"{sec}秒后重新获取"},apForm:{search:{search:"查询",reset:"重置"}},apTable:{pagination:{totalLeftPrefix:"共",totalLeftSuffix:"条记录",totalRightPrefix:"第",totalRightSuffix:"页"},setting:{title:"自定义表格",selectAll:"全选",unSelectAll:"取消全选",selectAllTip:"请选择需要展示在表格的字段",sizeSmall:"紧凑",sizeNormal:"正常",selectCount:"已选字段({count})",reset:"重置",fixToLeft:"固定在左侧",fixToRight:"固定在右侧",unFixed:"不固定",delete:"删除"},paragraphEllipsis:{copy:"复制",copySuccess:"复制成功"}},apUpload:{update:"上传",pictureType:"图片类型",videoType:"视频类型",audioType:"音频类型",documentType:"文档类型",allTypes:"全部类型",networkAnomaly:"网络异常",FailedToObtainOssTemporaryPermissions:"获取oss临时权限失败",pleasePass:"请传入",supportExtension:"支持扩展名",uploadFile:"上传文件",fileInitializationException:"文件初始化个数超过{maxCount}个,后续上传的文件会与数据不同步",maxUploadFiles:"最多上传{maxCount}个文件",maxUploadPicture:"最多上传{maxCount}张图片",maxUploadFileSize:"文件大小不超过{maxSize}MB",maxWarnUploadFileSize:"文件大小小于{maxSize}MB",maxUploadPictureSize:"图片大小小于{maxSize}MB",fileFormatNotSupported:"不支持该格式的文件",pictureFormatNotSupported:"不支持该格式的图片",imageParsingFailed:"图片解析失败",clickOrDragUpload:"点击或将文件拖拽到这里上传",foldersNotSupported:"不支持上传文件夹"},apExportGroup:{exportError:"导出失败",exportSelected:"导出所选",exportAll:"导出全部",export:"导出Excel",exportSuccess:"任务已提交,前往下载中心查看进度"},apBatchAction:{selected:"已选",piecesOfData:"条数据",empty:"清空"},apApBatchActionGroup:{batchOperation:"批量操作"},workOrderModal:{createTickets:"创建工单",submit:"确定",cancel:"取消",ticketsTitle:"工单标题",noEmpty:"不可为空",pleaseEntry:"请输入（300字以内）",ticketsType:"工单类型",ticketsDetail:"工单详情",ticketsLevel:"优先级",operationSuccess:"操作成功",fileSizeMax:"单个文件大小限制",fileCountMax:"单次数量限制 {x} 个",fileLabel:"上传附件"},apTableModal:{titleSuffixOne:"最多可添加{maxCount}个，",titleSuffixTwo:"已添加",titleSuffixThree:"个",messageMaxCount:"最多选择{maxCount}条数据",clear:"清空",selected:"已选"},apAttachment:{downloadall:"下载全部",more:"更多"},apSizeInput:{length:"长",width:"宽",height:"高"},apExpandAlert:{expand:"展开",collapse:"收起"},apAppendix:{downloadAll:"下载全部",downloadFile:"下载文件",appendix:"附件"},apGroupSearch:{defaultPlaceholder:"请输入",close:"关闭",clear:"清空",confirm:"确定",tokenSeparatorsPlaceholder:"支持批量输入，可用逗号、换行符号分隔，最多输入200条"},batchInputGroup:{popoverInputPlaceholder:"支持批量输入，可用换行符分隔，最多输入200条"},apSummary:{total:"合计"}}};exports.default=e;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vxe-table/es/locale/lang/zh-CN"),t={name:"zh-cn",ap:{common:{okText:"确认",cancelText:"取消",resetText:"重置",queryText:"查询",expandText:"展开",closeText:"收起",inputText:"请输入",chooseText:"请选择",redo:"刷新",back:"返回",more:"更多",all:"全部"},field:{startDateText:"开始日期",endDateText:"结束日期",today:"今天",yesterday:"昨天",thisWeek:"本周",lastWeek:"上周",thisMonth:"本月",lastMonth:"上月",thisYear:"今年",lastYear:"去年",lastXDays:"近{day}天"},modal:{restore:"还原",maximize:"最大化",close:"关闭"},countdown:{normalText:"获取验证码",sendText:"{sec}秒后重新获取"},apForm:{search:{search:"查询",reset:"重置"}},apTable:{pagination:{totalLeftPrefix:"共",totalLeftSuffix:"条记录",totalRightPrefix:"第",totalRightSuffix:"页"},setting:{title:"自定义表格",selectAll:"全选",unSelectAll:"取消全选",selectAllTip:"请选择需要展示在表格的字段",sizeSmall:"紧凑",sizeNormal:"正常",selectCount:"已选字段({count})",reset:"重置",fixToLeft:"固定在左侧",fixToRight:"固定在右侧",unFixed:"不固定",delete:"删除"},paragraphEllipsis:{copy:"复制",copySuccess:"复制成功"}},apUpload:{update:"上传",pictureType:"图片类型",videoType:"视频类型",audioType:"音频类型",documentType:"文档类型",allTypes:"全部类型",networkAnomaly:"网络异常",FailedToObtainOssTemporaryPermissions:"获取oss临时权限失败",pleasePass:"请传入",supportExtension:"支持扩展名",uploadFile:"上传文件",fileInitializationException:"文件初始化个数超过{maxCount}个,后续上传的文件会与数据不同步",maxUploadFiles:"最多上传{maxCount}个文件",maxUploadPicture:"最多上传{maxCount}张图片",maxUploadFileSize:"文件大小不超过{maxSize}MB",maxWarnUploadFileSize:"文件大小小于{maxSize}MB",maxUploadPictureSize:"图片大小小于{maxSize}MB",fileFormatNotSupported:"不支持该格式的文件",pictureFormatNotSupported:"不支持该格式的图片",imageParsingFailed:"图片解析失败",clickOrDragUpload:"点击或将文件拖拽到这里上传",foldersNotSupported:"不支持上传文件夹"},apExportGroup:{exportError:"导出失败",exportSelected:"导出所选",exportAll:"导出全部",export:"导出Excel",exportSuccess:"任务已提交,前往下载中心查看进度"},apBatchAction:{selected:"已选",piecesOfData:"条数据",empty:"清空"},apApBatchActionGroup:{batchOperation:"批量操作"},workOrderModal:{createTickets:"创建工单",submit:"确定",cancel:"取消",ticketsTitle:"工单标题",noEmpty:"不可为空",pleaseEntry:"请输入（300字以内）",ticketsType:"工单类型",ticketsDetail:"工单详情",ticketsLevel:"优先级",operationSuccess:"操作成功",fileSizeMax:"单个文件大小限制",fileCountMax:"单次数量限制 {x} 个",fileLabel:"上传附件"},apTableModal:{titleSuffixOne:"最多可添加{maxCount}个，",titleSuffixTwo:"已添加",titleSuffixThree:"个",messageMaxCount:"最多选择{maxCount}条数据",clear:"清空",selected:"已选"},apAttachment:{downloadall:"下载全部",more:"更多"},apSizeInput:{length:"长",width:"宽",height:"高"},apExpandAlert:{expand:"展开",collapse:"收起"},apAppendix:{downloadAll:"下载全部",downloadFile:"下载文件",appendix:"附件"},apGroupSearch:{defaultPlaceholder:"请输入",close:"关闭",clear:"清空",confirm:"确定",tokenSeparatorsPlaceholder:"支持批量输入，可用逗号、换行符号分隔，最多输入200条"},batchInputGroup:{popoverInputPlaceholder:"支持批量输入，可用换行符分隔，最多输入200条"},apSummary:{total:"合计"},...e}};exports.default=t;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "0.5.5",
+  "version": "0.5.7",
   "main": "./lib/index.js",
   "type": "module",
   "files": [
@@ -65,8 +65,8 @@
     "sortablejs": "^1.15.2",
     "vue-virtual-scroller": "2.0.0-beta.8",
     "vuedraggable": "^4.1.0",
-    "vxe-pc-ui": "^4.3.98",
-    "vxe-table": "4.11.14",
+    "vxe-pc-ui": "4.4.4",
+    "vxe-table": "4.11.18",
     "@aplus-frontend/hooks": "1.0.7",
     "@aplus-frontend/utils": "1.0.52"
   },

package/theme/antd-global-overwrite/aplus/field.css

@@ -0,0 +1,6 @@
+.ant-checkbox:not(.ant-checkbox-checked) .ant-checkbox-inner {
+  border-color: #d3d7de;
+}
+.ant-radio:not(.ant-radio-checked) .ant-radio-inner {
+  border-color: #d3d7de;
+}

package/theme/antd-global-overwrite/aplus/field.less

@@ -0,0 +1,7 @@
+.ant-checkbox:not(.ant-checkbox-checked) .ant-checkbox-inner {
+  border-color: #d3d7de;
+}
+
+.ant-radio:not(.ant-radio-checked) .ant-radio-inner {
+  border-color: #d3d7de;
+}

package/theme/antd-global-overwrite/aplus/index.css

@@ -872,3 +872,9 @@ div[class$='-basic-table-form-container ap-table--sticky'] form[class$='-basic-f
 [class*='-pro-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:has(.aplus-scroll-bar) ul.ant-pagination {
   padding-top: 8px;
 }
+.ant-checkbox:not(.ant-checkbox-checked) .ant-checkbox-inner {
+  border-color: #d3d7de;
+}
+.ant-radio:not(.ant-radio-checked) .ant-radio-inner {
+  border-color: #d3d7de;
+}

package/theme/antd-global-overwrite/aplus/index.less

@@ -6,3 +6,4 @@
 @import './pagination.less'; // 分页
 @import './steps.less'; // 步骤条
 @import './table.less'; // 表格
+@import './field.less'; // 输入类型控件

package/theme/ap-grid/index.css

@@ -300,7 +300,6 @@
 .aplus-ap-grid__table-wrapper-card {
   padding: 12px 16px 16px;
   background-color: #fff;
-  overflow: hidden;
 }
 .aplus-ap-grid-pagination {
   margin-top: 16px;

package/theme/ap-grid/index.less

@@ -67,7 +67,6 @@
   &__table-wrapper-card {
     padding: 12px 16px 16px;
     background-color: #fff;
-    overflow: hidden;
   }
   &-pagination {
     margin-top: 16px;

package/theme/index.css

@@ -2210,7 +2210,6 @@ div.aplus-ap-info-layout-admin__header-shadow.aplus-ap-info-layout-admin__sticky
 .aplus-ap-grid__table-wrapper-card {
   padding: 12px 16px 16px;
   background-color: #fff;
-  overflow: hidden;
 }
 .aplus-ap-grid-pagination {
   margin-top: 16px;

package/es/src/ap-grid/hooks/use-load-vxe.mjs

@@ -1,32 +0,0 @@
-import t from "vxe-pc-ui";
-import "vxe-table/lib/style.css";
-import "vxe-pc-ui/lib/style.css";
-import m from "vxe-table/lib/locale/lang/zh-CN";
-import _ from "vxe-table/lib/locale/lang/en-US";
-import { getCurrentInstance as s, watch as i, unref as c } from "vue";
-import "../../config-provider/index.mjs";
-import { useLocale as g } from "../../config-provider/hooks/use-locale.mjs";
-t.setI18n("zh-CN", m);
-t.setI18n("en-US", _);
-const u = {
-  "zh-cn": "zh-CN",
-  en: "en-US"
-}, x = () => {
-  var n;
-  const e = (n = s()) == null ? void 0 : n.appContext.app;
-  e && !e.__VXE_PC_UI_INSTALLED__ && (e.use(t), e.__VXE_PC_UI_INSTALLED__ = !0);
-  const { lang: r } = g();
-  i(
-    () => c(r),
-    (a) => {
-      const p = t.getLanguage(), o = u[a];
-      p !== o && t.setLanguage(o);
-    },
-    {
-      immediate: !0
-    }
-  );
-};
-export {
-  x as useLoadVxe
-};

package/lib/src/ap-grid/hooks/use-load-vxe.js

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("vxe-pc-ui");require("vxe-table/lib/style.css");require("vxe-pc-ui/lib/style.css");const c=require("vxe-table/lib/locale/lang/zh-CN"),i=require("vxe-table/lib/locale/lang/en-US"),t=require("vue");require("../../config-provider/index.js");const _=require("../../config-provider/hooks/use-locale.js");e.setI18n("zh-CN",c);e.setI18n("en-US",i);const g={"zh-cn":"zh-CN",en:"en-US"},L=()=>{var r;const n=(r=t.getCurrentInstance())==null?void 0:r.appContext.app;n&&!n.__VXE_PC_UI_INSTALLED__&&(n.use(e),n.__VXE_PC_UI_INSTALLED__=!0);const{lang:s}=_.useLocale();t.watch(()=>t.unref(s),a=>{const o=e.getLanguage(),u=g[a];o!==u&&e.setLanguage(u)},{immediate:!0})};exports.useLoadVxe=L;