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

package/es/src/ap-form/items/tree-select/index.vue.mjs

@@ -1,4 +1,4 @@
-import { defineComponent as B, ref as x, useSlots as S, computed as g, createBlock as k, openBlock as F, normalizeProps as n, guardReactiveProps as i, unref as l, createSlots as u, withCtx as p, createVNode as C, mergeProps as P, renderList as m, renderSlot as c } from "vue";
+import { defineComponent as B, ref as x, useSlots as S, computed as g, createBlock as k, openBlock as F, normalizeProps as n, guardReactiveProps as i, unref as l, createSlots as u, withCtx as p, createVNode as C, mergeProps as P, renderList as c, renderSlot as m } from "vue";
 import "../../item/index.vue2.mjs";
 import "../../../ap-field/index.mjs";
 import { isUndefined as q, omit as b, pick as $ } from "lodash-unified";
@@ -48,6 +48,7 @@ const E = /* @__PURE__ */ B({
     initialValue: {},
     _signal: {},
     transform: {},
+    description: {},
     field: { default: () => ({}) },
     placeholder: {},
     disabled: { type: Boolean, default: void 0 }
@@ -83,20 +84,20 @@ const E = /* @__PURE__ */ B({
           ref_key: "treeSelectRef",
           ref: a
         }), u({ _: 2 }, [
-          m(l(b)(f, l(_)), (d, t) => ({
+          c(l(b)(f, l(_)), (d, t) => ({
             name: t,
             fn: p((s) => [
-              c(e.$slots, t, n(i(s || {})))
+              m(e.$slots, t, n(i(s || {})))
             ])
           }))
         ]), 1040)
       ]),
       _: 2
     }, [
-      m(l($)(f, l(_)), (d, t) => ({
+      c(l($)(f, l(_)), (d, t) => ({
         name: t,
         fn: p((s) => [
-          c(e.$slots, t, n(i(s || {})))
+          m(e.$slots, t, n(i(s || {})))
         ])
       }))
     ]), 1040));

package/es/src/ap-form/render/item.vue.mjs

@@ -43,11 +43,12 @@ const S = /* @__PURE__ */ m({
     valuePropName: { default: "value" },
     initialValue: {},
     _signal: {},
-    transform: {}
+    transform: {},
+    description: {}
   },
   setup(d) {
-    const u = d, i = c();
-    return (a, h) => (v(), B(e(p).FormItem, o(l(u)), y({
+    const i = d, u = c();
+    return (a, h) => (v(), B(e(p).FormItem, o(l(i)), y({
       default: t(() => [
         x(e(p).ControlRender, null, {
           default: t((r) => [
@@ -58,7 +59,7 @@ const S = /* @__PURE__ */ m({
       ]),
       _: 2
     }, [
-      _(e(g)(i, "default"), (r, n) => ({
+      _(e(g)(u, "default"), (r, n) => ({
         name: n,
         fn: t((f) => [
           s(a.$slots, n, o(l(f || {})))

package/es/src/ap-form/search-form/components/popover-filter.vue2.mjs

@@ -1,5 +1,5 @@
-import { defineComponent as y, ref as k, createBlock as s, openBlock as p, unref as e, withCtx as o, createVNode as t, createElementVNode as d, normalizeClass as c, createElementBlock as C, Fragment as F, renderList as _, resolveDynamicComponent as b, createTextVNode as f, toDisplayString as v } from "vue";
-import { Popover as B, Tooltip as h, Button as u, Row as x, Col as L, Divider as N, Flex as S } from "@aplus-frontend/antdv";
+import { defineComponent as y, ref as k, createBlock as s, openBlock as l, unref as e, withCtx as o, createVNode as t, createElementVNode as d, normalizeClass as c, createElementBlock as C, Fragment as F, renderList as _, resolveDynamicComponent as b, createTextVNode as f, toDisplayString as v } from "vue";
+import { Popover as B, Tooltip as x, Button as u, Row as h, Col as L, Divider as N, Flex as S } from "@aplus-frontend/antdv";
 import { IconApFilterOutlined as w } from "@aplus-frontend/icon";
 import "../../../config-provider/index.mjs";
 import { useNamespace as D } from "../../../config-provider/hooks/use-namespace.mjs";
@@ -17,9 +17,9 @@ const O = /* @__PURE__ */ y({
     function g(n) {
       return n.closest(".ant-form") || document.body;
     }
-    return (n, l) => (p(), s(e(B), {
+    return (n, p) => (l(), s(e(B), {
       open: m.value,
-      "onUpdate:open": l[1] || (l[1] = (r) => m.value = r),
+      "onUpdate:open": p[1] || (p[1] = (r) => m.value = r),
       "overlay-class-name": e(a)("popover"),
       trigger: "click",
       placement: "bottom",
@@ -30,16 +30,16 @@ const O = /* @__PURE__ */ y({
       content: o(() => [
         d("div", {
           class: c([e(a)("popover-content")]),
-          style: { paddingBottom: 0, width: "825px" }
+          style: { paddingBottom: "4px", width: "825px" }
         }, [
-          t(e(x), { gutter: 16 }, {
+          t(e(h), { gutter: 16 }, {
             default: o(() => [
-              (p(!0), C(F, null, _(n.config, (r) => (p(), s(e(L), {
+              (l(!0), C(F, null, _(n.config, (r) => (l(), s(e(L), {
                 key: r.key,
                 span: 8
               }, {
                 default: o(() => [
-                  (p(), s(b(r.node)))
+                  (l(), s(b(r.node)))
                 ]),
                 _: 2
               }, 1024))), 128))
@@ -54,7 +54,7 @@ const O = /* @__PURE__ */ y({
           t(e(S), { justify: "end" }, {
             default: o(() => [
               t(e(u), {
-                onClick: l[0] || (l[0] = (r) => m.value = !1)
+                onClick: p[0] || (p[0] = (r) => m.value = !1)
               }, {
                 default: o(() => [
                   f(v(e(i)("ap.common.cancelText")), 1)
@@ -78,7 +78,7 @@ const O = /* @__PURE__ */ y({
         ], 2)
       ]),
       default: o(() => [
-        t(e(h), {
+        t(e(x), {
           title: e(i)("ap.apForm.search.moreFilter"),
           placement: "top"
         }, {

package/es/src/ap-form/search-form/components/popover-sorter/sortable-item.vue2.mjs

@@ -1,24 +1,24 @@
-import { defineComponent as a, computed as i, createElementBlock as c, openBlock as d, normalizeClass as r, unref as t, createElementVNode as l, createVNode as u, toDisplayString as f } from "vue";
+import { defineComponent as c, computed as n, createElementBlock as a, openBlock as d, normalizeClass as r, unref as t, createElementVNode as l, createVNode as u, toDisplayString as f } from "vue";
 import { HolderOutlined as h } from "@ant-design/icons-vue";
 import "../../../../config-provider/index.mjs";
 import { isBoolean as _ } from "lodash-unified";
 import { isDef as v } from "@fruits-chain/utils";
 import { useNamespace as b } from "../../../../config-provider/hooks/use-namespace.mjs";
-const x = ["title"], C = /* @__PURE__ */ a({
+const x = ["title"], C = /* @__PURE__ */ c({
   name: "ApFormSearchFormPopoverSorterItem",
   __name: "sortable-item",
   props: {
     item: {}
   },
   setup(m) {
-    const s = m, n = i(() => {
+    const s = m, i = n(() => {
       const e = s.item.props;
-      return e.label || e.placeholder;
-    }), p = i(() => {
+      return e.description || e.label || e.placeholder;
+    }), p = n(() => {
       const e = s.item.props;
       return _(e.hidden) ? !!e.hidden : v(e.hidden);
     }), { b: o } = b("search-form-sorter");
-    return (e, B) => (d(), c("div", {
+    return (e, B) => (d(), a("div", {
       class: r([t(o)("sorter-item"), { [t(o)("sorter-item--hidden")]: p.value }])
     }, [
       l("div", null, [
@@ -28,8 +28,8 @@ const x = ["title"], C = /* @__PURE__ */ a({
         }, null, 8, ["class"]),
         l("span", {
           class: r(t(o)("sorter-item-text")),
-          title: n.value
-        }, f(n.value), 11, x)
+          title: i.value
+        }, f(i.value), 11, x)
       ])
     ], 2));
   }

package/es/src/ap-form/search-form/index.vue.mjs

@@ -4,7 +4,7 @@ import "../ap-form.vue.mjs";
 import "../item/index.vue2.mjs";
 import { genRealChildren as V } from "../item-group/helper.mjs";
 import "../../config-provider/index.mjs";
-import { isArray as ie, isBoolean as ce, omit as ue } from "lodash-unified";
+import { isArray as ie, isBoolean as ue, omit as ce } from "lodash-unified";
 import { isDef as M } from "../../utils/index.mjs";
 import { execFunc as W, diffFormItem as pe } from "./utils.mjs";
 import "./components/popover-filter.vue.mjs";
@@ -113,15 +113,16 @@ const s = 24, Le = /* @__PURE__ */ te({
   setup(f, {
     expose: q
   }) {
-    var P;
+    var E;
     const i = oe(), o = f, {
       b: m
     } = fe("ap-form-search-form"), {
       t: N
     } = me(), z = de(o), y = ae();
     function k() {
-      var e, a;
-      (a = (e = y.value) == null ? void 0 : e.validateFields()) == null || a.then((l) => W(o.onSubmit, l));
+      var a;
+      const e = (a = y.value) == null ? void 0 : a.getFieldsValueTransformed(!0);
+      W(o.onSubmit, e);
     }
     function H() {
       var e, a;
@@ -129,22 +130,22 @@ const s = 24, Le = /* @__PURE__ */ te({
     }
     const G = (e) => M(e) ? (ie(e) ? e : [e]).join("") : Date.now();
     let I = [];
-    const c = j(V(i.default())), u = j((P = i.extra) == null ? void 0 : P.call(i)), E = _(() => Math.floor(s / n(z)));
+    const u = j(V(i.default())), c = j((E = i.extra) == null ? void 0 : E.call(i)), T = _(() => Math.floor(s / n(z)));
     L(() => i.default(), (e) => {
-      I = c.value, c.value = pe(I, V(e));
+      I = u.value, u.value = pe(I, V(e));
     }), L(() => {
       var e;
       return (e = i.extra) == null ? void 0 : e.call(i);
     }, (e) => {
-      u.value = e;
+      c.value = e;
     });
-    const r = _(() => {
-      const e = c.value, a = [], l = [], g = [], h = n(E);
+    const l = _(() => {
+      const e = u.value, a = [], r = [], g = [], h = n(T);
       let v = 0, b = 0;
-      const Q = s * o.maxRows - h * (n(u) && !o.extraInAction ? 2 : 1);
+      const Q = s * o.maxRows - h * (n(c) && !o.extraInAction ? 2 : 1);
       e.forEach((S, Z) => {
         const p = S.props;
-        if (ce(p.hidden) ? !!p.hidden : M(p.hidden))
+        if (ue(p.hidden) ? !!p.hidden : M(p.hidden))
           a.push(S);
         else {
           let C = p.span || h;
@@ -153,31 +154,31 @@ const s = 24, Le = /* @__PURE__ */ te({
             span: C,
             key: `ApFormSearchFormItem-${Z}-${G(p.name)}-${p._signal}`
           }, $ = s - v % s;
-          $ < C && (C += $), v += C, v > Q ? l.push(O) : (b = v, g.push(O));
+          $ < C && (C += $), v += C, v > Q ? r.push(O) : (b = v, g.push(O));
         }
       });
-      const T = s - (b + h) % s, X = b % s < h, Y = T < h ? s : T;
+      const P = s - (b + h) % s, X = b % s < h, Y = P < h ? s : P;
       return {
         hideNode: t(w, null, [a]),
         nodes: g,
-        collapseNodes: l,
+        collapseNodes: r,
         extraSpan: Y,
         lastRowOnlyIncludeActionAndExtra: X
       };
     });
     function J(e) {
-      c.value = [...e];
+      u.value = [...e];
     }
     const K = _(() => {
       let e;
       const a = t(R, {
-        span: n(E),
+        span: n(T),
         key: "actionWrapper"
       }, {
         default: () => [t(D, null, {
           default: () => [t(B, {
             wrap: "wrap",
-            justify: r.value.lastRowOnlyIncludeActionAndExtra && !(n(u) && o.extraInAction) ? "flex-end" : "space-between"
+            justify: l.value.lastRowOnlyIncludeActionAndExtra && !(n(c) && o.extraInAction) ? "flex-end" : "space-between"
           }, {
             default: () => [t(B, {
               gap: 8,
@@ -185,12 +186,12 @@ const s = 24, Le = /* @__PURE__ */ te({
             }, {
               default: () => [t("div", {
                 class: m("column-setting-trigger-wrapper")
-              }, [r.value.collapseNodes.length ? t(he, {
+              }, [l.value.collapseNodes.length ? t(he, {
                 onSubmit: k,
-                config: r.value.collapseNodes,
+                config: l.value.collapseNodes,
                 submitLoading: o.submitLoading
-              }, null) : null, o.sortable && c.value.length ? t(xe, {
-                children: c.value,
+              }, null) : null, o.sortable && u.value.length ? t(xe, {
+                children: u.value,
                 onClickConfirm: J
               }, null) : null]), t(U, {
                 type: "primary",
@@ -207,24 +208,24 @@ const s = 24, Le = /* @__PURE__ */ te({
               }, {
                 default: () => [o.resetText || N("ap.apForm.search.reset")]
               })]
-            }), o.extraInAction ? n(u) : null]
+            }), o.extraInAction ? n(c) : null]
           })]
         })]
-      }), l = !o.extraInAction && n(u) ? t(R, {
-        span: r.value.extraSpan,
+      }), r = !o.extraInAction && n(c) ? t(R, {
+        span: l.value.extraSpan,
         key: "extraNode"
       }, {
         default: () => [t(D, null, {
           default: () => [t(B, {
-            justify: r.value.extraSpan === s || r.value.lastRowOnlyIncludeActionAndExtra ? "start" : "flex-end"
-          }, ge(e = n(u)) ? e : {
+            justify: l.value.extraSpan === s || l.value.lastRowOnlyIncludeActionAndExtra ? "start" : "flex-end"
+          }, ge(e = n(c)) ? e : {
             default: () => [e]
           })]
         })]
       }) : null, g = t(R, {
-        span: r.value.extraSpan
+        span: l.value.extraSpan
       }, null);
-      return r.value.lastRowOnlyIncludeActionAndExtra ? t(w, null, [l || g, a]) : t(w, null, [a, l]);
+      return l.value.lastRowOnlyIncludeActionAndExtra ? t(w, null, [r || g, a]) : t(w, null, [a, r]);
     });
     return q({
       apForm: _(() => n(y))
@@ -232,15 +233,15 @@ const s = 24, Le = /* @__PURE__ */ te({
       ref_key: "apForm",
       ref: y,
       class: n(m)()
-    }, n(ue)(o, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
-      default: F(() => [(d(), x(A(r.value.hideNode))), t(n(se), {
+    }, n(ce)(o, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
+      default: F(() => [(d(), x(A(l.value.hideNode))), t(n(se), {
         gutter: 16
       }, {
-        default: F(() => [(d(!0), le(w, null, re(r.value.nodes, (l) => (d(), x(n(R), {
-          key: l.key,
-          span: l.span
+        default: F(() => [(d(!0), le(w, null, re(l.value.nodes, (r) => (d(), x(n(R), {
+          key: r.key,
+          span: r.span
         }, {
-          default: F(() => [(d(), x(A(l.node)))]),
+          default: F(() => [(d(), x(A(r.node)))]),
           _: 2
         }, 1032, ["span"]))), 128)), (d(), x(A(K.value)))]),
         _: 1

package/es/src/ap-grid/editable/form-item.vue.mjs

@@ -122,7 +122,7 @@ const ye = /* @__PURE__ */ P({
     tableWrapperStyle: {},
     wrapperStyle: {},
     size: {
-      default: "medium"
+      default: "mini"
     },
     adaptive: {
       type: Boolean,

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

@@ -123,7 +123,7 @@ const be = /* @__PURE__ */ U({
     tableWrapperStyle: {},
     wrapperStyle: {},
     size: {
-      default: "medium"
+      default: "mini"
     },
     adaptive: {
       type: Boolean,

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

@@ -101,7 +101,7 @@ const Bo = /* @__PURE__ */ ke({
     tableWrapperStyle: {},
     wrapperStyle: {},
     manual: { type: Boolean, default: !1 },
-    size: { default: void 0 },
+    size: { default: "mini" },
     adaptive: { type: Boolean, default: !1 },
     columnResizable: { type: [Boolean, Object], default: !1 },
     rowKey: { default: "key" },
@@ -114,11 +114,11 @@ const Bo = /* @__PURE__ */ ke({
     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 { e: E, b: c, be: le } = Je("ap-grid"), ne = Qe("valueTypeMap"), i = k([]), $ = k([]), m = k(), C = k(a.size), [, d] = Xe(), { t: se } = Ye();
     Z.setConfig({
       i18n: (e, r) => se(`ap.${e}`, r)
     });
-    const { renderConfig: de, updateSignal: ie } = Ge(d);
+    const { renderConfig: ie, updateSignal: de } = Ge(i);
     let K = 0;
     const ce = n(() => {
       if (m.value)
@@ -156,10 +156,10 @@ const Bo = /* @__PURE__ */ ke({
       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)), {
@@ -197,19 +197,19 @@ const Bo = /* @__PURE__ */ ke({
       pagination: a.pagination
     }), { sortChangeEvent: ge, filterChangeEvent: he, paginationChangeEvent: ve } = Oe(fe);
     He({
-      columns: n(() => d.value),
+      columns: n(() => i.value),
       columnsBackup: n(() => $.value),
       size: n(() => C.value ? qe[C.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];
       },
       renderConfig: n(() => ({
         className: le("table-header", "title"),
-        color: i.value.colorPrimary
+        color: d.value.colorPrimary
       })),
       dataSource: n(() => o(f).records),
       getSearchFormValues: U,
@@ -218,7 +218,7 @@ const Bo = /* @__PURE__ */ ke({
       reset: T
     });
     const Ce = n(
-      () => d.value.some(
+      () => i.value.some(
         (e) => e.fixed === "left" || e.fixed === !0
       ) ? "left" : void 0
     ), ye = n(
@@ -268,7 +268,7 @@ const Bo = /* @__PURE__ */ ke({
       () => {
         var r;
         const e = xe();
-        d.value = e, (r = a.onShownColumnsChange) == null || r.call(a, e), $.value = e;
+        i.value = e, (r = a.onShownColumnsChange) == null || r.call(a, e), $.value = e;
       },
       {
         deep: !0,
@@ -297,7 +297,7 @@ const Bo = /* @__PURE__ */ ke({
       refresh: pe,
       setSearchFormValues: q,
       getSearchFormValues: U,
-      getShowColumns: () => o(d),
+      getShowColumns: () => o(i),
       rowSelection: {
         selectedRows: n(() => x.value),
         clearAll: _
@@ -352,7 +352,7 @@ const Bo = /* @__PURE__ */ ke({
           D(e.$slots, "title", {
             selectedRows: o(x),
             selectedRowKeys: o(R).selectedRowKeys,
-            shownColumns: d.value,
+            shownColumns: i.value,
             clearAll: _
           })
         ], 2),
@@ -362,23 +362,24 @@ const Bo = /* @__PURE__ */ ke({
           (s(), p(o(Pe), h(o($e)(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,
             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),
@@ -400,8 +401,8 @@ const Bo = /* @__PURE__ */ ke({
                 ]),
                 _: 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), {
+              a.rowSelection ? (s(), p(o(Y), h({ key: 1 }, o(We)(o(R), i.value), { field: o(Ue) }), null, 16, ["field"])) : S("", !0),
+              (s(!0), F(Q, null, V(o(ie), (l) => (s(), p(L(l), {
                 key: l.props.colId
               }))), 128))
             ]),

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);
     /**
      * 是否可以复制
      */