@kq_npm/client3d_webgl_vue 3.1.7-beta → 3.1.8-beta

package/index.js

@@ -4166,6 +4166,8 @@ class MeasureViewModel {
   //测量事件
   //活动事件
   constructor(viewer) {
+    _defineProperty(this, "_viewer", null);
+
     _defineProperty(this, "_measureHandler", null);
 
     _defineProperty(this, "measureEvent", null);
@@ -4175,6 +4177,7 @@ class MeasureViewModel {
     //开启深度检测
     viewer.scene.globe.depthTestAgainstTerrain = true;
     this._measureHandler = new Cesium.Kq3dMeasureHandler(viewer);
+    this._viewer = viewer;
     this.measureEvent = this._measureHandler.measureEvent;
     this.activeEvent = this._measureHandler.activeEvent;
   } //距离测量
@@ -4266,6 +4269,26 @@ class MeasureViewModel {
     }
 
     return newValue;
+  } // 判断是否加载地形
+
+
+  checkTerrainAdded() {
+    return this._viewer.terrainProvider.availability;
+  } // 判断是否加载模型
+
+
+  checkModelAdded() {
+    let isAdd = false;
+    let models = this._viewer.scene.primitives._primitives;
+
+    for (let i = 0; i < models.length; i++) {
+      if (models[i] instanceof Cesium.Cesium3DTileset) {
+        isAdd = true;
+        break;
+      }
+    }
+
+    return isAdd;
   } //清除全部测量结果
 
 
@@ -4396,6 +4419,7 @@ const _hoisted_33 = {
 
 
 
+
 const Measurevue_type_script_setup_true_lang_js_default_ = {
   name: "Kq3dMeasure"
 };
@@ -4629,6 +4653,26 @@ const Measurevue_type_script_setup_true_lang_js_default_ = {
     }); //开始测量
 
     function startMeasure(type) {
+      if (mode.value === "ground") {
+        if (!viewModel.checkTerrainAdded()) {
+          message({
+            message: "请先加载地形!",
+            type: "warning"
+          });
+          return;
+        }
+      }
+
+      if (mode.value === "model") {
+        if (!viewModel.checkModelAdded()) {
+          message({
+            message: "请先加载模型!",
+            type: "warning"
+          });
+          return;
+        }
+      }
+
       viewModel.clear();
       isResult.value = false;
       measureType.value = type;
@@ -11502,9 +11546,6 @@ const TerrainOperationvue_type_script_setup_true_lang_js_hoisted_2 = {
   class: "kq3d-terrain-operation-analysis-span"
 };
 const TerrainOperationvue_type_script_setup_true_lang_js_hoisted_3 = {
-  key: 0
-};
-const TerrainOperationvue_type_script_setup_true_lang_js_hoisted_4 = {
   class: "kq3d-terrain-operation-analysis-footer"
 };
 
@@ -11573,8 +11614,8 @@ const TerrainOperationvue_type_script_setup_true_lang_js_default_ = {
     let language = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)({}); // 获取组件传参
 
     let formItem = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.reactive)({
-      terrainStyle: props.settingParams && props.settingParams.terrainStyle || 0,
-      // 地形操作类型。0:地形开挖;1:地形修改
+      terrainStyle: props.settingParams && props.settingParams.terrainStyle || 1,
+      // 地形操作类型。1:地形开挖;2:地形修改
       excavationDepth: props.settingParams && props.settingParams.excavationDepth || 500,
       // 地形开挖深度
       minExcavationDepth: props.settingParams && props.settingParams.minExcavationDepth || 0,
@@ -11777,13 +11818,11 @@ const TerrainOperationvue_type_script_setup_true_lang_js_default_ = {
       }, {
         default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("p", null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).skylineTips), 1
         /* TEXT */
-        ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).terrainStyle === 2 ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementBlock)("p", TerrainOperationvue_type_script_setup_true_lang_js_hoisted_3, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.toDisplayString)("(" + (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).reverseDrawPolygon + ")"), 1
-        /* TEXT */
-        )) : (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createCommentVNode)("v-if", true)]),
+        ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createCommentVNode)(" <p v-if=\"formItem.terrainStyle === 2\">{{ \"(\" + language.reverseDrawPolygon + \")\" }}</p> ")]),
         _: 1
         /* STABLE */
 
-      }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", TerrainOperationvue_type_script_setup_true_lang_js_hoisted_4, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_button, {
+      }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", TerrainOperationvue_type_script_setup_true_lang_js_hoisted_3, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_button, {
         onClick: _cache[7] || (_cache[7] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withModifiers)($event => startOperation(), ["stop"])),
         title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).startOperation,
         type: "primary"

package/measure/index.js

@@ -2,6 +2,33 @@
 /******/ 	"use strict";
 /******/ 	var __webpack_modules__ = ({
 
+/***/ 909:
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+
+// EXPORTS
+__webpack_require__.d(__webpack_exports__, {
+  "Z": function() { return /* binding */ message; }
+});
+
+;// CONCATENATED MODULE: external "element-plus/es"
+var es_namespaceObject = require("element-plus/es");
+// EXTERNAL MODULE: external "@kq_npm/client_common_vue/init.js"
+var init_js_ = __webpack_require__(5406);
+var init_js_default = /*#__PURE__*/__webpack_require__.n(init_js_);
+;// CONCATENATED MODULE: ./src/common/_ui/message/index.js
+
+
+
+es_namespaceObject.ElMessage.install = (Vue, opts) => {
+  init_js_default()(Vue, opts);
+  Vue.component("KqMessage", es_namespaceObject.ElMessage);
+};
+
+/* harmony default export */ var message = (es_namespaceObject.ElMessage);
+
+/***/ }),
+
 /***/ 193:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
@@ -16,6 +43,8 @@ class MeasureViewModel {
   //测量事件
   //活动事件
   constructor(viewer) {
+    (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_viewer", null);
+
     (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_measureHandler", null);
 
     (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "measureEvent", null);
@@ -25,6 +54,7 @@ class MeasureViewModel {
     //开启深度检测
     viewer.scene.globe.depthTestAgainstTerrain = true;
     this._measureHandler = new Cesium.Kq3dMeasureHandler(viewer);
+    this._viewer = viewer;
     this.measureEvent = this._measureHandler.measureEvent;
     this.activeEvent = this._measureHandler.activeEvent;
   } //距离测量
@@ -116,6 +146,26 @@ class MeasureViewModel {
     }
 
     return newValue;
+  } // 判断是否加载地形
+
+
+  checkTerrainAdded() {
+    return this._viewer.terrainProvider.availability;
+  } // 判断是否加载模型
+
+
+  checkModelAdded() {
+    let isAdd = false;
+    let models = this._viewer.scene.primitives._primitives;
+
+    for (let i = 0; i < models.length; i++) {
+      if (models[i] instanceof Cesium.Cesium3DTileset) {
+        isAdd = true;
+        break;
+      }
+    }
+
+    return isAdd;
   } //清除全部测量结果
 
 
@@ -290,6 +340,8 @@ var gis_utils_ = __webpack_require__(826);
 var MeasureViewModel = __webpack_require__(193);
 // EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/util"
 var util_ = __webpack_require__(9519);
+// EXTERNAL MODULE: ./src/common/_ui/message/index.js + 1 modules
+var message = __webpack_require__(909);
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/measure/Measure.vue?vue&type=script&setup=true&lang=js
 
 const _hoisted_1 = {
@@ -406,6 +458,7 @@ const _hoisted_33 = {
 
 
 
+
 const __default__ = {
   name: "Kq3dMeasure"
 };
@@ -639,6 +692,26 @@ const __default__ = {
     }); //开始测量
 
     function startMeasure(type) {
+      if (mode.value === "ground") {
+        if (!viewModel.checkTerrainAdded()) {
+          (0,message/* default */.Z)({
+            message: "请先加载地形!",
+            type: "warning"
+          });
+          return;
+        }
+      }
+
+      if (mode.value === "model") {
+        if (!viewModel.checkModelAdded()) {
+          (0,message/* default */.Z)({
+            message: "请先加载模型!",
+            type: "warning"
+          });
+          return;
+        }
+      }
+
       viewModel.clear();
       isResult.value = false;
       measureType.value = type;

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"3.1.7-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"^1.1.1","echarts":"^5.3.3","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","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":"3.1.8-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"^1.1.1","echarts":"^5.3.3","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","css-vars-ponyfill":"^2.4.8","html2canvas":"^1.4.1","xe-utils":"^3.5.4"}}

package/scenceview/index.js

@@ -11367,6 +11367,8 @@ class MeasureViewModel {
   //测量事件
   //活动事件
   constructor(viewer) {
+    (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_viewer", null);
+
     (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_measureHandler", null);
 
     (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "measureEvent", null);
@@ -11376,6 +11378,7 @@ class MeasureViewModel {
     //开启深度检测
     viewer.scene.globe.depthTestAgainstTerrain = true;
     this._measureHandler = new Cesium.Kq3dMeasureHandler(viewer);
+    this._viewer = viewer;
     this.measureEvent = this._measureHandler.measureEvent;
     this.activeEvent = this._measureHandler.activeEvent;
   } //距离测量
@@ -11467,6 +11470,26 @@ class MeasureViewModel {
     }
 
     return newValue;
+  } // 判断是否加载地形
+
+
+  checkTerrainAdded() {
+    return this._viewer.terrainProvider.availability;
+  } // 判断是否加载模型
+
+
+  checkModelAdded() {
+    let isAdd = false;
+    let models = this._viewer.scene.primitives._primitives;
+
+    for (let i = 0; i < models.length; i++) {
+      if (models[i] instanceof Cesium.Cesium3DTileset) {
+        isAdd = true;
+        break;
+      }
+    }
+
+    return isAdd;
   } //清除全部测量结果
 
 
@@ -11507,6 +11530,8 @@ var gis_utils_ = __webpack_require__(826);
 var MeasureViewModel = __webpack_require__(193);
 // EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/util"
 var util_ = __webpack_require__(9519);
+// EXTERNAL MODULE: ./src/common/_ui/message/index.js + 1 modules
+var message = __webpack_require__(909);
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/measure/Measure.vue?vue&type=script&setup=true&lang=js
 
 const _hoisted_1 = {
@@ -11623,6 +11648,7 @@ const _hoisted_33 = {
 
 
 
+
 const __default__ = {
   name: "Kq3dMeasure"
 };
@@ -11856,6 +11882,26 @@ const __default__ = {
     }); //开始测量
 
     function startMeasure(type) {
+      if (mode.value === "ground") {
+        if (!viewModel.checkTerrainAdded()) {
+          (0,message/* default */.Z)({
+            message: "请先加载地形!",
+            type: "warning"
+          });
+          return;
+        }
+      }
+
+      if (mode.value === "model") {
+        if (!viewModel.checkModelAdded()) {
+          (0,message/* default */.Z)({
+            message: "请先加载模型!",
+            type: "warning"
+          });
+          return;
+        }
+      }
+
       viewModel.clear();
       isResult.value = false;
       measureType.value = type;
@@ -20831,9 +20877,6 @@ const _hoisted_2 = {
   class: "kq3d-terrain-operation-analysis-span"
 };
 const _hoisted_3 = {
-  key: 0
-};
-const _hoisted_4 = {
   class: "kq3d-terrain-operation-analysis-footer"
 };
 
@@ -20902,8 +20945,8 @@ const __default__ = {
     let language = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)({}); // 获取组件传参
 
     let formItem = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.reactive)({
-      terrainStyle: props.settingParams && props.settingParams.terrainStyle || 0,
-      // 地形操作类型。0:地形开挖;1:地形修改
+      terrainStyle: props.settingParams && props.settingParams.terrainStyle || 1,
+      // 地形操作类型。1:地形开挖;2:地形修改
       excavationDepth: props.settingParams && props.settingParams.excavationDepth || 500,
       // 地形开挖深度
       minExcavationDepth: props.settingParams && props.settingParams.minExcavationDepth || 0,
@@ -21106,13 +21149,11 @@ const __default__ = {
       }, {
         default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).skylineTips), 1
         /* TEXT */
-        ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(formItem).terrainStyle === 2 ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)("p", _hoisted_3, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)("(" + (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).reverseDrawPolygon + ")"), 1
-        /* TEXT */
-        )) : (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createCommentVNode)("v-if", true)]),
+        ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createCommentVNode)(" <p v-if=\"formItem.terrainStyle === 2\">{{ \"(\" + language.reverseDrawPolygon + \")\" }}</p> ")]),
         _: 1
         /* STABLE */
 
-      }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_4, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
+      }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_3, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
         onClick: _cache[7] || (_cache[7] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withModifiers)($event => startOperation(), ["stop"])),
         title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).startOperation,
         type: "primary"

package/terrainoperation/index.js

@@ -374,9 +374,6 @@ const _hoisted_2 = {
   class: "kq3d-terrain-operation-analysis-span"
 };
 const _hoisted_3 = {
-  key: 0
-};
-const _hoisted_4 = {
   class: "kq3d-terrain-operation-analysis-footer"
 };
 
@@ -445,8 +442,8 @@ const __default__ = {
     let language = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)({}); // 获取组件传参
 
     let formItem = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.reactive)({
-      terrainStyle: props.settingParams && props.settingParams.terrainStyle || 0,
-      // 地形操作类型。0:地形开挖;1:地形修改
+      terrainStyle: props.settingParams && props.settingParams.terrainStyle || 1,
+      // 地形操作类型。1:地形开挖;2:地形修改
       excavationDepth: props.settingParams && props.settingParams.excavationDepth || 500,
       // 地形开挖深度
       minExcavationDepth: props.settingParams && props.settingParams.minExcavationDepth || 0,
@@ -649,13 +646,11 @@ const __default__ = {
       }, {
         default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).skylineTips), 1
         /* TEXT */
-        ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(formItem).terrainStyle === 2 ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)("p", _hoisted_3, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)("(" + (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).reverseDrawPolygon + ")"), 1
-        /* TEXT */
-        )) : (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createCommentVNode)("v-if", true)]),
+        ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createCommentVNode)(" <p v-if=\"formItem.terrainStyle === 2\">{{ \"(\" + language.reverseDrawPolygon + \")\" }}</p> ")]),
         _: 1
         /* STABLE */
 
-      }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_4, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
+      }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_3, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
         onClick: _cache[7] || (_cache[7] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withModifiers)($event => startOperation(), ["stop"])),
         title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).startOperation,
         type: "primary"