@aplus-frontend/ui 6.19.0 → 6.19.1

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../ap-action/index.js");require("../ap-field/index.js");require("../ap-form/index.js");require("./components/index/index.vue.js");require("./components/status/index.vue.js");const t=require("../ap-form/items/tree-select/index.vue.js"),e=require("../ap-form/items/text/index.js"),_=require("../ap-form/items/checkbox/index.vue.js"),u=require("../ap-form/items/text-area/index.vue.js"),r=require("../ap-form/items/switch/index.vue.js"),s=require("../ap-form/items/select/index.vue.js"),i=require("../ap-form/items/radio/index.vue.js"),n=require("../ap-form/items/number/index.vue.js"),p=require("../ap-form/items/date-range/index.vue.js"),a=require("../ap-form/items/date/index.vue.js"),d=require("../ap-field/tree-select/index.vue.js"),c=require("../ap-field/text/password.vue.js"),l=require("./components/status/index.vue2.js"),o=require("./components/index/index.vue2.js"),v=require("../ap-action/group/index.vue.js"),x=require("../ap-field/checkbox/index.vue.js"),q=require("../ap-field/text-area/index.vue.js"),g=require("../ap-field/text/index.js"),f=require("../ap-field/switch/index.vue.js"),y=require("../ap-field/select/index.vue.js"),$=require("../ap-field/radio/index.vue.js"),m=require("../ap-field/number/index.vue.js"),b=require("../ap-field/date-range/index.vue.js"),I=require("../ap-field/date/index.vue.js"),T={date:a.default,dateRange:p.default,number:n.default,radio:i.default,select:s.default,switch:r.default,text:e.ApFormItemText,textArea:u.default,checkbox:_.default,password:e.ApFormItemText.Password,treeSelect:t.default},A={date:I.default,dateRange:b.default,number:m.default,radio:$.default,select:y.default,switch:f.default,text:g.ApFieldText,textArea:q.default,checkbox:x.default,action:v.default,index:o.default,status:l.default,password:c.default,treeSelect:d.default},F=["action","index"];exports.apTableFormItemMap=T;exports.apTableRenderItemMap=A;exports.noRenderAsFormItemValueList=F;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../ap-action/index.js");require("../ap-field/index.js");require("../ap-form/index.js");require("./components/index/index.vue.js");require("./components/status/index.vue.js");const t=require("../ap-form/items/date/index.vue.js"),_=require("../ap-form/items/date-range/index.vue.js"),u=require("../ap-form/items/number/index.vue.js"),r=require("../ap-form/items/radio/index.vue.js"),s=require("../ap-form/items/select/index.vue.js"),i=require("../ap-form/items/switch/index.vue.js"),e=require("../ap-form/items/text/index.js"),n=require("../ap-form/items/text-area/index.vue.js"),p=require("../ap-form/items/checkbox/index.vue.js"),a=require("../ap-form/items/tree-select/index.vue.js"),d=require("../ap-field/date/index.vue.js"),c=require("../ap-field/date-range/index.vue.js"),l=require("../ap-field/number/index.vue.js"),o=require("../ap-field/radio/index.vue.js"),v=require("../ap-field/select/index.vue.js"),x=require("../ap-field/switch/index.vue.js"),q=require("../ap-field/text/index.js"),g=require("../ap-field/text-area/index.vue.js"),f=require("../ap-field/checkbox/index.vue.js"),y=require("../ap-action/group/index.vue.js"),$=require("./components/index/index.vue2.js"),m=require("./components/status/index.vue2.js"),b=require("../ap-field/text/password.vue.js"),I=require("../ap-field/tree-select/index.vue.js"),T={date:t.default,dateRange:_.default,number:u.default,radio:r.default,select:s.default,switch:i.default,text:e.ApFormItemText,textArea:n.default,checkbox:p.default,password:e.ApFormItemText.Password,treeSelect:a.default},A={date:d.default,dateRange:c.default,number:l.default,radio:o.default,select:v.default,switch:x.default,text:q.ApFieldText,textArea:g.default,checkbox:f.default,action:y.default,index:$.default,status:m.default,password:b.default,treeSelect:I.default},F=["action","index"];exports.apTableFormItemMap=T;exports.apTableRenderItemMap=A;exports.noRenderAsFormItemValueList=F;

package/lib/src/ap-table/hooks/use-table-column-state.d.ts

@@ -4,18 +4,18 @@ export declare const useTableColumnState: (columnSetting: ApTableSettingType, pe
     columnState: Ref<{
         key: string | number;
         show?: boolean | undefined;
-        fixed?: "left" | "right" | undefined;
+        fixed?: ("left" | "right") | undefined;
         disabled?: boolean | undefined;
         label?: any;
-        children?: /*elided*/ any[] | undefined;
+        children?: any[] | undefined;
         order?: number | undefined;
     }[], ApColumnState[] | {
         key: string | number;
         show?: boolean | undefined;
-        fixed?: "left" | "right" | undefined;
+        fixed?: ("left" | "right") | undefined;
         disabled?: boolean | undefined;
         label?: any;
-        children?: /*elided*/ any[] | undefined;
+        children?: any[] | undefined;
         order?: number | undefined;
     }[]>;
     selectAll: () => void;

package/lib/src/ap-tag/ap-tag.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const a=require("vue");require("../config-provider/index.js");const y=require("@aplus-frontend/antdv"),S=require("./utils.js"),$=require("../config-provider/hooks/use-global-config.js"),v=require("../config-provider/hooks/use-namespace.js"),w=a.defineComponent({name:"ApTag",__name:"ap-tag",props:{type:{default:"purely"},text:{},color:{default:"#34B77C"},size:{default:"middle"},disabled:{type:Boolean,default:!1},fixedWidth:{type:Boolean,default:!1}},setup(p){const t=p,o=$.useGlobalConfig("uiMode"),{b:n,bm:s}=v.useNamespace("tag");function i(e,r){e.length===4&&(e=`#${e[1]}${e[1]}${e[2]}${e[2]}${e[3]}${e[3]}`);const m=parseInt(e.slice(1,3),16),g=parseInt(e.slice(3,5),16),f=parseInt(e.slice(5,7),16),b=Math.round(r*255).toString(16).padStart(2,"0");return`#${m.toString(16).padStart(2,"0")}${g.toString(16).padStart(2,"0")}${f.toString(16).padStart(2,"0")}${b}`}const c=a.computed(()=>({maxWidth:`${l.value}px`,"--tag-main-color":t.color,"--tag-main-color-opacity":i(t.color,.06),"--tag-main-color-background":i(t.color,.15)})),u=a.computed(()=>[n("wrapper"),n(`wrapper-${t.type}`),s("wrapper",t.size)].filter(Boolean)),d=a.computed(()=>{const e=[n("inner-wrapper"),s("inner-wrapper",t.size)];return t.disabled&&(o.value==="aplus"?e.push(s("inner-wrapper","disabled")):e.push(s("inner-wrapper","disabled-admin"))),e}),l=a.ref(0);return a.watch(()=>t.text,()=>{const e=t.type==="border"?2:0;let r=Math.ceil(S.getTextWidth(t.size==="large"?14:12,t.text));t.size==="large"||t.size==="middle"?r+=12:r+=8,l.value=r+e},{immediate:!0}),(e,r)=>(a.openBlock(),a.createElementBlock("span",{style:a.normalizeStyle(c.value),class:a.normalizeClass(u.value)},[a.createVNode(a.unref(y.TypographyText),{class:a.normalizeClass(d.value),ellipsis:{tooltip:e.text},content:e.text},null,8,["class","ellipsis","content"])],6))}});exports.default=w;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const t=require("vue");require("../config-provider/index.js");const S=require("../config-provider/hooks/use-global-config.js"),b=require("../config-provider/hooks/use-namespace.js"),y=["title"],$=t.defineComponent({name:"ApTag",__name:"ap-tag",props:{type:{default:"purely"},text:{},color:{default:"#34B77C"},size:{default:"middle"},disabled:{type:Boolean,default:!1},fixedWidth:{type:Boolean,default:!1}},setup(p){const a=p,l=S.useGlobalConfig("uiMode"),{b:n,bm:r}=b.useNamespace("tag");function s(e,i){e.length===4&&(e=`#${e[1]}${e[1]}${e[2]}${e[2]}${e[3]}${e[3]}`);const d=parseInt(e.slice(1,3),16),g=parseInt(e.slice(3,5),16),m=parseInt(e.slice(5,7),16),f=Math.round(i*255).toString(16).padStart(2,"0");return`#${d.toString(16).padStart(2,"0")}${g.toString(16).padStart(2,"0")}${m.toString(16).padStart(2,"0")}${f}`}const o=t.computed(()=>({"--tag-main-color":a.color,"--tag-main-color-opacity":s(a.color,.06),"--tag-main-color-background":s(a.color,.15)})),c=t.computed(()=>[n("wrapper"),n(`wrapper-${a.type}`),r("wrapper",a.size)].filter(Boolean)),u=t.computed(()=>{const e=[n("inner-wrapper"),r("inner-wrapper",a.size)];return a.disabled&&(l.value==="aplus"?e.push(r("inner-wrapper","disabled")):e.push(r("inner-wrapper","disabled-admin"))),e});return(e,i)=>(t.openBlock(),t.createElementBlock("span",{style:t.normalizeStyle(o.value),title:e.text,class:t.normalizeClass(c.value)},[t.createElementVNode("span",{class:t.normalizeClass(u.value)},t.toDisplayString(e.text),3)],14,y))}});exports.default=$;

package/lib/src/ap-upload/apUpload.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue");require("../config-provider/index.js");require("./components/SingleFile.vue.js");require("./components/MultipleFile.vue.js");require("./components/Picture.vue.js");const E=require("./utils/accept.js"),j=require("./hooks/useOss.js"),z=require("@aplus-frontend/antdv"),h=require("../config-provider/hooks/use-locale.js"),A=require("../config-provider/hooks/use-namespace.js"),R=require("./components/Picture.vue2.js"),U=require("./components/MultipleFile.vue2.js"),k=require("./components/SingleFile.vue2.js"),g=require("../config-provider/hooks/use-global-config.js"),T=e.defineComponent({name:"AplusFileUpload",__name:"apUpload",props:{dirName:{type:String,default:void 0},type:{type:String,default:"singleFile"},value:{type:[String,Object,Array],default:void 0},needName:{type:[Boolean,Object],default:void 0},accept:{type:String,default:void 0},maxSize:{type:Number,default:void 0},title:{type:String,default:""},subTitle:{type:[String,Object],default:""},maxCount:{type:Number,default:void 0},beforeUpload:{type:Function,default:void 0},customRequest:{type:Function,default:void 0},getOssAccess:{type:Function,default:void 0},onChange:{type:Function,default:void 0},maxSizeErrorMsg:{type:String,default:void 0},maxCountErrorMsg:{type:String,default:void 0},acceptErrorMsg:{type:String,default:void 0},onRemove:{type:Function,default:void 0}},emits:["update:value"],setup(f,{expose:_,emit:y}){var p,d,v,m;const{t:s,lang:C}=h.useLocale();E.injectLocaleToAccept(s),j.injectLocaleToOss(s,C);const{b:S}=A.useNamespace("ap-upload"),a=e.ref(null),t=f,b=y,q={singleFile:k.default,multipleFile:U.default,picture:R.default},n=z.Form.useInjectFormItemContext(),M=e.computed({get(){return t.value},set(o){var r;b("update:value",o),n==null||n.onFieldChange(),(r=t.onChange)==null||r.call(t,o)}}),F=g.useGlobalConfig("uiMode"),i=g.useGlobalConfig("apUpload");e.provide("theme",F.value),e.provide("value",M),e.provide("dirName",t.dirName??((p=i.value)==null?void 0:p.dirName)),e.provide("needName",t.needName??((d=i.value)==null?void 0:d.needName)??!1),e.provide("accept",t.accept??((v=i.value)==null?void 0:v.accept)??""),e.provide("maxSize",t.maxSize),e.provide("title",t.title),e.provide("subTitle",t.subTitle),e.provide("maxCount",t.maxCount),e.provide("beforeUpload",t.beforeUpload),e.provide("customRequest",t.customRequest),e.provide("getOssAccess",t.getOssAccess??((m=i.value)==null?void 0:m.getOssAccess)),e.provide("maxSizeErrorMsg",t.maxSizeErrorMsg),e.provide("maxCountErrorMsg",t.maxCountErrorMsg),e.provide("acceptErrorMsg",t.acceptErrorMsg),e.provide("onRemove",t.onRemove);const x=e.computed(()=>l.value===0),l=e.ref(0);e.provide("uploadingCount",l);function N(){c(void 0)}function c(o){var r,u;(u=(r=a==null?void 0:a.value)==null?void 0:r.setValue)==null||u.call(r,o)}return _({done:x,clear:N,setValue:c}),(o,r)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(e.unref(S)())},[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(q[t.type]),e.mergeProps(o.$attrs,{ref_key:"uploadRef",ref:a}),e.createSlots({_:2},[e.renderList(Object.keys(o.$slots),u=>({name:u,fn:e.withCtx(O=>[e.renderSlot(o.$slots,u,e.normalizeProps(e.guardReactiveProps(O||{})))])}))]),1040))],2))}});exports.default=T;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue");require("../config-provider/index.js");require("./components/SingleFile.vue.js");require("./components/MultipleFile.vue.js");require("./components/Picture.vue.js");const E=require("./utils/accept.js"),j=require("./hooks/useOss.js"),z=require("@aplus-frontend/antdv"),h=require("../config-provider/hooks/use-locale.js"),A=require("../config-provider/hooks/use-namespace.js"),R=require("./components/SingleFile.vue2.js"),U=require("./components/MultipleFile.vue2.js"),k=require("./components/Picture.vue2.js"),g=require("../config-provider/hooks/use-global-config.js"),T=e.defineComponent({name:"AplusFileUpload",__name:"apUpload",props:{dirName:{type:String,default:void 0},type:{type:String,default:"singleFile"},value:{type:[String,Object,Array],default:void 0},needName:{type:[Boolean,Object],default:void 0},accept:{type:String,default:void 0},maxSize:{type:Number,default:void 0},title:{type:String,default:""},subTitle:{type:[String,Object],default:""},maxCount:{type:Number,default:void 0},beforeUpload:{type:Function,default:void 0},customRequest:{type:Function,default:void 0},getOssAccess:{type:Function,default:void 0},onChange:{type:Function,default:void 0},maxSizeErrorMsg:{type:String,default:void 0},maxCountErrorMsg:{type:String,default:void 0},acceptErrorMsg:{type:String,default:void 0},onRemove:{type:Function,default:void 0}},emits:["update:value"],setup(f,{expose:_,emit:y}){var p,d,v,m;const{t:s,lang:C}=h.useLocale();E.injectLocaleToAccept(s),j.injectLocaleToOss(s,C);const{b:S}=A.useNamespace("ap-upload"),a=e.ref(null),t=f,b=y,q={singleFile:R.default,multipleFile:U.default,picture:k.default},n=z.Form.useInjectFormItemContext(),M=e.computed({get(){return t.value},set(o){var r;b("update:value",o),n==null||n.onFieldChange(),(r=t.onChange)==null||r.call(t,o)}}),F=g.useGlobalConfig("uiMode"),i=g.useGlobalConfig("apUpload");e.provide("theme",F.value),e.provide("value",M),e.provide("dirName",t.dirName??((p=i.value)==null?void 0:p.dirName)),e.provide("needName",t.needName??((d=i.value)==null?void 0:d.needName)??!1),e.provide("accept",t.accept??((v=i.value)==null?void 0:v.accept)??""),e.provide("maxSize",t.maxSize),e.provide("title",t.title),e.provide("subTitle",t.subTitle),e.provide("maxCount",t.maxCount),e.provide("beforeUpload",t.beforeUpload),e.provide("customRequest",t.customRequest),e.provide("getOssAccess",t.getOssAccess??((m=i.value)==null?void 0:m.getOssAccess)),e.provide("maxSizeErrorMsg",t.maxSizeErrorMsg),e.provide("maxCountErrorMsg",t.maxCountErrorMsg),e.provide("acceptErrorMsg",t.acceptErrorMsg),e.provide("onRemove",t.onRemove);const x=e.computed(()=>l.value===0),l=e.ref(0);e.provide("uploadingCount",l);function N(){c(void 0)}function c(o){var r,u;(u=(r=a==null?void 0:a.value)==null?void 0:r.setValue)==null||u.call(r,o)}return _({done:x,clear:N,setValue:c}),(o,r)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(e.unref(S)())},[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(q[t.type]),e.mergeProps(o.$attrs,{ref_key:"uploadRef",ref:a}),e.createSlots({_:2},[e.renderList(Object.keys(o.$slots),u=>({name:u,fn:e.withCtx(O=>[e.renderSlot(o.$slots,u,e.normalizeProps(e.guardReactiveProps(O||{})))])}))]),1040))],2))}});exports.default=T;

package/lib/src/ap-upload/components/MultipleFile.vue.d.ts

@@ -1,6 +1,6 @@
 import { UploadFile, UploadChangeParam } from '@aplus-frontend/antdv';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions, CreateComponentPublicInstanceWithMixins, ExtractPropTypes, PropType, GlobalComponents, GlobalDirectives } from 'vue';
-import { UploadType, UploadFile, FileType, HttpRequestHeader, ShowUploadListInterface, UploadListType, UploadLocale, UploadListProgressProps, ItemRender } from '@aplus-frontend/antdv/es/upload/interface';
+import { UploadType, UploadFile, FileType, HttpRequestHeader, ShowUploadListInterface, UploadChangeParam, UploadListType, UploadLocale, UploadListProgressProps, ItemRender } from '@aplus-frontend/antdv/es/upload/interface';
 import { UploadRequestOption } from '@aplus-frontend/antdv/es/vc-upload/interface';
 import { VueNode } from '@aplus-frontend/antdv/es/_util/type';
 declare function setValue(val: (string | Record<string, any>)[]): void;
@@ -189,9 +189,9 @@ declare const _default: DefineComponent<{}, {
         multiple: boolean;
         disabled: boolean;
         method: "post" | "POST" | "PUT" | "PATCH" | "put" | "patch";
+        remove: (file: UploadFile<any>) => boolean | void | Promise<boolean | void>;
         locale: UploadLocale;
         action: string | ((file: FileType) => string) | ((file: FileType) => PromiseLike<string>);
-        remove: (file: UploadFile<any>) => boolean | void | Promise<boolean | void>;
         capture: boolean | "user" | "environment";
         iconRender: (opt: {
             file: UploadFile<any>;
@@ -415,9 +415,9 @@ declare const _default: DefineComponent<{}, {
         multiple: boolean;
         disabled: boolean;
         method: "post" | "POST" | "PUT" | "PATCH" | "put" | "patch";
+        remove: (file: UploadFile<any>) => boolean | void | Promise<boolean | void>;
         locale: UploadLocale;
         action: string | ((file: FileType) => string) | ((file: FileType) => PromiseLike<string>);
-        remove: (file: UploadFile<any>) => boolean | void | Promise<boolean | void>;
         capture: boolean | "user" | "environment";
         iconRender: (opt: {
             file: UploadFile<any>;

package/lib/src/ap-upload/components/Picture.vue.d.ts

@@ -1,5 +1,4 @@
 import { Oss } from '../hooks/useOss';
-import { actionResponse } from '@aplus-frontend/oss';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
 declare function setValue(val?: (string | Record<string, any>)[]): void;
 interface UploadFile extends File {
@@ -18,7 +17,13 @@ declare function __VLS_template(): {
         pictureContext?(_: {
             fileList: {
                 oss: {
-                    pauseUpload: (() => Promise< actionResponse>) | undefined;
+                    pauseUpload: (() => Promise<{
+                        status: number;
+                        previewUrl?: string;
+                        saveUrl?: string;
+                        originalFileName?: string;
+                        message: string;
+                    }>) | undefined;
                 };
             }[];
             remove: typeof handleRemove;

package/lib/src/business/ap-batch-action-group/MenuItemGroup.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),d=require("@ant-design/icons-vue"),s=require("@aplus-frontend/antdv"),f={style:{display:"flex","align-items":"center"}},p=e.defineComponent({__name:"MenuItemGroup",props:{selectedRows:{},buttonProps:{},menuList:{}},setup(a){const r=a,c=e.ref({});async function t(o,u){var l;const n=(o==null?void 0:o.id)||u;c.value[n]=!0;try{await((l=o==null?void 0:o.onClick)==null?void 0:l.call(o,{selectedRows:r==null?void 0:r.selectedRows}))}finally{c.value[n]=void 0}}return(o,u)=>(e.openBlock(),e.createBlock(e.unref(s.Menu),null,{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(r.menuList,(n,l)=>(e.openBlock(),e.createBlock(e.unref(s.MenuItem),e.mergeProps({key:(n==null?void 0:n.id)||l,ref_for:!0},{...n,onClick:()=>t(n,l),disabled:c.value[(n==null?void 0:n.id)||l]??(n==null?void 0:n.disabled)??!1}),{default:e.withCtx(()=>[e.createElementVNode("div",f,[e.withDirectives(e.createVNode(e.unref(d.LoadingOutlined),{style:{"margin-right":"10px"}},null,512),[[e.vShow,c.value[(n==null?void 0:n.id)||l]]]),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(e.h(e.Fragment,[n==null?void 0:n.content]))))])]),_:2},1040))),128))]),_:1}))}});exports.default=p;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),d=require("@ant-design/icons-vue"),s=require("@aplus-frontend/antdv"),f={style:{display:"flex","align-items":"center"}},p=e.defineComponent({__name:"MenuItemGroup",props:{selectedRows:{},buttonProps:{},menuList:{}},setup(a){const r=a,c=e.ref({});async function t(o,u){var l;const n=(o==null?void 0:o.id)||u;c.value[n]=!0;try{await((l=o==null?void 0:o.onClick)==null?void 0:l.call(o,{selectedRows:r==null?void 0:r.selectedRows}))}finally{c.value[n]=void 0}}return(o,u)=>(e.openBlock(),e.createBlock(e.unref(s.Menu),null,{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(r.menuList,(n,l)=>(e.openBlock(),e.createBlock(e.unref(s.MenuItem),e.mergeProps({key:(n==null?void 0:n.id)||l},{ref_for:!0},{...n,onClick:()=>t(n,l),disabled:c.value[(n==null?void 0:n.id)||l]??(n==null?void 0:n.disabled)??!1}),{default:e.withCtx(()=>[e.createElementVNode("div",f,[e.withDirectives(e.createVNode(e.unref(d.LoadingOutlined),{style:{"margin-right":"10px"}},null,512),[[e.vShow,c.value[(n==null?void 0:n.id)||l]]]),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(e.h(e.Fragment,[n==null?void 0:n.content]))))])]),_:2},1040))),128))]),_:1}))}});exports.default=p;

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

@@ -1,11 +1,10 @@
 import { CreateComponentPublicInstanceWithMixins, ExtractPropTypes, PropType, VNodeChild, CSSProperties, ComputedRef, ComponentOptionsMixin, PublicProps, GlobalComponents, GlobalDirectives, ComponentProvideOptions, ComponentOptionsBase, VNodeProps, AllowedComponentProps, ComponentCustomProps, Plugin } from 'vue';
-import { ButtonType, ButtonShape } from '@aplus-frontend/antdv/es/button';
-import { ButtonHTMLType, ButtonIconPosition, ButtonVariantType } from '@aplus-frontend/antdv/es/button/buttonTypes';
-import { SizeType } from '@aplus-frontend/antdv/es/config-provider';
+import { ButtonType, ButtonShape, ButtonSize } from '@aplus-frontend/antdv/es/button';
+import { ButtonHTMLType } from '@aplus-frontend/antdv/es/button/buttonTypes';
 import { VueTypeValidableDef } from '../../../node_modules/vue-types';
 import { MouseEventHandler, FocusEventHandler } from '@aplus-frontend/antdv/es/_util/EventInterface';
+import { ButtonProps, ItemType, MenuTheme, MenuMode, TableColumnsType } from '@aplus-frontend/antdv';
 import { DropdownArrowOptions, Trigger, Align } from '@aplus-frontend/antdv/es/dropdown/props';
-import { ItemType, MenuTheme, MenuMode, TableColumnsType, ButtonProps } from '@aplus-frontend/antdv';
 import { Key } from '@aplus-frontend/antdv/es/_util/type';
 import { CSSMotionProps } from '@aplus-frontend/antdv/es/_util/transition';
 import { BuiltinPlacements, TriggerSubMenuAction, SelectEventHandler, MenuClickEventHandler } from '@aplus-frontend/antdv/es/menu/src/interface';
@@ -27,7 +26,7 @@ declare const ApBatchActionGroup: {
                 type: PropType<ButtonShape>;
             };
             size: {
-                type: PropType<SizeType>;
+                type: PropType<ButtonSize>;
             };
             loading: {
                 type: PropType<boolean | {
@@ -63,15 +62,8 @@ declare const ApBatchActionGroup: {
             onMousedown: {
                 type: PropType< MouseEventHandler | MouseEventHandler[]>;
             };
-            autoInsertSpace: BooleanConstructor;
-            iconPosition: {
-                type: PropType<ButtonIconPosition>;
-                default: string;
-            };
-            color: PropType<"default" | "blue" | "cyan" | "gold" | "green" | "lime" | "magenta" | "orange" | "pink" | "purple" | "red" | "yellow" | "volcano" | "geekblue" | "primary" | "danger">;
-            variant: PropType<ButtonVariantType>;
         }>>, "type" | "onClick"> & {
-            type?: ( ButtonType | undefined) | "borderLink";
+            type?: ButtonProps["type"] | "borderLink";
             borderLinkColor?: string;
             minWidth?: boolean | number | string;
             lazy?: boolean | number;
@@ -272,7 +264,7 @@ declare const ApBatchActionGroup: {
             };
             getPopupContainer: PropType<(triggerNode: HTMLElement) => HTMLElement>;
             transitionName: StringConstructor;
-            placement: PropType<"top" | "bottom" | "bottomLeft" | "bottomRight" | "topLeft" | "topRight" | "topCenter" | "bottomCenter">;
+            placement: PropType<"top" | "bottom" | "topLeft" | "topRight" | "bottomLeft" | "bottomRight" | "topCenter" | "bottomCenter">;
             overlayClassName: StringConstructor;
             overlayStyle: {
                 type: PropType<CSSProperties>;
@@ -335,7 +327,7 @@ declare const ApBatchActionGroup: {
                 type: PropType<ButtonShape>;
             };
             size: {
-                type: PropType<SizeType>;
+                type: PropType<ButtonSize>;
             };
             loading: {
                 type: PropType<boolean | {
@@ -371,15 +363,8 @@ declare const ApBatchActionGroup: {
             onMousedown: {
                 type: PropType< MouseEventHandler | MouseEventHandler[]>;
             };
-            autoInsertSpace: BooleanConstructor;
-            iconPosition: {
-                type: PropType<ButtonIconPosition>;
-                default: string;
-            };
-            color: PropType<"default" | "blue" | "cyan" | "gold" | "green" | "lime" | "magenta" | "orange" | "pink" | "purple" | "red" | "yellow" | "volcano" | "geekblue" | "primary" | "danger">;
-            variant: PropType<ButtonVariantType>;
         }>>, "type" | "onClick"> & {
-            type?: ( ButtonType | undefined) | "borderLink";
+            type?: ButtonProps["type"] | "borderLink";
             borderLinkColor?: string;
             minWidth?: boolean | number | string;
             lazy?: boolean | number;
@@ -580,7 +565,7 @@ declare const ApBatchActionGroup: {
             };
             getPopupContainer: PropType<(triggerNode: HTMLElement) => HTMLElement>;
             transitionName: StringConstructor;
-            placement: PropType<"top" | "bottom" | "bottomLeft" | "bottomRight" | "topLeft" | "topRight" | "topCenter" | "bottomCenter">;
+            placement: PropType<"top" | "bottom" | "topLeft" | "topRight" | "bottomLeft" | "bottomRight" | "topCenter" | "bottomCenter">;
             overlayClassName: StringConstructor;
             overlayStyle: {
                 type: PropType<CSSProperties>;
@@ -640,7 +625,7 @@ declare const ApBatchActionGroup: {
             type: PropType<ButtonShape>;
         };
         size: {
-            type: PropType<SizeType>;
+            type: PropType<ButtonSize>;
         };
         loading: {
             type: PropType<boolean | {
@@ -676,13 +661,6 @@ declare const ApBatchActionGroup: {
         onMousedown: {
             type: PropType< MouseEventHandler | MouseEventHandler[]>;
         };
-        autoInsertSpace: BooleanConstructor;
-        iconPosition: {
-            type: PropType<ButtonIconPosition>;
-            default: string;
-        };
-        color: PropType<"default" | "blue" | "cyan" | "gold" | "green" | "lime" | "magenta" | "orange" | "pink" | "purple" | "red" | "yellow" | "volcano" | "geekblue" | "primary" | "danger">;
-        variant: PropType<ButtonVariantType>;
     }>>, "type" | "onClick"> & {
         type?: ButtonProps["type"] | "borderLink";
         borderLinkColor?: string;
@@ -885,7 +863,7 @@ declare const ApBatchActionGroup: {
         };
         getPopupContainer: PropType<(triggerNode: HTMLElement) => HTMLElement>;
         transitionName: StringConstructor;
-        placement: PropType<"top" | "bottom" | "bottomLeft" | "bottomRight" | "topLeft" | "topRight" | "topCenter" | "bottomCenter">;
+        placement: PropType<"top" | "bottom" | "topLeft" | "topRight" | "bottomLeft" | "bottomRight" | "topCenter" | "bottomCenter">;
         overlayClassName: StringConstructor;
         overlayStyle: {
             type: PropType<CSSProperties>;

package/lib/src/business/ap-draggable-grid/ApDraggableGrid.vue.d.ts

@@ -10,8 +10,8 @@ declare function __VLS_template(): {
                 span: number;
                 row: number;
                 col: number;
-                showHeight: number | string;
-                height?: number | string | undefined;
+                showHeight?: (number | string) | undefined;
+                height: number | string;
                 module: string;
             };
             index: number;
@@ -58,6 +58,7 @@ declare const __VLS_component: DefineComponent<ExtractPropTypes<{
     };
 }>, {
     setGridItems: (items: ApDraggableGridItemBase[]) => void;
+    getGridItems: () => ApDraggableGridItemBase[];
     refreshGrid: () => void;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     onGridListChange: (args_0: ApDraggableGridItemBase[]) => any;

package/lib/src/business/ap-draggable-grid/ApDraggableGrid.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const p=require("vue"),ro=require("./constans.js"),eo=require("@aplus-frontend/antdv");require("../../config-provider/index.js");const no=require("../../config-provider/hooks/use-namespace.js"),ao=["data-span","draggable","onDragstart"],so=p.defineComponent({__name:"ApDraggableGrid",props:ro.ApDraggableGridProps(),emits:["onGridListChange"],setup(_,{expose:j,emit:z}){const m=_,{b:I,e:M,m:L}=no.useNamespace("ap-draggable-grid"),$=p.ref(!1),k=p.ref([]),A=p.computed(()=>M("item")),N=p.computed(()=>M("dragging")),q=p.computed(()=>m.customWrapper?`.${m.customWrapper} .${A.value}`:`.${A.value}`),W=p.computed(()=>m.customWrapper?`.${m.customWrapper} .${A.value}:not(.${N.value})`:`.${A.value}:not(.${N.value})`),F=z,D=p.useTemplateRef("gridContainer"),S=p.ref(null),c=p.reactive([]);p.watch(()=>m.gridList,r=>{Array.isArray(r)&&G(r)},{deep:!0,immediate:!0});function G(r){c.splice(0,c.length),r.forEach(s=>{c.push({...s,isDragging:!1,isOverlay:!1})})}const J=r=>({gridColumn:`${r.col} / span ${r.span}`,gridRow:r.row,minHeight:`${m.gridItemHeight}px`,boxShadow:m.gridItemShadow?m.gridItemShadow:"none"}),U=(r,s)=>{S.value=s,c[s].isDragging=!0,k.value=c.map(o=>({row:o.row,col:o.col})),r.dataTransfer&&(r.dataTransfer.setData("text/plain",String(s)),r.dataTransfer.effectAllowed="move")},V=()=>{S.value!==null&&(c[S.value].isDragging=!1,C(),S.value=null),c.forEach(r=>r.isOverlay=!1)};function C(){const r=c.map(s=>({span:s.span,row:s.row,col:s.col,height:s.height?s.height:"",showHeight:s.showHeight?s.showHeight:"",module:s.module}));F("onGridListChange",r)}async function B(){if(G([]),typeof m.request=="function")try{$.value=!0;const r=await m.request();Array.isArray(r)?G(r):console.warn("ApDraggableGrid: 请求函数必须返回一个符合 ApDraggableGridItemBase 数组的格式")}catch(r){console.error("ApDraggableGrid: 请求错误:",r)}finally{$.value=!1}}function X(){k.value.length===c.length&&c.forEach((r,s)=>{const o=k.value[s];r.row=o.row,r.col=o.col})}p.onMounted(async()=>{if(await B(),O(),m.disableDrag||!D.value)return;const r=o=>{if(o.preventDefault(),S.value===null||!o.target)return;const e=document.elementFromPoint(o.clientX,o.clientY);if(!e)return;const t=e.closest(W.value);if(!t)return;const a=Array.from(document.querySelectorAll(q.value)).indexOf(t);a>=0&&a!==S.value&&(c.forEach(f=>f.isOverlay=!1),c[a].isOverlay=!0,H(S.value,a)?o.dataTransfer.dropEffect="move":o.dataTransfer.dropEffect="none")},s=o=>{if(o.preventDefault(),S.value===null)return;const e=document.elementFromPoint(o.clientX,o.clientY);if(!e)return;const t=e.closest(W.value);if(!t)return;const a=Array.from(document.querySelectorAll(q.value)).indexOf(t);a>=0&&Y(S.value,a)?(Q(S.value,a),O(),C()):X(),c.forEach(f=>{f.isDragging=!1,f.isOverlay=!1}),S.value=null};D.value.addEventListener("dragover",r),D.value.addEventListener("drop",s),p.onUnmounted(()=>{D.value&&(D.value.removeEventListener("dragover",r),D.value.removeEventListener("drop",s))})});function H(r,s){const o=c[r],e=c[s];if(o.row===e.row){const t=c.filter(a=>a.row===o.row);let i=0;return t.forEach(a=>{c.indexOf(a)!==r&&c.indexOf(a)!==s&&(i+=a.span)}),i+=o.span+e.span,i<=24}return o.span===e.span&&o.height===e.height?!0:o.span===24?c.filter(a=>a.row===e.row).reduce((a,f)=>a+f.span,0)===24:e.span===24?c.filter(a=>a.row===o.row).reduce((a,f)=>a+f.span,0)===24:!1}function Y(r,s){const o=c[r],e=c[s];if(o.row===e.row)return H(r,s);const t=JSON.parse(JSON.stringify(c)),i=o.row,a=e.row,f=a<i,v=new Map;if(t.forEach((n,u)=>{v.has(n.row)||v.set(n.row,[]),v.get(n.row).push(u)}),o.span===24&&e.span===24){t[r].row=a,t[r].col=1;const n=f?a+1:a-1;t[s].row=n,t[s].col=1;const u=t.map(w=>w.row);t.forEach((w,l)=>{l!==r&&l!==s&&(f?(u[l]>a&&u[l]<i||u[l]===n)&&(w.row+=1):(u[l]>i&&u[l]<a||u[l]===n)&&(w.row-=1))})}else if(o.span===24){const n=t.filter(w=>w.row===a);if(n.reduce((w,l)=>w+l.span,0)!==24)return!1;if(t[r].row=a,t[r].col=1,f){const w=new Set;for(let l=a;l<i;l++)w.add(l);t.forEach((l,y)=>{y!==r&&w.has(l.row)&&(l.row+=1)}),n.forEach(l=>{t.indexOf(l)!==r&&(l.row=a+1)})}else n.forEach(w=>{t.indexOf(w)!==r&&(w.row=i)})}else if(e.span===24){const n=t.filter(w=>w.row===i);if(n.reduce((w,l)=>w+l.span,0)!==24)return!1;t[s].row=i,t[s].col=1,f?n.forEach(w=>{t.indexOf(w)!==s&&(w.row=a+1)}):n.forEach(w=>{t.indexOf(w)!==s&&(w.row=a)})}else if(o.span===e.span)t[r].row=a,t[r].col=e.col,t[s].row=i,t[s].col=o.col;else return!1;const E=new Map;t.forEach(n=>{E.has(n.row)||E.set(n.row,[]),E.get(n.row).push(n)});const R=Array.from(E.keys()).sort((n,u)=>n-u);let g=1;for(const n of R)E.get(n).forEach(w=>{w.row=g}),g++;return K(t)}function K(r){const s={};r.forEach(o=>{s[o.row]||(s[o.row]=[]),s[o.row].push(o)});for(const o in s){const e=s[o];if(e.reduce((a,f)=>a+f.span,0)>24)return!1;e.sort((a,f)=>a.col-f.col);let i=0;for(const a of e){if(a.col<=i)return!1;i=a.col+a.span-1}}return!0}function Q(r,s){const o=c[r],e=c[s],t=JSON.parse(JSON.stringify(c)),i=o.row,a=e.row;if(o.span===24&&e.span===24){Z(o,e,i,a,t);return}if(i===a){const g=o.col;o.col=e.col,e.col=g;return}const f=a<i,v=c.map(g=>g.row),E=c.map(g=>g.col),R=c.map(g=>g.span);if(o.span===24&&e.span===24){const g=i,n=a;o.row=n,o.col=1,o.span=24,e.row=g,e.col=1,e.span=24;const u=Math.abs(g-n),w=new Set;for(let l=Math.min(g,n);l<=Math.max(g,n);l++)w.add(l);if(u!==1){const l=Math.min(g,n),y=Math.max(g,n),h=new Map;if(f){h.set(g,n),h.set(n,n+1);for(let d=n+1;d<g;d++)h.set(d,d+1)}else{h.set(g,n),h.set(n,n-1);for(let d=g+1;d<n;d++)h.set(d,d-1)}c.forEach((d,b)=>{if(b!==r&&b!==s){const T=v[b];T>=l&&T<=y&&h.has(T)&&(d.row=h.get(T),d.col=E[b],d.span=R[b])}})}}else if(o.span===24){const g=c.filter(n=>n.row===a);o.row=a,o.col=1,f?c.forEach((n,u)=>{u!==r&&(n.row===a?n.row=a+1:n.row>a&&n.row<i&&(n.row+=1))}):g.forEach(n=>{c.indexOf(n)!==r&&(n.row=i)})}else if(e.span===24){const g=c.filter(n=>n.row===i);e.row=i,e.col=1,f?(g.forEach(n=>{c.indexOf(n)!==s&&(n.row=a+1)}),c.forEach((n,u)=>{u!==s&&!g.includes(n)&&n.row>a&&n.row<i&&(n.row+=1)})):g.forEach(n=>{c.indexOf(n)!==s&&(n.row=a)})}else o.span===e.span&&(o.row=a,o.col=e.col,e.row=i,e.col=o.col);O()}function Z(r,s,o,e,t){const i=r.module,a=s.module,f=t.map(l=>({...l})),v=new Map;f.forEach(l=>{v.has(l.row)||v.set(l.row,[]),v.get(l.row).push(l)});const E=f.find(l=>l.module===i),R=f.find(l=>l.module===a),g=Array.from(new Set([o,e,...Array.from(v.keys())])).sort((l,y)=>l-y),n={};let u=1;for(const l of g){if(n[u]){u++;continue}if(l===o)u===e&&u++,n[u]=[R],R.row=u,R.col=1,R.span=24,u++;else if(l===e)u===o&&u++,n[u]=[E],E.row=u,E.col=1,E.span=24,u++;else{const h=(v.get(l)||[]).filter(d=>d.module!==i&&d.module!==a);h.length>0&&(h.forEach(d=>{d.row=u,d.col=d===h[0]?1:h[0].col+h[0].span}),n[u]=h,u++)}}c.splice(0,c.length);const w=Object.keys(n).map(Number).sort((l,y)=>l-y);for(const l of w){const y=n[l];y.sort((h,d)=>h.col-d.col),y.forEach(h=>{c.push(h)})}O()}function O(){c.forEach(e=>{if(e.module){const t=x(e.module);t&&(e.span<=0||e.span>24)?(console.log(`Restoring original span ${t} for module ${e.module}`),e.span=t):(e.span<=0&&(e.span=1),e.span>24&&(e.span=24))}else e.span<=0&&(e.span=1),e.span>24&&(e.span=24);e.span===24&&(e.col=1)});const r={};c.forEach(e=>{r[e.row]||(r[e.row]=[]),r[e.row].push(e)}),Object.keys(r).forEach(e=>{const t=parseInt(e),i=r[t];if(i.sort((f,v)=>f.col-v.col),i.length===1&&i[0].span===24){i[0].col=1;return}let a=1;i.forEach((f,v)=>{f.col=a;const E=24-a+1;f.span>E&&(v===0?f.span=Math.min(f.span,24):f.span=E),a+=f.span}),P(i)});const s=Object.keys(r).map(Number).sort((e,t)=>e-t);let o=1;s.forEach(e=>{e!==o&&r[e].forEach(t=>{t.row=o}),o++}),oo()}function x(r){return{1:8,2:16,3:24,4:16,5:8,6:16,7:8,8:24,9:12,10:12}[r]||null}function oo(){const r=[...new Set(c.map(o=>o.row))].sort((o,e)=>o-e);for(let o=0;o<r.length-1;o++)r[o+1]-r[o]!==1&&console.warn(`Row gap detected: ${r[o]} to ${r[o+1]}`);const s={};c.forEach(o=>{s[o.row]||(s[o.row]=[]),s[o.row].push(o)}),Object.keys(s).forEach(o=>{P(s[parseInt(o)])})}function P(r){r.sort((s,o)=>s.col-o.col);for(let s=0;s<r.length;s++){const o=r[s],e=o.col,t=o.span;if(o.span<=0&&(o.span=1),o.span>24&&(o.span=24),o.col<1&&(o.col=1),o.col+o.span-1>24&&(o.col>1?o.col=Math.max(1,25-o.span):o.span=24-o.col+1),s>0){const a=r[s-1],f=a.col+a.span-1;o.col<=f&&(o.col=f+1,o.col+o.span-1>24&&(o.span=Math.max(1,24-o.col+1)))}(e!==o.col||t!==o.span)&&console.warn(`Item layout corrected: col ${e} -> ${o.col}, span ${t} -> ${o.span}`)}}return j({setGridItems:r=>{G(r),O(),C()},refreshGrid:()=>{(async()=>{await B(),O(),C()})()}}),(r,s)=>(p.openBlock(),p.createBlock(p.unref(eo.Spin),{spinning:$.value},{default:p.withCtx(()=>[p.createElementVNode("div",{ref_key:"gridContainer",ref:D,class:p.normalizeClass([$.value?p.unref(I)("loading"):p.unref(I)(),m.customWrapper]),style:p.normalizeStyle({width:typeof r.gridWidth=="number"?`${r.gridWidth}px`:r.gridWidth,gap:`${r.gapWidth}px`})},[(p.openBlock(!0),p.createElementBlock(p.Fragment,null,p.renderList(c,(o,e)=>(p.openBlock(),p.createElementBlock("div",{key:e,class:p.normalizeClass([p.unref(M)("item"),m.disableDrag?"":p.unref(L)("dragging"),o.isDragging?p.unref(M)("dragging"):"",o.isOverlay?p.unref(M)("overlay"):"",m.disableDrag?"":p.unref(L)("canDrag")]),"data-span":o.span,style:p.normalizeStyle([J(o),{height:o.showHeight?o.showHeight+"px":""}]),draggable:!m.disableDrag,onDragstart:t=>U(t,e),onDragend:V},[p.renderSlot(r.$slots,"item",{item:o,index:e})],46,ao))),128))],6)]),_:3},8,["spinning"]))}});exports.default=so;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const r=require("vue"),X=require("./constans.js"),Y=require("@aplus-frontend/antdv");require("../../config-provider/index.js");const D=require("./utils/sortItemsByRowAndCol.js"),Z=require("../../config-provider/hooks/use-namespace.js"),ee=["data-span","data-index","data-row","data-col","data-height","data-module","draggable"],oe=r.defineComponent({__name:"ApDraggableGrid",props:X.ApDraggableGridProps(),emits:["onGridListChange"],setup(P,{expose:W,emit:_}){const f=P,{b:R,e:$,m:J}=Z.useNamespace("ap-draggable-grid"),T=r.ref(!1),B=r.ref(!1),x=r.computed(()=>$("item")),M=r.computed(()=>$("dragging")),z=r.computed(()=>f.customWrapper?`.${f.customWrapper} .${x.value}:not(.${M.value})`:`.${x.value}:not(.${M.value})`),j=_,m=r.useTemplateRef("gridContainer"),S=r.ref([]);r.watch(()=>f.gridList,e=>{Array.isArray(e)&&i(e)},{deep:!0,immediate:!0});function i(e){const n=[...e].sort((o,u)=>o.row-u.row);S.value=n.map(o=>({...o})),j("onGridListChange",JSON.parse(JSON.stringify(S.value)))}const U=e=>({gridColumn:`${e.col} / span ${e.span}`,gridRow:e.row,minHeight:e.showHeight?e.showHeight+"px":`${f.gridItemHeight}px`,height:e.showHeight?e.showHeight+"px":`${f.gridItemHeight}px`,boxShadow:f.gridItemShadow?f.gridItemShadow:"none"});async function H(){if(i([]),typeof f.request=="function")try{T.value=!0;const e=await f.request();Array.isArray(e)?(console.log("ApDraggableGrid: 请求到的布局数据:",e),i(e)):console.warn("ApDraggableGrid: 请求函数必须返回一个符合 ApDraggableGridItemBase 数组的格式")}catch(e){console.error("ApDraggableGrid: 请求错误:",e)}finally{T.value=!1}}let C=r.ref(null),N=r.ref(null),v=null,G=!1,y=null;const k=e=>{if(!G&&(G=!0,e.dataTransfer&&e.target instanceof HTMLElement)){const n=e.target.dataset;e.dataTransfer.setData("text/plain",n.module),e.dataTransfer.effectAllowed="move",C.value={span:Number(n.span),col:Number(n.col),row:Number(n.row),module:n.module,height:Number(n.height),index:Number(n.index)},v=e.target,v.style.opacity="0"}},q=e=>{if(e.preventDefault(),y&&clearTimeout(y),y=window.setTimeout(()=>{G=!1,y=null},300),e.dataTransfer&&e.target instanceof HTMLElement){const n=e.target.closest(z.value);if(!n)return;const o=n.dataset;N.value={span:Number(o.span),col:Number(o.col),row:Number(o.row),module:o.module,height:Number(o.height),index:Number(o.index)}}},F=e=>{e.preventDefault(),v&&(v.style.opacity="1",v=null),V(C,N)&&K(C,N),C.value=null,N.value=null,B.value=!1},O=()=>{v&&(v.style.opacity="1",v=null),C.value=null,N.value=null,B.value=!1},V=(e,n)=>{const{span:o,module:u}=e.value,{span:c,module:d}=n.value;return u===d&&o===c?(console.log("如果自己放在自己之上不能交换数据"),!1):!0},K=(e,n)=>{if(!e.value||!n.value)return;const{span:o,col:u,row:c,module:d,height:A,index:l}=e.value,{span:I,col:h,row:p,module:Q,height:L,index:g}=n.value;if(c===p&&u===h&&o===I&&A===L&&d===Q){console.log("从同一位置拖拽到同一位置,不做任何操作");return}let t=[...r.toRaw(S.value)];const E=JSON.parse(JSON.stringify(t));if(c===p)if(l>g){console.log("","从右向左拖拽"),console.log(l,g),console.log(l-g),l-g===1?(t[g].col=o+h,t[l].col=h):(t.forEach((w,a)=>{a<l&&a>=g&&(w.col+=I)}),t[l].col=h);const s=D.sortItemsByRowAndCol(t);if(!b(s)){console.warn("交换后的布局无效，恢复原始布局");return}i(s);return}else{console.log(l,g),console.log("","从左向右拖拽"),g-l===1?(t[l].col=I+1,t[g].col=u):(t.forEach((w,a)=>{a>l&&a<=g&&(w.col-=I)}),t[l].col=h);const s=D.sortItemsByRowAndCol(t);if(console.log("交换后的布局:",s),!b(s)){console.warn("交换后的布局无效，恢复原始布局"),i(E);return}i(s);return}else if(p<c){if(console.log("从下向上拖拽"),o===24){const s=[];for(let a=p;a<c;a++)s.push(a);t.forEach(a=>{s.includes(a.row)&&(a.row+=1)}),t[l].row=p;const w=D.sortItemsByRowAndCol(t);if(!b(w)){console.warn("交换后的布局无效，恢复原始布局"),i(E);return}i(w);return}if(o===I&&A===L){t[l].row=p,t[l].col=h,t[g].row=c,t[g].col=u;const s=D.sortItemsByRowAndCol(t);if(!b(s)){console.warn("交换后的布局无效，恢复原始布局"),i(E);return}i(s);return}}else{if(console.log("从上向下拖拽"),o===24){console.log("如果拖拽元素跨度为24","从上向下拖拽");const s=[];for(let a=c+1;a<=p;a++)s.push(a);t.forEach(a=>{s.includes(a.row)&&(a.row-=1)}),t[l].row=p;const w=D.sortItemsByRowAndCol(t);if(!b(w)){console.warn("交换后的布局无效，恢复原始布局"),i(E);return}i(w);return}if(o===I&&A===L){t[l].row=p,t[l].col=h,t[g].row=c,t[g].col=u;const s=D.sortItemsByRowAndCol(t);if(!b(s)){console.warn("交换后的布局无效，恢复原始布局"),i(E);return}i(s);return}}},b=e=>{const n={};e.forEach(o=>{n[o.row]||(n[o.row]=[]),n[o.row].push(o)});for(const o in n){const u=n[o].sort((d,A)=>d.col-A.col);let c=1;for(const d of u){if(d.col<c)return console.warn(`行 ${o} 中的元素重叠: 元素 ${d.module} 在列 ${d.col}, 但当前列已经是 ${c}`),!1;if(c=d.col+d.span,c>25)return console.warn(`行 ${o} 中的元素超出界限: 元素 ${d.module} 在列 ${d.col} 跨度 ${d.span}`),!1}}return!0};return r.onMounted(async()=>{await H(),!f.disableDrag&&m.value&&(m.value.addEventListener("dragstart",k),m.value.addEventListener("dragover",q),m.value.addEventListener("drop",F),m.value.addEventListener("dragend",O))}),r.onUnmounted(()=>{m.value&&(m.value.removeEventListener("dragstart",k),m.value.removeEventListener("dragover",q),m.value.removeEventListener("drop",F),m.value.removeEventListener("dragend",O),y&&clearTimeout(y))}),W({setGridItems:e=>{i(e)},getGridItems:()=>JSON.parse(JSON.stringify(S.value)),refreshGrid:()=>{(async()=>{await H()})()}}),(e,n)=>(r.openBlock(),r.createBlock(r.unref(Y.Spin),{spinning:T.value},{default:r.withCtx(()=>[r.createElementVNode("div",{ref_key:"gridContainer",ref:m,class:r.normalizeClass([T.value?r.unref(R)("loading"):r.unref(R)(),f.customWrapper]),style:r.normalizeStyle({width:typeof e.gridWidth=="number"?`${e.gridWidth}px`:e.gridWidth,gap:`${e.gapWidth}px`})},[(r.openBlock(!0),r.createElementBlock(r.Fragment,null,r.renderList(S.value,(o,u)=>(r.openBlock(),r.createElementBlock("div",{key:u,class:r.normalizeClass([r.unref($)("item"),f.disableDrag?"":r.unref(J)("canDrag")]),"data-span":o.span,"data-index":u,"data-row":o.row,"data-col":o.col,"data-height":o.height,"data-module":o.module,style:r.normalizeStyle([U(o)]),draggable:!f.disableDrag},[r.renderSlot(e.$slots,"item",{item:o,index:u})],14,ee))),128))],6)]),_:3},8,["spinning"]))}});exports.default=oe;

package/lib/src/business/ap-draggable-grid/constans.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=()=>({gridList:{type:Array,default:()=>[]},request:{type:Function,default:null},gridWidth:{type:[String,Number],default:"100%"},gridItemHeight:{type:Number,default:300},gridItemShadow:{type:String,default:"0px 4px 6px 0px rgba(73, 107, 158, 0.1)"},gapWidth:{type:Number,default:12},disableDrag:{type:Boolean,default:!1},customWrapper:{type:String,default:"ap-draggable-grid"}});exports.ApDraggableGridProps=e;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=()=>({gridList:{type:Array,default:()=>[]},request:{type:Function,default:null},gridWidth:{type:[String,Number],default:"100%"},gridItemHeight:{type:Number,default:100},gridItemShadow:{type:String,default:"0px 4px 6px 0px rgba(73, 107, 158, 0.1)"},gapWidth:{type:Number,default:12},disableDrag:{type:Boolean,default:!1},customWrapper:{type:String,default:"ap-draggable-grid"}});exports.ApDraggableGridProps=e;

package/lib/src/business/ap-draggable-grid/index.d.ts

@@ -39,6 +39,7 @@ declare const ApDraggableGrid: {
         onOnGridListChange?: ((args_0: ApDraggableGridItemBase[]) => any) | undefined;
     }>, {
         setGridItems: (items: ApDraggableGridItemBase[]) => void;
+        getGridItems: () => ApDraggableGridItemBase[];
         refreshGrid: () => void;
     }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
         onGridListChange: (args_0: ApDraggableGridItemBase[]) => any;
@@ -97,6 +98,7 @@ declare const ApDraggableGrid: {
         onOnGridListChange?: ((args_0: ApDraggableGridItemBase[]) => any) | undefined;
     }>, {
         setGridItems: (items: ApDraggableGridItemBase[]) => void;
+        getGridItems: () => ApDraggableGridItemBase[];
         refreshGrid: () => void;
     }, {}, {}, {}, {
         request: () => Promise< ApDraggableGridItemBase[]>;
@@ -148,6 +150,7 @@ declare const ApDraggableGrid: {
     onOnGridListChange?: ((args_0: ApDraggableGridItemBase[]) => any) | undefined;
 }>, {
     setGridItems: (items: ApDraggableGridItemBase[]) => void;
+    getGridItems: () => ApDraggableGridItemBase[];
     refreshGrid: () => void;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     onGridListChange: (args_0: ApDraggableGridItemBase[]) => any;
@@ -169,8 +172,8 @@ declare const ApDraggableGrid: {
                 span: number;
                 row: number;
                 col: number;
-                showHeight: number | string;
-                height?: number | string | undefined;
+                showHeight?: (number | string) | undefined;
+                height: number | string;
                 module: string;
             };
             index: number;

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

@@ -2,8 +2,8 @@ export interface ApDraggableGridItemBase {
     span: number;
     row: number;
     col: number;
-    showHeight: number | string;
-    height?: number | string;
+    showHeight?: number | string;
+    height: number | string;
     module: string;
 }
 export interface ApDraggableGridItem extends ApDraggableGridItemBase {
@@ -12,5 +12,6 @@ export interface ApDraggableGridItem extends ApDraggableGridItemBase {
 }
 export type ApDraggableGridExpose = {
     setGridItems: (items: ApDraggableGridItemBase[]) => void;
+    getGridItems: () => ApDraggableGridItemBase[];
     refreshGrid: () => void;
 };

package/lib/src/business/ap-draggable-grid/utils/sortItemsByRowAndCol.d.ts

@@ -0,0 +1,2 @@
+import { ApDraggableGridItem } from '../interface';
+export declare function sortItemsByRowAndCol(items: ApDraggableGridItem[]): ApDraggableGridItem[];

package/lib/src/business/ap-draggable-grid/utils/sortItemsByRowAndCol.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});function w(e){const c=[...e].sort((o,s)=>o.row-s.row),r={};c.forEach(o=>{r[o.row]||(r[o.row]=[]),r[o.row].push(o)});const t=[];return Object.keys(r).map(Number).sort((o,s)=>o-s).forEach(o=>{const s=r[o].sort((n,u)=>n.col-u.col);t.push(...s)}),t}exports.sortItemsByRowAndCol=w;

package/lib/src/business/ap-expand-alert/ApExpandAlert.vue.d.ts

@@ -1,5 +1,5 @@
 import { ApExpandAlertProps } from './interface';
-import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode } from 'vue';
+import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode, RendererNode, RendererElement } from 'vue';
 declare const _default: <T extends Record<string, any>>(__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<{
         readonly onExpand?: ((args_0: "collapse" | "expand") => any) | undefined;
@@ -23,7 +23,9 @@ declare const _default: <T extends Record<string, any>>(__VLS_props: NonNullable
         }): any;
     };
     emit: ((evt: "expand", args_0: "collapse" | "expand") => void) & ((evt: "choose", args_0: T) => void);
-}>) => VNode & {
+}>) => VNode<RendererNode, RendererElement, {
+    [key: string]: any;
+}> & {
     __ctx?: Awaited<typeof __VLS_setup>;
 };
 export default _default;

package/lib/src/business/ap-expand-alert/ApExpandAlert.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),z=require("@ant-design/icons-vue"),h=require("@aplus-frontend/antdv"),N=require("../../ap-action/index.js");require("../../config-provider/index.js");const i=require("lodash-unified"),T=require("../../config-provider/hooks/use-locale.js"),$=require("../../config-provider/hooks/use-namespace.js"),q=require("../../config-provider/hooks/use-global-config.js"),A=["onClick"],D=e.defineComponent({__name:"ApExpandAlert",props:{type:{default:"warning"},data:{default:()=>[]},prefix:{default:""},tipTitle:{default:""},mapLabel:{},separator:{default:"|"},separatorStyle:{default:()=>({})},contentStyle:{default:()=>({})},prefixStyle:{default:()=>({})},rows:{default:2},defaultExpand:{type:Boolean,default:!0},showIcon:{type:Boolean,default:!0}},emits:["choose","expand"],setup(g,{expose:v,emit:B}){const f=B,r=g,{t:m}=T.useLocale(),S=e.computed(()=>{if(r.type!="card")return r.type}),l=e.ref(""),s=e.ref(null),w=e.computed(()=>({fontWeight:"400",wordBreak:"break-all",overflow:"hidden",display:"-webkit-box",webkitLineClamp:l.value,webkitBoxOrient:"vertical",lineHeight:"18px"}));function C(){l.value==="1"?(l.value="",f("expand","expand")):(l.value="1",f("expand","collapse"))}const x=e.computed(()=>l.value==="1"?m("ap.apExpandAlert.expand"):m("ap.apExpandAlert.collapse")),u=e.ref(!0),y=e.computed(()=>l.value!=="1");function c(t){t?l.value="":l.value="1"}e.watch(()=>r.data,()=>{l.value="",e.nextTick(()=>{if(s.value){const t=Number(s.value.clientHeight),o=Number(parseInt(s.value.style.lineHeight));t<o*Number(r.rows)&&y.value?u.value=!1:u.value=!0}})},{immediate:!0}),e.watch(()=>r.defaultExpand,t=>{t?e.nextTick(()=>{c(t)}):e.nextTick(()=>{c(t)})},{immediate:!0}),e.onMounted(()=>{e.watch(()=>r.contentStyle,t=>{i.isNil(t.lineHeight)||e.nextTick(()=>{const o=document.querySelector(`#${p} .ant-alert-action`),a=document.querySelector(`#${p} .ant-alert-icon`);o&&o.setAttribute("style",`line-height: ${t.lineHeight}`),a&&a.setAttribute("style",`line-height: ${t.lineHeight}`)})},{deep:!0,immediate:!0,flush:"post"})});const{b:k,e:n,m:E}=$.useNamespace("ap-expand-alert"),p=`${k()}-key-${Date.now()}-${(Math.random()*1e6).toFixed(0)}`,b=q.useGlobalConfig("uiMode","aplus");return v({setExpand:c}),(t,o)=>(e.openBlock(),e.createElementBlock("div",{id:p,class:e.normalizeClass([e.unref(k)(),`${e.unref(E)(e.unref(b))}`])},[e.createVNode(e.unref(h.Alert),{type:S.value,"show-icon":t.showIcon,class:e.normalizeClass([e.unref(n)("antAlert"),t.type=="card"?"card-alert":""])},{action:e.withCtx(()=>[u.value?(e.openBlock(),e.createBlock(e.unref(N.ApActionItem),{key:0,size:"small",style:{"font-size":"12px","padding-left":"16px"},onClick:o[0]||(o[0]=a=>C())},{default:e.withCtx(()=>[e.createElementVNode("span",{class:e.normalizeClass(e.unref(n)("expandText"))},e.toDisplayString(x.value),3),e.createVNode(e.unref(z.DownOutlined),{class:e.normalizeClass(y.value?e.unref(n)("expandIcon"):e.unref(n)("collapseIcon"))},null,8,["class"])]),_:1})):e.createCommentVNode("",!0)]),message:e.withCtx(()=>[e.createElementVNode("div",{ref_key:"ellipsisBoxRef",ref:s,style:e.normalizeStyle({...w.value,...t.contentStyle}),class:e.normalizeClass(e.unref(n)("alertContent"))},[e.renderSlot(t.$slots,"default",{},()=>[e.unref(i.isString)(t.prefix)?(e.openBlock(),e.createElementBlock("span",{key:0,class:e.normalizeClass(e.unref(n)("prefix")),style:e.normalizeStyle(t.prefixStyle)},e.toDisplayString(t.prefix),7)):(e.openBlock(),e.createBlock(e.resolveDynamicComponent(t.prefix),{key:1,style:e.normalizeStyle(t.prefixStyle)},null,8,["style"])),e.unref(i.isString)(t.data)?(e.openBlock(),e.createElementBlock("span",{key:2,class:e.normalizeClass(e.unref(n)("text"))},e.toDisplayString(t.data),3)):(e.openBlock(!0),e.createElementBlock(e.Fragment,{key:3},e.renderList(t.data,(a,d)=>(e.openBlock(),e.createElementBlock(e.Fragment,{key:d},[e.createVNode(e.unref(h.Tooltip),{title:t.tipTitle?t.tipTitle:null},{default:e.withCtx(()=>[e.renderSlot(t.$slots,"item",{record:a,index:d},()=>[e.createElementVNode("span",{class:e.normalizeClass(e.unref(n)("showItem")),onClick:V=>t.$emit("choose",a)},e.toDisplayString(t.mapLabel?a[t.mapLabel]:a),11,A)])]),_:2},1032,["title"]),d!==t.data.length-1?(e.openBlock(),e.createElementBlock("span",{key:0,class:e.normalizeClass(e.unref(n)("spliter")),style:e.normalizeStyle(t.separatorStyle)},[e.unref(i.isString)(t.separator)?(e.openBlock(),e.createElementBlock(e.Fragment,{key:0},[e.createTextVNode(e.toDisplayString(t.separator),1)],64)):(e.openBlock(),e.createBlock(e.resolveDynamicComponent(t.separator),{key:1}))],6)):e.createCommentVNode("",!0)],64))),128))])],6)]),_:3},8,["type","show-icon","class"])],2))}});exports.default=D;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),z=require("@ant-design/icons-vue"),h=require("@aplus-frontend/antdv"),N=require("../../ap-action/index.js");require("../../config-provider/index.js");const i=require("lodash-unified"),T=require("../../config-provider/hooks/use-locale.js"),$=require("../../config-provider/hooks/use-namespace.js"),q=require("../../config-provider/hooks/use-global-config.js"),A=["onClick"],D=e.defineComponent({__name:"ApExpandAlert",props:{type:{default:"warning"},data:{default:()=>[]},prefix:{default:""},tipTitle:{default:""},mapLabel:{},separator:{type:[Object,Function,String],default:"|"},separatorStyle:{default:()=>({})},contentStyle:{default:()=>({})},prefixStyle:{default:()=>({})},rows:{default:2},defaultExpand:{type:Boolean,default:!0},showIcon:{type:Boolean,default:!0}},emits:["choose","expand"],setup(g,{expose:v,emit:S}){const f=S,r=g,{t:m}=T.useLocale(),B=e.computed(()=>{if(r.type!="card")return r.type}),n=e.ref(""),s=e.ref(null),w=e.computed(()=>({fontWeight:"400",wordBreak:"break-all",overflow:"hidden",display:"-webkit-box",webkitLineClamp:n.value,webkitBoxOrient:"vertical",lineHeight:"18px"}));function C(){n.value==="1"?(n.value="",f("expand","expand")):(n.value="1",f("expand","collapse"))}const x=e.computed(()=>n.value==="1"?m("ap.apExpandAlert.expand"):m("ap.apExpandAlert.collapse")),u=e.ref(!0),y=e.computed(()=>n.value!=="1");function c(t){t?n.value="":n.value="1"}e.watch(()=>r.data,()=>{n.value="",e.nextTick(()=>{if(s.value){const t=Number(s.value.clientHeight),o=Number(parseInt(s.value.style.lineHeight));t<o*Number(r.rows)&&y.value?u.value=!1:u.value=!0}})},{immediate:!0}),e.watch(()=>r.defaultExpand,t=>{t?e.nextTick(()=>{c(t)}):e.nextTick(()=>{c(t)})},{immediate:!0}),e.onMounted(()=>{e.watch(()=>r.contentStyle,t=>{i.isNil(t.lineHeight)||e.nextTick(()=>{const o=document.querySelector(`#${p} .ant-alert-action`),a=document.querySelector(`#${p} .ant-alert-icon`);o&&o.setAttribute("style",`line-height: ${t.lineHeight}`),a&&a.setAttribute("style",`line-height: ${t.lineHeight}`)})},{deep:!0,immediate:!0,flush:"post"})});const{b:k,e:l,m:b}=$.useNamespace("ap-expand-alert"),p=`${k()}-key-${Date.now()}-${(Math.random()*1e6).toFixed(0)}`,E=q.useGlobalConfig("uiMode","aplus");return v({setExpand:c}),(t,o)=>(e.openBlock(),e.createElementBlock("div",{id:p,class:e.normalizeClass([e.unref(k)(),`${e.unref(b)(e.unref(E))}`])},[e.createVNode(e.unref(h.Alert),{type:B.value,"show-icon":t.showIcon,class:e.normalizeClass([e.unref(l)("antAlert"),t.type=="card"?"card-alert":""])},{action:e.withCtx(()=>[u.value?(e.openBlock(),e.createBlock(e.unref(N.ApActionItem),{key:0,size:"small",style:{"font-size":"12px","padding-left":"16px"},onClick:o[0]||(o[0]=a=>C())},{default:e.withCtx(()=>[e.createElementVNode("span",{class:e.normalizeClass(e.unref(l)("expandText"))},e.toDisplayString(x.value),3),e.createVNode(e.unref(z.DownOutlined),{class:e.normalizeClass(y.value?e.unref(l)("expandIcon"):e.unref(l)("collapseIcon"))},null,8,["class"])]),_:1})):e.createCommentVNode("",!0)]),message:e.withCtx(()=>[e.createElementVNode("div",{ref_key:"ellipsisBoxRef",ref:s,style:e.normalizeStyle({...w.value,...t.contentStyle}),class:e.normalizeClass(e.unref(l)("alertContent"))},[e.renderSlot(t.$slots,"default",{},()=>[e.unref(i.isString)(t.prefix)?(e.openBlock(),e.createElementBlock("span",{key:0,class:e.normalizeClass(e.unref(l)("prefix")),style:e.normalizeStyle(t.prefixStyle)},e.toDisplayString(t.prefix),7)):(e.openBlock(),e.createBlock(e.resolveDynamicComponent(t.prefix),{key:1,style:e.normalizeStyle(t.prefixStyle)},null,8,["style"])),e.unref(i.isString)(t.data)?(e.openBlock(),e.createElementBlock("span",{key:2,class:e.normalizeClass(e.unref(l)("text"))},e.toDisplayString(t.data),3)):(e.openBlock(!0),e.createElementBlock(e.Fragment,{key:3},e.renderList(t.data,(a,d)=>(e.openBlock(),e.createElementBlock(e.Fragment,{key:d},[e.createVNode(e.unref(h.Tooltip),{title:t.tipTitle?t.tipTitle:null},{default:e.withCtx(()=>[e.renderSlot(t.$slots,"item",{record:a,index:d},()=>[e.createElementVNode("span",{class:e.normalizeClass(e.unref(l)("showItem")),onClick:V=>t.$emit("choose",a)},e.toDisplayString(t.mapLabel?a[t.mapLabel]:a),11,A)])]),_:2},1032,["title"]),d!==t.data.length-1?(e.openBlock(),e.createElementBlock("span",{key:0,class:e.normalizeClass(e.unref(l)("spliter")),style:e.normalizeStyle(t.separatorStyle)},[e.unref(i.isString)(t.separator)?(e.openBlock(),e.createElementBlock(e.Fragment,{key:0},[e.createTextVNode(e.toDisplayString(t.separator),1)],64)):(e.openBlock(),e.createBlock(e.resolveDynamicComponent(t.separator),{key:1}))],6)):e.createCommentVNode("",!0)],64))),128))])],6)]),_:3},8,["type","show-icon","class"])],2))}});exports.default=D;

package/lib/src/business/ap-expand-alert/index.d.ts

@@ -1,4 +1,4 @@
-import { Component, VNode, CSSProperties, PublicProps, ShallowUnwrapRef, Plugin } from 'vue';
+import { Component, VNode, CSSProperties, PublicProps, ShallowUnwrapRef, RendererNode, RendererElement, Plugin } from 'vue';
 export * from './interface';
 declare const ApExpandAlert: (<T extends Record<string, any>>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: {
     attrs: any;
@@ -20,7 +20,7 @@ declare const ApExpandAlert: (<T extends Record<string, any>>(__VLS_props: NonNu
     props: {
         readonly onExpand?: ((args_0: "collapse" | "expand") => any) | undefined;
         readonly onChoose?: ((args_0: T) => any) | undefined;
-        type?: "warning" | "error" | "success" | "info" | "card" | undefined | undefined;
+        type?: "warning" | "error" | "success" | "info" | "card" | undefined;
         data?: string | T[] | undefined;
         prefix?: string | undefined;
         tipTitle?: string | undefined;
@@ -29,7 +29,7 @@ declare const ApExpandAlert: (<T extends Record<string, any>>(__VLS_props: NonNu
         separatorStyle?: CSSProperties | undefined;
         contentStyle?: Omit< CSSProperties, "wordBreak" | "overflow" | "display" | "webkitLineClamp" | "webkitBoxOrient"> | undefined;
         prefixStyle?: CSSProperties | undefined;
-        rows?: string | number | undefined;
+        rows?: (string | number) | undefined;
         defaultExpand?: boolean | undefined;
         showIcon?: boolean | undefined;
     } & PublicProps;
@@ -51,7 +51,9 @@ declare const ApExpandAlert: (<T extends Record<string, any>>(__VLS_props: NonNu
         }): any;
     };
     emit: ((evt: "expand", args_0: "collapse" | "expand") => void) & ((evt: "choose", args_0: T) => void);
-}>) => VNode & {
+}>) => VNode<RendererNode, RendererElement, {
+    [key: string]: any;
+}> & {
     __ctx?: Awaited<typeof __VLS_setup>;
 }) & ( Plugin & (new (...args: any[]) => {
     $props: {

package/lib/src/business/ap-select-layout/index.d.ts

@@ -1,5 +1,5 @@
 import { ApSelectItem } from './interface';
-import { PublicProps, ShallowUnwrapRef, VNode, Plugin } from 'vue';
+import { PublicProps, ShallowUnwrapRef, VNode, RendererNode, RendererElement, Plugin } from 'vue';
 export * from './interface';
 declare const ApSelectLayout: (<T extends ApSelectItem>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: {
     attrs: any;
@@ -38,7 +38,9 @@ declare const ApSelectLayout: (<T extends ApSelectItem>(__VLS_props: NonNullable
         (event: "afterEnter", el: Element): void;
         (event: "afterLeave", el: Element): void;
     };
-}>) => VNode & {
+}>) => VNode<RendererNode, RendererElement, {
+    [key: string]: any;
+}> & {
     __ctx?: Awaited<typeof __VLS_setup>;
 }) & ( Plugin & (new (...args: any[]) => {
     $props: {

package/lib/src/business/ap-select-layout/select-layout.vue.d.ts

@@ -1,5 +1,5 @@
 import { ApSelectItem, ApSelectLayoutProps } from './interface';
-import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode } from 'vue';
+import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode, RendererNode, RendererElement } from 'vue';
 declare const _default: <T extends ApSelectItem>(__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<{
         readonly onOnSelect?: ((value: T) => any) | undefined;
@@ -19,7 +19,9 @@ declare const _default: <T extends ApSelectItem>(__VLS_props: NonNullable<Awaite
         (event: "afterEnter", el: Element): void;
         (event: "afterLeave", el: Element): void;
     };
-}>) => VNode & {
+}>) => VNode<RendererNode, RendererElement, {
+    [key: string]: any;
+}> & {
     __ctx?: Awaited<typeof __VLS_setup>;
 };
 export default _default;

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

@@ -4,8 +4,8 @@ import { CreateComponentPublicInstanceWithMixins, ComponentOptionsMixin, PublicP
 import { ApTableModalProps, OpenOptions, OpenReturnType } from './interface';
 import { Recordable } from '../../type';
 import { TableColumnsType } from '@aplus-frontend/antdv';
-import { ApFormSearchFormPopoverSorterItem } from '../..';
 import { InternalPagingType } from '../../ap-table/hooks/use-table-paging-ng';
+import { ApFormSearchFormPopoverSorterItem } from '../..';
 /**
  *
  */
@@ -42,14 +42,8 @@ declare const ApTableModal: {
                 };
                 y: undefined;
             };
-            getPaging: () => Partial<{
-                current: number;
-                pageSize: number;
-            }>;
-            setPaging: (nextPaging: Partial<{
-                current: number;
-                pageSize: number;
-            }>, refreshImmediately?: boolean) => void;
+            getPaging: () => InternalPagingType;
+            setPaging: (nextPaging: InternalPagingType, refreshImmediately?: boolean) => void;
             getSearchFormSorterItems: () => ApFormSearchFormPopoverSorterItem[];
             setSearchFormSorterItems: (sortedItems: ApFormSearchFormPopoverSorterItem[]) => void;
             resetSearchFormSorterItems: () => void;
@@ -153,14 +147,8 @@ declare const ApTableModal: {
                 };
                 y: undefined;
             };
-            getPaging: () => Partial<{
-                current: number;
-                pageSize: number;
-            }>;
-            setPaging: (nextPaging: Partial<{
-                current: number;
-                pageSize: number;
-            }>, refreshImmediately?: boolean) => void;
+            getPaging: () => InternalPagingType;
+            setPaging: (nextPaging: InternalPagingType, refreshImmediately?: boolean) => void;
             getSearchFormSorterItems: () => ApFormSearchFormPopoverSorterItem[];
             setSearchFormSorterItems: (sortedItems: ApFormSearchFormPopoverSorterItem[]) => void;
             resetSearchFormSorterItems: () => void;