@tmagic/editor 1.3.8 → 1.3.10

package/dist/tmagic-editor.js

@@ -1,13 +1,14 @@
 import { defineComponent, ref, watch, onMounted, onBeforeUnmount, openBlock, createElementBlock, createBlock, Teleport, createElementVNode, normalizeClass, normalizeStyle, createVNode, unref, computed, reactive, resolveComponent, inject, withCtx, Fragment, resolveDynamicComponent, createTextVNode, createCommentVNode, toRaw, nextTick, mergeProps, toDisplayString, renderList, createStaticVNode, watchEffect, withModifiers, renderSlot, normalizeProps, resolveDirective, withDirectives, createSlots, markRaw, getCurrentInstance, vShow, provide, Transition, toHandlers, mergeDefaults } from 'vue';
 import { FullScreen, Edit, View, Coin, Delete, Plus, Close, ArrowDown, ArrowLeftBold, ArrowRightBold, CaretBottom, DocumentCopy, Grid, Memo, ScaleToOriginal, ZoomOut, ZoomIn, Right, Back, Search, ArrowRight, CopyDocument, Files, Hide, Goods, List, EditPen, Top, Bottom } from '@element-plus/icons-vue';
-import { throttle, isEmpty, cloneDeep, mergeWith, get, set, isObject, uniq, map, has, pick, keys } from 'lodash-es';
-import * as monaco from 'monaco-editor';
+import { throttle, isEmpty, cloneDeep, mergeWith, isObject, uniq, get, map, has, pick, keys } from 'lodash-es';
 import serialize from 'serialize-javascript';
 import { TMagicButton, TMagicCard, tMagicMessage, TMagicDialog, TMagicTag, tMagicMessageBox, TMagicIcon, getConfig as getConfig$1, TMagicSwitch, TMagicInput, TMagicTooltip, TMagicDivider, TMagicDropdown, TMagicDropdownMenu, TMagicDropdownItem, TMagicPopover, TMagicScrollbar, TMagicCollapse, TMagicCollapseItem } from '@tmagic/design';
+import { emmetHTML, emmetCSS } from 'emmet-monaco-es';
+import * as monaco from 'monaco-editor';
 import { HookType, NodeType, ActionType } from '@tmagic/schema';
 import { MFormBox, MFormDrawer, MForm, createValues, MSelect } from '@tmagic/form';
 import { MagicTable } from '@tmagic/table';
-import { guid, isPage, isPageFragment, isPop, getNodePath, isNumber, toLine, getDefaultValueFromFields, DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, getKeys, addClassName, removeClassName, removeClassNameByClassName, convertToNumber, getNodes } from '@tmagic/utils';
+import { guid, isPage, isPageFragment, isPop, getNodePath, isNumber, toLine, getValueByKeyPath, setValueByKeyPath, getDefaultValueFromFields, DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, getKeys, addClassName, removeClassName, removeClassNameByClassName, convertToNumber, getNodes } from '@tmagic/utils';
 import Gesto from 'gesto';
 import Moveable from 'moveable';
 import { Watcher, DepTargetType, createRelatedCompTarget, createCodeBlockTarget, createDataSourceTarget, createDataSourceMethodTarget, createDataSourceCondTarget } from '@tmagic/dep';
@@ -23,6 +24,9 @@ const setConfig = (option) => {
 };
 const getConfig = (key) => $TMAGIC_EDITOR[key];
 
+emmetHTML(monaco);
+emmetCSS(monaco, ["css", "scss"]);
+
 const _hoisted_1$t = {
   class: /* @__PURE__ */ normalizeClass(`magic-code-editor`)
 };
@@ -612,7 +616,7 @@ const _sfc_main$P = /* @__PURE__ */ defineComponent({
           left: withCtx(() => [
             createVNode(unref(TMagicButton), {
               type: "primary",
-              text: "",
+              link: "",
               onClick: _cache[0] || (_cache[0] = ($event) => difVisible.value = true)
             }, {
               default: withCtx(() => [
@@ -2253,11 +2257,11 @@ class Props extends BaseService {
       if (!targetConfig)
         return;
       target.deps[config.id]?.keys?.forEach((fullKey) => {
-        const relateOriginId = get(config, fullKey);
+        const relateOriginId = getValueByKeyPath(fullKey, config);
         const relateTargetId = relateIdMap[relateOriginId];
         if (!relateTargetId)
           return;
-        set(targetConfig, fullKey, relateTargetId);
+        setValueByKeyPath(fullKey, relateTargetId, targetConfig);
       });
     });
   }
@@ -2897,14 +2901,19 @@ class Editor extends BaseService {
     const index = brothers.findIndex((item) => `${item.id}` === `${node?.id}`);
     const layout = await this.getLayout(parent, node);
     const isRelative = layout === Layout.RELATIVE;
-    brothers.splice(index, 1);
+    let offsetIndex;
     if (offset === LayerOffset.TOP) {
-      brothers.splice(isRelative ? 0 : brothers.length, 0, node);
+      offsetIndex = isRelative ? 0 : brothers.length;
     } else if (offset === LayerOffset.BOTTOM) {
-      brothers.splice(isRelative ? brothers.length : 0, 0, node);
+      offsetIndex = isRelative ? brothers.length : 0;
     } else {
-      brothers.splice(index + (isRelative ? -offset : offset), 0, node);
+      offsetIndex = index + (isRelative ? -offset : offset);
     }
+    if (offsetIndex > 0 && offsetIndex > brothers.length || offsetIndex < 0) {
+      return;
+    }
+    brothers.splice(index, 1);
+    brothers.splice(offsetIndex, 0, node);
     const grandparent = this.getParentById(parent.id);
     this.get("stage")?.update({
       config: cloneDeep(toRaw(parent)),
@@ -2913,6 +2922,7 @@ class Editor extends BaseService {
     });
     this.addModifiedNodeId(parent.id);
     this.pushHistoryState();
+    this.emit("move-layer", offset);
   }
   /**
    * 移动到指定容器中
@@ -4899,7 +4909,7 @@ const _sfc_main$E = /* @__PURE__ */ defineComponent({
                 }, null, 8, ["config", "model", "disabled", "size"]),
                 createVNode(unref(TMagicButton), {
                   style: { "color": "#f56c6c" },
-                  text: "",
+                  link: "",
                   icon: unref(Delete),
                   disabled: _ctx.disabled,
                   size: _ctx.size,
@@ -5063,7 +5073,7 @@ const _sfc_main$C = /* @__PURE__ */ defineComponent({
           key: 2,
           size: "default",
           disabled: _ctx.disabled,
-          text: "",
+          link: "",
           icon: _sfc_main$D,
           onClick: _cache[0] || (_cache[0] = ($event) => showCode.value = !showCode.value)
         }, null, 8, ["disabled"])) : createCommentVNode("", true)
@@ -5228,7 +5238,7 @@ const _sfc_main$A = /* @__PURE__ */ defineComponent({
           icon: unref(Delete),
           disabled: _ctx.disabled,
           size: _ctx.size,
-          text: "",
+          link: "",
           style: { "padding": "0" }
         }, {
           default: withCtx(() => [
@@ -5249,7 +5259,7 @@ const _sfc_main$A = /* @__PURE__ */ defineComponent({
                 icon: unref(Close),
                 disabled: _ctx.disabled,
                 size: _ctx.size,
-                text: "",
+                link: "",
                 onClick: withModifiers(deleteHandler, ["stop"])
               }, null, 8, ["icon", "disabled", "size", "onClick"])
             ]),
@@ -5261,7 +5271,7 @@ const _sfc_main$A = /* @__PURE__ */ defineComponent({
           }, {
             default: withCtx(() => [
               createVNode(unref(TMagicButton), {
-                text: "",
+                link: "",
                 style: { "padding": "0", "margin": "0" },
                 disabled: _ctx.disabled,
                 size: _ctx.size,
@@ -5284,7 +5294,7 @@ const _sfc_main$A = /* @__PURE__ */ defineComponent({
         }, {
           default: withCtx(() => [
             createVNode(unref(TMagicButton), {
-              text: "",
+              link: "",
               style: { "padding": "0", "margin": "0" },
               disabled: _ctx.disabled,
               size: _ctx.size,
@@ -5596,7 +5606,7 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
             default: withCtx(() => [
               createVNode(unref(TMagicButton), {
                 size: "small",
-                text: "",
+                link: "",
                 disabled: disabled.value
               }, {
                 default: withCtx(() => [
@@ -5613,7 +5623,7 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
           }, 8, ["content"])) : (openBlock(), createBlock(unref(TMagicButton), {
             key: 1,
             size: "small",
-            text: "",
+            link: "",
             disabled: disabled.value,
             title: _ctx.data.text
           }, {
@@ -5871,7 +5881,7 @@ const _sfc_main$u = /* @__PURE__ */ defineComponent({
           class: normalizeClass(["m-editor-page-bar-switch-type-button", { active: _ctx.modelValue === item.type }]),
           size: "small",
           key: item.type,
-          text: "",
+          link: "",
           type: _ctx.modelValue === item.type ? "primary" : "",
           onClick: ($event) => clickHandler(item.type)
         }, {
@@ -9439,7 +9449,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
             ]),
             createElementVNode("div", null, [
               createVNode(unref(TMagicButton), {
-                text: "",
+                link: "",
                 size: "small",
                 icon: unref(Close),
                 onClick: closeHandler
@@ -9956,7 +9966,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
             key: item.id
           }, [
             createVNode(unref(TMagicButton), {
-              text: "",
+              link: "",
               disabled: item.id === node.value?.id,
               onClick: ($event) => select(item)
             }, {