@aplus-frontend/ui 0.0.7 → 0.0.8

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

@@ -1,10 +1,10 @@
-import { isVNode as J, defineComponent as K, useSlots as Q, ref as X, unref as o, shallowRef as v, computed as C, watch as P, cloneVNode as Y, createVNode as a, Fragment as Z, openBlock as k, createBlock as A, mergeProps as ee, withCtx as E, resolveDynamicComponent as te } from "vue";
-import { Flex as N, Space as oe, Button as y } from "ant-design-vue";
+import { isVNode as J, defineComponent as K, useSlots as Q, ref as X, unref as o, shallowRef as P, computed as C, watch as k, cloneVNode as Y, createVNode as a, Fragment as Z, openBlock as A, createBlock as E, mergeProps as ee, withCtx as N, resolveDynamicComponent as te } from "vue";
+import { Flex as T, Space as oe, Button as y } from "ant-design-vue";
 import "../ap-form.vue.mjs";
 import "../ap-form-item-group/index.vue2.mjs";
 import "../ap-form-item.vue2.mjs";
 import "../../hooks/index.mjs";
-import { genRealChildren as T } from "../ap-form-item-group/helper.mjs";
+import { genRealChildren as V } from "../ap-form-item-group/helper.mjs";
 import { DoubleRightOutlined as ae } from "@ant-design/icons-vue";
 import "../../config-provider/index.mjs";
 import "../style/search-form.css";
@@ -12,13 +12,13 @@ import { omit as le } from "lodash-unified";
 import { useControllableValue as ne } from "../../hooks/useControllableValue.mjs";
 import { useNamespace as re } from "../../config-provider/hooks/use-namespace.mjs";
 import { useLocale as se } from "../../config-provider/hooks/use-locale.mjs";
-import V from "../ap-form-item.vue.mjs";
+import I from "../ap-form-item.vue.mjs";
 import pe from "../ap-form.vue2.mjs";
 import ce from "../ap-form-item-group/index.vue.mjs";
 function ie(i) {
   return typeof i == "function" || Object.prototype.toString.call(i) === "[object Object]" && !J(i);
 }
-const c = 24, Pe = /* @__PURE__ */ K({
+const s = 24, Pe = /* @__PURE__ */ K({
   name: "ApFormSearchForm",
   __name: "index",
   props: {
@@ -98,106 +98,106 @@ const c = 24, Pe = /* @__PURE__ */ K({
   },
   emits: ["update:collapse"],
   setup(i, {
-    expose: I,
-    emit: j
+    expose: j,
+    emit: M
   }) {
     var S;
-    const l = Q(), t = i, M = j, {
-      value: f,
-      updateValue: O
-    } = ne(t, M, {
+    const l = Q(), t = i, O = M, {
+      value: u,
+      updateValue: $
+    } = ne(t, O, {
       valuePropName: "collapse",
       defaultValuePropName: "defaultCollapse"
     }), {
-      b: $
+      b: D
     } = re("ap-form-search-form"), {
       t: g
     } = se(), m = X();
-    function D() {
-      O(!o(f));
-    }
     function L() {
+      $(!o(u));
+    }
+    function q() {
       var e, n;
       (n = (e = m.value) == null ? void 0 : e.validateFields()) == null || n.then(t.onSubmit);
     }
-    function q() {
-      var e, n, d;
-      t.customReset || (n = (e = m.value) == null ? void 0 : e.resetFields) == null || n.call(e), (d = t.onReset) == null || d.call(t);
+    function z() {
+      var e, n, f;
+      t.customReset || (n = (e = m.value) == null ? void 0 : e.resetFields) == null || n.call(e), (f = t.onReset) == null || f.call(t);
     }
-    const R = v(T(l.default())), u = v((S = l.extra) == null ? void 0 : S.call(l)), F = C(() => Math.floor(c / t.countPerRow));
-    P(() => l.default(), (e) => {
-      R.value = T(e);
-    }), P(() => {
+    const R = P(V(l.default())), d = P((S = l.extra) == null ? void 0 : S.call(l)), F = C(() => Math.floor(s / t.countPerRow));
+    k(() => l.default(), (e) => {
+      R.value = V(e);
+    }), k(() => {
       var e;
       return (e = l.extra) == null ? void 0 : e.call(l);
     }, (e) => {
-      u.value = e;
+      d.value = e;
     });
-    const z = C(() => {
+    const U = C(() => {
       let e;
-      const n = [...o(R)], d = [], b = [], r = o(F);
+      const n = [...o(R)], f = [], b = [], r = o(F);
       let h = 0;
-      n.forEach((s) => {
-        const p = s.props;
-        p != null && p.hidden ? d.push(s) : (h += p.span || r, b.push(s));
+      n.forEach((p) => {
+        const c = p.props;
+        c != null && c.hidden ? f.push(p) : (h += c.span || r, b.push(p));
       });
-      const B = c - (h + r) % c, U = B < r ? c : B, x = c - r * (o(u) && !t.extraInAction ? 2 : 1), W = !t.forceExpand && h > x;
+      const B = s - (h + r) % s, w = B < r ? s : B, x = s - r * (o(d) && !t.extraInAction ? 2 : 1), W = !t.forceExpand && h > x;
       let _ = 0;
-      const G = b.map((s, p) => {
-        const w = s.props;
-        return _ += w.span || r, Y(s, {
-          span: w.span || r,
-          key: `ApFormSearchFormItem-${p}`,
-          hidden: !t.forceExpand && o(f) && _ > x
+      const G = b.map((p, c) => {
+        const v = p.props;
+        return _ += v.span || r, Y(p, {
+          span: v.span || r,
+          key: `ApFormSearchFormItem-${c}`,
+          hidden: !t.forceExpand && o(u) && _ > x
         });
-      }), H = c - Math.min(x, _) - r;
-      return a(Z, null, [G, d, a(V, {
+      }), H = s - Math.min(x, _) - r;
+      return a(Z, null, [G, f, a(I, {
         span: o(F)
       }, {
-        default: () => [a(N, {
+        default: () => [a(T, {
           justify: "space-between"
         }, {
           default: () => [a(oe, null, {
             default: () => [a(y, {
               type: "primary",
-              onClick: L,
+              onClick: q,
               loading: t.submitLoading
             }, {
               default: () => [t.searchText || g("ap.apForm.search.search")]
             }), a(y, {
-              onClick: q
+              onClick: z
             }, {
               default: () => [t.resetText || g("ap.apForm.search.reset")]
             }), W ? a(y, {
-              onClick: D,
+              onClick: L,
               icon: a(ae, {
                 style: "color:#B8C3D1",
-                rotate: o(f) ? 90 : -90
+                rotate: o(u) ? 90 : -90
               }, null)
             }, null) : null]
-          }), t.extraInAction ? o(u) : null]
+          }), t.extraInAction ? o(d) : null]
         })]
-      }), !t.extraInAction && o(u) ? a(V, {
-        span: o(f) ? H : U
+      }), !t.extraInAction && o(d) ? a(I, {
+        span: o(u) ? H : w
       }, {
-        default: () => [a(N, {
-          justify: "end"
-        }, ie(e = o(u)) ? e : {
+        default: () => [a(T, {
+          justify: !o(u) && w === s ? "start" : "end"
+        }, ie(e = o(d)) ? e : {
           default: () => [e]
         })]
       }) : null]);
     });
-    return I({
+    return j({
       apForm: C(() => o(m))
-    }), (e, n) => (k(), A(pe, ee({
-      class: o($)(),
+    }), (e, n) => (A(), E(pe, ee({
+      class: o(D)(),
       ref_key: "apForm",
       ref: m
     }, o(le)(t, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
-      default: E(() => [a(ce, {
+      default: N(() => [a(ce, {
         "count-per-row": t.countPerRow
       }, {
-        default: E(() => [(k(), A(te(z.value)))]),
+        default: N(() => [(A(), E(te(U.value)))]),
         _: 1
       }, 8, ["count-per-row"])]),
       _: 1

package/es/src/ap-table/ap-table.vue.d.ts

@@ -1,5 +1,5 @@
 import { ApTableProps } from './interface';
-import { DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType, CSSProperties } from 'vue';
+import { ComputedRef, DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType, CSSProperties } from 'vue';
 import { SpinSize } from 'ant-design-vue/es/spin/Spin';
 import { VueTypeValidableDef } from '../../node_modules/vue-types';
 import { GetRowKey } from 'ant-design-vue/es/vc-table/interface';
@@ -52,6 +52,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     reset: () => void;
     setSearchFormValues: typeof setSearchFormValues;
     getSearchFormValues: typeof getSearchFormValues;
+    dataSource: ComputedRef<any[]>;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApTableProps<any, any, "text">>, {
     bordered: boolean;
     childrenColumnName: string;

package/es/src/ap-table/ap-table.vue.mjs

@@ -1,13 +1,13 @@
-import { defineComponent as $, computed as u, createVNode as d, mergeProps as m, unref as l, watch as H, openBlock as p, createElementBlock as c, normalizeClass as h, normalizeStyle as T, withCtx as f, Fragment as G, renderList as x, createBlock as Q, resolveDynamicComponent as U, createCommentVNode as B, createElementVNode as P, renderSlot as I, createSlots as J, toDisplayString as X, normalizeProps as Y, guardReactiveProps as Z } from "vue";
+import { defineComponent as $, computed as d, createVNode as s, mergeProps as c, unref as r, watch as H, openBlock as p, createElementBlock as m, normalizeClass as h, normalizeStyle as x, withCtx as f, Fragment as G, renderList as B, createBlock as Q, resolveDynamicComponent as U, createCommentVNode as P, createElementVNode as I, renderSlot as v, createSlots as J, toDisplayString as X, normalizeProps as Y, guardReactiveProps as Z } from "vue";
 import { Typography as ee, Table as ae, Tooltip as te } from "ant-design-vue";
 import { ApForm as oe } from "../ap-form/index.mjs";
-import { apTableRenderItemMap as le, noRenderAsFormItemValueList as v, apTableFormItemMap as ne } from "./constants.mjs";
+import { apTableRenderItemMap as re, noRenderAsFormItemValueList as k, apTableFormItemMap as le } from "./constants.mjs";
 import "../config-provider/index.mjs";
-import { useTablePaging as re } from "./hooks/use-table-paging.mjs";
+import { useTablePaging as ne } from "./hooks/use-table-paging.mjs";
 import { isUndefined as de, omit as se } from "lodash-unified";
 import "./style/ap-table.css";
 import { QuestionCircleOutlined as ue } from "@ant-design/icons-vue";
-import { apColumnToColumn as pe, getTableRenderType as ie, getTableRenderProps as me, getColumnOrder as k, updateFormProps as ce, getFieldProps as fe, getPlaceholder as ge } from "./utils.mjs";
+import { apColumnToColumn as pe, getTableRenderType as ie, getTableRenderProps as ce, getColumnOrder as O, updateFormProps as me, getFieldProps as fe, getPlaceholder as ge } from "./utils.mjs";
 import { useLocale as ye } from "../config-provider/hooks/use-locale.mjs";
 import { useNamespace as be } from "../config-provider/hooks/use-namespace.mjs";
 import { useGlobalConfig as he } from "../config-provider/hooks/use-global-config.mjs";
@@ -122,92 +122,92 @@ const Ce = {
       default: "middle"
     }
   },
-  setup(O, {
-    expose: z
+  setup(z, {
+    expose: E
   }) {
-    const n = O, {
-      t: E
+    const l = z, {
+      t: L
     } = ye(), {
       e: C,
       b: g
-    } = be("ap-table"), L = he("uiMode"), y = u(() => {
+    } = be("ap-table"), V = he("uiMode"), y = d(() => {
       var t;
-      let e = ((t = n.columns) == null ? void 0 : t.filter((a) => !a.hideInTable)) || [];
+      let e = ((t = l.columns) == null ? void 0 : t.filter((a) => !a.hideInTable)) || [];
       return e = e.map((a) => ({
         ...pe(a),
         customRender({
           value: o,
-          ...r
+          ...n
         }) {
-          let s;
+          let u;
           if (a.customRender)
-            s = a.customRender({
+            u = a.customRender({
               value: o,
-              ...r,
+              ...n,
               column: a
             });
           else {
-            const w = ie(a), q = le[w], K = me(a, {
+            const T = ie(a), q = re[T], K = ce(a, {
               value: o,
-              ...r
+              ...n
             });
-            s = d(q, m(K, {
+            u = s(q, c(K, {
               mode: "read"
             }), null);
           }
-          return A(a, o, s);
+          return A(a, o, u);
         }
       })), e;
-    }), F = u(() => {
+    }), F = d(() => {
       var e, t, a;
-      return ((a = (t = (e = n.columns) == null ? void 0 : e.filter((o) => !o.hideInSearch && o.dataIndex && (o.valueType || o.customRenderFormItem) && !v.includes(o.valueType))) == null ? void 0 : t.sort((o, r) => {
-        let s = k(o.order);
-        return k(r.order) - s;
+      return ((a = (t = (e = l.columns) == null ? void 0 : e.filter((o) => !o.hideInSearch && o.dataIndex && (o.valueType || o.customRenderFormItem) && !k.includes(o.valueType))) == null ? void 0 : t.sort((o, n) => {
+        let u = O(o.order);
+        return O(n.order) - u;
       })) == null ? void 0 : a.map((o) => {
-        const r = ce(o, fe(o.fieldProps));
+        const n = me(o, fe(o.fieldProps));
         return {
           ...o,
           fieldProps: {
             label: o.title,
             name: o.dataIndex,
-            ...r || {},
+            ...n || {},
             // 格式化placeholder
-            placeholder: ge(E, o.valueType, r == null ? void 0 : r.placeholder)
+            placeholder: ge(L, o.valueType, n == null ? void 0 : n.placeholder)
           }
         };
       })) || [];
-    }), V = u(() => l(y).filter((e) => e.sorter === !0).map((e) => e.dataIndex)), N = u(() => l(y).filter((e) => e.filters && !e.onFilter).map((e) => e.dataIndex)), {
+    }), N = d(() => r(y).filter((e) => e.sorter === !0).map((e) => e.dataIndex)), D = d(() => r(y).filter((e) => e.filters && !e.onFilter).map((e) => e.dataIndex)), {
       formRef: b,
       submit: S,
       reset: R,
       tableProps: i,
-      handleTableChange: D,
-      data: j
-    } = re({
+      handleTableChange: j,
+      data: w
+    } = ne({
       async request(e) {
         var a, o;
-        const t = await ((a = n.request) == null ? void 0 : a.call(n, e));
-        return (o = n.onLoad) == null || o.call(n, (t == null ? void 0 : t.data) || []), {
+        const t = await ((a = l.request) == null ? void 0 : a.call(l, e));
+        return (o = l.onLoad) == null || o.call(l, (t == null ? void 0 : t.data) || []), {
           data: (t == null ? void 0 : t.data) || [],
           total: (t == null ? void 0 : t.total) || 0
         };
       },
-      filterFields: l(N),
-      sortFields: l(V),
-      defaultParams: n.params,
-      defaultData: n.defaultData,
-      manual: n.manual,
-      defaultCurrent: n.pagination ? n.pagination.defaultCurrent : void 0,
-      defaultPageSize: n.pagination ? n.pagination.defaultPageSize : void 0,
-      formatParams: n.beforeSearchSubmit
-    }), W = u(() => ({
-      ...n,
-      ...l(i),
-      loading: de(n.loading) ? l(i).loading : n.loading,
-      pagination: n.pagination === !1 ? !1 : l(i).pagination
+      filterFields: r(D),
+      sortFields: r(N),
+      defaultParams: l.params,
+      defaultData: l.defaultData,
+      manual: l.manual,
+      defaultCurrent: l.pagination ? l.pagination.defaultCurrent : void 0,
+      defaultPageSize: l.pagination ? l.pagination.defaultPageSize : void 0,
+      formatParams: l.beforeSearchSubmit
+    }), W = d(() => ({
+      ...l,
+      ...r(i),
+      loading: de(l.loading) ? r(i).loading : l.loading,
+      pagination: l.pagination === !1 ? !1 : r(i).pagination
     }));
     function A(e, t, a) {
-      return v.includes(e.valueType) ? a : e.copyable || e.ellipsis ? d(ee.Text, {
+      return k.includes(e.valueType) ? a : e.copyable || e.ellipsis ? s(ee.Text, {
         copyable: e.copyable ? {
           text: t,
           tooltip: !1
@@ -218,9 +218,9 @@ const Ce = {
         content: a
       }, null) : a;
     }
-    H(() => l(j).loading, (e) => {
+    H(() => r(w).loading, (e) => {
       var t;
-      (t = n.onLoadingChange) == null || t.call(n, e);
+      (t = l.onLoadingChange) == null || t.call(l, e);
     });
     function M(e) {
       var t, a, o;
@@ -230,60 +230,61 @@ const Ce = {
       var e, t, a;
       return (a = (t = (e = b.value) == null ? void 0 : e.apForm) == null ? void 0 : t.getFieldsValue) == null ? void 0 : a.call(t, !0);
     }
-    return z({
+    return E({
       submit: () => S(),
       reset: () => R(),
       setSearchFormValues: M,
-      getSearchFormValues: _
-    }), (e, t) => (p(), c("div", {
-      class: h(e.card ? null : l(g)("wrapper"))
-    }, [e.searchForm !== !1 && F.value.length > 0 ? (p(), c("div", {
+      getSearchFormValues: _,
+      dataSource: d(() => r(w).records)
+    }), (e, t) => (p(), m("div", {
+      class: h(e.card ? null : r(g)("wrapper"))
+    }, [e.searchForm !== !1 && F.value.length > 0 ? (p(), m("div", {
       key: 0,
-      class: h(e.card ? l(C)("search-wrapper") : null),
-      style: T(e.searchFormWrapperStyle)
-    }, [d(l(oe).SearchForm, m(e.searchForm || {}, {
+      class: h(e.card ? r(C)("search-wrapper") : null),
+      style: x(e.searchFormWrapperStyle)
+    }, [s(r(oe).SearchForm, c(e.searchForm || {}, {
       ref_key: "formRef",
       ref: b,
       "custom-reset": "",
-      onSubmit: l(S),
-      onReset: l(R),
-      "submit-loading": l(i).loading
+      onSubmit: r(S),
+      onReset: r(R),
+      "submit-loading": r(i).loading
     }), {
-      default: f(() => [(p(!0), c(G, null, x(F.value, (a) => (p(), Q(U(a.customRenderFormItem ? a.customRenderFormItem(a) : l(ne)[a.valueType || "text"]), m({
+      default: f(() => [(p(!0), m(G, null, B(F.value, (a) => (p(), Q(U(a.customRenderFormItem ? a.customRenderFormItem(a) : r(le)[a.valueType || "text"]), c({
         key: a.dataIndex,
         ref_for: !0
       }, a.fieldProps || {}, {
         span: a.span
       }), null, 16, ["span"]))), 128))]),
       _: 1
-    }, 16, ["onSubmit", "onReset", "submit-loading"])], 6)) : B("", !0), P("div", {
-      class: h(e.card ? l(C)("table-wrapper") : null),
-      style: T(e.tableWrapperStyle)
-    }, [I(e.$slots, "title"), d(l(ae), m({
-      class: l(L) === "admin" ? l(g)("table-admin") : l(g)("table")
+    }, 16, ["onSubmit", "onReset", "submit-loading"])], 6)) : P("", !0), I("div", {
+      class: h(e.card ? r(C)("table-wrapper") : null),
+      style: x(e.tableWrapperStyle)
+    }, [v(e.$slots, "title"), s(r(ae), c({
+      class: r(V) === "admin" ? r(g)("table-admin") : r(g)("table")
     }, W.value, {
-      onChange: l(D),
+      onChange: r(j),
       columns: y.value
     }), J({
       headerCell: f(({
         column: a,
         title: o
-      }) => [a.tooltip ? (p(), c("span", Ce, [P("span", null, X(o), 1), d(l(te), {
+      }) => [a.tooltip ? (p(), m("span", Ce, [I("span", null, X(o), 1), s(r(te), {
         title: a.tooltip,
         placement: "bottom"
       }, {
-        default: f(() => [d(l(ue), {
+        default: f(() => [s(r(ue), {
           style: {
             color: "#0070ff",
             "padding-left": "4px"
           }
         })]),
         _: 2
-      }, 1032, ["title"])])) : B("", !0)]),
+      }, 1032, ["title"])])) : P("", !0)]),
       _: 2
-    }, [x(l(se)(e.$slots, "title"), (a, o) => ({
+    }, [B(r(se)(e.$slots, "title"), (a, o) => ({
       name: o,
-      fn: f((r) => [I(e.$slots, o, Y(Z(r || {})))])
+      fn: f((n) => [v(e.$slots, o, Y(Z(n || {})))])
     }))]), 1040, ["class", "onChange", "columns"])], 6)], 2));
   }
 });