@tmagic/editor 1.3.0-alpha.14 → 1.3.0-alpha.16

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.0-alpha.14",
+  "version": "1.3.0-alpha.16",
   "name": "@tmagic/editor",
   "type": "module",
   "sideEffects": [
@@ -46,26 +46,26 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@element-plus/icons-vue": "^2.0.9",
-    "@tmagic/core": "1.3.0-alpha.14",
-    "@tmagic/design": "1.3.0-alpha.14",
-    "@tmagic/form": "1.3.0-alpha.14",
-    "@tmagic/schema": "1.3.0-alpha.14",
-    "@tmagic/stage": "1.3.0-alpha.14",
-    "@tmagic/table": "1.3.0-alpha.14",
-    "@tmagic/utils": "1.3.0-alpha.14",
+    "@tmagic/core": "1.3.0-alpha.16",
+    "@tmagic/design": "1.3.0-alpha.16",
+    "@tmagic/form": "1.3.0-alpha.16",
+    "@tmagic/schema": "1.3.0-alpha.16",
+    "@tmagic/stage": "1.3.0-alpha.16",
+    "@tmagic/table": "1.3.0-alpha.16",
+    "@tmagic/utils": "1.3.0-alpha.16",
     "buffer": "^6.0.3",
     "color": "^3.1.3",
     "events": "^3.3.0",
-    "gesto": "^1.7.0",
-    "keycon": "^1.1.2",
+    "gesto": "^1.19.1",
+    "keycon": "^1.4.0",
     "lodash-es": "^4.17.21",
     "monaco-editor": "^0.39.0",
     "serialize-javascript": "^6.0.0",
     "vue": "^3.3.4"
   },
   "peerDependencies": {
-    "@tmagic/design": "1.3.0-alpha.14",
-    "@tmagic/form": "1.3.0-alpha.14",
+    "@tmagic/design": "1.3.0-alpha.16",
+    "@tmagic/form": "1.3.0-alpha.16",
     "monaco-editor": "^0.39.0",
     "vue": "^3.3.4"
   },

package/src/layouts/sidebar/LayerPanel.vue

@@ -156,7 +156,7 @@ const handleDragEnd = async (e: any) => {
   if (!tree.value) return;
   const { data: node } = e;
   const parent = editorService?.getParentById(node.id, false) as MContainer;
-  const layout = await editorService?.getLayout(parent);
+  const layout = await editorService?.getLayout(parent, node);
   node.style.position = layout;
   if (layout === Layout.RELATIVE) {
     node.style.top = 0;

package/src/layouts/sidebar/code-block/CodeBlockListPanel.vue

@@ -10,12 +10,11 @@
     </slot>
 
     <!-- 代码块列表 -->
-    <CodeBlockList
-      ref="codeBlockList"
-      :custom-error="customError"
-      @edit="editCode"
-      @remove="deleteCode"
-    ></CodeBlockList>
+    <CodeBlockList ref="codeBlockList" :custom-error="customError" @edit="editCode" @remove="deleteCode">
+      <template #code-block-panel-tool="{ id, data }">
+        <slot name="code-block-panel-tool" :id="id" :data="data"></slot>
+      </template>
+    </CodeBlockList>
 
     <!-- 代码块编辑区 -->
     <CodeBlockEditor

package/src/services/dep.ts

@@ -19,7 +19,7 @@ import { EventEmitter } from 'events';
 
 import { reactive } from 'vue';
 
-import { MNode } from '@tmagic/schema';
+import { Id, MNode } from '@tmagic/schema';
 
 type IsTarget = (key: string | number, value: any) => boolean;
 
@@ -277,13 +277,15 @@ export class Watcher extends EventEmitter {
    * @param nodes 需要清除依赖的节点
    */
   public clear(nodes?: MNode[]) {
+    const clearedItemsNodeIds: Id[] = [];
     Object.values(this.targets).forEach((targets) => {
       Object.values(targets).forEach((target) => {
         if (nodes) {
           nodes.forEach((node) => {
             target.removeDep(node);
 
-            if (Array.isArray(node.items)) {
+            if (Array.isArray(node.items) && node.items.length && !clearedItemsNodeIds.includes(node.id)) {
+              clearedItemsNodeIds.push(node.id);
               this.clear(node.items);
             }
           });

package/src/services/editor.ts

@@ -193,7 +193,7 @@ class Editor extends BaseService {
   /**
    * 只有容器拥有布局
    */
-  public async getLayout(parent: MNode, node?: MNode): Promise<Layout> {
+  public async getLayout(parent: MNode, node?: MNode | null): Promise<Layout> {
     if (node && typeof node !== 'function' && isFixed(node)) return Layout.FIXED;
 
     if (parent.layout) {

package/types/layouts/sidebar/code-block/CodeBlockListPanel.vue.d.ts

@@ -6,6 +6,10 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
     customError?: ((id: Id, errorType: CodeDeleteErrorType) => any) | undefined;
 }>>>, {}, {}>, {
     "code-block-panel-header"?(_: {}): any;
+    "code-block-panel-tool"?(_: {
+        id: any;
+        data: any;
+    }): any;
 }>;
 export default _default;
 type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;

package/types/services/editor.d.ts

@@ -42,7 +42,7 @@ declare class Editor extends BaseService {
     /**
      * 只有容器拥有布局
      */
-    getLayout(parent: MNode, node?: MNode): Promise<Layout>;
+    getLayout(parent: MNode, node?: MNode | null): Promise<Layout>;
     /**
      * 选中指定节点（将指定节点设置成当前选中状态）
      * @param config 指定节点配置或者ID