@tmagic/editor 1.3.0-alpha.9 → 1.3.0-beta.1

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

@@ -2,122 +2,110 @@
   <TMagicScrollbar class="data-source-list-panel m-editor-dep-list-panel">
     <div class="search-wrapper">
       <SearchInput @search="filterTextChangeHandler"></SearchInput>
-      <TMagicButton type="primary" size="small" @click="addHandler">新增</TMagicButton>
+      <TMagicPopover v-if="editable" placement="right">
+        <template #reference>
+          <TMagicButton type="primary" size="small">新增</TMagicButton>
+        </template>
+        <div class="data-source-list-panel-add-menu">
+          <ToolButton
+            v-for="(item, index) in datasourceTypeList"
+            :data="{
+              type: 'button',
+              text: item.text,
+              handler: () => {
+                addHandler(item.type);
+              },
+            }"
+            :key="index"
+          ></ToolButton>
+        </div>
+      </TMagicPopover>
     </div>
 
     <!-- 数据源列表 -->
-    <TMagicTree
-      ref="tree"
-      class="magic-editor-layer-tree"
-      node-key="id"
-      empty-text="暂无代码块"
-      default-expand-all
-      :expand-on-click-node="false"
-      :data="list"
-      :highlight-current="true"
-      @node-click="clickHandler"
-    >
-      <template #default="{ data }">
-        <div :id="data.id" class="list-container">
-          <div class="list-item">
-            <Icon v-if="data.type === 'code'" class="codeIcon" :icon="Coin"></Icon>
-            <Icon v-if="data.type === 'node'" class="compIcon" :icon="Aim"></Icon>
-            <span class="name" :class="{ code: data.type === 'code', hook: data.type === 'key' }"
-              >{{ data.name }}（{{ data.id }}）</span
-            >
-            <!-- 右侧工具栏 -->
-            <div class="right-tool" v-if="data.type === 'code'">
-              <TMagicTooltip effect="dark" content="编辑" placement="bottom">
-                <Icon class="edit-icon" :icon="Edit" @click.stop="editHandler(`${data.id}`)"></Icon>
-              </TMagicTooltip>
-              <TMagicTooltip 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>
-            </div>
-          </div>
-        </div>
-      </template>
-    </TMagicTree>
+    <DataSourceList @edit="editHandler" @remove="removeHandler"></DataSourceList>
 
     <DataSourceConfigPanel
       ref="editDialog"
+      :disabled="!editable"
       :values="dataSourceValues"
-      :title="typeof dataSourceValues.id !== 'undefined' ? `编辑${dataSourceValues.title}` : '新增'"
+      :title="dialogTitle"
       @submit="submitDataSourceHandler"
     ></DataSourceConfigPanel>
   </TMagicScrollbar>
 </template>
 
-<script setup lang="ts" name="MEditorDataSourceListPanel">
+<script setup lang="ts">
 import { computed, inject, ref } from 'vue';
-import { Aim, Close, Coin, Edit } from '@element-plus/icons-vue';
+import { mergeWith } from 'lodash-es';
 
-import { TMagicButton, tMagicMessageBox, TMagicScrollbar, TMagicTooltip, TMagicTree } from '@tmagic/design';
-import { DataSourceSchema, Id } from '@tmagic/schema';
+import { TMagicButton, TMagicPopover, TMagicScrollbar } from '@tmagic/design';
+import type { DataSourceSchema } from '@tmagic/schema';
 
-import Icon from '@editor/components/Icon.vue';
 import SearchInput from '@editor/components/SearchInput.vue';
+import ToolButton from '@editor/components/ToolButton.vue';
 import type { Services } from '@editor/type';
 
 import DataSourceConfigPanel from './DataSourceConfigPanel.vue';
+import DataSourceList from './DataSourceList.vue';
 
 defineOptions({
   name: 'MEditorDataSourceListPanel',
 });
 
-const services = inject<Partial<Services>>('services', {});
-const { dataSourceService, depService, editorService } = inject<Services>('services') || {};
-
-const list = computed(() =>
-  Object.values(depService?.targets['data-source'] || {}).map((target) => ({
-    id: target.id,
-    name: target.name,
-    type: 'code',
-    children: Object.entries(target.deps).map(([id, dep]) => ({
-      name: dep.name,
-      type: 'node',
-      id,
-      children: dep.keys.map((key) => ({ name: key, id: key, type: 'key' })),
-    })),
-  })),
-);
+const { dataSourceService } = inject<Services>('services') || {};
 
 const editDialog = ref<InstanceType<typeof DataSourceConfigPanel>>();
 
 const dataSourceValues = ref<Record<string, any>>({});
 
-const addHandler = () => {
+const dialogTitle = ref('');
+
+const editable = computed(() => dataSourceService?.get('editable') ?? true);
+const datasourceTypeList = computed(() =>
+  [
+    { text: '基础', type: 'base' },
+    { text: 'HTTP', type: 'http' },
+  ].concat(dataSourceService?.get('datasourceTypeList') ?? []),
+);
+
+const addHandler = (type: string) => {
   if (!editDialog.value) return;
 
-  dataSourceValues.value = {};
+  const datasourceType = datasourceTypeList.value.find((item) => item.type === type);
+
+  dataSourceValues.value = mergeWith(
+    { type, title: datasourceType?.text },
+    dataSourceService?.getFormValue(type) || {},
+    (objValue, srcValue) => {
+      if (Array.isArray(srcValue)) {
+        return srcValue;
+      }
+    },
+  );
+
+  dialogTitle.value = `新增${datasourceType?.text || ''}`;
 
   editDialog.value.show();
 };
 
 const editHandler = (id: string) => {
-  if (!editDialog.value || !services) return;
+  if (!editDialog.value) return;
 
   dataSourceValues.value = {
     ...dataSourceService?.getDataSourceById(id),
   };
 
+  dialogTitle.value = `新增${dataSourceValues.value.title || ''}`;
+
   editDialog.value.show();
 };
 
-const removeHandler = async (id: string) => {
-  await tMagicMessageBox.confirm('确定删除?', '提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  });
-
+const removeHandler = (id: string) => {
   dataSourceService?.remove(id);
 };
 
 const submitDataSourceHandler = (value: DataSourceSchema) => {
-  if (!services) return;
-
   if (value.id) {
     dataSourceService?.update(value);
   } else {
@@ -127,24 +115,9 @@ const submitDataSourceHandler = (value: DataSourceSchema) => {
   editDialog.value?.hide();
 };
 
-const tree = ref<InstanceType<typeof TMagicTree>>();
+const dataSourceList = ref<InstanceType<typeof DataSourceList>>();
 
 const filterTextChangeHandler = (val: string) => {
-  tree.value?.filter(val);
-};
-
-// 选中组件
-const selectComp = (compId: Id) => {
-  const stage = editorService?.get('stage');
-  editorService?.select(compId);
-  stage?.select(compId);
-};
-
-const clickHandler = (data: any, node: any) => {
-  if (data.type === 'node') {
-    selectComp(data.id);
-  } else if (data.type === 'key') {
-    selectComp(node.parent.data.id);
-  }
+  dataSourceList.value?.filter(val);
 };
 </script>

package/src/layouts/workspace/Workspace.vue

@@ -20,9 +20,9 @@ import { computed, inject } from 'vue';
 
 import { MenuButton, MenuComponent, Services } from '@editor/type';
 
+import MagicStage from './viewer/Stage.vue';
 import Breadcrumb from './Breadcrumb.vue';
 import PageBar from './PageBar.vue';
-import MagicStage from './Stage.vue';
 
 defineOptions({
   name: 'MEditorWorkspace',

package/src/layouts/workspace/viewer/NodeListMenu.vue

@@ -0,0 +1,159 @@
+<template>
+  <content-menu
+    ref="menu"
+    :menu-data="menuData"
+    :active="node?.id"
+    :auto-hide="!pinned"
+    @mouseenter="mouseenterHandler()"
+  >
+    <template #title>
+      <NodeListMenuTitle v-model:pinned="pinned" @change="dragMenuHandler" @close="closeHandler"></NodeListMenuTitle>
+    </template>
+  </content-menu>
+</template>
+
+<script lang="ts" setup>
+import { Component, computed, inject, ref, watch } from 'vue';
+import type { OnDrag } from 'gesto';
+
+import type { MNode } from '@tmagic/schema';
+import { StageDragStatus } from '@tmagic/stage';
+import { getNodes } from '@tmagic/utils';
+
+import ContentMenu from '@editor/components/ContentMenu.vue';
+import type { ComponentItem, MenuButton, Services } from '@editor/type';
+
+import NodeListMenuTitle from './NodeListMenuTitle.vue';
+const props = defineProps<{ isMultiSelect?: boolean }>();
+
+const menu = ref<InstanceType<typeof ContentMenu>>();
+const nodeList = ref<MNode[]>([]);
+const pinned = ref(false);
+
+const services = inject<Services>('services');
+const editorService = services?.editorService;
+const componentListService = services?.componentListService;
+
+const stage = computed(() => editorService?.get('stage'));
+const page = computed(() => editorService?.get('page'));
+const node = computed(() => editorService?.get('node'));
+
+let timeout: NodeJS.Timeout | null = null;
+
+const cancel = () => {
+  if (timeout) {
+    globalThis.clearTimeout(timeout);
+  }
+
+  if (pinned.value) {
+    return;
+  }
+
+  nodeList.value = [];
+  menu.value?.hide();
+};
+
+const unWatch = watch(
+  stage,
+  (stage) => {
+    if (!stage) return;
+
+    stage.on('drag-start', () => {
+      cancel();
+    });
+
+    stage.on('mousemove', (event: MouseEvent) => {
+      cancel();
+
+      if (props.isMultiSelect || stage.getDragStatus() !== StageDragStatus.END) {
+        return;
+      }
+
+      timeout = globalThis.setTimeout(() => {
+        const els = stage?.renderer.getElementsFromPoint(event);
+
+        const nodes = getNodes(
+          els.map((el) => el.id),
+          page.value?.items,
+        );
+
+        if (pinned.value && nodes.length === 0) {
+          return;
+        }
+
+        nodeList.value = nodes;
+
+        if (nodeList.value.length > 1) {
+          menu.value?.show(pinned.value ? undefined : event);
+        }
+      }, 1500);
+    });
+
+    stage.on('mouseleave', () => {
+      cancel();
+    });
+
+    unWatch();
+  },
+  {
+    immediate: true,
+  },
+);
+
+const componentMap = computed(() => {
+  const map: Record<string, ComponentItem> = {};
+  componentListService?.getList().forEach((group) => {
+    group.items.forEach((item) => {
+      map[item.type] = item;
+    });
+  });
+  return map;
+});
+
+const menuData = computed<MenuButton[]>(() =>
+  nodeList.value.map((node: MNode) => {
+    let text = node.name;
+    let icon: string | Component<{}, {}, any> | undefined;
+    if (node.type) {
+      const item = componentMap.value[node.type];
+      text += ` (${item?.text})`;
+      icon = item?.icon;
+    }
+
+    return {
+      type: 'button',
+      text,
+      id: node.id,
+      icon,
+      handler: async () => {
+        await editorService?.select(node);
+        stage.value?.select(node.id);
+      },
+    };
+  }),
+);
+
+const mouseenterHandler = () => {
+  // menu的mouseenter后，大概率还有最后一个mousemove事件，这里延迟清除
+  globalThis.setTimeout(() => {
+    if (timeout) {
+      globalThis.clearTimeout(timeout);
+    }
+  }, 300);
+};
+
+const dragMenuHandler = ({ deltaY, deltaX }: OnDrag) => {
+  if (!menu.value) return;
+
+  const { menuPosition } = menu.value;
+
+  menu.value?.setPosition({
+    clientY: menuPosition.top + deltaY,
+    clientX: menuPosition.left + deltaX,
+  });
+};
+
+const closeHandler = () => {
+  menu.value?.hide();
+};
+</script>

package/src/layouts/workspace/viewer/NodeListMenuTitle.vue

@@ -0,0 +1,68 @@
+<template>
+  <div
+    style="
+      text-align: center;
+      padding: 5px 0;
+      font-size: 14px;
+      cursor: move;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+    "
+    ref="target"
+  >
+    <TMagicTooltip placement="top" :content="pinned ? '取消置于顶层自动隐藏' : '置于顶层不消失'">
+      <MIcon
+        style="margin-left: 10px; cursor: pointer"
+        :icon="pinned ? PinnedIcon : PinIcon"
+        @click="pinHandler"
+      ></MIcon>
+    </TMagicTooltip>
+
+    <span>可选组件</span>
+
+    <div style="margin-right: 10px">
+      <TMagicButton text size="small" @click="closeHandler">
+        <MIcon :icon="Close"></MIcon>
+      </TMagicButton>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue';
+import { Close } from '@element-plus/icons-vue';
+import type { OnDrag } from 'gesto';
+
+import { TMagicButton, TMagicTooltip } from '@tmagic/design';
+
+import MIcon from '@editor/components/Icon.vue';
+import { useGetSo } from '@editor/hooks/use-getso';
+import PinIcon from '@editor/icons/PinIcon.vue';
+import PinnedIcon from '@editor/icons/PinnedIcon.vue';
+
+defineOptions({
+  name: 'MEditorNodeListMenuTitle',
+});
+
+const props = defineProps<{
+  pinned: boolean;
+}>();
+
+const emit = defineEmits<{
+  close: [];
+  'update:pinned': [pinned: boolean];
+  change: [e: OnDrag];
+}>();
+
+const pinHandler = () => {
+  emit('update:pinned', !props.pinned);
+};
+
+const closeHandler = () => {
+  emit('close');
+};
+
+const target = ref<HTMLDivElement>();
+useGetSo(target, emit);
+</script>

package/src/layouts/workspace/{Stage.vue → viewer/Stage.vue}

@@ -12,6 +12,7 @@
       width: 60,
       height: 50,
     }"
+    @click="stageWrap?.container?.focus()"
   >
     <div
       class="m-editor-stage-container"
@@ -23,6 +24,7 @@
     ></div>
     <Teleport to="body">
       <ViewerMenu ref="menu" :is-multi-select="isMultiSelect" :stage-content-menu="stageContentMenu"></ViewerMenu>
+      <NodeListMenu ref="nodeList" :is-multi-select="isMultiSelect"></NodeListMenu>
     </Teleport>
   </ScrollViewer>
 </template>
@@ -35,10 +37,11 @@ import type { MContainer } from '@tmagic/schema';
 import StageCore, { calcValueByFontsize, getOffset, Runtime } from '@tmagic/stage';
 
 import ScrollViewer from '@editor/components/ScrollViewer.vue';
+import { useStage } from '@editor/hooks/use-stage';
 import { Layout, MenuButton, MenuComponent, Services, StageOptions } from '@editor/type';
 import { getConfig } from '@editor/utils/config';
-import { useStage } from '@editor/utils/stage';
 
+import NodeListMenu from './NodeListMenu.vue';
 import ViewerMenu from './ViewerMenu.vue';
 
 defineOptions({
@@ -164,7 +167,7 @@ const dropHandler = async (e: DragEvent) => {
   if (e.dataTransfer && parent && stageContainer.value && stage) {
     const parseDSL = getConfig('parseDSL');
 
-    const data = e.dataTransfer.getData('text/html');
+    const data = e.dataTransfer.getData('text/json');
 
     if (!data) return;
 

package/src/layouts/workspace/{ViewerMenu.vue → viewer/ViewerMenu.vue}

@@ -4,14 +4,16 @@
 
 <script lang="ts" setup>
 import { computed, inject, markRaw, ref, watch } from 'vue';
-import { Bottom, CopyDocument, Delete, DocumentCopy, Top } from '@element-plus/icons-vue';
+import { Bottom, Top } from '@element-plus/icons-vue';
 
 import { NodeType } from '@tmagic/schema';
 import { isPage } from '@tmagic/utils';
 
 import ContentMenu from '@editor/components/ContentMenu.vue';
+import CenterIcon from '@editor/icons/CenterIcon.vue';
 import storageService from '@editor/services/storage';
 import { LayerOffset, Layout, MenuButton, MenuComponent, Services } from '@editor/type';
+import { useCopyMenu, useDeleteMenu, useMoveToMenu, usePasteMenu } from '@editor/utils/content-menu';
 import { COPY_STORAGE_KEY } from '@editor/utils/editor';
 
 defineOptions({
@@ -32,42 +34,20 @@ const canCenter = ref(false);
 const node = computed(() => editorService?.get('node'));
 const nodes = computed(() => editorService?.get('nodes'));
 const parent = computed(() => editorService?.get('parent'));
-const stage = computed(() => editorService?.get('stage'));
 
 const menuData = computed<(MenuButton | MenuComponent)[]>(() => [
   {
     type: 'button',
     text: '水平居中',
+    icon: markRaw(CenterIcon),
     display: () => canCenter.value,
     handler: () => {
       if (!nodes.value) return;
       editorService?.alignCenter(nodes.value);
     },
   },
-  {
-    type: 'button',
-    text: '复制',
-    icon: markRaw(CopyDocument),
-    handler: () => {
-      nodes.value && editorService?.copy(nodes.value);
-      canPaste.value = true;
-    },
-  },
-  {
-    type: 'button',
-    text: '粘贴',
-    icon: markRaw(DocumentCopy),
-    display: () => canPaste.value,
-    handler: () => {
-      const rect = menu.value?.$el.getBoundingClientRect();
-      const parentRect = stage.value?.container?.getBoundingClientRect();
-      const initialLeft = (rect?.left || 0) - (parentRect?.left || 0);
-      const initialTop = (rect?.top || 0) - (parentRect?.top || 0);
-
-      if (!nodes.value || nodes.value.length === 0) return;
-      editorService?.paste({ left: initialLeft, top: initialTop });
-    },
-  },
+  useCopyMenu(),
+  usePasteMenu(menu),
   {
     type: 'divider',
     direction: 'horizontal',
@@ -97,6 +77,7 @@ const menuData = computed<(MenuButton | MenuComponent)[]>(() => [
   {
     type: 'button',
     text: '置顶',
+    icon: markRaw(Top),
     display: () => !isPage(node.value) && !props.isMultiSelect,
     handler: () => {
       editorService?.moveLayer(LayerOffset.TOP);
@@ -105,25 +86,19 @@ const menuData = computed<(MenuButton | MenuComponent)[]>(() => [
   {
     type: 'button',
     text: '置底',
+    icon: markRaw(Bottom),
     display: () => !isPage(node.value) && !props.isMultiSelect,
     handler: () => {
       editorService?.moveLayer(LayerOffset.BOTTOM);
     },
   },
+  useMoveToMenu(services),
   {
     type: 'divider',
     direction: 'horizontal',
     display: () => !isPage(node.value) && !props.isMultiSelect,
   },
-  {
-    type: 'button',
-    text: '删除',
-    icon: Delete,
-    display: () => !isPage(node.value),
-    handler: () => {
-      nodes.value && editorService?.remove(nodes.value);
-    },
-  },
+  useDeleteMenu(),
   {
     type: 'divider',
     direction: 'horizontal',