Merge branch 'dev/v4' of github.com:letterletter/butterfly into HEAD

alibaba · Apr 24, 2021 · c789a07 · c789a07
2 parents fe34b64 + 683c77f
commit c789a07
Show file tree

Hide file tree

Showing 3 changed files with 424 additions and 2 deletions.
diff --git a/src/utils/link/edgeTypes/_utils.js b/src/utils/link/edgeTypes/_utils.js
@@ -1,4 +1,5 @@
 'use strict';
+<<<<<<< HEAD
 import _ from 'lodash';
 
 const MINDIST = 20;
@@ -311,4 +312,7 @@ export function _findManhattanPoint (points, pos) {
     }
   }
   return result;
-}
+}
+=======
+
+>>>>>>> 44fc7b5... chore: optimize link code
diff --git a/src/utils/link/edgeTypes/bezier.js b/src/utils/link/edgeTypes/bezier.js
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 'use strict';
 import {_findControlPoint, _calcOrientation} from './_utils.js';
 
@@ -44,3 +45,6 @@ function drawBezier(sourcePoint, targetPoint) {
 }
 
 export default drawBezier;
+=======
+'use strict';
+>>>>>>> 44fc7b5... chore: optimize link code