@aplus-frontend/ui 0.5.35 → 0.5.37

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

@@ -1,13 +1,13 @@
-import { defineComponent as H, ref as J, unref as t, computed as d, watch as Q, createBlock as S, openBlock as i, normalizeClass as u, withCtx as f, createElementVNode as X, normalizeStyle as h, renderSlot as l, createElementBlock as p, createCommentVNode as Y, createVNode as v, Fragment as I, renderList as Z, mergeProps as _ } from "vue";
-import { Empty as E, Spin as x, Pagination as ee } from "@aplus-frontend/antdv";
-import { useTablePaging as te } from "../ap-table/hooks/use-table-paging-ng.mjs";
+import { defineComponent as X, ref as Y, unref as e, computed as p, watch as Z, createElementBlock as s, openBlock as i, normalizeStyle as v, normalizeClass as l, renderSlot as u, createElementVNode as _, createCommentVNode as I, createVNode as g, Fragment as E, createBlock as O, withCtx as h, renderList as x, mergeProps as ee } from "vue";
+import { Empty as V, Spin as te, Pagination as ae } from "@aplus-frontend/antdv";
+import { useTablePaging as ne } from "../ap-table/hooks/use-table-paging-ng.mjs";
 import "../config-provider/index.mjs";
-import { isUndefined as O, isNumber as ae, omit as ne } from "lodash-unified";
-import { useOfflineList as re } from "./hooks/use-offline-list.mjs";
+import { isUndefined as F, isNumber as re, omit as oe } from "lodash-unified";
+import { useOfflineList as ie } from "./hooks/use-offline-list.mjs";
 import "vue-virtual-scroller/dist/vue-virtual-scroller.css";
-import { RecycleScroller as oe, DynamicScroller as ie, DynamicScrollerItem as le } from "vue-virtual-scroller";
-import { useNamespace as se } from "../config-provider/hooks/use-namespace.mjs";
-const he = /* @__PURE__ */ H({
+import { RecycleScroller as le, DynamicScroller as se, DynamicScrollerItem as ue } from "vue-virtual-scroller";
+import { useNamespace as ce } from "../config-provider/hooks/use-namespace.mjs";
+const be = /* @__PURE__ */ X({
   __name: "index",
   props: {
     dataSource: {},
@@ -24,22 +24,23 @@ const he = /* @__PURE__ */ H({
     contentStyle: { type: [Boolean, null, String, Object, Array] },
     footerWarpperStyle: { type: [Boolean, null, String, Object, Array] },
     virtual: { default: void 0 },
-    rowKey: {}
+    rowKey: {},
+    adaptive: { type: Boolean, default: !1 }
   },
-  setup(V, { expose: F }) {
-    const L = E.PRESENTED_IMAGE_SIMPLE, n = V, { b: m, e: N } = se("ap-list"), b = J(), {
+  setup(L, { expose: N }) {
+    const R = V.PRESENTED_IMAGE_SIMPLE, n = L, { b: m, e: y, bm: T, m: $ } = ce("ap-list"), b = Y(), {
       formRef: k,
-      submit: D,
-      reset: w,
-      handleTableChange: R,
-      data: g,
-      refresh: T,
-      refreshByDelete: $,
-      tableProps: z
-    } = te({
-      async request(e) {
+      submit: w,
+      reset: B,
+      handleTableChange: j,
+      data: S,
+      refresh: q,
+      refreshByDelete: A,
+      tableProps: D
+    } = ne({
+      async request(t) {
         var r;
-        const a = await ((r = n.request) == null ? void 0 : r.call(n, e));
+        const a = await ((r = n.request) == null ? void 0 : r.call(n, t));
         return {
           data: (a == null ? void 0 : a.data) || [],
           total: (a == null ? void 0 : a.total) || 0
@@ -50,143 +51,149 @@ const he = /* @__PURE__ */ H({
       manual: n.manual,
       pagination: n.pagination,
       formatParams: n.beforeSearchSubmit
-    }), j = { form: k }, {
-      pagination: B,
-      dataSource: q,
-      onChange: A
-    } = re(n);
-    function K(e, a) {
-      if (t(c)) {
-        A(e, a);
+    }), K = { form: k }, {
+      pagination: z,
+      dataSource: M,
+      onChange: W
+    } = ie(n);
+    function G(t, a) {
+      if (e(f)) {
+        W(t, a);
         return;
       }
-      R(
-        { current: e, pageSize: a },
+      j(
+        { current: t, pageSize: a },
         {},
         {},
         { currentDataSource: [], action: "paginate" }
       );
     }
-    const s = d(() => t(c) ? t(q) : t(g).records), y = d(() => O(n.loading) ? t(g).loading : n.loading), M = d(() => {
-      var e, a;
-      return n.pagination === !1 || n.virtual ? !1 : ((e = n.pagination) == null ? void 0 : e.hideOnSinglePage) !== !0 ? !0 : t(c) ? (((a = n.dataSource) == null ? void 0 : a.length) || 0) > t(B).pageSize : t(g).total > t(z).pagination.pageSize;
-    }), c = d(() => !O(n.dataSource));
-    Q(
-      () => t(y),
-      (e) => {
+    const c = p(() => e(f) ? e(M) : e(S).records), d = p(() => F(n.loading) ? e(S).loading : n.loading), U = p(() => {
+      var t, a;
+      return n.pagination === !1 || n.virtual ? !1 : ((t = n.pagination) == null ? void 0 : t.hideOnSinglePage) !== !0 ? !0 : e(f) ? (((a = n.dataSource) == null ? void 0 : a.length) || 0) > e(z).pageSize : e(S).total > e(D).pagination.pageSize;
+    }), f = p(() => !F(n.dataSource));
+    Z(
+      () => e(d),
+      (t) => {
         var a;
-        (a = n.onLoadingChange) == null || a.call(n, e);
+        (a = n.onLoadingChange) == null || a.call(n, t);
       }
     );
-    function W(e) {
+    function H(t) {
       var a, r;
-      (r = (a = b.value) == null ? void 0 : a.querySelector(e || ":first-child")) == null || r.scrollIntoView({ behavior: "smooth", block: "center" });
+      (r = (a = b.value) == null ? void 0 : a.querySelector(t || ":first-child")) == null || r.scrollIntoView({ behavior: "smooth", block: "center" });
     }
-    function G(e = !1) {
+    function J(t = !1) {
       var o;
-      const a = (o = k.value) == null ? void 0 : o.apForm, r = e ? a == null ? void 0 : a.getFieldsValueTransformed : a == null ? void 0 : a.getFieldsValue;
+      const a = (o = k.value) == null ? void 0 : o.apForm, r = t ? a == null ? void 0 : a.getFieldsValueTransformed : a == null ? void 0 : a.getFieldsValue;
       return (r == null ? void 0 : r()) || {};
     }
-    return F({
-      submit: () => D(),
-      reset: () => w(),
-      refresh: () => T(),
-      refreshByDelete: (e) => $(e),
-      scrollToFirstRow: W,
-      getSearchFormValuesIfSetted: G
-    }), (e, a) => (i(), S(t(x), {
-      spinning: y.value,
-      class: u(t(m)("spin"))
-    }, {
-      default: f(() => [
-        X("div", {
-          class: u(t(m)()),
-          style: h(e.containerStyle)
+    return N({
+      submit: () => w(),
+      reset: () => B(),
+      refresh: () => q(),
+      refreshByDelete: (t) => A(t),
+      scrollToFirstRow: H,
+      getSearchFormValuesIfSetted: J
+    }), (t, a) => (i(), s("div", {
+      class: l([e(m)(), { [e($)("adaptive")]: t.adaptive }]),
+      style: v(t.containerStyle)
+    }, [
+      u(t.$slots, "header", {
+        formIns: K,
+        submit: e(w),
+        reset: e(B)
+      }),
+      _("div", {
+        class: l([
+          e(m)("content-container"),
+          { [e(T)("content-container", "spinning")]: d.value }
+        ])
+      }, [
+        d.value ? (i(), s("div", {
+          key: 0,
+          class: l(e(y)("spin-wrapper"))
         }, [
-          l(e.$slots, "header", {
-            formIns: j,
-            submit: t(D),
-            reset: t(w)
-          }),
-          s.value.length === 0 ? l(e.$slots, "empty", {
-            key: 0,
-            loading: y.value
-          }, () => [
-            v(t(E), { image: t(L) }, null, 8, ["image"])
-          ]) : (i(), p("div", {
-            key: 1,
-            ref_key: "contentRef",
-            ref: b,
-            style: h(e.contentStyle)
-          }, [
-            e.virtual ? (i(), p(I, { key: 0 }, [
-              t(ae)(e.virtual) ? (i(), S(t(oe), {
-                key: 0,
-                class: u(t(m)("scroll-wrapper")),
-                items: s.value,
-                "item-size": e.virtual,
-                "key-field": n.rowKey || "id"
-              }, {
-                default: f(({ item: r, index: o }) => [
-                  l(e.$slots, "renderItem", {
-                    item: r,
-                    index: o
-                  })
-                ]),
-                _: 3
-              }, 8, ["class", "items", "item-size", "key-field"])) : (i(), S(t(ie), {
-                key: 1,
-                items: s.value,
-                "min-item-size": e.virtual.minItemSize,
-                class: u(t(m)("scroll-wrapper"))
-              }, {
-                default: f(({ item: r, index: o, active: U }) => {
-                  var C, P;
-                  return [
-                    v(t(le), {
-                      item: r,
-                      active: U,
-                      "data-index": o,
-                      "size-dependencies": (P = (C = e.virtual).sizeDependencies) == null ? void 0 : P.call(C, r)
-                    }, {
-                      default: f(() => [
-                        l(e.$slots, "renderItem", {
-                          item: r,
-                          index: o
-                        })
-                      ]),
-                      _: 2
-                    }, 1032, ["item", "active", "data-index", "size-dependencies"])
-                  ];
-                }),
-                _: 3
-              }, 8, ["items", "min-item-size", "class"]))
-            ], 64)) : l(e.$slots, "renderContent", {
+          g(e(te), { spinning: d.value }, null, 8, ["spinning"])
+        ], 2)) : I("", !0),
+        c.value.length === 0 ? u(t.$slots, "empty", {
+          key: 1,
+          loading: d.value
+        }, () => [
+          g(e(V), { image: e(R) }, null, 8, ["image"])
+        ]) : (i(), s("div", {
+          key: 2,
+          ref_key: "contentRef",
+          ref: b,
+          style: v(t.contentStyle),
+          class: l(e(y)("content"))
+        }, [
+          t.virtual ? (i(), s(E, { key: 0 }, [
+            e(re)(t.virtual) ? (i(), O(e(le), {
+              key: 0,
+              class: l(e(m)("scroll-wrapper")),
+              items: c.value,
+              "item-size": t.virtual,
+              "key-field": n.rowKey || "id"
+            }, {
+              default: h(({ item: r, index: o }) => [
+                u(t.$slots, "renderItem", {
+                  item: r,
+                  index: o
+                })
+              ]),
+              _: 3
+            }, 8, ["class", "items", "item-size", "key-field"])) : (i(), O(e(se), {
               key: 1,
-              dataSource: s.value
-            }, () => [
-              (i(!0), p(I, null, Z(s.value, (r, o) => l(e.$slots, "renderItem", {
-                item: r,
-                index: o
-              })), 256))
-            ])
-          ], 4)),
-          M.value ? (i(), p("div", {
-            key: 2,
-            class: u(t(N)("footer")),
-            style: h(e.footerWarpperStyle)
-          }, [
-            v(t(ee), _(
-              c.value ? t(B) : t(ne)(t(z).pagination, ["showTotal"]),
-              { onChange: K }
-            ), null, 16)
-          ], 6)) : Y("", !0)
-        ], 6)
-      ]),
-      _: 3
-    }, 8, ["spinning", "class"]));
+              items: c.value,
+              "min-item-size": t.virtual.minItemSize,
+              class: l(e(m)("scroll-wrapper"))
+            }, {
+              default: h(({ item: r, index: o, active: Q }) => {
+                var C, P;
+                return [
+                  g(e(ue), {
+                    item: r,
+                    active: Q,
+                    "data-index": o,
+                    "size-dependencies": (P = (C = t.virtual).sizeDependencies) == null ? void 0 : P.call(C, r)
+                  }, {
+                    default: h(() => [
+                      u(t.$slots, "renderItem", {
+                        item: r,
+                        index: o
+                      })
+                    ]),
+                    _: 2
+                  }, 1032, ["item", "active", "data-index", "size-dependencies"])
+                ];
+              }),
+              _: 3
+            }, 8, ["items", "min-item-size", "class"]))
+          ], 64)) : u(t.$slots, "renderContent", {
+            key: 1,
+            dataSource: c.value
+          }, () => [
+            (i(!0), s(E, null, x(c.value, (r, o) => u(t.$slots, "renderItem", {
+              item: r,
+              index: o
+            })), 256))
+          ])
+        ], 6))
+      ], 2),
+      U.value ? (i(), s("div", {
+        key: 0,
+        class: l(e(y)("footer")),
+        style: v(t.footerWarpperStyle)
+      }, [
+        g(e(ae), ee(
+          f.value ? e(z) : e(oe)(e(D).pagination, ["showTotal"]),
+          { onChange: G }
+        ), null, 16)
+      ], 6)) : I("", !0)
+    ], 6));
   }
 });
 export {
-  he as default
+  be as default
 };

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

@@ -86,6 +86,10 @@ export type ApListProps<RecordType = any, ParamsType = Recordable> = {
      * @default "id"
      */
     rowKey?: string;
+    /**
+     * 是否自适应外部容器高度（无数据时充满容器、数据超出时内部滚动）
+     */
+    adaptive?: boolean;
 };
 export type ApListExpose = {
     /**

package/es/src/ap-table/hooks/use-table-paging-ng.mjs

@@ -27,16 +27,16 @@ const Ae = ({
   request: f,
   defaultParams: L = {},
   defaultData: v = [],
-  formatParams: y,
-  paramsValueTypeMap: O,
-  resetFieldsIgnores: R,
+  formatParams: O,
+  paramsValueTypeMap: R,
+  resetFieldsIgnores: y,
   filterFields: J,
   sortFields: K,
   namespace: M = "ap-table",
   pagination: S
 }) => {
   let b = 0, i = {};
-  const Q = Se(S), $ = (e) => y ? y(e) : e, z = ae(), c = j(ze(S)), {
+  const Q = Se(S), $ = (e) => O ? O(e) : e, z = ae(), c = j(ze(S)), {
     getColumnSFConfig: G,
     setSF: W,
     clearAll: Z,
@@ -46,7 +46,7 @@ const Ae = ({
     t: T
   } = me(), {
     b: P
-  } = he(M), a = j({
+  } = he(M), o = j({
     total: v.length,
     records: v,
     loading: !1
@@ -56,32 +56,30 @@ const Ae = ({
   }, I = async (e) => {
     var r;
     const t = $(e), n = Date.now();
-    b = n, a.loading = !0;
+    b = n, o.loading = !0;
     try {
-      const o = await f({
+      const a = await f({
         ...m(L),
         ...t
       });
-      b === n && (a.total = o.total || ((r = o.data) == null ? void 0 : r.length) || 0, a.records = [...o.data || []]);
+      b === n && (o.total = a.total || ((r = a.data) == null ? void 0 : r.length) || 0, o.records = [...a.data || []], o.loading = !1);
     } catch {
-      b === n && (a.records = [], a.total = 0);
-    } finally {
-      a.loading = !1;
+      b === n && (o.records = [], o.total = 0, o.loading = !1);
     }
   }, V = (e) => {
     const t = {};
     return Object.entries(e).forEach(([n, r]) => {
-      if (t[n] = r, O && r) {
-        const o = O[n];
-        o && (t[n] = le(o, r));
+      if (t[n] = r, R && r) {
+        const a = R[n];
+        a && (t[n] = le(a, r));
       }
     }), t;
   }, Y = async (e) => {
-    var r, o, l, g, d;
+    var r, a, l, g, d;
     const t = w(), n = {};
     Object.entries(t).forEach(([p, F]) => {
-      R && R.indexOf(p) > -1 && (n[p] = F);
-    }), await ((o = (r = z.value) == null ? void 0 : r.apForm) == null ? void 0 : o.resetFields()), (d = (g = (l = z.value) == null ? void 0 : l.apForm) == null ? void 0 : g.setFieldsValue) == null || d.call(g, n), se(() => {
+      y && y.indexOf(p) > -1 && (n[p] = F);
+    }), await ((a = (r = z.value) == null ? void 0 : r.apForm) == null ? void 0 : a.resetFields()), (d = (g = (l = z.value) == null ? void 0 : l.apForm) == null ? void 0 : g.setFieldsValue) == null || d.call(g, n), se(() => {
       e == null || e();
     });
   }, C = (e) => {
@@ -113,7 +111,7 @@ const Ae = ({
       const {
         current: t,
         pageSize: n
-      } = c, r = a.total - e, o = Math.ceil(r / n), l = t > o ? o : t;
+      } = c, r = o.total - e, a = Math.ceil(r / n), l = t > a ? a : t;
       k({
         current: l > 0 ? l : 1
       });
@@ -122,8 +120,8 @@ const Ae = ({
     var p, F;
     const r = w();
     c.current = e.current, c.pageSize = e.pageSize, W(t, n);
-    const o = q(n) ? [...n] : [n], l = {};
-    for (const u of o)
+    const a = q(n) ? [...n] : [n], l = {};
+    for (const u of a)
       (p = m(K)) != null && p.includes(u.columnKey || u.field) && u.order && (l[fe(u.columnKey || u.field)] = u.order);
     const g = {};
     for (const u of Object.keys(t))
@@ -158,16 +156,16 @@ const Ae = ({
     deep: !0
   });
   const ne = A(() => {
-    if (a.total === 0)
+    if (o.total === 0)
       return "-";
     const {
       current: e,
       pageSize: t
     } = c;
-    return `${e}/${Math.ceil(a.total / t)}`;
+    return `${e}/${Math.ceil(o.total / t)}`;
   });
   function re(e) {
-    q(e) && (a.records = e, a.total = e.length);
+    q(e) && (o.records = e, o.total = e.length);
   }
   const oe = A(() => {
     const {
@@ -175,19 +173,19 @@ const Ae = ({
       showTotal: t,
       showQuickJumper: n,
       showSizeChanger: r,
-      pageSizeOptions: o
+      pageSizeOptions: a
     } = Q;
     return {
-      loading: a.loading,
+      loading: o.loading,
       pagination: {
         current: c.current,
         pageSize: c.pageSize,
-        total: a.total,
+        total: o.total,
         showSizeChanger: N(r) ? r : !e,
         showQuickJumper: N(n) ? n : !e,
         showLessItems: e,
         size: "default",
-        pageSizeOptions: pe(o) ? ["10", "20", "50", "100"] : o,
+        pageSizeOptions: pe(a) ? ["10", "20", "50", "100"] : a,
         showTotal: t ? (l) => x("span", {
           class: P("pagination-total-wrapper")
         }, [T("ap.apTable.pagination.totalLeftPrefix"), " ", x("span", {
@@ -199,7 +197,7 @@ const Ae = ({
         }, [m(ne)]), " ", T("ap.apTable.pagination.totalRightSuffix")])]) : void 0
       },
       onChange: _,
-      dataSource: a.records
+      dataSource: o.records
     };
   });
   return {
@@ -208,12 +206,12 @@ const Ae = ({
     reset: ee,
     refresh: U,
     refreshByDelete: te,
-    data: a,
+    data: o,
     current: c.current,
     pageSize: c.pageSize,
     handleTableChange: _,
     tableProps: oe,
-    dataSource: A(() => a.records),
+    dataSource: A(() => o.records),
     setDataSource: re,
     getColumnSFConfig: G,
     sortedInfo: H,

package/es/src/editable-table/index.vue.mjs

@@ -165,7 +165,7 @@ const Re = /* @__PURE__ */ $({
       const o = ((u = r(m)) == null ? void 0 : u.length) || 0, a = g(e) ? e : e.length;
       if (F(n.maxLength) && o + a > n.maxLength)
         return;
-      const l = g(e) ? new Array(e).fill({}) : le(e);
+      const l = g(e) ? new Array(e).fill(0).map(() => ({})) : le(e);
       (d = (s = i.value) == null ? void 0 : s.setFieldValue) == null || d.call(s, n.name, l, !0, (f, p) => {
         if (!f[p]) {
           f[p] = [...l];

package/es/src/editable-table/interface.d.ts

@@ -21,6 +21,10 @@ export type EditableColumnType<RecordType = any, ExtraValueType = 'text', ValueT
      * 是否省略自动溢出，自动溢出省略，为对象时可设置省略行数、是否可展开、添加后缀等
      */
     ellipsis?: boolean | EllipsisConfig;
+    /**
+     * 是否渲染必填标记（只渲染标记不生成校验规则）
+     */
+    markRequired?: boolean;
     /**
      * 是否可编辑
      */