@tmagic/stage 1.3.8 → 1.3.10

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.8",
+  "version": "1.3.10",
   "name": "@tmagic/stage",
   "type": "module",
   "sideEffects": [
@@ -26,9 +26,9 @@
   },
   "dependencies": {
     "@scena/guides": "^0.29.2",
-    "@tmagic/core": "1.3.8",
-    "@tmagic/schema": "1.3.8",
-    "@tmagic/utils": "1.3.8",
+    "@tmagic/core": "1.3.10",
+    "@tmagic/schema": "1.3.10",
+    "@tmagic/utils": "1.3.10",
     "events": "^3.3.0",
     "keycon": "^1.4.0",
     "lodash-es": "^4.17.21",

package/src/ActionManager.ts

@@ -429,11 +429,11 @@ export default class ActionManager extends EventEmitter {
       ?.on('update', (data: UpdateEventData) => {
         this.emit('multi-update', data);
       })
-      .on('change-to-select', async (id: Id) => {
+      .on('change-to-select', async (id: Id, e: MouseEvent) => {
         // 如果还在多选状态，不触发切换到单选
         if (this.isMultiSelectStatus) return false;
         const el = this.getTargetElement(id);
-        this.emit('change-to-select', el);
+        this.emit('change-to-select', el, e);
       });
 
     return multiDr;

package/src/DragResizeHelper.ts

@@ -35,7 +35,7 @@ import MoveableHelper from 'moveable-helper';
 import { DRAG_EL_ID_PREFIX, GHOST_EL_ID_PREFIX, Mode, ZIndex } from './const';
 import TargetShadow from './TargetShadow';
 import { DragResizeHelperConfig, Rect, TargetElement } from './types';
-import { calcValueByFontsize, getAbsolutePosition, getMarginValue, getOffset } from './util';
+import { calcValueByFontsize, getAbsolutePosition, getBorderWidth, getMarginValue, getOffset } from './util';
 
 /**
  * 拖拽/改变大小等操作发生时，moveable会抛出各种状态事件，DragResizeHelper负责响应这些事件，对目标节点target和拖拽节点targetShadow进行修改；
@@ -128,11 +128,13 @@ export default class DragResizeHelper {
       this.moveableHelper.onResize(e);
       const { marginLeft, marginTop } = getMarginValue(this.target);
       this.target.style.left = `${this.frameSnapShot.left + beforeTranslate[0] - marginLeft}px`;
-      this.target.style.top = `${this.frameSnapShot.top + beforeTranslate[1] - marginTop} - marginToppx`;
+      this.target.style.top = `${this.frameSnapShot.top + beforeTranslate[1] - marginTop}px`;
     }
 
-    this.target.style.width = `${width}px`;
-    this.target.style.height = `${height}px`;
+    const { borderLeftWidth, borderRightWidth, borderTopWidth, borderBottomWidth } = getBorderWidth(this.target);
+
+    this.target.style.width = `${width + borderLeftWidth + borderRightWidth}px`;
+    this.target.style.height = `${height + borderTopWidth + borderBottomWidth}px`;
   }
 
   public onDragStart(e: OnDragStart): void {
@@ -294,8 +296,11 @@ export default class DragResizeHelper {
 
     let left = calcValueByFontsize(doc, offset.left) - marginLeft;
     let top = calcValueByFontsize(doc, offset.top) - marginTop;
-    const width = calcValueByFontsize(doc, el.clientWidth);
-    const height = calcValueByFontsize(doc, el.clientHeight);
+
+    const { borderLeftWidth, borderRightWidth, borderTopWidth, borderBottomWidth } = getBorderWidth(el);
+
+    const width = calcValueByFontsize(doc, el.clientWidth + borderLeftWidth + borderRightWidth);
+    const height = calcValueByFontsize(doc, el.clientHeight + borderTopWidth + borderBottomWidth);
 
     let shadowEl = this.getShadowEl();
     const shadowEls = this.getShadowEls();

package/src/StageCore.ts

@@ -357,10 +357,10 @@ export default class StageCore extends EventEmitter {
   private initMulDrEvent(): void {
     this.actionManager
       // 多选切换到单选
-      .on('change-to-select', (el: HTMLElement) => {
+      .on('change-to-select', (el: HTMLElement, e: MouseEvent) => {
         this.select(el);
         // 先保证画布内完成渲染，再通知外部更新
-        setTimeout(() => this.emit('select', el));
+        setTimeout(() => this.emit('select', el, e));
       })
       .on('multi-update', (data: UpdateEventData) => {
         this.emit('update', data);

package/src/StageMultiDragResize.ts

@@ -128,7 +128,7 @@ export default class StageMultiDragResize extends MoveableOptionsManager {
         const { inputTarget, targets } = e;
         // 如果有多个元素被选中，同时点击的元素在选中元素中的其中一项，可能是多选态切换为该元素的单选态，抛事件给上一层继续判断是否切换
         if (targets.length > 1 && targets.includes(inputTarget)) {
-          this.emit('change-to-select', inputTarget.id.replace(DRAG_EL_ID_PREFIX, ''));
+          this.emit('change-to-select', inputTarget.id.replace(DRAG_EL_ID_PREFIX, ''), e.inputEvent);
         }
       });
   }

package/src/util.ts

@@ -57,7 +57,7 @@ export const getOffset = (el: Element): Offset => {
 // 将蒙层占位节点覆盖在原节点上方
 export const getTargetElStyle = (el: TargetElement, zIndex?: ZIndex) => {
   const offset = getOffset(el);
-  const { transform } = getComputedStyle(el);
+  const { transform, border } = getComputedStyle(el);
   return `
     position: absolute;
     transform: ${transform};
@@ -65,6 +65,7 @@ export const getTargetElStyle = (el: TargetElement, zIndex?: ZIndex) => {
     top: ${offset.top}px;
     width: ${el.clientWidth}px;
     height: ${el.clientHeight}px;
+    border: ${border};
     ${typeof zIndex !== 'undefined' ? `z-index: ${zIndex};` : ''}
   `;
 };
@@ -260,3 +261,22 @@ export const getMarginValue = (el: Element) => {
     marginTop: marginTopValue,
   };
 };
+
+export const getBorderWidth = (el: Element) => {
+  if (!el)
+    return {
+      borderLeftWidth: 0,
+      borderRightWidth: 0,
+      borderTopWidth: 0,
+      borderBottomWidth: 0,
+    };
+
+  const { borderLeftWidth, borderRightWidth, borderTopWidth, borderBottomWidth } = getComputedStyle(el);
+
+  return {
+    borderLeftWidth: parseFloat(borderLeftWidth) || 0,
+    borderRightWidth: parseFloat(borderRightWidth) || 0,
+    borderTopWidth: parseFloat(borderTopWidth) || 0,
+    borderBottomWidth: parseFloat(borderBottomWidth) || 0,
+  };
+};

package/types/util.d.ts

@@ -35,3 +35,9 @@ export declare const getMarginValue: (el: Element) => {
     marginLeft: number;
     marginTop: number;
 };
+export declare const getBorderWidth: (el: Element) => {
+    borderLeftWidth: number;
+    borderRightWidth: number;
+    borderTopWidth: number;
+    borderBottomWidth: number;
+};