From e0697833dab7b2b3850b955312ca1e71379cf848 Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Mon, 19 Sep 2022 18:45:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(editor):=20code-link=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=B8=8D=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor/src/fields/Code.vue     |  38 ++++----
 packages/editor/src/fields/CodeLink.vue | 121 +++++++++++-------------
 packages/editor/src/index.ts            |   4 +-
 3 files changed, 73 insertions(+), 90 deletions(-)

diff --git a/packages/editor/src/fields/Code.vue b/packages/editor/src/fields/Code.vue
index f093a26c..a7f9ea4f 100644
--- a/packages/editor/src/fields/Code.vue
+++ b/packages/editor/src/fields/Code.vue
@@ -7,29 +7,25 @@
   ></magic-code-editor>
 </template>
 
-<script lang="ts">
-import { computed, defineComponent } from 'vue';
+<script lang="ts" setup>
+import { computed } from 'vue';
 
-export default defineComponent({
-  name: 'm-fields-vs-code',
+const emit = defineEmits(['change']);
 
-  props: ['model', 'name', 'config', 'prop'],
+const props = defineProps<{
+  model: any;
+  name: string;
+  config: {
+    language?: string;
+  };
+  prop: string;
+}>();
 
-  emits: ['change'],
+const language = computed(() => props.config.language || 'javascript');
+const height = computed(() => `${document.body.clientHeight - 168}px`);
 
-  setup(props, { emit }) {
-    const language = computed(() => props.config.language || 'javascript');
-    const height = computed(() => `${document.body.clientHeight - 168}px`);
-
-    return {
-      height,
-      language,
-
-      save(v: string) {
-        props.model[props.name] = v;
-        emit('change', v);
-      },
-    };
-  },
-});
+const save = (v: string) => {
+  props.model[props.name] = v;
+  emit('change', v);
+};
 </script>
diff --git a/packages/editor/src/fields/CodeLink.vue b/packages/editor/src/fields/CodeLink.vue
index 5815f95a..808587c4 100644
--- a/packages/editor/src/fields/CodeLink.vue
+++ b/packages/editor/src/fields/CodeLink.vue
@@ -2,80 +2,67 @@
   <m-fields-link :config="formConfig" :model="modelValue" name="form" @change="changeHandler"></m-fields-link>
 </template>
 
-<script lang="ts">
-import { computed, defineComponent, PropType, ref, watchEffect } from 'vue';
+<script lang="ts" setup>
+import { computed, reactive, watch } from 'vue';
 import serialize from 'serialize-javascript';
 
-interface CodeLinkConfig {
-  type: 'code-link';
+const props = defineProps<{
+  config: {
+    type: 'code-link';
+    name: string;
+    text?: string;
+    formTitle?: string;
+  };
+  model: any;
   name: string;
-  text?: string;
-  formTitle?: string;
-}
+  prop: string;
+}>();
 
-export default defineComponent({
-  name: 'm-fields-code-link',
+const emit = defineEmits(['change']);
 
-  props: {
-    config: {
-      type: Object as PropType<CodeLinkConfig>,
+const formConfig = computed(() => ({
+  ...props.config,
+  text: '',
+  type: 'link',
+  form: [
+    {
+      name: props.name,
+      type: 'vs-code',
     },
+  ],
+}));
 
-    model: {
-      type: Object,
-    },
-
-    name: {
-      type: String,
-    },
-
-    prop: {
-      type: String,
-    },
-  },
-
-  emits: ['change'],
-
-  setup(props, { emit }) {
-    const modelValue = ref<{ form: Record<string, any> }>({
-      form: {},
-    });
-
-    watchEffect(() => {
-      if (!props.model || !props.name) return;
-      modelValue.value.form[props.name] = serialize(props.model[props.name], {
-        space: 2,
-        unsafe: true,
-      }).replace(/"(\w+)":\s/g, '$1: ');
-    });
-
-    return {
-      modelValue,
-
-      formConfig: computed(() => ({
-        ...props.config,
-        text: '',
-        type: 'link',
-        form: [
-          {
-            name: props.name,
-            type: 'vs-code',
-          },
-        ],
-      })),
-
-      changeHandler(v: Record<string, any>) {
-        if (!props.name || !props.model) return;
-
-        try {
-          // eslint-disable-next-line no-eval
-          props.model[props.name] = eval(`${v[props.name]}`);
-          emit('change', props.model[props.name]);
-        } catch (e) {
-          console.error(e);
-        }
-      },
-    };
+const modelValue = reactive<{ form: Record<string, string> }>({
+  form: {
+    [props.name]: '',
   },
 });
+
+watch(
+  () => props.model[props.name],
+  (value) => {
+    console.log(props.model[props.name]);
+    modelValue.form = {
+      [props.name]: serialize(value, {
+        space: 2,
+        unsafe: true,
+      }).replace(/"(\w+)":\s/g, '$1: '),
+    };
+  },
+  {
+    immediate: true,
+  },
+);
+
+const changeHandler = (v: Record<string, any>) => {
+  if (!props.name || !props.model) return;
+
+  try {
+    // eslint-disable-next-line no-eval
+    props.model[props.name] = eval(`(${v[props.name]})`);
+    emit('change', props.model[props.name]);
+  } catch (e) {
+    console.error(e);
+  }
+};
 </script>
diff --git a/packages/editor/src/index.ts b/packages/editor/src/index.ts
index ae4f1ebd..2477b1e5 100644
--- a/packages/editor/src/index.ts
+++ b/packages/editor/src/index.ts
@@ -59,8 +59,8 @@ export default {
 
     app.component(Editor.name, Editor);
     app.component('m-fields-ui-select', uiSelect);
-    app.component(CodeLink.name, CodeLink);
-    app.component(Code.name, Code);
+    app.component('m-fields-code-link', CodeLink);
+    app.component('m-fields-vs-code', Code);
     app.component(CodeEditor.name, CodeEditor);
   },
 };