@tmagic/editor 1.2.0-beta.19 → 1.2.0-beta.20

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.0-beta.19",
+  "version": "1.2.0-beta.20",
   "name": "@tmagic/editor",
   "sideEffects": [
     "dist/*",
@@ -45,12 +45,12 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@element-plus/icons-vue": "^2.0.9",
-    "@tmagic/core": "1.2.0-beta.19",
-    "@tmagic/design": "1.2.0-beta.19",
-    "@tmagic/form": "1.2.0-beta.19",
-    "@tmagic/schema": "1.2.0-beta.19",
-    "@tmagic/stage": "1.2.0-beta.19",
-    "@tmagic/utils": "1.2.0-beta.19",
+    "@tmagic/core": "1.2.0-beta.20",
+    "@tmagic/design": "1.2.0-beta.20",
+    "@tmagic/form": "1.2.0-beta.20",
+    "@tmagic/schema": "1.2.0-beta.20",
+    "@tmagic/stage": "1.2.0-beta.20",
+    "@tmagic/utils": "1.2.0-beta.20",
     "buffer": "^6.0.3",
     "color": "^3.1.3",
     "events": "^3.3.0",
@@ -62,8 +62,8 @@
     "vue": "^3.2.37"
   },
   "peerDependencies": {
-    "@tmagic/design": "1.2.0-beta.19",
-    "@tmagic/form": "1.2.0-beta.19",
+    "@tmagic/design": "1.2.0-beta.20",
+    "@tmagic/form": "1.2.0-beta.20",
     "monaco-editor": "^0.34.0",
     "vue": "^3.2.37"
   },

package/src/Editor.vue

@@ -224,15 +224,25 @@ export default defineComponent({
 
   setup(props, { emit }) {
     editorService.on('root-change', (value) => {
-      const node = editorService.get<MNode | null>('node');
-      const nodeId = node?.id || props.defaultSelected;
-      if (nodeId && node !== value) {
-        editorService.select(nodeId);
-      } else {
+      const nodeId = editorService.get<MNode | null>('node')?.id || props.defaultSelected;
+      let node;
+      if (nodeId) {
+        node = editorService.getNodeById(nodeId);
+      }
+
+      if (node && node !== value) {
+        editorService.select(node.id);
+      } else if (value?.items?.length) {
+        editorService.select(value.items[0]);
+      } else if (value?.id) {
         editorService.set('nodes', [value]);
+        editorService.set('parent', null);
+        editorService.set('page', null);
       }
 
-      emit('update:modelValue', toRaw(editorService.get('root')));
+      if (toRaw(value) !== toRaw(editorService.get('root'))) {
+        emit('update:modelValue', value);
+      }
     });
 
     // 初始值变化，重新设置节点信息

package/src/layouts/workspace/Stage.vue

@@ -62,7 +62,7 @@ const zoom = computed(() => services?.uiService.get<number>('zoom') || 1);
 const node = computed(() => services?.editorService.get<MNode>('node'));
 
 watchEffect(() => {
-  if (stage) return;
+  if (stage || !page.value) return;
 
   if (!stageContainer.value) return;
   if (!(stageOptions?.runtimeUrl || stageOptions?.render) || !root.value) return;

package/src/services/editor.ts

@@ -352,6 +352,9 @@ class Editor extends BaseService {
 
     const newNodes = await Promise.all(
       addNodes.map((node) => {
+        if (isPage(node)) {
+          return this.doAdd(node, this.get('root'));
+        }
         const parentNode = parent && typeof parent !== 'function' ? parent : getAddParent(node);
         if (!parentNode) throw new Error('未找到父元素');
         return this.doAdd(node, parentNode);
@@ -579,7 +582,7 @@ class Editor extends BaseService {
 
     const pasteConfigs = await this.doPaste(config, position);
 
-    return this.add(pasteConfigs);
+    return this.add(pasteConfigs, this.get('parent'));
   }
 
   public async doPaste(config: MNode[], position: PastePosition = {}): Promise<MNode[]> {

package/src/utils/index.ts

@@ -21,3 +21,4 @@ export * from './props';
 export * from './logger';
 export * from './editor';
 export * from './stage';
+export * from './operator';

package/types/utils/index.d.ts

@@ -3,3 +3,4 @@ export * from './props';
 export * from './logger';
 export * from './editor';
 export * from './stage';
+export * from './operator';