浏览代码

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/graphic/Renderer/Draw.js
bill 2 年之前
父节点
当前提交
e8f3c0ae8d
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      src/graphic/Renderer/Draw.js

+ 3 - 2
src/graphic/Renderer/Draw.js

@@ -393,7 +393,6 @@ export default class Draw {
   drawMagnifier(vector) {
   drawMagnifier(vector) {
     const ctx = this.context
     const ctx = this.context
     this.drawPoint({
     this.drawPoint({
-      ...vector,
       ...vector.position,
       ...vector.position,
       radius: Style.Magnifier.radius,
       radius: Style.Magnifier.radius,
     })
     })
@@ -439,7 +438,9 @@ export default class Draw {
     if (vector.color) {
     if (vector.color) {
       ctx.strokeStyle = vector.color
       ctx.strokeStyle = vector.color
     }
     }
-    const radius = (vector.radius || style.radius) * coordinate.ratio ;
+    const radius =
+      ((vector.radius || style.radius) * coordinate.ratio * coordinate.zoom) /
+      coordinate.defaultZoom;
     ctx.save();
     ctx.save();
     ctx.beginPath();
     ctx.beginPath();
     ctx.arc(pt.x, pt.y, radius, 0, Math.PI * 2, true);
     ctx.arc(pt.x, pt.y, radius, 0, Math.PI * 2, true);