!3054 修复:排钻智能偏移在第一次偏移时考虑通孔偏移距离

src/Add-on/DrawDrilling/DrawDrillingTool.ts

@@ -700,7 +700,7 @@ export class DrawDrillingTool extends Singleton
                     ((offsetDist && this.m_Option.isDrawWood) ? !FindInWall(dist + offsetDist, this.m_Face.Segment1D) : false))
                 {
                     //计算偏移可放置数值
-                    let { closestNum } = FindClosestInterval(dist, this.m_Face.Segment1D, this.m_Face.Length, this._MoveMinDist, offsetDist);
+                    let { closestNum } = FindClosestInterval(dist, this.m_Face.Segment1D, this.m_Face.Length, this._MoveMinDist, offsetDist, this.m_Option.tHoleOffset);
 
                     //偏移超出邻边两侧排钻距离
                     let leftIndex = this.m_Option.isFromBack ? (i + 1) : (i - 1);
@@ -1602,8 +1602,11 @@ export class DrawDrillingTool extends Singleton
                 return;
             }
 
-            //适用于距离大于200
-            this._AutoDeviation = !this.m_Option.haveDist && !this.m_Option.useTemp &&
+            // 1.不是间距32倍 且第二个排钻距第一个排钻
+            // 2.不使用模块
+            // 3.勾选自动偏移
+            // 4.适用于距离大于200
+            this._AutoDeviation = !(this.m_Option.spacing === SpacingType.Multiple32 && this.m_Option.haveDist) && !this.m_Option.useTemp &&
                 HostApplicationServices.autoDeviation && this.m_Face.Length >= HostApplicationServices.autoDeviationMinDist;
 
             //智能偏移获取可以放置排钻的区间