@aplus-frontend/ui 0.6.7 → 0.6.8

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

@@ -166,6 +166,10 @@ export type ApFormSearchFormProps = ApFormProps & {
      * 尺寸监听目标元素（用于响应式）
      */
     resizeTarget?: HTMLElement | null;
+    /**
+     * 查询按钮loading延迟（默认300ms）
+     */
+    loadingDelay?: number;
 };
 export type ApFormSearchFormPopoverFilterProps = {
     config: Array<{

package/es/src/ap-form/search-form/index.vue.d.ts

@@ -858,6 +858,7 @@ declare const __VLS_component: DefineComponent<ApFormSearchFormProps, {
     forceExpand: boolean;
     maxRows: number;
     sortable: boolean;
+    loadingDelay: number;
 }, {}, {}, {}, string, ComponentProvideOptions, false, {
     apForm: ({
         $: ComponentInternalInstance;

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

@@ -1,10 +1,10 @@
-import { isVNode as le, defineComponent as re, useSlots as se, ref as U, shallowRef as W, computed as S, unref as n, watch as M, createVNode as t, Fragment as _, createBlock as g, openBlock as d, mergeProps as ie, withCtx as B, resolveDynamicComponent as I, createElementBlock as ue, renderList as ce } from "vue";
-import { Col as w, Flex as N, Button as z, Row as pe } from "@aplus-frontend/antdv";
+import { isVNode as le, defineComponent as re, useSlots as se, ref as D, shallowRef as U, computed as S, unref as n, watch as W, createVNode as o, Fragment as _, createBlock as g, openBlock as d, mergeProps as ie, withCtx as B, resolveDynamicComponent as I, createElementBlock as ue, renderList as ce } from "vue";
+import { Col as w, Flex as N, Button as M, Row as pe } from "@aplus-frontend/antdv";
 import "../ap-form.vue.mjs";
 import "../item/index.vue2.mjs";
-import { genRealChildren as D } from "../item-group/helper.mjs";
+import { genRealChildren as z } from "../item-group/helper.mjs";
 import "../../config-provider/index.mjs";
-import { isArray as de, isBoolean as me, omit as fe } from "lodash-unified";
+import { isArray as de, isBoolean as fe, omit as me } from "lodash-unified";
 import { isDef as q } from "../../utils/index.mjs";
 import { execFunc as H, diffFormItem as he } from "./utils.mjs";
 import "./components/popover-filter.vue.mjs";
@@ -17,10 +17,10 @@ import G from "../item/index.vue.mjs";
 import Ce from "./components/popover-filter.vue2.mjs";
 import Se from "./components/popover-sorter/index.vue2.mjs";
 import _e from "../ap-form.vue2.mjs";
-function we(m) {
-  return typeof m == "function" || Object.prototype.toString.call(m) === "[object Object]" && !le(m);
+function we(f) {
+  return typeof f == "function" || Object.prototype.toString.call(f) === "[object Object]" && !le(f);
 }
-const s = 24, De = /* @__PURE__ */ re({
+const s = 24, ze = /* @__PURE__ */ re({
   name: "ApFormSearchForm",
   __name: "index",
   props: {
@@ -110,36 +110,39 @@ const s = 24, De = /* @__PURE__ */ re({
       type: Boolean,
       default: !0
     },
-    resizeTarget: {}
+    resizeTarget: {},
+    loadingDelay: {
+      default: 300
+    }
   },
-  setup(m, {
+  setup(f, {
     expose: J
   }) {
     var L;
-    const i = se(), o = m, {
-      b: f
+    const i = se(), t = f, {
+      b: m
     } = ye("ap-form-search-form"), {
       t: k
-    } = ve(), K = xe(o), y = U(), Q = U();
+    } = ve(), K = xe(t), y = D(), Q = D();
     function T() {
       var a;
       const e = (a = y.value) == null ? void 0 : a.getFieldsValueTransformed(!0);
-      H(o.onSubmit, e);
+      H(t.onSubmit, e);
     }
     function X() {
       var e, a;
-      o.customReset || (a = (e = y.value) == null ? void 0 : e.resetFields) == null || a.call(e), H(o.onReset);
+      t.customReset || (a = (e = y.value) == null ? void 0 : e.resetFields) == null || a.call(e), H(t.onReset);
     }
     const Y = (e) => q(e) ? (de(e) ? e : [e]).join("") : Date.now();
     let E = [];
-    const h = W(D(i.default())), c = W((L = i.extra) == null ? void 0 : L.call(i)), P = S(() => Math.floor(s / n(K))), {
+    const h = U(z(i.default())), c = U((L = i.extra) == null ? void 0 : L.call(i)), P = S(() => Math.floor(s / n(K))), {
       items: R,
       sorted: O,
       handleClickConfirm: b
     } = ge(h);
-    M(() => i.default(), (e) => {
-      E = h.value, h.value = he(E, D(e)), O.value = !1;
-    }), M(() => {
+    W(() => i.default(), (e) => {
+      E = h.value, h.value = he(E, z(e)), O.value = !1;
+    }), W(() => {
       var e;
       return (e = i.extra) == null ? void 0 : e.call(i);
     }, (e) => {
@@ -148,10 +151,10 @@ const s = 24, De = /* @__PURE__ */ re({
     const l = S(() => {
       const e = h.value, a = [], r = [], x = [], u = n(P);
       let v = 0, F = 0;
-      const te = s * o.maxRows - u * (n(c) && !o.extraInAction ? 2 : 1);
+      const te = s * t.maxRows - u * (n(c) && !t.extraInAction ? 2 : 1);
       e.forEach((A, ne) => {
         const p = A.props;
-        if (me(p.hidden) ? !!p.hidden : q(p.hidden))
+        if (fe(p.hidden) ? !!p.hidden : q(p.hidden))
           a.push(A);
         else {
           let C = p.span || u;
@@ -165,7 +168,7 @@ const s = 24, De = /* @__PURE__ */ re({
       });
       const $ = s - (F + u) % s, oe = F % s < u, ae = $ < u ? s : $;
       return {
-        hideNode: t(_, null, [a]),
+        hideNode: o(_, null, [a]),
         nodes: x,
         collapseNodes: r,
         extraSpan: ae,
@@ -173,63 +176,65 @@ const s = 24, De = /* @__PURE__ */ re({
       };
     }), Z = S(() => {
       let e;
-      const a = l.value.collapseNodes.length || o.sortable && h.value.length, r = t(w, {
+      const a = l.value.collapseNodes.length || t.sortable && h.value.length, r = o(w, {
         span: n(P),
         key: "actionWrapper"
       }, {
-        default: () => [t(G, null, {
-          default: () => [t(N, {
+        default: () => [o(G, null, {
+          default: () => [o(N, {
             wrap: "wrap",
-            justify: l.value.lastRowOnlyIncludeActionAndExtra && !(n(c) && o.extraInAction) ? "flex-end" : "space-between"
+            justify: l.value.lastRowOnlyIncludeActionAndExtra && !(n(c) && t.extraInAction) ? "flex-end" : "space-between"
           }, {
-            default: () => [t(N, {
+            default: () => [o(N, {
               gap: 8,
               wrap: "wrap"
             }, {
-              default: () => [a ? t("div", {
-                class: f("column-setting-trigger-wrapper")
-              }, [l.value.collapseNodes.length ? t(Ce, {
+              default: () => [a ? o("div", {
+                class: m("column-setting-trigger-wrapper")
+              }, [l.value.collapseNodes.length ? o(Ce, {
                 onSubmit: T,
                 config: l.value.collapseNodes,
-                submitLoading: o.submitLoading
-              }, null) : null, o.sortable && R.value.length ? t(Se, {
+                submitLoading: t.submitLoading
+              }, null) : null, t.sortable && R.value.length ? o(Se, {
                 ref: "sorterIns",
                 items: R.value,
                 onClickConfirm: b,
                 sorted: O.value
-              }, null) : null]) : null, t(z, {
+              }, null) : null]) : null, o(M, {
                 type: "primary",
                 onClick: T,
-                loading: o.submitLoading,
+                loading: t.submitLoading ? {
+                  delay: t.loadingDelay
+                } : !1,
                 htmlType: "submit",
-                class: f("action-btn")
+                class: m("action-btn")
               }, {
-                default: () => [o.searchText || k("ap.apForm.search.search")]
-              }), t(z, {
+                default: () => [t.searchText || k("ap.apForm.search.search")]
+              }), o(M, {
                 onClick: X,
                 type: "text",
-                class: [f("action-btn"), f("action-btn-reset")]
+                class: [m("action-btn"), m("action-btn-reset")]
               }, {
-                default: () => [o.resetText || k("ap.apForm.search.reset")]
+                default: () => [t.resetText || k("ap.apForm.search.reset")]
               })]
-            }), o.extraInAction ? n(c) : null]
+            }), t.extraInAction ? n(c) : null]
           })]
         })]
-      }), x = !o.extraInAction && n(c) ? t(w, {
+      }), x = !t.extraInAction && n(c) ? o(w, {
         span: l.value.extraSpan,
         key: "extraNode"
       }, {
-        default: () => [t(G, null, {
-          default: () => [t(N, {
+        default: () => [o(G, null, {
+          default: () => [o(N, {
             justify: l.value.extraSpan === s || l.value.lastRowOnlyIncludeActionAndExtra ? "start" : "flex-end"
           }, we(e = n(c)) ? e : {
             default: () => [e]
           })]
         })]
-      }) : null, u = t(w, {
+      }) : null, u = o(w, {
         span: l.value.extraSpan
       }, null);
-      return l.value.lastRowOnlyIncludeActionAndExtra ? t(_, null, [x || u, r]) : t(_, null, [r, x]);
+      return l.value.lastRowOnlyIncludeActionAndExtra ? o(_, null, [x || u, r]) : o(_, null, [r, x]);
     });
     function ee() {
       var a;
@@ -244,9 +249,9 @@ const s = 24, De = /* @__PURE__ */ re({
     }), (e, a) => (d(), g(_e, ie({
       ref_key: "apForm",
       ref: y,
-      class: n(f)()
-    }, n(fe)(o, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
-      default: B(() => [(d(), g(I(l.value.hideNode))), t(n(pe), {
+      class: n(m)()
+    }, n(me)(t, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
+      default: B(() => [(d(), g(I(l.value.hideNode))), o(n(pe), {
         gutter: 8
       }, {
         default: B(() => [(d(!0), ue(_, null, ce(l.value.nodes, (r) => (d(), g(n(w), {
@@ -263,5 +268,5 @@ const s = 24, De = /* @__PURE__ */ re({
   }
 });
 export {
-  De as default
+  ze as default
 };

package/es/src/business/ap-radio-group/ap-radio-group.vue.d.ts

@@ -14,8 +14,8 @@ declare const _default: DefineComponent<__VLS_Props, {}, {}, {}, {}, ComponentOp
     "onUpdate:value"?: ((value: string | number) => any) | undefined;
 }>, {
     value: string | number;
-    options: RadioOptionType[];
     delay: number;
+    options: RadioOptionType[];
     optionStyle: RadioOptionStyleType;
 }, {}, {}, {}, string, ComponentProvideOptions, false, {}, HTMLDivElement>;
 export default _default;

package/es/src/business/ap-radio-group/index.d.ts

@@ -15,8 +15,8 @@ declare const ApRadioGroup: {
         "update:value": (value: string | number) => any;
     }, PublicProps, {
         value: string | number;
-        options: RadioOptionType[];
         delay: number;
+        options: RadioOptionType[];
         optionStyle: RadioOptionStyleType;
     }, false, {}, {}, GlobalComponents, GlobalDirectives, string, {}, HTMLDivElement, ComponentProvideOptions, {
         P: {};
@@ -35,8 +35,8 @@ declare const ApRadioGroup: {
         "onUpdate:value"?: ((value: string | number) => any) | undefined;
     }>, {}, {}, {}, {}, {
         value: string | number;
-        options: RadioOptionType[];
         delay: number;
+        options: RadioOptionType[];
         optionStyle: RadioOptionStyleType;
     }>;
     __isFragment?: never;
@@ -55,8 +55,8 @@ declare const ApRadioGroup: {
     "update:value": (value: string | number) => any;
 }, string, {
     value: string | number;
-    options: RadioOptionType[];
     delay: number;
+    options: RadioOptionType[];
     optionStyle: RadioOptionStyleType;
 }, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & ( Plugin & (new (...args: any[]) => {
     $props: {

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

@@ -1,6 +1,6 @@
 import { ColumnsType } from '@aplus-frontend/antdv/es/table';
 import { AlignType, DataIndex, Key } from '@aplus-frontend/antdv/es/vc-table/interface';
-import { ApColumnType } from 'src/ap-table';
+import { ApColumnType } from '../../ap-table';
 export type SummaryColumnType = ApColumnType[] | ColumnsType;
 export type ValueType = {
     [key in string]: any;

package/es/src/business/hooks/useKeepAliveFlag.d.ts

@@ -0,0 +1,14 @@
+interface UseKeepAliveFlagOptions {
+    /** 状态切换到deactivated时触发 */
+    afterDeactivated?: () => void;
+}
+/**
+ * 获取keepAliveFlag
+ * @returns
+ */
+export declare function useKeepAliveFlag(options?: UseKeepAliveFlagOptions): {
+    isDeactivated: () => boolean;
+    isActivated: () => boolean;
+    registerAfterDeactivated: (fn: UseKeepAliveFlagOptions["afterDeactivated"]) => void;
+};
+export {};

package/es/src/business/hooks/useKeepAliveFlag.mjs

@@ -0,0 +1,18 @@
+import { onActivated as v, onDeactivated as c } from "vue";
+function l(a) {
+  let e = "notKeepAlive", t = a == null ? void 0 : a.afterDeactivated;
+  return v(() => {
+    e = "activated";
+  }), c(() => {
+    e = "deactivated", t == null || t();
+  }), {
+    isDeactivated: () => e === "deactivated",
+    isActivated: () => e === "activated",
+    registerAfterDeactivated: (i) => {
+      t = i;
+    }
+  };
+}
+export {
+  l as useKeepAliveFlag
+};

package/es/src/business/hooks/usePageListApGrid.d.ts

@@ -19,6 +19,10 @@ export interface UsePageListApGrid extends ApGridProps {
      * 表格刷新相关
      */
     tableRefresh?: boolean | Omit<UseTableRefreshOption, 'apTableRef'>;
+    /** 是否需要在deactivated的时候清空数据
+     * @default true
+     */
+    clearDataOnDeactivated?: boolean;
 }
 /**
  * 集成了列表页面的ApGrid的默认配置

package/es/src/business/hooks/usePageListApGrid.mjs

@@ -1,39 +1,56 @@
 import "../index.mjs";
-import { merge as c, cloneDeep as S } from "lodash-unified";
-import { ref as v } from "vue";
-import { useTableRefresh as g } from "./useTableRefresh.mjs";
-function T(s) {
-  const o = v(null), {
-    isShowRowSelection: i = !0,
-    clearSelectionOnRequest: f = !0,
+import { merge as i, cloneDeep as F } from "lodash-unified";
+import { ref as R } from "vue";
+import { useKeepAliveFlag as w } from "./useKeepAliveFlag.mjs";
+import { useTableRefresh as V } from "./useTableRefresh.mjs";
+function E(s) {
+  const o = R(null), {
+    isShowRowSelection: f = !0,
+    clearSelectionOnRequest: d = !0,
     transformSearchFormValues: a,
     api: l,
-    tableRefresh: d = !0,
-    virtual: m,
-    ...p
+    tableRefresh: m = !0,
+    virtual: p,
+    clearDataOnDeactivated: h = !0,
+    ...v
   } = s || {};
   let n = null;
   const u = () => {
     var e, r;
     (r = (e = o.value) == null ? void 0 : e.rowSelection) == null || r.clearAll();
   };
-  return g({
-    ...R(d),
+  V({
+    ...b(m),
     apTableRef: o
-  }), [c(
+  });
+  const c = () => {
+    var e;
+    (e = o.value) == null || e.submit();
+  }, S = () => {
+    var e;
+    (e = o.value) == null || e.reset();
+  }, { isDeactivated: g } = w({
+    afterDeactivated: c
+  });
+  return [i(
     {
       // scroll，tableLayout，columnResizable设置表格可拖动
       scroll: { x: "100%", y: "100%" },
       columnResizable: !0,
       request: l ? async (e) => {
+        if (g() && h)
+          return {
+            data: [],
+            total: 0
+          };
         n = e.sort;
         const r = a ? a(e) : e;
         try {
           if (!l) throw new Error("api is not defined");
-          const { records: t, total: h } = await l(r);
-          return f && u(), {
+          const { records: t, total: A } = await l(r);
+          return d && u(), {
             data: t,
-            total: h
+            total: A
           };
         } catch (t) {
           return console.error(t), {
@@ -42,33 +59,27 @@ function T(s) {
           };
         }
       } : void 0,
-      rowSelection: i ? {
+      rowSelection: f ? {
         fixed: "left",
         columnWidth: 38
       } : void 0,
       ref(e) {
         o.value = e;
       },
-      virtual: c(
+      virtual: i(
         {
           oSize: 20,
           y: 20
         },
-        m
+        p
       ),
       // 新UI规范，需要都添加分割线
       card: !0
     },
-    p
+    v
   ), {
-    reload: () => {
-      var e;
-      (e = o.value) == null || e.submit();
-    },
-    reset: () => {
-      var e;
-      (e = o.value) == null || e.reset();
-    },
+    reload: c,
+    reset: S,
     getSearchFormValues: (e = !0) => {
       var t;
       const r = ((t = o.value) == null ? void 0 : t.getSearchFormValues(!!e)) || {};
@@ -78,16 +89,16 @@ function T(s) {
     getSearchFormValuesAndSorted: (e = !0) => {
       var t;
       const r = ((t = o.value) == null ? void 0 : t.getSearchFormValues(!!e)) || {};
-      return r.sort = n && S(n), a ? a(r) : r;
+      return r.sort = n && F(n), a ? a(r) : r;
     },
     clearSelection: u
   }];
 }
-function R(s) {
+function b(s) {
   return s === !0 ? {} : s === !1 ? {
     refreshBefore: () => !1
   } : s;
 }
 export {
-  T as usePageListApGrid
+  E as usePageListApGrid
 };

package/es/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.6.7";
+declare const _default: "0.6.8";
 export default _default;

package/es/src/version.mjs

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

package/lib/src/ap-form/interface.d.ts

@@ -166,6 +166,10 @@ export type ApFormSearchFormProps = ApFormProps & {
      * 尺寸监听目标元素（用于响应式）
      */
     resizeTarget?: HTMLElement | null;
+    /**
+     * 查询按钮loading延迟（默认300ms）
+     */
+    loadingDelay?: number;
 };
 export type ApFormSearchFormPopoverFilterProps = {
     config: Array<{

package/lib/src/ap-form/search-form/index.vue.d.ts

@@ -858,6 +858,7 @@ declare const __VLS_component: DefineComponent<ApFormSearchFormProps, {
     forceExpand: boolean;
     maxRows: number;
     sortable: boolean;
+    loadingDelay: number;
 }, {}, {}, {}, string, ComponentProvideOptions, false, {
     apForm: ({
         $: ComponentInternalInstance;

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

package/lib/src/business/ap-radio-group/ap-radio-group.vue.d.ts

@@ -14,8 +14,8 @@ declare const _default: DefineComponent<__VLS_Props, {}, {}, {}, {}, ComponentOp
     "onUpdate:value"?: ((value: string | number) => any) | undefined;
 }>, {
     value: string | number;
-    options: RadioOptionType[];
     delay: number;
+    options: RadioOptionType[];
     optionStyle: RadioOptionStyleType;
 }, {}, {}, {}, string, ComponentProvideOptions, false, {}, HTMLDivElement>;
 export default _default;

package/lib/src/business/ap-radio-group/index.d.ts

@@ -15,8 +15,8 @@ declare const ApRadioGroup: {
         "update:value": (value: string | number) => any;
     }, PublicProps, {
         value: string | number;
-        options: RadioOptionType[];
         delay: number;
+        options: RadioOptionType[];
         optionStyle: RadioOptionStyleType;
     }, false, {}, {}, GlobalComponents, GlobalDirectives, string, {}, HTMLDivElement, ComponentProvideOptions, {
         P: {};
@@ -35,8 +35,8 @@ declare const ApRadioGroup: {
         "onUpdate:value"?: ((value: string | number) => any) | undefined;
     }>, {}, {}, {}, {}, {
         value: string | number;
-        options: RadioOptionType[];
         delay: number;
+        options: RadioOptionType[];
         optionStyle: RadioOptionStyleType;
     }>;
     __isFragment?: never;
@@ -55,8 +55,8 @@ declare const ApRadioGroup: {
     "update:value": (value: string | number) => any;
 }, string, {
     value: string | number;
-    options: RadioOptionType[];
     delay: number;
+    options: RadioOptionType[];
     optionStyle: RadioOptionStyleType;
 }, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & ( Plugin & (new (...args: any[]) => {
     $props: {

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

@@ -1,6 +1,6 @@
 import { ColumnsType } from '@aplus-frontend/antdv/es/table';
 import { AlignType, DataIndex, Key } from '@aplus-frontend/antdv/es/vc-table/interface';
-import { ApColumnType } from 'src/ap-table';
+import { ApColumnType } from '../../ap-table';
 export type SummaryColumnType = ApColumnType[] | ColumnsType;
 export type ValueType = {
     [key in string]: any;

package/lib/src/business/hooks/useKeepAliveFlag.d.ts

@@ -0,0 +1,14 @@
+interface UseKeepAliveFlagOptions {
+    /** 状态切换到deactivated时触发 */
+    afterDeactivated?: () => void;
+}
+/**
+ * 获取keepAliveFlag
+ * @returns
+ */
+export declare function useKeepAliveFlag(options?: UseKeepAliveFlagOptions): {
+    isDeactivated: () => boolean;
+    isActivated: () => boolean;
+    registerAfterDeactivated: (fn: UseKeepAliveFlagOptions["afterDeactivated"]) => void;
+};
+export {};

package/lib/src/business/hooks/useKeepAliveFlag.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("vue");function c(a){let e="notKeepAlive",t=a==null?void 0:a.afterDeactivated;return i.onActivated(()=>{e="activated"}),i.onDeactivated(()=>{e="deactivated",t==null||t()}),{isDeactivated:()=>e==="deactivated",isActivated:()=>e==="activated",registerAfterDeactivated:v=>{t=v}}}exports.useKeepAliveFlag=c;

package/lib/src/business/hooks/usePageListApGrid.d.ts

@@ -19,6 +19,10 @@ export interface UsePageListApGrid extends ApGridProps {
      * 表格刷新相关
      */
     tableRefresh?: boolean | Omit<UseTableRefreshOption, 'apTableRef'>;
+    /** 是否需要在deactivated的时候清空数据
+     * @default true
+     */
+    clearDataOnDeactivated?: boolean;
 }
 /**
  * 集成了列表页面的ApGrid的默认配置

package/lib/src/business/hooks/usePageListApGrid.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../index.js");const u=require("lodash-unified"),g=require("vue"),v=require("./useTableRefresh.js");function b(a){const o=g.ref(null),{isShowRowSelection:i=!0,clearSelectionOnRequest:d=!0,transformSearchFormValues:s,api:n,tableRefresh:f=!0,virtual:h,...S}=a||{};let l=null;const c=()=>{var e,r;(r=(e=o.value)==null?void 0:e.rowSelection)==null||r.clearAll()};v.useTableRefresh({...R(f),apTableRef:o});const p=async e=>{l=e.sort;const r=s?s(e):e;try{if(!n)throw new Error("api is not defined");const{records:t,total:m}=await n(r);return d&&c(),{data:t,total:m}}catch(t){return console.error(t),{data:[],total:0}}};return[u.merge({scroll:{x:"100%",y:"100%"},columnResizable:!0,request:n?p:void 0,rowSelection:i?{fixed:"left",columnWidth:38}:void 0,ref(e){o.value=e},virtual:u.merge({oSize:20,y:20},h),card:!0},S),{reload:()=>{var e;(e=o.value)==null||e.submit()},reset:()=>{var e;(e=o.value)==null||e.reset()},getSearchFormValues:(e=!0)=>{var t;const r=((t=o.value)==null?void 0:t.getSearchFormValues(!!e))||{};return s?s(r):r},getApGridInstance:()=>o.value,getSearchFormValuesAndSorted:(e=!0)=>{var t;const r=((t=o.value)==null?void 0:t.getSearchFormValues(!!e))||{};return r.sort=l&&u.cloneDeep(l),s?s(r):r},clearSelection:c}]}function R(a){return a===!0?{}:a===!1?{refreshBefore:()=>!1}:a}exports.usePageListApGrid=b;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../index.js");const u=require("lodash-unified"),q=require("vue"),F=require("./useKeepAliveFlag.js"),R=require("./useTableRefresh.js");function w(s){const a=q.ref(null),{isShowRowSelection:d=!0,clearSelectionOnRequest:f=!0,transformSearchFormValues:o,api:l,tableRefresh:p=!0,virtual:v,clearDataOnDeactivated:h=!0,...S}=s||{};let n=null;const c=()=>{var e,r;(r=(e=a.value)==null?void 0:e.rowSelection)==null||r.clearAll()};R.useTableRefresh({...G(p),apTableRef:a});const i=()=>{var e;(e=a.value)==null||e.submit()},g=()=>{var e;(e=a.value)==null||e.reset()},{isDeactivated:m}=F.useKeepAliveFlag({afterDeactivated:i}),A=async e=>{if(m()&&h)return{data:[],total:0};n=e.sort;const r=o?o(e):e;try{if(!l)throw new Error("api is not defined");const{records:t,total:b}=await l(r);return f&&c(),{data:t,total:b}}catch(t){return console.error(t),{data:[],total:0}}};return[u.merge({scroll:{x:"100%",y:"100%"},columnResizable:!0,request:l?A:void 0,rowSelection:d?{fixed:"left",columnWidth:38}:void 0,ref(e){a.value=e},virtual:u.merge({oSize:20,y:20},v),card:!0},S),{reload:i,reset:g,getSearchFormValues:(e=!0)=>{var t;const r=((t=a.value)==null?void 0:t.getSearchFormValues(!!e))||{};return o?o(r):r},getApGridInstance:()=>a.value,getSearchFormValuesAndSorted:(e=!0)=>{var t;const r=((t=a.value)==null?void 0:t.getSearchFormValues(!!e))||{};return r.sort=n&&u.cloneDeep(n),o?o(r):r},clearSelection:c}]}function G(s){return s===!0?{}:s===!1?{refreshBefore:()=>!1}:s}exports.usePageListApGrid=w;

package/lib/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.6.7";
+declare const _default: "0.6.8";
 export default _default;

package/lib/src/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "0.6.7",
+  "version": "0.6.8",
   "main": "./lib/index.js",
   "type": "module",
   "files": [
@@ -10,9 +10,9 @@
   ],
   "keywords": [
     "aplus",
-    "vuu3",
+    "vue3",
     "ant-design-vue",
-    "components"
+    "ui-components"
   ],
   "release-it": {
     "git": {