@aplus-frontend/ui 0.0.2 → 0.0.4

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

@@ -1,4 +1,16 @@
-import { ValueEnum, ValueEnumType } from './interface';
+import { ApColumnType, ApTableValueFields, ValueEnum, ValueEnumType } from './interface';
+import { Translator } from '../config-provider';
+import { AlignType, FixedType, Key, CellEllipsisType, DataIndex, ColumnType, GetComponentProps, ColumnGroupType } from 'ant-design-vue/es/vc-table/interface';
+import { ColumnTitle, CompareFn, SortOrder, FilterDropdownProps, FilterValue, FilterSearchType, ColumnFilterItem } from 'ant-design-vue/es/table/interface';
+import { Breakpoint } from 'ant-design-vue/es/_util/responsiveObserve';
+import { ExtractPropTypes, PropType, CSSProperties } from 'vue';
+import { VueTypeValidableDef } from '../../node_modules/vue-types';
+import { TriggerType } from 'ant-design-vue/es/tooltip/abstractTooltipProps';
+import { TooltipPlacement, AdjustOverflow } from 'ant-design-vue/es/tooltip';
+import { LiteralUnion, VueNode } from 'ant-design-vue/es/_util/type';
+import { PresetColorType } from 'ant-design-vue/es/_util/colors';
+import { AlignType, BuildInPlacements } from 'ant-design-vue/es/vc-trigger/interface';
+import { TableColumnType } from 'ant-design-vue';
 
 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;
@@ -28,5 +40,195 @@ export declare const objectToMap: (value: ValueEnum | undefined) => ValueEnumMap
  * @param valueEnumParams
  * @returns
  */
-export declare const valueEnumToArray: (valueEnumParams: ValueEnum) => OptionType;
+export declare const valueEnumToArray: (valueEnumParams: ValueEnum) => Partial<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;
+/**
+ * 获取表格的渲染类型
+ * @param item
+ * @returns
+ */
+export declare function getTableRenderType(item: ApColumnType<any, any>): "number" | "text" | "select" | "switch" | "index" | "status" | "checkbox" | "radio" | "date" | "action" | "dateRange" | "textArea";
+/**
+ * 处理表格render组件的props
+ * @param item
+ * @param renderOption
+ * @returns
+ */
+export declare function getTableRenderProps(item: ApColumnType<any, any>, renderOption: any): any;
+/**
+ * 将apColumn转化为column
+ * @param column
+ * @returns
+ */
+export declare function apColumnToColumn(column: ApColumnType<any>): {
+    align?: AlignType | undefined;
+    class?: string | undefined;
+    title?: ColumnTitle<any>;
+    width?: string | number | undefined;
+    slots?: {
+        filterIcon?: string | undefined;
+        filterDropdown?: string | undefined;
+        customRender?: string | undefined;
+        title?: string | undefined;
+    } | undefined;
+    fixed?: FixedType | undefined;
+    key?: Key | undefined;
+    responsive?: Breakpoint[] | undefined;
+    maxWidth?: number | undefined;
+    minWidth?: number | undefined;
+    ellipsis?: CellEllipsisType | undefined;
+    colSpan?: number | undefined;
+    dataIndex?: DataIndex | undefined;
+    customRender?: ((opt: {
+        value: any;
+        text: any;
+        record: any;
+        index: number;
+        renderIndex: number;
+        column: ColumnType<any>;
+    }) => any) | undefined;
+    rowSpan?: number | undefined;
+    resizable?: boolean | undefined;
+    customCell?: GetComponentProps<any> | undefined;
+    onCellClick?: ((record: any, e: MouseEvent) => void) | undefined;
+    className?: string | undefined;
+    customHeaderCell?: GetComponentProps< ColumnType<any> | ColumnGroupType<any>> | undefined;
+    customFilterDropdown?: boolean | undefined;
+    __originColumn__?: any;
+    sorter?: ((boolean | CompareFn<any> | {
+        compare?: CompareFn<any> | undefined;
+        multiple?: number | undefined;
+    }) & (string | boolean | CompareFn<any> | {
+        compare?: CompareFn<any> | undefined;
+        multiple?: number | undefined;
+    })) | undefined;
+    sortOrder?: SortOrder | undefined;
+    defaultSortOrder?: SortOrder | undefined;
+    sortDirections?: SortOrder[] | undefined;
+    showSorterTooltip?: boolean | Partial< ExtractPropTypes<{
+        title: VueTypeValidableDef<any>;
+        trigger: PropType< TriggerType | TriggerType[]>;
+        open: {
+            type: BooleanConstructor;
+            default: any;
+        };
+        visible: {
+            type: BooleanConstructor;
+            default: any;
+        };
+        placement: PropType<TooltipPlacement>;
+        color: PropType<LiteralUnion<PresetColorType>>;
+        transitionName: StringConstructor;
+        overlayStyle: {
+            type: PropType<CSSProperties>;
+            default: CSSProperties;
+        };
+        overlayInnerStyle: {
+            type: PropType<CSSProperties>;
+            default: CSSProperties;
+        };
+        overlayClassName: StringConstructor;
+        openClassName: StringConstructor;
+        prefixCls: StringConstructor;
+        mouseEnterDelay: NumberConstructor;
+        mouseLeaveDelay: NumberConstructor;
+        getPopupContainer: PropType<(triggerNode: HTMLElement) => HTMLElement>;
+        arrowPointAtCenter: {
+            type: BooleanConstructor;
+            default: any;
+        };
+        arrow: {
+            type: PropType<boolean | {
+                pointAtCenter?: boolean | undefined;
+            }>;
+            default: boolean | {
+                pointAtCenter?: boolean | undefined;
+            };
+        };
+        autoAdjustOverflow: {
+            type: PropType<boolean | AdjustOverflow>;
+            default: boolean | AdjustOverflow;
+        };
+        destroyTooltipOnHide: {
+            type: BooleanConstructor;
+            default: any;
+        };
+        align: {
+            type: PropType<AlignType>;
+            default: AlignType;
+        };
+        builtinPlacements: {
+            type: PropType<BuildInPlacements>;
+            default: BuildInPlacements;
+        };
+        children: ArrayConstructor;
+        onVisibleChange: PropType<(vis: boolean) => void>;
+        'onUpdate:visible': PropType<(vis: boolean) => void>;
+        onOpenChange: PropType<(vis: boolean) => void>;
+        'onUpdate:open': PropType<(vis: boolean) => void>;
+    }>> | undefined;
+    filtered?: boolean | undefined;
+    filterDropdown?: VueNode | ((props: FilterDropdownProps<any>) => VueNode);
+    filterMultiple?: boolean | undefined;
+    filteredValue?: FilterValue | null | undefined;
+    defaultFilteredValue?: FilterValue | null | undefined;
+    filterIcon?: VueNode | ((opt: {
+        filtered: boolean;
+        column: TableColumnType<any>;
+    }) => VueNode);
+    filterMode?: "menu" | "tree" | undefined;
+    filterSearch?: FilterSearchType<ColumnFilterItem> | undefined;
+    onFilter?: ((value: string | number | boolean, record: any) => boolean) | undefined;
+    filterDropdownOpen?: boolean | undefined;
+    onFilterDropdownOpenChange?: ((visible: boolean) => void) | undefined;
+    filterResetToDefaultFilteredValue?: boolean | undefined;
+    filterDropdownVisible?: boolean | undefined;
+    onFilterDropdownVisibleChange?: ((visible: boolean) => void) | undefined;
+    children?: ApColumnType<any, any>[] | undefined;
+    span?: number | undefined;
+    tooltip?: string | undefined;
+    copyable?: boolean | undefined;
+    hideInSearch?: boolean | undefined;
+    hideInTable?: boolean | undefined;
+    valueEnum?: ValueEnum | undefined;
+    customRenderFormItem?: ((config: ApColumnType<"text", any>) => any) | undefined;
+    valueType?: keyof ApTableValueFields | undefined;
+    fieldProps?: any;
+    order?: number | undefined;
+    filters?: true | ColumnFilterItem[] | undefined;
+};
+/**
+ * 更新查询表单的的props
+ * @param item
+ * @param fieldProps
+ * @returns
+ */
+export declare function updateFormProps(item: ApColumnType<any, any>, fieldProps: any): any;
 export {};

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

@@ -1,63 +1,110 @@
-import { isObject as c, isArray as a } from "lodash-unified";
-const u = (t, r, n) => {
+import { isObject as s, isArray as c, isUndefined as f, isFunction as l, omit as d, isBoolean as p } from "lodash-unified";
+const m = (e, t, n) => {
   let o = {};
-  return c(t) ? Object.keys(t).forEach((s) => {
-    c(t[s]) ? o[s] = u(t[s], r[s], n) : o[s] = n(t[s], r);
-  }) : o = n(t, r), o;
-}, d = (t, r) => {
-  switch (t) {
+  return s(e) ? Object.keys(e).forEach((u) => {
+    s(e[u]) ? o[u] = m(e[u], t[u], n) : o[u] = n(e[u], t);
+  }) : o = n(e, t), o;
+}, h = (e, t) => {
+  switch (e) {
     case "dayjs":
-      return r.valueOf();
+      return t.valueOf();
     case "dayjsRange":
-      return r.map((n) => n.valueOf());
+      return t.map((n) => n.valueOf());
     case "dayjsDayRange": {
-      const [n, o] = r;
+      const [n, o] = t;
       return [n.startOf("day").valueOf(), o.endOf("day").valueOf()];
     }
     case "multiple":
     case "multipleNumber":
-      return a(r) ? r : [r];
+      return c(t) ? t : [t];
     case "boolean":
-      return r;
+      return t;
     case "object":
-      return r;
+      return t;
     default:
-      return r;
+      return t;
   }
 };
-function p(t) {
-  return a(t) ? t.join(".") : t;
+function y(e) {
+  return c(e) ? e.join(".") : e;
 }
-function f(t) {
-  const r = Object.prototype.toString.call(t).match(/^\[object (.*)\]$/)[1].toLowerCase();
-  return r === "string" && typeof t == "object" ? "object" : t === null ? "null" : t === void 0 ? "undefined" : r;
+function x(e) {
+  const t = Object.prototype.toString.call(e).match(/^\[object (.*)\]$/)[1].toLowerCase();
+  return t === "string" && typeof e == "object" ? "object" : e === null ? "null" : e === void 0 ? "undefined" : t;
 }
-const i = (t) => f(t) === "map" ? t : new Map(Object.entries(t || {})), b = (t) => {
-  const r = [], n = i(t);
-  return n.forEach((o, s) => {
-    const e = n.get(s) || n.get(`${s}`);
-    if (e) {
-      if (typeof e == "object" && (e != null && e.text)) {
-        r.push({
-          text: e == null ? void 0 : e.text,
-          value: s,
-          label: e == null ? void 0 : e.text,
-          disabled: e.disabled
+const T = (e) => x(e) === "map" ? e : new Map(Object.entries(e || {})), a = (e) => {
+  const t = [], n = T(e);
+  return n.forEach((o, u) => {
+    const r = n.get(u) || n.get(`${u}`);
+    if (r) {
+      if (typeof r == "object" && (r != null && r.text)) {
+        t.push({
+          text: r == null ? void 0 : r.text,
+          value: u,
+          label: r == null ? void 0 : r.text,
+          disabled: r.disabled
         });
         return;
       }
-      r.push({
-        text: e,
-        label: e,
-        value: s
+      t.push({
+        text: r,
+        label: r,
+        value: u
       });
     }
-  }), r;
+  }), t;
+}, E = (e) => f(e) || e < 0 ? 0 : e, j = (e, t, n) => {
+  if (n)
+    return n;
+  const o = ["select", "date"], u = [
+    "text",
+    "textArea",
+    "number"
+  ];
+  if (t === "dateRange")
+    return [e("ap.common.chooseText"), e("ap.common.chooseText")];
+  if (o.includes(t))
+    return e("ap.common.chooseText");
+  if (u.includes(t))
+    return e("ap.common.inputText");
 };
+function b(e, t) {
+  return !e || !l(e) ? e : e(t);
+}
+function O(e) {
+  let t = e.valueType || "text";
+  return e.valueEnum && (t = "status"), t;
+}
+function F(e, t) {
+  const n = b(e.fieldProps, t), o = (n == null ? void 0 : n.field) || n || {}, u = e.valueType === "switch", r = e.valueType === "index", i = u ? { checked: t.value } : { value: r ? t.index + 1 : t.value };
+  return e.valueEnum && (o.valueEnum = e.valueEnum), {
+    ...d(o, ["request"]),
+    ...i
+  };
+}
+function v(e) {
+  const t = { ...e };
+  return p(e.filters) && e.filters && e.valueEnum && (t.filters = a(e.valueEnum)), t;
+}
+function w(e, t) {
+  var o;
+  const n = t || {};
+  return e.valueEnum && !((o = n.field) != null && o.options) && (n.field = {
+    ...n.field,
+    options: a(e.valueEnum)
+  }), n;
+}
 export {
-  p as dataIndexToStr,
-  u as formatParamsValueType,
-  i as objectToMap,
-  d as parseFieldValue,
-  b as valueEnumToArray
+  v as apColumnToColumn,
+  y as dataIndexToStr,
+  m as formatParamsValueType,
+  E as getColumnOrder,
+  b as getFieldProps,
+  j as getPlaceholder,
+  F as getTableRenderProps,
+  O as getTableRenderType,
+  T as objectToMap,
+  h as parseFieldValue,
+  w as updateFormProps,
+  a 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;