@tmagic/editor 1.0.0-beta.5 → 1.0.0-beta.8

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.8",
   "name": "@tmagic/editor",
   "sideEffects": false,
   "main": "dist/tmagic-editor.umd.js",
@@ -28,13 +28,13 @@
   },
   "dependencies": {
     "@element-plus/icons": "0.0.11",
-    "@tmagic/core": "^1.0.0-beta.5",
-    "@tmagic/form": "^1.0.0-beta.5",
-    "@tmagic/schema": "^1.0.0-beta.5",
-    "@tmagic/stage": "^1.0.0-beta.5",
-    "@tmagic/utils": "^1.0.0-beta.5",
+    "@tmagic/core": "^1.0.0-beta.8",
+    "@tmagic/form": "^1.0.0-beta.8",
+    "@tmagic/schema": "^1.0.0-beta.8",
+    "@tmagic/stage": "^1.0.0-beta.8",
+    "@tmagic/utils": "^1.0.0-beta.8",
     "color": "^3.1.3",
-    "element-plus": "^2.0.2",
+    "element-plus": "^2.1.7",
     "events": "^3.3.0",
     "lodash-es": "^4.17.21",
     "monaco-editor": "^0.32.1",
@@ -55,5 +55,6 @@
     "vite": "^2.3.7",
     "vite-plugin-dts": "^0.9.6",
     "vue-tsc": "^0.0.24"
-  }
+  },
+  "gitHead": "ff8e32901775ecc145a82f906d6af6119652d61e"
 }

package/src/layouts/PropsPanel.vue

@@ -1,6 +1,7 @@
 <template>
   <m-form
     class="m-editor-props-panel"
+    popper-class="m-editor-props-panel-popper"
     ref="configForm"
     size="small"
     :init-values="values"

package/src/services/editor.ts

@@ -184,6 +184,10 @@ class Editor extends BaseService {
     const { node, parent, page } = this.getNodeInfo(id);
     if (!node) throw new Error('获取不到组件信息');
 
+    if (node.id === this.state.root?.id) {
+      throw new Error('不能选根节点');
+    }
+
     this.set('node', node);
     this.set('page', page || null);
     this.set('parent', parent || null);
@@ -291,7 +295,7 @@ class Editor extends BaseService {
 
     let newConfig = await this.toggleFixedPosition(toRaw(config), node, this.get<MApp>('root'));
 
-    newConfig = mergeWith(node, newConfig, (objValue, srcValue) => {
+    newConfig = mergeWith(cloneDeep(node), newConfig, (objValue, srcValue) => {
       if (Array.isArray(srcValue)) {
         return srcValue;
       }
@@ -355,6 +359,8 @@ class Editor extends BaseService {
     await this.update(parent);
     await this.select(node);
 
+    this.get<StageCore>('stage')?.update({ config: cloneDeep(node), root: this.get('root') });
+
     this.addModifiedNodeId(parent.id);
     this.pushHistoryState();
   }

package/src/theme/props-panel.scss

@@ -14,4 +14,18 @@
   .el-tabs__item {
     font-size: 12px;
   }
+
+  span,
+  a,
+  p {
+    font-size: 12px;
+  }
+}
+
+.m-editor-props-panel-popper {
+  span,
+  a,
+  p {
+    font-size: 12px;
+  }
 }

package/src/utils/scroll-viewer.ts

@@ -155,11 +155,13 @@ export class ScrollViewer {
       event.preventDefault();
       event.stopImmediatePropagation();
       event.stopPropagation();
-    } else if (this.keydown) return;
+    }
 
-    this.keydown = true;
+    if (event.code !== Keys.ESCAPE || !this.enter || this.keydown) {
+      return;
+    }
 
-    event.preventDefault();
+    this.keydown = true;
 
     this.target.style.cursor = 'grab';
     this.container.addEventListener('mousedown', this.mousedownHandler);