@tmagic/editor 1.2.0-beta.14 → 1.2.0-beta.16

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.0-beta.14",
+  "version": "1.2.0-beta.16",
   "name": "@tmagic/editor",
   "sideEffects": [
     "dist/*",
@@ -45,12 +45,12 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@element-plus/icons-vue": "^2.0.9",
-    "@tmagic/core": "1.2.0-beta.14",
-    "@tmagic/design": "1.2.0-beta.14",
-    "@tmagic/form": "1.2.0-beta.14",
-    "@tmagic/schema": "1.2.0-beta.14",
-    "@tmagic/stage": "1.2.0-beta.14",
-    "@tmagic/utils": "1.2.0-beta.14",
+    "@tmagic/core": "1.2.0-beta.16",
+    "@tmagic/design": "1.2.0-beta.16",
+    "@tmagic/form": "1.2.0-beta.16",
+    "@tmagic/schema": "1.2.0-beta.16",
+    "@tmagic/stage": "1.2.0-beta.16",
+    "@tmagic/utils": "1.2.0-beta.16",
     "buffer": "^6.0.3",
     "color": "^3.1.3",
     "events": "^3.3.0",
@@ -62,8 +62,8 @@
     "vue": "^3.2.37"
   },
   "peerDependencies": {
-    "@tmagic/design": "1.2.0-beta.14",
-    "@tmagic/form": "1.2.0-beta.14",
+    "@tmagic/design": "1.2.0-beta.16",
+    "@tmagic/form": "1.2.0-beta.16",
     "monaco-editor": "^0.34.0",
     "vue": "^3.2.37"
   },

package/src/layouts/PropsPanel.vue

@@ -1,15 +1,16 @@
 <template>
   <div class="m-editor-props-panel">
     <slot name="props-panel-header"></slot>
-    <m-form
+    <MForm
       ref="configForm"
+      :key="node?.type"
       :class="`m-editor-props-panel ${propsPanelSize}`"
       :popper-class="`m-editor-props-panel-popper ${propsPanelSize}`"
       :size="propsPanelSize"
       :init-values="values"
       :config="curFormConfig"
       @change="submit"
-    ></m-form>
+    ></MForm>
   </div>
 </template>
 
@@ -17,7 +18,8 @@
 import { computed, getCurrentInstance, inject, onMounted, ref, watchEffect } from 'vue';
 
 import { tMagicMessage } from '@tmagic/design';
-import type { FormValue, MForm } from '@tmagic/form';
+import type { FormValue } from '@tmagic/form';
+import { MForm } from '@tmagic/form';
 import type { MNode } from '@tmagic/schema';
 import type StageCore from '@tmagic/stage';
 
@@ -32,7 +34,9 @@ const configForm = ref<InstanceType<typeof MForm>>();
 const curFormConfig = ref<any>([]);
 const services = inject<Services>('services');
 const node = computed(() => services?.editorService.get<MNode | null>('node'));
-const propsPanelSize = computed(() => services?.uiService.get('propsPanelSize') || 'small');
+const propsPanelSize = computed(
+  () => services?.uiService.get<'large' | 'default' | 'small'>('propsPanelSize') || 'small',
+);
 const stage = computed(() => services?.editorService.get<StageCore>('stage'));
 
 const init = async () => {

package/src/layouts/sidebar/LayerPanel.vue

@@ -1,66 +1,68 @@
 <template>
-  <div ref="layerPanel">
-    <TMagicScrollbar class="magic-editor-layer-panel">
-      <slot name="layer-panel-header"></slot>
-
-      <TMagicInput
-        v-model="filterText"
-        class="search-input"
-        size="small"
-        placeholder="输入关键字进行过滤"
-        clearable
-        :prefix-icon="Search"
-        @change="filterTextChangeHandler"
-      ></TMagicInput>
-
-      <TMagicTree
-        v-if="values.length"
-        class="magic-editor-layer-tree"
-        ref="tree"
-        node-key="id"
-        empty-text="页面空荡荡的"
-        draggable
-        :default-expanded-keys="defaultExpandedKeys"
-        :load="loadItems"
-        :data="values"
-        :expand-on-click-node="false"
-        :highlight-current="true"
-        :props="{
-          children: 'items',
-        }"
-        :filter-node-method="filterNode"
-        :allow-drop="allowDrop"
-        :show-checkbox="isMultiSelectStatus || selectedIds.length > 1"
-        @node-click="clickHandler"
-        @node-contextmenu="contextmenu"
-        @node-drag-end="handleDragEnd"
-        @node-collapse="handleCollapse"
-        @node-expand="handleExpand"
-        @check="multiClickHandler"
-        @mousedown="toggleClickFlag"
-        @mouseup="toggleClickFlag"
-      >
-        <template #default="{ node, data }">
-          <div
-            :id="data.id"
-            class="cus-tree-node"
-            @mouseenter="highlightHandler(data)"
-            :class="{ 'cus-tree-node-hover': canHighlight(data) }"
-          >
-            <slot name="layer-node-content" :node="node" :data="data">
-              <span>
-                {{ `${data.name} (${data.id})` }}
-              </span>
-            </slot>
-          </div>
-        </template>
-      </TMagicTree>
-
-      <Teleport to="body">
-        <LayerMenu ref="menu" :layer-content-menu="layerContentMenu"></LayerMenu>
-      </Teleport>
-    </TMagicScrollbar>
-  </div>
+  <TMagicScrollbar class="magic-editor-layer-panel">
+    <slot name="layer-panel-header"></slot>
+
+    <TMagicInput
+      v-model="filterText"
+      class="search-input"
+      size="small"
+      placeholder="输入关键字进行过滤"
+      clearable
+      :prefix-icon="Search"
+      @change="filterTextChangeHandler"
+    ></TMagicInput>
+
+    <TMagicTree
+      v-if="values.length"
+      tabindex="-1"
+      class="magic-editor-layer-tree"
+      ref="tree"
+      node-key="id"
+      empty-text="页面空荡荡的"
+      draggable
+      :default-expanded-keys="defaultExpandedKeys"
+      :load="loadItems"
+      :data="values"
+      :default-expand-all="true"
+      :expand-on-click-node="false"
+      :highlight-current="true"
+      :props="{
+        children: 'items',
+      }"
+      :filter-node-method="filterNode"
+      :allow-drop="allowDrop"
+      :show-checkbox="isMultiSelectStatus || selectedIds.length > 1"
+      @node-click="clickHandler"
+      @node-contextmenu="contextmenu"
+      @node-drag-end="handleDragEnd"
+      @node-collapse="handleCollapse"
+      @node-expand="handleExpand"
+      @check="multiClickHandler"
+      @mousedown="toggleClickFlag"
+      @mouseup="toggleClickFlag"
+      @mouseenter="mouseenterHandler"
+      @mouseleave="mouseleaveHandler"
+    >
+      <template #default="{ node, data }">
+        <div
+          :id="data.id"
+          class="cus-tree-node"
+          @mouseenter="highlightHandler(data)"
+          :class="{ 'cus-tree-node-hover': canHighlight(data) }"
+        >
+          <slot name="layer-node-content" :node="node" :data="data">
+            <span>
+              {{ `${data.name} (${data.id})` }}
+            </span>
+          </slot>
+        </div>
+      </template>
+    </TMagicTree>
+
+    <Teleport to="body">
+      <LayerMenu ref="menu" :layer-content-menu="layerContentMenu"></LayerMenu>
+    </Teleport>
+  </TMagicScrollbar>
 </template>
 
 <script lang="ts" setup name="MEditorLayerPanel">
@@ -262,24 +264,19 @@ watch([selectedIds, tree], async () => {
   setTreeKeyStatus();
 });
 
-const layerPanel = ref<HTMLDivElement>();
 const mouseenterHandler = () => {
-  layerPanel.value?.focus();
+  tree.value?.$el.focus();
 };
 
 const mouseleaveHandler = () => {
-  layerPanel.value?.blur();
-  // 如果鼠标移出监听范围，且当前只选中了一个，置为单选模式(修复按住ctrl不放但鼠标移出的情况)
-  if (selectedIds.value.length === 1) isMultiSelectStatus.value = false;
+  tree.value?.$el.blur();
+  isMultiSelectStatus.value = false;
 };
 
 let keycon: KeyController;
 
 onMounted(() => {
-  layerPanel.value?.addEventListener('mouseenter', mouseenterHandler);
-  layerPanel.value?.addEventListener('mouseleave', mouseleaveHandler);
-
-  keycon = new KeyController(layerPanel.value);
+  keycon = new KeyController(tree.value?.$el);
   const isMac = /mac os x/.test(navigator.userAgent.toLowerCase());
   const ctrl = isMac ? 'meta' : 'ctrl';
 
@@ -288,9 +285,6 @@ onMounted(() => {
       e.inputEvent.preventDefault();
       isMultiSelectStatus.value = true;
     })
-    .on('blur', () => {
-      isMultiSelectStatus.value = false;
-    })
     .keyup(ctrl, (e) => {
       e.inputEvent.preventDefault();
       isMultiSelectStatus.value = false;
@@ -298,8 +292,6 @@ onMounted(() => {
 });
 
 onUnmounted(() => {
-  layerPanel.value?.removeEventListener('mouseenter', mouseenterHandler);
-  layerPanel.value?.removeEventListener('mouseleave', mouseleaveHandler);
   keycon.destroy();
 });
 

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

@@ -164,7 +164,7 @@ const createCodeBlock = async () => {
   }
   const codeConfig: CodeBlockContent = {
     name: '代码块',
-    content: `() => {\n  // place your code here\n}`,
+    content: `({app, params}) => {\n  // place your code here\n}`,
     params: [],
   };
   await codeBlockService.setMode(CodeEditorMode.EDITOR);

package/src/services/codeBlock.ts

@@ -106,13 +106,17 @@ class CodeBlock extends BaseService {
    */
   public async setCodeDslById(id: Id, codeConfig: CodeBlockContent): Promise<void> {
     let codeDsl = await this.getCodeDsl();
+    const codeConfigProcessed = codeConfig;
+    if (codeConfig.content) {
+      // 在保存的时候转换代码内容
+      // eslint-disable-next-line no-eval
+      codeConfigProcessed.content = eval(codeConfig.content);
+    }
     if (!codeDsl) {
       // dsl中无代码块字段
       codeDsl = {
         [id]: {
-          ...codeConfig,
-          // eslint-disable-next-line no-eval
-          content: eval(codeConfig.content),
+          ...codeConfigProcessed,
         },
       };
     } else {
@@ -121,9 +125,7 @@ class CodeBlock extends BaseService {
         ...codeDsl,
         [id]: {
           ...existContent,
-          ...codeConfig,
-          // eslint-disable-next-line no-eval
-          content: eval(codeConfig.content),
+          ...codeConfigProcessed,
         },
       };
     }

package/src/theme/code-block.scss

@@ -35,9 +35,7 @@
       display: flex;
       align-items: center;
       .right-tool {
-        position: absolute;
-        right: 15px;
-        padding-left: 5px;
+        width: fit-content !important;
         display: flex;
         align-items: center;
         .edit-icon {
@@ -50,7 +48,8 @@
         white-space: nowrap;
         text-overflow: ellipsis;
         padding: 10px 15px;
-        margin-right: 60px;
+        width: 0 !important;
+        flex: 1;
       }
     }
     .code-comp-map-wrapper {