@aplus-frontend/ui 6.26.1 → 6.26.2

package/es/src/ap-pro-card/components/card/index.vue2.mjs

@@ -1,15 +1,15 @@
-import { defineComponent as re, useSlots as ae, ref as V, useModel as ne, watch as ie, computed as u, createVNode as d, Fragment as y, createElementBlock as B, openBlock as i, mergeProps as se, createCommentVNode as C, createElementVNode as de, normalizeStyle as I, normalizeClass as g, unref as h, createBlock as p, renderSlot as F, resolveDynamicComponent as v, withCtx as H, mergeModels as ue } from "vue";
-import { Spin as ce, Tooltip as fe } from "@aplus-frontend/antdv";
-import { QuestionCircleOutlined as pe } from "@ant-design/icons-vue";
+import { defineComponent as ae, useSlots as ne, ref as V, useModel as ie, watch as se, computed as u, createVNode as d, Fragment as y, createElementBlock as C, openBlock as i, mergeProps as de, createCommentVNode as g, createElementVNode as ue, normalizeStyle as I, normalizeClass as h, unref as B, createBlock as f, renderSlot as F, resolveDynamicComponent as b, withCtx as H, mergeModels as ce } from "vue";
+import { Spin as pe, Tooltip as fe } from "@aplus-frontend/antdv";
+import { QuestionCircleOutlined as ye } from "@ant-design/icons-vue";
 import "../../../config-provider/index.mjs";
 import { mergeClass as A } from "../../../editable-table/utils.mjs";
-import ye from "@aplus-frontend/antdv/es/_util/hooks/useBreakpoint";
+import be from "@aplus-frontend/antdv/es/_util/hooks/useBreakpoint";
 import { IconApAdFillDown as ve } from "@aplus-frontend/icon";
 import { useNamespace as xe } from "../../../config-provider/hooks/use-namespace.mjs";
-const ke = /* @__PURE__ */ re({
+const Ae = /* @__PURE__ */ ae({
   name: "ApProCard",
   __name: "index",
-  props: /* @__PURE__ */ ue({
+  props: /* @__PURE__ */ ce({
     headStyle: {},
     bodyStyle: {},
     actionsStyle: {},
@@ -82,22 +82,22 @@ const ke = /* @__PURE__ */ re({
   }),
   emits: ["update:collapsed"],
   setup(O) {
-    const t = O, r = ae(), x = V(t.defaultCollapsed), G = ne(O, "collapsed");
-    ie(() => G.value, (e) => {
-      e !== void 0 && (x.value = e);
+    const t = O, r = ne(), v = V(t.defaultCollapsed), G = ie(O, "collapsed");
+    se(() => G.value, (e) => {
+      e !== void 0 && (v.value = e);
     }, {
       immediate: !0
     });
     const Q = () => {
-      x.value = !x.value;
+      v.value = !v.value;
     }, {
       b: c
-    } = xe("pro-card"), m = ["xxxl", "xxl", "xl", "lg", "md", "sm", "xs"], b = ye(), w = (e, o) => e ? o : {}, T = (e) => {
+    } = xe("pro-card"), S = ["xxxl", "xxl", "xl", "lg", "md", "sm", "xs"], x = be(), w = (e, o) => e ? o : {}, T = (e) => {
       const o = [0, 0];
       return (Array.isArray(e) ? e : [e, 0]).forEach((n, l) => {
         if (typeof n == "object")
-          for (let s = 0; s < m.length; s += 1) {
-            const f = m[s];
+          for (let s = 0; s < S.length; s += 1) {
+            const p = S[s];
             if ({
               lg: !0,
               md: !0,
@@ -106,9 +106,9 @@ const ke = /* @__PURE__ */ re({
               xs: !1,
               xxl: !1,
               xxxl: !1,
-              ...b == null ? void 0 : b.value
-            }[f] && n[f] !== void 0) {
-              o[l] = n[f];
+              ...x == null ? void 0 : x.value
+            }[p] && n[p] !== void 0) {
+              o[l] = n[p];
               break;
             }
           }
@@ -118,8 +118,8 @@ const ke = /* @__PURE__ */ re({
     }, q = (e) => {
       let o = e;
       if (typeof e == "object")
-        for (let n = 0; n < m.length; n += 1) {
-          const l = m[n], s = {
+        for (let n = 0; n < S.length; n += 1) {
+          const l = S[n], s = {
             lg: !0,
             md: !0,
             sm: !0,
@@ -127,7 +127,7 @@ const ke = /* @__PURE__ */ re({
             xs: !1,
             xxl: !1,
             xxxl: !1,
-            ...b == null ? void 0 : b.value
+            ...x == null ? void 0 : x.value
           };
           if (s != null && s[l] && (e == null ? void 0 : e[l]) !== void 0) {
             o = e[l];
@@ -153,7 +153,7 @@ const ke = /* @__PURE__ */ re({
     }), W = u(() => {
       var e;
       return d(y, null, [t.actions || ((e = r.actions) == null ? void 0 : e.call(r))]);
-    }), X = u(() => t.loading === !0 ? d(ce, {
+    }), X = u(() => t.loading === !0 ? d(pe, {
       style: {
         width: "100%",
         height: "100%",
@@ -161,18 +161,17 @@ const ke = /* @__PURE__ */ re({
         alignItems: "center",
         justifyContent: "center"
       }
-    }, null) : d(y, null, [t.loading])), $ = u(() => {
+    }, null) : d(y, null, [t.loading])), $ = u(() => t.collapsible && G.value === void 0), Y = () => {
       var e;
-      if (t.collapsible && G.value === void 0)
-        return t.collapsibleIconRender ? (e = t.collapsibleIconRender) == null ? void 0 : e.call(t, {
-          collapsed: x.value
-        }) : d(y, null, [d(ve, {
-          class: c("collapsible-icon"),
-          style: {
-            transform: x.value ? "rotate(-90deg)" : "rotate(0deg)"
-          }
-        }, null)]);
-    }), P = (e, o = []) => {
+      return t.collapsibleIconRender ? (e = t.collapsibleIconRender) == null ? void 0 : e.call(t, {
+        collapsed: v.value
+      }) : d(y, null, [d(ve, {
+        class: c("collapsible-icon"),
+        style: {
+          transform: v.value ? "rotate(-90deg)" : "rotate(0deg)"
+        }
+      }, null)]);
+    }, P = (e, o = []) => {
       if ((e == null ? void 0 : e.type) === Symbol.for("v-fgt")) {
         const a = Array.isArray(e == null ? void 0 : e.children) ? e == null ? void 0 : e.children : [e == null ? void 0 : e.children];
         if (a != null && a.length)
@@ -181,24 +180,24 @@ const ke = /* @__PURE__ */ re({
       } else
         e && o.push(e);
       return o;
-    }, Y = () => {
+    }, Z = () => {
       var o, a, n;
       const e = (o = r.default) == null ? void 0 : o.call(r);
       return M(!1), d(y, null, [(n = (a = e == null ? void 0 : e.reduce((l, s) => {
-        const f = P(s);
-        return [...l, ...f];
-      }, [])) == null ? void 0 : a.filter((l) => l.type !== Symbol.for("v-cmt"))) == null ? void 0 : n.map((l, s, f) => {
+        const p = P(s);
+        return [...l, ...p];
+      }, [])) == null ? void 0 : a.filter((l) => l.type !== Symbol.for("v-cmt"))) == null ? void 0 : n.map((l, s, p) => {
         var z, D, R;
         if (l && typeof l == "object" && "type" in l && ((z = l.type) == null ? void 0 : z.isProCard) === !0) {
           M(!0);
-          const te = ((D = l == null ? void 0 : l.props) == null ? void 0 : D.colSpan) || ((R = l == null ? void 0 : l.props) == null ? void 0 : R["col-span"]) || {}, {
-            span: S,
-            colSpanStyle: le
-          } = q(te), k = c("col"), oe = A(`${k}`, [typeof S == "number" && S >= 0 && S <= 24 ? `${k}-span-${S}` : void 0, t.split === "horizontal" && s !== f.length - 1 ? `${k}-split-horizontal` : void 0, t.split === "vertical" && s !== f.length - 1 ? `${k}-split-vertical` : void 0].filter(Boolean)), [j, E] = J.value;
+          const le = ((D = l == null ? void 0 : l.props) == null ? void 0 : D.colSpan) || ((R = l == null ? void 0 : l.props) == null ? void 0 : R["col-span"]) || {}, {
+            span: m,
+            colSpanStyle: oe
+          } = q(le), k = c("col"), re = A(`${k}`, [typeof m == "number" && m >= 0 && m <= 24 ? `${k}-span-${m}` : void 0, t.split === "horizontal" && s !== p.length - 1 ? `${k}-split-horizontal` : void 0, t.split === "vertical" && s !== p.length - 1 ? `${k}-split-vertical` : void 0].filter(Boolean)), [j, E] = J.value;
           return d("div", {
-            class: oe,
+            class: re,
             style: {
-              ...le,
+              ...oe,
               ...w(j > 0, {
                 paddingInlineStart: `${j / 2}px`,
                 paddingInlineEnd: `${j / 2}px`
@@ -213,61 +212,63 @@ const ke = /* @__PURE__ */ re({
         }
         return l;
       })]);
-    }, Z = u(() => {
+    }, _ = u(() => {
       const e = c();
-      return A(`${e}`, [t.bordered ? `${e}-border` : void 0, t.boxShadow ? `${e}-box-shadow` : void 0, N.value ? `${e}-contain-card` : void 0, t.loading ? `${e}-loading` : void 0, t.split === "vertical" || t.split === "horizontal" ? `${e}-split` : void 0, t.ghost ? `${e}-ghost` : void 0, t.hoverable ? `${e}-hoverable` : void 0, t.type ? `${e}-type-${t.type}` : void 0, x.value ? `${e}-collapsed` : void 0].filter(Boolean));
-    }), _ = u(() => {
+      return A(`${e}`, [t.bordered ? `${e}-border` : void 0, t.boxShadow ? `${e}-box-shadow` : void 0, N.value ? `${e}-contain-card` : void 0, t.loading ? `${e}-loading` : void 0, t.split === "vertical" || t.split === "horizontal" ? `${e}-split` : void 0, t.ghost ? `${e}-ghost` : void 0, t.hoverable ? `${e}-hoverable` : void 0, t.type ? `${e}-type-${t.type}` : void 0, v.value ? `${e}-collapsed` : void 0].filter(Boolean));
+    }), ee = u(() => {
       const e = c("header");
       return A(`${e}`, [t.headerBordered || t.type === "inner" ? `${e}-border` : void 0, $.value ? `${e}-collapsible` : void 0].filter(Boolean));
-    }), ee = u(() => {
+    }), te = u(() => {
       const e = c("body");
       return A(`${e}`, [t.layout === "center" ? `${e}-center` : void 0, t.split === "horizontal" || t.direction === "column" ? `${e}-direction-column` : void 0, t.wrap && N.value ? `${e}-wrap` : void 0].filter(Boolean));
     });
-    return (e, o) => (i(), B("div", se({
-      class: Z.value
+    return (e, o) => (i(), C("div", de({
+      class: _.value
     }, {
       ...e.$attrs
-    }), [t.title || r.title || t.extra || r.extra || $.value ? (i(), B("div", {
+    }), [t.title || r.title || t.extra || r.extra || $.value ? (i(), C("div", {
       key: 0,
-      class: g(_.value),
+      class: h(ee.value),
       style: I({
         ...t.headStyle
       }),
       onClick: o[0] || (o[0] = () => {
         $.value && Q();
       })
-    }, [t.title || r.title || $.value ? (i(), B("div", {
+    }, [t.title || r.title || $.value ? (i(), C("div", {
       key: 0,
-      class: g(h(c)("header-title"))
-    }, [(i(), p(v($.value))), F(e.$slots, "title", {}, () => [(i(), p(v(K.value)))]), t.tooltip ? (i(), p(h(fe), {
+      class: h(B(c)("header-title"))
+    }, [$.value ? (i(), f(b(Y()), {
       key: 0
+    })) : g("", !0), F(e.$slots, "title", {}, () => [(i(), f(b(K.value)))]), t.tooltip ? (i(), f(B(fe), {
+      key: 1
     }, {
-      title: H(() => [(i(), p(v(L.value)))]),
-      default: H(() => [d(h(pe), {
-        class: g(h(c)("header-title-tooltip"))
+      title: H(() => [(i(), f(b(L.value)))]),
+      default: H(() => [d(B(ye), {
+        class: h(B(c)("header-title-tooltip"))
       }, null, 8, ["class"])]),
       _: 1
-    })) : C("", !0)], 2)) : C("", !0), t.extra || r.extra ? (i(), B("div", {
+    })) : g("", !0)], 2)) : g("", !0), t.extra || r.extra ? (i(), C("div", {
       key: 1,
-      class: g(h(c)("header-extra"))
-    }, [F(e.$slots, "extra", {}, () => [(i(), p(v(U.value)))])], 2)) : C("", !0)], 6)) : C("", !0), de("div", {
-      class: g(ee.value),
+      class: h(B(c)("header-extra"))
+    }, [F(e.$slots, "extra", {}, () => [(i(), f(b(U.value)))])], 2)) : g("", !0)], 6)) : g("", !0), ue("div", {
+      class: h(te.value),
       style: I({
         ...t.bodyStyle
       })
-    }, [t.loading ? (i(), p(v(X.value), {
+    }, [t.loading ? (i(), f(b(X.value), {
       key: 0
-    })) : (i(), p(v(Y()), {
+    })) : (i(), f(b(Z()), {
       key: 1
-    }))], 6), t.actions || r.actions ? (i(), B("div", {
+    }))], 6), t.actions || r.actions ? (i(), C("div", {
       key: 1,
-      class: g(h(c)("actions")),
+      class: h(B(c)("actions")),
       style: I({
         ...t.actionsStyle
       })
-    }, [(i(), p(v(W.value)))], 6)) : C("", !0)], 16));
+    }, [(i(), f(b(W.value)))], 6)) : g("", !0)], 16));
   }
 });
 export {
-  ke as default
+  Ae as default
 };

package/es/src/ap-pro-card/components/statistic-card/index.vue.d.ts

@@ -25,7 +25,9 @@ declare function __VLS_template(): {
     rootEl: HTMLDivElement;
 };
 type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
-declare const __VLS_component: DefineComponent<ApStatisticCardProps, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ApStatisticCardProps> & Readonly<{}>, {}, {}, {}, {}, string, ComponentProvideOptions, false, {}, HTMLDivElement>;
+declare const __VLS_component: DefineComponent<ApStatisticCardProps, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ApStatisticCardProps> & Readonly<{}>, {
+    collapsed: boolean;
+}, {}, {}, {}, string, ComponentProvideOptions, false, {}, HTMLDivElement>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
 export default _default;
 type __VLS_WithTemplateSlots<T, S> = T & {

package/es/src/ap-pro-card/components/statistic-card/index.vue2.mjs

@@ -1,12 +1,12 @@
-import { defineComponent as w, useSlots as V, computed as o, createVNode as n, mergeProps as x, createBlock as d, openBlock as f, createSlots as z, withCtx as O, createCommentVNode as N, renderSlot as _, resolveDynamicComponent as $, renderList as F, unref as I } from "vue";
+import { defineComponent as w, useSlots as V, computed as o, createVNode as n, mergeProps as x, createBlock as d, openBlock as f, createSlots as z, withCtx as O, createCommentVNode as N, renderSlot as _, resolveDynamicComponent as $, renderList as I, unref as L } from "vue";
 import "../../../config-provider/index.mjs";
 import "../card/index.vue.mjs";
 import "../statistic/index.vue.mjs";
 import { mergeClass as A } from "../../../editable-table/utils.mjs";
-import { omit as L } from "lodash-unified";
-import { useNamespace as R } from "../../../config-provider/hooks/use-namespace.mjs";
-import T from "../statistic/index.vue2.mjs";
-import q from "../card/index.vue2.mjs";
+import { omit as R } from "lodash-unified";
+import { useNamespace as T } from "../../../config-provider/hooks/use-namespace.mjs";
+import q from "../statistic/index.vue2.mjs";
+import E from "../card/index.vue2.mjs";
 const Y = /* @__PURE__ */ w({
   name: "ApStatisticCard",
   __name: "index",
@@ -58,11 +58,10 @@ const Y = /* @__PURE__ */ w({
       type: Boolean
     },
     collapsed: {
-      type: Boolean
-    },
-    collapsibleIconRender: {
-      type: Function
+      type: Boolean,
+      default: void 0
     },
+    collapsibleIconRender: {},
     boxShadow: {
       type: Boolean
     },
@@ -78,7 +77,7 @@ const Y = /* @__PURE__ */ w({
   setup(j) {
     const t = j, e = V(), {
       b: i
-    } = R("statistic-card"), P = o(() => i()), D = o(() => {
+    } = T("statistic-card"), P = o(() => i()), D = o(() => {
       const r = i("chart");
       return A(`${r}`, [t.chartPlacement === "left" ? `${r}-left` : void 0, t.chartPlacement === "right" ? `${r}-right` : void 0].filter(Boolean));
     }), m = o(() => {
@@ -86,7 +85,7 @@ const Y = /* @__PURE__ */ w({
       return A(`${r}`, [t.chartPlacement === "left" || t.chartPlacement === "right" ? `${r}-horizontal` : void 0].filter(Boolean));
     }), k = o(() => i("footer")), l = o(() => {
       var r, s, p, a, y, h, v, b, B, S, g, C;
-      return t.statistic ? n(T, x({
+      return t.statistic ? n(q, x({
         layout: "vertical"
       }, t.statistic, {
         title: ((r = t.statistic) == null ? void 0 : r.title) || ((s = e.statisticTitle) == null ? void 0 : s.call(e)),
@@ -111,7 +110,7 @@ const Y = /* @__PURE__ */ w({
         class: k.value
       }, [t.footer || ((r = e.footer) == null ? void 0 : r.call(e))]) : void 0;
     });
-    return (r, s) => (f(), d(q, x({
+    return (r, s) => (f(), d(E, x({
       class: P.value
     }, {
       ...t
@@ -122,7 +121,7 @@ const Y = /* @__PURE__ */ w({
         key: 1
       })) : N("", !0)]),
       _: 2
-    }, [F(I(L)(e, ["chart", "footer", "description", "default"]), (p, a) => ({
+    }, [I(L(R)(e, ["chart", "footer", "description", "default"]), (p, a) => ({
       name: a,
       fn: O(() => [_(r.$slots, a)])
     }))]), 1040, ["class"]));

package/es/src/business/ap-draggable-grid/ApDraggableGrid.vue2.mjs

@@ -1,44 +1,44 @@
-import { defineComponent as te, ref as T, computed as H, useTemplateRef as ne, watch as ae, toRaw as le, onMounted as se, onUnmounted as ie, createBlock as ue, openBlock as M, unref as G, withCtx as de, createElementVNode as ce, normalizeStyle as q, normalizeClass as z, createElementBlock as U, Fragment as ge, renderList as fe, renderSlot as pe } from "vue";
-import { ApDraggableGridProps as me } from "./constans.mjs";
-import { Spin as we } from "@aplus-frontend/antdv";
+import { defineComponent as ae, ref as T, computed as G, useTemplateRef as ne, watch as le, toRaw as se, onMounted as ie, onUnmounted as ue, createBlock as ce, openBlock as F, unref as L, withCtx as de, createElementVNode as ge, normalizeStyle as z, normalizeClass as U, createElementBlock as V, Fragment as fe, renderList as me, renderSlot as pe } from "vue";
+import { ApDraggableGridProps as we } from "./constans.mjs";
+import { Spin as ve } from "@aplus-frontend/antdv";
 import "../../config-provider/index.mjs";
 import { sortItemsByRowAndCol as D } from "./utils/sortItemsByRowAndCol.mjs";
 import { useNamespace as he } from "../../config-provider/hooks/use-namespace.mjs";
-const ve = ["data-span", "data-index", "data-row", "data-col", "data-height", "data-module", "draggable"], Ee = /* @__PURE__ */ te({
+const ye = ["data-span", "data-index", "data-row", "data-col", "data-height", "data-module", "draggable"], Te = /* @__PURE__ */ ae({
   __name: "ApDraggableGrid",
-  props: me(),
+  props: we(),
   emits: ["onGridListChange"],
-  setup(V, { expose: j, emit: K }) {
-    const g = V, { b: F, e: L, m: Q } = he("ap-draggable-grid"), C = T(!1), R = T(!1), O = H(() => L("item")), P = H(() => L("dragging")), X = H(() => g.customWrapper ? `.${g.customWrapper} .${O.value}:not(.${P.value})` : `.${O.value}:not(.${P.value})`), Y = K, f = ne("gridContainer"), I = T([]);
-    ae(
-      () => g.gridList,
+  setup(j, { expose: K, emit: Q }) {
+    const c = j, { b: R, e: A, m: X } = he("ap-draggable-grid"), C = T(!1), O = T(!1), P = G(() => A("item")), W = G(() => A("dragging")), x = G(() => A("overlay")), Y = G(() => c.customWrapper ? `.${c.customWrapper} .${P.value}:not(.${W.value})` : `.${P.value}:not(.${W.value})`), Z = Q, f = ne("gridContainer"), E = T([]);
+    le(
+      () => c.gridList,
       (e) => {
-        Array.isArray(e) && s(e);
+        Array.isArray(e) && i(e);
       },
       { deep: !0, immediate: !0 }
     );
-    function s(e) {
-      const t = [...e].sort((o, i) => o.row - i.row);
-      I.value = t.map((o) => ({
+    function i(e) {
+      const t = [...e].sort((o, u) => o.row - u.row);
+      E.value = t.map((o) => ({
         ...o
-      })), Y(
+      })), Z(
         "onGridListChange",
-        JSON.parse(JSON.stringify(I.value))
+        JSON.parse(JSON.stringify(E.value))
       );
     }
-    const Z = (e) => ({
+    const ee = (e) => ({
       gridColumn: `${e.col} / span ${e.span}`,
       gridRow: e.row,
-      minHeight: e.showHeight ? e.showHeight + "px" : `${g.gridItemHeight}px`,
-      height: e.showHeight ? e.showHeight + "px" : `${g.gridItemHeight}px`,
-      boxShadow: g.gridItemShadow ? g.gridItemShadow : "none"
+      minHeight: e.showHeight ? e.showHeight + "px" : `${c.gridItemHeight}px`,
+      height: e.showHeight ? e.showHeight + "px" : `${c.gridItemHeight}px`,
+      boxShadow: c.gridItemShadow ? c.gridItemShadow : "none"
     });
     async function k() {
-      if (s([]), typeof g.request == "function")
+      if (i([]), typeof c.request == "function")
         try {
           C.value = !0;
-          const e = await g.request();
-          Array.isArray(e) ? (console.log("ApDraggableGrid: 请求到的布局数据:", e), s(e)) : console.warn(
+          const e = await c.request();
+          Array.isArray(e) ? (console.log("ApDraggableGrid: 请求到的布局数据:", e), i(e)) : console.warn(
             "ApDraggableGrid: 请求函数必须返回一个符合 ApDraggableGridItemBase 数组的格式"
           );
         } catch (e) {
@@ -47,11 +47,11 @@ const ve = ["data-span", "data-index", "data-row", "data-col", "data-height", "d
           C.value = !1;
         }
     }
-    let N = T(null), S = T(null), w = null, A = !1, v = null;
-    const W = (e) => {
-      if (!A && (A = !0, e.dataTransfer && e.target instanceof HTMLElement)) {
+    let $ = T(null), N = T(null), w = null, H = !1, h = null;
+    const J = (e) => {
+      if (!H && (H = !0, e.dataTransfer && e.target instanceof HTMLElement)) {
         const t = e.target.dataset;
-        e.dataTransfer.setData("text/plain", t.module), e.dataTransfer.effectAllowed = "move", N.value = {
+        e.dataTransfer.setData("text/plain", t.module), e.dataTransfer.effectAllowed = "move", $.value = {
           span: Number(t.span),
           col: Number(t.col),
           row: Number(t.row),
@@ -60,16 +60,20 @@ const ve = ["data-span", "data-index", "data-row", "data-col", "data-height", "d
           index: Number(t.index)
         }, w = e.target, w.style.opacity = "0";
       }
-    }, J = (e) => {
-      if (e.preventDefault(), v && clearTimeout(v), v = window.setTimeout(() => {
-        A = !1, v = null;
+    }, q = (e) => {
+      if (e.preventDefault(), h && clearTimeout(h), h = window.setTimeout(() => {
+        H = !1, h = null;
       }, 300), e.dataTransfer && e.target instanceof HTMLElement) {
         const t = e.target.closest(
-          X.value
+          Y.value
         );
         if (!t) return;
         const o = t.dataset;
-        S.value = {
+        document.querySelectorAll(
+          `.${c.customWrapper} div[data-row="${o.row}"]`
+        ).forEach((s) => {
+          s.classList.add(x.value);
+        }), N.value = {
           span: Number(o.span),
           col: Number(o.col),
           row: Number(o.row),
@@ -79,110 +83,112 @@ const ve = ["data-span", "data-index", "data-row", "data-col", "data-height", "d
         };
       }
     }, B = (e) => {
-      e.preventDefault(), w && (w.style.opacity = "1", w = null), ee(N, S) && oe(N, S), N.value = null, S.value = null, R.value = !1;
+      e.preventDefault(), w && (w.style.opacity = "1", w = null), oe($, N) && re($, N), document.querySelectorAll(`.${x.value}`).forEach((t) => {
+        t.classList.remove(x.value);
+      }), $.value = null, N.value = null, O.value = !1;
     }, _ = () => {
-      w && (w.style.opacity = "1", w = null), N.value = null, S.value = null, R.value = !1;
-    }, ee = (e, t) => {
-      const { span: o, module: i } = e.value, { span: u, module: d } = t.value;
-      return i === d && o === u ? (console.log("如果自己放在自己之上不能交换数据"), !1) : !0;
+      w && (w.style.opacity = "1", w = null), $.value = null, N.value = null, O.value = !1;
     }, oe = (e, t) => {
+      const { span: o, module: u } = e.value, { span: s, module: d } = t.value;
+      return u === d && o === s ? (console.log("如果自己放在自己之上不能交换数据"), !1) : !0;
+    }, re = (e, t) => {
       if (!e.value || !t.value) return;
       const {
         span: o,
-        col: i,
-        row: u,
+        col: u,
+        row: s,
         module: d,
-        height: $,
-        index: a
+        height: S,
+        index: n
       } = e.value, {
         span: b,
-        col: h,
-        row: p,
-        module: re,
-        height: x,
-        index: c
+        col: v,
+        row: m,
+        module: te,
+        height: M,
+        index: g
       } = t.value;
-      if (u === p && i === h && o === b && $ === x && d === re) {
+      if (s === m && u === v && o === b && S === M && d === te) {
         console.log("从同一位置拖拽到同一位置,不做任何操作");
         return;
       }
-      let r = [...le(I.value)];
-      const E = JSON.parse(JSON.stringify(r));
-      if (u === p)
-        if (a > c) {
-          console.log("", "从右向左拖拽"), console.log(a, c), console.log(a - c), a - c === 1 ? (r[c].col = o + h, r[a].col = h) : (r.forEach((m, n) => {
-            n < a && n >= c && (m.col += b);
-          }), r[a].col = h);
+      let r = [...se(E.value)];
+      const I = JSON.parse(JSON.stringify(r));
+      if (s === m)
+        if (n > g) {
+          console.log("", "从右向左拖拽"), console.log(n, g), console.log(n - g), n - g === 1 ? (r[g].col = o + v, r[n].col = v) : (r.forEach((p, a) => {
+            a < n && a >= g && (p.col += b);
+          }), r[n].col = v);
           const l = D(r);
           if (!y(l)) {
             console.warn("交换后的布局无效，恢复原始布局");
             return;
           }
-          s(l);
+          i(l);
           return;
         } else {
-          console.log(a, c), console.log("", "从左向右拖拽"), c - a === 1 ? (r[a].col = b + 1, r[c].col = i) : (r.forEach((m, n) => {
-            n > a && n <= c && (m.col -= b);
-          }), r[a].col = h);
+          console.log(n, g), console.log("", "从左向右拖拽"), g - n === 1 ? (r[n].col = b + 1, r[g].col = u) : (r.forEach((p, a) => {
+            a > n && a <= g && (p.col -= b);
+          }), r[n].col = v);
           const l = D(r);
           if (console.log("交换后的布局:", l), !y(l)) {
-            console.warn("交换后的布局无效，恢复原始布局"), s(E);
+            console.warn("交换后的布局无效，恢复原始布局"), i(I);
             return;
           }
-          s(l);
+          i(l);
           return;
         }
-      else if (p < u) {
+      else if (m < s) {
         if (console.log("从下向上拖拽"), o === 24) {
           const l = [];
-          for (let n = p; n < u; n++)
-            l.push(n);
-          r.forEach((n) => {
-            l.includes(n.row) && (n.row += 1);
-          }), r[a].row = p;
-          const m = D(r);
-          if (!y(m)) {
-            console.warn("交换后的布局无效，恢复原始布局"), s(E);
+          for (let a = m; a < s; a++)
+            l.push(a);
+          r.forEach((a) => {
+            l.includes(a.row) && (a.row += 1);
+          }), r[n].row = m;
+          const p = D(r);
+          if (!y(p)) {
+            console.warn("交换后的布局无效，恢复原始布局"), i(I);
             return;
           }
-          s(m);
+          i(p);
           return;
         }
-        if (o === b && $ === x) {
-          r[a].row = p, r[a].col = h, r[c].row = u, r[c].col = i;
+        if (o === b && S === M) {
+          r[n].row = m, r[n].col = v, r[g].row = s, r[g].col = u;
           const l = D(r);
           if (!y(l)) {
-            console.warn("交换后的布局无效，恢复原始布局"), s(E);
+            console.warn("交换后的布局无效，恢复原始布局"), i(I);
             return;
           }
-          s(l);
+          i(l);
           return;
         }
       } else {
         if (console.log("从上向下拖拽"), o === 24) {
           console.log("如果拖拽元素跨度为24", "从上向下拖拽");
           const l = [];
-          for (let n = u + 1; n <= p; n++)
-            l.push(n);
-          r.forEach((n) => {
-            l.includes(n.row) && (n.row -= 1);
-          }), r[a].row = p;
-          const m = D(r);
-          if (!y(m)) {
-            console.warn("交换后的布局无效，恢复原始布局"), s(E);
+          for (let a = s + 1; a <= m; a++)
+            l.push(a);
+          r.forEach((a) => {
+            l.includes(a.row) && (a.row -= 1);
+          }), r[n].row = m;
+          const p = D(r);
+          if (!y(p)) {
+            console.warn("交换后的布局无效，恢复原始布局"), i(I);
             return;
           }
-          s(m);
+          i(p);
           return;
         }
-        if (o === b && $ === x) {
-          r[a].row = p, r[a].col = h, r[c].row = u, r[c].col = i;
+        if (o === b && S === M) {
+          r[n].row = m, r[n].col = v, r[g].row = s, r[g].col = u;
           const l = D(r);
           if (!y(l)) {
-            console.warn("交换后的布局无效，恢复原始布局"), s(E);
+            console.warn("交换后的布局无效，恢复原始布局"), i(I);
             return;
           }
-          s(l);
+          i(l);
           return;
         }
       }
@@ -192,14 +198,14 @@ const ve = ["data-span", "data-index", "data-row", "data-col", "data-height", "d
         t[o.row] || (t[o.row] = []), t[o.row].push(o);
       });
       for (const o in t) {
-        const i = t[o].sort((d, $) => d.col - $.col);
-        let u = 1;
-        for (const d of i) {
-          if (d.col < u)
+        const u = t[o].sort((d, S) => d.col - S.col);
+        let s = 1;
+        for (const d of u) {
+          if (d.col < s)
             return console.warn(
-              `行 ${o} 中的元素重叠: 元素 ${d.module} 在列 ${d.col}, 但当前列已经是 ${u}`
+              `行 ${o} 中的元素重叠: 元素 ${d.module} 在列 ${d.col}, 但当前列已经是 ${s}`
             ), !1;
-          if (u = d.col + d.span, u > 25)
+          if (s = d.col + d.span, s > 25)
             return console.warn(
               `行 ${o} 中的元素超出界限: 元素 ${d.module} 在列 ${d.col} 跨度 ${d.span}`
             ), !1;
@@ -207,48 +213,48 @@ const ve = ["data-span", "data-index", "data-row", "data-col", "data-height", "d
       }
       return !0;
     };
-    return se(async () => {
-      await k(), !g.disableDrag && f.value && (f.value.addEventListener("dragstart", W), f.value.addEventListener("dragover", J), f.value.addEventListener("drop", B), f.value.addEventListener("dragend", _));
-    }), ie(() => {
-      f.value && (f.value.removeEventListener("dragstart", W), f.value.removeEventListener("dragover", J), f.value.removeEventListener("drop", B), f.value.removeEventListener("dragend", _), v && clearTimeout(v));
-    }), j({
+    return ie(async () => {
+      await k(), !c.disableDrag && f.value && (f.value.addEventListener("dragstart", J), f.value.addEventListener("dragover", q), f.value.addEventListener("drop", B), f.value.addEventListener("dragend", _));
+    }), ue(() => {
+      f.value && (f.value.removeEventListener("dragstart", J), f.value.removeEventListener("dragover", q), f.value.removeEventListener("drop", B), f.value.removeEventListener("dragend", _), h && clearTimeout(h));
+    }), K({
       setGridItems: (e) => {
-        s(e);
+        i(e);
       },
-      getGridItems: () => JSON.parse(JSON.stringify(I.value)),
+      getGridItems: () => JSON.parse(JSON.stringify(E.value)),
       refreshGrid: () => {
         (async () => {
           await k();
         })();
       }
-    }), (e, t) => (M(), ue(G(we), { spinning: C.value }, {
+    }), (e, t) => (F(), ce(L(ve), { spinning: C.value }, {
       default: de(() => [
-        ce("div", {
+        ge("div", {
           ref_key: "gridContainer",
           ref: f,
-          class: z([C.value ? G(F)("loading") : G(F)(), g.customWrapper]),
-          style: q({
+          class: U([C.value ? L(R)("loading") : L(R)(), c.customWrapper]),
+          style: z({
             width: typeof e.gridWidth == "number" ? `${e.gridWidth}px` : e.gridWidth,
             gap: `${e.gapWidth}px`
           })
         }, [
-          (M(!0), U(ge, null, fe(I.value, (o, i) => (M(), U("div", {
-            key: i,
-            class: z([G(L)("item"), g.disableDrag ? "" : G(Q)("canDrag")]),
+          (F(!0), V(fe, null, me(E.value, (o, u) => (F(), V("div", {
+            key: u,
+            class: U([L(A)("item"), c.disableDrag ? "" : L(X)("canDrag")]),
             "data-span": o.span,
-            "data-index": i,
+            "data-index": u,
             "data-row": o.row,
             "data-col": o.col,
             "data-height": o.height,
             "data-module": o.module,
-            style: q([Z(o)]),
-            draggable: !g.disableDrag
+            style: z([ee(o)]),
+            draggable: !c.disableDrag
           }, [
             pe(e.$slots, "item", {
               item: o,
-              index: i
+              index: u
             })
-          ], 14, ve))), 128))
+          ], 14, ye))), 128))
         ], 6)
       ]),
       _: 3
@@ -256,5 +262,5 @@ const ve = ["data-span", "data-index", "data-row", "data-col", "data-height", "d
   }
 });
 export {
-  Ee as default
+  Te as default
 };

package/es/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.26.1";
+declare const _default: "6.26.2";
 export default _default;

package/es/src/version.mjs

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

package/lib/src/ap-pro-card/components/card/index.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),w=require("@aplus-frontend/antdv"),J=require("@ant-design/icons-vue");require("../../../config-provider/index.js");const g=require("../../../editable-table/utils.js"),K=require("@aplus-frontend/antdv/es/_util/hooks/useBreakpoint"),L=require("@aplus-frontend/icon"),U=require("../../../config-provider/hooks/use-namespace.js"),W=e.defineComponent({name:"ApProCard",__name:"index",props:e.mergeModels({headStyle:{},bodyStyle:{},actionsStyle:{},headerBordered:{type:Boolean,default:!1},title:{type:[Object,String,Number,Boolean,null,Array]},tooltip:{type:[Object,String,Number,Boolean,null,Array]},extra:{type:[Object,String,Number,Boolean,null,Array]},layout:{},type:{},direction:{},wrap:{type:Boolean,default:!1},loading:{type:[Boolean,Object,String,Number,null,Array]},colSpan:{},colStyle:{},gutter:{default:0},actions:{type:[Object,String,Number,Boolean,null,Array]},split:{},bordered:{type:Boolean,default:!1},hoverable:{type:Boolean,default:!1},ghost:{type:Boolean,default:!1},collapsible:{type:Boolean,default:!1},defaultCollapsed:{type:Boolean,default:!1},collapsed:{type:Boolean},collapsibleIconRender:{},boxShadow:{type:Boolean,default:!1}},{collapsed:{type:Boolean,default:void 0},collapsedModifiers:{}}),emits:["update:collapsed"],setup(h){const o=h,n=e.useSlots(),u=e.ref(o.defaultCollapsed),S=e.useModel(h,"collapsed");e.watch(()=>S.value,t=>{t!==void 0&&(u.value=t)},{immediate:!0});const A=()=>{u.value=!u.value},{b:c}=U.useNamespace("pro-card"),y=["xxxl","xxl","xl","lg","md","sm","xs"],p=K(),B=(t,r)=>t?r:{},E=t=>{const r=[0,0];return(Array.isArray(t)?t:[t,0]).forEach((s,l)=>{if(typeof s=="object")for(let i=0;i<y.length;i+=1){const d=y[i];if({lg:!0,md:!0,sm:!0,xl:!1,xs:!1,xxl:!1,xxxl:!1,...p==null?void 0:p.value}[d]&&s[d]!==void 0){r[l]=s[d];break}}else r[l]=s||0}),r},j=t=>{let r=t;if(typeof t=="object")for(let s=0;s<y.length;s+=1){const l=y[s],i={lg:!0,md:!0,sm:!0,xl:!1,xs:!1,xxl:!1,xxxl:!1,...p==null?void 0:p.value};if(i!=null&&i[l]&&(t==null?void 0:t[l])!==void 0){r=t[l];break}}const a=B(typeof r=="string"&&/\d%|\dpx/i.test(r),{width:r,flexShrink:0});return{span:r,colSpanStyle:a}},D=e.computed(()=>E(o.gutter)),C=e.ref(!1),$=t=>{C.value=t},q=e.computed(()=>{var t;return e.createVNode(e.Fragment,null,[o.title||((t=n.title)==null?void 0:t.call(n))])}),F=e.computed(()=>e.createVNode(e.Fragment,null,[o.tooltip])),I=e.computed(()=>{var t;return e.createVNode(e.Fragment,null,[o.extra||((t=n.extra)==null?void 0:t.call(n))])}),O=e.computed(()=>{var t;return e.createVNode(e.Fragment,null,[o.actions||((t=n.actions)==null?void 0:t.call(n))])}),M=e.computed(()=>o.loading===!0?e.createVNode(w.Spin,{style:{width:"100%",height:"100%",display:"flex",alignItems:"center",justifyContent:"center"}},null):e.createVNode(e.Fragment,null,[o.loading])),f=e.computed(()=>{var t;if(o.collapsible&&S.value===void 0)return o.collapsibleIconRender?(t=o.collapsibleIconRender)==null?void 0:t.call(o,{collapsed:u.value}):e.createVNode(e.Fragment,null,[e.createVNode(L.IconApAdFillDown,{class:c("collapsible-icon"),style:{transform:u.value?"rotate(-90deg)":"rotate(0deg)"}},null)])}),N=(t,r=[])=>{if((t==null?void 0:t.type)===Symbol.for("v-fgt")){const a=Array.isArray(t==null?void 0:t.children)?t==null?void 0:t.children:[t==null?void 0:t.children];if(a!=null&&a.length)for(let s=0;s<a.length;s++)a!=null&&a[s]&&N(a==null?void 0:a[s],r)}else t&&r.push(t);return r},P=()=>{var r,a,s;const t=(r=n.default)==null?void 0:r.call(n);return $(!1),e.createVNode(e.Fragment,null,[(s=(a=t==null?void 0:t.reduce((l,i)=>{const d=N(i);return[...l,...d]},[]))==null?void 0:a.filter(l=>l.type!==Symbol.for("v-cmt")))==null?void 0:s.map((l,i,d)=>{var b,z,V;if(l&&typeof l=="object"&&"type"in l&&((b=l.type)==null?void 0:b.isProCard)===!0){$(!0);const _=((z=l==null?void 0:l.props)==null?void 0:z.colSpan)||((V=l==null?void 0:l.props)==null?void 0:V["col-span"])||{},{span:m,colSpanStyle:H}=j(_),v=c("col"),Q=g.mergeClass(`${v}`,[typeof m=="number"&&m>=0&&m<=24?`${v}-span-${m}`:void 0,o.split==="horizontal"&&i!==d.length-1?`${v}-split-horizontal`:void 0,o.split==="vertical"&&i!==d.length-1?`${v}-split-vertical`:void 0].filter(Boolean)),[x,k]=D.value;return e.createVNode("div",{class:Q,style:{...H,...B(x>0,{paddingInlineStart:`${x/2}px`,paddingInlineEnd:`${x/2}px`}),...B(k>0,{paddingBlockStart:`${k/2}px`,paddingBlockEnd:`${k/2}px`}),...o.colStyle}},[l])}return l})])},G=e.computed(()=>{const t=c();return g.mergeClass(`${t}`,[o.bordered?`${t}-border`:void 0,o.boxShadow?`${t}-box-shadow`:void 0,C.value?`${t}-contain-card`:void 0,o.loading?`${t}-loading`:void 0,o.split==="vertical"||o.split==="horizontal"?`${t}-split`:void 0,o.ghost?`${t}-ghost`:void 0,o.hoverable?`${t}-hoverable`:void 0,o.type?`${t}-type-${o.type}`:void 0,u.value?`${t}-collapsed`:void 0].filter(Boolean))}),R=e.computed(()=>{const t=c("header");return g.mergeClass(`${t}`,[o.headerBordered||o.type==="inner"?`${t}-border`:void 0,f.value?`${t}-collapsible`:void 0].filter(Boolean))}),T=e.computed(()=>{const t=c("body");return g.mergeClass(`${t}`,[o.layout==="center"?`${t}-center`:void 0,o.split==="horizontal"||o.direction==="column"?`${t}-direction-column`:void 0,o.wrap&&C.value?`${t}-wrap`:void 0].filter(Boolean))});return(t,r)=>(e.openBlock(),e.createElementBlock("div",e.mergeProps({class:G.value},{...t.$attrs}),[o.title||n.title||o.extra||n.extra||f.value?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(R.value),style:e.normalizeStyle({...o.headStyle}),onClick:r[0]||(r[0]=()=>{f.value&&A()})},[o.title||n.title||f.value?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(e.unref(c)("header-title"))},[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(f.value))),e.renderSlot(t.$slots,"title",{},()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(q.value)))]),o.tooltip?(e.openBlock(),e.createBlock(e.unref(w.Tooltip),{key:0},{title:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(F.value)))]),default:e.withCtx(()=>[e.createVNode(e.unref(J.QuestionCircleOutlined),{class:e.normalizeClass(e.unref(c)("header-title-tooltip"))},null,8,["class"])]),_:1})):e.createCommentVNode("",!0)],2)):e.createCommentVNode("",!0),o.extra||n.extra?(e.openBlock(),e.createElementBlock("div",{key:1,class:e.normalizeClass(e.unref(c)("header-extra"))},[e.renderSlot(t.$slots,"extra",{},()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(I.value)))])],2)):e.createCommentVNode("",!0)],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{class:e.normalizeClass(T.value),style:e.normalizeStyle({...o.bodyStyle})},[o.loading?(e.openBlock(),e.createBlock(e.resolveDynamicComponent(M.value),{key:0})):(e.openBlock(),e.createBlock(e.resolveDynamicComponent(P()),{key:1}))],6),o.actions||n.actions?(e.openBlock(),e.createElementBlock("div",{key:1,class:e.normalizeClass(e.unref(c)("actions")),style:e.normalizeStyle({...o.actionsStyle})},[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(O.value)))],6)):e.createCommentVNode("",!0)],16))}});exports.default=W;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),w=require("@aplus-frontend/antdv"),K=require("@ant-design/icons-vue");require("../../../config-provider/index.js");const g=require("../../../editable-table/utils.js"),L=require("@aplus-frontend/antdv/es/_util/hooks/useBreakpoint"),U=require("@aplus-frontend/icon"),W=require("../../../config-provider/hooks/use-namespace.js"),X=e.defineComponent({name:"ApProCard",__name:"index",props:e.mergeModels({headStyle:{},bodyStyle:{},actionsStyle:{},headerBordered:{type:Boolean,default:!1},title:{type:[Object,String,Number,Boolean,null,Array]},tooltip:{type:[Object,String,Number,Boolean,null,Array]},extra:{type:[Object,String,Number,Boolean,null,Array]},layout:{},type:{},direction:{},wrap:{type:Boolean,default:!1},loading:{type:[Boolean,Object,String,Number,null,Array]},colSpan:{},colStyle:{},gutter:{default:0},actions:{type:[Object,String,Number,Boolean,null,Array]},split:{},bordered:{type:Boolean,default:!1},hoverable:{type:Boolean,default:!1},ghost:{type:Boolean,default:!1},collapsible:{type:Boolean,default:!1},defaultCollapsed:{type:Boolean,default:!1},collapsed:{type:Boolean},collapsibleIconRender:{},boxShadow:{type:Boolean,default:!1}},{collapsed:{type:Boolean,default:void 0},collapsedModifiers:{}}),emits:["update:collapsed"],setup(h){const o=h,n=e.useSlots(),u=e.ref(o.defaultCollapsed),S=e.useModel(h,"collapsed");e.watch(()=>S.value,t=>{t!==void 0&&(u.value=t)},{immediate:!0});const A=()=>{u.value=!u.value},{b:i}=W.useNamespace("pro-card"),y=["xxxl","xxl","xl","lg","md","sm","xs"],p=L(),B=(t,r)=>t?r:{},E=t=>{const r=[0,0];return(Array.isArray(t)?t:[t,0]).forEach((s,l)=>{if(typeof s=="object")for(let c=0;c<y.length;c+=1){const d=y[c];if({lg:!0,md:!0,sm:!0,xl:!1,xs:!1,xxl:!1,xxxl:!1,...p==null?void 0:p.value}[d]&&s[d]!==void 0){r[l]=s[d];break}}else r[l]=s||0}),r},j=t=>{let r=t;if(typeof t=="object")for(let s=0;s<y.length;s+=1){const l=y[s],c={lg:!0,md:!0,sm:!0,xl:!1,xs:!1,xxl:!1,xxxl:!1,...p==null?void 0:p.value};if(c!=null&&c[l]&&(t==null?void 0:t[l])!==void 0){r=t[l];break}}const a=B(typeof r=="string"&&/\d%|\dpx/i.test(r),{width:r,flexShrink:0});return{span:r,colSpanStyle:a}},D=e.computed(()=>E(o.gutter)),C=e.ref(!1),$=t=>{C.value=t},q=e.computed(()=>{var t;return e.createVNode(e.Fragment,null,[o.title||((t=n.title)==null?void 0:t.call(n))])}),F=e.computed(()=>e.createVNode(e.Fragment,null,[o.tooltip])),I=e.computed(()=>{var t;return e.createVNode(e.Fragment,null,[o.extra||((t=n.extra)==null?void 0:t.call(n))])}),O=e.computed(()=>{var t;return e.createVNode(e.Fragment,null,[o.actions||((t=n.actions)==null?void 0:t.call(n))])}),M=e.computed(()=>o.loading===!0?e.createVNode(w.Spin,{style:{width:"100%",height:"100%",display:"flex",alignItems:"center",justifyContent:"center"}},null):e.createVNode(e.Fragment,null,[o.loading])),f=e.computed(()=>o.collapsible&&S.value===void 0),P=()=>{var t;return o.collapsibleIconRender?(t=o.collapsibleIconRender)==null?void 0:t.call(o,{collapsed:u.value}):e.createVNode(e.Fragment,null,[e.createVNode(U.IconApAdFillDown,{class:i("collapsible-icon"),style:{transform:u.value?"rotate(-90deg)":"rotate(0deg)"}},null)])},N=(t,r=[])=>{if((t==null?void 0:t.type)===Symbol.for("v-fgt")){const a=Array.isArray(t==null?void 0:t.children)?t==null?void 0:t.children:[t==null?void 0:t.children];if(a!=null&&a.length)for(let s=0;s<a.length;s++)a!=null&&a[s]&&N(a==null?void 0:a[s],r)}else t&&r.push(t);return r},G=()=>{var r,a,s;const t=(r=n.default)==null?void 0:r.call(n);return $(!1),e.createVNode(e.Fragment,null,[(s=(a=t==null?void 0:t.reduce((l,c)=>{const d=N(c);return[...l,...d]},[]))==null?void 0:a.filter(l=>l.type!==Symbol.for("v-cmt")))==null?void 0:s.map((l,c,d)=>{var b,V,z;if(l&&typeof l=="object"&&"type"in l&&((b=l.type)==null?void 0:b.isProCard)===!0){$(!0);const H=((V=l==null?void 0:l.props)==null?void 0:V.colSpan)||((z=l==null?void 0:l.props)==null?void 0:z["col-span"])||{},{span:m,colSpanStyle:Q}=j(H),v=i("col"),J=g.mergeClass(`${v}`,[typeof m=="number"&&m>=0&&m<=24?`${v}-span-${m}`:void 0,o.split==="horizontal"&&c!==d.length-1?`${v}-split-horizontal`:void 0,o.split==="vertical"&&c!==d.length-1?`${v}-split-vertical`:void 0].filter(Boolean)),[x,k]=D.value;return e.createVNode("div",{class:J,style:{...Q,...B(x>0,{paddingInlineStart:`${x/2}px`,paddingInlineEnd:`${x/2}px`}),...B(k>0,{paddingBlockStart:`${k/2}px`,paddingBlockEnd:`${k/2}px`}),...o.colStyle}},[l])}return l})])},R=e.computed(()=>{const t=i();return g.mergeClass(`${t}`,[o.bordered?`${t}-border`:void 0,o.boxShadow?`${t}-box-shadow`:void 0,C.value?`${t}-contain-card`:void 0,o.loading?`${t}-loading`:void 0,o.split==="vertical"||o.split==="horizontal"?`${t}-split`:void 0,o.ghost?`${t}-ghost`:void 0,o.hoverable?`${t}-hoverable`:void 0,o.type?`${t}-type-${o.type}`:void 0,u.value?`${t}-collapsed`:void 0].filter(Boolean))}),T=e.computed(()=>{const t=i("header");return g.mergeClass(`${t}`,[o.headerBordered||o.type==="inner"?`${t}-border`:void 0,f.value?`${t}-collapsible`:void 0].filter(Boolean))}),_=e.computed(()=>{const t=i("body");return g.mergeClass(`${t}`,[o.layout==="center"?`${t}-center`:void 0,o.split==="horizontal"||o.direction==="column"?`${t}-direction-column`:void 0,o.wrap&&C.value?`${t}-wrap`:void 0].filter(Boolean))});return(t,r)=>(e.openBlock(),e.createElementBlock("div",e.mergeProps({class:R.value},{...t.$attrs}),[o.title||n.title||o.extra||n.extra||f.value?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(T.value),style:e.normalizeStyle({...o.headStyle}),onClick:r[0]||(r[0]=()=>{f.value&&A()})},[o.title||n.title||f.value?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(e.unref(i)("header-title"))},[f.value?(e.openBlock(),e.createBlock(e.resolveDynamicComponent(P()),{key:0})):e.createCommentVNode("",!0),e.renderSlot(t.$slots,"title",{},()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(q.value)))]),o.tooltip?(e.openBlock(),e.createBlock(e.unref(w.Tooltip),{key:1},{title:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(F.value)))]),default:e.withCtx(()=>[e.createVNode(e.unref(K.QuestionCircleOutlined),{class:e.normalizeClass(e.unref(i)("header-title-tooltip"))},null,8,["class"])]),_:1})):e.createCommentVNode("",!0)],2)):e.createCommentVNode("",!0),o.extra||n.extra?(e.openBlock(),e.createElementBlock("div",{key:1,class:e.normalizeClass(e.unref(i)("header-extra"))},[e.renderSlot(t.$slots,"extra",{},()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(I.value)))])],2)):e.createCommentVNode("",!0)],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{class:e.normalizeClass(_.value),style:e.normalizeStyle({...o.bodyStyle})},[o.loading?(e.openBlock(),e.createBlock(e.resolveDynamicComponent(M.value),{key:0})):(e.openBlock(),e.createBlock(e.resolveDynamicComponent(G()),{key:1}))],6),o.actions||n.actions?(e.openBlock(),e.createElementBlock("div",{key:1,class:e.normalizeClass(e.unref(i)("actions")),style:e.normalizeStyle({...o.actionsStyle})},[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(O.value)))],6)):e.createCommentVNode("",!0)],16))}});exports.default=X;

package/lib/src/ap-pro-card/components/statistic-card/index.vue.d.ts

@@ -25,7 +25,9 @@ declare function __VLS_template(): {
     rootEl: HTMLDivElement;
 };
 type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
-declare const __VLS_component: DefineComponent<ApStatisticCardProps, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ApStatisticCardProps> & Readonly<{}>, {}, {}, {}, {}, string, ComponentProvideOptions, false, {}, HTMLDivElement>;
+declare const __VLS_component: DefineComponent<ApStatisticCardProps, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ApStatisticCardProps> & Readonly<{}>, {
+    collapsed: boolean;
+}, {}, {}, {}, string, ComponentProvideOptions, false, {}, HTMLDivElement>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
 export default _default;
 type __VLS_WithTemplateSlots<T, S> = T & {

package/lib/src/ap-pro-card/components/statistic-card/index.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue");require("../../../config-provider/index.js");require("../card/index.vue.js");require("../statistic/index.vue.js");const _=require("../../../editable-table/utils.js"),O=require("lodash-unified"),q=require("../../../config-provider/hooks/use-namespace.js"),P=require("../statistic/index.vue2.js"),j=require("../card/index.vue2.js"),k=e.defineComponent({name:"ApStatisticCard",__name:"index",props:{headStyle:{},bodyStyle:{},actionsStyle:{},headerBordered:{type:Boolean},title:{type:[Object,String,Number,Boolean,null,Array]},tooltip:{type:[Object,String,Number,Boolean,null,Array]},extra:{type:[Object,String,Number,Boolean,null,Array]},layout:{},type:{},direction:{},wrap:{type:Boolean},loading:{type:[Boolean,Object,String,Number,null,Array]},colSpan:{},colStyle:{},gutter:{},actions:{type:[Object,String,Number,Boolean,null,Array]},split:{},bordered:{type:Boolean},hoverable:{type:Boolean},ghost:{type:Boolean},collapsible:{type:Boolean},defaultCollapsed:{type:Boolean},collapsed:{type:Boolean},collapsibleIconRender:{type:Function},boxShadow:{type:Boolean},chart:{type:[Object,String,Number,Boolean,null,Array]},statistic:{},chartPlacement:{},footer:{type:[Object,String,Number,Boolean,null,Array]}},setup(g){const r=g,t=e.useSlots(),{b:n}=q.useNamespace("statistic-card"),S=e.computed(()=>n()),C=e.computed(()=>{const o=n("chart");return _.mergeClass(`${o}`,[r.chartPlacement==="left"?`${o}-left`:void 0,r.chartPlacement==="right"?`${o}-right`:void 0].filter(Boolean))}),d=e.computed(()=>{const o=n("content");return _.mergeClass(`${o}`,[r.chartPlacement==="left"||r.chartPlacement==="right"?`${o}-horizontal`:void 0].filter(Boolean))}),N=e.computed(()=>n("footer")),c=e.computed(()=>{var o,u,s,a,p,f,m,y,v,h,B,b;return r.statistic?e.createVNode(P.default,e.mergeProps({layout:"vertical"},r.statistic,{title:((o=r.statistic)==null?void 0:o.title)||((u=t.statisticTitle)==null?void 0:u.call(t)),prefix:((s=r.statistic)==null?void 0:s.prefix)||((a=t.prefix)==null?void 0:a.call(t)),suffix:((p=r.statistic)==null?void 0:p.suffix)||((f=t.suffix)==null?void 0:f.call(t)),icon:((m=r.statistic)==null?void 0:m.icon)||((y=t.icon)==null?void 0:y.call(t)),tip:((v=r.statistic)==null?void 0:v.tip)||((h=t.tip)==null?void 0:h.call(t)),description:((B=r.statistic)==null?void 0:B.description)||((b=t.description)==null?void 0:b.call(t))}),null):void 0}),l=e.computed(()=>{var o;return r.chart||t.chart?e.createVNode("div",{class:C.value},[r.chart||((o=t.chart)==null?void 0:o.call(t))]):void 0}),i=e.computed(()=>l.value||c.value?r.chartPlacement==="left"?e.createVNode("div",{class:d.value},[l.value,c.value]):e.createVNode("div",{class:d.value},[c.value,l.value]):void 0),x=e.computed(()=>{var o;return r.footer||t.footer?e.createVNode("div",{class:N.value},[r.footer||((o=t.footer)==null?void 0:o.call(t))]):void 0});return(o,u)=>(e.openBlock(),e.createBlock(j.default,e.mergeProps({class:S.value},{...r}),e.createSlots({default:e.withCtx(()=>[i.value?(e.openBlock(),e.createBlock(e.resolveDynamicComponent(i.value),{key:0})):e.createCommentVNode("",!0),e.renderSlot(o.$slots,"default"),i.value?(e.openBlock(),e.createBlock(e.resolveDynamicComponent(x.value),{key:1})):e.createCommentVNode("",!0)]),_:2},[e.renderList(e.unref(O.omit)(t,["chart","footer","description","default"]),(s,a)=>({name:a,fn:e.withCtx(()=>[e.renderSlot(o.$slots,a)])}))]),1040,["class"]))}});exports.default=k;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue");require("../../../config-provider/index.js");require("../card/index.vue.js");require("../statistic/index.vue.js");const _=require("../../../editable-table/utils.js"),O=require("lodash-unified"),q=require("../../../config-provider/hooks/use-namespace.js"),P=require("../statistic/index.vue2.js"),j=require("../card/index.vue2.js"),k=e.defineComponent({name:"ApStatisticCard",__name:"index",props:{headStyle:{},bodyStyle:{},actionsStyle:{},headerBordered:{type:Boolean},title:{type:[Object,String,Number,Boolean,null,Array]},tooltip:{type:[Object,String,Number,Boolean,null,Array]},extra:{type:[Object,String,Number,Boolean,null,Array]},layout:{},type:{},direction:{},wrap:{type:Boolean},loading:{type:[Boolean,Object,String,Number,null,Array]},colSpan:{},colStyle:{},gutter:{},actions:{type:[Object,String,Number,Boolean,null,Array]},split:{},bordered:{type:Boolean},hoverable:{type:Boolean},ghost:{type:Boolean},collapsible:{type:Boolean},defaultCollapsed:{type:Boolean},collapsed:{type:Boolean,default:void 0},collapsibleIconRender:{},boxShadow:{type:Boolean},chart:{type:[Object,String,Number,Boolean,null,Array]},statistic:{},chartPlacement:{},footer:{type:[Object,String,Number,Boolean,null,Array]}},setup(g){const r=g,t=e.useSlots(),{b:n}=q.useNamespace("statistic-card"),S=e.computed(()=>n()),C=e.computed(()=>{const o=n("chart");return _.mergeClass(`${o}`,[r.chartPlacement==="left"?`${o}-left`:void 0,r.chartPlacement==="right"?`${o}-right`:void 0].filter(Boolean))}),d=e.computed(()=>{const o=n("content");return _.mergeClass(`${o}`,[r.chartPlacement==="left"||r.chartPlacement==="right"?`${o}-horizontal`:void 0].filter(Boolean))}),N=e.computed(()=>n("footer")),c=e.computed(()=>{var o,u,s,a,p,f,m,y,v,h,B,b;return r.statistic?e.createVNode(P.default,e.mergeProps({layout:"vertical"},r.statistic,{title:((o=r.statistic)==null?void 0:o.title)||((u=t.statisticTitle)==null?void 0:u.call(t)),prefix:((s=r.statistic)==null?void 0:s.prefix)||((a=t.prefix)==null?void 0:a.call(t)),suffix:((p=r.statistic)==null?void 0:p.suffix)||((f=t.suffix)==null?void 0:f.call(t)),icon:((m=r.statistic)==null?void 0:m.icon)||((y=t.icon)==null?void 0:y.call(t)),tip:((v=r.statistic)==null?void 0:v.tip)||((h=t.tip)==null?void 0:h.call(t)),description:((B=r.statistic)==null?void 0:B.description)||((b=t.description)==null?void 0:b.call(t))}),null):void 0}),l=e.computed(()=>{var o;return r.chart||t.chart?e.createVNode("div",{class:C.value},[r.chart||((o=t.chart)==null?void 0:o.call(t))]):void 0}),i=e.computed(()=>l.value||c.value?r.chartPlacement==="left"?e.createVNode("div",{class:d.value},[l.value,c.value]):e.createVNode("div",{class:d.value},[c.value,l.value]):void 0),x=e.computed(()=>{var o;return r.footer||t.footer?e.createVNode("div",{class:N.value},[r.footer||((o=t.footer)==null?void 0:o.call(t))]):void 0});return(o,u)=>(e.openBlock(),e.createBlock(j.default,e.mergeProps({class:S.value},{...r}),e.createSlots({default:e.withCtx(()=>[i.value?(e.openBlock(),e.createBlock(e.resolveDynamicComponent(i.value),{key:0})):e.createCommentVNode("",!0),e.renderSlot(o.$slots,"default"),i.value?(e.openBlock(),e.createBlock(e.resolveDynamicComponent(x.value),{key:1})):e.createCommentVNode("",!0)]),_:2},[e.renderList(e.unref(O.omit)(t,["chart","footer","description","default"]),(s,a)=>({name:a,fn:e.withCtx(()=>[e.renderSlot(o.$slots,a)])}))]),1040,["class"]))}});exports.default=k;

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 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;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const r=require("vue"),Y=require("./constans.js"),Z=require("@aplus-frontend/antdv");require("../../config-provider/index.js");const S=require("./utils/sortItemsByRowAndCol.js"),ee=require("../../config-provider/hooks/use-namespace.js"),oe=["data-span","data-index","data-row","data-col","data-height","data-module","draggable"],re=r.defineComponent({__name:"ApDraggableGrid",props:Y.ApDraggableGridProps(),emits:["onGridListChange"],setup(W,{expose:_,emit:J}){const d=W,{b:B,e:A,m:z}=ee.useNamespace("ap-draggable-grid"),T=r.ref(!1),x=r.ref(!1),M=r.computed(()=>A("item")),q=r.computed(()=>A("dragging")),L=r.computed(()=>A("overlay")),j=r.computed(()=>d.customWrapper?`.${d.customWrapper} .${M.value}:not(.${q.value})`:`.${M.value}:not(.${q.value})`),U=J,m=r.useTemplateRef("gridContainer"),D=r.ref([]);r.watch(()=>d.gridList,e=>{Array.isArray(e)&&u(e)},{deep:!0,immediate:!0});function u(e){const n=[...e].sort((o,c)=>o.row-c.row);D.value=n.map(o=>({...o})),U("onGridListChange",JSON.parse(JSON.stringify(D.value)))}const V=e=>({gridColumn:`${e.col} / span ${e.span}`,gridRow:e.row,minHeight:e.showHeight?e.showHeight+"px":`${d.gridItemHeight}px`,height:e.showHeight?e.showHeight+"px":`${d.gridItemHeight}px`,boxShadow:d.gridItemShadow?d.gridItemShadow:"none"});async function H(){if(u([]),typeof d.request=="function")try{T.value=!0;const e=await d.request();Array.isArray(e)?(console.log("ApDraggableGrid: 请求到的布局数据:",e),u(e)):console.warn("ApDraggableGrid: 请求函数必须返回一个符合 ApDraggableGridItemBase 数组的格式")}catch(e){console.error("ApDraggableGrid: 请求错误:",e)}finally{T.value=!1}}let E=r.ref(null),C=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",E.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"}},F=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(j.value);if(!n)return;const o=n.dataset;document.querySelectorAll(`.${d.customWrapper} div[data-row="${o.row}"]`).forEach(i=>{i.classList.add(L.value)}),C.value={span:Number(o.span),col:Number(o.col),row:Number(o.row),module:o.module,height:Number(o.height),index:Number(o.index)}}},O=e=>{e.preventDefault(),v&&(v.style.opacity="1",v=null),K(E,C)&&Q(E,C),document.querySelectorAll(`.${L.value}`).forEach(n=>{n.classList.remove(L.value)}),E.value=null,C.value=null,x.value=!1},P=()=>{v&&(v.style.opacity="1",v=null),E.value=null,C.value=null,x.value=!1},K=(e,n)=>{const{span:o,module:c}=e.value,{span:i,module:g}=n.value;return c===g&&o===i?(console.log("如果自己放在自己之上不能交换数据"),!1):!0},Q=(e,n)=>{if(!e.value||!n.value)return;const{span:o,col:c,row:i,module:g,height:N,index:l}=e.value,{span:I,col:h,row:p,module:X,height:R,index:f}=n.value;if(i===p&&c===h&&o===I&&N===R&&g===X){console.log("从同一位置拖拽到同一位置,不做任何操作");return}let t=[...r.toRaw(D.value)];const $=JSON.parse(JSON.stringify(t));if(i===p)if(l>f){console.log("","从右向左拖拽"),console.log(l,f),console.log(l-f),l-f===1?(t[f].col=o+h,t[l].col=h):(t.forEach((w,a)=>{a<l&&a>=f&&(w.col+=I)}),t[l].col=h);const s=S.sortItemsByRowAndCol(t);if(!b(s)){console.warn("交换后的布局无效，恢复原始布局");return}u(s);return}else{console.log(l,f),console.log("","从左向右拖拽"),f-l===1?(t[l].col=I+1,t[f].col=c):(t.forEach((w,a)=>{a>l&&a<=f&&(w.col-=I)}),t[l].col=h);const s=S.sortItemsByRowAndCol(t);if(console.log("交换后的布局:",s),!b(s)){console.warn("交换后的布局无效，恢复原始布局"),u($);return}u(s);return}else if(p<i){if(console.log("从下向上拖拽"),o===24){const s=[];for(let a=p;a<i;a++)s.push(a);t.forEach(a=>{s.includes(a.row)&&(a.row+=1)}),t[l].row=p;const w=S.sortItemsByRowAndCol(t);if(!b(w)){console.warn("交换后的布局无效，恢复原始布局"),u($);return}u(w);return}if(o===I&&N===R){t[l].row=p,t[l].col=h,t[f].row=i,t[f].col=c;const s=S.sortItemsByRowAndCol(t);if(!b(s)){console.warn("交换后的布局无效，恢复原始布局"),u($);return}u(s);return}}else{if(console.log("从上向下拖拽"),o===24){console.log("如果拖拽元素跨度为24","从上向下拖拽");const s=[];for(let a=i+1;a<=p;a++)s.push(a);t.forEach(a=>{s.includes(a.row)&&(a.row-=1)}),t[l].row=p;const w=S.sortItemsByRowAndCol(t);if(!b(w)){console.warn("交换后的布局无效，恢复原始布局"),u($);return}u(w);return}if(o===I&&N===R){t[l].row=p,t[l].col=h,t[f].row=i,t[f].col=c;const s=S.sortItemsByRowAndCol(t);if(!b(s)){console.warn("交换后的布局无效，恢复原始布局"),u($);return}u(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 c=n[o].sort((g,N)=>g.col-N.col);let i=1;for(const g of c){if(g.col<i)return console.warn(`行 ${o} 中的元素重叠: 元素 ${g.module} 在列 ${g.col}, 但当前列已经是 ${i}`),!1;if(i=g.col+g.span,i>25)return console.warn(`行 ${o} 中的元素超出界限: 元素 ${g.module} 在列 ${g.col} 跨度 ${g.span}`),!1}}return!0};return r.onMounted(async()=>{await H(),!d.disableDrag&&m.value&&(m.value.addEventListener("dragstart",k),m.value.addEventListener("dragover",F),m.value.addEventListener("drop",O),m.value.addEventListener("dragend",P))}),r.onUnmounted(()=>{m.value&&(m.value.removeEventListener("dragstart",k),m.value.removeEventListener("dragover",F),m.value.removeEventListener("drop",O),m.value.removeEventListener("dragend",P),y&&clearTimeout(y))}),_({setGridItems:e=>{u(e)},getGridItems:()=>JSON.parse(JSON.stringify(D.value)),refreshGrid:()=>{(async()=>{await H()})()}}),(e,n)=>(r.openBlock(),r.createBlock(r.unref(Z.Spin),{spinning:T.value},{default:r.withCtx(()=>[r.createElementVNode("div",{ref_key:"gridContainer",ref:m,class:r.normalizeClass([T.value?r.unref(B)("loading"):r.unref(B)(),d.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(D.value,(o,c)=>(r.openBlock(),r.createElementBlock("div",{key:c,class:r.normalizeClass([r.unref(A)("item"),d.disableDrag?"":r.unref(z)("canDrag")]),"data-span":o.span,"data-index":c,"data-row":o.row,"data-col":o.col,"data-height":o.height,"data-module":o.module,style:r.normalizeStyle([V(o)]),draggable:!d.disableDrag},[r.renderSlot(e.$slots,"item",{item:o,index:c})],14,oe))),128))],6)]),_:3},8,["spinning"]))}});exports.default=re;

package/lib/src/version.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "6.26.1",
+  "version": "6.26.2",
   "main": "./lib/index.js",
   "type": "module",
   "files": [
@@ -37,8 +37,8 @@
     "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.3",

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

@@ -61,8 +61,11 @@
   overflow: hidden;
   box-sizing: border-box;
 }
+.aplus-ap-draggable-grid--canDrag {
+  cursor: pointer;
+}
 .aplus-ap-draggable-grid--canDrag:hover {
-  border: 1px solid var(--ap-color-primary);
+  border: 1px solid #66a9ff;
 }
 .aplus-ap-draggable-grid--dragging {
   cursor: move;
@@ -74,7 +77,7 @@
   z-index: 999;
 }
 .aplus-ap-draggable-grid__overlay {
-  border: 1px solid var(--ap-color-primary);
+  border: 1px solid #66a9ff;
 }
 .aplus-ap-draggable-grid-loading {
   display: flex;

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

@@ -17,8 +17,9 @@
     box-sizing: border-box;
   }
   &--canDrag {
+    cursor: pointer;
     &:hover{
-      border: 1px solid var(--ap-color-primary);
+      border: 1px solid #66a9ff;
     }
   }
   &--dragging {
@@ -31,7 +32,7 @@
     z-index: 999;
   }
   &__overlay {
-    border: 1px solid var(--ap-color-primary);
+    border: 1px solid #66a9ff;
   }
 });
 .b('ap-draggable-grid-loading',{

package/theme/index.css

@@ -4166,8 +4166,11 @@ div.aplus-ap-info-layout-admin__header-shadow.aplus-ap-info-layout-admin__sticky
   overflow: hidden;
   box-sizing: border-box;
 }
+.aplus-ap-draggable-grid--canDrag {
+  cursor: pointer;
+}
 .aplus-ap-draggable-grid--canDrag:hover {
-  border: 1px solid var(--ap-color-primary);
+  border: 1px solid #66a9ff;
 }
 .aplus-ap-draggable-grid--dragging {
   cursor: move;
@@ -4179,7 +4182,7 @@ div.aplus-ap-info-layout-admin__header-shadow.aplus-ap-info-layout-admin__sticky
   z-index: 999;
 }
 .aplus-ap-draggable-grid__overlay {
-  border: 1px solid var(--ap-color-primary);
+  border: 1px solid #66a9ff;
 }
 .aplus-ap-draggable-grid-loading {
   display: flex;