@aplus-frontend/ui 0.0.1-beta.2 → 0.0.1-beta.3

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

@@ -1,31 +1,32 @@
-import { defineComponent as Ge, useAttrs as Me, useSlots as qe, ref as u, computed as g, unref as e, inject as Je, watchEffect as Qe, toRaw as N, openBlock as $, createElementBlock as Ue, normalizeClass as Xe, createBlock as Ye, mergeProps as O, createSlots as V, renderList as L, withCtx as h, renderSlot as S, normalizeProps as C, guardReactiveProps as b, createCommentVNode as Ze, withDirectives as et, createVNode as W, vShow as tt } from "vue";
-import { Table as ot } from "ant-design-vue";
-import { omit as at, isFunction as nt } from "lodash-unified";
+import { defineComponent as Je, useAttrs as Qe, useSlots as Ue, ref as d, computed as p, unref as e, inject as Xe, watchEffect as Ye, toRaw as O, openBlock as V, createElementBlock as L, normalizeClass as W, normalizeStyle as Ze, createVNode as D, mergeProps as j, createSlots as M, renderList as G, withCtx as S, renderSlot as C, normalizeProps as y, guardReactiveProps as b, createCommentVNode as et, withDirectives as tt, vShow as ot } from "vue";
+import { Table as at } from "ant-design-vue";
+import { isString as nt, omit as rt, isFunction as lt } from "lodash-unified";
 import "@ant-design/icons-vue";
 import "../config-provider/index.mjs";
 import "@fruits-chain/utils";
 import "@aplus-frontend/hooks";
-import rt from "../pro-form/pro-form.vue.mjs";
-import { useForm as lt } from "../pro-form/hooks/use-form.mjs";
-import st from "./components/header-cell.vue.mjs";
-import { usePagination as it } from "./hooks/use-pagination.mjs";
-import { useColumns as ct } from "./hooks/use-columns.mjs";
-import { useDataSource as mt } from "./hooks/use-data-source.mjs";
-import { useLoading as ut } from "./hooks/use-loading.mjs";
+import st from "../pro-form/pro-form.vue.mjs";
+import { useForm as it } from "../pro-form/hooks/use-form.mjs";
+import ct from "./components/header-cell.vue.mjs";
+import { usePagination as mt } from "./hooks/use-pagination.mjs";
+import { useColumns as ut } from "./hooks/use-columns.mjs";
+import { useDataSource as dt } from "./hooks/use-data-source.mjs";
+import { useLoading as pt } from "./hooks/use-loading.mjs";
 import { useRowSelection as ft } from "./hooks/use-row-selection.mjs";
-import { useTableScroll as pt } from "./hooks/use-table-scroll.mjs";
-import { useTableScrollTo as dt } from "./hooks/use-scroll-to.mjs";
-import { useCustomRow as gt } from "./hooks/use-custom-row.mjs";
-import { useTableStyle as ht } from "./hooks/use-table-style.mjs";
-import { useTableHeader as St } from "./hooks/use-table-header.mjs";
-import { useTableExpand as Ct } from "./hooks/use-table-expand.mjs";
-import { createTableContext as bt } from "./hooks/use-table-context.mjs";
-import { useTableFooter as yt } from "./hooks/use-table-footer.mjs";
-import { useTableForm as wt } from "./hooks/use-table-form.mjs";
+import { useTableScroll as gt } from "./hooks/use-table-scroll.mjs";
+import { useTableScrollTo as ht } from "./hooks/use-scroll-to.mjs";
+import { useCustomRow as St } from "./hooks/use-custom-row.mjs";
+import { useTableStyle as Ct } from "./hooks/use-table-style.mjs";
+import { useTableHeader as yt } from "./hooks/use-table-header.mjs";
+import { useTableExpand as bt } from "./hooks/use-table-expand.mjs";
+import { createTableContext as wt } from "./hooks/use-table-context.mjs";
+import { useTableFooter as Rt } from "./hooks/use-table-footer.mjs";
+import { useTableForm as Ft } from "./hooks/use-table-form.mjs";
 import "./style/pro-table.css";
-import { useGlobalConfig as Rt } from "../config-provider/hooks/use-global-config.mjs";
-import { useNamespace as Ft } from "../config-provider/hooks/use-namespace.mjs";
-const Tt = "PageWrapperFixedHeight", Zt = /* @__PURE__ */ Ge({
+import { formTableDivideSpaceMap as Tt } from "./const.mjs";
+import { useGlobalConfig as Bt } from "../config-provider/hooks/use-global-config.mjs";
+import { useNamespace as vt } from "../config-provider/hooks/use-namespace.mjs";
+const Pt = "PageWrapperFixedHeight", ao = /* @__PURE__ */ Je({
   name: "BasicTable",
   __name: "pro-table",
   props: {
@@ -76,7 +77,8 @@ const Tt = "PageWrapperFixedHeight", Zt = /* @__PURE__ */ Ge({
     rowClassName: {},
     scroll: {},
     beforeEditSubmit: {},
-    size: {}
+    size: {},
+    divideSpace: { default: "default" }
   },
   emits: [
     "fetch-success",
@@ -96,242 +98,250 @@ const Tt = "PageWrapperFixedHeight", Zt = /* @__PURE__ */ Ge({
     "change",
     "columns-change"
   ],
-  setup(j, { expose: G, emit: M }) {
-    const f = Rt().value.table, l = j, r = M, D = Me(), x = qe(), s = u(null), y = u([]), w = u(null), z = u(null), R = u(), { b: F, m: q } = Ft("pro-table"), [J, v] = lt(), a = g(() => ({
-      ...l,
-      sortFn: l.sortFn || f.defaultSortFn,
-      filterFn: l.filterFn || f.defaultFilterFn,
-      fetchSetting: l.fetchSetting || f.fetchSetting,
-      size: l.size || f.defaultSize,
-      ...e(R)
-    })), Q = Je(Tt, !1);
-    Qe(() => {
-      e(Q) && l.canResize && console.warn(
+  setup(q, { expose: J, emit: Q }) {
+    const f = Bt().value.table, r = q, l = Q, z = Qe(), x = Ue(), s = d(null), w = d([]), R = d(null), K = d(null), F = d(), { b: i, m: U } = vt("pro-table"), [X, k] = it(), T = p(() => nt(r.divideSpace) ? Tt[r.divideSpace] : r.divideSpace), a = p(() => ({
+      ...r,
+      sortFn: r.sortFn || f.defaultSortFn,
+      filterFn: r.filterFn || f.defaultFilterFn,
+      fetchSetting: r.fetchSetting || f.fetchSetting,
+      size: r.size || f.defaultSize,
+      ...e(F)
+    })), Y = Xe(Pt, !1);
+    Ye(() => {
+      e(Y) && r.canResize && console.warn(
         "'canResize' of BasicTable may not work in PageWrapper with 'fixedHeight' (especially in hot updates)"
       );
     });
-    const { getLoading: k, setLoading: K } = ut(a), {
-      getPaginationInfo: T,
-      getPagination: U,
-      setPagination: E,
-      setShowPagination: X,
-      getShowPagination: Y
-    } = it(a), {
-      getRowSelection: Z,
-      getRowSelectionRef: H,
-      getSelectRows: ee,
-      setSelectedRows: te,
-      clearSelectedRowKeys: p,
-      getSelectRowKeys: B,
-      deleteSelectRowByKey: oe,
-      setSelectedRowKeys: _
-    } = ft(a, y, r), {
-      handleTableChange: ae,
-      getDataSourceRef: i,
-      getDataSource: ne,
-      getRawDataSource: re,
-      setTableData: le,
-      updateTableDataRecord: se,
-      deleteTableDataRecord: ie,
-      insertTableDataRecord: ce,
-      findTableDataRecord: me,
-      fetch: ue,
-      getRowKey: fe,
-      reload: pe,
-      getAutoCreateKey: de,
-      updateTableData: ge
-    } = mt(
+    const { getLoading: E, setLoading: H } = pt(a), {
+      getPaginationInfo: B,
+      getPagination: Z,
+      setPagination: _,
+      setShowPagination: ee,
+      getShowPagination: te
+    } = mt(a), {
+      getRowSelection: oe,
+      getRowSelectionRef: A,
+      getSelectRows: ae,
+      setSelectedRows: ne,
+      clearSelectedRowKeys: g,
+      getSelectRowKeys: v,
+      deleteSelectRowByKey: re,
+      setSelectedRowKeys: I
+    } = ft(a, w, l), {
+      handleTableChange: le,
+      getDataSourceRef: c,
+      getDataSource: se,
+      getRawDataSource: ie,
+      setTableData: ce,
+      updateTableDataRecord: me,
+      deleteTableDataRecord: ue,
+      insertTableDataRecord: de,
+      findTableDataRecord: pe,
+      fetch: fe,
+      getRowKey: ge,
+      reload: he,
+      getAutoCreateKey: Se,
+      updateTableData: Ce
+    } = dt(
       a,
       {
-        tableData: y,
-        getPaginationInfo: T,
-        setLoading: K,
-        setPagination: E,
-        getFieldsValue: v.getFieldsValue,
-        clearSelectedRowKeys: p
+        tableData: w,
+        getPaginationInfo: B,
+        setLoading: H,
+        setPagination: _,
+        getFieldsValue: k.getFieldsValue,
+        clearSelectedRowKeys: g
       },
-      r
+      l
     );
-    function he(t, n, o, m) {
-      ae(t, n, o), r("change", t, n, o);
+    function ye(t, n, o, u) {
+      le(t, n, o), l("change", t, n, o);
       const { onChange: P } = e(a);
-      P && nt(P) && P(t, n, o, m);
+      P && lt(P) && P(t, n, o, u);
     }
     const {
-      getViewColumns: Se,
-      getColumns: Ce,
-      setCacheColumnsByField: be,
-      setCacheColumns: ye,
-      setColumnWidth: we,
-      setColumns: Re,
-      getColumnsRef: Fe,
-      getCacheColumns: Te
-    } = ct(a, T), { getScrollRef: A, redoHeight: I } = pt(
+      getViewColumns: be,
+      getColumns: we,
+      setCacheColumnsByField: Re,
+      setCacheColumns: Fe,
+      setColumnWidth: Te,
+      setColumns: Be,
+      getColumnsRef: ve,
+      getCacheColumns: Pe
+    } = ut(a, B), { getScrollRef: N, redoHeight: $ } = gt(
       a,
       s,
-      Fe,
-      H,
-      i,
-      w,
-      z
-    ), { scrollTo: Be } = dt(s, i), { customRow: Pe } = gt(a, {
-      setSelectedRowKeys: _,
-      getSelectRowKeys: B,
-      clearSelectedRowKeys: p,
-      getAutoCreateKey: de,
-      emit: r
-    }), { getRowClassName: De } = ht(a, F()), {
-      getExpandOption: xe,
-      expandAll: ze,
-      expandRows: ve,
-      collapseRows: ke,
-      collapseAll: Ke,
-      handleTableExpand: Ee
-    } = Ct(a, y, r), He = {
+      ve,
+      A,
+      c,
+      R,
+      K
+    ), { scrollTo: De } = ht(s, c), { customRow: ze } = St(a, {
+      setSelectedRowKeys: I,
+      getSelectRowKeys: v,
+      clearSelectedRowKeys: g,
+      getAutoCreateKey: Se,
+      emit: l
+    }), { getRowClassName: xe } = Ct(a, i()), {
+      getExpandOption: Ke,
+      expandAll: ke,
+      expandRows: Ee,
+      collapseRows: He,
+      collapseAll: _e,
+      handleTableExpand: Ae
+    } = bt(a, w, l), Ie = {
       onColumnsChange: (t) => {
         var n, o;
-        r("columns-change", t), (o = (n = e(a)).onColumnsChange) == null || o.call(n, t);
+        l("columns-change", t), (o = (n = e(a)).onColumnsChange) == null || o.call(n, t);
       }
-    }, _e = {
-      clearSelectedRowKeys: p,
-      getSelectRowKeys: B
-    }, { getHeaderProps: Ae } = St(a, x, He, _e), { getFooterProps: Ie } = yt(
+    }, Ne = {
+      clearSelectedRowKeys: g,
+      getSelectRowKeys: v
+    }, { getHeaderProps: $e } = yt(a, x, Ie, Ne), { getFooterProps: Oe } = Rt(
       a,
-      A,
+      N,
       s,
-      i
+      c
     ), {
-      getFormProps: Ne,
-      replaceFormSlotKey: $e,
-      getFormSlotKeys: Oe,
-      handleSearchInfoChange: Ve
-    } = wt(a, x, ue, k), c = g(() => {
-      const t = e(i);
+      getFormProps: Ve,
+      replaceFormSlotKey: Le,
+      getFormSlotKeys: We,
+      handleSearchInfoChange: je
+    } = Ft(a, x, fe, E), m = p(() => {
+      const t = e(c);
       let n = {
-        ...D,
-        customRow: Pe,
+        ...z,
+        customRow: ze,
         ...e(a),
-        ...e(Ae),
-        scroll: e(A),
-        loading: e(k),
+        ...e($e),
+        scroll: e(N),
+        loading: e(E),
         tableLayout: "fixed",
-        rowSelection: e(H),
-        rowKey: e(fe),
-        columns: N(e(Se)),
-        pagination: N(e(T)),
+        rowSelection: e(A),
+        rowKey: e(ge),
+        columns: O(e(be)),
+        pagination: O(e(B)),
         dataSource: t,
-        footer: e(Ie),
-        ...e(xe)
+        footer: e(Oe),
+        ...e(Ke)
       };
-      return n = at(n, ["class", "style", "onChange"]), n;
-    }), Le = g(() => {
-      const t = e(c);
+      return n = rt(n, ["class", "style", "onChange"]), n;
+    }), Me = p(() => {
+      const t = e(m);
       return [
-        F(),
-        D.class,
+        i(),
+        z.class,
         {
-          [F("form-container")]: t.useSearchForm,
-          [q("inset")]: t.inset
+          [U("inset")]: t.inset,
+          [i("no-divide")]: T.value === 0
         }
       ];
-    }), We = g(() => {
+    }), Ge = p(() => {
       const { emptyDataIsShowTable: t, useSearchForm: n } = e(a);
-      return t || !n ? !0 : !!e(i).length;
+      return t || !n ? !0 : !!e(c).length;
     });
-    function je(t) {
-      R.value = { ...e(R), ...t };
+    function qe(t) {
+      F.value = { ...e(F), ...t };
     }
-    const d = {
-      reload: pe,
-      getSelectRows: ee,
-      setSelectedRows: te,
-      clearSelectedRowKeys: p,
-      getSelectRowKeys: B,
-      deleteSelectRowByKey: oe,
-      setPagination: E,
-      setTableData: le,
-      updateTableDataRecord: se,
-      deleteTableDataRecord: ie,
-      insertTableDataRecord: ce,
-      findTableDataRecord: me,
-      redoHeight: I,
-      setSelectedRowKeys: _,
-      setColumns: Re,
-      setLoading: K,
-      getDataSource: ne,
-      getRawDataSource: re,
-      setProps: je,
-      getRowSelection: Z,
-      getPaginationRef: U,
-      getColumns: Ce,
-      getCacheColumns: Te,
-      emit: r,
-      updateTableData: ge,
-      setShowPagination: X,
-      getShowPagination: Y,
-      setCacheColumnsByField: be,
-      expandAll: ze,
-      collapseAll: Ke,
-      expandRows: ve,
-      collapseRows: ke,
-      scrollTo: Be,
-      getSize: () => e(c).size,
-      setCacheColumns: ye
+    const h = {
+      reload: he,
+      getSelectRows: ae,
+      setSelectedRows: ne,
+      clearSelectedRowKeys: g,
+      getSelectRowKeys: v,
+      deleteSelectRowByKey: re,
+      setPagination: _,
+      setTableData: ce,
+      updateTableDataRecord: me,
+      deleteTableDataRecord: ue,
+      insertTableDataRecord: de,
+      findTableDataRecord: pe,
+      redoHeight: $,
+      setSelectedRowKeys: I,
+      setColumns: Be,
+      setLoading: H,
+      getDataSource: se,
+      getRawDataSource: ie,
+      setProps: qe,
+      getRowSelection: oe,
+      getPaginationRef: Z,
+      getColumns: we,
+      getCacheColumns: Pe,
+      emit: l,
+      updateTableData: Ce,
+      setShowPagination: ee,
+      getShowPagination: te,
+      setCacheColumnsByField: Re,
+      expandAll: ke,
+      collapseAll: _e,
+      expandRows: Ee,
+      collapseRows: He,
+      scrollTo: De,
+      getSize: () => e(m).size,
+      setCacheColumns: Fe
     };
-    return bt({ ...d, wrapRef: w, getBindValues: c }), r("register", d, v), G({ tableElRef: s, ...d }), (t, n) => ($(), Ue("div", {
+    return wt({ ...h, wrapRef: R, getBindValues: m }), l("register", h, k), J({ tableElRef: s, ...h }), (t, n) => (V(), L("div", {
       ref_key: "wrapRef",
-      ref: w,
-      class: Xe(Le.value)
+      ref: R,
+      class: W(Me.value)
     }, [
-      c.value.useSearchForm ? ($(), Ye(e(rt), O({
+      m.value.useSearchForm ? (V(), L("div", {
         key: 0,
-        ref_key: "formRef",
-        ref: z,
-        submitOnReset: ""
-      }, e(Ne), {
-        tableAction: d,
-        onRegister: e(J),
-        onSubmit: e(Ve),
-        onAdvancedChange: e(I)
-      }), V({ _: 2 }, [
-        L(e(Oe), (o) => ({
-          name: e($e)(o),
-          fn: h((m) => [
-            S(t.$slots, o, C(b(m || {})))
-          ])
-        }))
-      ]), 1040, ["onRegister", "onSubmit", "onAdvancedChange"])) : Ze("", !0),
-      et(W(e(ot), O({
+        class: W([
+          e(i)("form-container"),
+          T.value === 0 ? e(i)("form-container-no-divide") : ""
+        ]),
+        style: Ze({ marginBottom: T.value + "px" })
+      }, [
+        D(e(st), j({
+          ref_key: "formRef",
+          ref: K,
+          submitOnReset: ""
+        }, e(Ve), {
+          tableAction: h,
+          onRegister: e(X),
+          onSubmit: e(je),
+          onAdvancedChange: e($)
+        }), M({ _: 2 }, [
+          G(e(We), (o) => ({
+            name: e(Le)(o),
+            fn: S((u) => [
+              C(t.$slots, o, y(b(u || {})))
+            ])
+          }))
+        ]), 1040, ["onRegister", "onSubmit", "onAdvancedChange"])
+      ], 6)) : et("", !0),
+      tt(D(e(at), j({
         ref_key: "tableElRef",
         ref: s
-      }, c.value, {
-        rowClassName: e(De),
-        onChange: he,
-        onResizeColumn: e(we),
-        onExpand: e(Ee)
-      }), V({
-        headerCell: h(({ column: o }) => [
-          S(t.$slots, "headerCell", C(b({ column: o })), () => [
-            W(st, { column: o }, null, 8, ["column"])
+      }, m.value, {
+        rowClassName: e(xe),
+        onChange: ye,
+        onResizeColumn: e(Te),
+        onExpand: e(Ae)
+      }), M({
+        headerCell: S(({ column: o }) => [
+          C(t.$slots, "headerCell", y(b({ column: o })), () => [
+            D(ct, { column: o }, null, 8, ["column"])
           ])
         ]),
-        bodyCell: h((o) => [
-          S(t.$slots, "bodyCell", C(b(o || {})))
+        bodyCell: S((o) => [
+          C(t.$slots, "bodyCell", y(b(o || {})))
         ]),
         _: 2
       }, [
-        L(Object.keys(t.$slots), (o) => ({
+        G(Object.keys(t.$slots), (o) => ({
           name: o,
-          fn: h((m) => [
-            S(t.$slots, o, C(b(m || {})))
+          fn: S((u) => [
+            C(t.$slots, o, y(b(u || {})))
           ])
         }))
       ]), 1040, ["rowClassName", "onResizeColumn", "onExpand"]), [
-        [tt, We.value]
+        [ot, Ge.value]
       ])
     ], 2));
   }
 });
 export {
-  Zt as default
+  ao as default
 };

package/es/src/pro-table/style/pro-table.css

@@ -1,20 +1,25 @@
 .aplus-pro-table {
   max-width: 100%;
   height: 100%;
+  padding: 16px;
+}
+.aplus-pro-table-no-divide .ant-table-wrapper {
+  border-top-left-radius: 0 !important;
+  border-top-right-radius: 0 !important;
 }
 .aplus-pro-table-row__striped td {
   background-color: #fafafa !important;
 }
-.aplus-pro-table-form-container {
-  padding: 16px;
-}
 .aplus-pro-table-form-container .ant-form {
   width: 100%;
-  margin-bottom: 16px;
-  padding: 16px 16px 4px;
+  padding: 16px 16px 8px;
   border-radius: 2px;
   background-color: #fff;
 }
+.aplus-pro-table-form-container-no-divide .ant-form {
+  border-bottom-left-radius: 0 !important;
+  border-bottom-right-radius: 0 !important;
+}
 .aplus-pro-table .ant-table-cell .ant-tag {
   margin-right: 0;
 }

package/es/src/scroll-bar/index.d.ts

@@ -5,7 +5,6 @@ export declare const Scrollbar: {
     new (...args: any[]): CreateComponentPublicInstance<Readonly< ExtractPropTypes<{
         native: {
             type: PropType<boolean>;
-            default: boolean;
         };
         scrollHeight: {
             type: PropType<number>;
@@ -39,7 +38,6 @@ export declare const Scrollbar: {
     }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, VNodeProps & AllowedComponentProps & ComponentCustomProps & Readonly< ExtractPropTypes<{
         native: {
             type: PropType<boolean>;
-            default: boolean;
         };
         scrollHeight: {
             type: PropType<number>;
@@ -69,7 +67,6 @@ export declare const Scrollbar: {
             default: string;
         };
     }>>, {
-        native: boolean;
         scrollHeight: number;
         wrapStyle: StyleValue;
         wrapClass: string | string[];
@@ -86,7 +83,6 @@ export declare const Scrollbar: {
     }, Readonly< ExtractPropTypes<{
         native: {
             type: PropType<boolean>;
-            default: boolean;
         };
         scrollHeight: {
             type: PropType<number>;
@@ -118,7 +114,6 @@ export declare const Scrollbar: {
     }>>, {
         wrap: Ref<any>;
     }, {}, {}, {}, {
-        native: boolean;
         scrollHeight: number;
         wrapStyle: StyleValue;
         wrapClass: string | string[];
@@ -132,7 +127,6 @@ export declare const Scrollbar: {
 } & ComponentOptionsBase<Readonly< ExtractPropTypes<{
     native: {
         type: PropType<boolean>;
-        default: boolean;
     };
     scrollHeight: {
         type: PropType<number>;
@@ -164,7 +158,6 @@ export declare const Scrollbar: {
 }>>, {
     wrap: Ref<any>;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, {
-    native: boolean;
     scrollHeight: number;
     wrapStyle: StyleValue;
     wrapClass: string | string[];

package/es/src/scroll-bar/scroll-bar.vue.d.ts

@@ -3,7 +3,6 @@ import { DefineComponent, Ref, ComponentOptionsMixin, PublicProps, ExtractPropTy
 import { StyleValue } from '../type';
 
 declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ScrollbarProps>, {
-    native: boolean;
     wrapStyle: string;
     wrapClass: string;
     viewStyle: string;
@@ -13,7 +12,6 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
 }>, {
     wrap: Ref<any>;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ScrollbarProps>, {
-    native: boolean;
     wrapStyle: string;
     wrapClass: string;
     viewStyle: string;
@@ -21,7 +19,6 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     tag: string;
     scrollHeight: number;
 }>>>, {
-    native: boolean;
     scrollHeight: number;
     wrapStyle: StyleValue;
     wrapClass: string | string[];