From 5b220a0e061e2a54ff87703eccb33954276844a4 Mon Sep 17 00:00:00 2001
From: parisma <parisma@tencent.com>
Date: Tue, 13 Sep 2022 15:32:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(editor):=20codeBlockService=E6=9A=B4?=
 =?UTF-8?q?=E9=9C=B2=E4=B8=80=E4=BA=9B=E6=96=B9=E6=B3=95=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?hook,=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=9D=97=E5=88=B0dsl=E7=9A=84method=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor/src/fields/CodeSelect.vue     | 10 +--
 .../sidebar/code-block/CodeBlockEditor.vue    | 24 ++++---
 .../sidebar/code-block/CodeBlockList.vue      | 24 ++++---
 packages/editor/src/services/codeBlock.ts     | 69 ++++++++++++-------
 packages/editor/src/services/editor.ts        | 24 ++++++-
 packages/editor/src/utils/props.ts            |  4 +-
 packages/schema/src/index.ts                  | 12 ++++
 playground/src/configs/dsl.ts                 |  8 +++
 8 files changed, 122 insertions(+), 53 deletions(-)

diff --git a/packages/editor/src/fields/CodeSelect.vue b/packages/editor/src/fields/CodeSelect.vue
index b1b9c774..8c89196e 100644
--- a/packages/editor/src/fields/CodeSelect.vue
+++ b/packages/editor/src/fields/CodeSelect.vue
@@ -41,16 +41,16 @@ const props = defineProps<{
   size: string;
 }>();
 
-const changeHandler = (value: any) => {
+const changeHandler = async (value: any) => {
   // 记录组件与代码块的绑定关系
   const { id = '' } = services?.editorService.get('node') || {};
-  services?.codeBlockService.setCompRelation(id, value);
+  await services?.codeBlockService.setCompRelation(id, value);
   emit('change', value);
 };
 
-const viewHandler = () => {
-  services?.codeBlockService.setMode(EditorMode.LIST);
-  services?.codeBlockService.setCombineIds(props.model[props.name]);
+const viewHandler = async () => {
+  await services?.codeBlockService.setMode(EditorMode.LIST);
+  await services?.codeBlockService.setCombineIds(props.model[props.name]);
   services?.codeBlockService.setCodeEditorContent(true, props.model[props.name][0]);
 };
 </script>
diff --git a/packages/editor/src/layouts/sidebar/code-block/CodeBlockEditor.vue b/packages/editor/src/layouts/sidebar/code-block/CodeBlockEditor.vue
index 591cc99a..308e7b02 100644
--- a/packages/editor/src/layouts/sidebar/code-block/CodeBlockEditor.vue
+++ b/packages/editor/src/layouts/sidebar/code-block/CodeBlockEditor.vue
@@ -58,7 +58,7 @@ import { computed, inject, ref, watchEffect } from 'vue';
 import { ElMessage } from 'element-plus';
 import { isEmpty } from 'lodash-es';
 
-import type { CodeBlockContent, Services } from '../../../type';
+import type { CodeBlockContent, CodeBlockDSL, Services } from '../../../type';
 import { EditorMode } from '../../../type';
 
 const services = inject<Services>('services');
@@ -66,6 +66,8 @@ const services = inject<Services>('services');
 const codeEditor = ref<any | null>(null);
 // 编辑器当前需展示的代码块内容
 const codeConfig = ref<CodeBlockContent | null>(null);
+// select选择的内容(CodeBlockDSL)
+const selectedValue = ref<CodeBlockDSL | null>(null);
 
 // 是否展示代码编辑区
 const isShowCodeBlockEditor = computed(() => codeConfig.value && services?.codeBlockService.getCodeEditorShowStatus());
@@ -74,15 +76,17 @@ const id = computed(() => services?.codeBlockService.getId() || '');
 const editable = computed(() => services?.codeBlockService.getEditStatus());
 // 当前选中组件绑定的代码块id数组
 const selectedIds = computed(() => services?.codeBlockService.getCombineIds() || []);
-// select选择的内容(CodeBlockDSL)
-const selectedValue = computed(() => services?.codeBlockService.getCodeDslByIds(selectedIds.value));
 
-watchEffect(() => {
-  codeConfig.value = services?.codeBlockService.getCodeContentById(id.value) ?? null;
+watchEffect(async () => {
+  codeConfig.value = (await services?.codeBlockService.getCodeContentById(id.value)) ?? null;
+});
+
+watchEffect(async () => {
+  selectedValue.value = (await services?.codeBlockService.getCodeDslByIds(selectedIds.value)) || null;
 });
 
 // 保存代码
-const saveCode = () => {
+const saveCode = async () => {
   if (!codeEditor.value || !codeConfig.value || !editable.value) return;
 
   try {
@@ -95,7 +99,7 @@ const saveCode = () => {
     return;
   }
   // 存入dsl
-  services?.codeBlockService.setCodeDslById(id.value, {
+  await services?.codeBlockService.setCodeDslById(id.value, {
     name: codeConfig.value.name,
     content: codeConfig.value.content,
   });
@@ -103,9 +107,9 @@ const saveCode = () => {
 };
 
 // 保存并关闭
-const saveAndClose = () => {
-  saveCode();
-  services?.codeBlockService.setCodeEditorShowStatus(false);
+const saveAndClose = async () => {
+  await saveCode();
+  await services?.codeBlockService.setCodeEditorShowStatus(false);
 };
 
 const menuSelectHandler = (item: any) => {
diff --git a/packages/editor/src/layouts/sidebar/code-block/CodeBlockList.vue b/packages/editor/src/layouts/sidebar/code-block/CodeBlockList.vue
index 27faf375..5dd31bc3 100644
--- a/packages/editor/src/layouts/sidebar/code-block/CodeBlockList.vue
+++ b/packages/editor/src/layouts/sidebar/code-block/CodeBlockList.vue
@@ -35,24 +35,28 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, inject } from 'vue';
+import { computed, inject, ref, watchEffect } from 'vue';
 import { Close, Edit } from '@element-plus/icons-vue';
 import { ElMessage } from 'element-plus';
 import { flattenDeep, isEmpty, values } from 'lodash-es';
 
 import type { CodeBlockContent, Services } from '../../../type';
-import { EditorMode } from '../../../type';
+import { CodeBlockDSL, EditorMode } from '../../../type';
 
 import codeBlockEditor from './CodeBlockEditor.vue';
 
 const services = inject<Services>('services');
-
 // 代码块列表
-const codeList = computed(() => services?.codeBlockService.getCodeDsl());
+const codeList = ref<CodeBlockDSL | null>(null);
+
 const editable = computed(() => services?.codeBlockService.getEditStatus());
 
+watchEffect(async () => {
+  codeList.value = (await services?.codeBlockService.getCodeDsl()) || null;
+});
+
 // 新增代码块
-const createCodeBlock = () => {
+const createCodeBlock = async () => {
   const { codeBlockService } = services || {};
   if (!codeBlockService) {
     ElMessage.error('新增代码块失败');
@@ -62,15 +66,15 @@ const createCodeBlock = () => {
     name: '代码块',
     content: `() => {\n  // place your code here\n}`,
   };
-  codeBlockService.setMode(EditorMode.EDITOR);
-  const id = codeBlockService.getUniqueId();
-  codeBlockService.setCodeDslById(id, codeConfig);
+  await codeBlockService.setMode(EditorMode.EDITOR);
+  const id = await codeBlockService.getUniqueId();
+  await codeBlockService.setCodeDslById(id, codeConfig);
   codeBlockService.setCodeEditorContent(true, id);
 };
 
 // 编辑代码块
-const editCode = (key: string) => {
-  services?.codeBlockService.setMode(EditorMode.EDITOR);
+const editCode = async (key: string) => {
+  await services?.codeBlockService.setMode(EditorMode.EDITOR);
   services?.codeBlockService.setCodeEditorContent(true, key);
 };
 
diff --git a/packages/editor/src/services/codeBlock.ts b/packages/editor/src/services/codeBlock.ts
index baf7c7f4..73650022 100644
--- a/packages/editor/src/services/codeBlock.ts
+++ b/packages/editor/src/services/codeBlock.ts
@@ -19,6 +19,7 @@
 import { reactive } from 'vue';
 import { keys, omit, pick } from 'lodash-es';
 
+import editorService from '../services/editor';
 import type { CodeBlockContent, CodeBlockDSL, CodeState, CompRelation } from '../type';
 import { EditorMode } from '../type';
 import { info } from '../utils/logger';
@@ -38,7 +39,21 @@ class CodeBlock extends BaseService {
   });
 
   constructor() {
-    super([]);
+    super([
+      'setCodeDsl',
+      'getCodeDsl',
+      'getCodeContentById',
+      'getCodeDslByIds',
+      'getCurrentDsl',
+      'setCodeDslById',
+      'setCodeEditorShowStatus',
+      'setEditStatus',
+      'setMode',
+      'setCombineIds',
+      'setCompRelation',
+      'setUndeleteableList',
+      'deleteCodeDslByIds',
+    ]);
   }
 
   /**
@@ -46,17 +61,21 @@ class CodeBlock extends BaseService {
    * @param {CodeBlockDSL} codeDsl 代码DSL
    * @returns {void}
    */
-  public setCodeDsl(codeDsl: CodeBlockDSL): void {
+  public async setCodeDsl(codeDsl: CodeBlockDSL): Promise<void> {
     this.state.codeDsl = codeDsl;
+    await editorService.setCodeDsl(this.state.codeDsl);
     info('[code-block]:code-dsl-change', this.state.codeDsl);
     this.emit('code-dsl-change', this.state.codeDsl);
   }
 
   /**
-   * 获取活动的代码块dsl数据源
+   * 获取活动的代码块dsl数据源（默认从dsl中的method字段读取）
    * @returns {CodeBlockDSL | null}
    */
-  public getCodeDsl(): CodeBlockDSL | null {
+  public async getCodeDsl(): Promise<CodeBlockDSL | null> {
+    if (!this.state.codeDsl) {
+      this.state.codeDsl = await editorService.getCodeDsl();
+    }
     return this.state.codeDsl;
   }
 
@@ -65,9 +84,9 @@ class CodeBlock extends BaseService {
    * @param {string} id 代码块id
    * @returns {CodeBlockContent | null}
    */
-  public getCodeContentById(id: string): CodeBlockContent | null {
+  public async getCodeContentById(id: string): Promise<CodeBlockContent | null> {
     if (!id) return null;
-    const totalCodeDsl = this.getCodeDsl();
+    const totalCodeDsl = await this.getCodeDsl();
     if (!totalCodeDsl) return null;
     return totalCodeDsl[id] ?? null;
   }
@@ -78,13 +97,13 @@ class CodeBlock extends BaseService {
    * @param {CodeBlockContent} codeConfig 代码块内容配置信息
    * @returns {void}
    */
-  public setCodeDslById(id: string, codeConfig: CodeBlockContent): void {
-    let codeDsl = this.getCodeDsl();
+  public async setCodeDslById(id: string, codeConfig: CodeBlockContent): Promise<void> {
+    let codeDsl = await this.getCodeDsl();
     codeDsl = {
       ...codeDsl,
       [id]: codeConfig,
     };
-    this.setCodeDsl(codeDsl);
+    await this.setCodeDsl(codeDsl);
   }
 
   /**
@@ -92,8 +111,8 @@ class CodeBlock extends BaseService {
    * @param {string[]} ids 代码块id数组
    * @returns {CodeBlockDSL}
    */
-  public getCodeDslByIds(ids: string[]): CodeBlockDSL {
-    const codeDsl = this.getCodeDsl();
+  public async getCodeDslByIds(ids: string[]): Promise<CodeBlockDSL> {
+    const codeDsl = await this.getCodeDsl();
     return pick(codeDsl, ids) as CodeBlockDSL;
   }
 
@@ -102,7 +121,7 @@ class CodeBlock extends BaseService {
    * @param {boolean} status 是否展示代码编辑面板
    * @returns {void}
    */
-  public setCodeEditorShowStatus(status: boolean): void {
+  public async setCodeEditorShowStatus(status: boolean): Promise<void> {
     this.state.isShowCodeEditor = status;
   }
 
@@ -130,8 +149,8 @@ class CodeBlock extends BaseService {
    * 获取当前选中的代码块内容
    * @returns {CodeBlockContent | null}
    */
-  public getCurrentDsl() {
-    return this.getCodeContentById(this.state.id);
+  public async getCurrentDsl() {
+    return await this.getCodeContentById(this.state.id);
   }
 
   /**
@@ -147,7 +166,7 @@ class CodeBlock extends BaseService {
    * @param {boolean} 是否可编辑
    * @returns {void}
    */
-  public setEditStatus(status: boolean): void {
+  public async setEditStatus(status: boolean): Promise<void> {
     this.state.editable = status;
   }
 
@@ -182,7 +201,7 @@ class CodeBlock extends BaseService {
    * @param {EditorMode} mode 模式
    * @returns {void}
    */
-  public setMode(mode: EditorMode): void {
+  public async setMode(mode: EditorMode): Promise<void> {
     this.state.mode = mode;
   }
 
@@ -191,7 +210,7 @@ class CodeBlock extends BaseService {
    * @param {string[]} ids 代码块id数组
    * @returns {void}
    */
-  public setCombineIds(ids: string[]): void {
+  public async setCombineIds(ids: string[]): Promise<void> {
     this.state.combineIds = ids;
   }
 
@@ -209,7 +228,7 @@ class CodeBlock extends BaseService {
    * @param {string[]} codeIds 代码块id数组
    * @returns {void}
    */
-  public setCompRelation(compId: number | string, codeIds: string[]) {
+  public async setCompRelation(compId: number | string, codeIds: string[]) {
     if (!compId) return;
     this.state.compRelation = {
       [compId]: codeIds,
@@ -237,7 +256,7 @@ class CodeBlock extends BaseService {
    * @param {string[]} codeIds 代码块id数组
    * @returns {void}
    */
-  public setUndeleteableList(codeIds: string[]): void {
+  public async setUndeleteableList(codeIds: string[]): Promise<void> {
     this.state.undeletableList = codeIds;
   }
 
@@ -246,10 +265,10 @@ class CodeBlock extends BaseService {
    * @param {string[]} codeIds 需要删除的代码块id数组
    * @returns {CodeBlockDSL} 删除后的code dsl
    */
-  public deleteCodeDslByIds(codeIds: string[]): CodeBlockDSL {
-    const currentDsl = this.getCodeDsl();
+  public async deleteCodeDslByIds(codeIds: string[]): Promise<CodeBlockDSL> {
+    const currentDsl = await this.getCodeDsl();
     const newDsl = omit(currentDsl, codeIds);
-    this.setCodeDsl(newDsl);
+    await this.setCodeDsl(newDsl);
     return newDsl;
   }
 
@@ -257,13 +276,13 @@ class CodeBlock extends BaseService {
    * 生成代码块唯一id
    * @returns {string} 代码块唯一id
    */
-  public getUniqueId(): string {
+  public async getUniqueId(): Promise<string> {
     const newId = (Date.now().toString(36) + Math.random().toString(36).substring(2)).padEnd(19, '0');
     // 判断是否重复
-    const dsl = this.getCodeDsl();
+    const dsl = await this.getCodeDsl();
     const existedIds = keys(dsl);
     if (!existedIds.includes(newId)) return newId;
-    return this.getUniqueId();
+    return await this.getUniqueId();
   }
 
   public destroy() {
diff --git a/packages/editor/src/services/editor.ts b/packages/editor/src/services/editor.ts
index 0264a876..7c364e0d 100644
--- a/packages/editor/src/services/editor.ts
+++ b/packages/editor/src/services/editor.ts
@@ -19,7 +19,7 @@
 import { reactive, toRaw } from 'vue';
 import { cloneDeep, mergeWith, uniq } from 'lodash-es';
 
-import type { Id, MApp, MComponent, MContainer, MNode, MPage } from '@tmagic/schema';
+import type { CodeBlockDSL, Id, MApp, MComponent, MContainer, MNode, MPage } from '@tmagic/schema';
 import { NodeType } from '@tmagic/schema';
 import StageCore from '@tmagic/stage';
 import { getNodePath, isNumber, isPage, isPop } from '@tmagic/utils';
@@ -80,6 +80,8 @@ class Editor extends BaseService {
         'undo',
         'redo',
         'highlight',
+        'getCodeDsl',
+        'setCodeDsl',
       ],
       // 需要注意循环依赖问题，如果函数间有相互调用的话，不能设置为串行调用
       ['select', 'update', 'moveLayer'],
@@ -760,6 +762,26 @@ class Editor extends BaseService {
     this.get<Map<Id, Id>>('modifiedNodeIds').clear();
   }
 
+  /**
+   * 从dsl中的method字段读取活动的代码块
+   * @returns {CodeBlockDSL | null}
+   */
+  public async getCodeDsl(): Promise<CodeBlockDSL | null> {
+    const root = this.get<MApp | null>('root');
+    if (!root) return null;
+    return root.method || null;
+  }
+
+  /**
+   * 设置代码块到dsl的method字段
+   * @param {CodeBlockDSL} codeDsl 代码DSL
+   * @returns {void}
+   */
+  public async setCodeDsl(codeDsl: CodeBlockDSL): Promise<void> {
+    if (!this.state.root) return;
+    this.state.root.method = codeDsl;
+  }
+
   private addModifiedNodeId(id: Id) {
     if (!this.isHistoryStateChange) {
       this.get<Map<Id, Id>>('modifiedNodeIds').set(id, id);
diff --git a/packages/editor/src/utils/props.ts b/packages/editor/src/utils/props.ts
index 65978153..eadecb8c 100644
--- a/packages/editor/src/utils/props.ts
+++ b/packages/editor/src/utils/props.ts
@@ -233,8 +233,8 @@ export const fillConfig = (config: FormConfig = []) => [
             labelWidth: '100px',
             selectConfig: {
               multiple: true,
-              options: () => {
-                const codeDsl = codeBlockService.getCodeDsl();
+              options: async () => {
+                const codeDsl = await codeBlockService.getCodeDsl();
                 if (codeDsl) {
                   return map(codeDsl, (value, key) => ({
                     text: `${value.name}（${key}）`,
diff --git a/packages/schema/src/index.ts b/packages/schema/src/index.ts
index 623e881c..ad582e92 100644
--- a/packages/schema/src/index.ts
+++ b/packages/schema/src/index.ts
@@ -68,8 +68,20 @@ export interface MApp extends MComponent {
   type: NodeType.ROOT;
   /** */
   items: MPage[];
+  /** 代码块 */
+  method: CodeBlockDSL;
 }
 
+export interface CodeBlockDSL {
+  [id: string]: CodeBlockContent;
+}
+
+export interface CodeBlockContent {
+  /** 代码块名称 */
+  name: string;
+  /** 代码块内容 */
+  content: string;
+}
 export interface PastePosition {
   left?: number;
   top?: number;
diff --git a/playground/src/configs/dsl.ts b/playground/src/configs/dsl.ts
index 39c71396..8dda0cc4 100644
--- a/playground/src/configs/dsl.ts
+++ b/playground/src/configs/dsl.ts
@@ -20,6 +20,14 @@ export default {
   id: '75f0extui9d7yksklx27hff8xg',
   name: 'test',
   type: 'app',
+  method: {
+    l7znj1q24wilb357ay6: {
+      name: 'getData',
+      content: () => {
+        console.log('this is getData function');
+      },
+    },
+  },
   items: [
     {
       type: 'page',