@tmagic/editor 1.2.8 → 1.2.10

package/dist/tmagic-editor.js

@@ -1,7 +1,7 @@
 import { defineComponent, computed, resolveComponent, openBlock, createBlock, normalizeStyle, unref, reactive, watch, withCtx, createVNode, createElementVNode, createElementBlock, normalizeClass, resolveDynamicComponent, toRaw, inject, createCommentVNode, ref, withModifiers, createTextVNode, toDisplayString, onMounted, onUnmounted, renderSlot, Fragment, createSlots, renderList, normalizeProps, mergeProps, markRaw, getCurrentInstance, watchEffect, provide, withDirectives, Teleport, vShow, nextTick, toHandlers } from 'vue';
 import serialize from 'serialize-javascript';
 import { Edit, View, Delete, Close, Plus, ArrowDown, Grid, Memo, FullScreen, ScaleToOriginal, ZoomOut, ZoomIn, Right, Back, Link, Search, Files, CopyDocument, Coin, EditPen, ArrowLeftBold, ArrowRightBold, CaretBottom, DocumentCopy, Top, Bottom } from '@element-plus/icons-vue';
-import { isEmpty, map, throttle, cloneDeep, mergeWith, isObject, uniq, forIn, difference, union, pick, omit, keys } from 'lodash-es';
+import { isEmpty, map, throttle, cloneDeep, mergeWith, isObject, uniq, forIn, difference, union, pick, keys, omit } from 'lodash-es';
 import { createValues, MForm } from '@tmagic/form';
 import { HookType, NodeType } from '@tmagic/schema';
 import { TMagicIcon, TMagicButton, TMagicTooltip, TMagicScrollbar, TMagicDivider, TMagicDropdown, TMagicDropdownMenu, TMagicDropdownItem, tMagicMessage, tMagicMessageBox, TMagicCard, TMagicInput, TMagicDialog, TMagicTree, TMagicCollapse, TMagicCollapseItem, getConfig as getConfig$1, TMagicTabs, TMagicPopover } from '@tmagic/design';
@@ -180,7 +180,7 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
     const props = __props;
     const services = inject("services");
     const mForm = inject("mForm");
-    const codeDsl = computed(() => services?.codeBlockService.getCodeDslSync());
+    const codeDsl = computed(() => services?.codeBlockService.getCodeDsl());
     const tableConfig = computed(() => {
       const defaultConfig = {
         dropSort: false,
@@ -1451,9 +1451,7 @@ class Editor$1 extends BaseService {
         "move",
         "undo",
         "redo",
-        "highlight",
-        "getCodeDsl",
-        "setCodeDsl"
+        "highlight"
       ],
       ["select", "update", "moveLayer"]
     );
@@ -1966,19 +1964,6 @@ class Editor$1 extends BaseService {
   resetModifiedNodeId() {
     this.get("modifiedNodeIds").clear();
   }
-  async getCodeDsl() {
-    const root = this.get("root");
-    return root?.codeBlocks || null;
-  }
-  getCodeDslSync() {
-    const root = this.get("root");
-    return root?.codeBlocks || null;
-  }
-  async setCodeDsl(codeDsl) {
-    if (!this.state.root)
-      return;
-    this.state.root.codeBlocks = codeDsl;
-  }
   addModifiedNodeId(id) {
     if (!this.isHistoryStateChange) {
       this.get("modifiedNodeIds").set(id, id);
@@ -3313,7 +3298,7 @@ const _sfc_main$g = /* @__PURE__ */ defineComponent({
       codeContent.value = props.content;
     });
     const initTableModel = () => {
-      const codeDsl = cloneDeep(services?.codeBlockService.getCodeDslSync());
+      const codeDsl = cloneDeep(services?.codeBlockService.getCodeDsl());
       if (!codeDsl)
         return;
       tableModel.value = {
@@ -3562,7 +3547,7 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
       }
     );
     watch(
-      [() => services?.codeBlockService.getCodeDslSync(), () => services?.codeBlockService.getCombineInfo()],
+      [() => services?.codeBlockService.getCodeDsl(), () => services?.codeBlockService.getCombineInfo()],
       () => {
         refreshCodeList();
       },
@@ -5617,8 +5602,6 @@ class CodeBlock extends BaseService {
   });
   constructor() {
     super([
-      "setCodeDsl",
-      "getCodeDsl",
       "getCodeContentById",
       "getCodeDslByIds",
       "getCurrentDsl",
@@ -5632,17 +5615,10 @@ class CodeBlock extends BaseService {
   }
   async setCodeDsl(codeDsl2) {
     this.state.codeDsl = codeDsl2;
-    await editorService.setCodeDsl(this.state.codeDsl);
     info("[code-block]:code-dsl-change", this.state.codeDsl);
     this.emit("code-dsl-change", this.state.codeDsl);
   }
-  async getCodeDsl(forceRefresh = false) {
-    return this.getCodeDslSync(forceRefresh);
-  }
-  getCodeDslSync(forceRefresh = false) {
-    if (!this.state.codeDsl || forceRefresh) {
-      this.state.codeDsl = editorService.getCodeDslSync();
-    }
+  getCodeDsl() {
     return this.state.codeDsl;
   }
   async getCodeContentById(id2) {
@@ -5654,28 +5630,19 @@ class CodeBlock extends BaseService {
     return totalCodeDsl[id2] ?? null;
   }
   async setCodeDslById(id, codeConfig) {
-    let codeDsl = await this.getCodeDsl();
+    const codeDsl = await this.getCodeDsl();
+    if (!codeDsl) {
+      throw new Error("dsl\u4E2D\u6CA1\u6709codeBlocks");
+    }
     const codeConfigProcessed = codeConfig;
     if (codeConfig.content) {
       codeConfigProcessed.content = eval(codeConfig.content);
     }
-    if (!codeDsl) {
-      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
+    };
   }
   async getCodeDslByIds(ids) {
     const codeDsl2 = await this.getCodeDsl();
@@ -5766,9 +5733,11 @@ class CodeBlock extends BaseService {
   }
   async deleteCodeDslByIds(codeIds) {
     const currentDsl = await this.getCodeDsl();
-    const newDsl = omit(currentDsl, codeIds);
-    await this.setCodeDsl(newDsl);
-    return newDsl;
+    if (!currentDsl)
+      return;
+    codeIds.forEach((id2) => {
+      delete currentDsl[id2];
+    });
   }
   async getUniqueId() {
     const newId = `code_${Math.random().toString(10).substring(2).substring(0, 4)}`;
@@ -5970,6 +5939,8 @@ const _sfc_main = defineComponent({
       if (toRaw(value) !== toRaw(preValue)) {
         emit("update:modelValue", value);
       }
+      value.codeBlocks = value.codeBlocks || {};
+      codeBlockService.setCodeDsl(value.codeBlocks);
     };
     editorService.on("root-change", rootChangeHandler);
     watch(