@aplus-frontend/ui 0.0.1 → 0.0.3

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

@@ -17,11 +17,11 @@ const ae = ({
   sortFields: E = []
 }) => {
   let F = 0, f = {};
-  const L = (e) => T ? T(e) : e, c = v(), l = v(y), g = v(S), { t: C } = Y(), n = v({
+  const L = (e) => T ? T(e) : e, i = v(), l = v(y), g = v(S), { t: V } = Y(), n = v({
     total: 0,
     records: A,
     loading: !1
-  }), V = async (e) => {
+  }), b = async (e) => {
     var o;
     const a = L(e), t = Date.now();
     F = t, n.value.loading = !0;
@@ -36,7 +36,7 @@ const ae = ({
     } finally {
       n.value.loading = !1;
     }
-  }, b = (e) => {
+  }, w = (e) => {
     const a = {};
     return Object.entries(e).forEach(([t, o]) => {
       if (a[t] = o, z && o) {
@@ -45,30 +45,30 @@ const ae = ({
       }
     }), a;
   }, M = (e) => {
-    var o, s, d, p, m, u, i;
-    const a = ((s = (o = c.value) == null ? void 0 : o.apForm) == null ? void 0 : s.getFieldsValue()) || {}, t = {};
+    var o, s, d, p, m, u, c;
+    const a = ((s = (o = i.value) == null ? void 0 : o.apForm) == null ? void 0 : s.getFieldsValue()) || {}, t = {};
     Object.entries(a).forEach(([$, K]) => {
       P && P.indexOf($) > -1 && (t[$] = K);
-    }), (p = (d = c.value) == null ? void 0 : d.apForm) == null || p.resetFields(), (i = (u = (m = c.value) == null ? void 0 : m.apForm) == null ? void 0 : u.setFieldsValue) == null || i.call(u, t), e == null || e();
+    }), (p = (d = i.value) == null ? void 0 : d.apForm) == null || p.resetFields(), (c = (u = (m = i.value) == null ? void 0 : m.apForm) == null ? void 0 : u.setFieldsValue) == null || c.call(u, t), e == null || e();
   }, h = (e) => {
     f = e;
-    const a = b(e);
-    V(a);
+    const a = w(e);
+    b(a);
   }, q = (e) => {
     h({
       ...f,
       ...e
     });
-  }, w = () => {
+  }, C = () => {
     var a, t;
-    const e = ((t = (a = c.value) == null ? void 0 : a.apForm) == null ? void 0 : t.getFieldsValue(!0)) || {};
+    const e = ((t = (a = i.value) == null ? void 0 : a.apForm) == null ? void 0 : t.getFieldsValue(!0)) || {};
     h({
       ...e,
-      pageCurrent: 1,
+      current: 1,
       pageSize: f.pageSize || S
     });
   }, J = () => {
-    M(w);
+    M(C);
   }, Q = () => {
     h(f);
   }, G = (e) => {
@@ -78,14 +78,14 @@ const ae = ({
     });
   }, O = (e, a, t) => {
     var m, u;
-    const o = ((u = (m = c.value) == null ? void 0 : m.apForm) == null ? void 0 : u.getFieldsValue(!0)) || {};
+    const o = ((u = (m = i.value) == null ? void 0 : m.apForm) == null ? void 0 : u.getFieldsValue(!0)) || {};
     l.value = e.current, g.value = e.pageSize;
     const s = X(t) ? [...t] : [t], d = {};
-    for (const i of s)
-      E.includes(i.field) && (d[W(i.field)] = i.order);
+    for (const c of s)
+      E.includes(c.field) && (d[W(c.field)] = c.order);
     const p = {};
-    for (const i of Object.keys(a))
-      B.includes(i) && (p[i] = a[i]);
+    for (const c of Object.keys(a))
+      B.includes(c) && (p[c] = a[c]);
     h({
       ...o,
       filter: p,
@@ -96,14 +96,14 @@ const ae = ({
   };
   N(() => {
     var a, t;
-    const e = ((t = (a = c.value) == null ? void 0 : a.apForm) == null ? void 0 : t.getFieldsValue(!0)) || {};
+    const e = ((t = (a = i.value) == null ? void 0 : a.apForm) == null ? void 0 : t.getFieldsValue(!0)) || {};
     if (f = {
       current: r(l),
       pageSize: r(g),
       ...e
     }, !x) {
-      const o = b(f);
-      V(o);
+      const o = w(f);
+      b(o);
     }
   });
   const H = j(() => r(n).total === 0 ? "-" : `${r(l.value)}/${Math.ceil(
@@ -116,7 +116,7 @@ const ae = ({
       total: r(n).total,
       showSizeChanger: !0,
       showQuickJumper: !0,
-      showTotal: (e) => `${C("ap.apTable.pagination.totalLeft", { total: e })} ${C(
+      showTotal: (e) => `${V("ap.apTable.pagination.totalLeft", { total: e })} ${V(
         "ap.apTable.pagination.totalRight",
         { page: r(H) }
       )}`
@@ -125,8 +125,8 @@ const ae = ({
     dataSource: r(n).records
   }));
   return {
-    formRef: c,
-    submit: w,
+    formRef: i,
+    submit: C,
     reset: J,
     refresh: Q,
     refreshByDelete: G,

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

@@ -7,7 +7,7 @@ import { CSSProperties } from 'vue';
 import { ApActionGroupProps } from '../ap-action';
 import { ApTableIndexProps } from './components/interface';
 
-type ValueEnmuTyType = {
+export type ValueEnumType = {
     text: string;
     status?: string;
     color?: string;
@@ -44,7 +44,7 @@ export type ApTableValueFields = {
      */
     index: ApTableIndexProps;
 };
-export type ValueEnum = Record<string, ValueEnmuTyType>;
+export type ValueEnum = Record<string, ValueEnumType>;
 export type ExtraProColumnType<T> = Omit<ColumnType<T>, 'children'> & {
     sorter?: string | boolean | CompareFn<T> | {
         compare?: CompareFn<T>;
@@ -52,8 +52,8 @@ export type ExtraProColumnType<T> = Omit<ColumnType<T>, 'children'> & {
         multiple?: number;
     };
 };
-export type ApColumnType<ValueType extends keyof ApTableValueFields = 'text'> = ExtraProColumnType<any> & {
-    children?: ApColumnType[];
+export type ApColumnType<ValueType extends keyof ApTableValueFields = 'text', RecordType = any> = ExtraProColumnType<any> & {
+    children?: ApColumnType<any, RecordType>[];
     /**
      * 表单项所占据的格子数（1-24格）
      */
@@ -75,8 +75,7 @@ export type ApColumnType<ValueType extends keyof ApTableValueFields = 'text'> =
      */
     hideInTable?: boolean;
     /**
-     * 值的枚举，会自动转化把值当成 key 来取出要显示的内容（也会作为select的选项）
-     * @deprecated 未实现请使用`fieldProps.options`
+     * 值的枚举，会自动转化把值当成 key 来取出要显示的内容（也会作为select等组件的选项）
      */
     valueEnum?: ValueEnum;
     /**
@@ -90,7 +89,19 @@ export type ApColumnType<ValueType extends keyof ApTableValueFields = 'text'> =
     /**
      * 值类型额外配置的参数（用于查询表单渲染）
      */
-    fieldProps?: ApTableValueFields[ValueType];
+    fieldProps?: ApTableValueFields[ValueType] | ((opt?: {
+        value: any;
+        text: any;
+        record: RecordType;
+        index: number;
+        renderIndex: number;
+        column: ApColumnType<ValueType, RecordType>;
+    }) => ApTableValueFields[ValueType]);
+    /**
+     * 用于表单项排序的字段
+     * @description 值越大，越排在前面，请设置正整数，设置为0或负数将会无效
+     */
+    order?: number;
 };
 export type RequestData<T> = {
     data: T[] | undefined;
@@ -100,7 +111,7 @@ export type ApTableProps<RecordType = any, ParamsType = any, ValueType extends k
     /**
      * 列配置
      */
-    columns?: ApColumnType<any>[];
+    columns?: ApColumnType<any, RecordType>[];
     /**
      * 是否启用卡片样式
      */
@@ -111,9 +122,7 @@ export type ApTableProps<RecordType = any, ParamsType = any, ValueType extends k
     params?: ParamsType;
     /**
      * 自定义渲染搜索表单
-     * @param props
-     * @param defaultDom
-     * @returns
+     * @deprecated 未实现 暂不可用
      */
     searchFormRender?: (props: ApTableProps<RecordType, ParamsType, ValueType>, defaultDom: any) => any;
     /**
@@ -129,7 +138,7 @@ export type ApTableProps<RecordType = any, ParamsType = any, ValueType extends k
     }) => Promise<Partial<RequestData<RecordType>>>;
     /**
      * 数据加载完成后触发
-     * @param data
+     * @deprecated 已弃用，请自行实现类似效果
      * @returns
      */
     onLoad?: (data: RecordType[]) => void;
@@ -181,4 +190,3 @@ export type ApTableExpose = {
     submit: () => void;
     reset: () => void;
 };
-export {};

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

@@ -1,3 +1,6 @@
+import { ApColumnType, ApTableValueFields, ValueEnum, ValueEnumType } from './interface';
+import { Translator } from '../config-provider';
+
 export type FieldValueType = 'multiple' | 'multipleNumber' | 'dayjs' | 'dayjsRange' | 'dayjsDayRange' | 'number' | 'boolean' | 'object';
 export declare const formatParamsValueType: (type: FieldValueType | Record<string, FieldValueType>, value: any, cb: (t: FieldValueType, value: any) => any) => any;
 /**
@@ -12,3 +15,47 @@ export declare const parseFieldValue: (t: FieldValueType, value: any) => any;
  * @returns
  */
 export declare function dataIndexToStr(dataIndex: string | number | (string | number)[]): string | number;
+type OptionType = {
+    label?: string;
+    text?: string;
+    value?: any;
+    disabled?: boolean;
+    [key: string]: any;
+};
+type ValueEnumMap = Map<string | number | boolean, ValueEnumType>;
+export declare const objectToMap: (value: ValueEnum | undefined) => ValueEnumMap;
+/**
+ * valueEnum转options array
+ * @param valueEnumParams
+ * @returns
+ */
+export declare const valueEnumToArray: (valueEnumParams: ValueEnum) => OptionType;
+/**
+ * 获取列在查询表单中的排序
+ * @param order
+ * @returns
+ */
+export declare const getColumnOrder: (order?: number) => number;
+/**
+ * 获取查询表单的placeholder
+ * @param t
+ * @param valueType
+ * @param placeholder
+ * @returns
+ */
+export declare const getPlaceholder: (t: Translator, valueType?: keyof ApTableValueFields, placeholder?: string) => string | string[] | undefined;
+/**
+ * 获取对象形式的FieldProps
+ * @param fieldProps
+ * @param record
+ * @returns
+ */
+export declare function getFieldProps<RecordType = any>(fieldProps: ApColumnType<any, any>['fieldProps'], opt?: {
+    value: any;
+    text: any;
+    record: any;
+    index: number;
+    renderIndex: number;
+    column: ApColumnType<any, RecordType>;
+}): any;
+export {};

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

@@ -1,35 +1,83 @@
-import { isObject as t, isArray as c } from "lodash-unified";
-const f = (e, r, s) => {
-  let a = {};
-  return t(e) ? Object.keys(e).forEach((n) => {
-    t(e[n]) ? a[n] = f(e[n], r[n], s) : a[n] = s(e[n], r);
-  }) : a = s(e, r), a;
-}, u = (e, r) => {
-  switch (e) {
+import { isObject as c, isArray as u, isUndefined as i, isFunction as a } from "lodash-unified";
+const f = (t, e, n) => {
+  let s = {};
+  return c(t) ? Object.keys(t).forEach((o) => {
+    c(t[o]) ? s[o] = f(t[o], e[o], n) : s[o] = n(t[o], e);
+  }) : s = n(t, e), s;
+}, p = (t, e) => {
+  switch (t) {
     case "dayjs":
-      return r.valueOf();
+      return e.valueOf();
     case "dayjsRange":
-      return r.map((s) => s.valueOf());
+      return e.map((n) => n.valueOf());
     case "dayjsDayRange": {
-      const [s, a] = r;
-      return [s.startOf("day").valueOf(), a.endOf("day").valueOf()];
+      const [n, s] = e;
+      return [n.startOf("day").valueOf(), s.endOf("day").valueOf()];
     }
     case "multiple":
     case "multipleNumber":
-      return c(r) ? r : [r];
+      return u(e) ? e : [e];
     case "boolean":
-      return r;
+      return e;
     case "object":
-      return r;
+      return e;
     default:
-      return r;
+      return e;
   }
 };
-function O(e) {
-  return c(e) ? e.join(".") : e;
+function b(t) {
+  return u(t) ? t.join(".") : t;
+}
+function d(t) {
+  const e = Object.prototype.toString.call(t).match(/^\[object (.*)\]$/)[1].toLowerCase();
+  return e === "string" && typeof t == "object" ? "object" : t === null ? "null" : t === void 0 ? "undefined" : e;
+}
+const l = (t) => d(t) === "map" ? t : new Map(Object.entries(t || {})), g = (t) => {
+  const e = [], n = l(t);
+  return n.forEach((s, o) => {
+    const r = n.get(o) || n.get(`${o}`);
+    if (r) {
+      if (typeof r == "object" && (r != null && r.text)) {
+        e.push({
+          text: r == null ? void 0 : r.text,
+          value: o,
+          label: r == null ? void 0 : r.text,
+          disabled: r.disabled
+        });
+        return;
+      }
+      e.push({
+        text: r,
+        label: r,
+        value: o
+      });
+    }
+  }), e;
+}, j = (t) => i(t) || t < 0 ? 0 : t, x = (t, e, n) => {
+  if (n)
+    return n;
+  const s = ["select", "date"], o = [
+    "text",
+    "textArea",
+    "number"
+  ];
+  if (e === "dateRange")
+    return [t("ap.common.chooseText"), t("ap.common.chooseText")];
+  if (s.includes(e))
+    return t("ap.common.chooseText");
+  if (o.includes(e))
+    return t("ap.common.inputText");
+};
+function O(t, e) {
+  return !t || !a(t) ? t : t(e);
 }
 export {
-  O as dataIndexToStr,
+  b as dataIndexToStr,
   f as formatParamsValueType,
-  u as parseFieldValue
+  j as getColumnOrder,
+  O as getFieldProps,
+  x as getPlaceholder,
+  l as objectToMap,
+  p as parseFieldValue,
+  g as valueEnumToArray
 };

package/es/src/ap-tag/style/ap-tag-group.css

@@ -2,5 +2,6 @@
   text-wrap: nowrap;
   display: flex;
   flex-wrap: nowrap;
+  white-space: nowrap;
   align-items: center;
 }

package/es/src/ap-tag/style/ap-tag.css

@@ -1,5 +1,6 @@
 .aplus-tag-wrapper {
   text-wrap: nowrap;
+  white-space: nowrap;
   display: inline-block;
 }
 .aplus-tag-inner-wrapper {

package/es/src/pro-form/components/form-action.vue2.mjs

@@ -1,12 +1,13 @@
-import { defineComponent as T, computed as u, openBlock as a, createBlock as s, unref as e, normalizeProps as z, mergeProps as p, withCtx as o, createElementVNode as V, normalizeStyle as $, createVNode as C, renderSlot as i, createTextVNode as m, toDisplayString as d, createCommentVNode as l, normalizeClass as j } from "vue";
-import { Col as F, Form as R } from "ant-design-vue";
-import { BaseButton as B } from "../../base-button/index.mjs";
-import { BasicArrow as G } from "../../basic/index.mjs";
-import { useFormContext as P } from "../hooks/use-form-context.mjs";
+import { defineComponent as T, computed as s, openBlock as a, createBlock as l, unref as e, normalizeProps as z, mergeProps as m, withCtx as o, createElementVNode as V, normalizeStyle as A, createVNode as g, renderSlot as i, createTextVNode as p, toDisplayString as d, createCommentVNode as r, normalizeClass as $ } from "vue";
+import { Col as F, Form as G } from "ant-design-vue";
+import { BaseButton as f } from "../../base-button/index.mjs";
+import { BasicArrow as R } from "../../basic/index.mjs";
+import { useFormContext as j } from "../hooks/use-form-context.mjs";
 import "../../config-provider/index.mjs";
 import "./style/form-action.css";
-import { useLocale as q } from "../../config-provider/hooks/use-locale.mjs";
-import { useNamespace as D } from "../../config-provider/hooks/use-namespace.mjs";
+import { useGlobalConfig as P } from "../../config-provider/hooks/use-global-config.mjs";
+import { useLocale as W } from "../../config-provider/hooks/use-locale.mjs";
+import { useNamespace as q } from "../../config-provider/hooks/use-namespace.mjs";
 const X = /* @__PURE__ */ T({
   name: "BasicFormAction",
   __name: "form-action",
@@ -23,75 +24,76 @@ const X = /* @__PURE__ */ T({
     hideAdvanceBtn: { type: Boolean }
   },
   emits: ["toggle-advanced"],
-  setup(h, { emit: O }) {
-    const r = h, b = O, { t: n } = q(), { em: c } = D("form-action"), { resetAction: k, submitAction: w } = P(), f = u(() => {
-      const { showAdvancedButton: t, actionSpan: A, actionColOptions: x } = r, g = 24 - A, N = t ? { span: g < 6 ? 24 : g } : {};
+  setup(h, { emit: C }) {
+    const u = h, b = C, O = P("uiMode"), k = s(() => O.value === "aplus" ? {} : {
+      color: "#34b77c"
+    }), { t: n } = W(), { em: c } = q("form-action"), { resetAction: w, submitAction: x } = j(), B = s(() => {
+      const { actionColOptions: t } = u;
       return {
-        style: { textAlign: "right" },
-        span: t ? 6 : 4,
-        ...N,
-        ...x
+        style: { textAlign: "right", flex: 1, maxWidth: "100%", minWidth: "25%" },
+        ...t
       };
-    }), v = u(() => Object.assign(
+    }), y = s(() => Object.assign(
       {
         text: n("ap.common.resetText")
       },
-      r.resetButtonOptions
-    )), y = u(() => Object.assign(
+      u.resetButtonOptions
+    )), v = s(() => Object.assign(
       {
         text: n("ap.common.queryText")
       },
-      r.submitButtonOptions
+      u.submitButtonOptions
     ));
     function S() {
       b("toggle-advanced");
     }
-    return (t, A) => t.showActionButtonGroup ? (a(), s(e(F), z(p({ key: 0 }, f.value)), {
+    return (t, N) => t.showActionButtonGroup ? (a(), l(e(F), z(m({ key: 0 }, B.value)), {
       default: o(() => [
         V("div", {
-          style: $([{ width: "100%" }, { textAlign: f.value.style.textAlign }])
+          style: A([{ width: "100%" }, { textAlign: B.value.style.textAlign }])
         }, [
-          C(e(R).Item, null, {
+          g(e(G).Item, null, {
             default: o(() => [
               i(t.$slots, "resetBefore"),
-              t.showResetButton ? (a(), s(e(B), p({
+              t.showResetButton ? (a(), l(e(f), m({
                 key: 0,
                 type: "default",
                 class: e(c)("button", "space")
-              }, v.value, { onClick: e(k) }), {
+              }, y.value, { onClick: e(w) }), {
                 default: o(() => [
-                  m(d(v.value.text), 1)
+                  p(d(y.value.text), 1)
                 ]),
                 _: 1
-              }, 16, ["class", "onClick"])) : l("", !0),
+              }, 16, ["class", "onClick"])) : r("", !0),
               i(t.$slots, "submitBefore"),
-              t.showSubmitButton ? (a(), s(e(B), p({
+              t.showSubmitButton ? (a(), l(e(f), m({
                 key: 1,
                 type: "primary",
                 class: e(c)("button", "space")
-              }, y.value, { onClick: e(w) }), {
+              }, v.value, { onClick: e(x) }), {
                 default: o(() => [
-                  m(d(y.value.text), 1)
+                  p(d(v.value.text), 1)
                 ]),
                 _: 1
-              }, 16, ["class", "onClick"])) : l("", !0),
+              }, 16, ["class", "onClick"])) : r("", !0),
               i(t.$slots, "advanceBefore"),
-              t.showAdvancedButton && !t.hideAdvanceBtn ? (a(), s(e(B), {
+              t.showAdvancedButton && !t.hideAdvanceBtn ? (a(), l(e(f), {
                 key: 2,
                 type: "link",
                 size: "small",
+                style: A(k.value),
                 onClick: S
               }, {
                 default: o(() => [
-                  m(d(t.isAdvanced ? e(n)("ap.common.closeText") : e(n)("ap.common.expandText")) + " ", 1),
-                  C(e(G), {
-                    class: j(e(c)("item", "space")),
+                  p(d(t.isAdvanced ? e(n)("ap.common.closeText") : e(n)("ap.common.expandText")) + " ", 1),
+                  g(e(R), {
+                    class: $(e(c)("item", "space")),
                     expand: !t.isAdvanced,
                     up: ""
                   }, null, 8, ["class", "expand"])
                 ]),
                 _: 1
-              })) : l("", !0),
+              }, 8, ["style"])) : r("", !0),
               i(t.$slots, "advanceAfter")
             ]),
             _: 3
@@ -99,7 +101,7 @@ const X = /* @__PURE__ */ T({
         ], 4)
       ]),
       _: 3
-    }, 16)) : l("", !0);
+    }, 16)) : r("", !0);
   }
 });
 export {

package/es/src/pro-form/hooks/use-advanced.mjs

@@ -1,79 +1,79 @@
-import { getCurrentInstance as X, computed as g, unref as d, watch as F, shallowReactive as N } from "vue";
-import { isNumber as U, isObject as _, isBoolean as j, isFunction as k } from "lodash-unified";
+import { getCurrentInstance as N, computed as T, unref as d, watch as X, shallowReactive as g } from "vue";
+import { isNumber as F, isObject as U, isBoolean as j, isFunction as k } from "lodash-unified";
 import { useDebounceFn as D } from "@vueuse/core";
 import { useBreakpoint as G, ScreenEnum as A } from "./use-break-point.mjs";
-const o = 24;
-function H({
-  advanceState: e,
-  emit: x,
-  getProps: t,
-  getSchema: l,
-  formModel: h,
-  defaultValueRef: B
+const f = 24, l = 18;
+function J({
+  advanceState: s,
+  emit: B,
+  getProps: o,
+  getSchema: h,
+  formModel: v,
+  defaultValueRef: b
 }) {
-  const p = X(), { screenRef: b, realWidthRef: v } = G(), y = g(() => {
-    if (!e.isAdvanced)
+  const p = N(), { screenRef: y, realWidthRef: L } = G(), E = T(() => {
+    if (!s.isAdvanced)
       return 0;
-    const n = d(t).emptySpan || 0;
-    if (U(n))
+    const n = d(o).emptySpan || 0;
+    if (F(n))
       return n;
-    if (_(n)) {
-      const { span: s = 0 } = n, f = d(b);
-      return n[f.toLowerCase()] || s || 0;
+    if (U(n)) {
+      const { span: e = 0 } = n, t = d(y);
+      return n[t.toLowerCase()] || e || 0;
     }
     return 0;
-  }), W = D(E, 30);
-  F(
+  }), R = D(W, 30);
+  X(
     [
-      () => d(l),
-      () => e.isAdvanced,
-      () => d(v)
+      () => d(h),
+      () => s.isAdvanced,
+      () => d(L)
     ],
     () => {
-      const { showAdvancedButton: n } = d(t);
-      n && W();
+      const { showAdvancedButton: n } = d(o);
+      n && R();
     },
     { immediate: !0 }
   );
-  function I(n, s = 0, f = !1) {
-    const c = d(v), i = parseInt(n.md) || parseInt(n.xs) || parseInt(n.sm) || n.span || o, r = parseInt(n.lg) || i, a = parseInt(n.xl) || r, u = parseInt(n.xxl) || a;
-    return c <= A.LG ? s += i : c < A.XL ? s += r : c < A.XXL ? s += a : s += u, f ? (e.hideAdvanceBtn = !1, s <= o * 2 ? (e.hideAdvanceBtn = !0, e.isAdvanced = !0) : s > o * 2 && s <= o * (d(t).autoAdvancedLine || 3) ? e.hideAdvanceBtn = !1 : e.isLoad || (e.isLoad = !0, e.isAdvanced = !e.isAdvanced), { isAdvanced: e.isAdvanced, itemColSum: s }) : s > o * (d(t).alwaysShowLines || 1) ? { isAdvanced: e.isAdvanced, itemColSum: s } : { isAdvanced: !0, itemColSum: s };
+  function I(n, e = 0, t = !1) {
+    const c = d(L), i = parseInt(n.md) || parseInt(n.xs) || parseInt(n.sm) || n.span || f, r = parseInt(n.lg) || i, a = parseInt(n.xl) || r, u = parseInt(n.xxl) || a;
+    return c <= A.LG ? e += i : c < A.XL ? e += r : c < A.XXL ? e += a : e += u, t ? (s.hideAdvanceBtn = !1, e <= f + l ? (s.hideAdvanceBtn = !0, s.isAdvanced = !0) : e > f + l && e <= f * (d(o).autoAdvancedLine || 3) ? s.hideAdvanceBtn = !1 : s.isLoad || (s.isLoad = !0, s.isAdvanced = !0), { isAdvanced: s.isAdvanced, itemColSum: e }) : e > l * (d(o).alwaysShowLines || 1) ? { isAdvanced: s.isAdvanced, itemColSum: e } : { isAdvanced: !0, itemColSum: e };
   }
-  const L = N({});
-  function E() {
+  const w = g({});
+  function W() {
     var c;
-    let n = 0, s = 0;
-    const { baseColProps: f = {} } = d(t);
-    for (const i of d(l)) {
+    let n = 0, e = 0;
+    const { baseColProps: t = {} } = d(o);
+    for (const i of d(h)) {
       const { show: r, colProps: a } = i;
       let u = !0;
       if (j(r) && (u = r), k(r) && (u = r({
         schema: i,
-        model: h,
+        model: v,
         field: i.field,
         values: {
-          ...d(B),
-          ...h
+          ...d(b),
+          ...v
         }
-      })), u && (a || f)) {
-        const { itemColSum: R, isAdvanced: w } = I(
-          { ...f, ...a },
+      })), u && (a || t)) {
+        const { itemColSum: _, isAdvanced: x } = I(
+          { ...t, ...a },
           n
         );
-        n = R || 0, w && (s = n), L[i.field] = w;
+        n = _ || 0, x && (e = n), w[i.field] = x;
       }
     }
-    (c = p == null ? void 0 : p.proxy) == null || c.$forceUpdate(), e.actionSpan = s % o + d(y), I(
-      d(t).actionColOptions || { span: o },
+    (c = p == null ? void 0 : p.proxy) == null || c.$forceUpdate(), s.actionSpan = e % f + d(E), I(
+      d(o).actionColOptions || { span: f },
       n,
       !0
-    ), x("advanced-change");
+    ), B("advanced-change");
   }
   function O() {
-    e.isAdvanced = !e.isAdvanced;
+    s.isAdvanced = !s.isAdvanced;
   }
-  return { handleToggleAdvanced: O, fieldsIsAdvancedMap: L };
+  return { handleToggleAdvanced: O, fieldsIsAdvancedMap: w };
 }
 export {
-  H as default
+  J as default
 };

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

@@ -16,6 +16,9 @@
   border-radius: 2px;
   background-color: #fff;
 }
+.aplus-pro-table-form-container .ant-form .ant-form-item {
+  margin-bottom: 16px;
+}
 .aplus-pro-table-form-container-no-divide .ant-form {
   border-bottom-left-radius: 0 !important;
   border-bottom-right-radius: 0 !important;