@kq_npm/client3d_webgl_vue 3.2.5-beta → 3.2.7-beta

package/isolineanalysis/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);
+
+/***/ }),
+
 /***/ 348:
 /***/ (function(module) {
 
@@ -155,10 +182,13 @@ var gis_utils_ = __webpack_require__(826);
 var defineProperty = __webpack_require__(8270);
 // EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
 var const_image_ = __webpack_require__(9702);
+// EXTERNAL MODULE: ./src/common/_ui/message/index.js + 1 modules
+var message = __webpack_require__(909);
 ;// CONCATENATED MODULE: ./src/webgl/isolineanalysis/IsolineAnalysisViewModel.js
 
  //等值线分析逻辑类
 
+
 class IsolineAnalysisViewModel {
   //等值线分析三维对象
   //等高面高度区间
@@ -375,7 +405,10 @@ class IsolineAnalysisViewModel {
         clampToGround: true
       });
     } else {
-      throw "请加载地形后分析!";
+      (0,message/* default */.Z)({
+        message: "请添加模型后分析!",
+        type: "warning"
+      });
     }
   } //清除全部结果
 

package/modelselect/index.js

@@ -2,129 +2,30 @@
 /******/ 	"use strict";
 /******/ 	var __webpack_modules__ = ({
 
-/***/ 5394:
+/***/ 909:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "Z": function() { return /* binding */ ModelSelectViewModel; }
-/* harmony export */ });
-/* harmony import */ var _Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8270);
-
-//模型拾取逻辑类
-class ModelSelectViewModel {
-  //三维viewer对象
-  //屏幕空间事件处理程序三维对象
-  //拾取状态
-  //高亮三维对象
-  //高亮颜色
-  constructor(scenceView, pickCallFunc) {
-    (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, "_handler", null);
-
-    (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_isPick", false);
-
-    (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_highlight", null);
-
-    (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_highlightColor", "#FF0000");
-
-    this._viewer = scenceView._viewer;
-    this._drawManager = scenceView._drawManager;
-    this._handler = new Cesium.ScreenSpaceEventHandler(this._viewer.scene.canvas);
-    let that = this;
-
-    this._handler.setInputAction(function (movement) {
-      if (that._isPick) {
-        that.clearHighlight();
-
-        let pickedObject = that._viewer.scene.pick(movement.position); // console.log(pickedObject);
-
-
-        if (pickedObject) {
-          if (pickedObject instanceof Cesium.Cesium3DTileFeature) {
-            let properties = pickedObject.getPropertyNames() || []; // console.log(properties);
-
-            that._highlight = {
-              object: pickedObject.pickId.object,
-              color: pickedObject.pickId.object.color
-            };
-            pickedObject.pickId.object.color = Cesium.Color.fromCssColorString(that._highlightColor);
-            let attrs = {};
-            properties.forEach(prop => {
-              attrs[prop] = pickedObject.getProperty(prop);
-            });
-            pickCallFunc && pickCallFunc(pickedObject.tileset.name || "LayerName", attrs); // if (properties.indexOf(that._modeFiled) > -1) {
-            //   let id = pickedObject.getProperty(that._modeFiled);
-            //   // that.clear();
-            //   that._highlight = new Cesium.Kq3dHighlight({
-            //     viewer: that._viewer,
-            //     tileset: pickedObject.tileset,
-            //     attrName: that._modeFiled,
-            //     attrValue: [id],
-            //     color: [Cesium.Color.RED]
-            //   });
-            //   let attrs = {};
-            //   properties.forEach(prop => {
-            //     attrs[prop] = pickedObject.getProperty(prop);
-            //   });
-            //   pickCallFunc && pickCallFunc(pickedObject.tileset.name || "LayerName", attrs);
-            // } else {
-            //   console.log("Feature has no id attribute!");
-            // }
-          }
-        }
-      }
-    }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
-  }
-
-  setCursor(style) {
-    this._viewer.canvas.style.cursor = style;
-  } //拾取
-
-
-  pick() {
-    // 判断是否添加了模型
-    var flag = false;
-    var models = this._viewer.scene.primitives._primitives;
-
-    for (let i = 0; i < models.length; i++) {
-      if (models[i]._url) {
-        flag = true;
-      }
-    }
-
-    if (flag) {
-      this.setCursor("crosshair");
-      this._isPick = true;
-    } else {
-      throw "请添加模型后拾取!";
-    }
-  }
-
-  clearHighlight() {
-    if (this._highlight) {
-      this._highlight.object.color = this._highlight.color;
-    }
-
-    this._highlight = null;
-  } //清除
 
+// EXPORTS
+__webpack_require__.d(__webpack_exports__, {
+  "Z": function() { return /* binding */ message; }
+});
 
-  clear() {
-    this.clearHighlight(); // this._highlight && this._highlight.remove();
-    // this._highlight = null;
+;// 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
 
-    this.setCursor("default");
-    this._isPick = false;
-  } //销毁
 
 
-  destroy() {
-    this.clear();
-    this._handler && this._handler.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
-  }
+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);
 
 /***/ }),
 
@@ -262,7 +163,7 @@ __webpack_require__.r(__webpack_exports__);
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
-  "ModelSelectViewModel": function() { return /* reexport */ ModelSelectViewModel/* default */.Z; },
+  "ModelSelectViewModel": function() { return /* reexport */ ModelSelectViewModel; },
   "default": function() { return /* reexport */ ModelSelect; }
 });
 
@@ -270,8 +171,131 @@ __webpack_require__.d(__webpack_exports__, {
 var external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_ = __webpack_require__(637);
 // EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/gis-utils"
 var gis_utils_ = __webpack_require__(826);
-// EXTERNAL MODULE: ./src/webgl/modelselect/ModelSelectViewModel.js
-var ModelSelectViewModel = __webpack_require__(5394);
+// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/defineProperty.js
+var defineProperty = __webpack_require__(8270);
+// EXTERNAL MODULE: ./src/common/_ui/message/index.js + 1 modules
+var message = __webpack_require__(909);
+;// CONCATENATED MODULE: ./src/webgl/modelselect/ModelSelectViewModel.js
+
+//模型拾取逻辑类
+
+class ModelSelectViewModel {
+  //三维viewer对象
+  //屏幕空间事件处理程序三维对象
+  //拾取状态
+  //高亮三维对象
+  //高亮颜色
+  constructor(scenceView, pickCallFunc) {
+    (0,defineProperty/* default */.Z)(this, "_viewer", null);
+
+    (0,defineProperty/* default */.Z)(this, "_handler", null);
+
+    (0,defineProperty/* default */.Z)(this, "_isPick", false);
+
+    (0,defineProperty/* default */.Z)(this, "_highlight", null);
+
+    (0,defineProperty/* default */.Z)(this, "_highlightColor", "#FF0000");
+
+    this._viewer = scenceView._viewer;
+    this._drawManager = scenceView._drawManager;
+    this._handler = new Cesium.ScreenSpaceEventHandler(this._viewer.scene.canvas);
+    let that = this;
+
+    this._handler.setInputAction(function (movement) {
+      if (that._isPick) {
+        that.clearHighlight();
+
+        let pickedObject = that._viewer.scene.pick(movement.position); // console.log(pickedObject);
+
+
+        if (pickedObject) {
+          if (pickedObject instanceof Cesium.Cesium3DTileFeature) {
+            let properties = pickedObject.getPropertyNames() || []; // console.log(properties);
+
+            that._highlight = {
+              object: pickedObject.pickId.object,
+              color: pickedObject.pickId.object.color
+            };
+            pickedObject.pickId.object.color = Cesium.Color.fromCssColorString(that._highlightColor);
+            let attrs = {};
+            properties.forEach(prop => {
+              attrs[prop] = pickedObject.getProperty(prop);
+            });
+            pickCallFunc && pickCallFunc(pickedObject.tileset.name || "LayerName", attrs); // if (properties.indexOf(that._modeFiled) > -1) {
+            //   let id = pickedObject.getProperty(that._modeFiled);
+            //   // that.clear();
+            //   that._highlight = new Cesium.Kq3dHighlight({
+            //     viewer: that._viewer,
+            //     tileset: pickedObject.tileset,
+            //     attrName: that._modeFiled,
+            //     attrValue: [id],
+            //     color: [Cesium.Color.RED]
+            //   });
+            //   let attrs = {};
+            //   properties.forEach(prop => {
+            //     attrs[prop] = pickedObject.getProperty(prop);
+            //   });
+            //   pickCallFunc && pickCallFunc(pickedObject.tileset.name || "LayerName", attrs);
+            // } else {
+            //   console.log("Feature has no id attribute!");
+            // }
+          }
+        }
+      }
+    }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+  }
+
+  setCursor(style) {
+    this._viewer.canvas.style.cursor = style;
+  } //拾取
+
+
+  pick() {
+    // 判断是否添加了模型
+    var flag = false;
+    var models = this._viewer.scene.primitives._primitives;
+
+    for (let i = 0; i < models.length; i++) {
+      if (models[i]._url) {
+        flag = true;
+      }
+    }
+
+    if (flag) {
+      this.setCursor("crosshair");
+      this._isPick = true;
+    } else {
+      (0,message/* default */.Z)({
+        message: "请添加模型后拾取!",
+        type: "warning"
+      });
+    }
+  }
+
+  clearHighlight() {
+    if (this._highlight) {
+      this._highlight.object.color = this._highlight.color;
+    }
+
+    this._highlight = null;
+  } //清除
+
+
+  clear() {
+    this.clearHighlight(); // this._highlight && this._highlight.remove();
+    // this._highlight = null;
+
+    this.setCursor("default");
+    this._isPick = false;
+  } //销毁
+
+
+  destroy() {
+    this.clear();
+    this._handler && this._handler.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
+  }
+
+}
 // EXTERNAL MODULE: external "@kq_npm/client_icons_vue"
 var client_icons_vue_ = __webpack_require__(348);
 // EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/util"
@@ -388,7 +412,7 @@ const __default__ = {
       gis_utils_.utils.getWebMap(null, scenceView => {
         if (scenceView) {
           language.value = scenceView._language;
-          viewModel = new ModelSelectViewModel/* default */.Z(scenceView, pickCallFunc);
+          viewModel = new ModelSelectViewModel(scenceView, pickCallFunc);
           viewModel._highlightColor = props.highlightColor;
         }
       });

package/modelselect/style/modelselect.css

@@ -1 +1 @@
-.kq3d-model-select{z-index:999;border-radius:var(--kq-border-radius-base);padding:16px;pointer-events:auto;cursor:default;background-color:var(--kq-bg-color)}.kq3d-model-select .kq3d-model-select-box{height:calc(100% - 35px)}.kq3d-model-select .kq3d-model-select-box .title span{font-weight:700;color:var(--kq-text-color-primary)}.kq3d-model-select .modelTable{width:100%;height:calc(100% - 70px);background-color:var(--kq-bg-color);pointer-events:auto}.kq3d-model-select .kq-row{margin-bottom:8px}.kq3d-model-select .footer-buttons{text-align:right}
+.kq3d-model-select{z-index:999;border-radius:var(--kq-border-radius-base);padding:16px;pointer-events:auto;cursor:default;width:300px;height:400px;background-color:var(--kq-bg-color)}.kq3d-model-select .kq3d-model-select-box{height:calc(100% - 35px)}.kq3d-model-select .kq3d-model-select-box .title span{font-weight:700;color:var(--kq-text-color-primary)}.kq3d-model-select .modelTable{width:100%;height:calc(100% - 70px);background-color:var(--kq-bg-color);pointer-events:auto}.kq3d-model-select .kq-row{margin-bottom:8px}.kq3d-model-select .footer-buttons{text-align:right}

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"3.2.5-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.2.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"}}