@tmagic/editor 1.0.0-beta.8 → 1.0.0-rc.10

package/package.json

@@ -1,7 +1,10 @@
 {
-  "version": "1.0.0-beta.8",
+  "version": "1.0.0-rc.10",
   "name": "@tmagic/editor",
-  "sideEffects": false,
+  "sideEffects": [
+    "dist/*",
+    "src/theme/*"
+  ],
   "main": "dist/tmagic-editor.umd.js",
   "module": "dist/tmagic-editor.es.js",
   "style": "dist/style.css",
@@ -14,8 +17,10 @@
     "./dist/style.css": {
       "import": "./dist/style.css",
       "require": "./dist/style.css"
-    }
+    },
+    "./*": "./*"
   },
+  "license": "Apache-2.0",
   "scripts": {
     "build": "vite build"
   },
@@ -26,21 +31,40 @@
     "type": "git",
     "url": "https://github.com/Tencent/tmagic-editor.git"
   },
+  "homepage": "https://tencent.github.io/tmagic-editor/docs/",
+  "keywords": [
+    "editor",
+    "drag",
+    "resize",
+    "vue",
+    "vue3",
+    "typescript"
+  ],
   "dependencies": {
+    "@babel/core": "^7.18.0",
     "@element-plus/icons": "0.0.11",
-    "@tmagic/core": "^1.0.0-beta.8",
-    "@tmagic/form": "^1.0.0-beta.8",
-    "@tmagic/schema": "^1.0.0-beta.8",
-    "@tmagic/stage": "^1.0.0-beta.8",
-    "@tmagic/utils": "^1.0.0-beta.8",
+    "@tmagic/core": "1.0.0-rc.10",
+    "@tmagic/form": "1.0.0-rc.10",
+    "@tmagic/schema": "1.0.0-rc.10",
+    "@tmagic/stage": "1.0.0-rc.10",
+    "@tmagic/utils": "1.0.0-rc.10",
+    "buffer": "^6.0.3",
     "color": "^3.1.3",
-    "element-plus": "^2.1.7",
+    "element-plus": "^2.2.0",
     "events": "^3.3.0",
+    "gesto": "^1.7.0",
+    "keycon": "^1.1.2",
     "lodash-es": "^4.17.21",
     "monaco-editor": "^0.32.1",
     "serialize-javascript": "^6.0.0",
     "vue": "^3.2.0"
   },
+  "peerDependencies": {
+    "@tmagic/form": "1.0.0-rc.10",
+    "element-plus": "^2.2.0",
+    "monaco-editor": "^0.32.1",
+    "vue": "^3.2.0"
+  },
   "devDependencies": {
     "@types/events": "^3.0.0",
     "@types/lodash-es": "^4.17.4",
@@ -49,12 +73,11 @@
     "@vitejs/plugin-vue": "^1.2.3",
     "@vitejs/plugin-vue-jsx": "^1.1.6",
     "@vue/compiler-sfc": "^3.2.0",
-    "@vue/test-utils": "^2.0.0-rc.12",
+    "@vue/test-utils": "^2.0.0",
     "sass": "^1.35.1",
     "typescript": "^4.3.4",
     "vite": "^2.3.7",
     "vite-plugin-dts": "^0.9.6",
     "vue-tsc": "^0.0.24"
-  },
-  "gitHead": "ff8e32901775ecc145a82f906d6af6119652d61e"
+  }
 }

package/src/Editor.vue

@@ -1,5 +1,5 @@
 <template>
-  <framework>
+  <framework :code-options="codeOptions">
     <template #nav>
       <slot name="nav" :editorService="editorService"><nav-menu :data="menu"></nav-menu></slot>
     </template>
@@ -12,12 +12,7 @@
 
     <template #workspace :editorService="editorService">
       <slot name="workspace">
-        <workspace
-          :runtime-url="runtimeUrl"
-          :render="render"
-          :moveable-options="moveableOptions"
-          :can-select="canSelect"
-        >
+        <workspace>
           <template #workspace-content><slot name="workspace-content" :editorService="editorService"></slot></template>
           <template #page-bar-title="{ page }"><slot name="page-bar-title" :page="page"></slot></template>
           <template #page-bar-popover="{ page }"><slot name="page-bar-popover" :page="page"></slot></template>
@@ -36,7 +31,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, onUnmounted, PropType, provide, toRaw, watch } from 'vue';
+import { defineComponent, onUnmounted, PropType, provide, reactive, toRaw, watch } from 'vue';
 
 import { EventOption } from '@tmagic/core';
 import type { FormConfig } from '@tmagic/form';
@@ -55,7 +50,7 @@ import eventsService from '@editor/services/events';
 import historyService from '@editor/services/history';
 import propsService from '@editor/services/props';
 import uiService from '@editor/services/ui';
-import type { ComponentGroup, MenuBarData, Services, SideBarData, StageRect } from '@editor/type';
+import type { ComponentGroup, MenuBarData, MenuItem, Services, SideBarData, StageRect } from '@editor/type';
 
 export default defineComponent({
   name: 'm-editor',
@@ -87,6 +82,16 @@ export default defineComponent({
       type: Object as PropType<SideBarData>,
     },
 
+    layerContentMenu: {
+      type: Array as PropType<MenuItem[]>,
+      default: () => [],
+    },
+
+    stageContentMenu: {
+      type: Array as PropType<MenuItem[]>,
+      default: () => [],
+    },
+
     /** 顶部工具栏配置 */
     menu: {
       type: Object as PropType<MenuBarData>,
@@ -101,6 +106,9 @@ export default defineComponent({
     /** 中间工作区域中画布通过iframe渲染时的页面url */
     runtimeUrl: String,
 
+    /** 选中时是否自动滚动到可视区域 */
+    autoScrollIntoView: Boolean,
+
     /** 组件的属性配置表单的dsl */
     propsConfigs: {
       type: Object as PropType<Record<string, FormConfig>>,
@@ -122,6 +130,9 @@ export default defineComponent({
     /** 画布中组件选中框的移动范围 */
     moveableOptions: {
       type: [Object, Function] as PropType<MoveableOptions | ((core?: StageCore) => MoveableOptions)>,
+      default: () => (core?: StageCore) => ({
+        container: core?.renderer?.contentWindow?.document.getElementById('app'),
+      }),
     },
 
     /** 编辑器初始化时默认选中的组件ID */
@@ -131,11 +142,21 @@ export default defineComponent({
 
     canSelect: {
       type: Function as PropType<(el: HTMLElement) => boolean | Promise<boolean>>,
+      default: (el: HTMLElement) => Boolean(el.id),
     },
 
     stageRect: {
       type: [String, Object] as PropType<StageRect>,
     },
+
+    codeOptions: {
+      type: Object,
+      default: () => ({}),
+    },
+
+    updateDragEl: {
+      type: Function as PropType<(el: HTMLDivElement, target: HTMLElement) => void>,
+    },
   },
 
   emits: ['props-panel-mounted', 'update:modelValue'],
@@ -228,6 +249,20 @@ export default defineComponent({
 
     provide('services', services);
 
+    provide('layerContentMenu', props.layerContentMenu);
+    provide('stageContentMenu', props.stageContentMenu);
+    provide(
+      'stageOptions',
+      reactive({
+        runtimeUrl: props.runtimeUrl,
+        autoScrollIntoView: props.autoScrollIntoView,
+        render: props.render,
+        moveableOptions: props.moveableOptions,
+        canSelect: props.canSelect,
+        updateDragEl: props.updateDragEl,
+      }),
+    );
+
     return services;
   },
 });

package/src/components/ContentMenu.vue

@@ -0,0 +1,140 @@
+<template>
+  <div v-if="menuData.length && visible" class="magic-editor-content-menu" ref="menu" :style="menuStyle">
+    <div>
+      <tool-button
+        v-for="(item, index) in menuData"
+        event-type="mouseup"
+        :data="item"
+        :key="index"
+        @mouseup="hide"
+        @mouseenter="showSubMenu(item)"
+      ></tool-button>
+    </div>
+    <teleport to="body">
+      <content-menu
+        class="sub-menu"
+        ref="subMenu"
+        :menu-data="subMenuData"
+        :is-sub-menu="true"
+        @hide="hide"
+      ></content-menu>
+    </teleport>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent, nextTick, onMounted, onUnmounted, PropType, ref } from 'vue';
+
+import { MenuButton, MenuItem } from '@editor/type';
+
+import ToolButton from './ToolButton.vue';
+
+export default defineComponent({
+  components: { ToolButton },
+
+  props: {
+    menuData: {
+      type: Array as PropType<MenuItem[]>,
+      default: () => [],
+    },
+
+    isSubMenu: {
+      type: Boolean,
+      default: false,
+    },
+  },
+
+  emits: ['hide', 'show'],
+
+  setup(props, { emit }) {
+    const menu = ref<HTMLDivElement>();
+    const subMenu = ref<any>();
+    const visible = ref(false);
+    const subMenuData = ref<MenuItem[]>([]);
+    const menuStyle = ref({
+      left: '0',
+      top: '0',
+    });
+
+    const hide = () => {
+      if (!visible.value) return;
+
+      visible.value = false;
+      subMenu.value?.hide();
+
+      emit('hide');
+    };
+
+    const hideHandler = (e: MouseEvent) => {
+      const target = e.target as HTMLElement | undefined;
+      if (!visible.value || !target) {
+        return;
+      }
+      if (menu.value?.contains(target) || subMenu.value?.$el?.contains(target)) {
+        return;
+      }
+      hide();
+    };
+
+    onMounted(() => {
+      if (props.isSubMenu) return;
+
+      globalThis.addEventListener('mousedown', hideHandler, true);
+    });
+
+    onUnmounted(() => {
+      if (props.isSubMenu) return;
+
+      globalThis.removeEventListener('mousedown', hideHandler, true);
+    });
+
+    return {
+      menu,
+      subMenu,
+      visible,
+      menuStyle,
+      subMenuData,
+
+      hide,
+
+      show(e: MouseEvent) {
+        // 加settimeout是以为，如果菜单中的按钮监听的是mouseup，那么菜单显示出来时鼠标如果正好在菜单上就会马上触发按钮的mouseup
+        setTimeout(() => {
+          visible.value = true;
+
+          nextTick(() => {
+            const menuHeight = menu.value?.clientHeight || 0;
+
+            let top = e.clientY;
+            if (menuHeight + e.clientY > document.body.clientHeight) {
+              top = document.body.clientHeight - menuHeight;
+            }
+
+            menuStyle.value = {
+              top: `${top}px`,
+              left: `${e.clientX}px`,
+            };
+
+            emit('show');
+          });
+        }, 300);
+      },
+
+      showSubMenu(item: MenuItem) {
+        const menuItem = item as MenuButton;
+        if (typeof item !== 'object' || !menuItem.items?.length) {
+          return;
+        }
+
+        subMenuData.value = menuItem.items;
+        if (menu.value) {
+          subMenu.value.show({
+            clientX: menu.value.offsetLeft + menu.value.clientWidth,
+            clientY: menu.value.offsetTop,
+          });
+        }
+      },
+    };
+  },
+});
+</script>

package/src/components/ScrollViewer.vue

@@ -55,7 +55,7 @@ export default defineComponent({
       style: computed(
         () => `
         width: ${props.width}px;
-        height: ${props.height}px;
+        height: ${(props.height || 0) - 40}px;
         position: absolute;
         margin-top: 30px;
       `,

package/src/components/ToolButton.vue

@@ -1,24 +1,37 @@
 <template>
-  <div v-if="display" class="menu-item">
-    <el-divider v-if="item.type === 'divider'" direction="vertical"></el-divider>
+  <div
+    v-if="display"
+    class="menu-item"
+    :class="item.type"
+    @click="clickHandler(item, $event)"
+    @mousedown="mousedownHandler(item, $event)"
+    @mouseup="mouseupHandler(item, $event)"
+  >
+    <el-divider v-if="item.type === 'divider'" :direction="item.direction || 'vertical'"></el-divider>
     <div v-else-if="item.type === 'text'" class="menu-item-text">{{ item.text }}</div>
 
     <template v-else-if="item.type === 'zoom'">
-      <m-icon :icon="ZoomIn" @click="zoomInHandler"></m-icon>
+      <tool-button
+        :data="{ type: 'button', icon: ZoomOut, handler: zoomOutHandler, tooltip: '缩小' }"
+        :event-type="eventType"
+      ></tool-button>
       <span class="menu-item-text" style="margin: 0 5px">{{ parseInt(`${zoom * 100}`, 10) }}%</span>
-      <m-icon :icon="ZoomOut" @click="zoomOutHandler"></m-icon>
+      <tool-button
+        :data="{ type: 'button', icon: ZoomIn, handler: zoomInHandler, tooltip: '放大' }"
+        :event-type="eventType"
+      ></tool-button>
     </template>
 
-    <el-tooltip
-      v-else-if="item.type === 'button'"
-      effect="dark"
-      placement="bottom-start"
-      :content="item.tooltip || item.text"
-    >
-      <el-button size="small" type="text" :disabled="disabled" @click="buttonHandler(item)"
-        ><m-icon :icon="item.icon"></m-icon><span>{{ item.text }}</span></el-button
+    <template v-else-if="item.type === 'button'">
+      <el-tooltip v-if="item.tooltip" effect="dark" placement="bottom-start" :content="item.tooltip">
+        <el-button size="small" text :disabled="disabled"
+          ><m-icon v-if="item.icon" :icon="item.icon"></m-icon><span>{{ item.text }}</span></el-button
+        >
+      </el-tooltip>
+      <el-button v-else size="small" text :disabled="disabled"
+        ><m-icon v-if="item.icon" :icon="item.icon"></m-icon><span>{{ item.text }}</span></el-button
       >
-    </el-tooltip>
+    </template>
 
     <el-dropdown v-else-if="item.type === 'dropdown'" trigger="click" :disabled="disabled" @command="dropdownHandler">
       <span class="el-dropdown-link menubar-menu-button">
@@ -38,9 +51,11 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, inject, PropType } from 'vue';
+import { computed, defineComponent, inject, markRaw, PropType } from 'vue';
 import { ArrowDown, Back, Delete, Grid, Right, ScaleToOriginal, ZoomIn, ZoomOut } from '@element-plus/icons';
 
+import { NodeType } from '@tmagic/schema';
+
 import MIcon from '@editor/components/Icon.vue';
 import type { MenuButton, MenuComponent, MenuItem, Services } from '@editor/type';
 
@@ -56,19 +71,24 @@ export default defineComponent({
         display: false,
       }),
     },
+
+    eventType: {
+      type: String as PropType<'mousedown' | 'mouseup' | 'click'>,
+      default: 'click',
+    },
   },
 
   setup(props) {
     const services = inject<Services>('services');
     const uiService = services?.uiService;
 
-    const zoomInHandler = () => uiService?.set('zoom', zoom.value + 0.1);
-    const zoomOutHandler = () => uiService?.set('zoom', zoom.value - 0.1);
-
     const zoom = computed((): number => uiService?.get<number>('zoom') ?? 1);
     const showGuides = computed((): boolean => uiService?.get<boolean>('showGuides') ?? true);
     const showRule = computed((): boolean => uiService?.get<boolean>('showRule') ?? true);
 
+    const zoomInHandler = () => uiService?.zoom(0.1);
+    const zoomOutHandler = () => uiService?.zoom(-0.1);
+
     const item = computed((): MenuButton | MenuComponent => {
       if (typeof props.data !== 'string') {
         return props.data;
@@ -85,15 +105,15 @@ export default defineComponent({
         case 'delete':
           return {
             type: 'button',
-            icon: Delete,
+            icon: markRaw(Delete),
             tooltip: '刪除',
-            disabled: () => services?.editorService.get('node')?.type === 'page',
+            disabled: () => services?.editorService.get('node')?.type === NodeType.PAGE,
             handler: () => services?.editorService.remove(services?.editorService.get('node')),
           };
         case 'undo':
           return {
             type: 'button',
-            icon: Back,
+            icon: markRaw(Back),
             tooltip: '后退',
             disabled: () => !services?.historyService.state.canUndo,
             handler: () => services?.editorService.undo(),
@@ -101,7 +121,7 @@ export default defineComponent({
         case 'redo':
           return {
             type: 'button',
-            icon: Right,
+            icon: markRaw(Right),
             tooltip: '前进',
             disabled: () => !services?.historyService.state.canRedo,
             handler: () => services?.editorService.redo(),
@@ -109,28 +129,28 @@ export default defineComponent({
         case 'zoom-in':
           return {
             type: 'button',
-            icon: ZoomIn,
+            icon: markRaw(ZoomIn),
             tooltip: '放大',
             handler: zoomInHandler,
           };
         case 'zoom-out':
           return {
             type: 'button',
-            icon: ZoomOut,
+            icon: markRaw(ZoomOut),
             tooltip: '縮小',
             handler: zoomOutHandler,
           };
         case 'rule':
           return {
             type: 'button',
-            icon: ScaleToOriginal,
+            icon: markRaw(ScaleToOriginal),
             tooltip: showRule.value ? '隐藏标尺' : '显示标尺',
             handler: () => uiService?.set('showRule', !showRule.value),
           };
         case 'guides':
           return {
             type: 'button',
-            icon: Grid,
+            icon: markRaw(Grid),
             tooltip: showGuides.value ? '隐藏参考线' : '显示参考线',
             handler: () => uiService?.set('showGuides', !showGuides.value),
           };
@@ -151,9 +171,16 @@ export default defineComponent({
       return item.value.disabled;
     });
 
+    const buttonHandler = (item: MenuButton | MenuComponent, event: MouseEvent) => {
+      if (disabled.value) return;
+      if (typeof (item as MenuButton).handler === 'function' && services) {
+        (item as MenuButton).handler?.(services, event);
+      }
+    };
+
     return {
-      ZoomIn,
-      ZoomOut,
+      ZoomIn: markRaw(ZoomIn),
+      ZoomOut: markRaw(ZoomOut),
 
       item,
       zoom,
@@ -176,10 +203,24 @@ export default defineComponent({
         }
       },
 
-      buttonHandler(item: MenuButton | MenuComponent) {
-        if (disabled.value) return;
-        if (typeof (item as MenuButton).handler === 'function') {
-          (item as MenuButton).handler?.(services);
+      clickHandler(item: MenuButton | MenuComponent, event: MouseEvent) {
+        if (props.eventType !== 'click') return;
+        if (item.type === 'button') {
+          buttonHandler(item, event);
+        }
+      },
+
+      mousedownHandler(item: MenuButton | MenuComponent, event: MouseEvent) {
+        if (props.eventType !== 'mousedown') return;
+        if (item.type === 'button') {
+          buttonHandler(item, event);
+        }
+      },
+
+      mouseupHandler(item: MenuButton | MenuComponent, event: MouseEvent) {
+        if (props.eventType !== 'mouseup') return;
+        if (item.type === 'button') {
+          buttonHandler(item, event);
         }
       },
     };

package/src/fields/UISelect.vue

@@ -1,16 +1,20 @@
 <template>
   <div class="m-fields-ui-select" v-if="uiSelectMode" @click="cancelHandler">
-    <i class="el-icon-delete" style="color: rgb(221, 75, 57)">取消</i>
+    <el-button type="danger" :icon="Delete" text style="padding: 0">取消</el-button>
   </div>
-  <div class="m-fields-ui-select" v-else @click="startSelect">
-    <i class="el-icon-thumb"></i>
-    <span>{{ val ? toName + '_' + val : '点击此处选择' }}</span>
-    <i class="el-icon-delete" @click.stop="deleteHandler" v-if="val"></i>
+  <div class="m-fields-ui-select" v-else @click="startSelect" style="display: flex">
+    <el-tooltip content="清除">
+      <el-button v-if="val" style="padding: 0" type="danger" :icon="Close" text @click.stop="deleteHandler"></el-button>
+    </el-tooltip>
+    <el-tooltip :content="val ? toName + '_' + val : '点击此处选择'">
+      <el-button text style="padding: 0; margin: 0">{{ val ? toName + '_' + val : '点击此处选择' }}</el-button>
+    </el-tooltip>
   </div>
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, inject, ref } from 'vue';
+import { computed, defineComponent, inject, markRaw, ref } from 'vue';
+import { Close, Delete, Pointer } from '@element-plus/icons';
 
 import { FormState } from '@tmagic/form';
 
@@ -60,6 +64,10 @@ export default defineComponent({
     };
 
     return {
+      Delete: markRaw(Delete),
+      Pointer: markRaw(Pointer),
+      Close: markRaw(Close),
+
       val,
       uiSelectMode,
       toName: computed(() => {

package/src/index.ts

@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import './utils/polyfills';
 
 import { App } from 'vue';
 
@@ -41,6 +42,7 @@ export { default as uiService } from './services/ui';
 export { default as ComponentListPanel } from './layouts/sidebar/ComponentListPanel.vue';
 export { default as LayerPanel } from './layouts/sidebar/LayerPanel.vue';
 export { default as PropsPanel } from './layouts/PropsPanel.vue';
+export { default as ToolButton } from './components/ToolButton.vue';
 
 const defaultInstallOpt: InstallOptions = {
   // @todo, 自定义图片上传方法等编辑器依赖的外部选项

package/src/layouts/AddPageBox.vue

@@ -15,6 +15,8 @@
 import { defineComponent, inject, toRaw } from 'vue';
 import { Plus } from '@element-plus/icons';
 
+import { NodeType } from '@tmagic/schema';
+
 import { Services } from '@editor/type';
 import { generatePageNameByApp } from '@editor/utils';
 
@@ -31,7 +33,7 @@ export default defineComponent({
         if (!editorService) return;
 
         editorService.add({
-          type: 'page',
+          type: NodeType.PAGE,
           name: generatePageNameByApp(toRaw(editorService.get('root'))),
         });
       },