@aplus-frontend/ui 6.34.0 → 6.35.0

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

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

package/es/src/business/ap-keep-alive/keeper/ap-view-keeper.mjs

@@ -1,9 +1,9 @@
 const a = {
-  get(t) {
+  get(e) {
   },
-  set(t, s) {
-    const e = t.component?.exposed;
-    console.log("[ apViewInstance ] >", e), e && e.setFirstDefaultSystemView(!0);
+  set(e, s) {
+    const t = e.component?.exposed;
+    t && t.setFirstDefaultSystemView(!0);
   }
 };
 export {

package/es/src/business/ap-label/ApLabel.d.ts

@@ -129,7 +129,7 @@ declare const _default: DefineComponent<ExtractPropTypes<{
     show: boolean;
     dot: boolean;
     count: any;
-    iconType: "ellipsis" | "success" | "warning" | "question" | "line-warning" | undefined;
+    iconType: "ellipsis" | "warning" | "success" | "question" | "line-warning" | undefined;
     showZero: boolean;
     overflowCount: number;
     numberStyle: CSSProperties;

package/es/src/business/ap-label/index.d.ts

@@ -71,7 +71,7 @@ declare const ApLabel: {
         show: boolean;
         dot: boolean;
         count: any;
-        iconType: "ellipsis" | "success" | "warning" | "question" | "line-warning" | undefined;
+        iconType: "ellipsis" | "warning" | "success" | "question" | "line-warning" | undefined;
         showZero: boolean;
         overflowCount: number;
         numberStyle: CSSProperties;
@@ -153,7 +153,7 @@ declare const ApLabel: {
         show: boolean;
         dot: boolean;
         count: any;
-        iconType: "ellipsis" | "success" | "warning" | "question" | "line-warning" | undefined;
+        iconType: "ellipsis" | "warning" | "success" | "question" | "line-warning" | undefined;
         showZero: boolean;
         overflowCount: number;
         numberStyle: CSSProperties;
@@ -232,7 +232,7 @@ declare const ApLabel: {
     show: boolean;
     dot: boolean;
     count: any;
-    iconType: "ellipsis" | "success" | "warning" | "question" | "line-warning" | undefined;
+    iconType: "ellipsis" | "warning" | "success" | "question" | "line-warning" | undefined;
     showZero: boolean;
     overflowCount: number;
     numberStyle: CSSProperties;

package/es/src/business/hooks/usePageListApTable.mjs

@@ -1,12 +1,13 @@
-import { merge as p, cloneDeep as h } from "lodash-unified";
+import { merge as d, cloneDeep as h } from "lodash-unified";
 import { ref as S } from "vue";
 import { useTableRefresh as b } from "./useTableRefresh.mjs";
-function g(o) {
+import { warning as g } from "../../utils/warning.mjs";
+function v(o) {
   return o === !0 ? {} : o === !1 ? {
     refreshBefore: () => !1
   } : o;
 }
-function I(o) {
+function O(o) {
   const r = S(null), {
     isShowRowSelection: u = !0,
     clearSelectionOnRequest: i = !0,
@@ -20,9 +21,9 @@ function I(o) {
     r.value?.rowSelection?.clearAll();
   };
   return b({
-    ...g(f),
+    ...v(f),
     apTableRef: r
-  }), [p(
+  }), [d(
     {
       // scroll，tableLayout，columnResizable设置表格可拖动
       scroll: { x: "100%", y: "100%" },
@@ -35,13 +36,13 @@ function I(o) {
         const t = a ? a(e) : e;
         try {
           if (!s) throw new Error("api is not defined");
-          const { records: n, total: d } = await s(t);
+          const { records: n, total: p } = await s(t);
           return i && c(), {
             data: n,
-            total: d
+            total: p
           };
         } catch (n) {
-          return console.error(n), {
+          return g(!1, n), {
             data: [],
             total: 0
           };
@@ -79,5 +80,5 @@ function I(o) {
   }];
 }
 export {
-  I as usePageListApTable
+  O as usePageListApTable
 };