From 6fa14e0c88b2da2af1b89cb6b8599955975253bf Mon Sep 17 00:00:00 2001
From: jxdnsong <592566207@qq.com>
Date: Mon, 02 Nov 2020 15:20:36 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/map3d into master
---
widgets/Measurement/Widget.js | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/widgets/Measurement/Widget.js b/widgets/Measurement/Widget.js
index f96e8c5..9e041a6 100644
--- a/widgets/Measurement/Widget.js
+++ b/widgets/Measurement/Widget.js
@@ -36,6 +36,7 @@
terrain: !1
});
$('#measuerLengths').click(function () {
+ window.dcViewer.contextMenu.enable=false;
measureSurface.measuerLength({
terrain: !1,
unit: _type,
@@ -43,12 +44,15 @@
})
$('#measuerLength2').click(function () {
+ window.dcViewer.contextMenu.enable=false;
measureSurface.measuerLength({
terrain: !0,
unit: _type,
})
})
$('#measureArea').click(function () {
+ window.dcViewer.contextMenu.enable=false;
+ contextMenu.enable = false;
measureSurface.measureArea({
unit: _type
});
@@ -56,6 +60,7 @@
$('#measureHeight').click(function () {
+ window.dcViewer.contextMenu.enable=false;
measureSurface.measureHeight({
isSuper: !1,
unit: _type,
@@ -63,6 +68,7 @@
})
$('#measureHeight2').click(function () {
+ window.dcViewer.contextMenu.enable=false;
measureSurface.measureHeight({
isSuper: !0,
unit: _type,
@@ -76,6 +82,8 @@
$('.xx').click(function () {
$('.jimu-widget-Measurement').hide()
measureSurface.clearMeasure()
+ window.dcViewer.contextMenu.enable=true;
+
})
--
Gitblit v1.9.3