@kq_npm/client3d_webgl_vue 4.3.4 → 4.3.6

package/measure/index.js

@@ -511,6 +511,22 @@ const _hoisted_32 = {
 const _hoisted_33 = {
   class: "res"
 };
+const _hoisted_34 = {
+  class: "tit"
+};
+const _hoisted_35 = {
+  class: "res"
+};
+const _hoisted_36 = {
+  key: 3,
+  class: "result"
+};
+const _hoisted_37 = {
+  class: "tit"
+};
+const _hoisted_38 = {
+  class: "res"
+};
 
 
 
@@ -574,6 +590,7 @@ const __default__ = {
 
     let isActive = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(null);
     let isResult = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(false);
+    let isTips = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(false);
     let distanceValue = null; // 默认显示距离的单位
 
     let distanceUnit = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(props.settingParams && props.settingParams.distanceUnit || ""); // 海里单位选择
@@ -581,7 +598,7 @@ const __default__ = {
     let nauticalMileUnit = props.settingParams && props.settingParams.nauticalMileUnit || "nmi"; // 面积单位
 
     let areaUnit = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(props.settingParams && props.settingParams.areaUnit || "");
-    let result = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)("0");
+    let result = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(0);
     let language = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)({});
     let mode = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)("space");
     let modeList = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)([]);
@@ -687,7 +704,10 @@ const __default__ = {
               }
             } else if (measureType.value === "azimuth" && res) {
               if (res.positions && res.positions.length > 0) {
-                result.value = res.azimuth.toFixed(4) + " °";
+                result.value = {
+                  azimuth: res.azimuth.toFixed(4),
+                  distance: res.distance.toFixed(2)
+                };
               } else result.value = 0;
             } else if (measureType.value === "slope" && res) {
               if (res.positions && res.positions.length > 0) {
@@ -712,8 +732,6 @@ const __default__ = {
                   };
                 }
 
-                viewModel.stopMeasure();
-
                 if (res.measureResult && res.measureResult.labels && res.measureResult.labels.length > 0) {
                   res.measureResult.labels._labels.forEach(label => {
                     label.text = label.text.replace('X', language.value.longitude).replace('Y', language.value.latitude).replace('Z', language.value.elevation).replace(/\n/g, '°\n');
@@ -728,12 +746,52 @@ const __default__ = {
           });
           viewModel.activeEvent.addEventListener(function (active) {
             if (!active) {
-              isActive.value = null;
+              // isActive.value = null;
+              isTips.value = false;
+              if (result.value === 0) return;
               if (measureType.value === "height" && result.value.angle === 0) return;
               if (measureType.value === "azimuth" && result.value === 0) return;
               isResult.value = true;
             }
           });
+          let handler = new Cesium.ScreenSpaceEventHandler(scenceView._viewer.scene.canvas);
+          handler.setInputAction(function () {
+            if (!viewModel._measureHandler.active) return;
+            let isDrawing = viewModel._measureHandler.isDrawing;
+
+            if (!isDrawing) {
+              let measureResults = viewModel._measureHandler.measureResults;
+
+              if (measureResults && measureResults.length > 0) {
+                measureResults[0].destroy();
+              }
+
+              if (measureType.value === "coordinate") {
+                isTips.value = false;
+                isResult.value = true;
+              } else {
+                isTips.value = true;
+                isResult.value = false;
+              }
+            }
+
+            if (isDrawing) {
+              if (measureType.value !== 'distance' && measureType.value !== 'area') {
+                continueMeasure();
+              }
+            }
+          }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+          handler.setInputAction(function () {
+            let isDrawing = viewModel._measureHandler.isDrawing;
+
+            if (!isDrawing) {
+              isActive.value = null;
+              viewModel.stopMeasure();
+            } else {
+              continueMeasure();
+            }
+          }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+          window.measureClickHandler = handler;
         }
       });
     }); // 经纬度转度分秒
@@ -860,6 +918,11 @@ const __default__ = {
 
     (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.onBeforeUnmount)(() => {
       clearMeasure();
+
+      if (window.measureClickHandler) {
+        window.measureClickHandler.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
+        window.measureClickHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+      }
     }); //开始测量
 
     function startMeasure(type) {
@@ -884,6 +947,8 @@ const __default__ = {
       }
 
       viewModel.clear();
+      result.value = 0;
+      isTips.value = true;
       isResult.value = false;
       measureType.value = type;
       isActive.value = type;
@@ -922,6 +987,44 @@ const __default__ = {
           break;
       }
     }
+
+    function continueMeasure() {
+      setTimeout(() => {
+        switch (measureType.value) {
+          case "distance":
+            viewModel.distanceMeasure(mode.value);
+            break;
+
+          case "area":
+            viewModel.areaMeasure(mode.value);
+            break;
+
+          case "height":
+            viewModel.heightMeasure();
+            break;
+
+          case "coordinate":
+            viewModel.coordinateMeasure();
+            break;
+
+          case "azimuth":
+            viewModel.azimuthMeasure();
+            break;
+
+          case "slope":
+            if (mode.value === "ground") {
+              viewModel.terrainSlopeMeasure();
+            } else if (mode.value === "model") {
+              viewModel.sceneSlopeMeasure();
+            }
+
+            break;
+
+          default:
+            break;
+        }
+      }, 300);
+    }
     /**
      * 清除测量
      */
@@ -931,6 +1034,7 @@ const __default__ = {
       viewModel && viewModel.clear();
       measureType.value = null;
       isActive.value = null;
+      isTips.value = false;
       isResult.value = false;
     }
 
@@ -968,8 +1072,7 @@ const __default__ = {
       /* TEXT */
       ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_select, {
         modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(mode),
-        "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.isRef)(mode) ? mode.value = $event : mode = $event),
-        disabled: !!(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(isActive)
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.isRef)(mode) ? mode.value = $event : mode = $event)
       }, {
         default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(true), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)(external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.Fragment, null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.renderList)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(modeList), item => {
           return (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createBlock)(_component_kq_option, {
@@ -987,7 +1090,7 @@ const __default__ = {
 
       }, 8
       /* PROPS */
-      , ["modelValue", "disabled"])])]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_5, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
+      , ["modelValue"])])]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_5, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
         onClick: _cache[1] || (_cache[1] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withModifiers)($event => startMeasure('distance'), ["stop"])),
         class: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.normalizeClass)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(isActive) == 'distance' ? 'is-active' : null),
         title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).distance
@@ -1115,7 +1218,7 @@ const __default__ = {
 
       }, 8
       /* PROPS */
-      , ["onClick", "title"])]), !!(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(isActive) ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)("div", _hoisted_6, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_divider), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(measureType) === 'height' || (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(measureType) === 'azimuth' ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)("p", _hoisted_7, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).measureTips1), 1
+      , ["onClick", "title"])]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(isTips) ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)("div", _hoisted_6, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_divider), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(measureType) === 'height' || (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(measureType) === 'azimuth' ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)("p", _hoisted_7, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).measureTips1), 1
       /* TEXT */
       )) : ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)("p", _hoisted_8, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).measureTips), 1
       /* TEXT */
@@ -1195,9 +1298,17 @@ const __default__ = {
       /* TEXT */
       ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", _hoisted_30, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(result).height) + " m", 1
       /* TEXT */
-      )])) : ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)("div", _hoisted_31, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", _hoisted_32, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language)[(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(measureType)]), 1
+      )])) : (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(measureType) === 'azimuth' ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)("div", _hoisted_31, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", _hoisted_32, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).azimuth), 1
+      /* TEXT */
+      ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", _hoisted_33, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(result).azimuth) + " °", 1
+      /* TEXT */
+      ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", _hoisted_34, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).distance), 1
+      /* TEXT */
+      ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", _hoisted_35, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(result).distance) + " m", 1
+      /* TEXT */
+      )])) : ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)("div", _hoisted_36, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", _hoisted_37, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language)[(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(measureType)]), 1
       /* TEXT */
-      ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", _hoisted_33, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(result)), 1
+      ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", _hoisted_38, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(result)), 1
       /* TEXT */
       )]))])])])) : (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createCommentVNode)("v-if", true)])], 2
       /* CLASS */

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"4.3.4","homepage":"","keywords":["KQGIS","webGL","Vue"],"restrictedVersion":true,"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"1.1.1","echarts":"4.9.0","echarts-stat":"1.2.0","js-cookie":"3.0.1","omit.js":"2.0.2","save":"2.5.0","tinycolor2":"1.4.2","vue-i18n":"9.2.0-beta.36","xlsx":"0.18.5","@kq_npm/client_icons_vue":"0.7.9-beta","css-vars-ponyfill":"2.4.8","html2canvas":"1.4.1","xe-utils":"3.5.4"}}
+{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"4.3.6","homepage":"","keywords":["KQGIS","webGL","Vue"],"restrictedVersion":true,"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"1.1.1","echarts":"4.9.0","echarts-stat":"1.2.0","js-cookie":"3.0.1","omit.js":"2.0.2","save":"2.5.0","tinycolor2":"1.4.2","vue-i18n":"9.2.0-beta.36","xlsx":"0.18.5","@kq_npm/client_icons_vue":"0.7.9-beta","css-vars-ponyfill":"2.4.8","html2canvas":"1.4.1","xe-utils":"3.5.4"}}