feat: support snap transform by view

VisActor · Feb 6, 2025 · 10e2147 · 10e2147
1 parent e1918f1
commit 10e2147
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/packages/vstory-core/src/character/table/runtime/row-visible.ts b/packages/vstory-core/src/character/table/runtime/row-visible.ts
@@ -18,7 +18,7 @@ export class RowVisibleRuntime implements ITableCharacterRuntime {
       const records: any[] = [];
       const headerRowVisible = options.rowVisible[-1];
       spec.showHeader = headerRowVisible !== false && options.showHeader !== false;
-      options.spec.records.forEach((record, index) => {
+      options.spec.records.forEach((record: any, index: number) => {
         const rowVisible = options.rowVisible[index];
         if (rowVisible === false) {
           return;

diff --git a/packages/vstory-editor/src/selection/edit-control/transform-control.ts b/packages/vstory-editor/src/selection/edit-control/transform-control.ts
@@ -141,6 +141,20 @@ export class TransformController extends AbstractComponent<Required<ControllerAt
   // snap的时候会修改rect，导致rect不跟手，所以需要一个最真实的bounds
   protected _actualSnapBounds: IAABBBounds | null = null;
 
+  /**
+   * 根据视图的缩放比例计算出snapThreshold
+   */
+  get transformedSnapThreshold() {
+    let snapThreshold = this._snapThreshold;
+    const globalTransMatrix = this.globalTransMatrix;
+    if (globalTransMatrix) {
+      const scaleX = globalTransMatrix.a;
+      const scaleY = globalTransMatrix.d;
+      snapThreshold = snapThreshold / Math.max(scaleX, scaleY);
+    }
+    return snapThreshold;
+  }
+
   // state: {
   //   actionMode: EditorActionMode;
   // };
@@ -821,7 +835,7 @@ export class TransformController extends AbstractComponent<Required<ControllerAt
             { x: item[0] * width, y: item[1] * height },
             { x: item[2] * width, y: item[3] * height }
           ],
-          pickStrokeBuffer: 2,
+          pickStrokeBuffer: 2 / ((scaleX + scaleY) / 2),
           boundsPadding: 1,
           cursor,
           ...resizeBorder
@@ -1050,12 +1064,13 @@ export class TransformController extends AbstractComponent<Required<ControllerAt
       (this as any)[k].setAttributes({ visible: false });
     });
 
+    const transformedSnapThreshold = this.transformedSnapThreshold;
     const snapLines = lines.filter(item => {
       const d1 = abs(item.value - bounds[`${orient}1`]);
       const d2 = abs(item.value - bounds[`${orient}2`]);
       // 中间的线
       const d3 = abs(item.value - (bounds[`${orient}1`] + bounds[`${orient}2`]) / 2);
-      return d1 < this._snapThreshold || d2 < this._snapThreshold || d3 < this._snapThreshold;
+      return d1 < transformedSnapThreshold || d2 < transformedSnapThreshold || d3 < transformedSnapThreshold;
     });
     if (!snapLines.length) {
       return false;