From 97101f18a6e2b86ca8c293f6af77069681a85ced Mon Sep 17 00:00:00 2001 From: roymondchen Date: Tue, 6 Jun 2023 14:20:12 +0800 Subject: [PATCH] =?UTF-8?q?feat(editor):=20=E6=B7=BB=E5=8A=A0=E5=87=A0?= =?UTF-8?q?=E4=B8=AAslot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/editor/src/Editor.vue | 20 ++++++++++++++- packages/editor/src/layouts/CodeEditor.vue | 4 +-- packages/editor/src/layouts/Framework.vue | 30 ++++++++++------------ 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/packages/editor/src/Editor.vue b/packages/editor/src/Editor.vue index 72df41c1..0fd9bc03 100644 --- a/packages/editor/src/Editor.vue +++ b/packages/editor/src/Editor.vue @@ -1,9 +1,19 @@ diff --git a/packages/editor/src/layouts/CodeEditor.vue b/packages/editor/src/layouts/CodeEditor.vue index 30975f7a..ca51ed17 100644 --- a/packages/editor/src/layouts/CodeEditor.vue +++ b/packages/editor/src/layouts/CodeEditor.vue @@ -14,8 +14,8 @@ defineOptions({ const props = withDefaults( defineProps<{ - initValues?: string | Object; - modifiedValues?: string | Object; + initValues?: string | Record | null; + modifiedValues?: string | Record | null; type?: 'diff'; language?: string; options?: { diff --git a/packages/editor/src/layouts/Framework.vue b/packages/editor/src/layouts/Framework.vue index 4e162780..a6001e67 100644 --- a/packages/editor/src/layouts/Framework.vue +++ b/packages/editor/src/layouts/Framework.vue @@ -1,14 +1,14 @@ + + + @@ -51,6 +54,7 @@ import Layout from '@editor/components/Layout.vue'; import type { GetColumnWidth, Services } from '@editor/type'; import AddPageBox from './AddPageBox.vue'; +import CodeEditor from './CodeEditor.vue'; defineOptions({ name: 'MEditorFramework', @@ -59,15 +63,7 @@ defineOptions({ const DEFAULT_LEFT_COLUMN_WIDTH = 310; const DEFAULT_RIGHT_COLUMN_WIDTH = 480; -withDefaults( - defineProps<{ - codeOptions?: Record; - }>(), - { - codeOptions: () => ({}), - }, -); - +const codeOptions = inject('codeOptions', {}); const { editorService, uiService } = inject('services') || {}; const root = computed(() => editorService?.get('root'));