@aplus-frontend/ui 0.4.0 → 0.4.1

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

@@ -1,19 +1,19 @@
-import { isVNode as q, defineComponent as D, useSlots as L, ref as h, watch as A, cloneVNode as G, computed as I, createVNode as u, mergeProps as p, unref as n, openBlock as g, createElementBlock as W, Fragment as H, withCtx as F, renderSlot as P, createTextVNode as J, toDisplayString as K, createElementVNode as Q, normalizeClass as X, createBlock as w, resolveDynamicComponent as x, createCommentVNode as Y } from "vue";
-import { Button as V, Flex as Z, Space as ee, Modal as te } from "@aplus-frontend/antdv";
+import { isVNode as D, defineComponent as L, useSlots as A, ref as p, watch as G, cloneVNode as I, computed as K, createVNode as u, mergeProps as b, unref as n, openBlock as g, createElementBlock as W, Fragment as H, withCtx as F, renderSlot as w, createTextVNode as J, toDisplayString as Q, createElementVNode as X, normalizeClass as Y, createBlock as x, resolveDynamicComponent as N, createCommentVNode as Z } from "vue";
+import { Button as V, Flex as ee, Space as te, Modal as le } from "@aplus-frontend/antdv";
 import "../ap-form.vue.mjs";
 import "../../hooks/index.mjs";
-import { getSingleVNode as le } from "../../utils/slot.mjs";
+import { getSingleVNode as oe } from "../../utils/slot.mjs";
 import "../../config-provider/index.mjs";
-import { omit as oe } from "lodash-unified";
-import { useControllableValue as ae } from "../../hooks/useControllableValue.mjs";
-import { useLocale as ne } from "../../config-provider/hooks/use-locale.mjs";
-import { useGlobalConfig as se } from "../../config-provider/hooks/use-global-config.mjs";
-import { useNamespace as ie } from "../../config-provider/hooks/use-namespace.mjs";
-import re from "../ap-form.vue2.mjs";
-function N(c) {
-  return typeof c == "function" || Object.prototype.toString.call(c) === "[object Object]" && !q(c);
+import { omit as ae } from "lodash-unified";
+import { useControllableValue as ne } from "../../hooks/useControllableValue.mjs";
+import { useLocale as se } from "../../config-provider/hooks/use-locale.mjs";
+import { useGlobalConfig as ie } from "../../config-provider/hooks/use-global-config.mjs";
+import { useNamespace as re } from "../../config-provider/hooks/use-namespace.mjs";
+import ue from "../ap-form.vue2.mjs";
+function S(c) {
+  return typeof c == "function" || Object.prototype.toString.call(c) === "[object Object]" && !D(c);
 }
-const Se = /* @__PURE__ */ D({
+const _e = /* @__PURE__ */ L({
   __name: "index",
   props: {
     layout: {
@@ -91,30 +91,33 @@ const Se = /* @__PURE__ */ D({
   },
   emits: ["update:open"],
   setup(c, {
-    expose: S,
-    emit: _
+    expose: _,
+    emit: M
   }) {
-    const o = c, b = L(), M = _, a = h(), m = h(), i = h(!1), {
-      value: R,
+    const o = c, y = A(), R = M, a = p(), C = p(0), m = p(), i = p(!1), {
+      value: U,
       updateValue: f
-    } = ae(o, M, {
+    } = ne(o, R, {
       valuePropName: "open",
-      defaultValue: !1
+      defaultValue: !1,
+      beforeUpdateValue(e) {
+        return e && (C.value += 1), !0;
+      }
     }), {
       t: v
-    } = ne(), y = se("uiMode", "aplus"), {
+    } = se(), h = ie("uiMode", "aplus"), {
       b: j,
-      e: C
-    } = ie("ap-form-modal-form");
-    A(() => a.value, (e) => {
+      e: T
+    } = re("ap-form-modal-form");
+    G(() => a.value, (e) => {
       var t;
       e && m.value && ((t = e.setFieldsValue) == null || t.call(e, m.value), m.value = void 0);
     });
-    const T = le(b.trigger), B = T ? G(T, {
+    const B = oe(y.trigger), k = B ? I(B, {
       onClick: () => {
         f(!0);
       }
-    }) : null, O = I(() => {
+    }) : null, O = K(() => {
       var t, l, r, d;
       const e = [];
       if (o.submitter === !1)
@@ -122,23 +125,23 @@ const Se = /* @__PURE__ */ D({
       if (o.showCancel) {
         let s;
         e.push(u(V, {
-          onClick: k,
+          onClick: P,
           disabled: i.value
-        }, N(s = v("ap.common.cancelText")) ? s : {
+        }, S(s = v("ap.common.cancelText")) ? s : {
           default: () => [s]
         }));
       }
-      return ((t = o.submitter) == null ? void 0 : t.resetButtonProps) !== !1 && e.push(u(V, p(((l = o.submitter) == null ? void 0 : l.resetButtonProps) || {}, {
+      return ((t = o.submitter) == null ? void 0 : t.resetButtonProps) !== !1 && e.push(u(V, b(((l = o.submitter) == null ? void 0 : l.resetButtonProps) || {}, {
         key: "reset",
         disabled: i.value,
-        onClick: U,
+        onClick: z,
         htmlType: "reset"
       }), {
         default: () => {
           var s;
           return [((s = o.submitter) == null ? void 0 : s.resetText) || v("ap.common.resetText")];
         }
-      })), ((r = o.submitter) == null ? void 0 : r.submitButtonProps) !== !1 && e.push(u(V, p({
+      })), ((r = o.submitter) == null ? void 0 : r.submitButtonProps) !== !1 && e.push(u(V, b({
         type: "primary",
         key: "submit",
         htmlType: "submit"
@@ -149,29 +152,30 @@ const Se = /* @__PURE__ */ D({
           var s;
           return [((s = o.submitter) == null ? void 0 : s.submitText) || v("ap.common.okText")];
         }
-      })), u(Z, {
+      })), u(ee, {
         justify: "flex-end",
-        class: C(n(y) === "admin" ? "footer-admin" : "footer")
+        key: n(C),
+        class: T(n(h) === "admin" ? "footer-admin" : "footer")
       }, {
-        default: () => [b.submitter ? b.submitter(e) : u(ee, null, N(e) ? e : {
+        default: () => [y.submitter ? y.submitter(e) : u(te, null, S(e) ? e : {
           default: () => [e]
         })]
       });
     });
-    function U() {
+    function z() {
       var e, t, l;
       o.submitter !== !1 && ((e = a.value) == null || e.resetFields(), (l = (t = o.submitter) == null ? void 0 : t.onReset) == null || l.call(t));
     }
-    async function z(e) {
+    async function E(e) {
       var t, l, r;
       if (o.submitter !== !1)
         try {
           (l = (t = o.submitter) == null ? void 0 : t.onSubmit) == null || l.call(t), i.value = !0;
           const d = (r = o.onFinish) == null ? void 0 : r.call(o, e);
           if (o.submitTimeout && d instanceof Promise) {
-            const $ = setTimeout(() => i.value = !1, o.submitTimeout);
+            const q = setTimeout(() => i.value = !1, o.submitTimeout);
             d.finally(() => {
-              clearTimeout($), i.value = !1;
+              clearTimeout(q), i.value = !1;
             });
           }
           await d && f(!1);
@@ -179,13 +183,13 @@ const Se = /* @__PURE__ */ D({
           i.value = !1;
         }
     }
-    function k() {
+    function P() {
       n(i) || f(!1);
     }
-    function E(e) {
+    function $(e) {
       !e && n(i) || f(e);
     }
-    return S({
+    return _({
       resetFields: () => {
         var e;
         (e = a.value) == null || e.resetFields();
@@ -228,39 +232,39 @@ const Se = /* @__PURE__ */ D({
       }
     }), (e, t) => {
       var l;
-      return g(), W(H, null, [u(n(te), p(e.modalProps, {
-        open: n(R),
+      return g(), W(H, null, [u(n(le), b(e.modalProps, {
+        open: n(U),
         footer: null,
         width: e.width,
         class: n(j)(),
         "body-style": {
           ...((l = e.modalProps) == null ? void 0 : l.bodyStyle) || {},
-          padding: n(y) === "admin" ? "0px !important" : "20px !important"
+          padding: n(h) === "admin" ? "0px !important" : "20px !important"
           // 这里使用内联样式目的是为了使用最高优先级覆盖设置的全局样式
           // 使用ModalForm你可能无法再自定义body的样式
         },
-        "onUpdate:open": E,
-        onCancel: k
+        "onUpdate:open": $,
+        onCancel: P
       }), {
-        title: F(() => [P(e.$slots, "title", {}, () => [J(K(o.title), 1)])]),
-        default: F(() => [u(re, p({
+        title: F(() => [w(e.$slots, "title", {}, () => [J(Q(o.title), 1)])]),
+        default: F(() => [u(ue, b({
           ref_key: "formRef",
           ref: a
-        }, n(oe)(o, ["modalProps", "open", "onUpdate:open", "title", "width", "onFinish", "submitter"]), {
-          onFinish: z
+        }, n(ae)(o, ["modalProps", "open", "onUpdate:open", "title", "width", "onFinish", "submitter"]), {
+          onFinish: E
         }), {
-          default: F(() => [Q("div", {
-            class: X(n(C)(n(y) === "admin" ? "content-admin" : "content"))
-          }, [P(e.$slots, "default")], 2), (g(), w(x(O.value)))]),
+          default: F(() => [X("div", {
+            class: Y(n(T)(n(h) === "admin" ? "content-admin" : "content"))
+          }, [w(e.$slots, "default")], 2), (g(), x(N(O.value)))]),
           _: 3
         }, 16)]),
         _: 3
-      }, 16, ["open", "width", "class", "body-style"]), n(B) ? (g(), w(x(n(B)), {
+      }, 16, ["open", "width", "class", "body-style"]), n(k) ? (g(), x(N(n(k)), {
         key: 0
-      })) : Y("", !0)], 64);
+      })) : Z("", !0)], 64);
     };
   }
 });
 export {
-  Se as default
+  _e as default
 };

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

@@ -30,7 +30,7 @@ export interface UsePageListApTable extends ApTableProps {
 export declare function usePageListApTable(props?: UsePageListApTable): [ApTableProps, {
     reload: () => void;
     reset: () => void;
-    getSearchFormValues: () => any;
+    getSearchFormValues: (transform: boolean) => any;
     getApTableInstance: () => {
         submit: () => void;
         reset: () => void;
@@ -50,6 +50,6 @@ export declare function usePageListApTable(props?: UsePageListApTable): [ApTable
         } | undefined;
         getShownColumns: () => TableColumnsType<any>;
     } | null | undefined;
-    getSearchFormValuesAndSorted: () => any;
+    getSearchFormValuesAndSorted: (transform: boolean) => any;
     clearSelection: () => void;
 }];

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

@@ -1,28 +1,28 @@
 import { merge as d, cloneDeep as h } from "lodash-unified";
 import { ref as S } from "vue";
 import { useTableRefresh as b } from "./useTableRefresh.mjs";
-function g(a) {
-  return a === !0 ? {} : a === !1 ? {
+function g(s) {
+  return s === !0 ? {} : s === !1 ? {
     refreshBefore: () => !1
-  } : a;
+  } : s;
 }
-function I(a) {
-  const t = S(null), {
+function I(s) {
+  const o = S(null), {
     isShowRowSelection: u = !0,
     clearSelectionOnRequest: i = !0,
-    transformSearchFormValues: o,
-    api: s,
+    transformSearchFormValues: a,
+    api: l,
     tableRefresh: f = !1,
     ...m
-  } = a || {};
-  let l = null;
+  } = s || {};
+  let n = null;
   const c = () => {
     var e, r;
-    (r = (e = t.value) == null ? void 0 : e.rowSelection) == null || r.clearAll();
+    (r = (e = o.value) == null ? void 0 : e.rowSelection) == null || r.clearAll();
   };
   return b({
     ...g(f),
-    apTableRef: t
+    apTableRef: o
   }), [d(
     {
       // scroll，tableLayout，columnResizable设置表格可拖动
@@ -31,18 +31,18 @@ function I(a) {
       columnResizable: !0,
       // 表格header吸顶效果
       class: "ap-table--sticky",
-      request: s ? async (e) => {
-        l = e.sort;
-        const r = o ? o(e) : e;
+      request: l ? async (e) => {
+        n = e.sort;
+        const r = a ? a(e) : e;
         try {
-          if (!s) throw new Error("api is not defined");
-          const { records: n, total: p } = await s(r);
+          if (!l) throw new Error("api is not defined");
+          const { records: t, total: p } = await l(r);
           return i && c(), {
-            data: n,
+            data: t,
             total: p
           };
-        } catch (n) {
-          return console.error(n), {
+        } catch (t) {
+          return console.error(t), {
             data: [],
             total: 0
           };
@@ -54,29 +54,29 @@ function I(a) {
         columnWidth: 50
       } : void 0,
       ref(e) {
-        t.value = e;
+        o.value = e;
       }
     },
     m
   ), {
     reload: () => {
       var e;
-      (e = t.value) == null || e.submit();
+      (e = o.value) == null || e.submit();
     },
     reset: () => {
       var e;
-      (e = t.value) == null || e.reset();
+      (e = o.value) == null || e.reset();
     },
-    getSearchFormValues: () => {
-      var r;
-      const e = ((r = t.value) == null ? void 0 : r.getSearchFormValues()) || {};
-      return o ? o(e) : e;
+    getSearchFormValues: (e) => {
+      var t;
+      const r = ((t = o.value) == null ? void 0 : t.getSearchFormValues(e)) || {};
+      return a ? a(r) : r;
     },
-    getApTableInstance: () => t.value,
-    getSearchFormValuesAndSorted: () => {
-      var r;
-      const e = ((r = t.value) == null ? void 0 : r.getSearchFormValues()) || {};
-      return e.sort = l && h(l), o ? o(e) : e;
+    getApTableInstance: () => o.value,
+    getSearchFormValuesAndSorted: (e) => {
+      var t;
+      const r = ((t = o.value) == null ? void 0 : t.getSearchFormValues(e)) || {};
+      return r.sort = n && h(n), a ? a(r) : r;
     },
     clearSelection: c
   }];

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

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),d=require("@aplus-frontend/antdv");require("../ap-form.vue.js");require("../../hooks/index.js");const x=require("../../utils/slot.js");require("../../config-provider/index.js");const M=require("lodash-unified"),j=require("../../hooks/useControllableValue.js"),O=require("../../config-provider/hooks/use-locale.js"),R=require("../../config-provider/hooks/use-global-config.js"),U=require("../../config-provider/hooks/use-namespace.js"),z=require("../ap-form.vue2.js");function V(c){return typeof c=="function"||Object.prototype.toString.call(c)==="[object Object]"&&!e.isVNode(c)}const D=e.defineComponent({__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:{},onFinishFailed:{},onValidate:{},initialValues:{},onValuesChange:{},syncToUrl:{type:[Boolean,Function]},syncToUrlPriority:{type:Boolean},open:{type:Boolean,default:void 0},"onUpdate:open":{},modalProps:{default:()=>({})},title:{},width:{default:800},onFinish:{},submitter:{type:[Boolean,Object],default:()=>({resetButtonProps:!1})},showCancel:{type:Boolean,default:!0},submitTimeout:{}},emits:["update:open"],setup(c,{expose:C,emit:B}){const a=c,p=e.useSlots(),T=B,n=e.ref(),f=e.ref(),r=e.ref(!1),{value:N,updateValue:m}=j.useControllableValue(a,T,{valuePropName:"open",defaultValue:!1}),{t:b}=O.useLocale(),v=R.useGlobalConfig("uiMode","aplus"),{b:k,e:y}=U.useNamespace("ap-form-modal-form");e.watch(()=>n.value,t=>{var l;t&&f.value&&((l=t.setFieldsValue)==null||l.call(t,f.value),f.value=void 0)});const g=x.getSingleVNode(p.trigger),h=g?e.cloneVNode(g,{onClick:()=>{m(!0)}}):null,P=e.computed(()=>{var l,o,u,i;const t=[];if(a.submitter===!1)return null;if(a.showCancel){let s;t.push(e.createVNode(d.Button,{onClick:F,disabled:r.value},V(s=b("ap.common.cancelText"))?s:{default:()=>[s]}))}return((l=a.submitter)==null?void 0:l.resetButtonProps)!==!1&&t.push(e.createVNode(d.Button,e.mergeProps(((o=a.submitter)==null?void 0:o.resetButtonProps)||{},{key:"reset",disabled:r.value,onClick:_,htmlType:"reset"}),{default:()=>{var s;return[((s=a.submitter)==null?void 0:s.resetText)||b("ap.common.resetText")]}})),((u=a.submitter)==null?void 0:u.submitButtonProps)!==!1&&t.push(e.createVNode(d.Button,e.mergeProps({type:"primary",key:"submit",htmlType:"submit"},((i=a.submitter)==null?void 0:i.submitButtonProps)||{},{loading:r.value}),{default:()=>{var s;return[((s=a.submitter)==null?void 0:s.submitText)||b("ap.common.okText")]}})),e.createVNode(d.Flex,{justify:"flex-end",class:y(e.unref(v)==="admin"?"footer-admin":"footer")},{default:()=>[p.submitter?p.submitter(t):e.createVNode(d.Space,null,V(t)?t:{default:()=>[t]})]})});function _(){var t,l,o;a.submitter!==!1&&((t=n.value)==null||t.resetFields(),(o=(l=a.submitter)==null?void 0:l.onReset)==null||o.call(l))}async function q(t){var l,o,u;if(a.submitter!==!1)try{(o=(l=a.submitter)==null?void 0:l.onSubmit)==null||o.call(l),r.value=!0;const i=(u=a.onFinish)==null?void 0:u.call(a,t);if(a.submitTimeout&&i instanceof Promise){const S=setTimeout(()=>r.value=!1,a.submitTimeout);i.finally(()=>{clearTimeout(S),r.value=!1})}await i&&m(!1)}finally{r.value=!1}}function F(){e.unref(r)||m(!1)}function w(t){!t&&e.unref(r)||m(t)}return C({resetFields:()=>{var t;(t=n.value)==null||t.resetFields()},clearValidate:t=>{var l;(l=n.value)==null||l.clearValidate(t)},validateFields:(t,l)=>{var o;return(o=n.value)==null?void 0:o.validateFields(t,l)},getFieldsValue:t=>{var l;return(l=n.value)==null?void 0:l.getFieldsValue(t)},validate:(t,l)=>{var o;return(o=n.value)==null?void 0:o.validate(t,l)},scrollToField:(t,l={})=>{var o;(o=n.value)==null||o.scrollToField(t,l)},setFieldValue:(t,l)=>{var o,u;(u=(o=n.value)==null?void 0:o.setFieldValue)==null||u.call(o,t,l)},setFieldsValue:t=>{var l,o;if(!n.value){f.value=t;return}(o=(l=n.value)==null?void 0:l.setFieldsValue)==null||o.call(l,t)},getInternalInstance:t=>{var l;return(l=n.value)==null?void 0:l.getInternalInstance(t)}}),(t,l)=>{var o;return e.openBlock(),e.createElementBlock(e.Fragment,null,[e.createVNode(e.unref(d.Modal),e.mergeProps(t.modalProps,{open:e.unref(N),footer:null,width:t.width,class:e.unref(k)(),"body-style":{...((o=t.modalProps)==null?void 0:o.bodyStyle)||{},padding:e.unref(v)==="admin"?"0px !important":"20px !important"},"onUpdate:open":w,onCancel:F}),{title:e.withCtx(()=>[e.renderSlot(t.$slots,"title",{},()=>[e.createTextVNode(e.toDisplayString(a.title),1)])]),default:e.withCtx(()=>[e.createVNode(z.default,e.mergeProps({ref_key:"formRef",ref:n},e.unref(M.omit)(a,["modalProps","open","onUpdate:open","title","width","onFinish","submitter"]),{onFinish:q}),{default:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass(e.unref(y)(e.unref(v)==="admin"?"content-admin":"content"))},[e.renderSlot(t.$slots,"default")],2),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(P.value)))]),_:3},16)]),_:3},16,["open","width","class","body-style"]),e.unref(h)?(e.openBlock(),e.createBlock(e.resolveDynamicComponent(e.unref(h)),{key:0})):e.createCommentVNode("",!0)],64)}}});exports.default=D;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),d=require("@aplus-frontend/antdv");require("../ap-form.vue.js");require("../../hooks/index.js");const M=require("../../utils/slot.js");require("../../config-provider/index.js");const U=require("lodash-unified"),j=require("../../hooks/useControllableValue.js"),O=require("../../config-provider/hooks/use-locale.js"),R=require("../../config-provider/hooks/use-global-config.js"),z=require("../../config-provider/hooks/use-namespace.js"),D=require("../ap-form.vue2.js");function C(c){return typeof c=="function"||Object.prototype.toString.call(c)==="[object Object]"&&!e.isVNode(c)}const E=e.defineComponent({__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:{},onFinishFailed:{},onValidate:{},initialValues:{},onValuesChange:{},syncToUrl:{type:[Boolean,Function]},syncToUrlPriority:{type:Boolean},open:{type:Boolean,default:void 0},"onUpdate:open":{},modalProps:{default:()=>({})},title:{},width:{default:800},onFinish:{},submitter:{type:[Boolean,Object],default:()=>({resetButtonProps:!1})},showCancel:{type:Boolean,default:!0},submitTimeout:{}},emits:["update:open"],setup(c,{expose:B,emit:T}){const a=c,p=e.useSlots(),k=T,n=e.ref(),y=e.ref(0),f=e.ref(),r=e.ref(!1),{value:N,updateValue:m}=j.useControllableValue(a,k,{valuePropName:"open",defaultValue:!1,beforeUpdateValue(t){return t&&(y.value+=1),!0}}),{t:b}=O.useLocale(),v=R.useGlobalConfig("uiMode","aplus"),{b:P,e:g}=z.useNamespace("ap-form-modal-form");e.watch(()=>n.value,t=>{var l;t&&f.value&&((l=t.setFieldsValue)==null||l.call(t,f.value),f.value=void 0)});const h=M.getSingleVNode(p.trigger),V=h?e.cloneVNode(h,{onClick:()=>{m(!0)}}):null,_=e.computed(()=>{var l,o,u,i;const t=[];if(a.submitter===!1)return null;if(a.showCancel){let s;t.push(e.createVNode(d.Button,{onClick:F,disabled:r.value},C(s=b("ap.common.cancelText"))?s:{default:()=>[s]}))}return((l=a.submitter)==null?void 0:l.resetButtonProps)!==!1&&t.push(e.createVNode(d.Button,e.mergeProps(((o=a.submitter)==null?void 0:o.resetButtonProps)||{},{key:"reset",disabled:r.value,onClick:q,htmlType:"reset"}),{default:()=>{var s;return[((s=a.submitter)==null?void 0:s.resetText)||b("ap.common.resetText")]}})),((u=a.submitter)==null?void 0:u.submitButtonProps)!==!1&&t.push(e.createVNode(d.Button,e.mergeProps({type:"primary",key:"submit",htmlType:"submit"},((i=a.submitter)==null?void 0:i.submitButtonProps)||{},{loading:r.value}),{default:()=>{var s;return[((s=a.submitter)==null?void 0:s.submitText)||b("ap.common.okText")]}})),e.createVNode(d.Flex,{justify:"flex-end",key:e.unref(y),class:g(e.unref(v)==="admin"?"footer-admin":"footer")},{default:()=>[p.submitter?p.submitter(t):e.createVNode(d.Space,null,C(t)?t:{default:()=>[t]})]})});function q(){var t,l,o;a.submitter!==!1&&((t=n.value)==null||t.resetFields(),(o=(l=a.submitter)==null?void 0:l.onReset)==null||o.call(l))}async function w(t){var l,o,u;if(a.submitter!==!1)try{(o=(l=a.submitter)==null?void 0:l.onSubmit)==null||o.call(l),r.value=!0;const i=(u=a.onFinish)==null?void 0:u.call(a,t);if(a.submitTimeout&&i instanceof Promise){const x=setTimeout(()=>r.value=!1,a.submitTimeout);i.finally(()=>{clearTimeout(x),r.value=!1})}await i&&m(!1)}finally{r.value=!1}}function F(){e.unref(r)||m(!1)}function S(t){!t&&e.unref(r)||m(t)}return B({resetFields:()=>{var t;(t=n.value)==null||t.resetFields()},clearValidate:t=>{var l;(l=n.value)==null||l.clearValidate(t)},validateFields:(t,l)=>{var o;return(o=n.value)==null?void 0:o.validateFields(t,l)},getFieldsValue:t=>{var l;return(l=n.value)==null?void 0:l.getFieldsValue(t)},validate:(t,l)=>{var o;return(o=n.value)==null?void 0:o.validate(t,l)},scrollToField:(t,l={})=>{var o;(o=n.value)==null||o.scrollToField(t,l)},setFieldValue:(t,l)=>{var o,u;(u=(o=n.value)==null?void 0:o.setFieldValue)==null||u.call(o,t,l)},setFieldsValue:t=>{var l,o;if(!n.value){f.value=t;return}(o=(l=n.value)==null?void 0:l.setFieldsValue)==null||o.call(l,t)},getInternalInstance:t=>{var l;return(l=n.value)==null?void 0:l.getInternalInstance(t)}}),(t,l)=>{var o;return e.openBlock(),e.createElementBlock(e.Fragment,null,[e.createVNode(e.unref(d.Modal),e.mergeProps(t.modalProps,{open:e.unref(N),footer:null,width:t.width,class:e.unref(P)(),"body-style":{...((o=t.modalProps)==null?void 0:o.bodyStyle)||{},padding:e.unref(v)==="admin"?"0px !important":"20px !important"},"onUpdate:open":S,onCancel:F}),{title:e.withCtx(()=>[e.renderSlot(t.$slots,"title",{},()=>[e.createTextVNode(e.toDisplayString(a.title),1)])]),default:e.withCtx(()=>[e.createVNode(D.default,e.mergeProps({ref_key:"formRef",ref:n},e.unref(U.omit)(a,["modalProps","open","onUpdate:open","title","width","onFinish","submitter"]),{onFinish:w}),{default:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass(e.unref(g)(e.unref(v)==="admin"?"content-admin":"content"))},[e.renderSlot(t.$slots,"default")],2),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(_.value)))]),_:3},16)]),_:3},16,["open","width","class","body-style"]),e.unref(V)?(e.openBlock(),e.createBlock(e.resolveDynamicComponent(e.unref(V)),{key:0})):e.createCommentVNode("",!0)],64)}}});exports.default=E;

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

@@ -30,7 +30,7 @@ export interface UsePageListApTable extends ApTableProps {
 export declare function usePageListApTable(props?: UsePageListApTable): [ApTableProps, {
     reload: () => void;
     reset: () => void;
-    getSearchFormValues: () => any;
+    getSearchFormValues: (transform: boolean) => any;
     getApTableInstance: () => {
         submit: () => void;
         reset: () => void;
@@ -50,6 +50,6 @@ export declare function usePageListApTable(props?: UsePageListApTable): [ApTable
         } | undefined;
         getShownColumns: () => TableColumnsType<any>;
     } | null | undefined;
-    getSearchFormValuesAndSorted: () => any;
+    getSearchFormValuesAndSorted: (transform: boolean) => any;
     clearSelection: () => void;
 }];

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("lodash-unified"),S=require("vue"),m=require("./useTableRefresh.js");function g(s){return s===!0?{}:s===!1?{refreshBefore:()=>!1}:s}function v(s){const t=S.ref(null),{isShowRowSelection:i=!0,clearSelectionOnRequest:f=!0,transformSearchFormValues:a,api:o,tableRefresh:d=!1,...h}=s||{};let l=null;const c=()=>{var e,r;(r=(e=t.value)==null?void 0:e.rowSelection)==null||r.clearAll()};m.useTableRefresh({...g(d),apTableRef:t});const b=async e=>{l=e.sort;const r=a?a(e):e;try{if(!o)throw new Error("api is not defined");const{records:n,total:p}=await o(r);return f&&c(),{data:n,total:p}}catch(n){return console.error(n),{data:[],total:0}}};return[u.merge({scroll:{x:"100%",y:"100%"},tableLayout:"fixed",columnResizable:!0,class:"ap-table--sticky",request:o?b:void 0,rowSelection:i?{mode:"internal",fixed:"left",columnWidth:50}:void 0,ref(e){t.value=e}},h),{reload:()=>{var e;(e=t.value)==null||e.submit()},reset:()=>{var e;(e=t.value)==null||e.reset()},getSearchFormValues:()=>{var r;const e=((r=t.value)==null?void 0:r.getSearchFormValues())||{};return a?a(e):e},getApTableInstance:()=>t.value,getSearchFormValuesAndSorted:()=>{var r;const e=((r=t.value)==null?void 0:r.getSearchFormValues())||{};return e.sort=l&&u.cloneDeep(l),a?a(e):e},clearSelection:c}]}exports.usePageListApTable=v;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("lodash-unified"),S=require("vue"),m=require("./useTableRefresh.js");function g(o){return o===!0?{}:o===!1?{refreshBefore:()=>!1}:o}function v(o){const a=S.ref(null),{isShowRowSelection:i=!0,clearSelectionOnRequest:f=!0,transformSearchFormValues:s,api:l,tableRefresh:d=!1,...h}=o||{};let n=null;const c=()=>{var e,r;(r=(e=a.value)==null?void 0:e.rowSelection)==null||r.clearAll()};m.useTableRefresh({...g(d),apTableRef:a});const b=async e=>{n=e.sort;const r=s?s(e):e;try{if(!l)throw new Error("api is not defined");const{records:t,total:p}=await l(r);return f&&c(),{data:t,total:p}}catch(t){return console.error(t),{data:[],total:0}}};return[u.merge({scroll:{x:"100%",y:"100%"},tableLayout:"fixed",columnResizable:!0,class:"ap-table--sticky",request:l?b:void 0,rowSelection:i?{mode:"internal",fixed:"left",columnWidth:50}:void 0,ref(e){a.value=e}},h),{reload:()=>{var e;(e=a.value)==null||e.submit()},reset:()=>{var e;(e=a.value)==null||e.reset()},getSearchFormValues:e=>{var t;const r=((t=a.value)==null?void 0:t.getSearchFormValues(e))||{};return s?s(r):r},getApTableInstance:()=>a.value,getSearchFormValuesAndSorted:e=>{var t;const r=((t=a.value)==null?void 0:t.getSearchFormValues(e))||{};return r.sort=n&&u.cloneDeep(n),s?s(r):r},clearSelection:c}]}exports.usePageListApTable=v;

package/package.json

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