@tmagic/editor 1.2.8 → 1.2.10

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.8",
+  "version": "1.2.10",
   "name": "@tmagic/editor",
   "type": "module",
   "sideEffects": [
@@ -46,12 +46,12 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@element-plus/icons-vue": "^2.0.9",
-    "@tmagic/core": "1.2.8",
-    "@tmagic/design": "1.2.8",
-    "@tmagic/form": "1.2.8",
-    "@tmagic/schema": "1.2.8",
-    "@tmagic/stage": "1.2.8",
-    "@tmagic/utils": "1.2.8",
+    "@tmagic/core": "1.2.10",
+    "@tmagic/design": "1.2.10",
+    "@tmagic/form": "1.2.10",
+    "@tmagic/schema": "1.2.10",
+    "@tmagic/stage": "1.2.10",
+    "@tmagic/utils": "1.2.10",
     "buffer": "^6.0.3",
     "color": "^3.1.3",
     "events": "^3.3.0",
@@ -63,8 +63,8 @@
     "vue": "^3.2.37"
   },
   "peerDependencies": {
-    "@tmagic/design": "1.2.8",
-    "@tmagic/form": "1.2.8",
+    "@tmagic/design": "1.2.10",
+    "@tmagic/form": "1.2.10",
     "monaco-editor": "^0.34.0",
     "vue": "^3.2.37"
   },

package/src/Editor.vue

@@ -247,6 +247,10 @@ export default defineComponent({
       if (toRaw(value) !== toRaw(preValue)) {
         emit('update:modelValue', value);
       }
+
+      value.codeBlocks = value.codeBlocks || {};
+
+      codeBlockService.setCodeDsl(value.codeBlocks);
     };
 
     editorService.on('root-change', rootChangeHandler);

package/src/components/FunctionEditor.vue

@@ -136,7 +136,7 @@ watchEffect(() => {
 });
 
 const initTableModel = (): void => {
-  const codeDsl = cloneDeep(services?.codeBlockService.getCodeDslSync());
+  const codeDsl = cloneDeep(services?.codeBlockService.getCodeDsl());
   if (!codeDsl) return;
   tableModel.value = {
     params: codeDsl[props.id]?.params || [],

package/src/fields/CodeSelect.vue

@@ -44,7 +44,7 @@ const props = defineProps<{
   name: string;
   size: 'mini' | 'small' | 'medium';
 }>();
-const codeDsl = computed(() => services?.codeBlockService.getCodeDslSync());
+const codeDsl = computed(() => services?.codeBlockService.getCodeDsl());
 
 const tableConfig = computed<FormItem>(() => {
   const defaultConfig = {

package/src/layouts/sidebar/code-block/CodeBlockList.vue

@@ -164,7 +164,7 @@ watch(
 );
 
 watch(
-  [() => services?.codeBlockService.getCodeDslSync(), () => services?.codeBlockService.getCombineInfo()],
+  [() => services?.codeBlockService.getCodeDsl(), () => services?.codeBlockService.getCombineInfo()],
   () => {
     refreshCodeList();
   },

package/src/services/codeBlock.ts

@@ -41,8 +41,6 @@ class CodeBlock extends BaseService {
 
   constructor() {
     super([
-      'setCodeDsl',
-      'getCodeDsl',
       'getCodeContentById',
       'getCodeDslByIds',
       'getCurrentDsl',
@@ -62,7 +60,6 @@ class CodeBlock extends BaseService {
    */
   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);
   }
@@ -73,14 +70,7 @@ class CodeBlock extends BaseService {
    * @param {boolean} forceRefresh 是否强制从活动dsl拉取刷新
    * @returns {CodeBlockDSL | null}
    */
-  public async getCodeDsl(forceRefresh = false): Promise<CodeBlockDSL | null> {
-    return this.getCodeDslSync(forceRefresh);
-  }
-
-  public getCodeDslSync(forceRefresh = false): CodeBlockDSL | null {
-    if (!this.state.codeDsl || forceRefresh) {
-      this.state.codeDsl = editorService.getCodeDslSync();
-    }
+  public getCodeDsl(): CodeBlockDSL | null {
     return this.state.codeDsl;
   }
 
@@ -103,31 +93,25 @@ class CodeBlock extends BaseService {
    * @returns {void}
    */
   public async setCodeDslById(id: Id, codeConfig: CodeBlockContent): Promise<void> {
-    let codeDsl = await this.getCodeDsl();
+    const codeDsl = await this.getCodeDsl();
+
+    if (!codeDsl) {
+      throw new Error('dsl中没有codeBlocks');
+    }
+
     const codeConfigProcessed = codeConfig;
     if (codeConfig.content) {
       // 在保存的时候转换代码内容
       // eslint-disable-next-line no-eval
       codeConfigProcessed.content = eval(codeConfig.content);
     }
-    if (!codeDsl) {
-      // dsl中无代码块字段
-      codeDsl = {
-        [id]: {
-          ...codeConfigProcessed,
-        },
-      };
-    } else {
-      const existContent = codeDsl[id] || {};
-      codeDsl = {
-        ...codeDsl,
-        [id]: {
-          ...existContent,
-          ...codeConfigProcessed,
-        },
-      };
-    }
-    await this.setCodeDsl(codeDsl);
+
+    const existContent = codeDsl[id] || {};
+
+    codeDsl[id] = {
+      ...existContent,
+      ...codeConfigProcessed,
+    };
   }
 
   /**
@@ -320,13 +304,15 @@ class CodeBlock extends BaseService {
   /**
    * 在dsl数据源中删除指定id的代码块
    * @param {Id[]} codeIds 需要删除的代码块id数组
-   * @returns {CodeBlockDSL} 删除后的code dsl
    */
-  public async deleteCodeDslByIds(codeIds: Id[]): Promise<CodeBlockDSL> {
+  public async deleteCodeDslByIds(codeIds: Id[]): Promise<void> {
     const currentDsl = await this.getCodeDsl();
-    const newDsl = omit(currentDsl, codeIds);
-    await this.setCodeDsl(newDsl);
-    return newDsl;
+
+    if (!currentDsl) return;
+
+    codeIds.forEach((id) => {
+      delete currentDsl[id];
+    });
   }
 
   /**

package/src/services/editor.ts

@@ -19,7 +19,7 @@
 import { reactive, toRaw } from 'vue';
 import { cloneDeep, isObject, mergeWith, uniq } from 'lodash-es';
 
-import type { CodeBlockDSL, Id, MApp, MComponent, MContainer, MNode, MPage } from '@tmagic/schema';
+import type { 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,8 +80,6 @@ class Editor extends BaseService {
         'undo',
         'redo',
         'highlight',
-        'getCodeDsl',
-        'setCodeDsl',
       ],
       // 需要注意循环依赖问题，如果函数间有相互调用的话，不能设置为串行调用
       ['select', 'update', 'moveLayer'],
@@ -832,30 +830,6 @@ class Editor extends BaseService {
     this.get('modifiedNodeIds').clear();
   }
 
-  /**
-   * 从dsl中的codeBlocks字段读取活动的代码块
-   * @returns {CodeBlockDSL | null}
-   */
-  public async getCodeDsl(): Promise<CodeBlockDSL | null> {
-    const root = this.get('root');
-    return root?.codeBlocks || null;
-  }
-
-  public getCodeDslSync(): CodeBlockDSL | null {
-    const root = this.get('root');
-    return root?.codeBlocks || null;
-  }
-
-  /**
-   * 设置代码块到dsl的codeBlocks字段
-   * @param {CodeBlockDSL} codeDsl 代码DSL
-   * @returns {void}
-   */
-  public async setCodeDsl(codeDsl: CodeBlockDSL): Promise<void> {
-    if (!this.state.root) return;
-    this.state.root.codeBlocks = codeDsl;
-  }
-
   private addModifiedNodeId(id: Id) {
     if (!this.isHistoryStateChange) {
       this.get('modifiedNodeIds').set(id, id);

package/types/services/codeBlock.d.ts

@@ -16,8 +16,7 @@ declare class CodeBlock extends BaseService {
      * @param {boolean} forceRefresh 是否强制从活动dsl拉取刷新
      * @returns {CodeBlockDSL | null}
      */
-    getCodeDsl(forceRefresh?: boolean): Promise<CodeBlockDSL | null>;
-    getCodeDslSync(forceRefresh?: boolean): CodeBlockDSL | null;
+    getCodeDsl(): CodeBlockDSL | null;
     /**
      * 根据代码块id获取代码块内容
      * @param {Id} id 代码块id
@@ -134,9 +133,8 @@ declare class CodeBlock extends BaseService {
     /**
      * 在dsl数据源中删除指定id的代码块
      * @param {Id[]} codeIds 需要删除的代码块id数组
-     * @returns {CodeBlockDSL} 删除后的code dsl
      */
-    deleteCodeDslByIds(codeIds: Id[]): Promise<CodeBlockDSL>;
+    deleteCodeDslByIds(codeIds: Id[]): Promise<void>;
     /**
      * 生成代码块唯一id
      * @returns {Id} 代码块唯一id

package/types/services/editor.d.ts

@@ -1,4 +1,4 @@
-import type { CodeBlockDSL, Id, MContainer, MNode } from '@tmagic/schema';
+import type { Id, MContainer, MNode } from '@tmagic/schema';
 import type { AddMNode, EditorNodeInfo, PastePosition, StepValue, StoreState, StoreStateKey } from '../type';
 import { LayerOffset, Layout } from '../type';
 import BaseService from './BaseService';
@@ -136,18 +136,6 @@ declare class Editor extends BaseService {
     resetState(): void;
     destroy(): void;
     resetModifiedNodeId(): void;
-    /**
-     * 从dsl中的codeBlocks字段读取活动的代码块
-     * @returns {CodeBlockDSL | null}
-     */
-    getCodeDsl(): Promise<CodeBlockDSL | null>;
-    getCodeDslSync(): CodeBlockDSL | null;
-    /**
-     * 设置代码块到dsl的codeBlocks字段
-     * @param {CodeBlockDSL} codeDsl 代码DSL
-     * @returns {void}
-     */
-    setCodeDsl(codeDsl: CodeBlockDSL): Promise<void>;
     private addModifiedNodeId;
     private pushHistoryState;
     private changeHistoryState;