@aplus-frontend/ui 0.6.0-beta.0 → 0.6.0-beta.2

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

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

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

@@ -19,7 +19,7 @@ export type ApGridColumnType<RecordType = any, ExtraValueType = 'text', ValueTyp
     /**
      * 在title之后展示一个icon并触发tooltip
      */
-    tooltip?: string;
+    tooltip?: string | ((column: ApGridColumnType<RecordType, ExtraValueType, ValueType, MergedValueType>) => VNode);
     /**
      * 是否可以复制
      */