askbot-dragon 1.3.77 → 1.3.79
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -883,7 +883,7 @@ export default {
|
|
|
883
883
|
x: events2.pageX,
|
|
884
884
|
y: events2.pageY
|
|
885
885
|
}
|
|
886
|
-
)
|
|
886
|
+
) / that.getDistance(
|
|
887
887
|
{
|
|
888
888
|
x: that.displacement.pageX,
|
|
889
889
|
y: that.displacement.pageY
|
|
@@ -895,11 +895,15 @@ export default {
|
|
|
895
895
|
);
|
|
896
896
|
// 应用在元素上的缩放比例
|
|
897
897
|
let newScale = that.displacement.originScale * zoom;
|
|
898
|
-
console.log(zoom, newScale , 'newScale');
|
|
898
|
+
console.log(zoom, newScale , this.scale, 'newScale');
|
|
899
899
|
// 最大缩放比例限制
|
|
900
900
|
if (newScale > 2) {
|
|
901
901
|
newScale = 2;
|
|
902
902
|
}
|
|
903
|
+
// 最大缩放比例限制
|
|
904
|
+
if(newScale < 1) {
|
|
905
|
+
newScale = 1;
|
|
906
|
+
}
|
|
903
907
|
// 记住使用的缩放值
|
|
904
908
|
that.displacement.scale = newScale;
|
|
905
909
|
// console.log(newScale);
|