@tmagic/stage 1.1.0-beta.4 → 1.1.0-beta.5

package/dist/types/src/StageCore.d.ts

@@ -25,7 +25,8 @@ export default class StageCore extends EventEmitter {
     private canSelect;
     constructor(config: StageCoreConfig);
     getElementsFromPoint(event: MouseEvent): HTMLElement[];
-    getElementFromPoint(event: MouseEvent, type?: String): Promise<HTMLElement | undefined>;
+    getElementFromPoint(event: MouseEvent): Promise<HTMLElement | undefined>;
+    isElCanSelect(el: HTMLElement, event: MouseEvent, stop: () => boolean): Promise<Boolean>;
     /**
      * 选中组件
      * @param idOrEl 组件Dom节点的id属性，或者Dom节点

package/dist/types/src/StageMask.d.ts

@@ -21,7 +21,7 @@ export default class StageMask extends Rule {
     maxScrollTop: number;
     maxScrollLeft: number;
     intersectionObserver: IntersectionObserver | null;
-    shiftKeyDown: Boolean;
+    isMultiSelectStatus: Boolean;
     private mode;
     private pageResizeObserver;
     private wrapperResizeObserver;

package/dist/types/src/StageMultiDragResize.d.ts

@@ -22,6 +22,7 @@ export default class StageMultiDragResize extends EventEmitter {
      * @param els
      */
     multiSelect(els: HTMLElement[]): void;
+    canSelect(el: HTMLElement): Boolean;
     /**
      * 清除多选状态
      */
@@ -39,4 +40,10 @@ export default class StageMultiDragResize extends EventEmitter {
      * @param isResize 是否进行大小缩放
      */
     private update;
+    /**
+     * 获取moveable options参数
+     * @param {MoveableOptions} options
+     * @return {MoveableOptions} moveable options参数
+     */
+    private getOptions;
 }

package/dist/types/src/StageRender.d.ts

@@ -26,4 +26,5 @@ export default class StageRender extends EventEmitter {
      */
     destroy(): void;
     private loadHandler;
+    private postTmagicRuntimeReady;
 }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0-beta.4",
+  "version": "1.1.0-beta.5",
   "name": "@tmagic/stage",
   "sideEffects": [
     "dist/*"
@@ -27,9 +27,9 @@
   },
   "dependencies": {
     "@scena/guides": "^0.17.0",
-    "@tmagic/core": "1.1.0-beta.4",
-    "@tmagic/schema": "1.1.0-beta.4",
-    "@tmagic/utils": "1.1.0-beta.4",
+    "@tmagic/core": "1.1.0-beta.5",
+    "@tmagic/schema": "1.1.0-beta.5",
+    "@tmagic/utils": "1.1.0-beta.5",
     "events": "^3.3.0",
     "keycon": "^1.1.2",
     "lodash-es": "^4.17.21",

package/src/StageCore.ts

@@ -99,7 +99,7 @@ export default class StageCore extends EventEmitter {
         this.emit('changeGuides', data);
       })
       .on('highlight', async (event: MouseEvent) => {
-        const el = await this.getElementFromPoint(event, 'mousemove');
+        const el = await this.getElementFromPoint(event);
         if (!el) return;
         await this.highlight(el);
         if (this.highlightedDom === this.selectedDom) {
@@ -114,8 +114,6 @@ export default class StageCore extends EventEmitter {
       .on('beforeMultiSelect', async (event: MouseEvent) => {
         const el = await this.getElementFromPoint(event);
         if (!el) return;
-        // 多选不可以选中magic-ui-page
-        if (el.className.includes(PAGE_CLASS)) return;
         this.clearSelectStatus('select');
         // 如果已有单选选中元素，不是magic-ui-page就可以加入多选列表
         if (this.selectedDom && !this.selectedDom.className.includes(PAGE_CLASS)) {
@@ -166,26 +164,35 @@ export default class StageCore extends EventEmitter {
     return doc?.elementsFromPoint(x / zoom, y / zoom) as HTMLElement[];
   }
 
-  public async getElementFromPoint(event: MouseEvent, type?: String) {
+  public async getElementFromPoint(event: MouseEvent) {
     const els = this.getElementsFromPoint(event);
     let stopped = false;
     const stop = () => (stopped = true);
     for (const el of els) {
-      if (!el.id.startsWith(GHOST_EL_ID_PREFIX) && (await this.canSelect(el, event, stop))) {
+      if (!el.id.startsWith(GHOST_EL_ID_PREFIX) && (await this.isElCanSelect(el, event, stop))) {
         if (stopped) break;
-        if (event.type === type) {
-          return el;
-        }
         return el;
       }
     }
   }
 
+  public async isElCanSelect(el: HTMLElement, event: MouseEvent, stop: () => boolean): Promise<Boolean> {
+    // 执行业务方传入的判断逻辑
+    const canSelectByProp = await this.canSelect(el, event, stop);
+    if (!canSelectByProp) return false;
+    // 多选规则
+    if (this.mask.isMultiSelectStatus) {
+      return this.multiDr.canSelect(el);
+    }
+    return true;
+  }
+
   /**
    * 选中组件
    * @param idOrEl 组件Dom节点的id属性，或者Dom节点
    */
   public async select(idOrEl: Id | HTMLElement, event?: MouseEvent): Promise<void> {
+    this.clearSelectStatus('multiSelect');
     const el = await this.getTargetElement(idOrEl);
 
     if (el === this.selectedDom) return;
@@ -199,7 +206,6 @@ export default class StageCore extends EventEmitter {
     }
 
     this.mask.setLayout(el);
-    this.multiDr.destroyDragElList();
     this.dr.select(el, event);
 
     if (this.config.autoScrollIntoView || el.dataset.autoScrollIntoView) {

package/src/StageHighlight.ts

@@ -57,7 +57,7 @@ export default class StageHighlight extends EventEmitter {
       target: this.calibrationTarget.update(el, HIGHLIGHT_EL_ID_PREFIX),
       origin: false,
       rootContainer: this.core.container,
-      zoom: 1,
+      zoom: 2,
     });
   }
 

package/src/StageMask.ts

@@ -83,7 +83,7 @@ export default class StageMask extends Rule {
   public maxScrollTop = 0;
   public maxScrollLeft = 0;
   public intersectionObserver: IntersectionObserver | null = null;
-  public shiftKeyDown: Boolean = false;
+  public isMultiSelectStatus: Boolean = false;
 
   private mode: Mode = Mode.ABSOLUTE;
   private pageResizeObserver: ResizeObserver | null = null;
@@ -110,11 +110,11 @@ export default class StageMask extends Rule {
     this.content.addEventListener('mouseleave', this.mouseLeaveHandler);
     KeyController.global.keydown('shift', (e) => {
       e.inputEvent.preventDefault();
-      this.shiftKeyDown = true;
+      this.isMultiSelectStatus = true;
     });
     KeyController.global.keyup('shift', (e) => {
       e.inputEvent.preventDefault();
-      this.shiftKeyDown = false;
+      this.isMultiSelectStatus = false;
     });
   }
 
@@ -308,7 +308,7 @@ export default class StageMask extends Rule {
     if (event.button !== MouseButton.LEFT && event.button !== MouseButton.RIGHT) return;
 
     // 如果单击多选选中区域，则不需要再触发选中了，而可能是拖动行为
-    if (!this.shiftKeyDown && (event.target as HTMLDivElement).className.indexOf('moveable-area') !== -1) {
+    if (!this.isMultiSelectStatus && (event.target as HTMLDivElement).className.indexOf('moveable-area') !== -1) {
       return;
     }
     // 点击对象如果是边框锚点，则可能是resize
@@ -319,13 +319,13 @@ export default class StageMask extends Rule {
     this.content.removeEventListener('mousemove', this.highlightHandler);
 
     // 判断触发多选还是单选
-    if (this.shiftKeyDown) {
+    if (this.isMultiSelectStatus) {
       this.emit('beforeMultiSelect', event);
     } else {
       this.emit('beforeSelect', event);
-      // 如果是右键点击，这里的mouseup事件监听没有效果
-      globalThis.document.addEventListener('mouseup', this.mouseUpHandler);
     }
+    // 如果是右键点击，这里的mouseup事件监听没有效果
+    globalThis.document.addEventListener('mouseup', this.mouseUpHandler);
   };
 
   private mouseUpHandler = (): void => {

package/src/StageMultiDragResize.ts

@@ -18,14 +18,15 @@
 
 import { EventEmitter } from 'events';
 
+import type { MoveableOptions } from 'moveable';
 import Moveable from 'moveable';
 import MoveableHelper from 'moveable-helper';
 
-import { DRAG_EL_ID_PREFIX } from './const';
+import { DRAG_EL_ID_PREFIX, PAGE_CLASS } from './const';
 import StageCore from './StageCore';
 import StageMask from './StageMask';
 import { StageDragResizeConfig } from './types';
-import { calcValueByFontsize, getTargetElStyle } from './util';
+import { calcValueByFontsize, getMode, getTargetElStyle } from './util';
 export default class StageMultiDragResize extends EventEmitter {
   public core: StageCore;
   public mask: StageMask;
@@ -70,19 +71,12 @@ export default class StageMultiDragResize extends EventEmitter {
     this.moveableForMulti?.destroy();
     this.multiMoveableHelper?.clear();
 
-    this.moveableForMulti = new Moveable(this.container, {
-      target: this.dragElList,
-      defaultGroupRotate: 0,
-      defaultGroupOrigin: '50% 50%',
-      draggable: true,
-      resizable: true,
-      throttleDrag: 0,
-      startDragRotate: 0,
-      throttleDragRotate: 0,
-      zoom: 1,
-      origin: true,
-      padding: { left: 0, top: 0, right: 0, bottom: 0 },
-    });
+    this.moveableForMulti = new Moveable(
+      this.container,
+      this.getOptions({
+        target: this.dragElList,
+      }),
+    );
     this.multiMoveableHelper = MoveableHelper.create({
       useBeforeRender: true,
       useRender: false,
@@ -134,6 +128,30 @@ export default class StageMultiDragResize extends EventEmitter {
       });
   }
 
+  public canSelect(el: HTMLElement): Boolean {
+    // 多选不可以选中magic-ui-page
+    if (el.className.includes(PAGE_CLASS)) {
+      this.core.highlightedDom = undefined;
+      this.core.highlightLayer.clearHighlight();
+      return false;
+    }
+    const currentTargetMode = getMode(el);
+    let selectedDomMode = '';
+
+    if (this.targetList.length === 0 && this.core.selectedDom) {
+      // 单选后添加到多选的情况
+      selectedDomMode = getMode(this.core.selectedDom);
+    } else if (this.targetList.length > 0) {
+      // 已加入多选列表的布局模式是一样的，取第一个判断
+      selectedDomMode = getMode(this.targetList[0]);
+    }
+    // 定位模式不同，不可混选
+    if (currentTargetMode !== selectedDomMode) {
+      return false;
+    }
+    return true;
+  }
+
   /**
    * 清除多选状态
    */
@@ -142,6 +160,7 @@ export default class StageMultiDragResize extends EventEmitter {
     this.destroyDragElList();
     this.moveableForMulti.target = null;
     this.moveableForMulti.updateTarget();
+    this.targetList = [];
   }
 
   /**
@@ -182,4 +201,31 @@ export default class StageMultiDragResize extends EventEmitter {
       });
     });
   }
+
+  /**
+   * 获取moveable options参数
+   * @param {MoveableOptions} options
+   * @return {MoveableOptions} moveable options参数
+   */
+  private getOptions(options: MoveableOptions = {}): MoveableOptions {
+    let { moveableOptions = {} } = this.core.config;
+
+    if (typeof moveableOptions === 'function') {
+      moveableOptions = moveableOptions(this.core);
+    }
+    return {
+      defaultGroupRotate: 0,
+      defaultGroupOrigin: '50% 50%',
+      draggable: true,
+      resizable: true,
+      throttleDrag: 0,
+      startDragRotate: 0,
+      throttleDragRotate: 0,
+      zoom: 1,
+      origin: true,
+      padding: { left: 0, top: 0, right: 0, bottom: 0 },
+      ...options,
+      ...moveableOptions,
+    };
+  }
 }

package/src/StageRender.ts

@@ -72,20 +72,22 @@ export default class StageRender extends EventEmitter {
    * @param el 将页面挂载到该Dom节点上
    */
   public async mount(el: HTMLDivElement) {
-    if (this.iframe) {
-      if (!isSameDomain(this.runtimeUrl) && this.runtimeUrl) {
-        // 不同域，使用srcdoc发起异步请求，需要目标地址支持跨域
-        let html = await fetch(this.runtimeUrl).then((res) => res.text());
-        // 使用base, 解决相对路径或绝对路径的问题
-        const base = `${location.protocol}//${getHost(this.runtimeUrl)}`;
-        html = html.replace('<head>', `<head>\n<base href="${base}">`);
-        this.iframe.srcdoc = html;
-      }
-
-      el.appendChild<HTMLIFrameElement>(this.iframe);
-    } else {
+    if (!this.iframe) {
       throw Error('mount 失败');
     }
+
+    if (!isSameDomain(this.runtimeUrl) && this.runtimeUrl) {
+      // 不同域，使用srcdoc发起异步请求，需要目标地址支持跨域
+      let html = await fetch(this.runtimeUrl).then((res) => res.text());
+      // 使用base, 解决相对路径或绝对路径的问题
+      const base = `${location.protocol}//${getHost(this.runtimeUrl)}`;
+      html = html.replace('<head>', `<head>\n<base href="${base}">`);
+      this.iframe.srcdoc = html;
+    }
+
+    el.appendChild<HTMLIFrameElement>(this.iframe);
+
+    this.postTmagicRuntimeReady();
   }
 
   public getRuntime = (): Promise<Runtime> => {
@@ -111,26 +113,34 @@ export default class StageRender extends EventEmitter {
   }
 
   private loadHandler = async () => {
-    this.contentWindow = this.iframe?.contentWindow as RuntimeWindow;
+    if (!this.contentWindow?.magic) {
+      this.postTmagicRuntimeReady();
+    }
 
-    this.contentWindow.magic = this.getMagicApi();
+    if (!this.contentWindow) return;
 
     if (this.render) {
       const el = await this.render(this.core);
       if (el) {
-        this.iframe?.contentDocument?.body?.appendChild(el);
+        this.contentWindow.document?.body?.appendChild(el);
       }
     }
 
     this.emit('onload');
 
+    injectStyle(this.contentWindow.document, style);
+  };
+
+  private postTmagicRuntimeReady() {
+    this.contentWindow = this.iframe?.contentWindow as RuntimeWindow;
+
+    this.contentWindow.magic = this.getMagicApi();
+
     this.contentWindow.postMessage(
       {
         tmagicRuntimeReady: true,
       },
       '*',
     );
-
-    injectStyle(this.contentWindow.document, style);
-  };
+  }
 }

package/src/TargetCalibrate.ts

@@ -18,7 +18,7 @@
 
 import { EventEmitter } from 'events';
 
-import { Mode } from './const';
+import { Mode, ZIndex } from './const';
 import StageCore from './StageCore';
 import StageDragResize from './StageDragResize';
 import StageMask from './StageMask';
@@ -57,6 +57,7 @@ export default class TargetCalibrate extends EventEmitter {
       top: ${top}px;
       width: ${el.clientWidth}px;
       height: ${el.clientHeight}px;
+      z-index: ${ZIndex.DRAG_EL};
     `;
 
     this.operationEl.id = `${prefix}${el.id}`;

package/src/style.css

@@ -7,4 +7,5 @@
   left: 0;
   background-color: #000;
   opacity: .1;
+  pointer-events: none;
 }