@aplus-frontend/ui 0.5.0-beta.0 → 0.5.0-beta.2

package/es/src/business/ap-attachment/ApAttachment.mjs

@@ -4,29 +4,29 @@ import "../../config-provider/index.mjs";
 import { ApAttachmentProps as W } from "./constans.mjs";
 import { getHexWithOpacity as q, getFileInfo as w } from "../../ap-download/utils/getFileInfo.mjs";
 import { useOssInit as D } from "../../ap-download/hooks/index.mjs";
-import { isArray as E } from "lodash-unified";
+import { debounce as E, isArray as J } from "lodash-unified";
 import { LoadingOutlined as g } from "@ant-design/icons-vue";
-import { useNamespace as J } from "../../config-provider/hooks/use-namespace.mjs";
+import { useNamespace as Q } from "../../config-provider/hooks/use-namespace.mjs";
 import { useGlobalConfig as h } from "../../config-provider/hooks/use-global-config.mjs";
-import { useLocale as Q } from "../../config-provider/hooks/use-locale.mjs";
-const ce = /* @__PURE__ */ _({
+import { useLocale as X } from "../../config-provider/hooks/use-locale.mjs";
+const se = /* @__PURE__ */ _({
   name: "ApAttachment",
   props: W(),
   setup(e) {
     const {
-      b: O,
+      b,
       e: a
-    } = J("ap-attachment"), T = h("uiMode"), b = h("apUpload"), N = h("downloadCenterTriggerConfig"), {
+    } = Q("ap-attachment"), O = h("uiMode"), T = h("apUpload"), N = h("downloadCenterTriggerConfig"), {
       lang: x,
       t: m
-    } = Q(), i = F(!1), c = F(""), d = j(), P = n(() => x.value === "zh-cn" ? "zh_CN" : "en_US"), u = n(() => e.attachmentList.length === 1), p = n(() => e.needName ? e.attachmentList.length > 0 && e.needName && e.needName.nameKey ? e.attachmentList[0][e.needName.nameKey] : "" : e.attachmentList.length > 0 ? e.attachmentList[0].fileName : ""), k = n(() => u.value ? p.value : m("ap.apAttachment.downloadall")), A = n(() => e.color ? e.color : T.value === "aplus" ? "#0070FF" : "#1890FF"), S = n(() => ({
+    } = X(), i = F(!1), c = F(""), d = j(), P = n(() => x.value === "zh-cn" ? "zh_CN" : "en_US"), u = n(() => e.attachmentList.length === 1), p = n(() => e.needName ? e.attachmentList.length > 0 && e.needName && e.needName.nameKey ? e.attachmentList[0][e.needName.nameKey] : "" : e.attachmentList.length > 0 ? e.attachmentList[0].fileName : ""), k = n(() => u.value ? p.value : m("ap.apAttachment.downloadall")), A = n(() => e.color ? e.color : O.value === "aplus" ? "#0070FF" : "#1890FF"), S = n(() => ({
       width: u.value ? "auto" : "266px"
     })), L = n(() => ({
       "--download-main-color": A.value,
       "--download-main-color-opacity": q(A.value, 0.6)
     })), V = n(() => {
       var t;
-      return e.getOssAccess || ((t = b.value) == null ? void 0 : t.getOssAccess);
+      return e.getOssAccess || ((t = T.value) == null ? void 0 : t.getOssAccess);
     }), z = n(() => {
       const t = d.default ? d.default()[0] : null;
       return t ? K(t, {
@@ -34,12 +34,12 @@ const ce = /* @__PURE__ */ _({
           "font-size": "16px"
         }
       }) : null;
-    }), f = async (t, s) => {
+    }), f = E(async (t, s) => {
       var o, C;
       if (!e.disabled) {
         i.value = !0, s && (c.value = s);
         try {
-          const r = E(v(t)) ? v(t) : [v(t)];
+          const r = J(v(t)) ? v(t) : [v(t)];
           if ((o = N.value) != null && o.trigger) {
             const U = w(e.needName, r).map((y) => ({
               objectName: y.path,
@@ -54,7 +54,7 @@ const ce = /* @__PURE__ */ _({
           i.value = !1, c.value = "";
         }
       }
-    }, I = (t) => t && t.length > 0 ? l("ul", {
+    }, 500), I = (t) => t && t.length > 0 ? l("ul", {
       class: [a("file-list")],
       style: L.value
     }, [t.map((s, o) => l("li", {
@@ -76,7 +76,7 @@ const ce = /* @__PURE__ */ _({
     return () => {
       var t;
       return ((t = e.attachmentList) == null ? void 0 : t.length) > 0 && l("div", {
-        class: [O()],
+        class: [b()],
         style: [S.value, L.value]
       }, [l(H, {
         title: k.value,
@@ -108,5 +108,5 @@ const ce = /* @__PURE__ */ _({
   }
 });
 export {
-  ce as default
+  se as default
 };

package/es/src/business/ap-batch-action-group/MenuItemGroup.vue2.mjs

@@ -1,4 +1,4 @@
-import { defineComponent as _, ref as h, createBlock as a, openBlock as s, unref as u, withCtx as d, createElementBlock as v, Fragment as t, renderList as y, mergeProps as k, createElementVNode as w, withDirectives as g, createVNode as C, vShow as b, resolveDynamicComponent as L, h as M } from "vue";
+import { defineComponent as _, ref as v, createBlock as a, openBlock as s, unref as u, withCtx as d, createElementBlock as h, Fragment as t, renderList as y, mergeProps as k, createElementVNode as w, withDirectives as g, createVNode as C, vShow as b, resolveDynamicComponent as L, h as M } from "vue";
 import { LoadingOutlined as B } from "@ant-design/icons-vue";
 import { Menu as R, MenuItem as x } from "@aplus-frontend/antdv";
 const D = { style: { display: "flex", "align-items": "center" } }, P = /* @__PURE__ */ _({
@@ -9,31 +9,31 @@ const D = { style: { display: "flex", "align-items": "center" } }, P = /* @__PUR
     menuList: {}
   },
   setup(f) {
-    const o = f, r = h({});
-    async function p(e, c) {
-      var l;
-      const n = (e == null ? void 0 : e.id) || c;
+    const l = f, r = v({});
+    async function p(o, c) {
+      var e;
+      const n = (o == null ? void 0 : o.id) || c;
       r.value[n] = !0;
       try {
-        await ((l = e == null ? void 0 : e.onClick) == null ? void 0 : l.call(e, { selectedRows: o == null ? void 0 : o.selectedRows }));
+        await ((e = o == null ? void 0 : o.onClick) == null ? void 0 : e.call(o, { selectedRows: l == null ? void 0 : l.selectedRows }));
       } finally {
-        r.value[n] = !1;
+        r.value[n] = void 0;
       }
     }
-    return (e, c) => (s(), a(u(R), null, {
+    return (o, c) => (s(), a(u(R), null, {
       default: d(() => [
-        (s(!0), v(t, null, y(o.menuList, (n, l) => (s(), a(u(x), k({
-          key: (n == null ? void 0 : n.id) || l,
+        (s(!0), h(t, null, y(l.menuList, (n, e) => (s(), a(u(x), k({
+          key: (n == null ? void 0 : n.id) || e,
           ref_for: !0
         }, {
           ...n,
-          onClick: () => p(n, l),
-          disabled: r.value[(n == null ? void 0 : n.id) || l] ?? (n == null ? void 0 : n.disabled) ?? !1
+          onClick: () => p(n, e),
+          disabled: r.value[(n == null ? void 0 : n.id) || e] ?? (n == null ? void 0 : n.disabled) ?? !1
         }), {
           default: d(() => [
             w("div", D, [
               g(C(u(B), { style: { "margin-right": "10px" } }, null, 512), [
-                [b, r.value[(n == null ? void 0 : n.id) || l]]
+                [b, r.value[(n == null ? void 0 : n.id) || e]]
               ]),
               (s(), a(L(M(t, [n == null ? void 0 : n.content]))))
             ])

package/lib/src/ap-form/hooks/use-watch.d.ts

@@ -2,5 +2,8 @@ import { NamePath } from '@aplus-frontend/antdv/es/form/interface';
 import { ApFormExpose } from '../interface';
 import { Ref } from 'vue';
 type ApFormIns<T> = ApFormExpose<T>;
-declare const useWatch: <ValueType = any, StoreType = any>(name: NamePath | Ref<NamePath>, form?: Ref<ApFormIns<StoreType> | undefined>) => Ref<ValueType | undefined, ValueType | undefined>;
+type WatchOptions<ValueType> = {
+    initialValue: ValueType;
+};
+export declare function useWatch<ValueType = any, StoreType = any>(name: NamePath | Ref<NamePath>, formOrOptions?: Ref<ApFormIns<StoreType> | undefined> | WatchOptions<ValueType>, options?: WatchOptions<ValueType>): Ref<ValueType | undefined, ValueType | undefined>;
 export default useWatch;

package/lib/src/ap-form/hooks/use-watch.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const I=require("../context.js"),n=require("vue"),M=require("lodash-unified"),V=require("../constant.js");function h(e,t){return M.isArray(t)?t.reduce((r,s)=>r==null?void 0:r[s],e):e==null?void 0:e[t]}function d(e){try{return JSON.stringify(e)}catch{return Math.random()}}const N=(e,t)=>{const{internalInstance:r,model:s}=I.useInjectForm(),i=n.ref();let c="",o=!0;return n.watchEffect(l=>{var f;const u=((f=t==null?void 0:t.value)==null?void 0:f.getInternalInstance(V.INTERNAL_FORM_INSTANCE_MARK))||r;if(!u){o=!1;return}const a=u.registerWatch(w=>{const g=h(w,n.unref(e)),S=d(g);S!==c&&(i.value=g,c=S)},o);l(a)}),n.watch(()=>n.unref(e),l=>{const u=h(n.unref(s),l),a=d(u);a!==c&&(i.value=u,c=a)}),i};exports.default=N;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const _=require("../context.js"),u=require("vue"),o=require("lodash-unified"),q=require("../constant.js");function w(t,e){return o.isArray(e)?e.reduce((n,r)=>n==null?void 0:n[r],t):t==null?void 0:t[e]}function g(t){try{return JSON.stringify(t)}catch{return Math.random()}}function I(t,e,n){const{internalInstance:r,model:M}=_.useInjectForm(),V=(n==null?void 0:n.initialValue)||(e==null?void 0:e.initialValue)||void 0,i=u.ref(V);let c=g(V),d=!0;const s=e&&"value"in e?e:void 0;return u.watchEffect(f=>{var h;const a=((h=s==null?void 0:s.value)==null?void 0:h.getInternalInstance(q.INTERNAL_FORM_INSTANCE_MARK))||r;if(!a){d=!1;return}const l=a.registerWatch(N=>{const S=w(N,u.unref(t)),v=g(S);v!==c&&(i.value=S,c=v)},d);f(l)}),u.watch(()=>u.unref(t),f=>{const a=w(u.unref(M),f),l=g(a);l!==c&&(i.value=a,c=l)}),i}exports.default=I;exports.useWatch=I;

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("./ap-form.vue.js");require("./item/index.vue2.js");require("./item-group/index.vue2.js");require("./list/index.vue2.js");require("./search-form/index.vue2.js");require("./modal-form/index.vue2.js");const s=require("./hooks/use-watch.js");require("./dependency/index.vue2.js");require("./set/index.vue2.js");require("./drawer-form/index.vue2.js");require("./render/control.vue2.js");require("./render/item.vue2.js");require("./provider/index.vue2.js");require("./items/index.js");require("./interface.js");const c=require("./ap-form.vue2.js"),r=require("./item/index.vue.js"),t=require("./item-group/index.vue.js"),u=require("./list/index.vue.js"),_=require("./search-form/index.vue.js"),i=require("./modal-form/index.vue.js"),p=require("./dependency/index.vue.js"),o=require("./set/index.vue.js"),n=require("./drawer-form/index.vue.js"),a=require("./render/control.vue.js"),d=require("./render/item.vue.js"),l=require("./provider/index.vue.js"),e=c.default;e.FormItem=r.default;e.FormItemGroup=t.default;e.FormList=u.default;e.SearchForm=_.default;e.ModalForm=i.default;e.useWatch=s.default;e.Dependency=p.default;e.Set=o.default;e.DrawerForm=n.default;e.ControlRender=a.default;e.ItemRender=d.default;e.Provider=l.default;exports.ApFormItem=r.default;exports.ApFormItemGroup=t.default;exports.ApFormList=u.default;exports.ApFormSearchForm=_.default;exports.ApFormModalForm=i.default;exports.ApFormDependency=p.default;exports.ApFormSet=o.default;exports.ApFormDrawerForm=n.default;exports.ApFormControlRender=a.default;exports.ApFormItemRender=d.default;exports.ApFormProvider=l.default;exports.ApForm=e;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("./ap-form.vue.js");require("./item/index.vue2.js");require("./item-group/index.vue2.js");require("./list/index.vue2.js");require("./search-form/index.vue2.js");require("./modal-form/index.vue2.js");const l=require("./hooks/use-watch.js");require("./dependency/index.vue2.js");require("./set/index.vue2.js");require("./drawer-form/index.vue2.js");require("./render/control.vue2.js");require("./render/item.vue2.js");require("./provider/index.vue2.js");require("./items/index.js");require("./interface.js");const c=require("./ap-form.vue2.js"),r=require("./item/index.vue.js"),t=require("./item-group/index.vue.js"),u=require("./list/index.vue.js"),_=require("./search-form/index.vue.js"),i=require("./modal-form/index.vue.js"),p=require("./dependency/index.vue.js"),o=require("./set/index.vue.js"),n=require("./drawer-form/index.vue.js"),a=require("./render/control.vue.js"),s=require("./render/item.vue.js"),d=require("./provider/index.vue.js"),e=c.default;e.FormItem=r.default;e.FormItemGroup=t.default;e.FormList=u.default;e.SearchForm=_.default;e.ModalForm=i.default;e.useWatch=l.useWatch;e.Dependency=p.default;e.Set=o.default;e.DrawerForm=n.default;e.ControlRender=a.default;e.ItemRender=s.default;e.Provider=d.default;exports.ApFormItem=r.default;exports.ApFormItemGroup=t.default;exports.ApFormList=u.default;exports.ApFormSearchForm=_.default;exports.ApFormModalForm=i.default;exports.ApFormDependency=p.default;exports.ApFormSet=o.default;exports.ApFormDrawerForm=n.default;exports.ApFormControlRender=a.default;exports.ApFormItemRender=s.default;exports.ApFormProvider=d.default;exports.ApForm=e;

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"),u=require("@aplus-frontend/antdv");require("../ap-form.vue.js");require("../item/index.vue2.js");require("../../hooks/index.js");const q=require("../item-group/helper.js"),X=require("@ant-design/icons-vue");require("../../config-provider/index.js");const B=require("lodash-unified"),E=require("../../utils/index.js"),N=require("./utils.js"),Y=require("../../hooks/useControllableValue.js"),Z=require("../../config-provider/hooks/use-namespace.js"),ee=require("../../config-provider/hooks/use-global-config.js"),te=require("../../config-provider/hooks/use-locale.js"),I=require("../item/index.vue.js"),ne=require("../ap-form.vue2.js");function oe(m){return typeof m=="function"||Object.prototype.toString.call(m)==="[object Object]"&&!e.isVNode(m)}const l=24,ae=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:!1},"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}},emits:["update:collapse"],setup(m,{expose:P,emit:T}){var R;const c=e.useSlots(),o=m,O=T,{value:i,updateValue:D}=Y.useControllableValue(o,O,{valuePropName:"collapse",defaultValuePropName:"defaultCollapse"}),{b:M}=Z.useNamespace("ap-form-search-form"),j=ee.useGlobalConfig("uiMode"),{t:F}=te.useLocale(),y=e.ref();function L(){D(!e.unref(i))}function U(){var t,n;(n=(t=y.value)==null?void 0:t.validateFields())==null||n.then(r=>N.execFunc(o.onSubmit,r))}function W(){var t,n;o.customReset||(n=(t=y.value)==null?void 0:t.resetFields)==null||n.call(t),N.execFunc(o.onReset)}let v=[];const _=e.shallowRef(q.genRealChildren(c.default())),p=e.shallowRef((R=c.extra)==null?void 0:R.call(c)),S=e.computed(()=>Math.floor(l/o.countPerRow));e.watch(()=>c.default(),t=>{v=_.value,_.value=N.diffFormItem(v,q.genRealChildren(t))}),e.watch(()=>{var t;return(t=c.extra)==null?void 0:t.call(c)},t=>{p.value=t});const $=t=>E.isDef(t)?(B.isArray(t)?t:[t]).join(""):Date.now(),g=e.computed(()=>{const t=_.value,n=[],r=[],a=e.unref(S);let s=0;t.forEach(d=>{const f=d.props;if(B.isBoolean(f.hidden)?!!f.hidden:E.isDef(f.hidden))n.push(d);else{const x=l-s%l,C=f.span||a;x>=C?s+=C:s+=C+x,r.push(d)}});const V=l-s%l;V<a&&(s+=V);const k=l-(s+a)%l,G=s%l<a,H=k<a?l:k,b=l-a*(e.unref(p)&&!o.extraInAction?2:1),J=!o.forceExpand&&s>b;let w=0,A=0;const K=r.map((d,f)=>{const h=d.props,x=h.span||a;if(w+=x,!o.forceExpand&&e.unref(i)&&w>b){n.push(e.cloneVNode(d,{class:"ant-form-item-hidden",hidden:!0}));return}return A+=x,{node:d,span:h.span||a,key:`ApFormSearchFormItem-${f}-${$(h.name)}-${h._signal}`}}).filter(Boolean),Q=l-A-a;return{hideNode:e.createVNode(e.Fragment,null,[n]),nodes:K,defaultExtraSpan:H,actualExtraSpan:Q,showCollapse:J,lastRowOnlyIncludeActionAndExtra:G}}),z=e.computed(()=>{let t;const n=e.unref(g),r=e.createVNode(u.Col,{span:e.unref(S),key:"actionWrapper"},{default:()=>[e.createVNode(I.default,null,{default:()=>[e.createVNode(u.Flex,{justify:!e.unref(i)&&n.lastRowOnlyIncludeActionAndExtra&&!(e.unref(p)&&o.extraInAction)?"flex-end":"space-between"},{default:()=>[e.createVNode(u.Space,null,{default:()=>[e.createVNode(u.Button,{type:"primary",onClick:U,loading:o.submitLoading,htmlType:"submit"},{default:()=>[o.searchText||F("ap.apForm.search.search")]}),e.createVNode(u.Button,{onClick:W},{default:()=>[o.resetText||F("ap.apForm.search.reset")]}),n.showCollapse?e.createVNode(u.Button,{onClick:L,icon:e.createVNode(X.DoubleRightOutlined,{style:j.value==="aplus"?"color:#B8C3D1":"color:#BFBFBF",rotate:e.unref(i)?90:-90},null)},null):null]}),o.extraInAction?e.unref(p):null]})]})]}),a=!o.extraInAction&&e.unref(p)?e.createVNode(u.Col,{span:e.unref(i)?n.actualExtraSpan:n.defaultExtraSpan,key:"extraNode"},{default:()=>[e.createVNode(I.default,null,{default:()=>[e.createVNode(u.Flex,{justify:!e.unref(i)&&(n.defaultExtraSpan===l||n.lastRowOnlyIncludeActionAndExtra)?"start":"flex-end"},oe(t=e.unref(p))?t:{default:()=>[t]})]})]}):null,s=e.createVNode(u.Col,{span:n.defaultExtraSpan},null);return!e.unref(i)&&n.lastRowOnlyIncludeActionAndExtra?e.createVNode(e.Fragment,null,[a||s,r]):e.createVNode(e.Fragment,null,[r,a])});return P({apForm:e.computed(()=>e.unref(y))}),(t,n)=>(e.openBlock(),e.createBlock(ne.default,e.mergeProps({ref_key:"apForm",ref:y,class:e.unref(M)()},e.unref(B.omit)(o,["collapse","defaultCollapse","onUpdate:collapse","searchText","resetText","onSubmit","onReset","extraInAction","forceExpand","countPerRow"])),{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(g.value.hideNode))),e.createVNode(e.unref(u.Row),{gutter:16},{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(g.value.nodes,r=>(e.openBlock(),e.createBlock(e.unref(u.Col),{key:r.key,span:r.span},{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(r.node)))]),_:2},1032,["span"]))),128)),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(z.value)))]),_:1})]),_:1},16,["class"]))}});exports.default=ae;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),u=require("@aplus-frontend/antdv");require("../ap-form.vue.js");require("../item/index.vue2.js");require("../../hooks/index.js");const q=require("../item-group/helper.js"),X=require("@ant-design/icons-vue");require("../../config-provider/index.js");const B=require("lodash-unified"),E=require("../../utils/index.js"),N=require("./utils.js"),Y=require("../../hooks/useControllableValue.js"),Z=require("../../config-provider/hooks/use-namespace.js"),ee=require("../../config-provider/hooks/use-global-config.js"),te=require("../../config-provider/hooks/use-locale.js"),I=require("../item/index.vue.js"),ne=require("../ap-form.vue2.js");function oe(m){return typeof m=="function"||Object.prototype.toString.call(m)==="[object Object]"&&!e.isVNode(m)}const l=24,ae=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:!1},"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}},emits:["update:collapse"],setup(m,{expose:P,emit:T}){var R;const c=e.useSlots(),o=m,O=T,{value:i,updateValue:D}=Y.useControllableValue(o,O,{valuePropName:"collapse",defaultValuePropName:"defaultCollapse"}),{b:M}=Z.useNamespace("ap-form-search-form"),j=ee.useGlobalConfig("uiMode"),{t:F}=te.useLocale(),y=e.ref();function L(){D(!e.unref(i))}function U(){var t,n;(n=(t=y.value)==null?void 0:t.validateFields())==null||n.then(r=>N.execFunc(o.onSubmit,r))}function W(){var t,n;o.customReset||(n=(t=y.value)==null?void 0:t.resetFields)==null||n.call(t),N.execFunc(o.onReset)}let v=[];const _=e.shallowRef(q.genRealChildren(c.default())),p=e.shallowRef((R=c.extra)==null?void 0:R.call(c)),S=e.computed(()=>Math.floor(l/o.countPerRow));e.watch(()=>c.default(),t=>{v=_.value,_.value=N.diffFormItem(v,q.genRealChildren(t))}),e.watch(()=>{var t;return(t=c.extra)==null?void 0:t.call(c)},t=>{p.value=t});const $=t=>E.isDef(t)?(B.isArray(t)?t:[t]).join(""):Date.now(),g=e.computed(()=>{const t=_.value,n=[],r=[],a=e.unref(S);let s=0;t.forEach(d=>{const f=d.props;if(B.isBoolean(f.hidden)?!!f.hidden:E.isDef(f.hidden))n.push(d);else{const x=l-s%l,C=f.span||a;x>=C?s+=C:s+=C+x,r.push(d)}});const V=l-s%l;V<a&&(s+=V);const k=l-(s+a)%l,G=s%l<a,H=k<a?l:k,b=l-a*(e.unref(p)&&!o.extraInAction?2:1),J=!o.forceExpand&&s>b;let w=0,A=0;const K=r.map((d,f)=>{const h=d.props,x=h.span||a;if(w+=x,!o.forceExpand&&e.unref(i)&&w>b){n.push(e.cloneVNode(d,{hidden:!0}));return}return A+=x,{node:d,span:h.span||a,key:`ApFormSearchFormItem-${f}-${$(h.name)}-${h._signal}`}}).filter(Boolean),Q=l-A-a;return{hideNode:e.createVNode(e.Fragment,null,[n]),nodes:K,defaultExtraSpan:H,actualExtraSpan:Q,showCollapse:J,lastRowOnlyIncludeActionAndExtra:G}}),z=e.computed(()=>{let t;const n=e.unref(g),r=e.createVNode(u.Col,{span:e.unref(S),key:"actionWrapper"},{default:()=>[e.createVNode(I.default,null,{default:()=>[e.createVNode(u.Flex,{justify:!e.unref(i)&&n.lastRowOnlyIncludeActionAndExtra&&!(e.unref(p)&&o.extraInAction)?"flex-end":"space-between"},{default:()=>[e.createVNode(u.Space,null,{default:()=>[e.createVNode(u.Button,{type:"primary",onClick:U,loading:o.submitLoading,htmlType:"submit"},{default:()=>[o.searchText||F("ap.apForm.search.search")]}),e.createVNode(u.Button,{onClick:W},{default:()=>[o.resetText||F("ap.apForm.search.reset")]}),n.showCollapse?e.createVNode(u.Button,{onClick:L,icon:e.createVNode(X.DoubleRightOutlined,{style:j.value==="aplus"?"color:#B8C3D1":"color:#BFBFBF",rotate:e.unref(i)?90:-90},null)},null):null]}),o.extraInAction?e.unref(p):null]})]})]}),a=!o.extraInAction&&e.unref(p)?e.createVNode(u.Col,{span:e.unref(i)?n.actualExtraSpan:n.defaultExtraSpan,key:"extraNode"},{default:()=>[e.createVNode(I.default,null,{default:()=>[e.createVNode(u.Flex,{justify:!e.unref(i)&&(n.defaultExtraSpan===l||n.lastRowOnlyIncludeActionAndExtra)?"start":"flex-end"},oe(t=e.unref(p))?t:{default:()=>[t]})]})]}):null,s=e.createVNode(u.Col,{span:n.defaultExtraSpan},null);return!e.unref(i)&&n.lastRowOnlyIncludeActionAndExtra?e.createVNode(e.Fragment,null,[a||s,r]):e.createVNode(e.Fragment,null,[r,a])});return P({apForm:e.computed(()=>e.unref(y))}),(t,n)=>(e.openBlock(),e.createBlock(ne.default,e.mergeProps({ref_key:"apForm",ref:y,class:e.unref(M)()},e.unref(B.omit)(o,["collapse","defaultCollapse","onUpdate:collapse","searchText","resetText","onSubmit","onReset","extraInAction","forceExpand","countPerRow"])),{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(g.value.hideNode))),e.createVNode(e.unref(u.Row),{gutter:16},{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(g.value.nodes,r=>(e.openBlock(),e.createBlock(e.unref(u.Col),{key:r.key,span:r.span},{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(r.node)))]),_:2},1032,["span"]))),128)),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(z.value)))]),_:1})]),_:1},16,["class"]))}});exports.default=ae;

package/lib/src/ap-grid/index.vue.d.ts

@@ -0,0 +1,44 @@
+import { VxeTableSlots } from 'vxe-table';
+import { ApGridColumnType, ApGridExpose, ApGridProps } from './interface';
+import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode } from 'vue';
+declare const _default: <RecordType>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
+    props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{} & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>, never> & ApGridProps<RecordType> & Partial<{}>> & PublicProps;
+    expose(exposed: ShallowUnwrapRef<ApGridExpose>): void;
+    attrs: any;
+    slots: Readonly<VxeTableSlots<RecordType> & {
+        /**
+         * 自定义查询表单额外的区域
+         */
+        searchFormExtra?: any;
+        /**
+         * 自定义表格上部查询表单下部分区域的渲染
+         */
+        title?: (params: {
+            selectedRows: RecordType[];
+            selectedRowKeys: (string | number)[];
+            shownColumns: ApGridColumnType<RecordType>[];
+            clearAll: () => void;
+        }) => any;
+    }> & VxeTableSlots<RecordType> & {
+        /**
+         * 自定义查询表单额外的区域
+         */
+        searchFormExtra?: any;
+        /**
+         * 自定义表格上部查询表单下部分区域的渲染
+         */
+        title?: (params: {
+            selectedRows: RecordType[];
+            selectedRowKeys: (string | number)[];
+            shownColumns: ApGridColumnType<RecordType>[];
+            clearAll: () => void;
+        }) => any;
+    };
+    emit: {};
+}>) => VNode & {
+    __ctx?: Awaited<typeof __VLS_setup>;
+};
+export default _default;
+type __VLS_PrettifyLocal<T> = {
+    [K in keyof T]: T[K];
+} & {};

package/lib/src/ap-grid/index.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),v=require("vxe-table"),oe=require("vxe-pc-ui");require("/Users/limoer/www/aplus/aplus-ui/node_modules/.pnpm/vxe-table@4.10.14_vue@3.5.13_typescript@5.7.3_/node_modules/vxe-table/lib/style.css");require("/Users/limoer/www/aplus/aplus-ui/node_modules/.pnpm/vxe-pc-ui@4.3.95_vue@3.5.13_typescript@5.7.3_/node_modules/vxe-pc-ui/lib/style.css");const c=require("lodash-unified"),ae=require("../ap-form/index.js");require("../config-provider/index.js");const te=require("../ap-table/constants.js"),u=require("../ap-table/utils.js"),ne=require("../ap-table/hooks/use-table-paging-ng.js"),le=require("@aplus-frontend/antdv"),se=require("./hooks/use-inner-params.js"),b=require("./utils/table.js"),ue=require("../ap-table/hooks/use-table-row-selection.js"),de=require("../ap-table/context.js"),V=require("./constants.js"),ce=require("./hooks/use-render-columns.js"),ie=require("@aplus-frontend/antdv/es/theme/internal"),fe=require("../config-provider/hooks/use-namespace.js"),pe=require("../config-provider/hooks/use-global-config.js"),me=e.defineComponent({name:"ApGrid",__name:"index",props:{dropdownPrefixCls:{},loading:{type:[Boolean,Object],default:void 0},bordered:{type:Boolean,default:!1},locale:{},onChange:{},onResizeColumn:{},getPopupContainer:{},scroll:{},sortDirections:{default:()=>["ascend","descend"]},showSorterTooltip:{type:[Boolean,Object],default:!1},prefixCls:{},tableLayout:{},title:{},id:{},showHeader:{type:Boolean,default:!0},components:{},customRow:{},customHeaderRow:{},direction:{},expandFixed:{type:[String,Boolean],default:!1},expandColumnWidth:{},expandedRowKeys:{},defaultExpandedRowKeys:{},expandedRowRender:{},expandRowByClick:{type:Boolean,default:!1},expandIcon:{},onExpand:{},onExpandedRowsChange:{},defaultExpandAllRows:{type:Boolean,default:!1},indentSize:{default:15},expandIconColumnIndex:{},showExpandColumn:{type:Boolean,default:!0},expandedRowClassName:{},childrenColumnName:{default:"children"},rowExpandable:{},sticky:{type:[Boolean,Object]},transformCellText:{},rowClassName:{},stripe:{type:Boolean},headerRowClassName:{},footerRowClassName:{},cellClassName:{},headerCellClassName:{},footerCellClassName:{},rowStyle:{},headerRowStyle:{},footerRowStyle:{},cellStyle:{},headerCellStyle:{},footerCellStyle:{},height:{},minHeight:{},maxHeight:{},mergeCells:{},mergeFooterItems:{},cellConfig:{},columns:{},rowSelection:{type:Boolean},card:{type:Boolean,default:!1},params:{},request:{},defaultData:{},dataSource:{},onLoadingChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},manual:{type:Boolean,default:!1},size:{default:"medium"},adaptive:{type:Boolean,default:!1},columnResizable:{type:[Boolean,Object],default:!1},rowKey:{default:"key"},footer:{},virtual:{type:[Boolean,Object],default:void 0},expandable:{}},setup(T,{expose:_}){var z;const i=(z=e.getCurrentInstance())==null?void 0:z.appContext.app;i&&!i.__VXE_PC_UI_INSTALLED__&&(i.use(oe),i.__VXE_PC_UI_INSTALLED__=!0);const x=e.useSlots(),o=T,{e:h,b:f,be:A}=fe.useNamespace("ap-grid"),O=pe.useGlobalConfig("valueTypeMap"),l=e.ref([]),k=e.ref([]),p=e.ref(),S=e.ref(o.size),[,L]=ie.useToken(),{renderConfig:D,updateSignal:K}=ce.useRenderColumns(l);let R=0;const B=e.computed(()=>{var r,n,t;return R++,((t=(n=(r=o.columns)==null?void 0:r.filter(a=>!a.hideInSearch&&a.dataIndex&&(a.valueType||a.customRenderFormItem)&&!te.noRenderAsFormItemValueList.includes(a.valueType)))==null?void 0:n.sort((a,s)=>{let d=u.getColumnOrder(a.order);return u.getColumnOrder(s.order)-d}))==null?void 0:t.map(a=>{const s=u.updateFormProps(a,u.getFieldProps(a.fieldProps,{})),d={...a,fieldProps:{label:a.title,name:a.dataIndex,...s||{},_signal:R},renderNode:void 0};return d.renderNode=u.getSearchFormItemRenderNode(d,e.unref(O)),d}))||[]}),j=e.computed(()=>[f(),o.card?null:f("wrapper")].filter(Boolean)),F=e.computed(()=>u.recursionApColumns(e.unref(l),r=>{if(r.sorter===!0)return r.key||r.dataIndex}).filter(Boolean)),P=e.computed(()=>u.recursionApColumns(e.unref(l),r=>{if(r.filters&&!r.onFilter)return r.key||r.dataIndex}).filter(Boolean)),{formRef:y,submit:N,reset:E,refresh:U,data:m,tableProps:$,setDataSource:W,handleTableChange:H}=ne.useTablePaging({async request(r){var t;if(!C.value.preserveSelectedRowKeys&&c.isUndefined(o.dataSource)&&w(),!c.isUndefined(o.dataSource)){const a=r.pageSize*(r.current-1);return{data:(o.pagination===!1?o.dataSource:o.dataSource.slice(a,a+r.pageSize))||[],total:o.dataSource.length||0}}const n=await((t=o.request)==null?void 0:t.call(o,r));return{data:(n==null?void 0:n.data)||[],total:(n==null?void 0:n.total)||0}},namespace:"ap-grid",filterFields:P,sortFields:F,defaultParams:o.params,defaultData:o.defaultData,manual:o.manual,formatParams:o.beforeSearchSubmit,pagination:o.pagination}),{sortChangeEvent:M,filterChangeEvent:G,paginationChangeEvent:X}=se.useInnerParams(H);de.useProvideApTable({columns:e.computed(()=>l.value),columnsBackup:e.computed(()=>k.value),size:e.computed(()=>V.sizeMap[S.value]),updateColumns(r){l.value=r},updateSize(r){S.value=V.sizeReverseMap[r]},renderConfig:e.computed(()=>({className:A("table-header","title"),color:L.value.colorPrimary}))});const I=e.computed(()=>l.value.some(r=>r.fixed==="left"||r.fixed===!0)?"left":void 0),J=e.computed(()=>c.isUndefined(o.dataSource)?m.records:o.dataSource),{selectedRows:g,rowSelection:C,...Q}=ue.default({...o.rowSelection===!0?{}:o.rowSelection,dataSource:J,rowKey:o.rowKey}),q=()=>{const r=p.value;r&&(g.value=[...r.getCheckboxReserveRecords(),...r.getCheckboxRecords()])},Y=()=>{const r=p.value;r&&(g.value=[r.getRadioRecord()])};function Z(){var r;return((r=o.columns)==null?void 0:r.filter(n=>!n.hideInTable))||[]}function ee(r){var n,t,a;(a=(t=(n=y.value)==null?void 0:n.apForm)==null?void 0:t.setFieldsValue)==null||a.call(t,r)}function re(r=!1){var t,a,s;const n=r?"getFieldsValueTransformed":"getFieldsValue";return(s=(a=(t=y.value)==null?void 0:t.apForm)==null?void 0:a[n])==null?void 0:s.call(a,!0)}function w(){Q.clearAll();const r=p.value;r&&(C.value.type==="radio"?(r.clearRadioRow(),r.clearRadioReserve()):(r.clearCheckboxRow(),r.clearCheckboxReserve()))}return e.watchEffect(()=>{const r=Z();l.value=r,k.value=r}),e.watch(()=>o.dataSource,r=>{W(r)},{immediate:!0}),e.watch(()=>e.unref(m).loading,r=>{var n;(n=o.onLoadingChange)==null||n.call(o,r)}),_({submit:N,reset:E,refresh:U,setSearchFormValues:ee,getSearchFormValues:re,getShowColumns:()=>e.unref(l),rowSelection:{selectedRows:e.computed(()=>g.value),clearAll:w}}),(r,n)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(j.value)},[e.unref(c.isUndefined)(r.dataSource)&&r.searchForm!==!1&&B.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(r.card?e.unref(h)("search-wrapper"):null),style:e.normalizeStyle(r.searchFormWrapperStyle)},[e.createVNode(e.unref(ae.ApForm).SearchForm,e.mergeProps(r.searchForm||{},{ref_key:"formRef",ref:y,"custom-reset":"","submit-loading":!1,onSubmit:e.unref(N),onReset:e.unref(E)}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(B.value,t=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(t.renderNode.Comp),e.mergeProps({key:t.dataIndex,item:t,ref_for:!0},t.fieldProps||{},{span:t.span,"custom-render":t.renderNode.render}),null,16,["item","span","custom-render"]))),128))]),_:2},[x.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(r.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["onSubmit","onReset"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{class:e.normalizeClass([e.unref(h)("table-wrapper"),r.card?e.unref(h)("table-wrapper-card"):null]),style:e.normalizeStyle(r.tableWrapperStyle)},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(f)("header-wrapper"))},[e.renderSlot(r.$slots,"title",{selectedRows:e.unref(g),selectedRowKeys:e.unref(C).selectedRowKeys,shownColumns:l.value,clearAll:w})],2),(e.openBlock(),e.createBlock(e.unref(v.VxeTable),e.mergeProps(e.unref(b.toVxeProps)(o),{ref_key:"tableRef",ref:p,key:e.unref(K),data:e.unref(m).records,"sort-config":{remote:F.value.length>0},"filter-config":{remote:P.value.length>0},loading:e.unref(m).loading,"row-config":{isHover:!0,keyField:o.rowKey},size:S.value,onSortChange:e.unref(M),onFilterChange:e.unref(G),onCheckboxChange:q,onCheckboxAll:q,onRadioChange:Y}),e.createSlots({default:e.withCtx(()=>[o.expandable?(e.openBlock(),e.createBlock(e.unref(v.VxeColumn),e.mergeProps({key:0},e.unref(b.getRowExpandProps)(r.expandable),{fixed:I.value}),{content:e.withCtx(t=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(o.expandable.renderContent(t))))]),_:1},16,["fixed"])):e.createCommentVNode("",!0),o.rowSelection?(e.openBlock(),e.createBlock(e.unref(v.VxeColumn),e.mergeProps({key:1},e.unref(b.getRowSelectionProps)(e.unref(C)),{fixed:I.value}),null,16,["fixed"])):e.createCommentVNode("",!0),(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(e.unref(D),t=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(t),{key:t.props.colId}))),128))]),_:2},[e.renderList(e.unref(c.omit)(x,["searchFormExtra"]),(t,a)=>({name:a,fn:e.withCtx(s=>[e.renderSlot(r.$slots,a,e.normalizeProps(e.guardReactiveProps(s||{})))])}))]),1040,["data","sort-config","filter-config","loading","row-config","size","onSortChange","onFilterChange"])),r.pagination!==!1?(e.openBlock(),e.createBlock(e.unref(le.Pagination),e.mergeProps({key:0,class:e.unref(f)("pagination")},e.unref($).pagination,{onChange:e.unref(X)}),null,16,["class","onChange"])):e.createCommentVNode("",!0)],6)],2))}});exports.default=me;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),w=require("vxe-table"),ae=require("vxe-pc-ui");require("vxe-table/lib/style.css");require("vxe-pc-ui/lib/style.css");const f=require("lodash-unified"),te=require("../ap-form/index.js");require("../config-provider/index.js");const ne=require("../ap-table/constants.js"),d=require("../ap-table/utils.js"),le=require("../ap-table/hooks/use-table-paging-ng.js"),se=require("@aplus-frontend/antdv"),ue=require("./hooks/use-inner-params.js"),b=require("./utils/table.js"),de=require("../ap-table/hooks/use-table-row-selection.js"),ce=require("../ap-table/context.js"),V=require("./constants.js"),ie=require("./hooks/use-render-columns.js"),fe=require("@aplus-frontend/antdv/es/theme/internal");require("../scroll-bar/index.js");const pe=require("../config-provider/hooks/use-namespace.js"),me=require("../config-provider/hooks/use-global-config.js"),ge=require("../scroll-bar/index.vue.js"),Ce=e.defineComponent({name:"ApGrid",__name:"index",props:{dropdownPrefixCls:{},loading:{type:[Boolean,Object],default:void 0},bordered:{type:Boolean,default:!1},locale:{},onChange:{},onResizeColumn:{},getPopupContainer:{},scroll:{},sortDirections:{default:()=>["ascend","descend"]},showSorterTooltip:{type:[Boolean,Object],default:!1},prefixCls:{},tableLayout:{},title:{},id:{},showHeader:{type:Boolean,default:!0},components:{},customRow:{},customHeaderRow:{},direction:{},expandFixed:{type:[String,Boolean],default:!1},expandColumnWidth:{},expandedRowKeys:{},defaultExpandedRowKeys:{},expandedRowRender:{},expandRowByClick:{type:Boolean,default:!1},expandIcon:{},onExpand:{},onExpandedRowsChange:{},defaultExpandAllRows:{type:Boolean,default:!1},indentSize:{default:15},expandIconColumnIndex:{},showExpandColumn:{type:Boolean,default:!0},expandedRowClassName:{},childrenColumnName:{default:"children"},rowExpandable:{},sticky:{type:[Boolean,Object],default:!1},transformCellText:{},rowClassName:{},stripe:{type:Boolean},headerRowClassName:{},footerRowClassName:{},cellClassName:{},headerCellClassName:{},footerCellClassName:{},rowStyle:{},headerRowStyle:{},footerRowStyle:{},cellStyle:{},headerCellStyle:{},footerCellStyle:{},height:{},minHeight:{},maxHeight:{},mergeCells:{},mergeFooterItems:{},cellConfig:{},columns:{},rowSelection:{type:Boolean},card:{type:Boolean,default:!1},params:{},request:{},defaultData:{},dataSource:{},onLoadingChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},manual:{type:Boolean,default:!1},size:{default:"medium"},adaptive:{type:Boolean,default:!1},columnResizable:{type:[Boolean,Object],default:!1},rowKey:{default:"key"},footer:{},virtual:{type:[Boolean,Object],default:void 0},expandable:{}},setup(_,{expose:T}){var z;const p=(z=e.getCurrentInstance())==null?void 0:z.appContext.app;p&&!p.__VXE_PC_UI_INSTALLED__&&(p.use(ae),p.__VXE_PC_UI_INSTALLED__=!0);const k=e.useSlots(),o=_,{e:h,b:s,be:A}=pe.useNamespace("ap-grid"),O=me.useGlobalConfig("valueTypeMap"),l=e.ref([]),x=e.ref([]),c=e.ref(),v=e.ref(o.size),[,L]=fe.useToken(),{renderConfig:D,updateSignal:K}=ie.useRenderColumns(l);let R=0;const j=e.computed(()=>{if(c.value)return c.value.$el.querySelector(".vxe-table--header-inner-wrapper")}),B=e.computed(()=>{var r,n,t;return R++,((t=(n=(r=o.columns)==null?void 0:r.filter(a=>!a.hideInSearch&&a.dataIndex&&(a.valueType||a.customRenderFormItem)&&!ne.noRenderAsFormItemValueList.includes(a.valueType)))==null?void 0:n.sort((a,u)=>{let i=d.getColumnOrder(a.order);return d.getColumnOrder(u.order)-i}))==null?void 0:t.map(a=>{const u=d.updateFormProps(a,d.getFieldProps(a.fieldProps,{})),i={...a,fieldProps:{label:a.title,name:a.dataIndex,...u||{},_signal:R},renderNode:void 0};return i.renderNode=d.getSearchFormItemRenderNode(i,e.unref(O)),i}))||[]}),U=e.computed(()=>[s(),o.card?null:s("wrapper"),o.adaptive?s("adaptive"):null,o.sticky?s("sticky"):null].filter(Boolean)),F=e.computed(()=>d.recursionApColumns(e.unref(l),r=>{if(r.sorter===!0)return r.key||r.dataIndex}).filter(Boolean)),P=e.computed(()=>d.recursionApColumns(e.unref(l),r=>{if(r.filters&&!r.onFilter)return r.key||r.dataIndex}).filter(Boolean)),{formRef:y,submit:N,reset:E,refresh:$,data:m,tableProps:W,setDataSource:H,handleTableChange:M}=le.useTablePaging({async request(r){var t;if(!C.value.preserveSelectedRowKeys&&f.isUndefined(o.dataSource)&&S(),!f.isUndefined(o.dataSource)){const a=r.pageSize*(r.current-1);return{data:(o.pagination===!1?o.dataSource:o.dataSource.slice(a,a+r.pageSize))||[],total:o.dataSource.length||0}}const n=await((t=o.request)==null?void 0:t.call(o,r));return{data:(n==null?void 0:n.data)||[],total:(n==null?void 0:n.total)||0}},namespace:"ap-grid",filterFields:P,sortFields:F,defaultParams:o.params,defaultData:o.defaultData,manual:o.manual,formatParams:o.beforeSearchSubmit,pagination:o.pagination}),{sortChangeEvent:G,filterChangeEvent:X,paginationChangeEvent:J}=ue.useInnerParams(M);ce.useProvideApTable({columns:e.computed(()=>l.value),columnsBackup:e.computed(()=>x.value),size:e.computed(()=>V.sizeMap[v.value]),updateColumns(r){l.value=r},updateSize(r){v.value=V.sizeReverseMap[r]},renderConfig:e.computed(()=>({className:A("table-header","title"),color:L.value.colorPrimary}))});const q=e.computed(()=>l.value.some(r=>r.fixed==="left"||r.fixed===!0)?"left":void 0),Q=e.computed(()=>f.isUndefined(o.dataSource)?m.records:o.dataSource),{selectedRows:g,rowSelection:C,...Y}=de.default({...o.rowSelection===!0?{}:o.rowSelection,dataSource:Q,rowKey:o.rowKey}),I=()=>{const r=c.value;r&&(g.value=[...r.getCheckboxReserveRecords(),...r.getCheckboxRecords()])},Z=()=>{const r=c.value;r&&(g.value=[r.getRadioRecord()])};function ee(){var r;return((r=o.columns)==null?void 0:r.filter(n=>!n.hideInTable))||[]}function re(r){var n,t,a;(a=(t=(n=y.value)==null?void 0:n.apForm)==null?void 0:t.setFieldsValue)==null||a.call(t,r)}function oe(r=!1){var t,a,u;const n=r?"getFieldsValueTransformed":"getFieldsValue";return(u=(a=(t=y.value)==null?void 0:t.apForm)==null?void 0:a[n])==null?void 0:u.call(a,!0)}function S(){Y.clearAll();const r=c.value;r&&(C.value.type==="radio"?(r.clearRadioRow(),r.clearRadioReserve()):(r.clearCheckboxRow(),r.clearCheckboxReserve()))}return e.watchEffect(()=>{const r=ee();l.value=r,x.value=r}),e.watch(()=>o.dataSource,r=>{H(r)},{immediate:!0}),e.watch(()=>e.unref(m).loading,r=>{var n;(n=o.onLoadingChange)==null||n.call(o,r)}),T({submit:N,reset:E,refresh:$,setSearchFormValues:re,getSearchFormValues:oe,getShowColumns:()=>e.unref(l),rowSelection:{selectedRows:e.computed(()=>g.value),clearAll:S}}),(r,n)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(U.value)},[e.unref(f.isUndefined)(r.dataSource)&&r.searchForm!==!1&&B.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(r.card?e.unref(h)("search-wrapper"):null),style:e.normalizeStyle(r.searchFormWrapperStyle)},[e.createVNode(e.unref(te.ApForm).SearchForm,e.mergeProps(r.searchForm||{},{ref_key:"formRef",ref:y,"custom-reset":"","submit-loading":!1,onSubmit:e.unref(N),onReset:e.unref(E)}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(B.value,t=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(t.renderNode.Comp),e.mergeProps({key:t.dataIndex,item:t,ref_for:!0},t.fieldProps||{},{span:t.span,"custom-render":t.renderNode.render}),null,16,["item","span","custom-render"]))),128))]),_:2},[k.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(r.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["onSubmit","onReset"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{class:e.normalizeClass([e.unref(h)("table-wrapper"),r.card?e.unref(h)("table-wrapper-card"):null]),style:e.normalizeStyle(r.tableWrapperStyle)},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(s)("header-wrapper"))},[e.renderSlot(r.$slots,"title",{selectedRows:e.unref(g),selectedRowKeys:e.unref(C).selectedRowKeys,shownColumns:l.value,clearAll:S})],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(s)("vxe-wrapper"))},[(e.openBlock(),e.createBlock(e.unref(w.VxeTable),e.mergeProps(e.unref(b.toVxeProps)(o),{ref_key:"tableRef",ref:c,key:e.unref(K),data:e.unref(m).records,"sort-config":{remote:F.value.length>0},"filter-config":{remote:P.value.length>0},loading:e.unref(m).loading,"row-config":{isHover:!0,keyField:o.rowKey},size:v.value,onSortChange:e.unref(G),onFilterChange:e.unref(X),onCheckboxChange:I,onCheckboxAll:I,onRadioChange:Z}),e.createSlots({default:e.withCtx(()=>[o.expandable?(e.openBlock(),e.createBlock(e.unref(w.VxeColumn),e.mergeProps({key:0},e.unref(b.getRowExpandProps)(r.expandable),{fixed:q.value}),{content:e.withCtx(t=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(o.expandable.renderContent(t))))]),_:1},16,["fixed"])):e.createCommentVNode("",!0),o.rowSelection?(e.openBlock(),e.createBlock(e.unref(w.VxeColumn),e.mergeProps({key:1},e.unref(b.getRowSelectionProps)(e.unref(C)),{fixed:q.value}),null,16,["fixed"])):e.createCommentVNode("",!0),(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(e.unref(D),t=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(t),{key:t.props.colId}))),128))]),_:2},[e.renderList(e.unref(f.omit)(k,["searchFormExtra"]),(t,a)=>({name:a,fn:e.withCtx(u=>[e.renderSlot(r.$slots,a,e.normalizeProps(e.guardReactiveProps(u||{})))])}))]),1040,["data","sort-config","filter-config","loading","row-config","size","onSortChange","onFilterChange"]))],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(s)("pagination-wrapper"))},[r.sticky?(e.openBlock(),e.createBlock(e.unref(ge.default),{key:0,direction:"horizontal","scroll-container":j.value},null,8,["scroll-container"])):e.createCommentVNode("",!0),r.pagination!==!1?(e.openBlock(),e.createBlock(e.unref(se.Pagination),e.mergeProps({key:1,class:e.unref(s)("pagination")},e.unref(W).pagination,{onChange:e.unref(J)}),null,16,["class","onChange"])):e.createCommentVNode("",!0)],2)],6)],2))}});exports.default=Ce;

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

@@ -4,7 +4,7 @@ import { Recordable } from '../type';
 import { TableProps } from '@aplus-frontend/antdv';
 import { ColumnFilterItem, SortOrder, TableRowSelection } from '@aplus-frontend/antdv/es/table/interface';
 import { ComputedRef, CSSProperties, Ref, VNode } from 'vue';
-import { VxeTablePropTypes, VxeTableSlots, VxeColumnPropTypes, VxeTableProps, VxeTableDefines, VxeColumnSlots } from 'vxe-table';
+import { VxeTablePropTypes, VxeColumnPropTypes, VxeTableProps, VxeTableDefines, VxeColumnSlots } from 'vxe-table';
 export type ColConfigType = VxeTableDefines.ColumnOptions;
 export type ApGridColumnType<RecordType = any, ExtraValueType = 'text', ValueType extends ApTableValueTypes = ApTableValueTypes, MergedValueType extends ExtraValueType | ValueType = ExtraValueType | ValueType> = MergedValueType extends ExtraValueType | ValueType ? Omit<ExtraProColumnType<RecordType>, 'sorter' | 'rowSpan' | 'customCell' | 'customHeaderCell' | 'minWidth'> & {
     children?: ApGridColumnType<RecordType, ExtraValueType, ValueType, MergedValueType>[];
@@ -180,7 +180,6 @@ export type ApGridProps<RecordType = any, ParamsType = any> = Omit<TableProps<Re
     size?: 'medium' | 'small' | 'mini';
     /**
      * 表格是否自适应高度
-     * @deprecated 暂未实现
      */
     adaptive?: boolean;
     /**
@@ -221,21 +220,6 @@ export type ApGridVirtualConfig = {
 export type ApGridColumnProps<RecordType> = {
     column: ApGridColumnType<RecordType>;
 };
-export type ApGridSlots<RecordType> = VxeTableSlots<RecordType> & {
-    /**
-     * 自定义查询表单额外的区域
-     */
-    searchFormExtra?: any;
-    /**
-     * 自定义表格上部查询表单下部分区域的渲染
-     */
-    title?: (params: {
-        selectedRows: RecordType[];
-        selectedRowKeys: (string | number)[];
-        shownColumns: ApGridColumnType<RecordType>[];
-        clearAll: () => void;
-    }) => any;
-};
 export type ApGridExpose<SearchParamsType = Recordable, RecordType = any> = {
     /**
      * 表格查询提交（重制页码但查询参数不会重置）
@@ -263,7 +247,7 @@ export type ApGridExpose<SearchParamsType = Recordable, RecordType = any> = {
      * @param transform 是否获取转换后的数据 默认为`false`
      * @returns
      */
-    getSearchFormValues: (transform?: boolean) => Partial<SearchParamsType> & Recordable<any>;
+    getSearchFormValues: (transform?: boolean) => (Partial<SearchParamsType> & Recordable<any>) | undefined;
     /**
      * 获取最终现实的列配置
      * @returns

package/lib/src/ap-grid/utils/table.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("lodash-unified"),a=30,c=50;function f(e){var i,n,d;const t={...e};if(e.columnResizable&&(t.columnConfig?t.columnConfig.resizable=!0:t.columnConfig={resizable:!0}),e.rowSelection){const o=e.rowSelection===!0?{}:e.rowSelection;o.type==="radio"?t.radioConfig={highlight:!0,checkMethod({row:r}){return o.disabled?!o.disabled(r):!0},checkRowKey:(i=o.defaultSelectedRowKeys)==null?void 0:i[0],reserve:l.isUndefined(o.preserveSelectedRowKeys)?!0:o.preserveSelectedRowKeys}:t.checkboxConfig={highlight:!0,checkMethod({row:r}){return o.disabled?!o.disabled(r):!0},checkRowKeys:o.defaultSelectedRowKeys,reserve:l.isUndefined(o.preserveSelectedRowKeys)?!0:o.preserveSelectedRowKeys}}return t.border=e.bordered,e.expandable&&(t.expandConfig=l.omit(e.expandable,["renderContent","width","title"])),e.footer&&(t.showFooter=!0,l.isFunction(e.footer)?t.footerMethod=e.footer:t.footerData=e.footer),e.virtual===!1?(t.virtualXConfig={enabled:!1},t.virtualYConfig={enabled:!1}):(s(t,"X",(n=e.virtual)==null?void 0:n.x),s(t,"Y",(d=e.virtual)==null?void 0:d.y)),t}function s(e,t,i){const n=t==="X",d=n?"virtualXConfig":"virtualYConfig",o=i!==!1,r=n?a:c,u=l.isNumber(i)&&i>=0?i:r;e[d]={enabled:o,gt:u}}function h(e){const t=e===!0||!e.type?"checkbox":e.type,i=e===!0?60:e.columnWidth||60;return{type:t,width:i}}function b(e){const t=(e==null?void 0:e.width)||"auto";return{type:"expand",title:e==null?void 0:e.title,width:t}}exports.getRowExpandProps=b;exports.getRowSelectionProps=h;exports.toVxeProps=f;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("lodash-unified"),a=30,c=50;function f(e){var i,l,d;const t={...n.omit(e,["columns","request","searchForm","dataSource"])};if(e.adaptive&&(t.autoResize=!0,t.height="100%"),e.columnResizable&&(t.columnConfig?t.columnConfig.resizable=!0:t.columnConfig={resizable:!0}),e.rowSelection){const o=e.rowSelection===!0?{}:e.rowSelection;o.type==="radio"?t.radioConfig={highlight:!0,checkMethod({row:r}){return o.disabled?!o.disabled(r):!0},checkRowKey:(i=o.defaultSelectedRowKeys)==null?void 0:i[0],reserve:n.isUndefined(o.preserveSelectedRowKeys)?!0:o.preserveSelectedRowKeys}:t.checkboxConfig={highlight:!0,checkMethod({row:r}){return o.disabled?!o.disabled(r):!0},checkRowKeys:o.defaultSelectedRowKeys,reserve:n.isUndefined(o.preserveSelectedRowKeys)?!0:o.preserveSelectedRowKeys}}return t.border=e.bordered,e.expandable&&(t.expandConfig=n.omit(e.expandable,["renderContent","width","title"])),e.footer&&(t.showFooter=!0,n.isFunction(e.footer)?t.footerMethod=e.footer:t.footerData=e.footer),e.virtual===!1?(t.virtualXConfig={enabled:!1},t.virtualYConfig={enabled:!1}):(u(t,"X",(l=e.virtual)==null?void 0:l.x),u(t,"Y",(d=e.virtual)==null?void 0:d.y)),t}function u(e,t,i){const l=t==="X",d=l?"virtualXConfig":"virtualYConfig",o=i!==!1,r=l?a:c,s=n.isNumber(i)&&i>=0?i:r;e[d]={enabled:o,gt:s}}function h(e){const t=e===!0||!e.type?"checkbox":e.type,i=e===!0?60:e.columnWidth||60;return{type:t,width:i}}function b(e){const t=(e==null?void 0:e.width)||"auto";return{type:"expand",title:e==null?void 0:e.title,width:t}}exports.getRowExpandProps=b;exports.getRowSelectionProps=h;exports.toVxeProps=f;

package/lib/src/ap-modal/enums/modalMessage.d.ts

@@ -0,0 +1,6 @@
+export declare enum ModalMessage {
+    /**
+     * 弹框不需要关闭
+     */
+    NOT_NEED_CLOSE = "Info: [aplus-ui: ApModal.createModalStream] The modal does not need to be closed"
+}

package/lib/src/ap-modal/enums/modalMessage.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});var o=(e=>(e.NOT_NEED_CLOSE="Info: [aplus-ui: ApModal.createModalStream] The modal does not need to be closed",e))(o||{});exports.ModalMessage=o;

package/lib/src/ap-modal/index.d.ts

@@ -1,8 +1,9 @@
 import { Modal as _Modal } from '@aplus-frontend/antdv';
-import { CreateModalFunc } from './interface';
+import { CreateModalFunc, CreateModalStreamFunc } from './interface';
 export * from './interface';
 type ApModalMixedProps = typeof _Modal & {
     createModal: CreateModalFunc;
+    createModalStream: CreateModalStreamFunc;
 };
 declare const ApModal: ApModalMixedProps;
 export { ApModal };

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("@aplus-frontend/antdv");require("./utils/index.js");require("./interface.js");const a=require("./utils/createModal.js"),e=r.Modal;e.createModal=a.createModal;e.name="ApModal";exports.ApModal=e;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("@aplus-frontend/antdv");require("./utils/index.js");require("./interface.js");const r=require("./utils/createModal.js"),t=require("./utils/createModalStream.js"),e=a.Modal;e.createModal=r.createModal;e.createModalStream=t.createModalStream;e.name="ApModal";exports.ApModal=e;

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

@@ -1,16 +1,141 @@
-import { ModalProps } from '@aplus-frontend/antdv';
+import { ModalProps, ModalFuncProps } from '@aplus-frontend/antdv';
+import { ModalFunc } from '@aplus-frontend/antdv/lib/modal/confirm';
 export type CreateModalFuncProps<ContentRecord = any> = Omit<ModalProps, 'open' | 'onUpdate:open' | 'destroyOnClose' | 'onCancel' | 'onOk' | 'getContainer' | 'icon'> & Partial<{
+    /**
+     * 点击取消回调
+     * @param params content组件内使用defineExpose导出的对象
+     * @returns
+     */
     onCancel: (params: ContentRecord) => any | Promise<any>;
+    /**
+     * 点击确定回调
+     * @param params content组件内使用defineExpose导出的对象
+     * @returns
+     */
     onOk: (params: ContentRecord) => any | Promise<any>;
+    /**
+     * 指定弹框挂载的 HTML 节点
+     */
     getContainer: HTMLElement;
+    /**
+     * 内容
+     */
     content: any;
+    /**
+     * 关闭时是否销毁弹框
+     */
     destroyOnClose: boolean;
+    /**
+     * 自适应高度
+     */
     wrapperOffset: boolean | number;
 }>;
 export type CreateModalFuncReturn = {
+    /**
+     * 销毁弹框
+     * @returns
+     */
     destroy: () => void;
+    /**
+     * 更新弹框 props 属性
+     * @param newConfig
+     * @returns
+     */
     update: (newConfig: CreateModalFuncProps) => void;
+    /**
+     * 打开弹框
+     * @returns
+     */
     open: () => void;
+    /**
+     * 关闭弹框,不销毁
+     * @returns
+     */
     close: () => void;
 };
 export type CreateModalFunc = (props: CreateModalFuncProps) => CreateModalFuncReturn;
+export type ModalStreamNextFunc<ModalType extends ModalStreamTypeKey = ModalStreamTypeKey> = (option: {
+    /**
+     * 下一步弹框的id
+     */
+    modalId?: string;
+    /**
+     * 下一步弹框传递的参数
+     */
+    params?: any;
+    /**
+     * 本次弹框关闭前的回调,createModal默认关闭弹框,其他弹框类型默认销毁弹框,调用弹框实例的open方法可以不关闭弹框
+     */
+    handleCurrentModal?: (
+    /**
+     * 本次弹框的实例方法
+     */
+    modalExample: ModalStreamTypeExample[ModalType]) => any | Promise<any>;
+}) => any | Promise<any>;
+export type ModalStreamType = {
+    createModal: CreateModalStream<'createModal'>;
+    info: ModalFuncStream<'info'>;
+    success: ModalFuncStream<'success'>;
+    error: ModalFuncStream<'error'>;
+    warning: ModalFuncStream<'warning'>;
+    confirm: ModalFuncStream<'confirm'>;
+};
+export type ModalStreamFuncReturn = ReturnType<ModalFunc> & {
+    open: () => void;
+};
+export type ModalStreamTypeExample = {
+    createModal: CreateModalFuncReturn;
+    info: ModalStreamFuncReturn;
+    success: ModalStreamFuncReturn;
+    error: ModalStreamFuncReturn;
+    warning: ModalStreamFuncReturn;
+    confirm: ModalStreamFuncReturn;
+};
+export type ModalFuncStream<ModalType extends ModalStreamTypeKey = ModalStreamTypeKey> = Omit<ModalFuncProps, 'onOk' | 'onCancel'> & {
+    /**
+     * 点击确定回调
+     * @param next 下一步
+     * @returns
+     */
+    onOk?: (next: ModalStreamNextFunc<ModalType>) => any | Promise<any>;
+    /**
+     * 点击取消回调
+     * @param next 下一步
+     * @returns
+     */
+    onCancel?: (next: ModalStreamNextFunc<ModalType>) => any | Promise<any>;
+};
+export type CreateModalStream<ModalType extends ModalStreamTypeKey = ModalStreamTypeKey> = Omit<CreateModalFuncProps, 'destroyOnClose' | 'onOk' | 'onCancel'> & {
+    /**
+     * 点击确定回调
+     * * @param params content组件内使用defineExpose导出的对象
+     * @param next 下一步
+     * @returns
+     */
+    onOk?: (params: any, next: ModalStreamNextFunc<ModalType>) => any | Promise<any>;
+    /**
+     * 点击取消回调
+     * * @param params content组件内使用defineExpose导出的对象
+     * @param next 下一步
+     * @returns
+     */
+    onCancel?: (params: any, next: ModalStreamNextFunc<ModalType>) => any | Promise<any>;
+};
+export type ModalStreamTypeKey = keyof ModalStreamType;
+export type CreateModalStreamProps<ModalType extends ModalStreamTypeKey = ModalStreamTypeKey> = ModalType extends ModalStreamTypeKey ? {
+    /**
+     * 弹框id
+     */
+    modalId: string;
+    /**
+     * 弹框类型
+     */
+    modalType?: ModalType;
+    /**
+     * 弹框属性
+     * @param params 上一步弹框传递的参数
+     * @returns
+     */
+    props: (params: any) => Promise<ModalStreamType[ModalType]>;
+} : never;
+export type CreateModalStreamFunc<ModalType extends ModalStreamTypeKey = ModalStreamTypeKey> = (streamList: CreateModalStreamProps<ModalType>[], firstModalId?: string) => void;

package/lib/src/ap-modal/utils/createModalStream.d.ts

@@ -0,0 +1,2 @@
+import { CreateModalStreamFunc } from '../interface';
+export declare const createModalStream: CreateModalStreamFunc;

package/lib/src/ap-modal/utils/createModalStream.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const b=require("@aplus-frontend/utils"),z=require("./createModal.js"),P=require("@aplus-frontend/antdv"),m=require("../enums/modalMessage.js"),j=(N,M)=>{var k;const I=M??(Array.isArray(N)?(k=N[0])==null?void 0:k.modalId:void 0),w=new Map;let y,S,l=1e3;const C=async({modalId:i,params:f,handleCurrentModal:t})=>{y=f;const d=N.find(s=>s.modalId===i);let n=!1;if(S){const s=w.get(S),o={...s,destroy:()=>{var a;(a=s==null?void 0:s.destroy)==null||a.call(s),w.delete(S)},open:()=>{n=!0}};await(t==null?void 0:t(o))}return d&&setTimeout(()=>{T(d)}),n},g=()=>{var i;for(const[f,t]of w)(i=t==null?void 0:t.destroy)==null||i.call(t)},T=async i=>{var q,D,_,A;const{modalId:f,modalType:t="createModal",props:d}=i;S=f;const n=w.get(f),s=await(d==null?void 0:d(y));l=Math.max((s==null?void 0:s.zIndex)??0,l),l+=1;let o,a=!1;if(t==="createModal"){const e=s,u=async r=>(a=!0,await C(r));o={...e,destroyOnClose:!1,zIndex:l,onOk:async r=>{var E;const c=await((E=e==null?void 0:e.onOk)==null?void 0:E.call(e,r,u));if(a||g(),c)throw new Error(m.ModalMessage.NOT_NEED_CLOSE)},onCancel:async r=>{var E;const c=await((E=e==null?void 0:e.onCancel)==null?void 0:E.call(e,r,u));if(a||g(),c)throw new Error(m.ModalMessage.NOT_NEED_CLOSE)}}}else{const e=s,u=async r=>(a=!0,await C(r));o={...e,zIndex:l,onOk:async()=>{var c;const r=await((c=e==null?void 0:e.onOk)==null?void 0:c.call(e,u));if(a||g(),r)throw new Error(m.ModalMessage.NOT_NEED_CLOSE)},onCancel:async()=>{var c;const r=await((c=e==null?void 0:e.onCancel)==null?void 0:c.call(e,u));if(a||g(),r)throw new Error(m.ModalMessage.NOT_NEED_CLOSE)}}}if(n){n==null||n.update(o),(q=n==null?void 0:n.open)==null||q.call(n);return}else if(t==="createModal"){const e=z.createModal(o);(D=e==null?void 0:e.open)==null||D.call(e),w.set(f,e)}else(A=(_=P.Modal)==null?void 0:_[t])==null||A.call(_,o)},O=N.find(i=>b.isValid(I)&&i.modalId===I);O!==void 0&&T(O)};exports.createModalStream=j;

package/lib/src/ap-modal/utils/index.d.ts

@@ -1 +1,2 @@
 export * from './createModal';
+export * from './createModalStream';

package/lib/src/ap-modal/utils/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./createModal.js");exports.createModal=e.createModal;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./createModal.js"),a=require("./createModalStream.js");exports.createModal=e.createModal;exports.createModalStream=a.createModalStream;

package/lib/src/ap-table/components/dynamic-component/index.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),n=e.defineComponent({name:"ApTableDynamicComponent",inheritAttrs:!1,__name:"index",props:{customRender:{type:Function}},setup(o){return(t,r)=>(e.openBlock(),e.createElementBlock(e.Fragment,null,[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(t.customRender(t.$attrs)))),e.createTextVNode(" "+e.toDisplayString(console.log(t.$attrs)),1)],64))}});exports.default=n;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),t=e.defineComponent({name:"ApTableDynamicComponent",inheritAttrs:!1,__name:"index",props:{customRender:{type:Function}},setup(o){return(n,r)=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n.customRender(n.$attrs))))}});exports.default=t;

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

@@ -1010,10 +1010,7 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                         };
                         parser: {
                             type: PropType<(displayValue: string) => ValueType>;
-                            default: (displayValue: string) => **
-                             * 通常情况下，表格渲染是不需要请求网络数据的，因此这里删掉request，
-                             * 如果需要做映射，可以在外部发起一次网络请求，然后使用valueEnum设置匹配枚举。
-                             */).ValueType;
+                            default: (displayValue: string) => ValueType;
                         };
                         formatter: {
                             type: PropType<(value: ValueType, info: {

package/lib/src/ap-table/utils.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("vue"),s=require("lodash-unified"),p=require("./constants.js"),g=require("@fruits-chain/utils");require("../ap-form/index.js");const h=require("@aplus-frontend/antdv"),j=require("@ant-design/icons-vue");require("./components/dynamic-component/index.vue.js");const f=require("./components/dynamic-component/index.vue2.js"),O=require("../ap-form/item/index.vue.js");function E(e){return typeof e=="function"||Object.prototype.toString.call(e)==="[object Object]"&&!l.isVNode(e)}const m=(e,t,n)=>{let o={};return s.isObject(e)?Object.keys(e).forEach(i=>{s.isObject(e[i])?o[i]=m(e[i],t[i],n):o[i]=n(e[i],t)}):o=n(e,t),o},N=(e,t)=>{switch(e){case"dayjs":return t.valueOf();case"dayjsRange":return t.map(n=>n.valueOf());case"dayjsDayRange":{const[n,o]=t;return[n.startOf("day").valueOf(),o.endOf("day").valueOf()]}case"multiple":case"multipleNumber":return s.isArray(t)?t:[t];case"boolean":return t;case"object":return t;default:return t}};function C(e){return s.isArray(e)?e.join("."):e}function F(e){const t=Object.prototype.toString.call(e).match(/^\[object (.*)\]$/)[1].toLowerCase();return t==="string"&&typeof e=="object"?"object":e===null?"null":e===void 0?"undefined":t}const y=e=>F(e)==="map"?e:new Map(Object.entries(e||{})),a=e=>{const t=[],n=y(e);return n.forEach((o,i)=>{const r=n.get(i)||n.get(`${i}`);if(r){if(typeof r=="object"&&(r!=null&&r.text)){t.push({text:r==null?void 0:r.text,value:i,label:r==null?void 0:r.text,disabled:r.disabled});return}t.push({text:r,label:r,value:i})}}),t},_=e=>s.isUndefined(e)||e<0?0:e;function T(e,t){return!e||!s.isFunction(e)?e:e(t)}function v(e){let t=e.valueType||"text";return e.valueEnum&&(t="status"),t}function S(e,t,n,o){var u;const i=p.apTableRenderItemMap[e];if(i)return l.createVNode(i,l.mergeProps(t,{mode:"read"}),null);const r=o==null?void 0:o[e];return((u=r==null?void 0:r.render)==null?void 0:u.call(r,t.value,n,t))||t.value}function V(e,t){if(e.customRenderFormItem){let r=function(u){const c=u.item.customRenderFormItem(u.item);return l.cloneVNode(c,{...u.item.fieldProps,span:u.item.span,...c.props||{},hidden:u.hidden,class:u.class})};return{Comp:f.default,render:r}}const n=p.apTableFormItemMap[e.valueType];if(n)return{Comp:n};const o=t==null?void 0:t[e.valueType];function i(r){var c;const u=(c=o==null?void 0:o.renderFormItem)==null?void 0:c.call(o,r.item.fieldProps.field);return u?l.createVNode(O.default,l.mergeProps(r.item.fieldProps,{span:e.span}),E(u)?u:{default:()=>[u]}):null}return{Comp:f.default,render:i}}function q(e,t){const n=T(e.fieldProps,t),o=(n==null?void 0:n.field)||n||{},i=e.valueType==="switch",r=e.valueType==="index",u=i?{checked:t.value}:{value:r?t.index+1:t.value};return e.valueEnum&&(o.valueEnum=e.valueEnum),{...s.omit(o,["request"]),...u}}function P(e){const t={...e};return s.isBoolean(e.filters)&&e.filters&&e.valueEnum&&(t.filters=a(e.valueEnum)),t}function I(e,t){var o;const n=t||{};return e.valueEnum&&!((o=n.field)!=null&&o.options)&&(n.field={...n.field,options:a(e.valueEnum)}),n}function A(e){if(!g.isType("Object")(e))return e;try{return JSON.stringify(e)}catch{return e}}function x(e,t,n,o){const i=n==null?void 0:n({title:e.title,column:e}),r=(i==null?void 0:i.filter(b=>b.type!==Symbol.for("v-cmt")))||[];if(i&&r.length>0)return i;const c=s.isString(e.title)?l.createVNode("span",{class:t,title:e.title},[e.title]):e.title,d=e.tooltip?s.isFunction(e.tooltip)?e.tooltip(e):l.createVNode(l.Fragment,null,[e.tooltip]):null;return d?l.createVNode("span",{style:{display:"inline-flex",alignItems:"center",maxWidth:"100%"}},[c,l.createVNode(h.Tooltip,{title:d,placement:"bottom"},{default:()=>[l.createVNode(j.QuestionCircleOutlined,{style:{padding:"4px",color:o,verticalAlign:"middle"}},null)]})]):c}function R(e,t){const n=[];function o(i){var r;for(const u of i)(r=u.children)!=null&&r.length?o(u.children):n.push(t(u))}return o(e),n}function w(e,t){if(s.isArray(e)&&s.isArray(t))return s.isEqual(s.sortBy(e),s.sortBy(t));if(s.isPlainObject(e)&&s.isPlainObject(t)){const n=o=>s.every(o,i=>i==null)||s.isEmpty(o);if(n(e)&&n(t))return!0}}function U(e){if(e!==!1)return e}exports.apColumnToColumn=P;exports.dataIndexToStr=C;exports.falseToUndefined=U;exports.formatParamsValueType=m;exports.getColumnOrder=_;exports.getFieldProps=T;exports.getSearchFormItemRenderNode=V;exports.getTableCellRenderNode=S;exports.getTableRenderProps=q;exports.getTableRenderType=v;exports.getTableTitle=x;exports.isEqualCustom=w;exports.objectToMap=y;exports.objectToString=A;exports.parseFieldValue=N;exports.recursionApColumns=R;exports.updateFormProps=I;exports.valueEnumToArray=a;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("vue"),u=require("lodash-unified"),p=require("./constants.js"),g=require("@fruits-chain/utils");require("../ap-form/index.js");const h=require("@aplus-frontend/antdv"),j=require("@ant-design/icons-vue");require("./components/dynamic-component/index.vue.js");const f=require("./components/dynamic-component/index.vue2.js"),O=require("../ap-form/item/index.vue.js");function E(e){return typeof e=="function"||Object.prototype.toString.call(e)==="[object Object]"&&!l.isVNode(e)}const m=(e,t,n)=>{let o={};return u.isObject(e)?Object.keys(e).forEach(i=>{u.isObject(e[i])?o[i]=m(e[i],t[i],n):o[i]=n(e[i],t)}):o=n(e,t),o},N=(e,t)=>{switch(e){case"dayjs":return t.valueOf();case"dayjsRange":return t.map(n=>n.valueOf());case"dayjsDayRange":{const[n,o]=t;return[n.startOf("day").valueOf(),o.endOf("day").valueOf()]}case"multiple":case"multipleNumber":return u.isArray(t)?t:[t];case"boolean":return t;case"object":return t;default:return t}};function C(e){return u.isArray(e)?e.join("."):e}function F(e){const t=Object.prototype.toString.call(e).match(/^\[object (.*)\]$/)[1].toLowerCase();return t==="string"&&typeof e=="object"?"object":e===null?"null":e===void 0?"undefined":t}const y=e=>F(e)==="map"?e:new Map(Object.entries(e||{})),a=e=>{const t=[],n=y(e);return n.forEach((o,i)=>{const r=n.get(i)||n.get(`${i}`);if(r){if(typeof r=="object"&&(r!=null&&r.text)){t.push({text:r==null?void 0:r.text,value:i,label:r==null?void 0:r.text,disabled:r.disabled});return}t.push({text:r,label:r,value:i})}}),t},_=e=>u.isUndefined(e)||e<0?0:e;function T(e,t){return!e||!u.isFunction(e)?e:e(t)}function v(e){let t=e.valueType||"text";return e.valueEnum&&(t="status"),t}function S(e,t,n,o){var s;const i=p.apTableRenderItemMap[e];if(i)return l.createVNode(i,l.mergeProps(t,{mode:"read"}),null);const r=o==null?void 0:o[e];return((s=r==null?void 0:r.render)==null?void 0:s.call(r,t.value,n,t))||t.value}function V(e,t){if(e.customRenderFormItem){let r=function(s){const c=s.item.customRenderFormItem(s.item);return l.cloneVNode(c,{...s.item.fieldProps,span:s.item.span,...c.props||{},hidden:s.hidden,class:s.class})};return{Comp:f.default,render:r}}const n=p.apTableFormItemMap[e.valueType];if(n)return{Comp:n};const o=t==null?void 0:t[e.valueType];function i(r){var c;const s=(c=o==null?void 0:o.renderFormItem)==null?void 0:c.call(o,r.item.fieldProps.field);return s?l.createVNode(O.default,l.mergeProps(r.item.fieldProps,{hidden:r.hidden,class:r.class,span:e.span}),E(s)?s:{default:()=>[s]}):null}return{Comp:f.default,render:i}}function q(e,t){const n=T(e.fieldProps,t),o=(n==null?void 0:n.field)||n||{},i=e.valueType==="switch",r=e.valueType==="index",s=i?{checked:t.value}:{value:r?t.index+1:t.value};return e.valueEnum&&(o.valueEnum=e.valueEnum),{...u.omit(o,["request"]),...s}}function P(e){const t={...e};return u.isBoolean(e.filters)&&e.filters&&e.valueEnum&&(t.filters=a(e.valueEnum)),t}function I(e,t){var o;const n=t||{};return e.valueEnum&&!((o=n.field)!=null&&o.options)&&(n.field={...n.field,options:a(e.valueEnum)}),n}function A(e){if(!g.isType("Object")(e))return e;try{return JSON.stringify(e)}catch{return e}}function x(e,t,n,o){const i=n==null?void 0:n({title:e.title,column:e}),r=(i==null?void 0:i.filter(b=>b.type!==Symbol.for("v-cmt")))||[];if(i&&r.length>0)return i;const c=u.isString(e.title)?l.createVNode("span",{class:t,title:e.title},[e.title]):e.title,d=e.tooltip?u.isFunction(e.tooltip)?e.tooltip(e):l.createVNode(l.Fragment,null,[e.tooltip]):null;return d?l.createVNode("span",{style:{display:"inline-flex",alignItems:"center",maxWidth:"100%"}},[c,l.createVNode(h.Tooltip,{title:d,placement:"bottom"},{default:()=>[l.createVNode(j.QuestionCircleOutlined,{style:{padding:"4px",color:o,verticalAlign:"middle"}},null)]})]):c}function R(e,t){const n=[];function o(i){var r;for(const s of i)(r=s.children)!=null&&r.length?o(s.children):n.push(t(s))}return o(e),n}function w(e,t){if(u.isArray(e)&&u.isArray(t))return u.isEqual(u.sortBy(e),u.sortBy(t));if(u.isPlainObject(e)&&u.isPlainObject(t)){const n=o=>u.every(o,i=>i==null)||u.isEmpty(o);if(n(e)&&n(t))return!0}}function U(e){if(e!==!1)return e}exports.apColumnToColumn=P;exports.dataIndexToStr=C;exports.falseToUndefined=U;exports.formatParamsValueType=m;exports.getColumnOrder=_;exports.getFieldProps=T;exports.getSearchFormItemRenderNode=V;exports.getTableCellRenderNode=S;exports.getTableRenderProps=q;exports.getTableRenderType=v;exports.getTableTitle=x;exports.isEqualCustom=w;exports.objectToMap=y;exports.objectToString=A;exports.parseFieldValue=N;exports.recursionApColumns=R;exports.updateFormProps=I;exports.valueEnumToArray=a;

package/lib/src/business/ap-attachment/ApAttachment.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),p=require("@aplus-frontend/antdv");require("../../config-provider/index.js");const _=require("./constans.js"),f=require("../../ap-download/utils/getFileInfo.js"),k=require("../../ap-download/hooks/index.js"),G=require("lodash-unified"),g=require("@ant-design/icons-vue"),U=require("../../config-provider/hooks/use-namespace.js"),v=require("../../config-provider/hooks/use-global-config.js"),j=require("../../config-provider/hooks/use-locale.js"),z=e.defineComponent({name:"ApAttachment",props:_.ApAttachmentProps(),setup(t){const{b:F,e:l}=U.useNamespace("ap-attachment"),w=v.useGlobalConfig("uiMode"),y=v.useGlobalConfig("apUpload"),N=v.useGlobalConfig("downloadCenterTriggerConfig"),{lang:b,t:r}=j.useLocale(),o=e.ref(!1),c=e.ref(""),d=e.useSlots(),O=e.computed(()=>b.value==="zh-cn"?"zh_CN":"en_US"),u=e.computed(()=>t.attachmentList.length===1),h=e.computed(()=>t.needName?t.attachmentList.length>0&&t.needName&&t.needName.nameKey?t.attachmentList[0][t.needName.nameKey]:"":t.attachmentList.length>0?t.attachmentList[0].fileName:""),q=e.computed(()=>u.value?h.value:r("ap.apAttachment.downloadall")),L=e.computed(()=>t.color?t.color:w.value==="aplus"?"#0070FF":"#1890FF"),T=e.computed(()=>({width:u.value?"auto":"266px"})),V=e.computed(()=>({"--download-main-color":L.value,"--download-main-color-opacity":f.getHexWithOpacity(L.value,.6)})),x=e.computed(()=>{var a;return t.getOssAccess||((a=y.value)==null?void 0:a.getOssAccess)}),I=e.computed(()=>{const a=d.default?d.default()[0]:null;return a?e.cloneVNode(a,{style:{"font-size":"16px"}}):null}),m=async(a,i)=>{var n,C;if(!t.disabled){o.value=!0,i&&(c.value=i);try{const s=G.isArray(e.toRaw(a))?e.toRaw(a):[e.toRaw(a)];if((n=N.value)!=null&&n.trigger){const M=f.getFileInfo(t.needName,s).map(A=>({objectName:A.path,fileName:A.fileName}));(C=N.value)==null||C.trigger(M)}else await(await k.useOssInit(x.value,e.unref(O))).downloadFile(f.getFileInfo(t.needName,s))}catch(s){console.error(s)}finally{o.value=!1,c.value=""}}},P=a=>a&&a.length>0?e.createVNode("ul",{class:[l("file-list")],style:V.value},[a.map((i,n)=>e.createVNode("li",{key:n,class:[l("file-item")],onClick:()=>m(i,n+1)},[o.value&&c.value===n+1?e.createVNode("span",{class:[l("spin")]},[e.createVNode(g.LoadingOutlined,{spin:!0},null)]):null,i.fileName])),e.createVNode("li",{class:[l("down-load-all")],onClick:()=>m(t.attachmentList,"all")},[o.value&&c.value==="all"?e.createVNode("span",{class:[l("spin")]},[e.createVNode(g.LoadingOutlined,{spin:!0},null)]):null,r("ap.apAttachment.downloadall")])]):null;return()=>{var a;return((a=t.attachmentList)==null?void 0:a.length)>0&&e.createVNode("div",{class:[F()],style:[T.value,V.value]},[e.createVNode(p.Tooltip,{title:q.value,placement:t.textToolTipPlacement,color:t.toolTipBgColor},{default:()=>[e.createVNode("div",{class:[l("content")],onClick:()=>m(u.value?t.attachmentList[0]:t.attachmentList,"global")},[o.value&&c.value==="global"?e.createVNode("div",{class:[l("spin")]},[e.createVNode(g.LoadingOutlined,{spin:!0},null)]):null,d.default?e.createVNode("div",{class:[l("text-render")]},[I.value,e.createTextVNode(" ")]):null,e.createVNode("div",{class:[l("text-inner")]},[h.value])])]}),e.createVNode(p.Popover,{content:P(t.attachmentList),placement:t.fileMorePopoverPlacement,color:"#fff"},{default:()=>[!u.value&&e.createVNode("div",{class:[l("more")]},[r("ap.apAttachment.more")])]})])}}});exports.default=z;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),p=require("@aplus-frontend/antdv");require("../../config-provider/index.js");const k=require("./constans.js"),f=require("../../ap-download/utils/getFileInfo.js"),G=require("../../ap-download/hooks/index.js"),F=require("lodash-unified"),g=require("@ant-design/icons-vue"),U=require("../../config-provider/hooks/use-namespace.js"),v=require("../../config-provider/hooks/use-global-config.js"),j=require("../../config-provider/hooks/use-locale.js"),z=e.defineComponent({name:"ApAttachment",props:k.ApAttachmentProps(),setup(t){const{b:w,e:l}=U.useNamespace("ap-attachment"),y=v.useGlobalConfig("uiMode"),b=v.useGlobalConfig("apUpload"),N=v.useGlobalConfig("downloadCenterTriggerConfig"),{lang:O,t:r}=j.useLocale(),o=e.ref(!1),c=e.ref(""),d=e.useSlots(),q=e.computed(()=>O.value==="zh-cn"?"zh_CN":"en_US"),u=e.computed(()=>t.attachmentList.length===1),h=e.computed(()=>t.needName?t.attachmentList.length>0&&t.needName&&t.needName.nameKey?t.attachmentList[0][t.needName.nameKey]:"":t.attachmentList.length>0?t.attachmentList[0].fileName:""),T=e.computed(()=>u.value?h.value:r("ap.apAttachment.downloadall")),L=e.computed(()=>t.color?t.color:y.value==="aplus"?"#0070FF":"#1890FF"),x=e.computed(()=>({width:u.value?"auto":"266px"})),V=e.computed(()=>({"--download-main-color":L.value,"--download-main-color-opacity":f.getHexWithOpacity(L.value,.6)})),I=e.computed(()=>{var a;return t.getOssAccess||((a=b.value)==null?void 0:a.getOssAccess)}),P=e.computed(()=>{const a=d.default?d.default()[0]:null;return a?e.cloneVNode(a,{style:{"font-size":"16px"}}):null}),m=F.debounce(async(a,i)=>{var n,C;if(!t.disabled){o.value=!0,i&&(c.value=i);try{const s=F.isArray(e.toRaw(a))?e.toRaw(a):[e.toRaw(a)];if((n=N.value)!=null&&n.trigger){const _=f.getFileInfo(t.needName,s).map(A=>({objectName:A.path,fileName:A.fileName}));(C=N.value)==null||C.trigger(_)}else await(await G.useOssInit(I.value,e.unref(q))).downloadFile(f.getFileInfo(t.needName,s))}catch(s){console.error(s)}finally{o.value=!1,c.value=""}}},500),S=a=>a&&a.length>0?e.createVNode("ul",{class:[l("file-list")],style:V.value},[a.map((i,n)=>e.createVNode("li",{key:n,class:[l("file-item")],onClick:()=>m(i,n+1)},[o.value&&c.value===n+1?e.createVNode("span",{class:[l("spin")]},[e.createVNode(g.LoadingOutlined,{spin:!0},null)]):null,i.fileName])),e.createVNode("li",{class:[l("down-load-all")],onClick:()=>m(t.attachmentList,"all")},[o.value&&c.value==="all"?e.createVNode("span",{class:[l("spin")]},[e.createVNode(g.LoadingOutlined,{spin:!0},null)]):null,r("ap.apAttachment.downloadall")])]):null;return()=>{var a;return((a=t.attachmentList)==null?void 0:a.length)>0&&e.createVNode("div",{class:[w()],style:[x.value,V.value]},[e.createVNode(p.Tooltip,{title:T.value,placement:t.textToolTipPlacement,color:t.toolTipBgColor},{default:()=>[e.createVNode("div",{class:[l("content")],onClick:()=>m(u.value?t.attachmentList[0]:t.attachmentList,"global")},[o.value&&c.value==="global"?e.createVNode("div",{class:[l("spin")]},[e.createVNode(g.LoadingOutlined,{spin:!0},null)]):null,d.default?e.createVNode("div",{class:[l("text-render")]},[P.value,e.createTextVNode(" ")]):null,e.createVNode("div",{class:[l("text-inner")]},[h.value])])]}),e.createVNode(p.Popover,{content:S(t.attachmentList),placement:t.fileMorePopoverPlacement,color:"#fff"},{default:()=>[!u.value&&e.createVNode("div",{class:[l("more")]},[r("ap.apAttachment.more")])]})])}}});exports.default=z;