@tmagic/editor 1.5.0-beta.9 → 1.5.1

package/src/layouts/props-panel/PropsPanel.vue

@@ -0,0 +1,146 @@
+<template>
+  <div class="m-editor-props-panel" v-show="nodes.length === 1">
+    <slot name="props-panel-header"></slot>
+    <FormPanel
+      ref="propertyFormPanel"
+      class="m-editor-props-property-panel"
+      :class="{ 'show-style-panel': showStylePanel }"
+      :config="curFormConfig"
+      :values="values"
+      :disabledShowSrc="disabledShowSrc"
+      :extendState="extendState"
+      @submit="submit"
+      @submit-error="errorHandler"
+      @form-error="errorHandler"
+      @mounted="mountedHandler"
+    ></FormPanel>
+
+    <FormPanel
+      v-if="showStylePanel"
+      class="m-editor-props-style-panel"
+      label-position="top"
+      code-value-key="style"
+      :config="styleFormConfig"
+      :values="values"
+      :disabledShowSrc="disabledShowSrc"
+      :extendState="extendState"
+      @submit="submit"
+      @submit-error="errorHandler"
+      @form-error="errorHandler"
+    >
+      <template #props-form-panel-header>
+        <div class="m-editor-props-style-panel-title">
+          <span>样式</span>
+          <div>
+            <TMagicButton link size="small" @click="closeStylePanelHandler"><MIcon :icon="Close"></MIcon></TMagicButton>
+          </div>
+        </div>
+      </template>
+    </FormPanel>
+
+    <TMagicButton
+      v-if="!showStylePanel"
+      class="m-editor-props-panel-style-icon"
+      circle
+      :type="showStylePanel ? 'primary' : ''"
+      @click="showStylePanelHandler"
+    >
+      <MIcon :icon="Sugar"></MIcon>
+    </TMagicButton>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { computed, inject, onBeforeUnmount, ref, useTemplateRef, watchEffect } from 'vue';
+import { Close, Sugar } from '@element-plus/icons-vue';
+
+import type { MNode } from '@tmagic/core';
+import { TMagicButton } from '@tmagic/design';
+import type { ContainerChangeEventData, FormState, FormValue } from '@tmagic/form';
+
+import MIcon from '@editor/components/Icon.vue';
+import type { PropsPanelSlots, Services } from '@editor/type';
+import { styleTabConfig } from '@editor/utils';
+
+import FormPanel from './FormPanel.vue';
+import { useStylePanel } from './use-style-panel';
+
+defineSlots<PropsPanelSlots>();
+
+defineOptions({
+  name: 'MEditorPropsPanel',
+});
+
+defineProps<{
+  disabledShowSrc?: boolean;
+  extendState?: (state: FormState) => Record<string, any> | Promise<Record<string, any>>;
+}>();
+
+const emit = defineEmits<{
+  'submit-error': [e: any];
+  'form-error': [e: any];
+  mounted: [internalInstance: InstanceType<typeof FormPanel>];
+}>();
+
+const services = inject<Services>('services');
+
+const values = ref<FormValue>({});
+// ts类型应该是FormConfig， 但是打包时会出错，所以暂时用any
+const curFormConfig = ref<any>([]);
+const node = computed(() => services?.editorService.get('node'));
+const nodes = computed(() => services?.editorService.get('nodes') || []);
+
+const styleFormConfig = [
+  {
+    tabPosition: 'right',
+    items: styleTabConfig.items,
+  },
+];
+
+const init = async () => {
+  if (!node.value) {
+    curFormConfig.value = [];
+    return;
+  }
+
+  const type = node.value.type || (node.value.items ? 'container' : 'text');
+  curFormConfig.value = (await services?.propsService.getPropsConfig(type)) || [];
+  values.value = node.value;
+};
+
+watchEffect(init);
+services?.propsService.on('props-configs-change', init);
+
+onBeforeUnmount(() => {
+  services?.propsService.off('props-configs-change', init);
+});
+
+const submit = async (v: MNode, eventData?: ContainerChangeEventData) => {
+  try {
+    if (!v.id) {
+      v.id = values.value.id;
+    }
+    services?.editorService.update(v, { changeRecords: eventData?.changeRecords });
+  } catch (e: any) {
+    emit('submit-error', e);
+  }
+};
+
+const errorHandler = (e: any) => {
+  emit('form-error', e);
+};
+
+const mountedHandler = (e: InstanceType<typeof FormPanel>) => {
+  emit('mounted', e);
+};
+
+const { showStylePanel, showStylePanelHandler, closeStylePanelHandler } = useStylePanel(services);
+
+const propertyFormPanelRef = useTemplateRef<InstanceType<typeof FormPanel>>('propertyFormPanel');
+defineExpose({
+  getFormState() {
+    return propertyFormPanelRef.value?.configForm?.formState;
+  },
+  submit,
+});
+</script>

package/src/layouts/props-panel/use-style-panel.ts

@@ -0,0 +1,29 @@
+import { computed } from 'vue';
+
+import { Protocol } from '@editor/services/storage';
+import { Services } from '@editor/type';
+
+export const useStylePanel = (services?: Services) => {
+  const showStylePanelStorageKey = 'props-panel-show-style-panel';
+  const showStylePanelStorageValue = services?.storageService.getItem(showStylePanelStorageKey, {
+    protocol: Protocol.BOOLEAN,
+  });
+  if (typeof showStylePanelStorageValue === 'boolean') {
+    services?.uiService.set('showStylePanel', showStylePanelStorageValue);
+  }
+  const showStylePanel = computed(() => services?.uiService.get('showStylePanel') ?? true);
+  const showStylePanelHandler = () => {
+    services?.uiService.set('showStylePanel', true);
+    services?.storageService.setItem(showStylePanelStorageKey, true, { protocol: Protocol.BOOLEAN });
+  };
+  const closeStylePanelHandler = () => {
+    services?.uiService.set('showStylePanel', false);
+    services?.storageService.setItem(showStylePanelStorageKey, false, { protocol: Protocol.BOOLEAN });
+  };
+
+  return {
+    showStylePanel,
+    showStylePanelHandler,
+    closeStylePanelHandler,
+  };
+};

package/src/layouts/sidebar/Sidebar.vue

@@ -19,6 +19,7 @@
     </div>
     <div
       class="m-editor-sidebar-content"
+      :class="{ 'm-editor-dep-collecting': collecting }"
       v-for="(config, index) in sideBarItems"
       :key="config.$key ?? index"
       v-show="[config.text, config.$key, `${index}`].includes(activeTabName)"
@@ -157,6 +158,7 @@ import { useEditorContentHeight } from '@editor/hooks/use-editor-content-height'
 import { useFloatBox } from '@editor/hooks/use-float-box';
 import {
   ColumnLayout,
+  CustomContentMenuFunction,
   type MenuButton,
   type MenuComponent,
   type Services,
@@ -184,7 +186,7 @@ const props = withDefaults(
     layerContentMenu: (MenuButton | MenuComponent)[];
     indent?: number;
     nextLevelIndentIncrement?: number;
-    customContentMenu?: (menus: (MenuButton | MenuComponent)[], type: string) => (MenuButton | MenuComponent)[];
+    customContentMenu: CustomContentMenuFunction;
   }>(),
   {
     data: () => ({
@@ -197,6 +199,8 @@ const props = withDefaults(
 
 const services = inject<Services>('services');
 
+const collecting = computed(() => services?.depService.get('collecting'));
+
 const columnLeftWidth = computed(() => services?.uiService.get('columnWidth')[ColumnLayout.LEFT] || 0);
 const { height: editorContentHeight } = useEditorContentHeight();
 const columnLeftHeight = ref(0);
@@ -251,6 +255,7 @@ const getItemConfig = (data: SideItem): SideComponent => {
       props: {
         indent: props.indent,
         nextLevelIndentIncrement: props.nextLevelIndentIncrement,
+        customContentMenu: props.customContentMenu,
       },
       slots: {},
     },
@@ -263,6 +268,7 @@ const getItemConfig = (data: SideItem): SideComponent => {
       props: {
         indent: props.indent,
         nextLevelIndentIncrement: props.nextLevelIndentIncrement,
+        customContentMenu: props.customContentMenu,
       },
       slots: {},
     },

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

@@ -5,6 +5,7 @@
     :indent="indent"
     :next-level-indent-increment="nextLevelIndentIncrement"
     @node-click="clickHandler"
+    @node-contextmenu="nodeContentMenuHandler"
   >
     <template #tree-node-label="{ data }">
       <div
@@ -19,6 +20,9 @@
     </template>
 
     <template #tree-node-tool="{ data }">
+      <TMagicTag v-if="collecting && data.type === 'code'" type="info" size="small" style="margin-right: 5px"
+        >依赖收集中</TMagicTag
+      >
       <TMagicTooltip v-if="data.type === 'code'" effect="dark" :content="editable ? '编辑' : '查看'" placement="bottom">
         <Icon :icon="editable ? Edit : View" class="edit-icon" @click.stop="editCode(`${data.key}`)"></Icon>
       </TMagicTooltip>
@@ -36,7 +40,7 @@ import { Close, Edit, View } from '@element-plus/icons-vue';
 
 import type { Id, MNode } from '@tmagic/core';
 import { DepTargetType } from '@tmagic/core';
-import { tMagicMessage, tMagicMessageBox, TMagicTooltip } from '@tmagic/design';
+import { tMagicMessage, tMagicMessageBox, TMagicTag, TMagicTooltip } from '@tmagic/design';
 
 import Icon from '@editor/components/Icon.vue';
 import Tree from '@editor/components/Tree.vue';
@@ -59,11 +63,14 @@ const props = defineProps<{
 const emit = defineEmits<{
   edit: [id: string];
   remove: [id: string];
+  'node-contextmenu': [event: MouseEvent, data: TreeNodeData];
 }>();
 
 const services = inject<Services>('services');
 const { codeBlockService, depService, editorService } = services || {};
 
+const collecting = computed(() => depService?.get('collecting'));
+
 // 代码块列表
 const codeList = computed<TreeNodeData[]>(() =>
   Object.entries(codeBlockService?.getCodeDsl() || {}).map(([codeId, code]) => {
@@ -157,12 +164,21 @@ const deleteCode = async (id: string) => {
     if (typeof props.customError === 'function') {
       props.customError(id, existBinds ? CodeDeleteErrorType.BIND : CodeDeleteErrorType.UNDELETEABLE);
     } else {
-      tMagicMessage.error('代码块删除失败');
+      if (existBinds) {
+        tMagicMessage.error('代码块存在绑定关系，不可删除');
+      } else {
+        tMagicMessage.error('代码块不可删除');
+      }
     }
   }
 };
 
+const nodeContentMenuHandler = (event: MouseEvent, data: TreeNodeData) => {
+  emit('node-contextmenu', event, data);
+};
+
 defineExpose({
   filter: filterTextChangeHandler,
+  deleteCode,
 });
 </script>

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

@@ -18,6 +18,7 @@
       :next-level-indent-increment="nextLevelIndentIncrement"
       @edit="editCode"
       @remove="deleteCode"
+      @node-contextmenu="nodeContentMenuHandler"
     >
       <template #code-block-panel-tool="{ id, data }">
         <slot name="code-block-panel-tool" :id="id" :data="data"></slot>
@@ -32,20 +33,40 @@
     :content="codeConfig"
     @submit="submitCodeBlockHandler"
   ></CodeBlockEditor>
+
+  <Teleport to="body">
+    <ContentMenu
+      v-if="menuData.length"
+      :menu-data="menuData"
+      ref="menu"
+      style="overflow: initial"
+      @hide="contentMenuHideHandler"
+    ></ContentMenu>
+  </Teleport>
 </template>
 
 <script setup lang="ts">
-import { computed, inject, ref } from 'vue';
+import { computed, inject, useTemplateRef } from 'vue';
 
 import type { Id } from '@tmagic/core';
 import { TMagicButton, TMagicScrollbar } from '@tmagic/design';
 
 import CodeBlockEditor from '@editor/components/CodeBlockEditor.vue';
+import ContentMenu from '@editor/components/ContentMenu.vue';
 import SearchInput from '@editor/components/SearchInput.vue';
 import { useCodeBlockEdit } from '@editor/hooks/use-code-block-edit';
-import type { CodeBlockListPanelSlots, CodeDeleteErrorType, EventBus, Services } from '@editor/type';
+import type {
+  CodeBlockListPanelSlots,
+  CodeDeleteErrorType,
+  CustomContentMenuFunction,
+  EventBus,
+  MenuButton,
+  MenuComponent,
+  Services,
+} from '@editor/type';
 
 import CodeBlockList from './CodeBlockList.vue';
+import { useContentMenu } from './useContentMenu';
 
 defineSlots<CodeBlockListPanelSlots>();
 
@@ -53,10 +74,11 @@ defineOptions({
   name: 'MEditorCodeBlockListPanel',
 });
 
-defineProps<{
+const props = defineProps<{
   indent?: number;
   nextLevelIndentIncrement?: number;
   customError?: (id: Id, errorType: CodeDeleteErrorType) => any;
+  customContentMenu: CustomContentMenuFunction;
 }>();
 
 const eventBus = inject<EventBus>('eventBus');
@@ -67,7 +89,7 @@ const editable = computed(() => codeBlockService?.getEditStatus());
 const { codeBlockEditor, codeConfig, editCode, deleteCode, createCodeBlock, submitCodeBlockHandler } =
   useCodeBlockEdit(codeBlockService);
 
-const codeBlockList = ref<InstanceType<typeof CodeBlockList>>();
+const codeBlockList = useTemplateRef<InstanceType<typeof CodeBlockList>>('codeBlockList');
 
 const filterTextChangeHandler = (val: string) => {
   codeBlockList.value?.filter(val);
@@ -76,4 +98,13 @@ const filterTextChangeHandler = (val: string) => {
 eventBus?.on('edit-code', (id: string) => {
   editCode(id);
 });
+
+const {
+  nodeContentMenuHandler,
+  menuData: contentMenuData,
+  contentMenuHideHandler,
+} = useContentMenu((id: string) => {
+  codeBlockList.value?.deleteCode(id);
+});
+const menuData = computed<(MenuButton | MenuComponent)[]>(() => props.customContentMenu(contentMenuData, 'code-block'));
 </script>

package/src/layouts/sidebar/code-block/useContentMenu.ts

@@ -0,0 +1,83 @@
+import { inject, markRaw, useTemplateRef } from 'vue';
+import { CopyDocument, Delete, Edit } from '@element-plus/icons-vue';
+import { cloneDeep } from 'lodash-es';
+
+import ContentMenu from '@editor/components/ContentMenu.vue';
+import type { EventBus, MenuButton, MenuComponent, Services, TreeNodeData } from '@editor/type';
+
+export const useContentMenu = (deleteCode: (id: string) => void) => {
+  const eventBus = inject<EventBus>('eventBus');
+  const menuRef = useTemplateRef<InstanceType<typeof ContentMenu>>('menu');
+
+  let selectId = '';
+
+  const menuData: (MenuButton | MenuComponent)[] = [
+    {
+      type: 'button',
+      text: '编辑',
+      icon: Edit,
+      display: (services) => services?.codeBlockService?.getEditStatus() ?? true,
+      handler: () => {
+        if (!selectId) {
+          return;
+        }
+
+        eventBus?.emit('edit-code', selectId);
+      },
+    },
+    {
+      type: 'button',
+      text: '复制并粘贴至当前',
+      icon: markRaw(CopyDocument),
+      handler: async ({ codeBlockService }: Services) => {
+        if (!selectId) {
+          return;
+        }
+
+        const codeBlock = codeBlockService.getCodeContentById(selectId);
+        if (!codeBlock) {
+          return;
+        }
+
+        const newCodeId = await codeBlockService.getUniqueId();
+
+        codeBlockService.setCodeDslById(newCodeId, cloneDeep(codeBlock));
+      },
+    },
+    {
+      type: 'button',
+      text: '删除',
+      icon: Delete,
+      handler: () => {
+        if (!selectId) {
+          return;
+        }
+
+        deleteCode(selectId);
+      },
+    },
+  ];
+
+  const nodeContentMenuHandler = (event: MouseEvent, data: TreeNodeData) => {
+    event.preventDefault();
+
+    if (data.type === 'code') {
+      menuRef.value?.show(event);
+      if (data.id) {
+        selectId = `${data.id}`;
+      } else {
+        selectId = '';
+      }
+    }
+  };
+
+  const contentMenuHideHandler = () => {
+    selectId = '';
+  };
+
+  return {
+    menuData,
+    nodeContentMenuHandler,
+    contentMenuHideHandler,
+  };
+};

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

@@ -24,9 +24,9 @@
 <script setup lang="ts">
 import { inject, Ref, ref, watchEffect } from 'vue';
 
-import { DataSourceSchema } from '@tmagic/core';
+import type { DataSourceSchema } from '@tmagic/core';
 import { tMagicMessage } from '@tmagic/design';
-import { FormConfig, MFormBox } from '@tmagic/form';
+import { type ContainerChangeEventData, type FormConfig, MFormBox } from '@tmagic/form';
 
 import FloatingBox from '@editor/components/FloatingBox.vue';
 import { useEditorContentHeight } from '@editor/hooks';
@@ -46,7 +46,9 @@ const props = defineProps<{
 const boxVisible = defineModel<boolean>('visible', { default: false });
 const width = defineModel<number>('width', { default: 670 });
 
-const emit = defineEmits(['submit']);
+const emit = defineEmits<{
+  submit: [v: any, eventData: ContainerChangeEventData];
+}>();
 
 const services = inject<Services>('services');
 
@@ -63,8 +65,8 @@ watchEffect(() => {
   dataSourceConfig.value = services?.dataSourceService.getFormConfig(initValues.value.type) || [];
 });
 
-const submitHandler = (values: any) => {
-  emit('submit', values);
+const submitHandler = (values: any, data: ContainerChangeEventData) => {
+  emit('submit', values, data);
 };
 
 const errorHandler = (error: any) => {

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

@@ -5,6 +5,7 @@
     :indent="indent"
     :next-level-indent-increment="nextLevelIndentIncrement"
     @node-click="clickHandler"
+    @node-contextmenu="nodeContentMenuHandler"
   >
     <template #tree-node-label="{ data }">
       <div
@@ -18,6 +19,9 @@
       </div>
     </template>
     <template #tree-node-tool="{ data }">
+      <TMagicTag v-if="collecting && data.type === 'ds'" type="info" size="small" style="margin-right: 5px"
+        >依赖收集中</TMagicTag
+      >
       <TMagicTooltip v-if="data.type === 'ds'" effect="dark" :content="editable ? '编辑' : '查看'" placement="bottom">
         <Icon :icon="editable ? Edit : View" class="edit-icon" @click.stop="editHandler(`${data.key}`)"></Icon>
       </TMagicTooltip>
@@ -34,13 +38,13 @@ import { computed, inject } from 'vue';
 import { Close, Edit, View } from '@element-plus/icons-vue';
 
 import { DepData, DepTargetType, Id, MNode } from '@tmagic/core';
-import { tMagicMessageBox, TMagicTooltip } from '@tmagic/design';
+import { TMagicTag, TMagicTooltip } from '@tmagic/design';
 
 import Icon from '@editor/components/Icon.vue';
 import Tree from '@editor/components/Tree.vue';
 import { useFilter } from '@editor/hooks/use-filter';
 import { useNodeStatus } from '@editor/hooks/use-node-status';
-import type { DataSourceListSlots, Services } from '@editor/type';
+import type { DataSourceListSlots, Services, TreeNodeData } from '@editor/type';
 
 defineSlots<DataSourceListSlots>();
 
@@ -56,10 +60,13 @@ defineProps<{
 const emit = defineEmits<{
   edit: [id: string];
   remove: [id: string];
+  'node-contextmenu': [event: MouseEvent, data: TreeNodeData];
 }>();
 
 const { depService, editorService, dataSourceService } = inject<Services>('services') || {};
 
+const collecting = computed(() => depService?.get('collecting'));
+
 const editable = computed(() => dataSourceService?.get('editable') ?? true);
 
 const dataSources = computed(() => dataSourceService?.get('dataSources') || []);
@@ -154,12 +161,6 @@ const editHandler = (id: string) => {
 };
 
 const removeHandler = async (id: string) => {
-  await tMagicMessageBox.confirm('确定删除?', '提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  });
-
   emit('remove', id);
 };
 
@@ -176,6 +177,10 @@ const clickHandler = (event: MouseEvent, data: any) => {
   }
 };
 
+const nodeContentMenuHandler = (event: MouseEvent, data: TreeNodeData) => {
+  emit('node-contextmenu', event, data);
+};
+
 defineExpose({
   filter: filterTextChangeHandler,
 });

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

@@ -35,6 +35,7 @@
       :next-level-indent-increment="nextLevelIndentIncrement"
       @edit="editHandler"
       @remove="removeHandler"
+      @node-contextmenu="nodeContentMenuHandler"
     ></DataSourceList>
   </TMagicScrollbar>
 
@@ -45,21 +46,40 @@
     :title="dialogTitle"
     @submit="submitDataSourceHandler"
   ></DataSourceConfigPanel>
+
+  <Teleport to="body">
+    <ContentMenu
+      v-if="menuData.length"
+      :menu-data="menuData"
+      ref="menu"
+      style="overflow: initial"
+      @hide="contentMenuHideHandler"
+    ></ContentMenu>
+  </Teleport>
 </template>
 
 <script setup lang="ts">
 import { computed, inject, ref } from 'vue';
 import { mergeWith } from 'lodash-es';
 
-import { TMagicButton, TMagicPopover, TMagicScrollbar } from '@tmagic/design';
+import { TMagicButton, tMagicMessageBox, TMagicPopover, TMagicScrollbar } from '@tmagic/design';
 
+import ContentMenu from '@editor/components/ContentMenu.vue';
 import SearchInput from '@editor/components/SearchInput.vue';
 import ToolButton from '@editor/components/ToolButton.vue';
 import { useDataSourceEdit } from '@editor/hooks/use-data-source-edit';
-import type { DataSourceListSlots, EventBus, Services } from '@editor/type';
+import type {
+  CustomContentMenuFunction,
+  DataSourceListSlots,
+  EventBus,
+  MenuButton,
+  MenuComponent,
+  Services,
+} from '@editor/type';
 
 import DataSourceConfigPanel from './DataSourceConfigPanel.vue';
 import DataSourceList from './DataSourceList.vue';
+import { useContentMenu } from './useContentMenu';
 
 defineSlots<DataSourceListSlots>();
 
@@ -67,9 +87,10 @@ defineOptions({
   name: 'MEditorDataSourceListPanel',
 });
 
-defineProps<{
+const props = defineProps<{
   indent?: number;
   nextLevelIndentIncrement?: number;
+  customContentMenu: CustomContentMenuFunction;
 }>();
 
 const eventBus = inject<EventBus>('eventBus');
@@ -105,7 +126,13 @@ const addHandler = (type: string) => {
   editDialog.value.show();
 };
 
-const removeHandler = (id: string) => {
+const removeHandler = async (id: string) => {
+  await tMagicMessageBox.confirm('确定删除?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  });
+
   dataSourceService?.remove(id);
 };
 
@@ -118,4 +145,13 @@ const filterTextChangeHandler = (val: string) => {
 eventBus?.on('edit-data-source', (id: string) => {
   editHandler(id);
 });
+
+eventBus?.on('remove-data-source', (id: string) => {
+  removeHandler(id);
+});
+
+const { nodeContentMenuHandler, menuData: contentMenuData, contentMenuHideHandler } = useContentMenu();
+const menuData = computed<(MenuButton | MenuComponent)[]>(() =>
+  props.customContentMenu(contentMenuData, 'data-source'),
+);
 </script>