@aplus-frontend/ui 6.30.0 → 6.30.1

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

@@ -1,21 +1,21 @@
-import { isVNode as se, defineComponent as ie, useSlots as ue, ref as D, shallowRef as U, computed as _, unref as a, watch as z, createVNode as o, Fragment as w, createBlock as y, openBlock as p, mergeProps as ce, withCtx as B, resolveDynamicComponent as I, createElementBlock as pe, renderList as de, normalizeStyle as fe } from "vue";
-import { Col as R, Flex as k, Button as M, Row as me } from "@aplus-frontend/antdv";
+import { isVNode as se, defineComponent as ie, useSlots as ue, ref as U, shallowRef as z, computed as _, unref as a, watch as M, createVNode as o, Fragment as w, createBlock as y, openBlock as p, mergeProps as ce, withCtx as B, resolveDynamicComponent as I, createElementBlock as pe, renderList as de, normalizeStyle as fe } from "vue";
+import { Col as R, Flex as k, Button as q, Row as me } from "@aplus-frontend/antdv";
 import "../ap-form.vue.mjs";
 import "../item/index.vue2.mjs";
-import { genRealChildren as q } from "../item-group/helper.mjs";
+import { genRealChildren as H } from "../item-group/helper.mjs";
 import "../../config-provider/index.mjs";
 import { isArray as he, isBoolean as xe, omit as ye } from "lodash-unified";
-import { isDef as H } from "../../utils/index.mjs";
-import { execFunc as G, diffFormItem as ge } from "./utils.mjs";
+import { isDef as G } from "../../utils/index.mjs";
+import { execFunc as J, diffFormItem as ge } from "./utils.mjs";
 import "./components/popover-filter.vue.mjs";
 import { useCountPerRow as ve } from "./hooks/use-count-per-row.mjs";
 import "./components/popover-sorter/index.vue.mjs";
 import { useSorter as Ce } from "./hooks/use-sorter.mjs";
 import { getTargetNode as Se } from "./hooks/use-collapse-input-count.mjs";
-import { floorWith as J } from "@fruits-chain/utils";
+import { floorWith as K } from "@fruits-chain/utils";
 import { useNamespace as _e } from "../../config-provider/hooks/use-namespace.mjs";
 import { useLocale as we } from "../../config-provider/hooks/use-locale.mjs";
-import K from "../item/index.vue.mjs";
+import Q from "../item/index.vue.mjs";
 import Re from "./components/popover-filter.vue2.mjs";
 import be from "./components/popover-sorter/index.vue2.mjs";
 import Fe from "../ap-form.vue2.mjs";
@@ -119,57 +119,57 @@ const r = 100, Qe = /* @__PURE__ */ ie({
     }
   },
   setup(d, {
-    expose: Q
+    expose: X
   }) {
     const g = ue(), t = d, {
       b: f
     } = _e("ap-form-search-form"), {
       t: T
-    } = we(), X = ve(t), v = D(), Y = D();
-    function P() {
+    } = we(), Y = ve(t), v = U(), P = U();
+    function E() {
       const e = v.value?.getFieldsValueTransformed(!0);
-      G(t.onSubmit, e);
+      J(t.onSubmit, e);
     }
     function Z() {
-      t.customReset || v.value?.resetFields?.(), G(t.onReset);
+      t.customReset || v.value?.resetFields?.(), J(t.onReset);
     }
-    const ee = (e) => H(e) ? (he(e) ? e : [e]).join("") : Date.now();
-    let E = [];
-    const m = U(q(g.default())), u = U(g.extra?.()), O = _(() => J(r / a(X), 4)), {
+    const ee = (e) => G(e) ? (he(e) ? e : [e]).join("") : Date.now();
+    let O = [];
+    const m = z(H(g.default())), u = z(g.extra?.()), L = _(() => K(r / a(Y), 4)), {
       items: b,
-      sorted: L,
+      sorted: W,
       handleClickConfirm: F
     } = Ce(m);
-    z(() => g.default(), (e) => {
-      E = m.value, m.value = ge(E, q(e)), L.value = !1;
-    }), z(() => g.extra?.(), (e) => {
+    M(() => g.default(), (e) => {
+      O = m.value, m.value = ge(O, H(e)), W.value = !1;
+    }), M(() => g.extra?.(), (e) => {
       u.value = e;
     });
     function te(e) {
-      return J(e * (r / 24), 4);
+      return K(e * (r / 24), 4);
     }
     const n = _(() => {
-      const e = m.value, c = [], l = [], x = [], s = a(O);
+      const e = m.value, c = [], l = [], x = [], s = a(L);
       let C = 0, A = 0;
       const ne = r * t.maxRows - s * (a(u) && !t.extraInAction ? 2 : 1);
       e.forEach((N) => {
-        const $ = Se(N);
-        if (!$)
+        const j = Se(N);
+        if (!j)
           return;
-        const i = $.props;
-        if (xe(i.hidden) ? !!i.hidden : H(i.hidden))
+        const i = j.props;
+        if (xe(i.hidden) ? !!i.hidden : G(i.hidden))
           c.push(N);
         else {
           let S = i.span ? te(i.span) : s;
-          const j = {
+          const V = {
             node: N,
             span: S,
             key: `ApFormSearchFormItem-${ee(i.name)}-${i._signal}`
-          }, V = r - C % r;
-          V < S && (S += V), C += S, C > ne ? l.push(j) : (A = C, x.push(j));
+          }, D = r - C % r;
+          D < S && (S += D), C += S, C > ne ? l.push(V) : (A = C, x.push(V));
         }
       });
-      const W = r - (A + s) % r, le = Math.ceil(A) % r < s, re = W < s ? r : W;
+      const $ = r - (A + s) % r, le = Math.ceil(A) % r < s, re = $ < s ? r : $;
       return {
         hideNode: o(w, null, [c]),
         nodes: x,
@@ -180,10 +180,10 @@ const r = 100, Qe = /* @__PURE__ */ ie({
     }), h = (e) => `${e}%`, oe = _(() => {
       let e;
       const c = n.value.collapseNodes.length || t.sortable && m.value.length, l = o(R, {
-        flex: h(a(O)),
+        flex: h(a(L)),
         key: "actionWrapper"
       }, {
-        default: () => [o(K, null, {
+        default: () => [o(Q, null, {
           default: () => [o(k, {
             wrap: "wrap",
             justify: n.value.lastRowOnlyIncludeActionAndExtra && !(a(u) && t.extraInAction) ? "flex-end" : "space-between"
@@ -195,17 +195,17 @@ const r = 100, Qe = /* @__PURE__ */ ie({
               default: () => [c ? o("div", {
                 class: f("column-setting-trigger-wrapper")
               }, [n.value.collapseNodes.length ? o(Re, {
-                onSubmit: P,
+                onSubmit: E,
                 config: n.value.collapseNodes,
                 submitLoading: t.submitLoading
               }, null) : null, t.sortable && b.value.length ? o(be, {
-                ref: "sorterIns",
+                ref: P,
                 items: b.value,
                 onClickConfirm: F,
-                sorted: L.value
-              }, null) : null]) : null, o(M, {
+                sorted: W.value
+              }, null) : null]) : null, o(q, {
                 type: "primary",
-                onClick: P,
+                onClick: E,
                 loading: t.submitLoading ? {
                   delay: t.loadingDelay
                 } : !1,
@@ -213,7 +213,7 @@ const r = 100, Qe = /* @__PURE__ */ ie({
                 class: f("action-btn")
               }, {
                 default: () => [t.searchText || T("ap.apForm.search.search")]
-              }), o(M, {
+              }), o(q, {
                 onClick: Z,
                 type: "text",
                 class: [f("action-btn"), f("action-btn-reset")]
@@ -227,7 +227,7 @@ const r = 100, Qe = /* @__PURE__ */ ie({
         flex: h(n.value.extraSpan),
         key: "extraNode"
       }, {
-        default: () => [o(K, null, {
+        default: () => [o(Q, null, {
           default: () => [o(k, {
             justify: n.value.extraSpan === r || n.value.lastRowOnlyIncludeActionAndExtra ? "start" : "flex-end"
           }, Ae(e = a(u)) ? e : {
@@ -240,10 +240,10 @@ const r = 100, Qe = /* @__PURE__ */ ie({
       return n.value.lastRowOnlyIncludeActionAndExtra ? o(w, null, [x || s, l]) : o(w, null, [l, x]);
     });
     function ae() {
-      const e = Y.value?.getCachedList();
+      const e = P.value?.getCachedList();
       F(e);
     }
-    return Q({
+    return X({
       apForm: _(() => a(v)),
       getSorterItems: () => b.value,
       setSorterItems: F,

package/es/src/business/ap-view/ap-view.vue2.mjs

@@ -39,15 +39,15 @@ const Ke = /* @__PURE__ */ $({
   setup(F, {
     expose: N
   }) {
-    const s = F, _ = te("viewCacheOption"), {
+    const o = F, _ = te("viewCacheOption"), {
       b: V
     } = ae("ap-view"), {
-      t: O
+      t: I
     } = ie(), d = C(() => ({
       viewKey: u,
-      viewName: O("ap.apView.systemView")
+      viewName: I("ap.apView.systemView")
     })), {
-      getSearchFormValues: I,
+      getSearchFormValues: O,
       setSearchFormValues: L,
       submit: x,
       reset: B,
@@ -55,20 +55,20 @@ const Ke = /* @__PURE__ */ $({
       getSearchFormSorterItems: k,
       setSearchFormSorterItems: A,
       resetSearchFormSorterItems: P
-    } = Z(), T = p(!1), S = p(!1), v = p("");
+    } = Z(), T = p(!1), S = p(!1), w = p("");
     let c = !1, b = !1;
     const W = {
       dropdownType: "dropdown",
       content: K(se, {
-        maxViewNum: s.maxViewNum
+        maxViewNum: o.maxViewNum
       }, null)
-    }, a = p([d.value]), j = C(() => a.value.map((e) => ({
-      id: e.viewKey,
+    }, i = p([d.value]), j = C(() => i.value.map((t) => ({
+      id: t.viewKey,
       content: K(oe, {
-        view: e
+        view: t
       }, null)
-    }))), o = {
-      getSearchFormValues: I,
+    }))), r = {
+      getSearchFormValues: O,
       setSearchFormValues: L,
       submit: x,
       reset: B,
@@ -76,112 +76,112 @@ const Ke = /* @__PURE__ */ $({
       getSearchFormSorterItems: k,
       setSearchFormSorterItems: A,
       resetSearchFormSorterItems: P,
-      ...s.saveDataSource
-    }, w = {
+      ...o.saveDataSource
+    }, v = {
       ..._.value,
-      ...s.viewCacheOption
-    }, g = () => s.isDefaultSystemView ? u : (s.isFirstDefaultSystemView || b) && c ? u : a.value.find((i) => i.isDefault)?.viewKey ?? u, n = (e) => {
-      v.value = e;
-      const i = a.value.find((t) => t.viewKey === v.value);
-      i && setTimeout(() => {
-        i.viewKey === u ? c ? s.manual || o?.submitWith?.() : (o?.resetSearchFormSorterItems?.(), s.manual || o?.reset?.()) : (o?.setSearchFormValues?.({
-          ...Object.fromEntries(Object.keys(o?.getSearchFormValues?.() ?? {}).map((t) => [t, void 0])) ?? {},
-          ...i.viewConfig?.searchForm ?? {}
-        }), o?.setSearchFormSorterItems?.(i.viewConfig?.sorterItems ?? []), c ? s.manual || o?.submitWith?.() : o?.submit?.()), c = !1;
+      ...o.viewCacheOption
+    }, g = () => o.isDefaultSystemView ? u : (o.isFirstDefaultSystemView || b) && c ? u : i.value.find((a) => a.isDefault)?.viewKey ?? u, l = (t) => {
+      w.value = t;
+      const a = i.value.find((e) => e.viewKey === w.value);
+      a && setTimeout(() => {
+        a.viewKey === u ? c ? o.manual || r?.submitWith?.() : o.manual || (r?.resetSearchFormSorterItems?.(), r?.reset?.()) : (r?.setSearchFormValues?.({
+          ...Object.fromEntries(Object.keys(r?.getSearchFormValues?.() ?? {}).map((e) => [e, void 0])) ?? {},
+          ...r?.getSearchFormSorterItems?.()?.reduce((e, s) => (a.viewConfig?.searchForm?.[s.name] && (e[s.name] = a.viewConfig?.searchForm?.[s.name]), e), {}) ?? {}
+        }), r?.setSearchFormSorterItems?.(a.viewConfig?.sorterItems ?? []), c ? o.manual || r?.submitWith?.() : r?.submit?.()), c = !1;
       });
     }, D = {
-      getViewList: async (e) => {
+      getViewList: async (t) => {
         try {
           const {
-            tableKey: i
-          } = e, t = await w?.getViewList?.({
-            tableKey: i
+            tableKey: a
+          } = t, e = await v?.getViewList?.({
+            tableKey: a
           });
-          return a.value = [d.value, ...t ?? []], n(g()), a.value;
+          return i.value = [d.value, ...e ?? []], l(g()), i.value;
         } catch {
-          return a.value = [d.value], n(u), a.value;
+          return i.value = [d.value], l(u), i.value;
         }
       },
-      addView: async (e) => {
+      addView: async (t) => {
         const {
-          tableKey: i,
-          viewKey: t,
-          viewName: r,
-          isDefault: l,
+          tableKey: a,
+          viewKey: e,
+          viewName: s,
+          isDefault: n,
           viewConfig: f
-        } = e;
-        await w?.addView?.({
-          tableKey: i,
-          viewKey: t,
-          viewName: r,
-          isDefault: l,
+        } = t;
+        await v?.addView?.({
+          tableKey: a,
+          viewKey: e,
+          viewName: s,
+          isDefault: n,
           viewConfig: f
-        }), l && (a.value = a.value.map((m) => ({
+        }), n && (i.value = i.value.map((m) => ({
           ...m,
           isDefault: !1
-        }))), a.value = [...a.value, {
-          viewKey: t,
-          viewName: r,
-          isDefault: l,
+        }))), i.value = [...i.value, {
+          viewKey: e,
+          viewName: s,
+          isDefault: n,
           viewConfig: f
-        }], n(t);
+        }], l(e);
       },
-      changeView: async (e) => {
+      changeView: async (t) => {
         const {
-          tableKey: i,
-          viewKey: t,
-          viewName: r,
-          isDefault: l,
+          tableKey: a,
+          viewKey: e,
+          viewName: s,
+          isDefault: n,
           viewConfig: f
-        } = e;
-        await w?.changeView?.({
-          tableKey: i,
-          viewKey: t,
-          viewName: r,
-          isDefault: l,
+        } = t;
+        await v?.changeView?.({
+          tableKey: a,
+          viewKey: e,
+          viewName: s,
+          isDefault: n,
           viewConfig: f
-        }), l && (a.value = a.value.map((h) => ({
+        }), n && (i.value = i.value.map((h) => ({
           ...h,
           isDefault: !1
         })));
-        const m = a.value.find((h) => h.viewKey === t);
-        m && (m.viewName = r, m.isDefault = l, m.viewConfig = f), n(t);
+        const m = i.value.find((h) => h.viewKey === e);
+        m && (m.viewName = s, m.isDefault = n, m.viewConfig = f), l(e);
       },
-      removeView: async (e) => {
+      removeView: async (t) => {
         const {
-          tableKey: i,
-          viewKey: t
-        } = e;
-        await w?.removeView?.({
-          tableKey: i,
-          viewKey: t
-        }), a.value = a.value.filter((r) => r.viewKey !== t), t === v.value && n(g());
+          tableKey: a,
+          viewKey: e
+        } = t;
+        await v?.removeView?.({
+          tableKey: a,
+          viewKey: e
+        }), i.value = i.value.filter((s) => s.viewKey !== e), e === w.value && l(g());
       }
     }, G = {
-      tableKey: s.tableKey,
-      currentViewKey: v,
-      changeCurrentViewKey: n,
+      tableKey: o.tableKey,
+      currentViewKey: w,
+      changeCurrentViewKey: l,
       popoverOpen: T,
       menuOpen: S,
-      viewList: a,
+      viewList: i,
       viewListCRUD: D,
-      saveDataSource: o
+      saveDataSource: r
     };
-    return X(G), U(() => s.tableKey, (e) => {
-      ee(e) && (c = !0, D?.getViewList?.({
-        tableKey: e
+    return X(G), U(() => o.tableKey, (t) => {
+      ee(t) && (c = !0, D?.getViewList?.({
+        tableKey: t
       }));
     }, {
       immediate: !0
     }), N({
-      setFirstDefaultSystemView: (e) => {
-        b = e;
+      setFirstDefaultSystemView: (t) => {
+        b = t;
       }
-    }), (e, i) => (z(), Y(y(Q), M({
-      ...e.$attrs
+    }), (t, a) => (z(), Y(y(Q), M({
+      ...t.$attrs
     }, {
       open: S.value,
-      "onUpdate:open": i[0] || (i[0] = (t) => S.value = t),
+      "onUpdate:open": a[0] || (a[0] = (e) => S.value = e),
       class: [y(V)()],
       "button-props": W,
       "menu-list": j.value,

package/es/src/business/ap-view/interface.d.ts

@@ -1,23 +1,31 @@
 import { ApFormSearchFormPopoverSorterItem } from '../../ap-form';
 import { Recordable } from '../../type';
 export interface SaveDataSource {
+    /** 获取表单数据 */
     getSearchFormValues?: (transform?: boolean) => (Partial<Recordable> & Recordable<any>) | undefined;
+    /** 设置表单数据 */
     setSearchFormValues?: (values: Partial<Recordable>) => void;
+    /** 提交 */
     submit?: () => void;
+    /** 表格submitWith,非表格则和submit传递一致函数即可 */
     submitWith?: () => void;
+    /** 重置 */
     reset?: () => void;
+    /** 获取表单排序 */
     getSearchFormSorterItems?: () => ApFormSearchFormPopoverSorterItem[];
+    /** 设置表单排序 */
     setSearchFormSorterItems?: (sortedItems: ApFormSearchFormPopoverSorterItem[]) => void;
+    /** 重置表单排序 */
     resetSearchFormSorterItems?: () => void;
-    /**
-     * 是否转换搜索表单,默认为 false
-     */
+    /** 是否转换搜索表单,默认为 false */
     searchFormTransform?: boolean;
 }
 export interface ViewCacheOption {
+    /** 获取视图列表 */
     getViewList?: (option: {
         tableKey: string;
     }) => Promise<ViewListModel[]>;
+    /** 添加视图 */
     addView?: (option: {
         tableKey: string;
         viewName: string;
@@ -25,6 +33,7 @@ export interface ViewCacheOption {
         viewConfig?: Recordable;
         isDefault?: boolean;
     }) => Promise<void>;
+    /** 设置视图 */
     changeView?: (option: {
         tableKey: string;
         viewName: string;
@@ -32,6 +41,7 @@ export interface ViewCacheOption {
         viewConfig?: Recordable;
         isDefault?: boolean;
     }) => Promise<void>;
+    /** 删除视图 */
     removeView?: (option: {
         tableKey: string;
         viewKey: string;

package/es/src/mask/utils.d.ts

@@ -1,2 +1,2 @@
-export declare function lockScrollable(): () => void;
+export declare function lockScrollable(): (() => void) | undefined;
 export declare const getMaskZIndex: () => number;

package/es/src/mask/utils.mjs

@@ -1,21 +1,37 @@
-function o() {
-  const t = `aplus-ui-locker-${Date.now()}`;
-  let e = document.querySelector(`style#${t}`);
-  return e || (e = document.createElement("style"), e.id = t, e.innerHTML = `
+import { getScrollbarSize as i } from "../utils/index.mjs";
+function d(o) {
+  if (!o || o.nodeType !== Node.ELEMENT_NODE)
+    return {
+      x: !1,
+      y: !1
+    };
+  const e = window.getComputedStyle(o), l = e.overflowX, t = e.overflowY, n = l === "scroll" || l === "auto", r = t === "scroll" || t === "auto", c = o.scrollWidth > o.clientWidth, s = o.scrollHeight > o.clientHeight;
+  return {
+    x: n && c,
+    y: r && s
+  };
+}
+function f() {
+  const o = `aplus-ui-locker-${Date.now()}`, { y: e } = d(document.body);
+  if (!e)
+    return;
+  const l = i();
+  let t = document.querySelector(`style#${o}`);
+  return t || (t = document.createElement("style"), t.id = o, t.innerHTML = `
       html body {
       overflow-y: hidden;
-      width: calc(100% - 15px);
+      width: calc(100% - ${l || 15}px);
     }
-    `, document.head.appendChild(e)), () => {
-    e.remove();
+    `, document.head.appendChild(t)), () => {
+    t.remove();
   };
 }
-function n() {
-  let t = 99;
-  return () => ++t;
+function a() {
+  let o = 99;
+  return () => ++o;
 }
-const r = n();
+const y = a();
 export {
-  r as getMaskZIndex,
-  o as lockScrollable
+  y as getMaskZIndex,
+  f as lockScrollable
 };

package/es/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.30.0";
+declare const _default: "6.30.1";
 export default _default;

package/es/src/version.mjs

@@ -1,4 +1,4 @@
-const e = "6.30.0";
+const e = "6.30.1";
 export {
   e as default
 };

package/lib/src/ap-form/search-form/index.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),l=require("@aplus-frontend/antdv");require("../ap-form.vue.js");require("../item/index.vue2.js");const P=require("../item-group/helper.js");require("../../config-provider/index.js");const w=require("lodash-unified"),E=require("../../utils/index.js"),F=require("./utils.js");require("./components/popover-filter.vue.js");const Q=require("./hooks/use-count-per-row.js");require("./components/popover-sorter/index.vue.js");const X=require("./hooks/use-sorter.js"),Y=require("./hooks/use-collapse-input-count.js"),O=require("@fruits-chain/utils"),Z=require("../../config-provider/hooks/use-namespace.js"),ee=require("../../config-provider/hooks/use-locale.js"),D=require("../item/index.vue.js"),te=require("./components/popover-filter.vue2.js"),oe=require("./components/popover-sorter/index.vue2.js"),ne=require("../ap-form.vue2.js");function ae(d){return typeof d=="function"||Object.prototype.toString.call(d)==="[object Object]"&&!e.isVNode(d)}const r=100,le=e.defineComponent({name:"ApFormSearchForm",__name:"index",props:{layout:{default:"horizontal"},labelCol:{},wrapperCol:{},colon:{type:Boolean,default:!0},labelAlign:{default:"right"},labelWrap:{type:Boolean},prefixCls:{},requiredMark:{},hideRequiredMark:{type:Boolean,default:!1},rules:{},validateMessages:{},validateOnRuleChange:{type:Boolean,default:!0},scrollToFirstError:{},onSubmit:{},name:{},validateTrigger:{default:"change"},size:{},disabled:{type:Boolean},onFieldsChange:{},onFinish:{},onFinishFailed:{},onValidate:{},variant:{},initialValues:{},onValuesChange:{},syncToUrl:{type:[Boolean,Function]},syncToUrlPriority:{type:Boolean},collapse:{type:Boolean,default:void 0},defaultCollapse:{type:Boolean,default:!0},"onUpdate:collapse":{},searchText:{},resetText:{},onReset:{},customReset:{type:Boolean,default:!1},extraInAction:{type:Boolean,default:!1},forceExpand:{type:Boolean,default:!1},countPerRow:{default:5},submitLoading:{type:Boolean},maxRows:{default:2},sortable:{type:Boolean,default:!0},resizeTarget:{},loadingDelay:{default:300}},setup(d,{expose:L}){const x=e.useSlots(),o=d,{b:p}=Z.useNamespace("ap-form-search-form"),{t:B}=ee.useLocale(),W=Q.useCountPerRow(o),g=e.ref(),j=e.ref();function R(){const t=g.value?.getFieldsValueTransformed(!0);F.execFunc(o.onSubmit,t)}function M(){o.customReset||g.value?.resetFields?.(),F.execFunc(o.onReset)}const U=t=>E.isDef(t)?(w.isArray(t)?t:[t]).join(""):Date.now();let b=[];const f=e.shallowRef(P.genRealChildren(x.default())),c=e.shallowRef(x.extra?.()),k=e.computed(()=>O.floorWith(r/e.unref(W),4)),{items:v,sorted:q,handleClickConfirm:C}=X.useSorter(f);e.watch(()=>x.default(),t=>{b=f.value,f.value=F.diffFormItem(b,P.genRealChildren(t)),q.value=!1}),e.watch(()=>x.extra?.(),t=>{c.value=t});function $(t){return O.floorWith(t*(r/24),4)}const n=e.computed(()=>{const t=f.value,i=[],a=[],h=[],s=e.unref(k);let y=0,N=0;const G=r*o.maxRows-s*(e.unref(c)&&!o.extraInAction?2:1);t.forEach(S=>{const A=Y.getTargetNode(S);if(!A)return;const u=A.props;if(w.isBoolean(u.hidden)?!!u.hidden:E.isDef(u.hidden))i.push(S);else{let _=u.span?$(u.span):s;const I={node:S,span:_,key:`ApFormSearchFormItem-${U(u.name)}-${u._signal}`},T=r-y%r;T<_&&(_+=T),y+=_,y>G?a.push(I):(N=y,h.push(I))}});const V=r-(N+s)%r,J=Math.ceil(N)%r<s,K=V<s?r:V;return{hideNode:e.createVNode(e.Fragment,null,[i]),nodes:h,collapseNodes:a,extraSpan:K,lastRowOnlyIncludeActionAndExtra:J}}),m=t=>`${t}%`,z=e.computed(()=>{let t;const i=n.value.collapseNodes.length||o.sortable&&f.value.length,a=e.createVNode(l.Col,{flex:m(e.unref(k)),key:"actionWrapper"},{default:()=>[e.createVNode(D.default,null,{default:()=>[e.createVNode(l.Flex,{wrap:"wrap",justify:n.value.lastRowOnlyIncludeActionAndExtra&&!(e.unref(c)&&o.extraInAction)?"flex-end":"space-between"},{default:()=>[e.createVNode(l.Flex,{gap:8,wrap:"wrap"},{default:()=>[i?e.createVNode("div",{class:p("column-setting-trigger-wrapper")},[n.value.collapseNodes.length?e.createVNode(te.default,{onSubmit:R,config:n.value.collapseNodes,submitLoading:o.submitLoading},null):null,o.sortable&&v.value.length?e.createVNode(oe.default,{ref:"sorterIns",items:v.value,onClickConfirm:C,sorted:q.value},null):null]):null,e.createVNode(l.Button,{type:"primary",onClick:R,loading:o.submitLoading?{delay:o.loadingDelay}:!1,htmlType:"submit",class:p("action-btn")},{default:()=>[o.searchText||B("ap.apForm.search.search")]}),e.createVNode(l.Button,{onClick:M,type:"text",class:[p("action-btn"),p("action-btn-reset")]},{default:()=>[o.resetText||B("ap.apForm.search.reset")]})]}),o.extraInAction?e.unref(c):null]})]})]}),h=!o.extraInAction&&e.unref(c)?e.createVNode(l.Col,{flex:m(n.value.extraSpan),key:"extraNode"},{default:()=>[e.createVNode(D.default,null,{default:()=>[e.createVNode(l.Flex,{justify:n.value.extraSpan===r||n.value.lastRowOnlyIncludeActionAndExtra?"start":"flex-end"},ae(t=e.unref(c))?t:{default:()=>[t]})]})]}):null,s=e.createVNode(l.Col,{flex:m(n.value.extraSpan)},null);return n.value.lastRowOnlyIncludeActionAndExtra?e.createVNode(e.Fragment,null,[h||s,a]):e.createVNode(e.Fragment,null,[a,h])});function H(){const t=j.value?.getCachedList();C(t)}return L({apForm:e.computed(()=>e.unref(g)),getSorterItems:()=>v.value,setSorterItems:C,resetSorterItems:H}),(t,i)=>(e.openBlock(),e.createBlock(ne.default,e.mergeProps({ref_key:"apForm",ref:g,class:e.unref(p)()},e.unref(w.omit)(o,["collapse","defaultCollapse","onUpdate:collapse","searchText","resetText","onSubmit","onReset","extraInAction","forceExpand","countPerRow"])),{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n.value.hideNode))),e.createVNode(e.unref(l.Row),{gutter:8},{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(n.value.nodes,a=>(e.openBlock(),e.createBlock(e.unref(l.Col),{key:a.key,flex:m(a.span),style:e.normalizeStyle({maxWidth:m(a.span)})},{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(a.node)))]),_:2},1032,["flex","style"]))),128)),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(z.value)))]),_:1})]),_:1},16,["class"]))}});exports.default=le;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),l=require("@aplus-frontend/antdv");require("../ap-form.vue.js");require("../item/index.vue2.js");const E=require("../item-group/helper.js");require("../../config-provider/index.js");const w=require("lodash-unified"),O=require("../../utils/index.js"),F=require("./utils.js");require("./components/popover-filter.vue.js");const Q=require("./hooks/use-count-per-row.js");require("./components/popover-sorter/index.vue.js");const X=require("./hooks/use-sorter.js"),Y=require("./hooks/use-collapse-input-count.js"),D=require("@fruits-chain/utils"),Z=require("../../config-provider/hooks/use-namespace.js"),ee=require("../../config-provider/hooks/use-locale.js"),L=require("../item/index.vue.js"),te=require("./components/popover-filter.vue2.js"),oe=require("./components/popover-sorter/index.vue2.js"),ne=require("../ap-form.vue2.js");function ae(d){return typeof d=="function"||Object.prototype.toString.call(d)==="[object Object]"&&!e.isVNode(d)}const r=100,le=e.defineComponent({name:"ApFormSearchForm",__name:"index",props:{layout:{default:"horizontal"},labelCol:{},wrapperCol:{},colon:{type:Boolean,default:!0},labelAlign:{default:"right"},labelWrap:{type:Boolean},prefixCls:{},requiredMark:{},hideRequiredMark:{type:Boolean,default:!1},rules:{},validateMessages:{},validateOnRuleChange:{type:Boolean,default:!0},scrollToFirstError:{},onSubmit:{},name:{},validateTrigger:{default:"change"},size:{},disabled:{type:Boolean},onFieldsChange:{},onFinish:{},onFinishFailed:{},onValidate:{},variant:{},initialValues:{},onValuesChange:{},syncToUrl:{type:[Boolean,Function]},syncToUrlPriority:{type:Boolean},collapse:{type:Boolean,default:void 0},defaultCollapse:{type:Boolean,default:!0},"onUpdate:collapse":{},searchText:{},resetText:{},onReset:{},customReset:{type:Boolean,default:!1},extraInAction:{type:Boolean,default:!1},forceExpand:{type:Boolean,default:!1},countPerRow:{default:5},submitLoading:{type:Boolean},maxRows:{default:2},sortable:{type:Boolean,default:!0},resizeTarget:{},loadingDelay:{default:300}},setup(d,{expose:W}){const x=e.useSlots(),o=d,{b:p}=Z.useNamespace("ap-form-search-form"),{t:B}=ee.useLocale(),j=Q.useCountPerRow(o),g=e.ref(),R=e.ref();function b(){const t=g.value?.getFieldsValueTransformed(!0);F.execFunc(o.onSubmit,t)}function M(){o.customReset||g.value?.resetFields?.(),F.execFunc(o.onReset)}const U=t=>O.isDef(t)?(w.isArray(t)?t:[t]).join(""):Date.now();let k=[];const f=e.shallowRef(E.genRealChildren(x.default())),c=e.shallowRef(x.extra?.()),q=e.computed(()=>D.floorWith(r/e.unref(j),4)),{items:v,sorted:V,handleClickConfirm:C}=X.useSorter(f);e.watch(()=>x.default(),t=>{k=f.value,f.value=F.diffFormItem(k,E.genRealChildren(t)),V.value=!1}),e.watch(()=>x.extra?.(),t=>{c.value=t});function $(t){return D.floorWith(t*(r/24),4)}const n=e.computed(()=>{const t=f.value,i=[],a=[],h=[],s=e.unref(q);let y=0,N=0;const G=r*o.maxRows-s*(e.unref(c)&&!o.extraInAction?2:1);t.forEach(S=>{const I=Y.getTargetNode(S);if(!I)return;const u=I.props;if(w.isBoolean(u.hidden)?!!u.hidden:O.isDef(u.hidden))i.push(S);else{let _=u.span?$(u.span):s;const T={node:S,span:_,key:`ApFormSearchFormItem-${U(u.name)}-${u._signal}`},P=r-y%r;P<_&&(_+=P),y+=_,y>G?a.push(T):(N=y,h.push(T))}});const A=r-(N+s)%r,J=Math.ceil(N)%r<s,K=A<s?r:A;return{hideNode:e.createVNode(e.Fragment,null,[i]),nodes:h,collapseNodes:a,extraSpan:K,lastRowOnlyIncludeActionAndExtra:J}}),m=t=>`${t}%`,z=e.computed(()=>{let t;const i=n.value.collapseNodes.length||o.sortable&&f.value.length,a=e.createVNode(l.Col,{flex:m(e.unref(q)),key:"actionWrapper"},{default:()=>[e.createVNode(L.default,null,{default:()=>[e.createVNode(l.Flex,{wrap:"wrap",justify:n.value.lastRowOnlyIncludeActionAndExtra&&!(e.unref(c)&&o.extraInAction)?"flex-end":"space-between"},{default:()=>[e.createVNode(l.Flex,{gap:8,wrap:"wrap"},{default:()=>[i?e.createVNode("div",{class:p("column-setting-trigger-wrapper")},[n.value.collapseNodes.length?e.createVNode(te.default,{onSubmit:b,config:n.value.collapseNodes,submitLoading:o.submitLoading},null):null,o.sortable&&v.value.length?e.createVNode(oe.default,{ref:R,items:v.value,onClickConfirm:C,sorted:V.value},null):null]):null,e.createVNode(l.Button,{type:"primary",onClick:b,loading:o.submitLoading?{delay:o.loadingDelay}:!1,htmlType:"submit",class:p("action-btn")},{default:()=>[o.searchText||B("ap.apForm.search.search")]}),e.createVNode(l.Button,{onClick:M,type:"text",class:[p("action-btn"),p("action-btn-reset")]},{default:()=>[o.resetText||B("ap.apForm.search.reset")]})]}),o.extraInAction?e.unref(c):null]})]})]}),h=!o.extraInAction&&e.unref(c)?e.createVNode(l.Col,{flex:m(n.value.extraSpan),key:"extraNode"},{default:()=>[e.createVNode(L.default,null,{default:()=>[e.createVNode(l.Flex,{justify:n.value.extraSpan===r||n.value.lastRowOnlyIncludeActionAndExtra?"start":"flex-end"},ae(t=e.unref(c))?t:{default:()=>[t]})]})]}):null,s=e.createVNode(l.Col,{flex:m(n.value.extraSpan)},null);return n.value.lastRowOnlyIncludeActionAndExtra?e.createVNode(e.Fragment,null,[h||s,a]):e.createVNode(e.Fragment,null,[a,h])});function H(){const t=R.value?.getCachedList();C(t)}return W({apForm:e.computed(()=>e.unref(g)),getSorterItems:()=>v.value,setSorterItems:C,resetSorterItems:H}),(t,i)=>(e.openBlock(),e.createBlock(ne.default,e.mergeProps({ref_key:"apForm",ref:g,class:e.unref(p)()},e.unref(w.omit)(o,["collapse","defaultCollapse","onUpdate:collapse","searchText","resetText","onSubmit","onReset","extraInAction","forceExpand","countPerRow"])),{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n.value.hideNode))),e.createVNode(e.unref(l.Row),{gutter:8},{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(n.value.nodes,a=>(e.openBlock(),e.createBlock(e.unref(l.Col),{key:a.key,flex:m(a.span),style:e.normalizeStyle({maxWidth:m(a.span)})},{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(a.node)))]),_:2},1032,["flex","style"]))),128)),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(z.value)))]),_:1})]),_:1},16,["class"]))}});exports.default=le;

package/lib/src/business/ap-view/ap-view.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue");require("../../config-provider/index.js");const B=require("./icons/line-down.vue.js"),P=require("../ap-batch-action-group/index.js");require("./components/main-button-content.vue.js");require("./components/menu-list-content.vue.js");const j=require("./hooks/use-view-provide.js"),k=require("../../ap-table/context.js"),m=require("./utils/enum.js"),A=require("@aplus-frontend/utils"),G=require("../../config-provider/hooks/use-global-config.js"),U=require("../../config-provider/hooks/use-namespace.js"),z=require("../../config-provider/hooks/use-locale.js"),R=require("./components/main-button-content.vue2.js"),$=require("./components/menu-list-content.vue2.js"),H=e.defineComponent({name:"ApView",__name:"ap-view",props:{tableKey:{},saveDataSource:{},viewCacheOption:{},maxViewNum:{default:20},isDefaultSystemView:{type:Boolean,default:!1},isFirstDefaultSystemView:{type:Boolean,default:!1},manual:{type:Boolean,default:!1}},setup(g,{expose:h}){const r=g,E=G.useGlobalConfig("viewCacheOption"),{b:y}=U.useNamespace("ap-view"),{t:C}=z.useLocale(),d=e.computed(()=>({viewKey:m.SYSTEM_VIEW_KEY,viewName:C("ap.apView.systemView")})),{getSearchFormValues:D,setSearchFormValues:q,submit:F,reset:I,submitWith:N,getSearchFormSorterItems:Y,setSearchFormSorterItems:O,resetSearchFormSorterItems:T}=k.useInjectApTable(),L=e.ref(!1),V=e.ref(!1),w=e.ref("");let v=!1,_=!1;const W={dropdownType:"dropdown",content:e.createVNode(R.default,{maxViewNum:r.maxViewNum},null)},i=e.ref([d.value]),M=e.computed(()=>i.value.map(t=>({id:t.viewKey,content:e.createVNode($.default,{view:t},null)}))),o={getSearchFormValues:D,setSearchFormValues:q,submit:F,reset:I,submitWith:N,getSearchFormSorterItems:Y,setSearchFormSorterItems:O,resetSearchFormSorterItems:T,...r.saveDataSource},p={...E.value,...r.viewCacheOption},K=()=>r.isDefaultSystemView||(r.isFirstDefaultSystemView||_)&&v?m.SYSTEM_VIEW_KEY:i.value.find(s=>s.isDefault)?.viewKey??m.SYSTEM_VIEW_KEY,l=t=>{w.value=t;const s=i.value.find(a=>a.viewKey===w.value);s&&setTimeout(()=>{s.viewKey===m.SYSTEM_VIEW_KEY?v?r.manual||o?.submitWith?.():(o?.resetSearchFormSorterItems?.(),r.manual||o?.reset?.()):(o?.setSearchFormValues?.({...Object.fromEntries(Object.keys(o?.getSearchFormValues?.()??{}).map(a=>[a,void 0]))??{},...s.viewConfig?.searchForm??{}}),o?.setSearchFormSorterItems?.(s.viewConfig?.sorterItems??[]),v?r.manual||o?.submitWith?.():o?.submit?.()),v=!1})},b={getViewList:async t=>{try{const{tableKey:s}=t,a=await p?.getViewList?.({tableKey:s});return i.value=[d.value,...a??[]],l(K()),i.value}catch{return i.value=[d.value],l(m.SYSTEM_VIEW_KEY),i.value}},addView:async t=>{const{tableKey:s,viewKey:a,viewName:u,isDefault:n,viewConfig:f}=t;await p?.addView?.({tableKey:s,viewKey:a,viewName:u,isDefault:n,viewConfig:f}),n&&(i.value=i.value.map(c=>({...c,isDefault:!1}))),i.value=[...i.value,{viewKey:a,viewName:u,isDefault:n,viewConfig:f}],l(a)},changeView:async t=>{const{tableKey:s,viewKey:a,viewName:u,isDefault:n,viewConfig:f}=t;await p?.changeView?.({tableKey:s,viewKey:a,viewName:u,isDefault:n,viewConfig:f}),n&&(i.value=i.value.map(S=>({...S,isDefault:!1})));const c=i.value.find(S=>S.viewKey===a);c&&(c.viewName=u,c.isDefault=n,c.viewConfig=f),l(a)},removeView:async t=>{const{tableKey:s,viewKey:a}=t;await p?.removeView?.({tableKey:s,viewKey:a}),i.value=i.value.filter(u=>u.viewKey!==a),a===w.value&&l(K())}},x={tableKey:r.tableKey,currentViewKey:w,changeCurrentViewKey:l,popoverOpen:L,menuOpen:V,viewList:i,viewListCRUD:b,saveDataSource:o};return j.useViewProvide(x),e.watch(()=>r.tableKey,t=>{A.isValid(t)&&(v=!0,b?.getViewList?.({tableKey:t}))},{immediate:!0}),h({setFirstDefaultSystemView:t=>{_=t}}),(t,s)=>(e.openBlock(),e.createBlock(e.unref(P.ApBatchActionGroup),e.mergeProps({...t.$attrs},{open:V.value,"onUpdate:open":s[0]||(s[0]=a=>V.value=a),class:[e.unref(y)()],"button-props":W,"menu-list":M.value,"overlay-class-name":[e.unref(y)("overlay")],trigger:"click",placement:"bottom"}),{icon:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass([e.unref(y)("icon")])},[e.createVNode(B.default)],2)]),_:1},16,["open","class","menu-list","overlay-class-name"]))}});exports.default=H;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const t=require("vue");require("../../config-provider/index.js");const B=require("./icons/line-down.vue.js"),P=require("../ap-batch-action-group/index.js");require("./components/main-button-content.vue.js");require("./components/menu-list-content.vue.js");const j=require("./hooks/use-view-provide.js"),k=require("../../ap-table/context.js"),m=require("./utils/enum.js"),A=require("@aplus-frontend/utils"),G=require("../../config-provider/hooks/use-global-config.js"),U=require("../../config-provider/hooks/use-namespace.js"),z=require("../../config-provider/hooks/use-locale.js"),R=require("./components/main-button-content.vue2.js"),$=require("./components/menu-list-content.vue2.js"),H=t.defineComponent({name:"ApView",__name:"ap-view",props:{tableKey:{},saveDataSource:{},viewCacheOption:{},maxViewNum:{default:20},isDefaultSystemView:{type:Boolean,default:!1},isFirstDefaultSystemView:{type:Boolean,default:!1},manual:{type:Boolean,default:!1}},setup(g,{expose:h}){const o=g,C=G.useGlobalConfig("viewCacheOption"),{b:y}=U.useNamespace("ap-view"),{t:E}=z.useLocale(),d=t.computed(()=>({viewKey:m.SYSTEM_VIEW_KEY,viewName:E("ap.apView.systemView")})),{getSearchFormValues:D,setSearchFormValues:F,submit:q,reset:I,submitWith:N,getSearchFormSorterItems:Y,setSearchFormSorterItems:O,resetSearchFormSorterItems:T}=k.useInjectApTable(),L=t.ref(!1),V=t.ref(!1),w=t.ref("");let v=!1,_=!1;const W={dropdownType:"dropdown",content:t.createVNode(R.default,{maxViewNum:o.maxViewNum},null)},s=t.ref([d.value]),M=t.computed(()=>s.value.map(a=>({id:a.viewKey,content:t.createVNode($.default,{view:a},null)}))),n={getSearchFormValues:D,setSearchFormValues:F,submit:q,reset:I,submitWith:N,getSearchFormSorterItems:Y,setSearchFormSorterItems:O,resetSearchFormSorterItems:T,...o.saveDataSource},p={...C.value,...o.viewCacheOption},K=()=>o.isDefaultSystemView||(o.isFirstDefaultSystemView||_)&&v?m.SYSTEM_VIEW_KEY:s.value.find(i=>i.isDefault)?.viewKey??m.SYSTEM_VIEW_KEY,l=a=>{w.value=a;const i=s.value.find(e=>e.viewKey===w.value);i&&setTimeout(()=>{i.viewKey===m.SYSTEM_VIEW_KEY?v?o.manual||n?.submitWith?.():o.manual||(n?.resetSearchFormSorterItems?.(),n?.reset?.()):(n?.setSearchFormValues?.({...Object.fromEntries(Object.keys(n?.getSearchFormValues?.()??{}).map(e=>[e,void 0]))??{},...n?.getSearchFormSorterItems?.()?.reduce((e,r)=>(i.viewConfig?.searchForm?.[r.name]&&(e[r.name]=i.viewConfig?.searchForm?.[r.name]),e),{})??{}}),n?.setSearchFormSorterItems?.(i.viewConfig?.sorterItems??[]),v?o.manual||n?.submitWith?.():n?.submit?.()),v=!1})},b={getViewList:async a=>{try{const{tableKey:i}=a,e=await p?.getViewList?.({tableKey:i});return s.value=[d.value,...e??[]],l(K()),s.value}catch{return s.value=[d.value],l(m.SYSTEM_VIEW_KEY),s.value}},addView:async a=>{const{tableKey:i,viewKey:e,viewName:r,isDefault:u,viewConfig:f}=a;await p?.addView?.({tableKey:i,viewKey:e,viewName:r,isDefault:u,viewConfig:f}),u&&(s.value=s.value.map(c=>({...c,isDefault:!1}))),s.value=[...s.value,{viewKey:e,viewName:r,isDefault:u,viewConfig:f}],l(e)},changeView:async a=>{const{tableKey:i,viewKey:e,viewName:r,isDefault:u,viewConfig:f}=a;await p?.changeView?.({tableKey:i,viewKey:e,viewName:r,isDefault:u,viewConfig:f}),u&&(s.value=s.value.map(S=>({...S,isDefault:!1})));const c=s.value.find(S=>S.viewKey===e);c&&(c.viewName=r,c.isDefault=u,c.viewConfig=f),l(e)},removeView:async a=>{const{tableKey:i,viewKey:e}=a;await p?.removeView?.({tableKey:i,viewKey:e}),s.value=s.value.filter(r=>r.viewKey!==e),e===w.value&&l(K())}},x={tableKey:o.tableKey,currentViewKey:w,changeCurrentViewKey:l,popoverOpen:L,menuOpen:V,viewList:s,viewListCRUD:b,saveDataSource:n};return j.useViewProvide(x),t.watch(()=>o.tableKey,a=>{A.isValid(a)&&(v=!0,b?.getViewList?.({tableKey:a}))},{immediate:!0}),h({setFirstDefaultSystemView:a=>{_=a}}),(a,i)=>(t.openBlock(),t.createBlock(t.unref(P.ApBatchActionGroup),t.mergeProps({...a.$attrs},{open:V.value,"onUpdate:open":i[0]||(i[0]=e=>V.value=e),class:[t.unref(y)()],"button-props":W,"menu-list":M.value,"overlay-class-name":[t.unref(y)("overlay")],trigger:"click",placement:"bottom"}),{icon:t.withCtx(()=>[t.createElementVNode("div",{class:t.normalizeClass([t.unref(y)("icon")])},[t.createVNode(B.default)],2)]),_:1},16,["open","class","menu-list","overlay-class-name"]))}});exports.default=H;

package/lib/src/business/ap-view/interface.d.ts

@@ -1,23 +1,31 @@
 import { ApFormSearchFormPopoverSorterItem } from '../../ap-form';
 import { Recordable } from '../../type';
 export interface SaveDataSource {
+    /** 获取表单数据 */
     getSearchFormValues?: (transform?: boolean) => (Partial<Recordable> & Recordable<any>) | undefined;
+    /** 设置表单数据 */
     setSearchFormValues?: (values: Partial<Recordable>) => void;
+    /** 提交 */
     submit?: () => void;
+    /** 表格submitWith,非表格则和submit传递一致函数即可 */
     submitWith?: () => void;
+    /** 重置 */
     reset?: () => void;
+    /** 获取表单排序 */
     getSearchFormSorterItems?: () => ApFormSearchFormPopoverSorterItem[];
+    /** 设置表单排序 */
     setSearchFormSorterItems?: (sortedItems: ApFormSearchFormPopoverSorterItem[]) => void;
+    /** 重置表单排序 */
     resetSearchFormSorterItems?: () => void;
-    /**
-     * 是否转换搜索表单,默认为 false
-     */
+    /** 是否转换搜索表单,默认为 false */
     searchFormTransform?: boolean;
 }
 export interface ViewCacheOption {
+    /** 获取视图列表 */
     getViewList?: (option: {
         tableKey: string;
     }) => Promise<ViewListModel[]>;
+    /** 添加视图 */
     addView?: (option: {
         tableKey: string;
         viewName: string;
@@ -25,6 +33,7 @@ export interface ViewCacheOption {
         viewConfig?: Recordable;
         isDefault?: boolean;
     }) => Promise<void>;
+    /** 设置视图 */
     changeView?: (option: {
         tableKey: string;
         viewName: string;
@@ -32,6 +41,7 @@ export interface ViewCacheOption {
         viewConfig?: Recordable;
         isDefault?: boolean;
     }) => Promise<void>;
+    /** 删除视图 */
     removeView?: (option: {
         tableKey: string;
         viewKey: string;

package/lib/src/mask/utils.d.ts

@@ -1,2 +1,2 @@
-export declare function lockScrollable(): () => void;
+export declare function lockScrollable(): (() => void) | undefined;
 export declare const getMaskZIndex: () => number;

package/lib/src/mask/utils.js

@@ -1,6 +1,6 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});function n(){const t=`aplus-ui-locker-${Date.now()}`;let e=document.querySelector(`style#${t}`);return e||(e=document.createElement("style"),e.id=t,e.innerHTML=`
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("../utils/index.js");function d(o){if(!o||o.nodeType!==Node.ELEMENT_NODE)return{x:!1,y:!1};const t=window.getComputedStyle(o),l=t.overflowX,e=t.overflowY,n=l==="scroll"||l==="auto",c=e==="scroll"||e==="auto",r=o.scrollWidth>o.clientWidth,s=o.scrollHeight>o.clientHeight;return{x:n&&r,y:c&&s}}function a(){const o=`aplus-ui-locker-${Date.now()}`,{y:t}=d(document.body);if(!t)return;const l=i.getScrollbarSize();let e=document.querySelector(`style#${o}`);return e||(e=document.createElement("style"),e.id=o,e.innerHTML=`
       html body {
       overflow-y: hidden;
-      width: calc(100% - 15px);
+      width: calc(100% - ${l||15}px);
     }
-    `,document.head.appendChild(e)),()=>{e.remove()}}function l(){let t=99;return()=>++t}const o=l();exports.getMaskZIndex=o;exports.lockScrollable=n;
+    `,document.head.appendChild(e)),()=>{e.remove()}}function u(){let o=99;return()=>++o}const f=u();exports.getMaskZIndex=f;exports.lockScrollable=a;

package/lib/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.30.0";
+declare const _default: "6.30.1";
 export default _default;

package/lib/src/version.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="6.30.0";exports.default=e;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="6.30.1";exports.default=e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "6.30.0",
+  "version": "6.30.1",
   "main": "./lib/index.js",
   "type": "module",
   "files": [

package/theme/antdv-override.css

@@ -262,9 +262,6 @@
 [data-aplus-ui-mode='aplus'] .ant-input-number .ant-input-number-input-wrap > input::placeholder {
   color: #abb7cc;
 }
-[data-aplus-ui-mode='aplus'] .ant-input-clear-icon {
-  line-height: 18px;
-}
 [data-aplus-ui-mode='aplus'] .ant-tooltip div[role='tooltip'] {
   padding-block: 6px;
 }
@@ -542,9 +539,6 @@
 [data-aplus-ui-mode='admin'] .ant-input-number .ant-input-number-input-wrap > input::placeholder {
   color: #bfbfbf;
 }
-[data-aplus-ui-mode='admin'] .ant-input-clear-icon {
-  line-height: 18px;
-}
 [data-aplus-ui-mode='admin'] .ant-drawer-right .ant-drawer-content-wrapper {
   box-shadow: -8px 2px 24px 0 rgba(51, 51, 51, 0.2);
 }

package/theme/antdv-override.less

@@ -299,10 +299,6 @@
   .ant-input-number .ant-input-number-input-wrap > input::placeholder {
     color: #abb7cc;
   }
-
-  .ant-input-clear-icon {
-    line-height: 18px;
-  }
   // Tooltip
   .ant-tooltip div[role='tooltip'] {
     padding-block: 6px;
@@ -624,10 +620,6 @@
     color: #bfbfbf;
   }
 
-  .ant-input-clear-icon {
-    line-height: 18px;
-  }
-
   // Drawer
   .ant-drawer {
     &-right {

package/theme/ap-expand-alert/ap-expand-alert.css

@@ -60,11 +60,7 @@
   transition: all 0.3s;
   transform: rotateZ(0deg);
 }
-.aplus-ap-expand-alert__alertContent {
-  color: #182948;
-}
 .aplus-ap-expand-alert__prefix {
-  color: #182948;
   display: inline-block;
 }
 .aplus-ap-expand-alert__showItem {

package/theme/ap-expand-alert/ap-expand-alert.less

@@ -26,13 +26,14 @@
 
   }
 
-  &__alertContent {
-    color: #182948;
-  }
+  // 此处颜色不写死，根据UIMode自动切换
+  // &__alertContent {
+  //   color: #182948;
+  // }
 
-  // 考虑多端样式
+  // 此处颜色不写死，根据UIMode自动切换
   &__prefix {
-    color: #182948;
+    // color: #182948;
     display: inline-block;
   }
   &__text {

package/theme/ap-view/ap-view.css

@@ -136,6 +136,10 @@
   align-items: center;
   color: var(--ap-text-color-3);
 }
+.aplus-ap-view-menu-list-content .menu-list-content-action-delete svg {
+  outline: none;
+  box-shadow: none;
+}
 .aplus-ap-view-menu-list-content .menu-list-content-edit {
   display: flex;
   align-items: center;

package/theme/ap-view/ap-view.less

@@ -88,6 +88,10 @@
         display: flex;
         align-items: center;
         color: var(--ap-text-color-3);
+        svg {
+          outline: none;
+          box-shadow: none;
+        }
       }
     }
     

package/theme/index.css

@@ -363,9 +363,6 @@
 [data-aplus-ui-mode='aplus'] .ant-input-number .ant-input-number-input-wrap > input::placeholder {
   color: #abb7cc;
 }
-[data-aplus-ui-mode='aplus'] .ant-input-clear-icon {
-  line-height: 18px;
-}
 [data-aplus-ui-mode='aplus'] .ant-tooltip div[role='tooltip'] {
   padding-block: 6px;
 }
@@ -643,9 +640,6 @@
 [data-aplus-ui-mode='admin'] .ant-input-number .ant-input-number-input-wrap > input::placeholder {
   color: #bfbfbf;
 }
-[data-aplus-ui-mode='admin'] .ant-input-clear-icon {
-  line-height: 18px;
-}
 [data-aplus-ui-mode='admin'] .ant-drawer-right .ant-drawer-content-wrapper {
   box-shadow: -8px 2px 24px 0 rgba(51, 51, 51, 0.2);
 }
@@ -1022,11 +1016,7 @@
   transition: all 0.3s;
   transform: rotateZ(0deg);
 }
-.aplus-ap-expand-alert__alertContent {
-  color: #182948;
-}
 .aplus-ap-expand-alert__prefix {
-  color: #182948;
   display: inline-block;
 }
 .aplus-ap-expand-alert__showItem {
@@ -4087,6 +4077,10 @@ div.aplus-ap-info-layout-admin__header-shadow.aplus-ap-info-layout-admin__sticky
   align-items: center;
   color: var(--ap-text-color-3);
 }
+.aplus-ap-view-menu-list-content .menu-list-content-action-delete svg {
+  outline: none;
+  box-shadow: none;
+}
 .aplus-ap-view-menu-list-content .menu-list-content-edit {
   display: flex;
   align-items: center;