jinx 2 years ago
parent
commit
bb5d959888

File diff suppressed because it is too large
+ 1 - 1
server/test/a0k4xu045_202305311600080410/attach/sceneStore


+ 11 - 12
src/graphic/ListenLayer.js

@@ -678,17 +678,15 @@ export default class ListenLayer {
       }
 
       //检查edge
-   // (mathUtil.isContainForSegment(join, startPoint, endPoint) && 
-        // leftSideJoin && 
-        // mathUtil.isContainForSegment(position, join, leftSideJoin))
+      // ||
+      // (mathUtil.isContainForSegment(join, startPoint, endPoint) &&
+      //  leftSideJoin &&
+      //  mathUtil.isContainForSegment(position, leftSideJoin, leftJoin)
+      // )
       distance = this.getDistance(position, leftJoin);
       if (
         (mathUtil.isContainForSegment(leftJoin, leftEdge.start, leftEdge.end) &&
-        distance < Constant.minAdsorbPix / 2) ||
-        (mathUtil.isContainForSegment(join, startPoint, endPoint) &&
-         leftSideJoin &&
-         mathUtil.isContainForSegment(position, leftSideJoin, leftJoin)
-        )
+        distance < Constant.minAdsorbPix / 2) 
       ) {
         if (!edgeInfo.edgeId || distance < edgeInfo.distance) {
 
@@ -703,16 +701,17 @@ export default class ListenLayer {
       }
 
       distance = this.getDistance(position, rightJoin);
+      // ||
+      //   (mathUtil.isContainForSegment(join, startPoint, endPoint) && 
+      //    rightSideJoin &&
+      //    mathUtil.isContainForSegment(position,rightSideJoin,rightJoin))
       if (
         (mathUtil.isContainForSegment(
           rightJoin,
           rightEdge.start,
           rightEdge.end
         ) &&
-        distance < Constant.minAdsorbPix / 2) ||
-        (mathUtil.isContainForSegment(join, startPoint, endPoint) && 
-         rightSideJoin &&
-         mathUtil.isContainForSegment(position,rightSideJoin,rightJoin))
+        distance < Constant.minAdsorbPix / 2) 
       ) {
         if (!edgeInfo.edgeId || distance < edgeInfo.distance) {
           edgeInfo = {

+ 1 - 1
src/views/tables/write/index.vue

@@ -105,7 +105,7 @@ const setCaretPosition = (ctrl, pos) => {
 // 获取 textarea 元素
 
 const getSelectionDistance = () => {
-  var textarea = document.getElementById('write-info'); // 替换 'yourTextareaId' 为您的 textarea 元素的实际 ID
+  var textarea = document.getElementById('write-info'); 
   // // 获取 textarea 的样式属性
   var textareaStyle = getComputedStyle(textarea);
   // // 计算光标位置距离顶部的距离