@tmagic/editor 1.2.0-beta.11 → 1.2.0-beta.13

package/dist/tmagic-editor.mjs

@@ -1,22 +1,22 @@
-import { defineComponent, computed, resolveComponent, openBlock, createBlock, normalizeStyle, unref, reactive, watch, inject, ref, watchEffect, createElementBlock, createVNode, withCtx, createElementVNode, withModifiers, createCommentVNode, createTextVNode, toDisplayString, onMounted, onUnmounted, renderSlot, Fragment, normalizeClass, resolveDynamicComponent, toRaw, createSlots, renderList, normalizeProps, mergeProps, markRaw, getCurrentInstance, isRef, withDirectives, Teleport, vShow, nextTick, toHandlers, provide } from 'vue';
+import { defineComponent, computed, resolveComponent, openBlock, createBlock, normalizeStyle, unref, reactive, watch, inject, createElementBlock, createVNode, ref, withCtx, withModifiers, createCommentVNode, createTextVNode, toDisplayString, onMounted, onUnmounted, renderSlot, Fragment, createElementVNode, normalizeClass, resolveDynamicComponent, toRaw, createSlots, renderList, normalizeProps, mergeProps, markRaw, getCurrentInstance, watchEffect, provide, withDirectives, Teleport, vShow, nextTick, toHandlers } from 'vue';
 import serialize from 'serialize-javascript';
-import { map, xor, throttle, pick, cloneDeep, isEmpty, forIn, omit, keys, mergeWith, uniq } from 'lodash-es';
-import { TMagicCard, TMagicTooltip, tMagicMessage, TMagicButton, TMagicIcon, TMagicScrollbar, TMagicDivider, TMagicDropdown, TMagicDropdownMenu, TMagicDropdownItem, TMagicDialog, TMagicInput, TMagicTree, TMagicCollapse, TMagicCollapseItem, getConfig as getConfig$1, TMagicTabs, TMagicPopover } from '@tmagic/design';
+import { isEmpty, map, throttle, pick, omit, keys, cloneDeep, forIn, mergeWith, uniq, isObject } from 'lodash-es';
+import { HookType, NodeType } from '@tmagic/schema';
 import { Delete, Close, Edit, Plus, ArrowDown, Grid, Memo, FullScreen, ScaleToOriginal, ZoomOut, ZoomIn, Right, Back, View, Link, Search, Files, DocumentCopy, Coin, EditPen, ArrowLeftBold, ArrowRightBold, CaretBottom, Top, Bottom } from '@element-plus/icons-vue';
+import { TMagicButton, TMagicTooltip, TMagicIcon, TMagicScrollbar, TMagicDivider, TMagicDropdown, TMagicDropdownMenu, TMagicDropdownItem, tMagicMessage, tMagicMessageBox, TMagicCard, TMagicInput, TMagicDialog, TMagicTree, TMagicCollapse, TMagicCollapseItem, getConfig as getConfig$1, TMagicTabs, TMagicPopover } from '@tmagic/design';
 import * as monaco from 'monaco-editor';
 import StageCore, { GuidesType, getOffset, calcValueByFontsize, CONTAINER_HIGHLIGHT_CLASS, ContainerHighlightType } from '@tmagic/stage';
 import Gesto from 'gesto';
-import { NodeType } from '@tmagic/schema';
-import { isPop, getNodePath, isNumber, isPage, toLine, removeClassNameByClassName } from '@tmagic/utils';
+import { isPop, getNodePath, isNumber, isPage, toLine, datetimeFormatter, removeClassNameByClassName } from '@tmagic/utils';
 import { EventEmitter } from 'events';
 import { DEFAULT_EVENTS, DEFAULT_METHODS } from '@tmagic/core';
 import KeyController from 'keycon';
 
-const __default__$r = defineComponent({
+const __default__$t = defineComponent({
   name: "MEditorCode"
 });
-const _sfc_main$s = /* @__PURE__ */ defineComponent({
-  ...__default__$r,
+const _sfc_main$u = /* @__PURE__ */ defineComponent({
+  ...__default__$t,
   props: {
     model: null,
     name: null,
@@ -45,11 +45,11 @@ const _sfc_main$s = /* @__PURE__ */ defineComponent({
   }
 });
 
-const __default__$q = defineComponent({
+const __default__$s = defineComponent({
   name: "MEditorCodeLink"
 });
-const _sfc_main$r = /* @__PURE__ */ defineComponent({
-  ...__default__$q,
+const _sfc_main$t = /* @__PURE__ */ defineComponent({
+  ...__default__$s,
   props: {
     config: null,
     model: null,
@@ -118,60 +118,12 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
   }
 });
 
-var ColumnLayout = /* @__PURE__ */ ((ColumnLayout2) => {
-  ColumnLayout2["LEFT"] = "left";
-  ColumnLayout2["CENTER"] = "center";
-  ColumnLayout2["RIGHT"] = "right";
-  return ColumnLayout2;
-})(ColumnLayout || {});
-var LayerOffset = /* @__PURE__ */ ((LayerOffset2) => {
-  LayerOffset2["TOP"] = "top";
-  LayerOffset2["BOTTOM"] = "bottom";
-  return LayerOffset2;
-})(LayerOffset || {});
-var Layout = /* @__PURE__ */ ((Layout2) => {
-  Layout2["FLEX"] = "flex";
-  Layout2["FIXED"] = "fixed";
-  Layout2["RELATIVE"] = "relative";
-  Layout2["ABSOLUTE"] = "absolute";
-  return Layout2;
-})(Layout || {});
-var Keys = /* @__PURE__ */ ((Keys2) => {
-  Keys2["ESCAPE"] = "Space";
-  return Keys2;
-})(Keys || {});
-const H_GUIDE_LINE_STORAGE_KEY = "$MagicStageHorizontalGuidelinesData";
-const V_GUIDE_LINE_STORAGE_KEY = "$MagicStageVerticalGuidelinesData";
-var CodeEditorMode = /* @__PURE__ */ ((CodeEditorMode2) => {
-  CodeEditorMode2["LIST"] = "list";
-  CodeEditorMode2["EDITOR"] = "editor";
-  return CodeEditorMode2;
-})(CodeEditorMode || {});
-var CodeDeleteErrorType = /* @__PURE__ */ ((CodeDeleteErrorType2) => {
-  CodeDeleteErrorType2["UNDELETEABLE"] = "undeleteable";
-  CodeDeleteErrorType2["BIND"] = "bind";
-  return CodeDeleteErrorType2;
-})(CodeDeleteErrorType || {});
-var CodeSelectOp = /* @__PURE__ */ ((CodeSelectOp2) => {
-  CodeSelectOp2["ADD"] = "add";
-  CodeSelectOp2["DELETE"] = "delete";
-  CodeSelectOp2["CHANGE"] = "change";
-  return CodeSelectOp2;
-})(CodeSelectOp || {});
-
-const _hoisted_1$e = { class: "tool-bar" };
-const _hoisted_2$6 = /* @__PURE__ */ createElementVNode("path", {
-  fill: "currentColor",
-  d: "m23 12l-7.071 7.071l-1.414-1.414L20.172 12l-5.657-5.657l1.414-1.414L23 12zM3.828 12l5.657 5.657l-1.414 1.414L1 12l7.071-7.071l1.414 1.414L3.828 12z"
-}, null, -1);
-const _hoisted_3$3 = [
-  _hoisted_2$6
-];
-const __default__$p = defineComponent({
+const _hoisted_1$g = { class: "m-fields-code-select" };
+const __default__$r = defineComponent({
   name: "MEditorCodeSelect"
 });
-const _sfc_main$q = /* @__PURE__ */ defineComponent({
-  ...__default__$p,
+const _sfc_main$s = /* @__PURE__ */ defineComponent({
+  ...__default__$r,
   props: {
     config: null,
     model: null,
@@ -183,122 +135,98 @@ const _sfc_main$q = /* @__PURE__ */ defineComponent({
   setup(__props, { emit }) {
     const props = __props;
     const services = inject("services");
-    const form = inject("mForm");
-    const selectConfig = computed(() => {
+    const codeDsl = computed(() => services?.codeBlockService.getCodeDslSync());
+    const tableConfig = computed(() => {
       const defaultConfig = {
-        multiple: true,
-        options: async () => {
-          const codeDsl = await services?.codeBlockService.getCodeDsl();
-          if (codeDsl) {
-            return map(codeDsl, (value, key) => ({
-              text: `${value.name}\uFF08${key}\uFF09`,
-              label: `${value.name}\uFF08${key}\uFF09`,
-              value: key
-            }));
+        dropSort: true,
+        enableFullscreen: false,
+        border: true,
+        items: [
+          {
+            type: "select",
+            label: "\u4EE3\u7801\u5757",
+            name: "codeId",
+            width: "200px",
+            options: () => {
+              if (codeDsl.value) {
+                return map(codeDsl.value, (value, key) => ({
+                  text: `${value.name}\uFF08${key}\uFF09`,
+                  label: `${value.name}\uFF08${key}\uFF09`,
+                  value: key
+                }));
+              }
+              return [];
+            },
+            onChange: (formState, codeId, { model }) => {
+              model.params = {};
+            }
+          },
+          {
+            name: "params",
+            label: "\u53C2\u6570",
+            defaultValue: {},
+            itemsFunction: (row) => getParamsConfig(row.codeId)
           }
-          return [];
-        }
+        ]
       };
       return {
         ...defaultConfig,
-        ...props.config.selectConfig
+        ...props.config.tableConfig
       };
     });
-    const fieldKey = ref("");
-    const multiple = ref(true);
-    const lastTagSnapshot = ref([]);
-    watchEffect(async () => {
-      if (!props.model[props.name])
-        return;
-      const combineNames = await Promise.all(
-        props.model[props.name].map(async (id) => {
-          const { name = "" } = await services?.codeBlockService.getCodeContentById(id) || {};
-          return name;
-        })
-      );
-      fieldKey.value = combineNames.join("-");
-    });
-    const changeHandler = async (value) => {
-      let codeIds = value;
-      if (typeof value === "string") {
-        multiple.value = false;
-        codeIds = value ? [value] : [];
-      }
-      await setCombineRelation(codeIds);
-      emit("change", value);
-    };
-    const setCombineRelation = async (codeIds) => {
-      const { id = "" } = services?.editorService.get("node") || {};
-      let opFlag = CodeSelectOp.CHANGE;
-      let diffValues = codeIds;
-      if (multiple.value) {
-        lastTagSnapshot.value = form?.initValues[props.name] || [];
-        opFlag = codeIds.length < lastTagSnapshot.value.length ? CodeSelectOp.DELETE : CodeSelectOp.ADD;
-        diffValues = xor(codeIds, lastTagSnapshot.value);
+    watch(
+      () => props.model[props.name],
+      (value) => {
+        if (isEmpty(value)) {
+          props.model[props.name] = {
+            hookType: HookType.CODE,
+            hookData: []
+          };
+        }
+      },
+      {
+        immediate: true
       }
-      await services?.codeBlockService.setCombineRelation(id, diffValues, opFlag, props.prop);
+    );
+    const changeHandler = async () => {
+      emit("change", props.model[props.name]);
     };
-    const viewHandler = async () => {
-      if (props.model[props.name].length === 0) {
-        tMagicMessage.error("\u8BF7\u5148\u7ED1\u5B9A\u4EE3\u7801\u5757");
-        return;
-      }
-      await services?.codeBlockService.setCombineIds(props.model[props.name]);
-      await services?.codeBlockService.setMode(CodeEditorMode.LIST);
-      services?.codeBlockService.setCodeEditorContent(true, props.model[props.name][0]);
+    const getParamsConfig = (codeId) => {
+      if (!codeDsl.value)
+        return [];
+      const paramStatements = codeDsl.value[codeId]?.params;
+      if (isEmpty(paramStatements))
+        return [];
+      return paramStatements.map((paramState) => ({
+        name: paramState.name,
+        text: paramState.name,
+        labelWidth: "100px",
+        type: "text"
+      }));
     };
     return (_ctx, _cache) => {
-      const _component_m_fields_select = resolveComponent("m-fields-select");
-      return openBlock(), createElementBlock("div", {
-        class: "m-fields-code-select",
-        key: fieldKey.value
-      }, [
-        createVNode(unref(TMagicCard), { shadow: "never" }, {
-          header: withCtx(() => [
-            createVNode(_component_m_fields_select, {
-              config: unref(selectConfig),
-              model: __props.model,
-              prop: __props.prop,
-              name: __props.name,
-              size: __props.size,
-              onChange: changeHandler
-            }, null, 8, ["config", "model", "prop", "name", "size"])
-          ]),
-          default: withCtx(() => [
-            createElementVNode("div", _hoisted_1$e, [
-              createVNode(unref(TMagicTooltip), {
-                class: "tool-item",
-                effect: "dark",
-                content: "\u67E5\u770B\u4EE3\u7801\u5757",
-                placement: "top"
-              }, {
-                default: withCtx(() => [
-                  (openBlock(), createElementBlock("svg", {
-                    onClick: viewHandler,
-                    preserveAspectRatio: "xMidYMid meet",
-                    viewBox: "0 0 24 24",
-                    width: "15px",
-                    height: "15px",
-                    "data-v-65a7fb6c": ""
-                  }, _hoisted_3$3))
-                ]),
-                _: 1
-              })
-            ])
-          ]),
-          _: 1
-        })
+      const _component_m_form_table = resolveComponent("m-form-table");
+      return openBlock(), createElementBlock("div", _hoisted_1$g, [
+        createVNode(_component_m_form_table, {
+          config: unref(tableConfig),
+          model: __props.model[__props.name],
+          name: "hookData",
+          enableToggleMode: false,
+          prop: __props.prop,
+          size: __props.size,
+          onChange: changeHandler
+        }, null, 8, ["config", "model", "prop", "size"])
       ]);
     };
   }
 });
 
-const _hoisted_1$d = /* @__PURE__ */ createTextVNode("\u53D6\u6D88");
-const __default__$o = defineComponent({
+const _hoisted_1$f = /* @__PURE__ */ createTextVNode("\u53D6\u6D88");
+const __default__$q = defineComponent({
   name: "MEditorUISelect"
 });
-const _sfc_main$p = /* @__PURE__ */ defineComponent({
-  ...__default__$o,
+const _sfc_main$r = /* @__PURE__ */ defineComponent({
+  ...__default__$q,
   props: {
     config: null,
     model: null,
@@ -360,7 +288,7 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
           style: { "padding": "0" }
         }, {
           default: withCtx(() => [
-            _hoisted_1$d
+            _hoisted_1$f
           ]),
           _: 1
         }, 8, ["icon"])
@@ -408,15 +336,15 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
 
 const UISelect_vue_vue_type_style_index_0_lang = '';
 
-const __default__$n = defineComponent({
+const __default__$p = defineComponent({
   name: "MEditorCodeEditor"
 });
-const _sfc_main$o = /* @__PURE__ */ defineComponent({
-  ...__default__$n,
+const _sfc_main$q = /* @__PURE__ */ defineComponent({
+  ...__default__$p,
   props: {
     initValues: null,
     modifiedValues: null,
-    type: { default: "" },
+    type: null,
     language: { default: "javascript" },
     options: { default: () => ({
       tabSize: 2
@@ -541,11 +469,11 @@ const setConfig = (option) => {
 };
 const getConfig = (key) => $TMAGIC_EDITOR[key];
 
-const __default__$m = defineComponent({
+const __default__$o = defineComponent({
   name: "MEditorResizer"
 });
-const _sfc_main$n = /* @__PURE__ */ defineComponent({
-  ...__default__$m,
+const _sfc_main$p = /* @__PURE__ */ defineComponent({
+  ...__default__$o,
   emits: ["change"],
   setup(__props, { emit }) {
     const target = ref();
@@ -577,11 +505,11 @@ const _sfc_main$n = /* @__PURE__ */ defineComponent({
   }
 });
 
-const __default__$l = defineComponent({
+const __default__$n = defineComponent({
   name: "MEditorLayout"
 });
-const _sfc_main$m = /* @__PURE__ */ defineComponent({
-  ...__default__$l,
+const _sfc_main$o = /* @__PURE__ */ defineComponent({
+  ...__default__$n,
   props: {
     left: null,
     right: null,
@@ -659,7 +587,7 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
           }, [
             renderSlot(_ctx.$slots, "left")
           ], 6),
-          createVNode(_sfc_main$n, { onChange: changeLeft })
+          createVNode(_sfc_main$p, { onChange: changeLeft })
         ], 64)) : createCommentVNode("", true),
         createElementVNode("div", {
           class: normalizeClass(["m-editor-layout-center", __props.centerClass]),
@@ -668,7 +596,7 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
           renderSlot(_ctx.$slots, "center")
         ], 6),
         typeof props.right !== "undefined" ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-          createVNode(_sfc_main$n, { onChange: changeRight }),
+          createVNode(_sfc_main$p, { onChange: changeRight }),
           createElementVNode("div", {
             class: normalizeClass(["m-editor-layout-right", __props.rightClass]),
             style: normalizeStyle(`width: ${__props.right}px`)
@@ -681,12 +609,12 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$c = ["src"];
-const __default__$k = defineComponent({
+const _hoisted_1$e = ["src"];
+const __default__$m = defineComponent({
   name: "MEditorIcon"
 });
-const _sfc_main$l = /* @__PURE__ */ defineComponent({
-  ...__default__$k,
+const _sfc_main$n = /* @__PURE__ */ defineComponent({
+  ...__default__$m,
   props: {
     icon: null
   },
@@ -705,7 +633,7 @@ const _sfc_main$l = /* @__PURE__ */ defineComponent({
         class: "magic-editor-icon"
       }, {
         default: withCtx(() => [
-          createElementVNode("img", { src: __props.icon }, null, 8, _hoisted_1$c)
+          createElementVNode("img", { src: __props.icon }, null, 8, _hoisted_1$e)
         ]),
         _: 1
       })) : typeof __props.icon === "string" ? (openBlock(), createElementBlock("i", {
@@ -724,6 +652,42 @@ const _sfc_main$l = /* @__PURE__ */ defineComponent({
   }
 });
 
+var ColumnLayout = /* @__PURE__ */ ((ColumnLayout2) => {
+  ColumnLayout2["LEFT"] = "left";
+  ColumnLayout2["CENTER"] = "center";
+  ColumnLayout2["RIGHT"] = "right";
+  return ColumnLayout2;
+})(ColumnLayout || {});
+var LayerOffset = /* @__PURE__ */ ((LayerOffset2) => {
+  LayerOffset2["TOP"] = "top";
+  LayerOffset2["BOTTOM"] = "bottom";
+  return LayerOffset2;
+})(LayerOffset || {});
+var Layout = /* @__PURE__ */ ((Layout2) => {
+  Layout2["FLEX"] = "flex";
+  Layout2["FIXED"] = "fixed";
+  Layout2["RELATIVE"] = "relative";
+  Layout2["ABSOLUTE"] = "absolute";
+  return Layout2;
+})(Layout || {});
+var Keys = /* @__PURE__ */ ((Keys2) => {
+  Keys2["ESCAPE"] = "Space";
+  return Keys2;
+})(Keys || {});
+const H_GUIDE_LINE_STORAGE_KEY = "$MagicStageHorizontalGuidelinesData";
+const V_GUIDE_LINE_STORAGE_KEY = "$MagicStageVerticalGuidelinesData";
+var CodeEditorMode = /* @__PURE__ */ ((CodeEditorMode2) => {
+  CodeEditorMode2["LIST"] = "list";
+  CodeEditorMode2["EDITOR"] = "editor";
+  return CodeEditorMode2;
+})(CodeEditorMode || {});
+var CodeDeleteErrorType = /* @__PURE__ */ ((CodeDeleteErrorType2) => {
+  CodeDeleteErrorType2["UNDELETEABLE"] = "undeleteable";
+  CodeDeleteErrorType2["BIND"] = "bind";
+  return CodeDeleteErrorType2;
+})(CodeDeleteErrorType || {});
+const CODE_DRAFT_STORAGE_KEY = "magicCodeDraft";
+
 const log = (...args) => {
   if (process.env.NODE_ENV === "development") {
     console.log("magic editor: ", ...args);
@@ -872,7 +836,8 @@ class CodeBlock extends BaseService {
     editable: true,
     mode: CodeEditorMode.EDITOR,
     combineIds: [],
-    undeletableList: []
+    undeletableList: [],
+    relations: {}
   });
   constructor() {
     super([
@@ -890,31 +855,37 @@ class CodeBlock extends BaseService {
       "deleteCodeDslByIds"
     ]);
   }
-  async setCodeDsl(codeDsl) {
-    this.state.codeDsl = codeDsl;
+  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 = await editorService.getCodeDsl();
+      this.state.codeDsl = editorService.getCodeDslSync();
     }
     return this.state.codeDsl;
   }
-  async getCodeContentById(id) {
-    if (!id)
+  async getCodeContentById(id2) {
+    if (!id2)
       return null;
     const totalCodeDsl = await this.getCodeDsl();
     if (!totalCodeDsl)
       return null;
-    return totalCodeDsl[id] ?? null;
+    return totalCodeDsl[id2] ?? null;
   }
   async setCodeDslById(id, codeConfig) {
     let codeDsl = await this.getCodeDsl();
     if (!codeDsl) {
       codeDsl = {
-        [id]: codeConfig
+        [id]: {
+          ...codeConfig,
+          content: eval(codeConfig.content)
+        }
       };
     } else {
       const existContent = codeDsl[id] || {};
@@ -922,15 +893,16 @@ class CodeBlock extends BaseService {
         ...codeDsl,
         [id]: {
           ...existContent,
-          ...codeConfig
+          ...codeConfig,
+          content: eval(codeConfig.content)
         }
       };
     }
     await this.setCodeDsl(codeDsl);
   }
   async getCodeDslByIds(ids) {
-    const codeDsl = await this.getCodeDsl();
-    return pick(codeDsl, ids);
+    const codeDsl2 = await this.getCodeDsl();
+    return pick(codeDsl2, ids);
   }
   async setCodeEditorShowStatus(status) {
     this.state.isShowCodeEditor = status;
@@ -938,10 +910,10 @@ class CodeBlock extends BaseService {
   getCodeEditorShowStatus() {
     return this.state.isShowCodeEditor;
   }
-  setCodeEditorContent(status, id) {
-    if (!id)
+  setCodeEditorContent(status, id2) {
+    if (!id2)
       return;
-    this.setId(id);
+    this.setId(id2);
     this.state.isShowCodeEditor = status;
   }
   async getCurrentDsl() {
@@ -953,10 +925,10 @@ class CodeBlock extends BaseService {
   async setEditStatus(status) {
     this.state.editable = status;
   }
-  setId(id) {
-    if (!id)
+  setId(id2) {
+    if (!id2)
       return;
-    this.state.id = id;
+    this.state.id = id2;
   }
   getId() {
     return this.state.id;
@@ -973,61 +945,17 @@ class CodeBlock extends BaseService {
   getCombineIds() {
     return this.state.combineIds;
   }
-  async setCombineRelation(compId, diffCodeIds, opFlag, hook) {
-    const codeDsl = cloneDeep(await this.getCodeDsl());
-    if (!codeDsl)
-      return;
-    if (opFlag === CodeSelectOp.DELETE) {
-      try {
-        diffCodeIds.forEach((codeId) => {
-          const compsContent = codeDsl[codeId].comps;
-          const index = compsContent?.[compId].findIndex((item) => item === hook);
-          if (typeof index !== "undefined" && index !== -1) {
-            compsContent?.[compId].splice(index, 1);
-          }
-        });
-      } catch (e) {
-        error(e);
-        throw new Error("\u89E3\u7ED1\u4EE3\u7801\u5757\u5931\u8D25");
-      }
-    } else if (opFlag === CodeSelectOp.ADD) {
-      try {
-        diffCodeIds.forEach((codeId) => {
-          const compsContent = codeDsl[codeId].comps;
-          const existHooks = compsContent?.[compId];
-          if (isEmpty(existHooks)) {
-            codeDsl[codeId].comps = {
-              ...codeDsl[codeId].comps || {},
-              [compId]: [hook]
-            };
-          } else {
-            existHooks?.push(hook);
-          }
-        });
-      } catch (e) {
-        error(e);
-        throw new Error("\u7ED1\u5B9A\u4EE3\u7801\u5757\u5931\u8D25");
-      }
-    } else if (opFlag === CodeSelectOp.CHANGE) {
-      forIn(codeDsl, (codeBlockContent, codeId) => {
-        if (codeId === diffCodeIds[0]) {
-          codeBlockContent.comps = {
-            ...codeBlockContent?.comps || {},
-            [compId]: [hook]
-          };
-        } else if (isEmpty(diffCodeIds) || codeId !== diffCodeIds[0]) {
-          const compHooks = codeBlockContent?.comps?.[compId];
-          if (!compHooks)
-            return true;
-          const index = compHooks.findIndex((hookName) => hookName === hook);
-          if (index !== -1) {
-            compHooks.splice(index, 1);
-            return false;
-          }
-        }
-      });
-    }
-    this.setCodeDsl(codeDsl);
+  refreshCombineInfo() {
+    const root = editorService.get("root");
+    if (!root)
+      return null;
+    const relations = {};
+    this.recurseMNode(root, relations);
+    this.state.relations = relations;
+    return this.state.relations;
+  }
+  getCombineInfo() {
+    return this.state.relations;
   }
   getUndeletableList() {
     return this.state.undeletableList;
@@ -1035,6 +963,15 @@ class CodeBlock extends BaseService {
   async setUndeleteableList(codeIds) {
     this.state.undeletableList = codeIds;
   }
+  setCodeDraft(codeId, content) {
+    globalThis.localStorage.setItem(`${CODE_DRAFT_STORAGE_KEY}_${codeId}`, content);
+  }
+  getCodeDraft(codeId) {
+    return globalThis.localStorage.getItem(`${CODE_DRAFT_STORAGE_KEY}_${codeId}`);
+  }
+  removeCodeDraft(codeId) {
+    globalThis.localStorage.removeItem(`${CODE_DRAFT_STORAGE_KEY}_${codeId}`);
+  }
   async deleteCodeDslByIds(codeIds) {
     const currentDsl = await this.getCodeDsl();
     const newDsl = omit(currentDsl, codeIds);
@@ -1050,11 +987,11 @@ class CodeBlock extends BaseService {
     return await this.getUniqueId();
   }
   async deleteCompsInRelation(node) {
-    const codeDsl = cloneDeep(await this.getCodeDsl());
-    if (!codeDsl)
+    const codeDsl2 = cloneDeep(await this.getCodeDsl());
+    if (!codeDsl2)
       return;
-    this.recurseNodes(node, codeDsl);
-    this.setCodeDsl(codeDsl);
+    this.refreshRelationDeep(node, codeDsl2);
+    this.setCodeDsl(codeDsl2);
   }
   destroy() {
     this.state.isShowCodeEditor = false;
@@ -1065,16 +1002,39 @@ class CodeBlock extends BaseService {
     this.state.combineIds = [];
     this.state.undeletableList = [];
   }
-  recurseNodes(node, codeDsl) {
+  refreshRelationDeep(node, codeDsl2) {
     if (!node.id)
       return;
-    forIn(codeDsl, (codeBlockContent) => {
+    forIn(codeDsl2, (codeBlockContent) => {
       const compsContent = codeBlockContent.comps || {};
       codeBlockContent.comps = omit(compsContent, node.id);
     });
     if (!isEmpty(node.items)) {
       node.items.forEach((item) => {
-        this.recurseNodes(item, codeDsl);
+        this.refreshRelationDeep(item, codeDsl2);
+      });
+    }
+  }
+  recurseMNode(node, relations) {
+    forIn(node, (value, key) => {
+      if (value?.hookType === HookType.CODE && !isEmpty(value.hookData)) {
+        value.hookData.forEach((relationItem) => {
+          if (!relationItem.codeId)
+            return;
+          if (!relations[relationItem.codeId]) {
+            relations[relationItem.codeId] = {};
+          }
+          const codeItem = relations[relationItem.codeId];
+          if (isEmpty(codeItem[node.id])) {
+            codeItem[node.id] = [];
+          }
+          codeItem[node.id].push(key);
+        });
+      }
+    });
+    if (!isEmpty(node.items)) {
+      node.items.forEach((item) => {
+        this.recurseMNode(item, relations);
       });
     }
   }
@@ -1443,6 +1403,10 @@ const fixNodePosition = (config, parent, stage) => {
     left: fixNodeLeft(config, parent, stage?.renderer.contentWindow?.document)
   };
 };
+const serializeConfig = (config) => serialize(config, {
+  space: 2,
+  unsafe: true
+}).replace(/"(\w+)":\s/g, "$1: ");
 
 class Props extends BaseService {
   state = reactive({
@@ -1842,7 +1806,9 @@ class Editor$1 extends BaseService {
         stage?.select(newNodes[0].id);
       }
     }
-    this.pushHistoryState();
+    if (!isPage(newNodes[0])) {
+      this.pushHistoryState();
+    }
     this.emit("add", newNodes);
     return Array.isArray(addNode) ? newNodes : newNodes[0];
   }
@@ -1884,7 +1850,9 @@ class Editor$1 extends BaseService {
   async remove(nodeOrNodeList) {
     const nodes = Array.isArray(nodeOrNodeList) ? nodeOrNodeList : [nodeOrNodeList];
     await Promise.all(nodes.map((node) => this.doRemove(node)));
-    this.pushHistoryState();
+    if (!isPage(nodes[0])) {
+      this.pushHistoryState();
+    }
     this.emit("remove", nodes);
   }
   async doUpdate(config) {
@@ -1896,6 +1864,9 @@ class Editor$1 extends BaseService {
     const node = cloneDeep(toRaw(info.node));
     let newConfig = await this.toggleFixedPosition(toRaw(config), node, this.get("root"));
     newConfig = mergeWith(cloneDeep(node), newConfig, (objValue, srcValue) => {
+      if (isObject(srcValue) && Array.isArray(objValue)) {
+        return srcValue;
+      }
       if (Array.isArray(srcValue)) {
         return srcValue;
       }
@@ -1939,6 +1910,7 @@ class Editor$1 extends BaseService {
     const newNodes = await Promise.all(nodes.map((node) => this.doUpdate(node)));
     this.pushHistoryState();
     this.emit("update", newNodes);
+    codeBlockService.refreshCombineInfo();
     return Array.isArray(config) ? newNodes : newNodes[0];
   }
   async sort(id1, id2) {
@@ -2115,6 +2087,12 @@ class Editor$1 extends BaseService {
       return null;
     return root.codeBlocks || null;
   }
+  getCodeDslSync() {
+    const root = this.get("root");
+    if (!root)
+      return null;
+    return root.codeBlocks || null;
+  }
   async setCodeDsl(codeDsl) {
     if (!this.state.root)
       return;
@@ -2429,14 +2407,14 @@ const fillConfig = (config = []) => [
           {
             name: "created",
             text: "created",
-            type: "code-select",
-            labelWidth: "100px"
+            labelWidth: "100px",
+            type: "code-select"
           },
           {
             name: "mounted",
             text: "mounted",
-            type: "code-select",
-            labelWidth: "100px"
+            labelWidth: "100px",
+            type: "code-select"
           }
         ]
       }
@@ -2591,14 +2569,14 @@ const useStage = (stageOptions) => {
   return stage;
 };
 
-const _hoisted_1$b = { class: "m-editor-empty-panel" };
-const _hoisted_2$5 = { class: "m-editor-empty-content" };
-const _hoisted_3$2 = /* @__PURE__ */ createElementVNode("p", null, "\u65B0\u589E\u9875\u9762", -1);
-const __default__$j = defineComponent({
+const _hoisted_1$d = { class: "m-editor-empty-panel" };
+const _hoisted_2$7 = { class: "m-editor-empty-content" };
+const _hoisted_3$4 = /* @__PURE__ */ createElementVNode("p", null, "\u65B0\u589E\u9875\u9762", -1);
+const __default__$l = defineComponent({
   name: "MEditorAddPageBox"
 });
-const _sfc_main$k = /* @__PURE__ */ defineComponent({
-  ...__default__$j,
+const _sfc_main$m = /* @__PURE__ */ defineComponent({
+  ...__default__$l,
   setup(__props) {
     const services = inject("services");
     const clickHandler = () => {
@@ -2611,16 +2589,16 @@ const _sfc_main$k = /* @__PURE__ */ defineComponent({
       });
     };
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1$b, [
-        createElementVNode("div", _hoisted_2$5, [
+      return openBlock(), createElementBlock("div", _hoisted_1$d, [
+        createElementVNode("div", _hoisted_2$7, [
           createElementVNode("div", {
             class: "m-editor-empty-button",
             onClick: clickHandler
           }, [
             createElementVNode("div", null, [
-              createVNode(_sfc_main$l, { icon: unref(Plus) }, null, 8, ["icon"])
+              createVNode(_sfc_main$n, { icon: unref(Plus) }, null, 8, ["icon"])
             ]),
-            _hoisted_3$2
+            _hoisted_3$4
           ])
         ])
       ]);
@@ -2628,12 +2606,12 @@ const _sfc_main$k = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$a = { class: "m-editor" };
-const __default__$i = defineComponent({
+const _hoisted_1$c = { class: "m-editor" };
+const __default__$k = defineComponent({
   name: "MEditorFramework"
 });
-const _sfc_main$j = /* @__PURE__ */ defineComponent({
-  ...__default__$i,
+const _sfc_main$l = /* @__PURE__ */ defineComponent({
+  ...__default__$k,
   props: {
     codeOptions: { default: () => ({}) }
   },
@@ -2699,7 +2677,7 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
     };
     return (_ctx, _cache) => {
       const _component_magic_code_editor = resolveComponent("magic-code-editor");
-      return openBlock(), createElementBlock("div", _hoisted_1$a, [
+      return openBlock(), createElementBlock("div", _hoisted_1$c, [
         renderSlot(_ctx.$slots, "nav", { class: "m-editor-nav-menu" }),
         unref(showSrc) ? (openBlock(), createBlock(_component_magic_code_editor, {
           key: 0,
@@ -2707,7 +2685,7 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
           "init-values": unref(root),
           options: __props.codeOptions,
           onSave: saveCode
-        }, null, 8, ["init-values", "options"])) : (openBlock(), createBlock(_sfc_main$m, {
+        }, null, 8, ["init-values", "options"])) : (openBlock(), createBlock(_sfc_main$o, {
           key: 1,
           class: "m-editor-content",
           "left-class": "m-editor-framework-left",
@@ -2726,7 +2704,7 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
           ]),
           center: withCtx(() => [
             unref(pageLength) > 0 ? renderSlot(_ctx.$slots, "workspace", { key: 0 }) : renderSlot(_ctx.$slots, "empty", { key: 1 }, () => [
-              createVNode(_sfc_main$k)
+              createVNode(_sfc_main$m)
             ])
           ]),
           _: 2
@@ -2748,16 +2726,16 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$9 = {
+const _hoisted_1$b = {
   key: 1,
   class: "menu-item-text"
 };
-const _hoisted_2$4 = { class: "el-dropdown-link menubar-menu-button" };
-const __default__$h = defineComponent({
+const _hoisted_2$6 = { class: "el-dropdown-link menubar-menu-button" };
+const __default__$j = defineComponent({
   name: "MEditorToolButton"
 });
-const _sfc_main$i = /* @__PURE__ */ defineComponent({
-  ...__default__$h,
+const _sfc_main$k = /* @__PURE__ */ defineComponent({
+  ...__default__$j,
   props: {
     data: { default: () => ({
       type: "text",
@@ -2832,7 +2810,7 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
         __props.data.type === "divider" ? (openBlock(), createBlock(unref(TMagicDivider), {
           key: 0,
           direction: __props.data.direction || "vertical"
-        }, null, 8, ["direction"])) : __props.data.type === "text" ? (openBlock(), createElementBlock("div", _hoisted_1$9, toDisplayString(__props.data.text), 1)) : __props.data.type === "button" ? (openBlock(), createElementBlock(Fragment, { key: 2 }, [
+        }, null, 8, ["direction"])) : __props.data.type === "text" ? (openBlock(), createElementBlock("div", _hoisted_1$b, toDisplayString(__props.data.text), 1)) : __props.data.type === "button" ? (openBlock(), createElementBlock(Fragment, { key: 2 }, [
           __props.data.tooltip ? (openBlock(), createBlock(unref(TMagicTooltip), {
             key: 0,
             effect: "dark",
@@ -2846,7 +2824,7 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
                 disabled: unref(disabled)
               }, {
                 default: withCtx(() => [
-                  __props.data.icon ? (openBlock(), createBlock(_sfc_main$l, {
+                  __props.data.icon ? (openBlock(), createBlock(_sfc_main$n, {
                     key: 0,
                     icon: __props.data.icon
                   }, null, 8, ["icon"])) : createCommentVNode("", true),
@@ -2863,7 +2841,7 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
             disabled: unref(disabled)
           }, {
             default: withCtx(() => [
-              __props.data.icon ? (openBlock(), createBlock(_sfc_main$l, {
+              __props.data.icon ? (openBlock(), createBlock(_sfc_main$n, {
                 key: 0,
                 icon: __props.data.icon
               }, null, 8, ["icon"])) : createCommentVNode("", true),
@@ -2896,7 +2874,7 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
             })) : createCommentVNode("", true)
           ]),
           default: withCtx(() => [
-            createElementVNode("span", _hoisted_2$4, [
+            createElementVNode("span", _hoisted_2$6, [
               createTextVNode(toDisplayString(__props.data.text), 1),
               createVNode(unref(TMagicIcon), { class: "el-icon--right" }, {
                 default: withCtx(() => [
@@ -2913,11 +2891,11 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
   }
 });
 
-const __default__$g = defineComponent({
+const __default__$i = defineComponent({
   name: "MEditorNavMenu"
 });
-const _sfc_main$h = /* @__PURE__ */ defineComponent({
-  ...__default__$g,
+const _sfc_main$j = /* @__PURE__ */ defineComponent({
+  ...__default__$i,
   props: {
     data: { default: () => ({}) },
     height: { default: 35 }
@@ -3072,7 +3050,7 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
             style: normalizeStyle(`width: ${unref(columnWidth)?.[key]}px`)
           }, [
             (openBlock(true), createElementBlock(Fragment, null, renderList(unref(buttons)[key], (item, index) => {
-              return openBlock(), createBlock(_sfc_main$i, {
+              return openBlock(), createBlock(_sfc_main$k, {
                 data: item,
                 key: index
               }, null, 8, ["data"]);
@@ -3084,12 +3062,12 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$8 = { class: "m-editor-props-panel" };
-const __default__$f = defineComponent({
+const _hoisted_1$a = { class: "m-editor-props-panel" };
+const __default__$h = defineComponent({
   name: "MEditorPropsPanel"
 });
-const _sfc_main$g = /* @__PURE__ */ defineComponent({
-  ...__default__$f,
+const _sfc_main$i = /* @__PURE__ */ defineComponent({
+  ...__default__$h,
   emits: ["mounted"],
   setup(__props, { expose, emit }) {
     const internalInstance = getCurrentInstance();
@@ -3132,7 +3110,7 @@ const _sfc_main$g = /* @__PURE__ */ defineComponent({
     expose({ submit });
     return (_ctx, _cache) => {
       const _component_m_form = resolveComponent("m-form");
-      return openBlock(), createElementBlock("div", _hoisted_1$8, [
+      return openBlock(), createElementBlock("div", _hoisted_1$a, [
         renderSlot(_ctx.$slots, "props-panel-header"),
         createVNode(_component_m_form, {
           ref_key: "configForm",
@@ -3149,23 +3127,276 @@ const _sfc_main$g = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$7 = ["id"];
-const _hoisted_2$3 = { class: "list-item" };
-const _hoisted_3$1 = { class: "code-name" };
-const _hoisted_4$1 = { class: "code-name-wrapper" };
-const _hoisted_5$1 = /* @__PURE__ */ createElementVNode("div", { class: "code-name-label" }, "\u4EE3\u7801\u5757\u540D\u79F0", -1);
-const _hoisted_6$1 = { class: "m-editor-wrapper" };
-const _hoisted_7$1 = {
-  key: 1,
+const _hoisted_1$9 = { class: "m-editor-wrapper" };
+const _hoisted_2$5 = {
+  key: 0,
   class: "m-editor-content-bottom"
 };
-const _hoisted_8$1 = /* @__PURE__ */ createTextVNode("\u4FDD\u5B58");
-const _hoisted_9$1 = /* @__PURE__ */ createTextVNode("\u5173\u95ED");
-const _hoisted_10 = {
-  key: 2,
+const _hoisted_3$3 = /* @__PURE__ */ createTextVNode("\u4FDD\u5B58");
+const _hoisted_4$2 = /* @__PURE__ */ createTextVNode("\u5173\u95ED");
+const _hoisted_5$1 = {
+  key: 1,
   class: "m-editor-content-bottom"
 };
-const _hoisted_11 = /* @__PURE__ */ createTextVNode("\u5173\u95ED");
+const _hoisted_6$1 = /* @__PURE__ */ createTextVNode("\u5173\u95ED");
+const __default__$g = defineComponent({
+  name: "MEditorCodeDraftEditor"
+});
+const _sfc_main$h = /* @__PURE__ */ defineComponent({
+  ...__default__$g,
+  props: {
+    id: null,
+    content: null,
+    editable: { type: Boolean, default: true },
+    autoSaveDraft: { type: Boolean, default: true },
+    codeOptions: null,
+    language: null
+  },
+  emits: ["save", "close", "saveAndClose"],
+  setup(__props, { emit }) {
+    const props = __props;
+    const services = inject("services");
+    const codeContent = ref("");
+    const editorContent = ref("");
+    const codeEditor = ref();
+    const originCodeContent = ref("");
+    const codeOptions = computed(() => ({
+      ...props.codeOptions,
+      readOnly: !props.editable
+    }));
+    watchEffect(() => {
+      codeContent.value = props.content;
+      if (!originCodeContent.value) {
+        originCodeContent.value = codeContent.value;
+      }
+      const codeDraft = services?.codeBlockService.getCodeDraft(props.id);
+      if (codeDraft) {
+        codeContent.value = codeDraft;
+      }
+    });
+    const saveCodeDraft = async (codeValue) => {
+      if (!props.autoSaveDraft)
+        return;
+      if (originCodeContent.value === codeValue) {
+        services?.codeBlockService.removeCodeDraft(props.id);
+        return;
+      }
+      services?.codeBlockService.setCodeDraft(props.id, codeValue);
+      tMagicMessage.success(`\u4EE3\u7801\u8349\u7A3F\u4FDD\u5B58\u6210\u529F ${datetimeFormatter(new Date())}`);
+    };
+    const saveCode = () => {
+      if (!codeEditor.value || !props.editable)
+        return;
+      editorContent.value = codeEditor.value.getEditor()?.getValue();
+      emit("save", editorContent.value);
+    };
+    const saveAndClose = () => {
+      if (!codeEditor.value || !props.editable)
+        return;
+      editorContent.value = codeEditor.value.getEditor()?.getValue();
+      emit("saveAndClose", editorContent.value);
+    };
+    const close = async () => {
+      const codeDraft = services?.codeBlockService.getCodeDraft(props.id);
+      if (codeDraft) {
+        tMagicMessageBox.confirm("\u60A8\u6709\u4EE3\u7801\u4FEE\u6539\u672A\u4FDD\u5B58\uFF0C\u662F\u5426\u4FDD\u5B58\u540E\u518D\u5173\u95ED\uFF1F", "\u63D0\u793A", {
+          confirmButtonText: "\u786E\u8BA4",
+          cancelButtonText: "\u53D6\u6D88",
+          type: "warning"
+        }).then(async () => {
+          saveAndClose();
+        }).catch(() => {
+          services?.codeBlockService.removeCodeDraft(props.id);
+          emit("close");
+        });
+      } else {
+        emit("close");
+      }
+    };
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("div", _hoisted_1$9, [
+        createVNode(_sfc_main$q, {
+          ref_key: "codeEditor",
+          ref: codeEditor,
+          class: "m-editor-container",
+          "init-values": `${codeContent.value}`,
+          onSave: saveCodeDraft,
+          language: __props.language,
+          options: unref(codeOptions)
+        }, null, 8, ["init-values", "language", "options"]),
+        __props.editable ? (openBlock(), createElementBlock("div", _hoisted_2$5, [
+          createVNode(unref(TMagicButton), {
+            type: "primary",
+            class: "button",
+            onClick: saveCode
+          }, {
+            default: withCtx(() => [
+              _hoisted_3$3
+            ]),
+            _: 1
+          }),
+          createVNode(unref(TMagicButton), {
+            type: "primary",
+            class: "button",
+            onClick: close
+          }, {
+            default: withCtx(() => [
+              _hoisted_4$2
+            ]),
+            _: 1
+          })
+        ])) : (openBlock(), createElementBlock("div", _hoisted_5$1, [
+          createVNode(unref(TMagicButton), {
+            type: "primary",
+            class: "button",
+            onClick: close
+          }, {
+            default: withCtx(() => [
+              _hoisted_6$1
+            ]),
+            _: 1
+          })
+        ]))
+      ]);
+    };
+  }
+});
+
+const _hoisted_1$8 = { class: "code-name-wrapper" };
+const _hoisted_2$4 = /* @__PURE__ */ createElementVNode("div", { class: "code-name-label" }, "\u4EE3\u7801\u5757\u540D\u79F0", -1);
+const _hoisted_3$2 = { class: "code-name-wrapper" };
+const _hoisted_4$1 = /* @__PURE__ */ createElementVNode("div", { class: "code-name-label" }, "\u53C2\u6570\u5B9A\u4E49", -1);
+const __default__$f = defineComponent({
+  name: "MEditorFunctionEditor"
+});
+const _sfc_main$g = /* @__PURE__ */ defineComponent({
+  ...__default__$f,
+  props: {
+    id: null,
+    name: null,
+    content: null,
+    editable: { type: Boolean, default: true },
+    autoSaveDraft: { type: Boolean, default: true },
+    codeOptions: null
+  },
+  emits: ["change", "field-input"],
+  setup(__props, { emit }) {
+    const props = __props;
+    const tableConfig = {
+      border: true,
+      enableFullscreen: false,
+      name: "params",
+      items: [
+        {
+          type: "text",
+          label: "\u53C2\u6570\u540D",
+          name: "name"
+        }
+      ]
+    };
+    const services = inject("services");
+    const codeName = ref("");
+    const codeContent = ref("");
+    const evalRes = ref(true);
+    provide("mForm", {
+      $emit: emit,
+      setField: () => {
+      }
+    });
+    const tableModel = ref();
+    watchEffect(() => {
+      codeName.value = props.name;
+      codeContent.value = props.content;
+    });
+    const initTableModel = () => {
+      const codeDsl = services?.codeBlockService.getCodeDslSync();
+      if (!codeDsl)
+        return;
+      tableModel.value = {
+        params: codeDsl[props.id]?.params || []
+      };
+    };
+    initTableModel();
+    const beforeSave = (codeValue) => {
+      try {
+        eval(codeValue);
+        return true;
+      } catch (e) {
+        tMagicMessage.error(e.stack);
+        return false;
+      }
+    };
+    const saveCode = async (codeValue2) => {
+      if (!props.editable)
+        return;
+      evalRes.value = beforeSave(codeValue2);
+      if (evalRes.value) {
+        await services?.codeBlockService.setCodeDslById(props.id, {
+          name: codeName.value,
+          content: codeValue2,
+          params: tableModel.value?.params || []
+        });
+        tMagicMessage.success("\u4EE3\u7801\u4FDD\u5B58\u6210\u529F");
+        services?.codeBlockService.removeCodeDraft(props.id);
+      }
+    };
+    const saveAndClose = async (codeValue2) => {
+      await saveCode(codeValue2);
+      if (evalRes.value) {
+        close();
+      }
+    };
+    const close = () => {
+      services?.codeBlockService.setCodeEditorShowStatus(false);
+    };
+    return (_ctx, _cache) => {
+      const _component_m_form_table = resolveComponent("m-form-table");
+      return openBlock(), createBlock(unref(TMagicCard), { shadow: "never" }, {
+        header: withCtx(() => [
+          createElementVNode("div", _hoisted_1$8, [
+            _hoisted_2$4,
+            createVNode(unref(TMagicInput), {
+              class: "code-name-input",
+              modelValue: codeName.value,
+              "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => codeName.value = $event),
+              disabled: !__props.editable
+            }, null, 8, ["modelValue", "disabled"])
+          ]),
+          createElementVNode("div", _hoisted_3$2, [
+            _hoisted_4$1,
+            createVNode(_component_m_form_table, {
+              style: { "width": "320px" },
+              config: tableConfig,
+              model: tableModel.value,
+              enableToggleMode: false,
+              name: "params",
+              prop: "params",
+              size: "small"
+            }, null, 8, ["model"])
+          ])
+        ]),
+        default: withCtx(() => [
+          createVNode(_sfc_main$h, {
+            id: __props.id,
+            content: codeContent.value,
+            editable: __props.editable,
+            autoSaveDraft: __props.autoSaveDraft,
+            codeOptions: __props.codeOptions,
+            language: "javascript",
+            onSave: saveCode,
+            onSaveAndClose: saveAndClose,
+            onClose: close
+          }, null, 8, ["id", "content", "editable", "autoSaveDraft", "codeOptions"])
+        ]),
+        _: 1
+      });
+    };
+  }
+});
+
+const _hoisted_1$7 = ["id"];
+const _hoisted_2$3 = { class: "list-item" };
+const _hoisted_3$1 = { class: "code-name" };
 const __default__$e = defineComponent({
   name: "MEditorCodeBlockEditor"
 });
@@ -3173,22 +3404,22 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
   ...__default__$e,
   setup(__props) {
     const services = inject("services");
-    const codeEditor = ref();
+    const codeOptions = inject("codeOptions", {});
     const left = ref(200);
     const currentTitle = ref("");
     const codeConfig = ref(null);
     const state = reactive({
       codeList: []
     });
-    const isShowCodeBlockEditor = computed(
-      () => codeConfig.value && services?.codeBlockService.getCodeEditorShowStatus() || false
-    );
     const mode = computed(() => services?.codeBlockService.getMode());
     const id = computed(() => services?.codeBlockService.getId() || "");
     const editable = computed(() => services?.codeBlockService.getEditStatus());
     const selectedIds = computed(() => services?.codeBlockService.getCombineIds() || []);
     watchEffect(async () => {
-      codeConfig.value = await services?.codeBlockService.getCodeContentById(id.value) || null;
+      codeConfig.value = cloneDeep(await services?.codeBlockService.getCodeContentById(id.value)) || null;
+      if (!codeConfig.value)
+        return;
+      codeConfig.value.content = serializeConfig(codeConfig.value.content);
     });
     watchEffect(async () => {
       const codeDsl = await services?.codeBlockService.getCodeDslByIds(selectedIds.value) || null;
@@ -3203,47 +3434,24 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
       });
       currentTitle.value = state.codeList[0]?.name || "";
     });
-    const saveCode = async () => {
-      if (!codeEditor.value || !codeConfig.value || !editable.value)
-        return true;
-      try {
-        const codeContent = codeEditor.value.getEditor()?.getValue();
-        codeConfig.value.content = eval(codeContent);
-      } catch (e) {
-        tMagicMessage.error(e.stack);
-        return false;
-      }
-      await services?.codeBlockService.setCodeDslById(id.value, {
-        name: codeConfig.value.name,
-        content: codeConfig.value.content
-      });
-      tMagicMessage.success("\u4EE3\u7801\u4FDD\u5B58\u6210\u529F");
-      return true;
-    };
-    const saveAndClose = async () => {
-      const saveRes = await saveCode();
-      if (saveRes) {
-        await services?.codeBlockService.setCodeEditorShowStatus(false);
-      }
-    };
     const selectHandler = (data) => {
       services?.codeBlockService.setId(data.id);
       currentTitle.value = data.name;
     };
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(TMagicDialog), {
-        modelValue: unref(isShowCodeBlockEditor),
-        "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => isRef(isShowCodeBlockEditor) ? isShowCodeBlockEditor.value = $event : null),
+        "model-value": true,
         class: "code-editor-dialog",
         title: currentTitle.value,
         fullscreen: true,
-        "before-close": saveAndClose,
-        "append-to-body": true
+        "close-on-press-escape": false,
+        "append-to-body": true,
+        "show-close": false
       }, {
         default: withCtx(() => [
-          createVNode(_sfc_main$m, {
+          createVNode(_sfc_main$o, {
             left: left.value,
-            "onUpdate:left": _cache[1] || (_cache[1] = ($event) => left.value = $event),
+            "onUpdate:left": _cache[0] || (_cache[0] = ($event) => left.value = $event),
             "min-left": 45,
             class: "code-editor-layout"
           }, createSlots({
@@ -3255,72 +3463,15 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
                 ])
               }, [
                 renderSlot(_ctx.$slots, "code-block-edit-panel-header", { id: unref(id) }),
-                createVNode(unref(TMagicCard), { shadow: "never" }, {
-                  header: withCtx(() => [
-                    createElementVNode("div", _hoisted_4$1, [
-                      _hoisted_5$1,
-                      codeConfig.value ? (openBlock(), createBlock(unref(TMagicInput), {
-                        key: 0,
-                        class: "code-name-input",
-                        modelValue: codeConfig.value.name,
-                        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => codeConfig.value.name = $event),
-                        disabled: !unref(editable)
-                      }, null, 8, ["modelValue", "disabled"])) : createCommentVNode("", true)
-                    ])
-                  ]),
-                  default: withCtx(() => [
-                    createElementVNode("div", _hoisted_6$1, [
-                      codeConfig.value ? (openBlock(), createBlock(_sfc_main$o, {
-                        key: 0,
-                        ref_key: "codeEditor",
-                        ref: codeEditor,
-                        class: "m-editor-container",
-                        "init-values": `${codeConfig.value.content}`,
-                        onSave: saveCode,
-                        options: {
-                          tabSize: 2,
-                          fontSize: 16,
-                          formatOnPaste: true,
-                          readOnly: !unref(editable)
-                        }
-                      }, null, 8, ["init-values", "options"])) : createCommentVNode("", true),
-                      unref(editable) ? (openBlock(), createElementBlock("div", _hoisted_7$1, [
-                        createVNode(unref(TMagicButton), {
-                          type: "primary",
-                          class: "button",
-                          onClick: saveCode
-                        }, {
-                          default: withCtx(() => [
-                            _hoisted_8$1
-                          ]),
-                          _: 1
-                        }),
-                        createVNode(unref(TMagicButton), {
-                          type: "primary",
-                          class: "button",
-                          onClick: saveAndClose
-                        }, {
-                          default: withCtx(() => [
-                            _hoisted_9$1
-                          ]),
-                          _: 1
-                        })
-                      ])) : (openBlock(), createElementBlock("div", _hoisted_10, [
-                        createVNode(unref(TMagicButton), {
-                          type: "primary",
-                          class: "button",
-                          onClick: saveAndClose
-                        }, {
-                          default: withCtx(() => [
-                            _hoisted_11
-                          ]),
-                          _: 1
-                        })
-                      ]))
-                    ])
-                  ]),
-                  _: 1
-                })
+                codeConfig.value ? (openBlock(), createBlock(_sfc_main$g, {
+                  key: 0,
+                  id: unref(id),
+                  name: codeConfig.value.name,
+                  content: codeConfig.value.content,
+                  editable: !!unref(editable),
+                  autoSaveDraft: unref(mode) === unref(CodeEditorMode).EDITOR,
+                  codeOptions: unref(codeOptions)
+                }, null, 8, ["id", "name", "content", "editable", "autoSaveDraft", "codeOptions"])) : createCommentVNode("", true)
               ], 2)) : createCommentVNode("", true)
             ]),
             _: 2
@@ -3355,7 +3506,7 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
           ]), 1032, ["left"])
         ]),
         _: 3
-      }, 8, ["modelValue", "title"]);
+      }, 8, ["title"]);
     };
   }
 });
@@ -3394,41 +3545,38 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
     const props = __props;
     const services = inject("services");
     const state = reactive({
-      codeList: [],
-      bindComps: {}
+      codeList: []
     });
     const editable = computed(() => services?.codeBlockService.getEditStatus());
-    const getBindCompsByCodeId = (codeId, codeBlockContent) => {
-      if (isEmpty(codeBlockContent) || isEmpty(codeBlockContent.comps)) {
-        state.bindComps[codeId] = [];
-        return;
-      }
-      const compsField = codeBlockContent.comps;
-      const bindCompIds = Object.keys(compsField);
-      const bindCompsFiltered = bindCompIds.filter((compId) => !isEmpty(compsField[compId]));
-      const compsInfo = bindCompsFiltered.map((compId) => ({
-        id: compId,
-        name: getCompName(compId)
+    const isShowCodeBlockEditor = computed(() => services?.codeBlockService.getCodeEditorShowStatus() || false);
+    const codeCombineInfo = ref(null);
+    const getBindCompsByCodeId = (codeId) => {
+      if (!codeCombineInfo.value || !codeCombineInfo.value[codeId])
+        return [];
+      const bindCompsId = Object.keys(codeCombineInfo.value[codeId]);
+      return bindCompsId.map((compId) => ({
+        compId,
+        compName: getCompName(compId)
       }));
-      state.bindComps[codeId] = compsInfo;
     };
     const initList = async () => {
-      const codeDsl = await services?.codeBlockService.getCodeDsl() || null;
-      if (!codeDsl)
+      const codeDsl = cloneDeep(await services?.codeBlockService.getCodeDsl()) || null;
+      codeCombineInfo.value = cloneDeep(services?.codeBlockService.getCombineInfo()) || null;
+      if (!codeDsl || !codeCombineInfo.value)
         return;
       state.codeList = [];
       forIn(codeDsl, (value, codeId) => {
-        getBindCompsByCodeId(codeId, value);
         state.codeList.push({
           id: codeId,
           name: value.name,
           codeBlockContent: value,
-          showRelation: true
+          showRelation: true,
+          combineInfo: getBindCompsByCodeId(codeId)
         });
       });
     };
     watch(
-      () => services?.codeBlockService.getCodeDsl(),
+      [() => services?.codeBlockService.getCodeDslSync(), () => services?.codeBlockService.refreshCombineInfo()],
       () => {
         initList();
       },
@@ -3437,20 +3585,6 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
         deep: true
       }
     );
-    watch(
-      () => services?.editorService.get("node"),
-      (curNode) => {
-        if (!curNode?.id)
-          return;
-        forIn(state.bindComps, (bindCompInfo) => {
-          bindCompInfo.forEach((comp) => {
-            if (comp.id === curNode.id) {
-              comp.name = curNode.name;
-            }
-          });
-        });
-      }
-    );
     const createCodeBlock = async () => {
       const { codeBlockService } = services || {};
       if (!codeBlockService) {
@@ -3461,7 +3595,8 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
         name: "\u4EE3\u7801\u5757",
         content: `() => {
   // place your code here
-}`
+}`,
+        params: []
       };
       await codeBlockService.setMode(CodeEditorMode.EDITOR);
       const id = await codeBlockService.getUniqueId();
@@ -3473,7 +3608,8 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
       services?.codeBlockService.setCodeEditorContent(true, key);
     };
     const deleteCode = (key) => {
-      const existBinds = !!(state.bindComps[key]?.length > 0);
+      const currentCode = state.codeList.find((codeItem) => codeItem.id === key);
+      const existBinds = !isEmpty(currentCode?.combineInfo);
       const undeleteableList = services?.codeBlockService.getUndeletableList() || [];
       if (!existBinds && !undeleteableList.includes(key)) {
         services?.codeBlockService.deleteCodeDslByIds([key]);
@@ -3556,7 +3692,7 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
               class: "list-container"
             }, [
               createElementVNode("div", _hoisted_5, [
-                createElementVNode("div", _hoisted_6, toDisplayString(data.name) + "\uFF08" + toDisplayString(data.id) + "\uFF09", 1),
+                createElementVNode("span", _hoisted_6, toDisplayString(data.name) + "\uFF08" + toDisplayString(data.id) + "\uFF09", 1),
                 createElementVNode("div", _hoisted_7, [
                   createVNode(unref(TMagicTooltip), {
                     effect: "dark",
@@ -3564,7 +3700,7 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
                     placement: "bottom"
                   }, {
                     default: withCtx(() => [
-                      createVNode(_sfc_main$l, {
+                      createVNode(_sfc_main$n, {
                         icon: unref(editable) ? unref(Edit) : unref(View),
                         class: "edit-icon",
                         onClick: withModifiers(($event) => editCode(`${data.id}`), ["stop"])
@@ -3572,14 +3708,14 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
                     ]),
                     _: 2
                   }, 1032, ["content"]),
-                  state.bindComps[data.id] && state.bindComps[data.id].length > 0 ? (openBlock(), createBlock(unref(TMagicTooltip), {
+                  data.combineInfo && data.combineInfo.length > 0 ? (openBlock(), createBlock(unref(TMagicTooltip), {
                     key: 0,
                     effect: "dark",
                     content: "\u67E5\u770B\u7ED1\u5B9A\u5173\u7CFB",
                     placement: "bottom"
                   }, {
                     default: withCtx(() => [
-                      createVNode(_sfc_main$l, {
+                      createVNode(_sfc_main$n, {
                         icon: unref(Link),
                         class: "edit-icon",
                         onClick: withModifiers(($event) => toggleCombineRelation(data), ["stop"])
@@ -3594,7 +3730,7 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
                     placement: "bottom"
                   }, {
                     default: withCtx(() => [
-                      createVNode(_sfc_main$l, {
+                      createVNode(_sfc_main$n, {
                         icon: unref(Close),
                         class: "edit-icon",
                         onClick: withModifiers(($event) => deleteCode(`${data.id}`), ["stop"])
@@ -3608,18 +3744,18 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
                   })
                 ])
               ]),
-              data.showRelation && state.bindComps[data.id] && state.bindComps[data.id].length > 0 ? (openBlock(), createElementBlock("div", _hoisted_8, [
+              data.showRelation && data.combineInfo && data.combineInfo.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_8, [
                 _hoisted_9,
-                (openBlock(true), createElementBlock(Fragment, null, renderList(state.bindComps[data.id], (comp, index) => {
+                (openBlock(true), createElementBlock(Fragment, null, renderList(data.combineInfo, (comp, index) => {
                   return openBlock(), createBlock(unref(TMagicButton), {
                     key: index,
                     class: "code-comp",
                     size: "small",
                     plain: true,
-                    onClick: withModifiers(($event) => selectComp(comp.id), ["stop"])
+                    onClick: withModifiers(($event) => selectComp(comp.compId), ["stop"])
                   }, {
                     default: withCtx(() => [
-                      createTextVNode(toDisplayString(comp.name), 1)
+                      createTextVNode(toDisplayString(comp.compName), 1)
                     ]),
                     _: 2
                   }, 1032, ["onClick"]);
@@ -3629,12 +3765,12 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
           ]),
           _: 3
         }, 8, ["data"])) : createCommentVNode("", true),
-        createVNode(_sfc_main$f, null, {
+        unref(isShowCodeBlockEditor) ? (openBlock(), createBlock(_sfc_main$f, { key: 1 }, {
           "code-block-edit-panel-header": withCtx(({ id }) => [
             renderSlot(_ctx.$slots, "code-block-edit-panel-header", { id })
           ]),
           _: 3
-        })
+        })) : createCommentVNode("", true)
       ]);
     };
   }
@@ -3734,7 +3870,7 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
                     name: `${index}`
                   }, {
                     title: withCtx(() => [
-                      createVNode(_sfc_main$l, { icon: unref(Grid) }, null, 8, ["icon"]),
+                      createVNode(_sfc_main$n, { icon: unref(Grid) }, null, 8, ["icon"]),
                       createTextVNode(toDisplayString(group.title), 1)
                     ]),
                     default: withCtx(() => [
@@ -3749,7 +3885,7 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
                           onDrag: dragHandler
                         }, [
                           renderSlot(_ctx.$slots, "component-list-item", { component: item }, () => [
-                            createVNode(_sfc_main$l, {
+                            createVNode(_sfc_main$n, {
                               icon: item.icon
                             }, null, 8, ["icon"]),
                             createVNode(unref(TMagicTooltip), {
@@ -3872,7 +4008,7 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
       }, [
         createElementVNode("div", null, [
           (openBlock(true), createElementBlock(Fragment, null, renderList(__props.menuData, (item, index) => {
-            return openBlock(), createBlock(_sfc_main$i, {
+            return openBlock(), createBlock(_sfc_main$k, {
               "event-type": "mouseup",
               data: item,
               key: index,
@@ -4159,28 +4295,37 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
       await expandNodes();
       setTreeKeyStatus();
     });
-    const keycon = ref();
-    const addSelectModeListener = () => {
+    const layerPanel = ref();
+    const mouseenterHandler = () => {
+      layerPanel.value?.focus();
+    };
+    const mouseleaveHandler = () => {
+      layerPanel.value?.blur();
+      if (selectedIds.value.length === 1)
+        isMultiSelectStatus.value = false;
+    };
+    let keycon;
+    onMounted(() => {
+      layerPanel.value?.addEventListener("mouseenter", mouseenterHandler);
+      layerPanel.value?.addEventListener("mouseleave", mouseleaveHandler);
+      keycon = new KeyController(layerPanel.value);
       const isMac = /mac os x/.test(navigator.userAgent.toLowerCase());
       const ctrl = isMac ? "meta" : "ctrl";
-      keycon.value = new KeyController();
-      keycon.value.keydown(ctrl, (e) => {
+      keycon.keydown(ctrl, (e) => {
         e.inputEvent.preventDefault();
         isMultiSelectStatus.value = true;
-      });
-      keycon.value.on("blur", () => {
+      }).on("blur", () => {
         isMultiSelectStatus.value = false;
-      });
-      keycon.value.keyup(ctrl, (e) => {
+      }).keyup(ctrl, (e) => {
         e.inputEvent.preventDefault();
         isMultiSelectStatus.value = false;
       });
-    };
-    const removeSelectModeListener = () => {
-      keycon.value?.destroy();
-      if (selectedIds.value.length === 1)
-        isMultiSelectStatus.value = false;
-    };
+    });
+    onUnmounted(() => {
+      layerPanel.value?.removeEventListener("mouseenter", mouseenterHandler);
+      layerPanel.value?.removeEventListener("mouseleave", mouseleaveHandler);
+      keycon.destroy();
+    });
     const clicked = ref(false);
     const highlightNode = computed(() => editorService?.get("highlightNode"));
     const highlightHandler = throttle((data) => {
@@ -4235,77 +4380,78 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
       menu.value?.show(event);
     };
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(unref(TMagicScrollbar), {
-        class: "magic-editor-layer-panel",
-        onMouseenter: addSelectModeListener,
-        onMouseleave: removeSelectModeListener
-      }, {
-        default: withCtx(() => [
-          renderSlot(_ctx.$slots, "layer-panel-header"),
-          createVNode(unref(TMagicInput), {
-            modelValue: filterText.value,
-            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => filterText.value = $event),
-            class: "search-input",
-            size: "small",
-            placeholder: "\u8F93\u5165\u5173\u952E\u5B57\u8FDB\u884C\u8FC7\u6EE4",
-            clearable: "",
-            "prefix-icon": unref(Search),
-            onChange: filterTextChangeHandler
-          }, null, 8, ["modelValue", "prefix-icon"]),
-          unref(values).length ? (openBlock(), createBlock(unref(TMagicTree), {
-            key: 0,
-            class: "magic-editor-layer-tree",
-            ref_key: "tree",
-            ref: tree,
-            "node-key": "id",
-            "empty-text": "\u9875\u9762\u7A7A\u8361\u8361\u7684",
-            draggable: "",
-            "default-expanded-keys": unref(defaultExpandedKeys),
-            load: loadItems,
-            data: unref(values),
-            "expand-on-click-node": false,
-            "highlight-current": true,
-            props: {
-              children: "items"
-            },
-            "filter-node-method": filterNode,
-            "allow-drop": allowDrop,
-            "show-checkbox": isMultiSelectStatus.value || unref(selectedIds).length > 1,
-            onNodeClick: clickHandler,
-            onNodeContextmenu: contextmenu,
-            onNodeDragEnd: handleDragEnd,
-            onNodeCollapse: handleCollapse,
-            onNodeExpand: handleExpand,
-            onCheck: multiClickHandler,
-            onMousedown: toggleClickFlag,
-            onMouseup: toggleClickFlag
-          }, {
-            default: withCtx(({ node, data }) => [
-              createElementVNode("div", {
-                id: data.id,
-                class: normalizeClass(["cus-tree-node", { "cus-tree-node-hover": canHighlight(data) }]),
-                onMouseenter: ($event) => unref(highlightHandler)(data)
-              }, [
-                renderSlot(_ctx.$slots, "layer-node-content", {
-                  node,
-                  data
-                }, () => [
-                  createElementVNode("span", null, toDisplayString(`${data.name} (${data.id})`), 1)
-                ])
-              ], 42, _hoisted_1$4)
-            ]),
-            _: 3
-          }, 8, ["default-expanded-keys", "data", "show-checkbox"])) : createCommentVNode("", true),
-          (openBlock(), createBlock(Teleport, { to: "body" }, [
-            createVNode(_sfc_main$b, {
-              ref_key: "menu",
-              ref: menu,
-              "layer-content-menu": __props.layerContentMenu
-            }, null, 8, ["layer-content-menu"])
-          ]))
-        ]),
-        _: 3
-      });
+      return openBlock(), createElementBlock("div", {
+        ref_key: "layerPanel",
+        ref: layerPanel
+      }, [
+        createVNode(unref(TMagicScrollbar), { class: "magic-editor-layer-panel" }, {
+          default: withCtx(() => [
+            renderSlot(_ctx.$slots, "layer-panel-header"),
+            createVNode(unref(TMagicInput), {
+              modelValue: filterText.value,
+              "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => filterText.value = $event),
+              class: "search-input",
+              size: "small",
+              placeholder: "\u8F93\u5165\u5173\u952E\u5B57\u8FDB\u884C\u8FC7\u6EE4",
+              clearable: "",
+              "prefix-icon": unref(Search),
+              onChange: filterTextChangeHandler
+            }, null, 8, ["modelValue", "prefix-icon"]),
+            unref(values).length ? (openBlock(), createBlock(unref(TMagicTree), {
+              key: 0,
+              class: "magic-editor-layer-tree",
+              ref_key: "tree",
+              ref: tree,
+              "node-key": "id",
+              "empty-text": "\u9875\u9762\u7A7A\u8361\u8361\u7684",
+              draggable: "",
+              "default-expanded-keys": unref(defaultExpandedKeys),
+              load: loadItems,
+              data: unref(values),
+              "expand-on-click-node": false,
+              "highlight-current": true,
+              props: {
+                children: "items"
+              },
+              "filter-node-method": filterNode,
+              "allow-drop": allowDrop,
+              "show-checkbox": isMultiSelectStatus.value || unref(selectedIds).length > 1,
+              onNodeClick: clickHandler,
+              onNodeContextmenu: contextmenu,
+              onNodeDragEnd: handleDragEnd,
+              onNodeCollapse: handleCollapse,
+              onNodeExpand: handleExpand,
+              onCheck: multiClickHandler,
+              onMousedown: toggleClickFlag,
+              onMouseup: toggleClickFlag
+            }, {
+              default: withCtx(({ node, data }) => [
+                createElementVNode("div", {
+                  id: data.id,
+                  class: normalizeClass(["cus-tree-node", { "cus-tree-node-hover": canHighlight(data) }]),
+                  onMouseenter: ($event) => unref(highlightHandler)(data)
+                }, [
+                  renderSlot(_ctx.$slots, "layer-node-content", {
+                    node,
+                    data
+                  }, () => [
+                    createElementVNode("span", null, toDisplayString(`${data.name} (${data.id})`), 1)
+                  ])
+                ], 42, _hoisted_1$4)
+              ]),
+              _: 3
+            }, 8, ["default-expanded-keys", "data", "show-checkbox"])) : createCommentVNode("", true),
+            (openBlock(), createBlock(Teleport, { to: "body" }, [
+              createVNode(_sfc_main$b, {
+                ref_key: "menu",
+                ref: menu,
+                "layer-content-menu": __props.layerContentMenu
+              }, null, 8, ["layer-content-menu"])
+            ]))
+          ]),
+          _: 3
+        })
+      ], 512);
     };
   }
 });
@@ -4388,7 +4534,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
                 (openBlock(), createElementBlock("div", {
                   key: config.text
                 }, [
-                  config.icon ? (openBlock(), createBlock(_sfc_main$l, {
+                  config.icon ? (openBlock(), createBlock(_sfc_main$n, {
                     key: 0,
                     icon: config.icon
                   }, null, 8, ["icon"])) : createCommentVNode("", true),
@@ -4606,14 +4752,14 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
           class: "m-editor-page-bar-item m-editor-page-bar-item-icon",
           onClick: addPage
         }, [
-          createVNode(_sfc_main$l, { icon: unref(Plus) }, null, 8, ["icon"])
+          createVNode(_sfc_main$n, { icon: unref(Plus) }, null, 8, ["icon"])
         ])) : (openBlock(), createElementBlock("div", _hoisted_1$1)),
         canScroll.value ? (openBlock(), createElementBlock("div", {
           key: 2,
           class: "m-editor-page-bar-item m-editor-page-bar-item-icon",
           onClick: _cache[0] || (_cache[0] = ($event) => scroll("left"))
         }, [
-          createVNode(_sfc_main$l, { icon: unref(ArrowLeftBold) }, null, 8, ["icon"])
+          createVNode(_sfc_main$n, { icon: unref(ArrowLeftBold) }, null, 8, ["icon"])
         ])) : createCommentVNode("", true),
         unref(pageLength) ? (openBlock(), createElementBlock("div", {
           key: 3,
@@ -4629,7 +4775,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
           class: "m-editor-page-bar-item m-editor-page-bar-item-icon",
           onClick: _cache[1] || (_cache[1] = ($event) => scroll("right"))
         }, [
-          createVNode(_sfc_main$l, { icon: unref(ArrowRightBold) }, null, 8, ["icon"])
+          createVNode(_sfc_main$n, { icon: unref(ArrowRightBold) }, null, 8, ["icon"])
         ])) : createCommentVNode("", true)
       ], 512);
     };
@@ -4701,7 +4847,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
                 default: withCtx(() => [
                   createElementVNode("div", null, [
                     renderSlot(_ctx.$slots, "page-bar-popover", { page: item }, () => [
-                      createVNode(_sfc_main$i, {
+                      createVNode(_sfc_main$k, {
                         data: {
                           type: "button",
                           text: "\u590D\u5236",
@@ -4709,7 +4855,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
                           handler: () => copy(item)
                         }
                       }, null, 8, ["data"]),
-                      createVNode(_sfc_main$i, {
+                      createVNode(_sfc_main$k, {
                         data: {
                           type: "button",
                           text: "\u5220\u9664",
@@ -5526,11 +5672,11 @@ const componentListService = new ComponentList();
 const _sfc_main = defineComponent({
   name: "m-editor",
   components: {
-    NavMenu: _sfc_main$h,
+    NavMenu: _sfc_main$j,
     Sidebar: _sfc_main$9,
     Workspace: _sfc_main$1,
-    PropsPanel: _sfc_main$g,
-    Framework: _sfc_main$j
+    PropsPanel: _sfc_main$i,
+    Framework: _sfc_main$l
   },
   props: {
     modelValue: {
@@ -5703,6 +5849,7 @@ const _sfc_main = defineComponent({
       codeBlockService
     };
     provide("services", services);
+    provide("codeOptions", props.codeOptions);
     provide(
       "stageOptions",
       reactive({
@@ -5827,13 +5974,13 @@ const index = {
     app.config.globalProperties.$TMAGIC_EDITOR = option;
     setConfig(option);
     app.component(Editor.name, Editor);
-    app.component("m-fields-ui-select", _sfc_main$p);
-    app.component("m-fields-code-link", _sfc_main$r);
-    app.component("m-fields-vs-code", _sfc_main$s);
-    app.component("magic-code-editor", _sfc_main$o);
-    app.component("m-fields-code-select", _sfc_main$q);
+    app.component("m-fields-ui-select", _sfc_main$r);
+    app.component("m-fields-code-link", _sfc_main$t);
+    app.component("m-fields-vs-code", _sfc_main$u);
+    app.component("magic-code-editor", _sfc_main$q);
+    app.component("m-fields-code-select", _sfc_main$s);
   }
 };
 
-export { COPY_STORAGE_KEY, _sfc_main$e as CodeBlockList, CodeDeleteErrorType, CodeEditorMode, _sfc_main$q as CodeSelect, CodeSelectOp, ColumnLayout, _sfc_main$d as ComponentListPanel, _sfc_main$c as ContentMenu, Fixed2Other, H_GUIDE_LINE_STORAGE_KEY, _sfc_main$l as Icon, Keys, LayerOffset, _sfc_main$a as LayerPanel, Layout, _sfc_main$m as LayoutContainer, _sfc_main$g as PropsPanel, _sfc_main$o as TMagicCodeEditor, Editor as TMagicEditor, _sfc_main$i as ToolButton, V_GUIDE_LINE_STORAGE_KEY, change2Fixed, codeBlockService, debug, index as default, editorService, error, eventsService, fillConfig, fixNodeLeft, fixNodePosition, generatePageName, generatePageNameByApp, getConfig, getGuideLineFromCache, getInitPositionStyle, getNodeIndex, getPageList, getPageNameList, getRelativeStyle, historyService, info, isFixed, log, propsService, setConfig, setLayout, storageService, uiService, useStage, warn };
+export { CODE_DRAFT_STORAGE_KEY, COPY_STORAGE_KEY, _sfc_main$e as CodeBlockList, CodeDeleteErrorType, CodeEditorMode, _sfc_main$s as CodeSelect, ColumnLayout, _sfc_main$d as ComponentListPanel, _sfc_main$c as ContentMenu, Fixed2Other, H_GUIDE_LINE_STORAGE_KEY, _sfc_main$n as Icon, Keys, LayerOffset, _sfc_main$a as LayerPanel, Layout, _sfc_main$o as LayoutContainer, _sfc_main$i as PropsPanel, _sfc_main$q as TMagicCodeEditor, Editor as TMagicEditor, _sfc_main$k as ToolButton, V_GUIDE_LINE_STORAGE_KEY, change2Fixed, codeBlockService, debug, index as default, editorService, error, eventsService, fillConfig, fixNodeLeft, fixNodePosition, generatePageName, generatePageNameByApp, getConfig, getGuideLineFromCache, getInitPositionStyle, getNodeIndex, getPageList, getPageNameList, getRelativeStyle, historyService, info, isFixed, log, propsService, serializeConfig, setConfig, setLayout, storageService, uiService, useStage, warn };
 //# sourceMappingURL=tmagic-editor.mjs.map