From 5de3eeda716199f6e21772189214f7cfcec82e13 Mon Sep 17 00:00:00 2001
From: parisma <parisma@tencent.com>
Date: Mon, 19 Sep 2022 16:42:01 +0800
Subject: [PATCH] =?UTF-8?q?refactor(editor):=20cr=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/package.json                                  | 6 +++---
 .../src/layouts/sidebar/code-block/CodeBlockEditor.vue      | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 5c127444..8f692ff3 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -35,14 +35,14 @@
     "vue"
   ],
   "dependencies": {
-    "@tmagic/schema": "1.1.6",
-    "events": "^3.3.0"
+    "@tmagic/schema": "1.1.5",
+    "events": "^3.3.0",
+    "lodash-es": "^4.17.21"
   },
   "devDependencies": {
     "@types/events": "^3.0.0",
     "@types/lodash-es": "^4.17.4",
     "@types/node": "^15.12.4",
-    "lodash-es": "^4.17.21",
     "rimraf": "^3.0.2",
     "typescript": "^4.7.4",
     "vite": "^3.1.3"
diff --git a/packages/editor/src/layouts/sidebar/code-block/CodeBlockEditor.vue b/packages/editor/src/layouts/sidebar/code-block/CodeBlockEditor.vue
index f19116cd..0b86a4eb 100644
--- a/packages/editor/src/layouts/sidebar/code-block/CodeBlockEditor.vue
+++ b/packages/editor/src/layouts/sidebar/code-block/CodeBlockEditor.vue
@@ -83,11 +83,12 @@ import { forIn, isEmpty } from 'lodash-es';
 
 import type { CodeBlockContent, CodeDslList, ListState, Services } from '../../../type';
 import { EditorMode } from '../../../type';
+import MagicCodeEditor from '../../CodeEditor.vue';
 import Layout from '../../Layout.vue';
 
 const services = inject<Services>('services');
 
-const codeEditor = ref<any | null>(null);
+const codeEditor = ref<InstanceType<typeof MagicCodeEditor>>();
 const left = ref(200);
 const currentTitle = ref('');
 // 编辑器当前需展示的代码块内容
@@ -108,7 +109,7 @@ const editable = computed(() => services?.codeBlockService.getEditStatus());
 const selectedIds = computed(() => services?.codeBlockService.getCombineIds() || []);
 
 watchEffect(async () => {
-  codeConfig.value = (await services?.codeBlockService.getCodeContentById(id.value)) ?? null;
+  codeConfig.value = (await services?.codeBlockService.getCodeContentById(id.value)) || null;
 });
 
 watchEffect(async () => {