@aplus-frontend/ui 6.19.0 → 6.20.0

package/es/src/business/ap-draggable-grid/constans.mjs

@@ -13,7 +13,7 @@ const e = () => ({
   },
   gridItemHeight: {
     type: Number,
-    default: 300
+    default: 100
   },
   gridItemShadow: {
     type: String,

package/es/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/es/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/es/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/es/src/business/ap-draggable-grid/utils/sortItemsByRowAndCol.mjs

@@ -0,0 +1,14 @@
+function e(c) {
+  const w = [...c].sort((o, s) => o.row - s.row), r = {};
+  w.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;
+}
+export {
+  e as sortItemsByRowAndCol
+};

package/es/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.19.0";
+declare const _default: "6.20.0";
 export default _default;

package/es/src/version.mjs

@@ -1,4 +1,4 @@
-const e = "6.19.0";
+const e = "6.20.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"),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;
+"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,onCurrentRowChange: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-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/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/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.19.0";
+declare const _default: "6.20.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.19.0";exports.default=e;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="6.20.0";exports.default=e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "6.19.0",
+  "version": "6.20.0",
   "main": "./lib/index.js",
   "type": "module",
   "files": [
@@ -35,15 +35,15 @@
     "scroll-into-view-if-needed": "^3.1.0",
     "vue-virtual-scroller": "2.0.0-beta.8",
     "vuedraggable": "^4.1.0",
-    "@aplus-frontend/hooks": "1.0.7",
-    "@aplus-frontend/utils": "1.0.61"
+    "@aplus-frontend/utils": "1.0.61",
+    "@aplus-frontend/hooks": "1.0.7"
   },
   "peerDependencies": {
     "@aplus-frontend/antdv": "^1.2.0",
     "@aplus-frontend/icon": "^1.2.6",
     "@aplus-frontend/oss": "^1.1.2",
     "vue": "^3.5.14",
-    "vxe-table": "4.11.29"
+    "vxe-table": "^4.13.37"
   },
   "devDependencies": {
     "@aplus-frontend/antdv": "^1.2.0",

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

@@ -57,8 +57,9 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  transition: all 0.5s ease;
   overflow: hidden;
-  transition: all 0.3s ease;
+  box-sizing: border-box;
 }
 .aplus-ap-draggable-grid--canDrag:hover {
   border: 1px solid var(--ap-color-primary);
@@ -69,8 +70,7 @@
   opacity: 0.8;
 }
 .aplus-ap-draggable-grid__dragging {
-  opacity: 0.5;
-  transform: scale(0.98);
+  opacity: 0;
   z-index: 999;
 }
 .aplus-ap-draggable-grid__overlay {

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

@@ -12,9 +12,9 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    transition: all 0.3s ease;
+    transition: all 0.5s ease;
     overflow: hidden;
-    transition: all 0.3s ease,
+    box-sizing: border-box;
   }
   &--canDrag {
     &:hover{
@@ -27,8 +27,7 @@
     opacity: 0.8;
   }
   &__dragging {
-    opacity: 0.5;
-    transform: scale(0.98);
+    opacity: 0;
     z-index: 999;
   }
   &__overlay {

package/theme/ap-tag/ap-tag.css

@@ -47,13 +47,14 @@
 .aplus-tag-wrapper {
   text-wrap: nowrap;
   white-space: nowrap;
-  display: inline-block;
-  width: 100%;
+  display: inline-flex;
+  max-width: 100%;
 }
 .aplus-tag-wrapper .aplus-tag-inner-wrapper {
-  display: inline-block;
   border-radius: 4px;
   box-sizing: border-box;
+  overflow: hidden;
+  text-overflow: ellipsis;
   width: 100%;
 }
 .aplus-tag-wrapper .aplus-tag-inner-wrapper--large {

package/theme/ap-tag/ap-tag.less

@@ -4,13 +4,14 @@
     &-wrapper {
       text-wrap: nowrap;
       white-space: nowrap;
-      display: inline-block;
-      width: 100%;
+      display: inline-flex;
+      max-width: 100%;
     }
     &-wrapper &-inner-wrapper {
-      display: inline-block;
       border-radius: 4px;
       box-sizing: border-box;
+      overflow: hidden;
+      text-overflow: ellipsis;
       width: 100%;
       
       &--large {

package/theme/index.css

@@ -2339,13 +2339,14 @@ div.aplus-ap-info-layout-admin__header-shadow.aplus-ap-info-layout-admin__sticky
 .aplus-tag-wrapper {
   text-wrap: nowrap;
   white-space: nowrap;
-  display: inline-block;
-  width: 100%;
+  display: inline-flex;
+  max-width: 100%;
 }
 .aplus-tag-wrapper .aplus-tag-inner-wrapper {
-  display: inline-block;
   border-radius: 4px;
   box-sizing: border-box;
+  overflow: hidden;
+  text-overflow: ellipsis;
   width: 100%;
 }
 .aplus-tag-wrapper .aplus-tag-inner-wrapper--large {
@@ -4118,8 +4119,9 @@ div.aplus-ap-info-layout-admin__header-shadow.aplus-ap-info-layout-admin__sticky
   display: flex;
   align-items: center;
   justify-content: center;
+  transition: all 0.5s ease;
   overflow: hidden;
-  transition: all 0.3s ease;
+  box-sizing: border-box;
 }
 .aplus-ap-draggable-grid--canDrag:hover {
   border: 1px solid var(--ap-color-primary);
@@ -4130,8 +4132,7 @@ div.aplus-ap-info-layout-admin__header-shadow.aplus-ap-info-layout-admin__sticky
   opacity: 0.8;
 }
 .aplus-ap-draggable-grid__dragging {
-  opacity: 0.5;
-  transform: scale(0.98);
+  opacity: 0;
   z-index: 999;
 }
 .aplus-ap-draggable-grid__overlay {