From e577628852a59607da39be580465c2f4ca758da4 Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Wed, 19 Jul 2023 14:57:26 +0800
Subject: [PATCH] =?UTF-8?q?style(editor):=20=E4=BB=A3=E7=A0=81=E5=9D=97?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=B8=AD=E4=BB=A3=E7=A0=81=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=99=A8=E9=AB=98=E5=BA=A6=E8=87=AA=E5=8A=A8=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=BF=9D=E6=8C=81=E8=A1=A8=E5=8D=95=E4=B8=8D=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor/src/components/CodeBlockEditor.vue | 16 +++++++++-
 packages/editor/src/fields/Code.vue           |  9 ++----
 packages/editor/src/index.ts                  |  1 +
 packages/editor/src/layouts/CodeEditor.vue    |  2 +-
 packages/editor/src/layouts/Framework.vue     | 10 +++++--
 packages/form/src/FormDrawer.vue              | 30 ++++++++++++++-----
 packages/form/src/theme/form-drawer.scss      |  6 ++++
 7 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/packages/editor/src/components/CodeBlockEditor.vue b/packages/editor/src/components/CodeBlockEditor.vue
index 25a4a1df..d61c6b3d 100644
--- a/packages/editor/src/components/CodeBlockEditor.vue
+++ b/packages/editor/src/components/CodeBlockEditor.vue
@@ -9,6 +9,7 @@
     :disabled="disabled"
     @submit="submitForm"
     @error="errorHandler"
+    @open="openHandler"
   ></MFormDrawer>
 </template>
 
@@ -37,7 +38,10 @@ const emit = defineEmits<{
 
 const services = inject<Services>('services');
 
-const size = computed(() => globalThis.document.body.clientWidth - (services?.uiService.get('columnWidth').left || 0));
+const columnWidth = computed(() => services?.uiService.get('columnWidth'));
+const size = computed(() => (columnWidth.value ? columnWidth.value.center + columnWidth.value.right : 600));
+
+const codeEditorHeight = ref('600px');
 
 const defaultParamColConfig: ColumnConfig = {
   type: 'row',
@@ -104,6 +108,7 @@ const functionConfig = computed(() => [
     name: 'content',
     type: 'vs-code',
     options: inject('codeOptions', {}),
+    height: codeEditorHeight.value,
     onChange: (formState: FormState | undefined, code: string) => {
       try {
         // 检测js代码是否存在语法错误
@@ -129,6 +134,15 @@ const errorHandler = (error: any) => {
 
 const fomDrawer = ref<InstanceType<typeof MFormDrawer>>();
 
+const openHandler = () => {
+  setTimeout(() => {
+    if (fomDrawer.value) {
+      const height = fomDrawer.value?.bodyHeight - 468;
+      codeEditorHeight.value = `${height > 100 ? height : 600}px`;
+    }
+  });
+};
+
 defineExpose({
   show() {
     fomDrawer.value?.show();
diff --git a/packages/editor/src/fields/Code.vue b/packages/editor/src/fields/Code.vue
index aa5369fb..2760c1f7 100644
--- a/packages/editor/src/fields/Code.vue
+++ b/packages/editor/src/fields/Code.vue
@@ -1,8 +1,8 @@
 <template>
   <MagicCodeEditor
-    :height="height"
+    :height="config.height"
     :init-values="model[name]"
-    :language="language"
+    :language="config.language"
     :options="{
       ...config.options,
       readOnly: disabled,
@@ -12,8 +12,6 @@
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
-
 import MagicCodeEditor from '@editor/layouts/CodeEditor.vue';
 
 defineOptions({
@@ -41,9 +39,6 @@ const props = withDefaults(
   },
 );
 
-const language = computed(() => props.config.language || 'javascript');
-const height = computed(() => props.config.height || `${document.body.clientHeight - 168}px`);
-
 const save = (v: string) => {
   props.model[props.name] = v;
   emit('change', v);
diff --git a/packages/editor/src/index.ts b/packages/editor/src/index.ts
index 59466894..61eacc51 100644
--- a/packages/editor/src/index.ts
+++ b/packages/editor/src/index.ts
@@ -62,6 +62,7 @@ export { default as DataSourceMethodSelect } from './fields/DataSourceMethodSele
 export { default as EventSelect } from './fields/EventSelect.vue';
 export { default as KeyValue } from './fields/KeyValue.vue';
 export { default as CodeBlockList } from './layouts/sidebar/code-block/CodeBlockList.vue';
+export { default as CodeBlockListPanel } from './layouts/sidebar/code-block/CodeBlockListPanel.vue';
 export { default as PropsPanel } from './layouts/PropsPanel.vue';
 export { default as ToolButton } from './components/ToolButton.vue';
 export { default as ContentMenu } from './components/ContentMenu.vue';
diff --git a/packages/editor/src/layouts/CodeEditor.vue b/packages/editor/src/layouts/CodeEditor.vue
index 76e26b69..bb87bbf9 100644
--- a/packages/editor/src/layouts/CodeEditor.vue
+++ b/packages/editor/src/layouts/CodeEditor.vue
@@ -3,7 +3,7 @@
     <Teleport to="body" :disabled="!fullScreen">
       <div
         :class="`magic-code-editor-wrapper${fullScreen ? ' full-screen' : ''}`"
-        :style="!fullScreen && height ? `height: ${height}` : ''"
+        :style="!fullScreen && height ? `height: ${height}` : '100%'"
       >
         <TMagicButton
           class="magic-code-editor-full-screen-icon"
diff --git a/packages/editor/src/layouts/Framework.vue b/packages/editor/src/layouts/Framework.vue
index e3bf4da3..1012a36b 100644
--- a/packages/editor/src/layouts/Framework.vue
+++ b/packages/editor/src/layouts/Framework.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="m-editor">
+  <div class="m-editor" ref="content">
     <slot name="header"></slot>
 
     <slot name="nav"></slot>
@@ -67,6 +67,8 @@ const DEFAULT_RIGHT_COLUMN_WIDTH = 480;
 const codeOptions = inject('codeOptions', {});
 const { editorService, uiService } = inject<Services>('services') || {};
 
+const content = ref<HTMLDivElement>();
+
 const root = computed(() => editorService?.get('root'));
 
 const pageLength = computed(() => editorService?.get('pageLength') || 0);
@@ -91,13 +93,15 @@ watch(
 
     columnWidth.value.left = left;
 
+    const container = content.value || document.body;
+
     if (length <= 0) {
       columnWidth.value.right = undefined;
-      columnWidth.value.center = globalThis.document.body.clientWidth - left;
+      columnWidth.value.center = container.clientWidth - left;
     } else {
       const right = columnWidth.value.right || RightColumnWidthCacheData || DEFAULT_RIGHT_COLUMN_WIDTH;
       columnWidth.value.right = right;
-      columnWidth.value.center = globalThis.document.body.clientWidth - left - right;
+      columnWidth.value.center = container.clientWidth - left - right;
     }
 
     uiService?.set('columnWidth', columnWidth.value as GetColumnWidth);
diff --git a/packages/form/src/FormDrawer.vue b/packages/form/src/FormDrawer.vue
index 0090f7c8..da25ffaa 100644
--- a/packages/form/src/FormDrawer.vue
+++ b/packages/form/src/FormDrawer.vue
@@ -9,12 +9,10 @@
     :close-on-click-modal="true"
     :size="width"
     :zIndex="zIndex"
+    @open="openHandler"
+    @opened="openedHandler"
   >
-    <div
-      v-if="visible"
-      class="m-drawer-body"
-      :style="`max-height: ${bodyHeight}; overflow-y: auto; overflow-x: hidden;`"
-    >
+    <div v-if="visible" ref="drawerBody" class="m-drawer-body">
       <Form
         ref="form"
         :size="size"
@@ -47,7 +45,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
+import { ref, watchEffect } from 'vue';
 
 import { TMagicButton, TMagicCol, TMagicDrawer, TMagicRow } from '@tmagic/design';
 
@@ -78,12 +76,19 @@ withDefaults(
   },
 );
 
-const emit = defineEmits(['close', 'submit', 'error', 'change']);
+const emit = defineEmits(['close', 'submit', 'error', 'change', 'open', 'opened']);
 
 const form = ref<InstanceType<typeof Form>>();
+const drawerBody = ref<HTMLDivElement>();
 const visible = ref(false);
 const saveFetch = ref(false);
-const bodyHeight = ref(`${document.body.clientHeight - 194}px`);
+const bodyHeight = ref(0);
+
+watchEffect(() => {
+  if (drawerBody.value) {
+    bodyHeight.value = drawerBody.value.clientHeight;
+  }
+});
 
 const submitHandler = async () => {
   try {
@@ -98,6 +103,14 @@ const changeHandler = (value: any) => {
   emit('change', value);
 };
 
+const openHandler = (value: any) => {
+  emit('open', value);
+};
+
+const openedHandler = (value: any) => {
+  emit('opened', value);
+};
+
 const show = () => {
   visible.value = true;
 };
@@ -109,6 +122,7 @@ const hide = () => {
 defineExpose({
   form,
   saveFetch,
+  bodyHeight,
 
   show,
   hide,
diff --git a/packages/form/src/theme/form-drawer.scss b/packages/form/src/theme/form-drawer.scss
index 1b26e075..6ea0a244 100644
--- a/packages/form/src/theme/form-drawer.scss
+++ b/packages/form/src/theme/form-drawer.scss
@@ -2,4 +2,10 @@
   .el-drawer__header {
     margin: 0;
   }
+
+  .m-drawer-body {
+    height: 100%;
+    overflow-y: auto;
+    overflow-x: hidden;
+  }
 }