mx-framework-plus 1.1.2 → 1.1.4

package/dist/mx-framework-plus.es.ts

@@ -4448,20 +4448,20 @@ function Me(t) {
           // 继承样式
         ), U = 10, I = 10, R = g.getCellGeometry(h);
         let $ = R.getTerminalPoint(!0), T = R.getTerminalPoint(!1);
-        var K = new mxGeometry();
-        K.setTerminalPoint(
+        var G = new mxGeometry();
+        G.setTerminalPoint(
           new mxPoint(
             $.x + U,
             $.y + I
           ),
           !0
-        ), K.setTerminalPoint(
+        ), G.setTerminalPoint(
           new mxPoint(
             T.x + U,
             T.y + I
           ),
           !1
-        ), C.setGeometry(K), C.value = h.value, C.type = h.type, C.model = "yes", C.type = "edge", C.iconName = h.iconName, k(C);
+        ), C.setGeometry(G), C.value = h.value, C.type = h.type, C.model = "yes", C.type = "edge", C.iconName = h.iconName, k(C);
       } finally {
         z.endUpdate();
       }
@@ -4555,8 +4555,8 @@ function Tt(t) {
         let $ = C.value.style || {};
         $.background && $.background.indexOf("files/") > -1 && $["background-image"] ? I.style.background = `${$["background-image"]} center center no-repeat` : I.style.background = "";
       }
-      let K = k.container.querySelector("#gridCanvas_" + C.id);
-      K && K.remove(), k.container.prepend(I), I.width = I.offsetWidth, I.height = I.offsetHeight, U ? s = "transparent" : s = "#dddddd", A(I), I.addEventListener("wheel", function($) {
+      let G = k.container.querySelector("#gridCanvas_" + C.id);
+      G && G.remove(), k.container.prepend(I), I.width = I.offsetWidth, I.height = I.offsetHeight, U ? s = "transparent" : s = "#dddddd", A(I), I.addEventListener("wheel", function($) {
         $.preventDefault();
         const T = I.getBoundingClientRect(), Z = $.clientX - T.left, te = $.clientY - T.top, ie = 0.1, oe = $.deltaY < 0 ? 1 : -1, ce = Math.exp(oe * ie), ye = Z / h, fe = te / h;
         h *= ce, h = Math.min(Math.max(0.5, h), 5), x = ye - Z / h, g = fe - te / h, A(I), k && (k.view.scale = h, k.refresh());
@@ -4567,8 +4567,8 @@ function Tt(t) {
     if (!k) return;
     k.snapPoint = function(C, U, I) {
       if (!I && this.snapToGrid && l > 0) {
-        const R = l / h, K = C.x - x, $ = C.y - g;
-        C.x = Math.round(K / R) * R + x, C.y = Math.round($ / R) * R + g;
+        const R = l / h, G = C.x - x, $ = C.y - g;
+        C.x = Math.round(G / R) * R + x, C.y = Math.round($ / R) * R + g;
       }
       return C;
     };
@@ -4584,8 +4584,8 @@ function Tt(t) {
         for (let C = 0; C < z.length; C++) {
           const U = z[C], I = this.getCellGeometry(U);
           if (I) {
-            const R = I.clone(), K = this.snapPoint({ x: R.x, y: R.y });
-            R.x = K.x, R.y = K.y, this.getModel().setGeometry(U, R);
+            const R = I.clone(), G = this.snapPoint({ x: R.x, y: R.y });
+            R.x = G.x, R.y = G.y, this.getModel().setGeometry(U, R);
           }
         }
       } finally {
@@ -4600,17 +4600,17 @@ function Tt(t) {
     const U = l * h;
     if (U < 2) return;
     C.strokeStyle = s, C.lineWidth = m, C.globalAlpha = v;
-    const I = Math.floor(-x * h / U) * U, R = Math.floor(-g * h / U) * U, K = z.width + U, $ = z.height + U;
+    const I = Math.floor(-x * h / U) * U, R = Math.floor(-g * h / U) * U, G = z.width + U, $ = z.height + U;
     switch (p) {
       case "dotted":
         C.fillStyle = s;
-        for (let T = I; T < K; T += U)
+        for (let T = I; T < G; T += U)
           for (let Z = R; Z < $; Z += U)
             C.beginPath(), C.arc(T + 0.5, Z + 0.5, m, 0, Math.PI * 2), C.fill();
         break;
       case "dashed":
         C.setLineDash([5, 3]), C.beginPath();
-        for (let T = I; T < K; T += U)
+        for (let T = I; T < G; T += U)
           C.moveTo(T + 0.5, 0), C.lineTo(T + 0.5, z.height);
         for (let T = R; T < $; T += U)
           C.moveTo(0, T + 0.5), C.lineTo(z.width, T + 0.5);
@@ -4618,7 +4618,7 @@ function Tt(t) {
         break;
       case "square":
         C.beginPath();
-        for (let T = I; T < K; T += U)
+        for (let T = I; T < G; T += U)
           C.moveTo(T + 0.5, 0), C.lineTo(T + 0.5, z.height);
         for (let T = R; T < $; T += U)
           C.moveTo(0, T + 0.5), C.lineTo(z.width, T + 0.5);
@@ -4626,7 +4626,7 @@ function Tt(t) {
         break;
       default:
         C.beginPath();
-        for (let T = I; T < K; T += U)
+        for (let T = I; T < G; T += U)
           C.moveTo(T + 0.5, 0), C.lineTo(T + 0.5, z.height);
         for (let T = R; T < $; T += U)
           C.moveTo(0, T + 0.5), C.lineTo(z.width, T + 0.5);
@@ -5534,7 +5534,7 @@ function je(t) {
             e.firstStyle = !1;
           }
       }, i.view.scaleGrid = !0, i.view.roundPoints = !0, mxSvgCanvas2D.prototype.updateTextNodes = function(w, E, L, O, M, B, F, V, H, W, q) {
-        var G = this.state.scale;
+        var K = this.state.scale;
         mxSvgCanvas2D.createCss(
           L + 2,
           O,
@@ -5547,11 +5547,11 @@ function je(t) {
           this.state.fontBorderColor != null ? this.state.fontBorderColor : null,
           "display: flex; align-items: unsafe " + (B == mxConstants.ALIGN_TOP ? "flex-start" : B == mxConstants.ALIGN_BOTTOM ? "flex-end" : "center") + "; justify-content: unsafe " + (M == mxConstants.ALIGN_LEFT ? "flex-start" : M == mxConstants.ALIGN_RIGHT ? "flex-end" : "center") + "; ",
           this.getTextCss(),
-          G,
+          K,
           mxUtils.bind(this, function(ne, re, Y, se, X) {
             w += this.state.dx, E += this.state.dy;
-            var he = q.firstChild, Ue = he.firstChild, Le = Ue.firstChild, et = Le.firstChild, Pe = (this.rotateHtml ? this.state.rotation : 0) + (W ?? 0), Ce = (this.foOffset != 0 ? "translate(" + this.foOffset + " " + this.foOffset + ")" : "") + (G != 1 ? "scale(" + G + ")" : "");
-            et.setAttribute("style", X), Le.setAttribute("style", se), he.setAttribute("width", Math.ceil(1 / Math.min(1, G) * 100) + "%"), he.setAttribute("height", Math.ceil(1 / Math.min(1, G) * 100) + "%");
+            var he = q.firstChild, Ue = he.firstChild, Le = Ue.firstChild, et = Le.firstChild, Pe = (this.rotateHtml ? this.state.rotation : 0) + (W ?? 0), Ce = (this.foOffset != 0 ? "translate(" + this.foOffset + " " + this.foOffset + ")" : "") + (K != 1 ? "scale(" + K + ")" : "");
+            et.setAttribute("style", X), Le.setAttribute("style", se), he.setAttribute("width", Math.ceil(1 / Math.min(1, K) * 100) + "%"), he.setAttribute("height", Math.ceil(1 / Math.min(1, K) * 100) + "%");
             let ge = Math.round(E + re), tt = Math.round(w + ne), lt = s(ge), at = s(tt);
             if (ge < 0)
               he.setAttribute("y", ge);
@@ -5943,12 +5943,12 @@ function je(t) {
       return i === "gap" && (y = `${o}px`), `${i}=${y}`;
     }).join("; ") + ";" : "";
   }
-  function K(a) {
+  function G(a) {
     const u = String(a).match(/\d+/);
     return u ? Number(u[0]) : null;
   }
   function $(a, n, u) {
-    let d = a.value, o = K(d);
+    let d = a.value, o = G(d);
     return n === "-inf" ? o <= u : u === "+inf" ? o >= n : o >= n && o <= u;
   }
   function T(a, n) {
@@ -6124,8 +6124,8 @@ function je(t) {
         f && (M = u.getPointForEvent(f));
         let B = ue(), F = u.insertEdge(d, null, "", null, null, w.perimeter + `;strokeWidth=${w.strokeWidth || 1};strokeColor=${w.strokeColor || "#333333"}`);
         F.id = B;
-        let V = new mxGeometry(), { startX: H, startY: W, endX: q, endY: G } = ze(M, E, L);
-        V.setTerminalPoint(new mxPoint(H, W), !0), V.setTerminalPoint(new mxPoint(q, G), !1), F.setGeometry(V), F.model = "yes", F.type = "edge", F.iconName = O, F.value = {
+        let V = new mxGeometry(), { startX: H, startY: W, endX: q, endY: K } = ze(M, E, L);
+        V.setTerminalPoint(new mxPoint(H, W), !0), V.setTerminalPoint(new mxPoint(q, K), !1), F.setGeometry(V), F.model = "yes", F.type = "edge", F.iconName = O, F.value = {
           data: { ...b },
           //存储对象
           style: { ...w }
@@ -6158,9 +6158,9 @@ function je(t) {
           se.value = W;
         }
         b.layout = W;
-        let G = n.getDefaultParent();
+        let K = n.getDefaultParent();
         ce(n, null);
-        let ne = R(b), re = ue(), Y = n.insertVertex(G, re, b.text || "", H.x, H.y, F, V, ne);
+        let ne = R(b), re = ue(), Y = n.insertVertex(K, re, b.text || "", H.x, H.y, F, V, ne);
         Y.crtype = "creatComp", Y.cmp = L, Y.codeType = O, Y.type = E, Y.realType = B, Y.model = "yes", Y.name = b.text || "", Y.iconName = M, Y.style = ne, Y.value = {
           data: c,
           //存储对象
@@ -6195,14 +6195,14 @@ function je(t) {
         }
         let W = R(b);
         b.gtype == "rect" && (Number(b.borderValue) === 0 && (b.stroke = "transparent"), W = b.perimeter + `;fillColor=${b.background || "transparent"};strokeColor=${b.stroke || "#333333"};strokeWidth=${b.borderWidth || 0}`);
-        let q = ue(), G = n.insertVertex(B, q, b.text || "", M.x, M.y, S, w, W);
-        b.gtype == "rect" ? G.type = "rect" : G.type = "vertex", G.model = "yes", G.name = b.text || "", G.iconName = E, G.value = {
+        let q = ue(), K = n.insertVertex(B, q, b.text || "", M.x, M.y, S, w, W);
+        b.gtype == "rect" ? K.type = "rect" : K.type = "vertex", K.model = "yes", K.name = b.text || "", K.iconName = E, K.value = {
           data: { ...c },
           //存储对象
           style: { ...b }
           //存储样式对象
-        }, G.from = O || "other", G.realType = L, G.style = W, d.push(G), n.fireEvent(new mxEventObject(mxEvent.SELECTION_CHANGED, {
-          cells: [G]
+        }, K.from = O || "other", K.realType = L, K.style = W, d.push(K), n.fireEvent(new mxEventObject(mxEvent.SELECTION_CHANGED, {
+          cells: [K]
         }));
       }
       n.setSelectionCells(d);
@@ -6293,9 +6293,9 @@ function je(t) {
       height: H,
       x: W.x,
       y: W.y
-    }, G = i.children;
-    if (G && G.length > 0) {
-      let Y = G.find((se) => se.key == "layout");
+    }, K = i.children;
+    if (K && K.length > 0) {
+      let Y = K.find((se) => se.key == "layout");
       Y.value = q;
     }
     f.layout = q;
@@ -6967,8 +6967,7 @@ const $e = {
       isShowPup: !1,
       wndAry: [],
       thisObj: /* @__PURE__ */ new Map(),
-      centeredWindow: [],
-      maskObj: {}
+      centeredWindow: []
     };
   },
   watch: {
@@ -6976,7 +6975,9 @@ const $e = {
       handler(t, e) {
         let l = this;
         l.yhz && (l.yhz.isPreview(!t), l.$nextTick(() => {
-          t ? (l.keys = Math.random().toString(36).substring(2), l.graph.refresh(), l.scheduleUpdateOverlay()) : l.removeMaskOrWnd();
+          t ? (l.keys = Math.random().toString(36).substring(2), l.graph.refresh(), l.scheduleUpdateOverlay()) : l.centeredWindow && l.centeredWindow.forEach((r) => {
+            r && (r.setVisible(!1), r.destroy());
+          });
         }));
       },
       immediate: !0,
@@ -7141,7 +7142,7 @@ const $e = {
     },
     onResize() {
       let t = this;
-      t.yhz && (t.removeMaskOrWnd(!1), t.yhz.changePageSize(), t.yhz.getFloatingPosition());
+      t.yhz && (t.yhz.changePageSize(), t.yhz.getFloatingPosition());
     },
     //清空并重新加载
     clearCanvas() {
@@ -7151,7 +7152,9 @@ const $e = {
     openPupop(t, e = !0) {
       let l = this;
       if (l.pupAry = t, t && t.length > 0) {
-        l.removeMaskOrWnd(!0);
+        l.centeredWindow && l.centeredWindow.forEach((m) => {
+          m && (m.setVisible(!1), m.destroy());
+        });
         let s = [];
         t.forEach((r, m) => {
           var p = document.createElement("div");
@@ -7188,10 +7191,12 @@ const $e = {
             "mxWindowTitle"
           );
           U.setClosable(!0), U.setMaximizable(!0), U.setScrollable(!0), U.setResizable(!0), U.setVisible(e), U.constrainWithinViewport = !0, U.addListener(mxEvent.CLOSE, function(I, R) {
-            l.isShowPup = !1, document.body.removeChild(z), z.style.display = "none";
+            l.isShowPup = !1, C && C.length > 0 && C.forEach((G) => {
+              document.body.removeChild(G);
+            }), z.style.display = "none";
           }), U.addListener(mxEvent.MOVE, function(I, R) {
-            var K = U.getX(), $ = U.getY(), T = U.getElement().offsetWidth, Z = U.getElement().offsetHeight, te = document.documentElement.clientWidth, ie = document.documentElement.clientHeight, oe = 0, ce = 0, ye = te - T, fe = ie - Z;
-            K = Math.max(oe, Math.min(K, ye)), $ = Math.max(ce, Math.min($, fe)), U.setLocation(K, $);
+            var G = U.getX(), $ = U.getY(), T = U.getElement().offsetWidth, Z = U.getElement().offsetHeight, te = document.documentElement.clientWidth, ie = document.documentElement.clientHeight, oe = 0, ce = 0, ye = te - T, fe = ie - Z;
+            G = Math.max(oe, Math.min(G, ye)), $ = Math.max(ce, Math.min($, fe)), U.setLocation(G, $);
           }), U.div && C.length === 0 && (U.div.style.zIndex = 2e3 + m, z.className = "mx-window-mask", z.style.zIndex = 30 + m, document.body.appendChild(z), z.style.display = "block"), s.push(U);
         }), l.centeredWindow = s, l.wndAry = s;
       }
@@ -7221,14 +7226,6 @@ const $e = {
           console.log("元素滚动:", l.scrollTop, l.scrollLeft);
         });
       }
-    },
-    removeMaskOrWnd(t) {
-      let e = this, l = document.querySelectorAll(".mx-window-mask");
-      l && l.length > 0 && l.forEach((s) => {
-        s.remove();
-      }), t && e.centeredWindow && e.centeredWindow.forEach((r) => {
-        r && (r.setVisible(!1), r.destroy());
-      });
     }
   },
   mounted() {
@@ -7241,7 +7238,9 @@ const $e = {
   },
   unmounted() {
     let t = this;
-    t.resizeObserver && t.resizeObserver.disconnect(), t.isShowPup = !1, t.removeMaskOrWnd(!0), window.removeEventListener("resize", t.getWindowInfo);
+    t.resizeObserver && t.resizeObserver.disconnect(), t.isShowPup = !1, t.centeredWindow && t.centeredWindow.forEach((l) => {
+      l && (l.setVisible(!1), l.destroy());
+    }), window.removeEventListener("resize", t.getWindowInfo);
   }
 }, Nl = ["id"], Ul = {
   key: 0,
@@ -7505,7 +7504,7 @@ const jl = /* @__PURE__ */ ae(zl, [["render", Pl]]), Tl = {
           A.setClosable(!0), A.setMaximizable(!1), A.setResizable(!0), A.setVisible(e), A.constrainWithinViewport = !0, A.addListener(mxEvent.CLOSE, function(z, C) {
             l.isShowPup = !1;
           }), A.addListener(mxEvent.MOVE, function(z, C) {
-            var U = A.getX(), I = A.getY(), R = A.getElement().offsetWidth, K = A.getElement().offsetHeight, $ = document.documentElement.clientWidth, T = document.documentElement.clientHeight, Z = 0, te = 0, ie = $ - R, oe = T - K;
+            var U = A.getX(), I = A.getY(), R = A.getElement().offsetWidth, G = A.getElement().offsetHeight, $ = document.documentElement.clientWidth, T = document.documentElement.clientHeight, Z = 0, te = 0, ie = $ - R, oe = T - G;
             U = Math.max(Z, Math.min(U, ie)), I = Math.max(te, Math.min(I, oe)), A.setLocation(U, I);
           }), s.push(A);
         }), window.centeredWindow = s, l.wndAry = s;