@vtj/designer 0.8.3 → 0.8.4

package/dist/index.mjs

@@ -12,10 +12,10 @@ import ms from "mockjs";
  * Copyright (c) 2024, VTJ.PRO All rights reserved.
  * @name @vtj/designer 
  * @author CHC chenhuachun1549@dingtalk.com 
- * @version 0.8.3
+ * @version 0.8.4
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
  */
-const vs = "0.8.3", Rt = {
+const vs = "0.8.4", Rt = {
   width: 390,
   height: 844
 }, Tt = {
@@ -3129,12 +3129,12 @@ const Bs = "data:image/svg+xml,%3c?xml%20version='1.0'%20standalone='no'?%3e%3c!
             break;
         }
     }, E = (N) => {
-      if (N) {
+      if (N && f.value) {
         const T = o.assets.componentMap.get(N.name);
-        T && f.value?.setDragging(T), f.value?.setDraggingNode(N);
+        T && f.value.setDragging(T), f.value.setDraggingNode(N);
       }
     }, B = () => {
-      f.value?.setDraggingNode(null), f.value?.setDragging(null);
+      f.value && (f.value.setDraggingNode(null), f.value.setDragging(null));
     };
     return e({
       designer: f,
@@ -3619,7 +3619,7 @@ const Bs = "data:image/svg+xml,%3c?xml%20version='1.0'%20standalone='no'?%3e%3c!
           }, ["prevent", "stop"]), ["enter"]))
         }, {
           default: h(() => [
-            (u(!0), V(R, null, F(n.items, (i) => (u(), b(t(J), re(i, {
+            (u(!0), V(R, null, F(n.items, (i) => (u(), b(t(J), re({ ref_for: !0 }, i, {
               key: `${i.name}_${n.node.id}`,
               current: n.current,
               context: n.context,
@@ -7496,7 +7496,8 @@ const Bs = "data:image/svg+xml,%3c?xml%20version='1.0'%20standalone='no'?%3e%3c!
     return (n, l) => (u(), b(t(Mn), re({ clearable: "" }, n.$attrs), {
       default: h(() => [
         (u(!0), V(R, null, F(e.options, (a) => (u(), b(t(Ln), re({
-          key: a.label
+          key: a.label,
+          ref_for: !0
         }, a), null, 16))), 128))
       ]),
       _: 1
@@ -8465,16 +8466,18 @@ class Ui {
       this.dropping.value = null;
   }
   async allowDrop(e, n = "inner") {
-    const { dragging: l, engine: a } = this, s = a.current.value;
-    if (!l || !s)
+    const { dragging: l, engine: a, draggingNode: s } = this, r = a.current.value;
+    if (!l || !r)
       return !1;
     if (ee(e))
       return !0;
-    const r = a.assets.componentMap, o = n !== "inner" && e.parent || e, i = await a.assets.getBlockMaterial(o.from) || r.get(o.name);
-    if (!i)
+    if (s && e.id === s.id || s && s.isChild(e))
+      return !1;
+    const o = a.assets.componentMap, i = n !== "inner" && e.parent || e, v = await a.assets.getBlockMaterial(i.from) || o.get(i.name);
+    if (!v)
       return !1;
-    const { parentIncludes: v = !0, name: m } = l, { childIncludes: g = !0 } = i, y = v === !0 || Array.isArray(v) && v.includes(o.name), f = g === !0 || Array.isArray(g) && g.includes(m);
-    return y && f;
+    const { parentIncludes: m = !0, name: g } = l, { childIncludes: y = !0 } = v, f = m === !0 || Array.isArray(m) && m.includes(i.name), d = y === !0 || Array.isArray(y) && y.includes(g);
+    return f && d;
   }
   dispose() {
     const { contentWindow: e, document: n } = this;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vtj/designer",
   "private": false,
-  "version": "0.8.3",
+  "version": "0.8.4",
   "type": "module",
   "scripts": {
     "build": "vue-tsc && vite build",
@@ -10,11 +10,11 @@
     "coverage": "vitest run --coverage"
   },
   "dependencies": {
-    "@vtj/core": "^0.8.3",
-    "@vtj/icons": "^0.8.3",
-    "@vtj/renderer": "^0.8.3",
-    "@vtj/ui": "^0.8.3",
-    "@vtj/utils": "^0.8.3",
+    "@vtj/core": "^0.8.4",
+    "@vtj/icons": "^0.8.4",
+    "@vtj/renderer": "^0.8.4",
+    "@vtj/ui": "^0.8.4",
+    "@vtj/utils": "^0.8.4",
     "mockjs": "~1.1.0",
     "monaco-editor": "~0.47.0"
   },
@@ -42,5 +42,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5b5cc8b02b8f367591e4bee47a7d7ff54a01981b"
+  "gitHead": "a2174c3ec95f12c150d1451281dc9625c8dbb40f"
 }

package/types/version.d.ts

@@ -2,7 +2,7 @@
  * Copyright (c) 2024, VTJ.PRO All rights reserved.
  * @name @vtj/designer
  * @author CHC chenhuachun1549@dingtalk.com
- * @version 0.8.2
+ * @version 0.8.3
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
  */
-export declare const version = "0.8.2";
+export declare const version = "0.8.3";