@aplus-frontend/ui 6.17.1 → 6.18.0

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

@@ -27,18 +27,14 @@ declare const ApDraggableGrid: {
             type: NumberConstructor;
             default: number;
         };
-        dragOverlayColor: {
-            type: StringConstructor;
-            default: string;
-        };
-        dragOverlayBorderColor: {
-            type: StringConstructor;
-            default: string;
-        };
         disableDrag: {
             type: BooleanConstructor;
             default: boolean;
         };
+        customWrapper: {
+            type: StringConstructor;
+            default: string;
+        };
     }>> & Readonly<{
         onOnGridListChange?: ((args_0: ApDraggableGridItemBase[]) => any) | undefined;
     }>, {
@@ -53,9 +49,8 @@ declare const ApDraggableGrid: {
         gridItemHeight: number;
         gridItemShadow: string;
         gapWidth: number;
-        dragOverlayColor: string;
-        dragOverlayBorderColor: string;
         disableDrag: boolean;
+        customWrapper: string;
     }, true, {}, {}, GlobalComponents, GlobalDirectives, string, {
         gridContainer: HTMLDivElement;
     }, any, ComponentProvideOptions, {
@@ -90,18 +85,14 @@ declare const ApDraggableGrid: {
             type: NumberConstructor;
             default: number;
         };
-        dragOverlayColor: {
-            type: StringConstructor;
-            default: string;
-        };
-        dragOverlayBorderColor: {
-            type: StringConstructor;
-            default: string;
-        };
         disableDrag: {
             type: BooleanConstructor;
             default: boolean;
         };
+        customWrapper: {
+            type: StringConstructor;
+            default: string;
+        };
     }>> & Readonly<{
         onOnGridListChange?: ((args_0: ApDraggableGridItemBase[]) => any) | undefined;
     }>, {
@@ -114,9 +105,8 @@ declare const ApDraggableGrid: {
         gridItemHeight: number;
         gridItemShadow: string;
         gapWidth: number;
-        dragOverlayColor: string;
-        dragOverlayBorderColor: string;
         disableDrag: boolean;
+        customWrapper: string;
     }>;
     __isFragment?: never;
     __isTeleport?: never;
@@ -146,18 +136,14 @@ declare const ApDraggableGrid: {
         type: NumberConstructor;
         default: number;
     };
-    dragOverlayColor: {
-        type: StringConstructor;
-        default: string;
-    };
-    dragOverlayBorderColor: {
-        type: StringConstructor;
-        default: string;
-    };
     disableDrag: {
         type: BooleanConstructor;
         default: boolean;
     };
+    customWrapper: {
+        type: StringConstructor;
+        default: string;
+    };
 }>> & Readonly<{
     onOnGridListChange?: ((args_0: ApDraggableGridItemBase[]) => any) | undefined;
 }>, {
@@ -172,9 +158,8 @@ declare const ApDraggableGrid: {
     gridItemHeight: number;
     gridItemShadow: string;
     gapWidth: number;
-    dragOverlayColor: string;
-    dragOverlayBorderColor: string;
     disableDrag: boolean;
+    customWrapper: string;
 }, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & (new () => {
     $slots: {
         item?(_: {
@@ -184,7 +169,9 @@ declare const ApDraggableGrid: {
                 span: number;
                 row: number;
                 col: number;
+                showHeight: number | string;
                 height?: number | string | undefined;
+                module: string;
             };
             index: number;
         }): any;

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

@@ -2,7 +2,9 @@ export interface ApDraggableGridItemBase {
     span: number;
     row: number;
     col: number;
+    showHeight: number | string;
     height?: number | string;
+    module: string;
 }
 export interface ApDraggableGridItem extends ApDraggableGridItemBase {
     isDragging: boolean;

package/es/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.17.1";
+declare const _default: "6.18.0";
 export default _default;

package/es/src/version.mjs

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

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");require("vxe-table/es/style.css");const i=require("lodash-unified"),be=require("../ap-form/index.js");require("../config-provider/index.js");const Re=require("../ap-table/constants.js"),p=require("../ap-table/utils.js"),xe=require("../ap-table/hooks/use-table-paging-ng.js"),b=require("@aplus-frontend/antdv"),ke=require("./hooks/use-inner-params.js"),F=require("./utils/table.js"),Be=require("./hooks/use-row-selection.js"),Fe=require("../ap-table/context.js"),E=require("./constants.js"),Ee=require("./hooks/use-render-columns.js"),Ie=require("@aplus-frontend/antdv/es/theme/internal");require("../scroll-bar/index.js");const Ne=require("../utils/index.js"),Pe=require("../utils/slot.js"),Ve=require("./hooks/use-table-style.js"),qe=require("../config-provider/hooks/use-namespace.js"),ze=require("../config-provider/hooks/use-global-config.js"),Te=require("../config-provider/hooks/use-locale.js"),_e=require("../scroll-bar/index.vue.js"),Ae=e.defineComponent({name:"ApGrid",__name:"index",props:{dropdownPrefixCls:{},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:{},loading:{type:Boolean,default:void 0},loadingConfig:{},headerCellConfig:{},footerCellConfig:{},round:{type:Boolean,default:void 0},columns:{},rowSelection:{type:Boolean},card:{type:Boolean,default:!1},params:{},request:{},defaultData:{},dataSource:{},onLoadingChange:{},onShownColumnsChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},wrapperStyle:{},manual:{type:Boolean,default:void 0},size:{default:"mini"},adaptive:{type:Boolean,default:!1},columnResizable:{type:[Boolean,Object],default:!1},rowKey:{default:"key"},footer:{},virtual:{type:[Boolean,Object],default:void 0},expandable:{},value:{},rowHighlightable:{type:[Boolean,Function],default:!1},treeConfig:{}},setup(M,{expose:W}){var U;const g=e.useSlots(),o=M,y=(U=e.getCurrentInstance())==null?void 0:U.appContext.app;y&&!y.__VXE_PC_UI_INSTALLED__&&(y.use(v.VxeUI),y.__VXE_PC_UI_INSTALLED__=!0);const{e:S,b:u,be:j}=qe.useNamespace("ap-grid"),H=ze.useGlobalConfig("valueTypeMap"),s=e.ref([]),I=e.ref([]),l=e.ref(),w=e.ref(o.size),G=Ve.useTableStyle(),[,X]=Ie.useToken(),{t:J}=Te.useLocale();v.VxeUI.setConfig({i18n:(t,r)=>J(`ap.${t}`,r)});const{renderConfig:Q,updateSignal:Y}=Ee.useRenderColumns(s);let N=0;const Z=e.computed(()=>{if(l.value)return l.value.$el.querySelector(".vxe-table--header-inner-wrapper")}),P=e.computed(()=>{var t,r,n;return N++,((n=(r=(t=o.columns)==null?void 0:t.filter(a=>!a.hideInSearch&&a.dataIndex&&(a.valueType||a.customRenderFormItem)&&!Re.noRenderAsFormItemValueList.includes(a.valueType)))==null?void 0:r.sort((a,c)=>{let h=p.getColumnOrder(a.order);return p.getColumnOrder(c.order)-h}))==null?void 0:n.map(a=>{const c=p.updateFormProps(a,p.getFieldProps(a.fieldProps,{})),h={...a,fieldProps:{label:a.title,name:a.dataIndex,bordered:!0,...c||{},_signal:N},renderNode:void 0};return h.renderNode=p.getSearchFormItemRenderNode(h,e.unref(H)),h}))||[]}),ee=e.computed(()=>{var r;return Ne.isDef(o.manual)?o.manual:Pe.getValidVNodeList(((r=g.searchFormExtra)==null?void 0:r.call(g))||[]).some(n=>{var a;return((a=n.type)==null?void 0:a.name)==="ApView"})}),te=e.computed(()=>[u(),o.card?null:u("wrapper"),o.adaptive?u("adaptive"):null,o.sticky?u("sticky"):null].filter(Boolean)),V=e.computed(()=>p.recursionApColumns(e.unref(s),t=>{if(t.sorter===!0)return t.key||t.dataIndex}).filter(Boolean)),q=e.computed(()=>p.recursionApColumns(e.unref(s),t=>{if(t.filters&&!t.onFilter)return t.key||t.dataIndex}).filter(Boolean)),{formRef:m,submit:R,reset:x,refresh:z,data:d,tableProps:T,setDataSource:re,handleTableChangeOptional:oe,getPaging:ae,setPaging:ne,submitWith:_}=xe.useTablePaging({async request(t){var n;if(!f.value.preserveSelectedRowKeys&&i.isUndefined(o.dataSource)&&B(),!i.isUndefined(o.dataSource)){const a=t.pageSize*(t.current-1);return{data:(o.pagination===!1?o.dataSource:o.dataSource.slice(a,a+t.pageSize))||[],total:o.dataSource.length||0}}const r=await((n=o.request)==null?void 0:n.call(o,t));return{data:(r==null?void 0:r.data)||[],total:(r==null?void 0:r.total)||0}},namespace:"ap-grid",filterFields:q,sortFields:V,params:e.toRef(o,"params"),defaultData:o.defaultData,manual:e.unref(ee),formatParams:o.beforeSearchSubmit,pagination:o.pagination,onClickReset:Se,onAfterRequest:$}),{sortChangeEvent:le,filterChangeEvent:se,paginationChangeEvent:ue}=ke.useInnerParams(oe);Fe.useProvideApTable({columns:e.computed(()=>s.value),columnsBackup:e.computed(()=>I.value),size:e.computed(()=>E.sizeMap[w.value]),updateColumns(t){var r;s.value=t,(r=o.onShownColumnsChange)==null||r.call(o,t)},updateSize(t){w.value=E.sizeReverseMap[t]},renderConfig:e.computed(()=>({className:j("table-header","title"),color:X.value.colorTextTertiary})),dataSource:e.computed(()=>e.unref(d).records),getSearchFormValues:L,setSearchFormValues:A,submit:R,submitWith:_,reset:x,refresh:z,getSearchFormSorterItems:K,setSearchFormSorterItems:D,resetSearchFormSorterItems:O});const ce=e.computed(()=>s.value.some(t=>t.fixed==="left"||t.fixed===!0)?"left":void 0),ie=e.computed(()=>i.isUndefined(o.loading)?d.loading:o.loading),de=e.computed(()=>i.isUndefined(o.dataSource)?d.records:o.dataSource),{selectedRows:k,rowSelection:f,...C}=Be.default({...o.rowSelection===!0?{}:o.rowSelection,dataSource:de,rowKey:o.rowKey}),fe=({checked:t})=>{const r=l.value;r&&r&&C.selectChange(t,r.getCheckboxRecords(),r.getCheckboxReserveRecords())},pe=({checked:t})=>{const r=l.value;r&&C.selectAllChange(t,[...r.getCheckboxReserveRecords(),...r.getCheckboxRecords()])},me=()=>{const t=l.value;t&&C.selectRangeChange(t.getCheckboxRecords(),[...t.getCheckboxReserveRecords(),...t.getCheckboxRecords()])},ge=()=>{const t=l.value;t&&(k.value=[t.getRadioRecord()])},Ce=({row:t})=>{const r=o.rowHighlightable;i.isFunction(r)&&r(t)};function he(){var t;return((t=o.columns)==null?void 0:t.filter(r=>!r.hideInTable))||[]}function A(t){var r,n,a;(a=(n=(r=m.value)==null?void 0:r.apForm)==null?void 0:n.setFieldsValue)==null||a.call(n,t)}function L(t=!1){var n,a,c;const r=t?"getFieldsValueTransformed":"getFieldsValue";return(c=(a=(n=m.value)==null?void 0:n.apForm)==null?void 0:a[r])==null?void 0:c.call(a,!0)}function K(){var t;return((t=m.value)==null?void 0:t.getSorterItems())||[]}function D(t){var r;(r=m.value)==null||r.setSorterItems(t)}function O(){var t;(t=m.value)==null||t.resetSorterItems()}function B(){C.clearAll();const t=l.value;t&&(f.value.type==="radio"?(t.clearRadioRow(),t.clearRadioReserve()):(t.clearCheckboxRow(),t.clearCheckboxReserve()))}function ve(t){i.isFunction(o.rowKey)||(C.selectMultiByKeys(t),$())}function ye(t){const r=l.value;if(!r)return;const n=String(t[o.rowKey]),a=r.getRowById(n);r.setCurrentRow(a)}function Se(){const t=l.value;t&&(t.clearSort(),t.clearFilter())}function $(){e.nextTick(()=>{var t,r;f.value.type==="radio"?(t=l.value)==null||t.setRadioRowKey(f.value.selectedRowKeys[0]):(r=l.value)==null||r.setCheckboxRowKey(f.value.selectedRowKeys,!0)})}async function we(t,r){var a;const n=d.records[t];if(n)return(a=l.value)==null?void 0:a.scrollToRow(n,r)}return e.watch(()=>[o.columnResizable,o.columns],()=>{var r;const t=he();s.value=t,(r=o.onShownColumnsChange)==null||r.call(o,t),I.value=t},{deep:!0,immediate:!0}),e.watch(()=>o.dataSource,t=>{re(t)},{immediate:!0,deep:!0}),e.watch(()=>e.unref(d).loading,t=>{var r;(r=o.onLoadingChange)==null||r.call(o,t)}),e.watch(()=>o.size,t=>{w.value=t}),W({submit:R,reset:x,refresh:z,submitWith:_,setSearchFormValues:A,getSearchFormValues:L,getShowColumns:()=>e.unref(s),rowSelection:{selectedRows:e.computed(()=>k.value),setSelectedRowKeys:ve,clearAll:B},scrollToRow:we,getDataSource:()=>e.unref(d.records),setCurrentRow:ye,getPaging:ae,setPaging:ne,getSearchFormSorterItems:K,setSearchFormSorterItems:D,resetSearchFormSorterItems:O}),(t,r)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(te.value),style:e.normalizeStyle(t.wrapperStyle)},[e.unref(i.isUndefined)(t.dataSource)&&t.searchForm!==!1&&P.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(t.card?e.unref(S)("search-wrapper"):null),style:e.normalizeStyle(t.searchFormWrapperStyle)},[e.createVNode(e.unref(be.ApForm).SearchForm,e.mergeProps(t.searchForm||{},{ref_key:"formRef",ref:m,"custom-reset":"","submit-loading":e.unref(T).loading,onSubmit:e.unref(R),onReset:e.unref(x)}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(P.value,n=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n.renderNode),{key:n.dataIndex}))),128))]),_:2},[g.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(t.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["submit-loading","onSubmit","onReset"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{class:e.normalizeClass([e.unref(S)("table-wrapper"),t.card?e.unref(S)("table-wrapper-card"):null]),style:e.normalizeStyle(t.tableWrapperStyle)},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(u)("header-wrapper"))},[e.renderSlot(t.$slots,"title",{selectedRows:e.unref(k),selectedRowKeys:e.unref(f).selectedRowKeys,shownColumns:s.value,clearAll:B})],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(u)("vxe-wrapper"))},[(e.openBlock(),e.createBlock(e.unref(v.VxeTable),e.mergeProps(e.unref(F.toVxeProps)(o),{ref_key:"tableRef",ref:l,key:e.unref(Y),data:e.unref(d).records,"sort-config":{remote:V.value.length>0,trigger:"cell"},"filter-config":{remote:q.value.length>0},loading:ie.value,style:e.unref(G),size:w.value,onSortChange:e.unref(le),onFilterChange:e.unref(se),onCheckboxChange:fe,onCheckboxRangeChange:me,onCheckboxAll:pe,onRadioChange:ge,onCurrentChange:Ce}),e.createSlots({empty:e.withCtx(()=>[e.createVNode(e.unref(b.Empty),{image:e.unref(b.Empty).PRESENTED_IMAGE_SIMPLE},null,8,["image"])]),loading:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass(e.unref(S)("table-loading-wrapper"))},[e.createVNode(e.unref(b.Spin))],2)]),default:e.withCtx(()=>[o.expandable&&s.value.length?(e.openBlock(),e.createBlock(e.unref(v.VxeColumn),e.mergeProps({key:0},e.unref(F.getRowExpandProps)(t.expandable),{fixed:ce.value}),{content:e.withCtx(n=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(o.expandable.renderContent(n))))]),_:1},16,["fixed"])):e.createCommentVNode("",!0),o.rowSelection&&s.value.length?(e.openBlock(),e.createBlock(e.unref(v.VxeColumn),e.mergeProps({key:1},e.unref(F.getRowSelectionProps)(e.unref(f),s.value),{field:e.unref(E.ROW_SELECTION_FIELD)}),null,16,["field"])):e.createCommentVNode("",!0),(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(e.unref(Q),n=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n),{key:n.props.colId}))),128))]),_:2},[e.renderList(e.unref(i.omit)(g,["searchFormExtra"]),(n,a)=>({name:a,fn:e.withCtx(c=>[e.renderSlot(t.$slots,a,e.normalizeProps(e.guardReactiveProps(c||{})))])}))]),1040,["data","sort-config","filter-config","loading","style","size","onSortChange","onFilterChange"]))],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(u)("pagination-wrapper"))},[t.sticky?(e.openBlock(),e.createBlock(e.unref(_e.default),{key:0,direction:"horizontal","scroll-container":Z.value,"extra-size":-4.2,"bar-color":"var(--ap-scrollbar-thumb-color-base)","track-color":"var(--ap-table-header-bg, #f2f6f9)"},null,8,["scroll-container"])):e.createCommentVNode("",!0),t.pagination!==!1?(e.openBlock(),e.createBlock(e.unref(b.Pagination),e.mergeProps({key:1,class:e.unref(u)("pagination")},e.unref(T).pagination,{onChange:e.unref(ue)}),null,16,["class","onChange"])):e.createCommentVNode("",!0)],2)],6)],6))}});exports.default=Ae;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),v=require("vxe-table");require("vxe-table/es/style.css");const i=require("lodash-unified"),be=require("../ap-form/index.js");require("../config-provider/index.js");const Re=require("../ap-table/constants.js"),p=require("../ap-table/utils.js"),xe=require("../ap-table/hooks/use-table-paging-ng.js"),b=require("@aplus-frontend/antdv"),ke=require("./hooks/use-inner-params.js"),F=require("./utils/table.js"),Be=require("./hooks/use-row-selection.js"),Fe=require("../ap-table/context.js"),E=require("./constants.js"),Ee=require("./hooks/use-render-columns.js"),Ie=require("@aplus-frontend/antdv/es/theme/internal");require("../scroll-bar/index.js");const Ne=require("../utils/index.js"),Pe=require("../utils/slot.js"),ze=require("./hooks/use-table-style.js"),Ve=require("../config-provider/hooks/use-namespace.js"),qe=require("../config-provider/hooks/use-global-config.js"),Te=require("../config-provider/hooks/use-locale.js"),_e=require("../scroll-bar/index.vue.js"),Ae=e.defineComponent({name:"ApGrid",__name:"index",props:{dropdownPrefixCls:{},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:{},loading:{type:Boolean,default:void 0},loadingConfig:{},headerCellConfig:{},footerCellConfig:{},round:{type:Boolean,default:void 0},columns:{},rowSelection:{type:Boolean},card:{type:Boolean,default:!1},params:{},request:{},defaultData:{},dataSource:{},onLoadingChange:{},onShownColumnsChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},wrapperStyle:{},manual:{type:Boolean,default:void 0},size:{default:"mini"},adaptive:{type:Boolean,default:!1},columnResizable:{type:[Boolean,Object],default:!1},rowKey:{default:"key"},footer:{},virtual:{type:[Boolean,Object],default:void 0},expandable:{},value:{},rowHighlightable:{type:[Boolean,Function],default:!1},treeConfig:{}},setup(M,{expose:W}){var U;const g=e.useSlots(),o=M,y=(U=e.getCurrentInstance())==null?void 0:U.appContext.app;y&&!y.__VXE_PC_UI_INSTALLED__&&(y.use(v.VxeUI),y.__VXE_PC_UI_INSTALLED__=!0);const{e:S,b:u,be:j}=Ve.useNamespace("ap-grid"),H=qe.useGlobalConfig("valueTypeMap"),s=e.ref([]),I=e.ref([]),l=e.ref(),w=e.ref(o.size),G=ze.useTableStyle(),[,X]=Ie.useToken(),{t:J}=Te.useLocale();v.VxeUI.setConfig({i18n:(t,r)=>J(`ap.${t}`,r)});const{renderConfig:Q,updateSignal:Y}=Ee.useRenderColumns(s);let N=0;const Z=e.computed(()=>{if(l.value)return l.value.$el.querySelector(".vxe-table--header-inner-wrapper")}),P=e.computed(()=>{var t,r,n;return N++,((n=(r=(t=o.columns)==null?void 0:t.filter(a=>!a.hideInSearch&&a.dataIndex&&(a.valueType||a.customRenderFormItem)&&!Re.noRenderAsFormItemValueList.includes(a.valueType)))==null?void 0:r.sort((a,c)=>{let h=p.getColumnOrder(a.order);return p.getColumnOrder(c.order)-h}))==null?void 0:n.map(a=>{const c=p.updateFormProps(a,p.getFieldProps(a.fieldProps,{})),h={...a,fieldProps:{label:a.title,name:a.dataIndex,bordered:!0,...c||{},_signal:N},renderNode:void 0};return h.renderNode=p.getSearchFormItemRenderNode(h,e.unref(H)),h}))||[]}),ee=e.computed(()=>{var r;return Ne.isDef(o.manual)?o.manual:Pe.getValidVNodeList(((r=g.searchFormExtra)==null?void 0:r.call(g))||[]).some(n=>{var a;return((a=n.type)==null?void 0:a.name)==="ApView"})}),te=e.computed(()=>[u(),o.card?null:u("wrapper"),o.adaptive?u("adaptive"):null,o.sticky?u("sticky"):null].filter(Boolean)),z=e.computed(()=>p.recursionApColumns(e.unref(s),t=>{if(t.sorter===!0)return t.key||t.dataIndex}).filter(Boolean)),V=e.computed(()=>p.recursionApColumns(e.unref(s),t=>{if(t.filters&&!t.onFilter)return t.key||t.dataIndex}).filter(Boolean)),{formRef:m,submit:R,reset:x,refresh:q,data:d,tableProps:T,setDataSource:re,handleTableChangeOptional:oe,getPaging:ae,setPaging:ne,submitWith:_}=xe.useTablePaging({async request(t){var n;if(!f.value.preserveSelectedRowKeys&&i.isUndefined(o.dataSource)&&B(),!i.isUndefined(o.dataSource)){const a=t.pageSize*(t.current-1);return{data:(o.pagination===!1?o.dataSource:o.dataSource.slice(a,a+t.pageSize))||[],total:o.dataSource.length||0}}const r=await((n=o.request)==null?void 0:n.call(o,t));return{data:(r==null?void 0:r.data)||[],total:(r==null?void 0:r.total)||0}},namespace:"ap-grid",filterFields:V,sortFields:z,params:e.toRef(o,"params"),defaultData:o.defaultData,manual:e.unref(ee),formatParams:o.beforeSearchSubmit,pagination:o.pagination,onClickReset:Se,onAfterRequest:$}),{sortChangeEvent:le,filterChangeEvent:se,paginationChangeEvent:ue}=ke.useInnerParams(oe);Fe.useProvideApTable({columns:e.computed(()=>s.value),columnsBackup:e.computed(()=>I.value),size:e.computed(()=>E.sizeMap[w.value]),updateColumns(t){var r;s.value=t,(r=o.onShownColumnsChange)==null||r.call(o,t)},updateSize(t){w.value=E.sizeReverseMap[t]},renderConfig:e.computed(()=>({className:j("table-header","title"),color:X.value.colorTextTertiary})),dataSource:e.computed(()=>e.unref(d).records),getSearchFormValues:L,setSearchFormValues:A,submit:R,submitWith:_,reset:x,refresh:q,getSearchFormSorterItems:K,setSearchFormSorterItems:D,resetSearchFormSorterItems:O});const ce=e.computed(()=>s.value.some(t=>t.fixed==="left"||t.fixed===!0)?"left":void 0),ie=e.computed(()=>i.isUndefined(o.loading)?d.loading:o.loading),de=e.computed(()=>i.isUndefined(o.dataSource)?d.records:o.dataSource),{selectedRows:k,rowSelection:f,...C}=Be.default({...o.rowSelection===!0?{}:o.rowSelection,dataSource:de,rowKey:o.rowKey}),fe=({checked:t})=>{const r=l.value;r&&r&&C.selectChange(t,r.getCheckboxRecords(),r.getCheckboxReserveRecords())},pe=({checked:t})=>{const r=l.value;r&&C.selectAllChange(t,[...r.getCheckboxReserveRecords(),...r.getCheckboxRecords()])},me=()=>{const t=l.value;t&&C.selectRangeChange(t.getCheckboxRecords(),[...t.getCheckboxReserveRecords(),...t.getCheckboxRecords()])},ge=()=>{const t=l.value;t&&(k.value=[t.getRadioRecord()])},Ce=({row:t})=>{const r=o.rowHighlightable;i.isFunction(r)&&r(t)};function he(){var t;return((t=o.columns)==null?void 0:t.filter(r=>!r.hideInTable))||[]}function A(t){var r,n,a;(a=(n=(r=m.value)==null?void 0:r.apForm)==null?void 0:n.setFieldsValue)==null||a.call(n,t)}function L(t=!1){var n,a,c;const r=t?"getFieldsValueTransformed":"getFieldsValue";return(c=(a=(n=m.value)==null?void 0:n.apForm)==null?void 0:a[r])==null?void 0:c.call(a,!0)}function K(){var t;return((t=m.value)==null?void 0:t.getSorterItems())||[]}function D(t){var r;(r=m.value)==null||r.setSorterItems(t)}function O(){var t;(t=m.value)==null||t.resetSorterItems()}function B(){C.clearAll();const t=l.value;t&&(f.value.type==="radio"?(t.clearRadioRow(),t.clearRadioReserve()):(t.clearCheckboxRow(),t.clearCheckboxReserve()))}function ve(t){i.isFunction(o.rowKey)||(C.selectMultiByKeys(t),$())}function ye(t){const r=l.value;if(!r)return;const n=String(t[o.rowKey]),a=r.getRowById(n);r.setCurrentRow(a)}function Se(){const t=l.value;t&&(t.clearSort(),t.clearFilter())}function $(){e.nextTick(()=>{var t,r;f.value.type==="radio"?(t=l.value)==null||t.setRadioRowKey(f.value.selectedRowKeys[0]):(r=l.value)==null||r.setCheckboxRowKey(f.value.selectedRowKeys,!0)})}async function we(t,r){var a;const n=d.records[t];if(n)return(a=l.value)==null?void 0:a.scrollToRow(n,r)}return e.watch(()=>[o.columnResizable,o.columns],()=>{var r;const t=he();s.value=t,(r=o.onShownColumnsChange)==null||r.call(o,t),I.value=t},{deep:!0,immediate:!0}),e.watch(()=>o.dataSource,t=>{re(t)},{immediate:!0,deep:!0}),e.watch(()=>e.unref(d).loading,t=>{var r;(r=o.onLoadingChange)==null||r.call(o,t)}),e.watch(()=>o.size,t=>{w.value=t}),W({submit:R,reset:x,refresh:q,submitWith:_,setSearchFormValues:A,getSearchFormValues:L,getShowColumns:()=>e.unref(s),rowSelection:{selectedRows:e.computed(()=>k.value),setSelectedRowKeys:ve,clearAll:B},scrollToRow:we,getDataSource:()=>e.unref(d.records),setCurrentRow:ye,getPaging:ae,setPaging:ne,getSearchFormSorterItems:K,setSearchFormSorterItems:D,resetSearchFormSorterItems:O}),(t,r)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(te.value),style:e.normalizeStyle(t.wrapperStyle)},[e.unref(i.isUndefined)(t.dataSource)&&t.searchForm!==!1&&P.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(t.card?e.unref(S)("search-wrapper"):null),style:e.normalizeStyle(t.searchFormWrapperStyle)},[e.createVNode(e.unref(be.ApForm).SearchForm,e.mergeProps(t.searchForm||{},{ref_key:"formRef",ref:m,"custom-reset":"","submit-loading":e.unref(T).loading,onSubmit:e.unref(R),onReset:e.unref(x)}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(P.value,n=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n.renderNode),{key:n.dataIndex}))),128))]),_:2},[g.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(t.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["submit-loading","onSubmit","onReset"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{class:e.normalizeClass([e.unref(S)("table-wrapper"),t.card?e.unref(S)("table-wrapper-card"):null]),style:e.normalizeStyle(t.tableWrapperStyle)},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(u)("header-wrapper"))},[e.renderSlot(t.$slots,"title",{selectedRows:e.unref(k),selectedRowKeys:e.unref(f).selectedRowKeys,shownColumns:s.value,clearAll:B})],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(u)("vxe-wrapper"))},[(e.openBlock(),e.createBlock(e.unref(v.VxeTable),e.mergeProps(e.unref(F.toVxeProps)(o),{ref_key:"tableRef",ref:l,key:e.unref(Y),data:e.unref(d).records,"sort-config":{remote:z.value.length>0,trigger:"cell"},"filter-config":{remote:V.value.length>0},loading:ie.value,style:e.unref(G),size:w.value,onSortChange:e.unref(le),onFilterChange:e.unref(se),onCheckboxChange:fe,onCheckboxRangeChange:me,onCheckboxAll:pe,onRadioChange:ge,onCurrentChange:Ce}),e.createSlots({empty:e.withCtx(()=>[e.createVNode(e.unref(b.Empty),{image:e.unref(b.Empty).PRESENTED_IMAGE_SIMPLE},null,8,["image"])]),loading:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass(e.unref(S)("table-loading-wrapper"))},[e.createVNode(e.unref(b.Spin))],2)]),default:e.withCtx(()=>[o.expandable&&s.value.length?(e.openBlock(),e.createBlock(e.unref(v.VxeColumn),e.mergeProps({key:0},e.unref(F.getRowExpandProps)(t.expandable),{fixed:ce.value}),{content:e.withCtx(n=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(o.expandable.renderContent(n))))]),_:1},16,["fixed"])):e.createCommentVNode("",!0),o.rowSelection&&s.value.length?(e.openBlock(),e.createBlock(e.unref(v.VxeColumn),e.mergeProps({key:1},e.unref(F.getRowSelectionProps)(e.unref(f),s.value,o.size),{resizable:!1,field:e.unref(E.ROW_SELECTION_FIELD)}),null,16,["field"])):e.createCommentVNode("",!0),(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(e.unref(Q),n=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n),{key:n.props.colId}))),128))]),_:2},[e.renderList(e.unref(i.omit)(g,["searchFormExtra"]),(n,a)=>({name:a,fn:e.withCtx(c=>[e.renderSlot(t.$slots,a,e.normalizeProps(e.guardReactiveProps(c||{})))])}))]),1040,["data","sort-config","filter-config","loading","style","size","onSortChange","onFilterChange"]))],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(u)("pagination-wrapper"))},[t.sticky?(e.openBlock(),e.createBlock(e.unref(_e.default),{key:0,direction:"horizontal","scroll-container":Z.value,"extra-size":-4.2,"bar-color":"var(--ap-scrollbar-thumb-color-base)","track-color":"var(--ap-table-header-bg, #f2f6f9)"},null,8,["scroll-container"])):e.createCommentVNode("",!0),t.pagination!==!1?(e.openBlock(),e.createBlock(e.unref(b.Pagination),e.mergeProps({key:1,class:e.unref(u)("pagination")},e.unref(T).pagination,{onChange:e.unref(ue)}),null,16,["class","onChange"])):e.createCommentVNode("",!0)],2)],6)],6))}});exports.default=Ae;

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

@@ -2,7 +2,7 @@ import { VxeTableEventProps, VxeTableProps } from 'vxe-table';
 import { ApGridColumnType, ApGridProps, ApGridRowSelection } from '../interface';
 import { RowSelectionType } from '@aplus-frontend/antdv/es/table/interface';
 export declare function toVxeProps<RecordType>(props: ApGridProps): VxeTableProps<RecordType> & VxeTableEventProps<RecordType>;
-export declare function getRowSelectionProps(rowSelection: ApGridRowSelection<any> | true, columns: ApGridColumnType[]): {
+export declare function getRowSelectionProps(rowSelection: ApGridRowSelection<any> | true, columns: ApGridColumnType[], size: 'mini' | 'medium'): {
     type: RowSelectionType;
     width: string | number;
     fixed: "left" | "right" | undefined;

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("lodash-unified"),h=require("../../utils/index.js"),g=20,m=50,C=e=>e.some(t=>!!t.html);function y(e){var r;const t={...u.omit(e,["columns","request","searchForm","dataSource","rowKey","value","round"])};if(t.rowConfig={isHover:!0,keyField:e.rowKey,isCurrent:!!e.rowHighlightable},t.columnConfig={},C(e.columns||[])&&(t.rowConfig.useKey=!0,t.columnConfig.useKey=!0),e.adaptive&&(t.autoResize=!0,t.height="100%"),e.columnResizable&&(t.columnConfig.resizable=!0),e.rowSelection){const o=e.rowSelection===!0?{}:e.rowSelection;o.type==="radio"?t.radioConfig={highlight:!0,checkMethod({row:i}){return o.disabled?!o.disabled(i):!0},visibleMethod({row:i}){return o.shown?o.shown(i):!0},checkRowKey:(r=o.defaultSelectedRowKeys)==null?void 0:r[0],reserve:u.isUndefined(o.preserveSelectedRowKeys)?!0:o.preserveSelectedRowKeys}:t.checkboxConfig={highlight:!0,checkMethod({row:i}){return o.disabled?!o.disabled(i):!0},visibleMethod({row:i}){return o.shown?o.shown(i):!0},reserve:u.isUndefined(o.preserveSelectedRowKeys)?!0:o.preserveSelectedRowKeys,range:o.range||!1}}return t.border=e.bordered===!1?"inner":!0,e.expandable&&(t.expandConfig=u.omit(e.expandable,["renderContent","width","title"])),e.footer&&(t.showFooter=!0,u.isFunction(e.footer)?t.footerMethod=e.footer:t.footerData=e.footer),e.virtual===!1?(t.virtualXConfig={enabled:!1},t.virtualYConfig={enabled:!1}):(d(t,"X",e.virtual),d(t,"Y",e.virtual)),t.round=h.isDef(e.round)?e.round:!e.card,t.headerCellConfig={height:36,...t.headerCellConfig||{}},t.treeConfig&&(t.treeConfig={...t.treeConfig||{},transform:!0}),t.resizableConfig={minWidth({cell:o}){return S(o,e.size)}},t}function d(e,t,n){const r=t==="X",o=r?"x":"y",i=r?"virtualXConfig":"virtualYConfig",l=n==null?void 0:n[o],f=l!==!1,s=r?g:m,c=u.isNumber(l)&&l>=0?l:s;e[i]={enabled:f,gt:c,oSize:(n==null?void 0:n.oSize)||0}}function b(e){return e===!0?"left":e}function w(e,t){const n=e===!0||!e.type?"checkbox":e.type,r=e===!0?60:e.columnWidth||60;let o=e===!0?void 0:b(e.fixed);return o||(o===!1?o=void 0:o=t.some(i=>i.fixed==="left"||i.fixed===!0)?"left":void 0),{type:n,width:r,fixed:o}}function x(e){const t=(e==null?void 0:e.width)||"auto";return{type:"expand",title:e==null?void 0:e.title,width:t}}function a(e){if(!e)return 0;const t=getComputedStyle(e);return e.offsetWidth+(Number.parseFloat(t.marginLeft)||0)+Number.parseFloat(t.marginRight)||0}function S(e,t){if(!e)return"auto";const n=getComputedStyle(e);let r=t==="medium"?12*2:9*2;const o=(Number.parseFloat(n.fontSize)||14)*1.6;return r+=o,e.querySelector("span.anticon-question-circle")&&(r+=20),r+=a(e.querySelector(".vxe-cell--sort"))+a(e.querySelector(".vxe-cell--filter")),Math.ceil(r)}exports.getRowExpandProps=x;exports.getRowSelectionProps=w;exports.toVxeProps=y;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("lodash-unified"),h=require("../../utils/index.js"),g=20,m=50,C=e=>e.some(t=>!!t.html);function y(e){var i;const t={...l.omit(e,["columns","request","searchForm","dataSource","rowKey","value","round"])};if(t.rowConfig={isHover:!0,keyField:e.rowKey,isCurrent:!!e.rowHighlightable},t.columnConfig={},C(e.columns||[])&&(t.rowConfig.useKey=!0,t.columnConfig.useKey=!0),e.adaptive&&(t.autoResize=!0,t.height="100%"),e.columnResizable&&(t.columnConfig.resizable=!0),e.rowSelection){const o=e.rowSelection===!0?{}:e.rowSelection;o.type==="radio"?t.radioConfig={highlight:!0,checkMethod({row:n}){return o.disabled?!o.disabled(n):!0},visibleMethod({row:n}){return o.shown?o.shown(n):!0},checkRowKey:(i=o.defaultSelectedRowKeys)==null?void 0:i[0],reserve:l.isUndefined(o.preserveSelectedRowKeys)?!0:o.preserveSelectedRowKeys}:t.checkboxConfig={highlight:!0,checkMethod({row:n}){return o.disabled?!o.disabled(n):!0},visibleMethod({row:n}){return o.shown?o.shown(n):!0},reserve:l.isUndefined(o.preserveSelectedRowKeys)?!0:o.preserveSelectedRowKeys,range:o.range||!1}}return t.border=e.bordered===!1?"inner":!0,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}):(a(t,"X",e.virtual),a(t,"Y",e.virtual)),t.round=h.isDef(e.round)?e.round:!e.card,t.headerCellConfig={height:36,...t.headerCellConfig||{}},t.treeConfig&&(t.treeConfig={...t.treeConfig||{},transform:!0}),t.resizableConfig={minWidth({cell:o}){return S(o,e.size)}},t}function a(e,t,r){const i=t==="X",o=i?"x":"y",n=i?"virtualXConfig":"virtualYConfig",u=r==null?void 0:r[o],s=u!==!1,d=i?g:m,c=l.isNumber(u)&&u>=0?u:d;e[n]={enabled:s,gt:c,oSize:(r==null?void 0:r.oSize)||0}}function b(e){return e===!0?"left":e}function w(e,t,r){const i=e===!0||!e.type?"checkbox":e.type,o=(r==="mini"?9*2:12*2)+16,n=e===!0?o:e.columnWidth||o;let u=e===!0?void 0:b(e.fixed);return u||(u===!1?u=void 0:u=t.some(s=>s.fixed==="left"||s.fixed===!0)?"left":void 0),{type:i,width:n,fixed:u}}function x(e){const t=(e==null?void 0:e.width)||"auto";return{type:"expand",title:e==null?void 0:e.title,width:t}}function f(e){if(!e)return 0;const t=getComputedStyle(e);return e.offsetWidth+(Number.parseFloat(t.marginLeft)||0)+Number.parseFloat(t.marginRight)||0}function S(e,t){if(!e)return"auto";const r=getComputedStyle(e);let i=t==="medium"?12*2:9*2;const o=(Number.parseFloat(r.fontSize)||14)*1.6;return i+=o,e.querySelector("span.anticon-question-circle")&&(i+=20),i+=f(e.querySelector(".vxe-cell--sort"))+f(e.querySelector(".vxe-cell--filter")),Math.ceil(i)}exports.getRowExpandProps=x;exports.getRowSelectionProps=w;exports.toVxeProps=y;

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

@@ -10,7 +10,9 @@ declare function __VLS_template(): {
                 span: number;
                 row: number;
                 col: number;
+                showHeight: number | string;
                 height?: number | string | undefined;
+                module: string;
             };
             index: number;
         }): any;
@@ -46,18 +48,14 @@ declare const __VLS_component: DefineComponent<ExtractPropTypes<{
         type: NumberConstructor;
         default: number;
     };
-    dragOverlayColor: {
-        type: StringConstructor;
-        default: string;
-    };
-    dragOverlayBorderColor: {
-        type: StringConstructor;
-        default: string;
-    };
     disableDrag: {
         type: BooleanConstructor;
         default: boolean;
     };
+    customWrapper: {
+        type: StringConstructor;
+        default: string;
+    };
 }>, {
     setGridItems: (items: ApDraggableGridItemBase[]) => void;
     refreshGrid: () => void;
@@ -88,18 +86,14 @@ declare const __VLS_component: DefineComponent<ExtractPropTypes<{
         type: NumberConstructor;
         default: number;
     };
-    dragOverlayColor: {
-        type: StringConstructor;
-        default: string;
-    };
-    dragOverlayBorderColor: {
-        type: StringConstructor;
-        default: string;
-    };
     disableDrag: {
         type: BooleanConstructor;
         default: boolean;
     };
+    customWrapper: {
+        type: StringConstructor;
+        default: string;
+    };
 }>> & Readonly<{
     onOnGridListChange?: ((args_0: ApDraggableGridItemBase[]) => any) | undefined;
 }>, {
@@ -109,9 +103,8 @@ declare const __VLS_component: DefineComponent<ExtractPropTypes<{
     gridItemHeight: number;
     gridItemShadow: string;
     gapWidth: number;
-    dragOverlayColor: string;
-    dragOverlayBorderColor: string;
     disableDrag: boolean;
+    customWrapper: string;
 }, {}, {}, {}, string, ComponentProvideOptions, true, {
     gridContainer: HTMLDivElement;
 }, 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 t=require("vue"),T=require("./constans.js"),N=require("@aplus-frontend/antdv");require("../../config-provider/index.js");const R=require("../../config-provider/hooks/use-namespace.js"),_=["data-span","draggable","onDragstart"],F=t.defineComponent({__name:"ApDraggableGrid",props:T.ApDraggableGridProps(),emits:["onGridListChange"],setup(I,{expose:O,emit:C}){const i=I,{b:w,e:f,m:A}=R.useNamespace("ap-draggable-grid"),p=t.ref(!1),v=t.computed(()=>f("item")),D=t.computed(()=>f("dragging")),G=C,d=t.useTemplateRef("gridContainer"),c=t.ref(null),s=t.reactive([]);t.watch(()=>i.gridList,e=>{Array.isArray(e)&&h(e)},{deep:!0,immediate:!0});function h(e){s.splice(0,s.length),e.forEach(r=>{s.push({...r,isDragging:!1,isOverlay:!1})})}const $=e=>({gridColumn:`${e.col} / span ${e.span}`,gridRow:e.row,minHeight:`${i.gridItemHeight}px`,boxShadow:i.gridItemShadow?i.gridItemShadow:"none"}),k=e=>{if(e.isOverlay){const r={};return i.dragOverlayColor&&(r.backgroundColor=i.dragOverlayColor),i.dragOverlayBorderColor&&(r.border=`2px dashed ${i.dragOverlayBorderColor}`,r.boxSizing="border-box"),r}return{}},q=(e,r)=>{c.value=r,s[r].isDragging=!0,e.dataTransfer&&(e.dataTransfer.setData("text/plain",String(r)),e.dataTransfer.effectAllowed="move")},L=()=>{c.value!==null&&(s[c.value].isDragging=!1,m(),c.value=null),s.forEach(e=>e.isOverlay=!1)};function m(){const e=s.map(r=>({span:r.span,row:r.row,col:r.col,height:r.height?r.height:""}));G("onGridListChange",e)}async function b(){if(h([]),typeof i.request=="function")try{p.value=!0;const e=await i.request();Array.isArray(e)?h(e):console.warn("ApDraggableGrid: 请求函数必须返回一个符合 ApDraggableGridItemBase 数组的格式")}catch(e){console.error("ApDraggableGrid: 请求错误:",e)}finally{p.value=!1}}t.onMounted(async()=>{if(await b(),y(),i.disableDrag||!d.value)return;const e=a=>{if(a.preventDefault(),c.value===null||!a.target)return;const n=document.elementFromPoint(a.clientX,a.clientY);if(!n)return;const o=n.closest(`.${v.value}:not(.${D.value})`);if(!o)return;const l=Array.from(document.querySelectorAll(`.${v.value}`)).indexOf(o);l>=0&&l!==c.value&&(s.forEach(u=>u.isOverlay=!1),s[l].isOverlay=!0,E(c.value,l)?a.dataTransfer.dropEffect="move":a.dataTransfer.dropEffect="none")},r=a=>{if(a.preventDefault(),c.value===null)return;const n=document.elementFromPoint(a.clientX,a.clientY);if(!n)return;const o=n.closest(`.${v.value}:not(.${D.value})`);if(!o)return;const l=Array.from(document.querySelectorAll(`.${v.value}`)).indexOf(o);l>=0&&E(c.value,l)&&(B(c.value,l),y(),m()),s.forEach(u=>{u.isDragging=!1,u.isOverlay=!1}),c.value=null};d.value.addEventListener("dragover",e),d.value.addEventListener("drop",r),t.onUnmounted(()=>{d.value&&(d.value.removeEventListener("dragover",e),d.value.removeEventListener("drop",r))})});function E(e,r){const a=JSON.parse(JSON.stringify(s)),n=a[e],o=a[r],g=n.height===o.height,l=S(n.span,o.row,e,r),u=S(o.span,n.row,r,e);return l&&u&&g}function S(e,r,a,n){let o=0,g=1;return s.forEach((l,u)=>{l.row===r&&u!==n&&u!==a&&(o+=l.span,l.col<=g&&(g=l.col+l.span))}),o+e<=24}function B(e,r){const a=s[e],n=s[r],o=a.row,g=a.col;a.row=n.row,a.col=n.col,n.row=o,n.col=g}function y(){const e={};s.forEach(r=>{e[r.row]||(e[r.row]=[]),e[r.row].push(r)}),Object.keys(e).forEach(r=>{const a=parseInt(r);e[a].sort((o,g)=>o.col-g.col);let n=1;e[a].forEach(o=>{o.col=n,n+=o.span})})}return O({setGridItems:e=>{h(e),y(),m()},refreshGrid:()=>{(async()=>{await b(),y(),m()})()}}),(e,r)=>(t.openBlock(),t.createBlock(t.unref(N.Spin),{spinning:p.value},{default:t.withCtx(()=>[t.createElementVNode("div",{ref_key:"gridContainer",ref:d,class:t.normalizeClass([p.value?t.unref(w)("loading"):t.unref(w)()]),style:t.normalizeStyle({width:typeof e.gridWidth=="number"?`${e.gridWidth}px`:e.gridWidth,gap:`${e.gapWidth}px`})},[(t.openBlock(!0),t.createElementBlock(t.Fragment,null,t.renderList(s,(a,n)=>(t.openBlock(),t.createElementBlock("div",{key:n,class:t.normalizeClass([t.unref(f)("item"),i.disableDrag?"":t.unref(A)("dragging"),a.isDragging?t.unref(f)("dragging"):"",a.isOverlay?t.unref(f)("overlay"):""]),"data-span":a.span,style:t.normalizeStyle([$(a),k(a),{height:a.height?a.height+"px":""}]),draggable:!i.disableDrag,onDragstart:o=>q(o,n),onDragend:L},[t.renderSlot(e.$slots,"item",{item:a,index:n},()=>[t.createTextVNode(t.toDisplayString(Math.round(a.span/24*100))+"% ("+t.toDisplayString(a.span)+"/24) ",1)])],46,_))),128))],6)]),_:3},8,["spinning"]))}});exports.default=F;
+"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;

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

@@ -25,16 +25,12 @@ export declare const ApDraggableGridProps: () => {
         type: NumberConstructor;
         default: number;
     };
-    dragOverlayColor: {
-        type: StringConstructor;
-        default: string;
-    };
-    dragOverlayBorderColor: {
-        type: StringConstructor;
-        default: string;
-    };
     disableDrag: {
         type: BooleanConstructor;
         default: boolean;
     };
+    customWrapper: {
+        type: StringConstructor;
+        default: string;
+    };
 };

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},dragOverlayColor:{type:String,default:"#66a9ff"},dragOverlayBorderColor:{type:String,default:"#4d97f7"},disableDrag:{type:Boolean,default:!1}});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: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;

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

@@ -27,18 +27,14 @@ declare const ApDraggableGrid: {
             type: NumberConstructor;
             default: number;
         };
-        dragOverlayColor: {
-            type: StringConstructor;
-            default: string;
-        };
-        dragOverlayBorderColor: {
-            type: StringConstructor;
-            default: string;
-        };
         disableDrag: {
             type: BooleanConstructor;
             default: boolean;
         };
+        customWrapper: {
+            type: StringConstructor;
+            default: string;
+        };
     }>> & Readonly<{
         onOnGridListChange?: ((args_0: ApDraggableGridItemBase[]) => any) | undefined;
     }>, {
@@ -53,9 +49,8 @@ declare const ApDraggableGrid: {
         gridItemHeight: number;
         gridItemShadow: string;
         gapWidth: number;
-        dragOverlayColor: string;
-        dragOverlayBorderColor: string;
         disableDrag: boolean;
+        customWrapper: string;
     }, true, {}, {}, GlobalComponents, GlobalDirectives, string, {
         gridContainer: HTMLDivElement;
     }, any, ComponentProvideOptions, {
@@ -90,18 +85,14 @@ declare const ApDraggableGrid: {
             type: NumberConstructor;
             default: number;
         };
-        dragOverlayColor: {
-            type: StringConstructor;
-            default: string;
-        };
-        dragOverlayBorderColor: {
-            type: StringConstructor;
-            default: string;
-        };
         disableDrag: {
             type: BooleanConstructor;
             default: boolean;
         };
+        customWrapper: {
+            type: StringConstructor;
+            default: string;
+        };
     }>> & Readonly<{
         onOnGridListChange?: ((args_0: ApDraggableGridItemBase[]) => any) | undefined;
     }>, {
@@ -114,9 +105,8 @@ declare const ApDraggableGrid: {
         gridItemHeight: number;
         gridItemShadow: string;
         gapWidth: number;
-        dragOverlayColor: string;
-        dragOverlayBorderColor: string;
         disableDrag: boolean;
+        customWrapper: string;
     }>;
     __isFragment?: never;
     __isTeleport?: never;
@@ -146,18 +136,14 @@ declare const ApDraggableGrid: {
         type: NumberConstructor;
         default: number;
     };
-    dragOverlayColor: {
-        type: StringConstructor;
-        default: string;
-    };
-    dragOverlayBorderColor: {
-        type: StringConstructor;
-        default: string;
-    };
     disableDrag: {
         type: BooleanConstructor;
         default: boolean;
     };
+    customWrapper: {
+        type: StringConstructor;
+        default: string;
+    };
 }>> & Readonly<{
     onOnGridListChange?: ((args_0: ApDraggableGridItemBase[]) => any) | undefined;
 }>, {
@@ -172,9 +158,8 @@ declare const ApDraggableGrid: {
     gridItemHeight: number;
     gridItemShadow: string;
     gapWidth: number;
-    dragOverlayColor: string;
-    dragOverlayBorderColor: string;
     disableDrag: boolean;
+    customWrapper: string;
 }, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & (new () => {
     $slots: {
         item?(_: {
@@ -184,7 +169,9 @@ declare const ApDraggableGrid: {
                 span: number;
                 row: number;
                 col: number;
+                showHeight: number | string;
                 height?: number | string | undefined;
+                module: string;
             };
             index: number;
         }): any;

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

@@ -2,7 +2,9 @@ export interface ApDraggableGridItemBase {
     span: number;
     row: number;
     col: number;
+    showHeight: number | string;
     height?: number | string;
+    module: string;
 }
 export interface ApDraggableGridItem extends ApDraggableGridItemBase {
     isDragging: boolean;

package/lib/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.17.1";
+declare const _default: "6.18.0";
 export default _default;

package/lib/src/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "6.17.1",
+  "version": "6.18.0",
   "main": "./lib/index.js",
   "type": "module",
   "files": [
@@ -35,8 +35,8 @@
     "scroll-into-view-if-needed": "^3.1.0",
     "vue-virtual-scroller": "2.0.0-beta.8",
     "vuedraggable": "^4.1.0",
-    "@aplus-frontend/utils": "1.0.61",
-    "@aplus-frontend/hooks": "1.0.7"
+    "@aplus-frontend/hooks": "1.0.7",
+    "@aplus-frontend/utils": "1.0.61"
   },
   "peerDependencies": {
     "@aplus-frontend/antdv": "^1.1.12",

package/theme/ap-descriptions/ap-descriptions.css

@@ -55,7 +55,7 @@
   padding-bottom: var(--ap-descriptions-item-padding-bottom, 16px);
 }
 .aplus-ap-descriptions .ant-descriptions th.ant-descriptions-item {
-  padding-bottom: 8px;
+  padding-bottom: 4px;
 }
 .aplus-ap-descriptions .ant-descriptions .ant-descriptions-row:last-child .ant-descriptions-item {
   padding-bottom: var(--ap-descriptions-last-row-item-padding-bottom, 0px);

package/theme/ap-descriptions/ap-descriptions.less

@@ -19,7 +19,7 @@
     }
     th {
       &.ant-descriptions-item {
-        padding-bottom: 8px;
+        padding-bottom: 4px;
       }
     }
     // 最后一个 item 的 padding-bottom 为 0

package/theme/ap-draggable-grid/ap-draggable-grid.css

@@ -49,20 +49,24 @@
   grid-template-columns: repeat(24, 1fr);
   /* 固定24列布局 */
   width: 100%;
-  padding: 20px;
   box-sizing: border-box;
 }
 .aplus-ap-draggable-grid__item {
   background: #fff;
-  border-radius: 8px;
+  border-radius: 4px;
   display: flex;
   align-items: center;
   justify-content: center;
-  transition: all 0.3s ease;
   overflow: hidden;
+  transition: all 0.3s ease;
+}
+.aplus-ap-draggable-grid--canDrag:hover {
+  border: 1px solid var(--ap-color-primary);
 }
 .aplus-ap-draggable-grid--dragging {
   cursor: move;
+  z-index: 100;
+  opacity: 0.8;
 }
 .aplus-ap-draggable-grid__dragging {
   opacity: 0.5;
@@ -70,8 +74,7 @@
   z-index: 999;
 }
 .aplus-ap-draggable-grid__overlay {
-  background: #94bff8;
-  border: 2px dashed #e0ebfa;
+  border: 1px solid var(--ap-color-primary);
 }
 .aplus-ap-draggable-grid-loading {
   display: flex;

package/theme/ap-draggable-grid/ap-draggable-grid.less

@@ -5,19 +5,26 @@
   display: grid;
   grid-template-columns: repeat(24, 1fr); /* 固定24列布局 */
   width: 100%;
-  padding: 20px;
   box-sizing: border-box;
   &__item{
     background: #fff;
-    border-radius: 8px;
+    border-radius: 4px;
     display: flex;
     align-items: center;
     justify-content: center;
     transition: all 0.3s ease;
     overflow: hidden;
+    transition: all 0.3s ease,
+  }
+  &--canDrag {
+    &:hover{
+      border: 1px solid var(--ap-color-primary);
+    }
   }
   &--dragging {
     cursor: move;
+    z-index: 100;
+    opacity: 0.8;
   }
   &__dragging {
     opacity: 0.5;
@@ -25,8 +32,7 @@
     z-index: 999;
   }
   &__overlay {
-    background: #94bff8;
-    border: 2px dashed #e0ebfa;
+    border: 1px solid var(--ap-color-primary);
   }
 });
 .b('ap-draggable-grid-loading',{