@tmagic/editor 1.3.0-beta.6 → 1.3.0-beta.7

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.0-beta.6",
+  "version": "1.3.0-beta.7",
   "name": "@tmagic/editor",
   "type": "module",
   "sideEffects": [
@@ -47,13 +47,13 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@element-plus/icons-vue": "^2.0.9",
-    "@tmagic/core": "1.3.0-beta.6",
-    "@tmagic/design": "1.3.0-beta.6",
-    "@tmagic/form": "1.3.0-beta.6",
-    "@tmagic/schema": "1.3.0-beta.6",
-    "@tmagic/stage": "1.3.0-beta.6",
-    "@tmagic/table": "1.3.0-beta.6",
-    "@tmagic/utils": "1.3.0-beta.6",
+    "@tmagic/core": "1.3.0-beta.7",
+    "@tmagic/design": "1.3.0-beta.7",
+    "@tmagic/form": "1.3.0-beta.7",
+    "@tmagic/schema": "1.3.0-beta.7",
+    "@tmagic/stage": "1.3.0-beta.7",
+    "@tmagic/table": "1.3.0-beta.7",
+    "@tmagic/utils": "1.3.0-beta.7",
     "buffer": "^6.0.3",
     "color": "^3.1.3",
     "events": "^3.3.0",
@@ -65,8 +65,8 @@
     "vue": "^3.3.4"
   },
   "peerDependencies": {
-    "@tmagic/design": "1.3.0-beta.6",
-    "@tmagic/form": "1.3.0-beta.6",
+    "@tmagic/design": "1.3.0-beta.7",
+    "@tmagic/form": "1.3.0-beta.7",
     "monaco-editor": "^0.41.0",
     "vue": "^3.3.4"
   },

package/src/Editor.vue

@@ -25,6 +25,10 @@
             <slot name="layer-node-content" :data="data"></slot>
           </template>
 
+          <template #layer-node-tool="{ data }">
+            <slot name="layer-node-tool" :data="data"></slot>
+          </template>
+
           <template #component-list-panel-header>
             <slot name="component-list-panel-header"></slot>
           </template>
@@ -40,6 +44,10 @@
           <template #code-block-panel-tool="{ id, data }">
             <slot name="code-block-panel-tool" :id="id" :data="data"></slot>
           </template>
+
+          <template #data-source-panel-tool="{ data }">
+            <slot name="data-source-panel-tool" :data="data"></slot>
+          </template>
         </Sidebar>
       </slot>
     </template>

package/src/components/Tree.vue

@@ -0,0 +1,66 @@
+<template>
+  <div class="m-editor-tree" @dragover="handleDragOver">
+    <template v-if="data?.length">
+      <TreeNode v-for="item in data" :key="item.id" :data="item" :indent="indent" :node-status-map="nodeStatusMap">
+        <template #tree-node-content="{ data: nodeData }">
+          <slot name="tree-node-content" :data="nodeData"> </slot>
+        </template>
+
+        <template #tree-node-tool="{ data: nodeData }">
+          <slot name="tree-node-tool" :data="nodeData"> </slot>
+        </template>
+      </TreeNode>
+    </template>
+    <div v-else>
+      <p>{{ emptyText }}</p>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { provide } from 'vue';
+
+import type { Id } from '@tmagic/schema';
+
+import type { LayerNodeStatus, TreeNodeData } from '@editor/type';
+
+import TreeNode from './TreeNode.vue';
+
+defineSlots<{
+  'tree-node-content'(props: { data: TreeNodeData }): any;
+  'tree-node-tool'(props: { data: TreeNodeData }): any;
+}>();
+
+defineOptions({
+  name: 'MEditorTree',
+});
+
+const emit = defineEmits<{
+  'node-dragover': [event: DragEvent];
+  'node-dragstart': [event: DragEvent, data: TreeNodeData];
+  'node-dragleave': [event: DragEvent, data: TreeNodeData];
+  'node-dragend': [event: DragEvent, data: TreeNodeData];
+  'node-contextmenu': [event: MouseEvent, data: TreeNodeData];
+  'node-mouseenter': [event: MouseEvent, data: TreeNodeData];
+  'node-click': [event: MouseEvent, data: TreeNodeData];
+}>();
+
+provide('treeEmit', emit);
+
+withDefaults(
+  defineProps<{
+    data: TreeNodeData[];
+    nodeStatusMap: Map<Id, LayerNodeStatus>;
+    indent?: number;
+    emptyText?: string;
+  }>(),
+  {
+    indent: 0,
+    emptyText: '暂无数据',
+  },
+);
+
+const handleDragOver = (event: DragEvent) => {
+  emit('node-dragover', event);
+};
+</script>

package/src/components/TreeNode.vue

@@ -0,0 +1,142 @@
+<template>
+  <div
+    v-show="visible"
+    class="m-editor-tree-node"
+    :draggable="draggable"
+    :data-node-id="data.id"
+    :data-is-container="Array.isArray(data.items)"
+    @dragstart="handleDragStart"
+    @dragleave="handleDragLeave"
+    @dragend="handleDragEnd"
+  >
+    <div
+      class="tree-node"
+      :class="{ selected, expanded }"
+      :style="`padding-left: ${indent}px`"
+      @contextmenu="nodeContentmenuHandler"
+      @mouseenter="mouseenterHandler"
+    >
+      <MIcon
+        class="expand-icon"
+        :style="hasChilren ? '' : 'color: transparent; cursor: default'"
+        :icon="expanded ? ArrowDown : ArrowRight"
+        @click="expandHandler"
+      ></MIcon>
+
+      <div class="tree-node-content" @click="nodeClickHandler">
+        <slot name="tree-node-content" :data="data">
+          <div class="tree-node-label">{{ `${data.name} (${data.id})` }}</div>
+          <div class="tree-node-tool">
+            <slot name="tree-node-tool" :data="data"></slot>
+          </div>
+        </slot>
+      </div>
+    </div>
+
+    <div v-if="hasChilren && expanded" class="m-editor-tree-node-children">
+      <TreeNode
+        v-for="item in data.items"
+        :key="item.id"
+        :data="item"
+        :node-status-map="nodeStatusMap"
+        :indent="indent + 11"
+      >
+        <template #tree-node-content="{ data: nodeData }">
+          <slot name="tree-node-content" :data="nodeData"> </slot>
+        </template>
+        <template #tree-node-tool="{ data: nodeData }">
+          <slot name="tree-node-tool" :data="nodeData"> </slot>
+        </template>
+      </TreeNode>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, inject } from 'vue';
+import { ArrowDown, ArrowRight } from '@element-plus/icons-vue';
+
+import type { Id } from '@tmagic/schema';
+
+import MIcon from '@editor/components/Icon.vue';
+import type { LayerNodeStatus, TreeNodeData } from '@editor/type';
+import { updateStatus } from '@editor/utils/tree';
+
+defineSlots<{
+  'tree-node-tool'(props: { data: TreeNodeData }): any;
+  'tree-node-content'(props: { data: TreeNodeData }): any;
+}>();
+
+defineOptions({
+  name: 'MEditorTreeNode',
+});
+
+const emit = defineEmits<{
+  'node-dragstart': [event: DragEvent, data: TreeNodeData];
+  'node-dragleave': [event: DragEvent, data: TreeNodeData];
+  'node-dragend': [event: DragEvent, data: TreeNodeData];
+  'node-contextmenu': [event: MouseEvent, data: TreeNodeData];
+  'node-mouseenter': [event: MouseEvent, data: TreeNodeData];
+  'node-click': [event: MouseEvent, data: TreeNodeData];
+}>();
+
+const treeEmit = inject<typeof emit>('treeEmit');
+
+const props = withDefaults(
+  defineProps<{
+    data: TreeNodeData;
+    nodeStatusMap: Map<Id, LayerNodeStatus>;
+    indent?: number;
+  }>(),
+  {
+    indent: 0,
+  },
+);
+
+const nodeStatus = computed(
+  () =>
+    props.nodeStatusMap?.get(props.data.id) || {
+      selected: false,
+      expand: false,
+      visible: false,
+      draggable: false,
+    },
+);
+
+const expanded = computed(() => nodeStatus.value.expand);
+const selected = computed(() => nodeStatus.value.selected);
+const visible = computed(() => nodeStatus.value.visible);
+const draggable = computed(() => nodeStatus.value.draggable);
+
+const hasChilren = computed(() => props.data.items && props.data.items.length > 0);
+
+const handleDragStart = (event: DragEvent) => {
+  treeEmit?.('node-dragstart', event, props.data);
+};
+
+const handleDragLeave = (event: DragEvent) => {
+  treeEmit?.('node-dragleave', event, props.data);
+};
+
+const handleDragEnd = (event: DragEvent) => {
+  treeEmit?.('node-dragend', event, props.data);
+};
+
+const nodeContentmenuHandler = (event: MouseEvent) => {
+  treeEmit?.('node-contextmenu', event, props.data);
+};
+
+const mouseenterHandler = (event: MouseEvent) => {
+  treeEmit?.('node-mouseenter', event, props.data);
+};
+
+const expandHandler = () => {
+  updateStatus(props.nodeStatusMap, props.data.id, {
+    expand: !expanded.value,
+  });
+};
+
+const nodeClickHandler = (event: MouseEvent) => {
+  treeEmit?.('node-click', event, props.data);
+};
+</script>

package/src/layouts/sidebar/Sidebar.vue

@@ -64,6 +64,19 @@
           <slot v-if="config.$key === 'layer'" name="layer-node-content" :data="nodeData"></slot>
           <component v-else-if="config.slots?.layerNodeContent" :is="config.slots.layerNodeContent" :data="nodeData" />
         </template>
+
+        <template #layer-node-tool="{ data: nodeData }" v-if="config.$key === 'layer' || config.slots?.layerNodeTool">
+          <slot v-if="config.$key === 'layer'" name="layer-node-tool" :data="nodeData"></slot>
+          <component v-else-if="config.slots?.layerNodeTool" :is="config.slots.layerNodeTool" :data="nodeData" />
+        </template>
+
+        <template
+          #data-source-panel-tool="{ data }"
+          v-if="config.$key === 'data-source' || config.slots?.codeBlockPanelTool"
+        >
+          <slot v-if="config.$key === 'data-source'" name="data-source-panel-tool" :data="data"></slot>
+          <component v-else-if="config.slots?.DataSourcePanelTool" :is="config.slots.DataSourcePanelTool" />
+        </template>
       </component>
     </div>
   </div>

package/src/layouts/sidebar/data-source/DataSourceList.vue

@@ -26,7 +26,7 @@
             <TMagicTooltip v-if="editable" effect="dark" content="删除" placement="bottom">
               <Icon :icon="Close" class="edit-icon" @click.stop="removeHandler(`${data.id}`)"></Icon>
             </TMagicTooltip>
-            <slot name="data-source-panel-tool" :id="data.id" :data="data.codeBlockContent"></slot>
+            <slot name="data-source-panel-tool" :data="data"></slot>
           </div>
         </div>
       </div>
@@ -42,7 +42,9 @@ import { tMagicMessageBox, TMagicTooltip, TMagicTree } from '@tmagic/design';
 import { Dep, Id } from '@tmagic/schema';
 
 import Icon from '@editor/components/Icon.vue';
-import { DepTargetType, Services } from '@editor/type';
+import { type DataSourceListSlots, DepTargetType, type Services } from '@editor/type';
+
+defineSlots<DataSourceListSlots>();
 
 defineOptions({
   name: 'MEditorDataSourceList',

package/src/layouts/sidebar/data-source/DataSourceListPanel.vue

@@ -23,7 +23,11 @@
     </div>
 
     <!-- 数据源列表 -->
-    <DataSourceList @edit="editHandler" @remove="removeHandler"></DataSourceList>
+    <DataSourceList @edit="editHandler" @remove="removeHandler">
+      <template #data-source-panel-tool="{ data }">
+        <slot name="data-source-panel-tool" :data="data"></slot>
+      </template>
+    </DataSourceList>
 
     <DataSourceConfigPanel
       ref="editDialog"
@@ -44,11 +48,13 @@ import type { DataSourceSchema } from '@tmagic/schema';
 
 import SearchInput from '@editor/components/SearchInput.vue';
 import ToolButton from '@editor/components/ToolButton.vue';
-import type { Services } from '@editor/type';
+import type { DataSourceListSlots, Services } from '@editor/type';
 
 import DataSourceConfigPanel from './DataSourceConfigPanel.vue';
 import DataSourceList from './DataSourceList.vue';
 
+defineSlots<DataSourceListSlots>();
+
 defineOptions({
   name: 'MEditorDataSourceListPanel',
 });

package/src/layouts/sidebar/layer/LayerPanel.vue

@@ -1,22 +1,33 @@
 <template>
-  <TMagicScrollbar class="magic-editor-layer-panel">
+  <TMagicScrollbar class="m-editor-layer-panel">
     <slot name="layer-panel-header"></slot>
 
     <SearchInput @search="filterTextChangeHandler"></SearchInput>
 
-    <div class="magic-editor-layer-tree" ref="layerTreeContainer" tabindex="-1" @dragover="handleDragOver">
-      <LayerNode
-        v-if="page && root"
-        :data="page"
-        :filter-text="filterText"
-        :is-ctrl-key-down="isCtrlKeyDown"
-        @node-contextmenu="contextmenu"
-      >
-        <template #layer-node-content="{ data: nodeData }">
-          <slot name="layer-node-content" :data="nodeData"> </slot>
-        </template>
-      </LayerNode>
-    </div>
+    <Tree
+      v-if="page && nodeStatusMap"
+      tabindex="-1"
+      ref="tree"
+      :data="[page]"
+      :node-status-map="nodeStatusMap"
+      @node-dragover="handleDragOver"
+      @node-dragstart="handleDragStart"
+      @node-dragleave="handleDragLeave"
+      @node-dragend="handleDragEnd"
+      @node-contextmenu="nodeContentmenuHandler"
+      @node-mouseenter="mouseenterHandler"
+      @node-click="nodeClickHandler"
+    >
+      <template #tree-node-tool="{ data: nodeData }">
+        <slot name="layer-node-tool" :data="nodeData">
+          <LayerNodeTool :data="nodeData"></LayerNodeTool>
+        </slot>
+      </template>
+
+      <template #tree-node-content="{ data: nodeData }">
+        <slot name="layer-node-content" :data="nodeData"> </slot>
+      </template>
+    </Tree>
 
     <Teleport to="body">
       <LayerMenu ref="menu" :layer-content-menu="layerContentMenu" @collapse-all="collapseAllHandler"></LayerMenu>
@@ -25,15 +36,17 @@
 </template>
 
 <script setup lang="ts">
-import { computed, inject, provide, ref } from 'vue';
+import { computed, inject, ref } from 'vue';
 
 import { TMagicScrollbar } from '@tmagic/design';
 
 import SearchInput from '@editor/components/SearchInput.vue';
-import type { LayerPanelSlots, MenuButton, MenuComponent, Services } from '@editor/type';
+import Tree from '@editor/components/Tree.vue';
+import { LayerPanelSlots, MenuButton, MenuComponent, Services } from '@editor/type';
 
 import LayerMenu from './LayerMenu.vue';
-import LayerNode from './LayerNode.vue';
+import LayerNodeTool from './LayerNodeTool.vue';
+import { useClick } from './use-click';
 import { useDrag } from './use-drag';
 import { useFilter } from './use-filter';
 import { useKeybinding } from './use-keybinding';
@@ -52,17 +65,14 @@ defineProps<{
 const services = inject<Services>('services');
 const editorService = services?.editorService;
 
-const layerTreeContainer = ref<HTMLDivElement>();
+const tree = ref<InstanceType<typeof Tree>>();
 
 const page = computed(() => editorService?.get('page'));
-const root = computed(() => editorService?.get('root'));
 
 const { nodeStatusMap } = useNodeStatus(services, page);
-const { isCtrlKeyDown } = useKeybinding(services, layerTreeContainer);
+const { isCtrlKeyDown } = useKeybinding(services, tree);
 
-provide('nodeStatusMap', nodeStatusMap);
-
-const { filterText, filterTextChangeHandler } = useFilter(nodeStatusMap, page);
+const { filterTextChangeHandler } = useFilter(nodeStatusMap, page);
 
 const collapseAllHandler = () => {
   if (!page.value || !nodeStatusMap.value) return;
@@ -75,13 +85,12 @@ const collapseAllHandler = () => {
   }
 };
 
-// 右键菜单
-const menu = ref<InstanceType<typeof LayerMenu>>();
-const contextmenu = (event: MouseEvent): void => {
-  event.preventDefault();
-
-  menu.value?.show(event);
-};
+const { handleDragStart, handleDragEnd, handleDragLeave, handleDragOver } = useDrag(services);
 
-const { handleDragOver } = useDrag(services);
+const {
+  menu,
+  nodeClickHandler,
+  nodeContentmenuHandler,
+  highlightHandler: mouseenterHandler,
+} = useClick(services, isCtrlKeyDown, nodeStatusMap);
 </script>

package/src/layouts/sidebar/layer/use-click.ts

@@ -0,0 +1,105 @@
+import { type ComputedRef, nextTick, type Ref, ref } from 'vue';
+import { throttle } from 'lodash-es';
+
+import { Id, MNode } from '@tmagic/schema';
+
+import { LayerNodeStatus, Services, TreeNodeData, UI_SELECT_MODE_EVENT_NAME } from '@editor/type';
+import { updateStatus } from '@editor/utils/tree';
+
+import LayerMenu from './LayerMenu.vue';
+
+export const useClick = (
+  services: Services | undefined,
+  isCtrlKeyDown: Ref<boolean>,
+  nodeStatusMap: ComputedRef<Map<Id, LayerNodeStatus> | undefined>,
+) => {
+  // 触发画布选中
+  const select = async (data: MNode) => {
+    if (!data.id) {
+      throw new Error('没有id');
+    }
+
+    if (isCtrlKeyDown.value) {
+      multiSelect(data);
+    } else {
+      await services?.editorService.select(data);
+      services?.editorService.get('stage')?.select(data.id);
+    }
+  };
+
+  const multiSelect = async (data: MNode) => {
+    const nodes = services?.editorService.get('nodes') || [];
+
+    const newNodes: Id[] = [];
+    let isCancel = false;
+    nodes.forEach((node) => {
+      if (node.id === data.id) {
+        isCancel = true;
+        return;
+      }
+
+      newNodes.push(node.id);
+    });
+
+    // 只剩一个不能取消选中
+    if (!isCancel || newNodes.length === 0) {
+      newNodes.push(data.id);
+    }
+
+    await services?.editorService.multiSelect(newNodes);
+    services?.editorService.get('stage')?.multiSelect(newNodes);
+  };
+
+  const throttleTime = 300;
+  // 鼠标在组件树移动触发高亮
+  const highlightHandler = throttle((event: MouseEvent, data: TreeNodeData) => {
+    highlight(data);
+  }, throttleTime);
+
+  // 触发画布高亮
+  const highlight = (data: TreeNodeData) => {
+    services?.editorService?.highlight(data);
+    services?.editorService?.get('stage')?.highlight(data.id);
+  };
+
+  const nodeClickHandler = (event: MouseEvent, data: TreeNodeData) => {
+    if (!nodeStatusMap?.value) return;
+
+    if (services?.uiService.get('uiSelectMode')) {
+      document.dispatchEvent(new CustomEvent(UI_SELECT_MODE_EVENT_NAME, { detail: data }));
+      return;
+    }
+
+    if (data.items && data.items.length > 0 && !isCtrlKeyDown.value) {
+      updateStatus(nodeStatusMap.value, data.id, {
+        expand: true,
+      });
+    }
+
+    nextTick(() => {
+      select(data);
+    });
+  };
+
+  // 右键菜单
+  const menu = ref<InstanceType<typeof LayerMenu>>();
+
+  return {
+    menu,
+
+    nodeClickHandler,
+
+    nodeContentmenuHandler(event: MouseEvent, data: TreeNodeData) {
+      event.preventDefault();
+
+      const nodes = services?.editorService.get('nodes') || [];
+      if (nodes.length < 2 || !nodes.includes(data)) {
+        nodeClickHandler(event, data);
+      }
+
+      menu.value?.show(event);
+    },
+
+    highlightHandler,
+  };
+};

package/src/layouts/sidebar/layer/use-drag.ts

@@ -65,7 +65,7 @@ export const useDrag = (services: Services | undefined) => {
     if (!event.target) return;
 
     const targetEl = getNodeEl(event.target as HTMLElement);
-    if (!targetEl) return;
+    if (!targetEl?.draggable) return;
 
     const labelEl = targetEl.children[0];
     if (!labelEl) return;

package/src/layouts/sidebar/layer/use-filter.ts

@@ -1,21 +1,10 @@
 import { type ComputedRef, ref } from 'vue';
 
 import { Id, MNode, MPage } from '@tmagic/schema';
-import { getKeys } from '@tmagic/utils';
 
 import { LayerNodeStatus } from '@editor/type';
 import { traverseNode } from '@editor/utils';
-
-export const updateStatus = (nodeStatusMap: Map<Id, LayerNodeStatus>, id: Id, status: Partial<LayerNodeStatus>) => {
-  const nodeStatus = nodeStatusMap.get(id);
-
-  if (!nodeStatus) return;
-  getKeys(status).forEach((key) => {
-    if (nodeStatus[key] !== undefined && status[key] !== undefined) {
-      nodeStatus[key] = Boolean(status[key]);
-    }
-  });
-};
+import { updateStatus } from '@editor/utils/tree';
 
 export const useFilter = (
   nodeStatusMap: ComputedRef<Map<Id, LayerNodeStatus> | undefined>,

package/src/layouts/sidebar/layer/use-keybinding.ts

@@ -1,9 +1,13 @@
 import { type Ref, ref, watchEffect } from 'vue';
 
+import Tree from '@editor/components/Tree.vue';
 import type { Services } from '@editor/type';
 import { KeyBindingContainerKey } from '@editor/utils/keybinding-config';
 
-export const useKeybinding = (services: Services | undefined, contianer: Ref<HTMLDivElement | undefined>) => {
+export const useKeybinding = (
+  services: Services | undefined,
+  contianer: Ref<InstanceType<typeof Tree> | undefined>,
+) => {
   const keybindingService = services?.keybindingService;
 
   // 是否多选
@@ -37,7 +41,7 @@ export const useKeybinding = (services: Services | undefined, contianer: Ref<HTM
   watchEffect(() => {
     if (contianer.value) {
       globalThis.addEventListener('blur', windowBlurHandler);
-      keybindingService?.registeEl(KeyBindingContainerKey.LAYER_PANEL, contianer.value);
+      keybindingService?.registeEl(KeyBindingContainerKey.LAYER_PANEL, contianer.value.$el);
     } else {
       globalThis.removeEventListener('blur', windowBlurHandler);
       keybindingService?.unregisteEl(KeyBindingContainerKey.LAYER_PANEL);

package/src/layouts/sidebar/layer/use-node-status.ts

@@ -5,8 +5,7 @@ import { getNodePath } from '@tmagic/utils';
 
 import { LayerNodeStatus, Services } from '@editor/type';
 import { traverseNode } from '@editor/utils';
-
-import { updateStatus } from './use-filter';
+import { updateStatus } from '@editor/utils/tree';
 
 const createPageNodeStatus = (services: Services | undefined, pageId: Id) => {
   const map = new Map<Id, LayerNodeStatus>();
@@ -15,6 +14,7 @@ const createPageNodeStatus = (services: Services | undefined, pageId: Id) => {
     visible: true,
     expand: true,
     selected: true,
+    draggable: false,
   });
 
   services?.editorService.getNodeById(pageId)?.items.forEach((node: MNode) =>
@@ -23,6 +23,7 @@ const createPageNodeStatus = (services: Services | undefined, pageId: Id) => {
         visible: true,
         expand: false,
         selected: false,
+        draggable: true,
       });
     }),
   );
@@ -87,6 +88,7 @@ export const useNodeStatus = (services: Services | undefined, page: ComputedRef<
           visible: true,
           expand: Array.isArray(node.items),
           selected: true,
+          draggable: true,
         });
       });
     });