@kq_npm/client3d_webgl_vue 0.1.2-beta → 0.1.4-beta

package/boxclip/index.js

@@ -393,7 +393,8 @@ const __default__ = {
 
 
     function clip() {
-      this.clearResult();
+      // this.clearResult();
+      viewModel && viewModel.clear();
       viewModel && viewModel.start();
     } // 清除
 

package/excavatefillanalysis/index.js

@@ -281,7 +281,9 @@ const __default__ = {
     }); //开始分析
 
     function startAnalysis() {
-      this.clearResult();
+      // this.clearResult();
+      showResult.value = false;
+      viewModel && viewModel.clear();
       viewModel && viewModel.start();
     } //清除结果
 

package/index.js

@@ -363,14 +363,6 @@ module.exports = function (list, options) {
   };
 };
 
-/***/ }),
-
-/***/ 159:
-/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
-
-__webpack_require__.r(__webpack_exports__);
-/* harmony default export */ __webpack_exports__["default"] = ("data:image/png;base64,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");
-
 /***/ })
 
 /******/ 	});
@@ -534,13 +526,19 @@ function _defineProperty(obj, key, value) {
 ;// CONCATENATED MODULE: external "@kq_npm/client_common_vue/_utils/mitt"
 var mitt_namespaceObject = require("@kq_npm/client_common_vue/_utils/mitt");
 var mitt_default = /*#__PURE__*/__webpack_require__.n(mitt_namespaceObject);
+;// CONCATENATED MODULE: external "core-js/modules/web.dom-exception.stack.js"
+var web_dom_exception_stack_js_namespaceObject = require("core-js/modules/web.dom-exception.stack.js");
 ;// CONCATENATED MODULE: external "core-js/modules/es.array.includes.js"
 var es_array_includes_js_namespaceObject = require("core-js/modules/es.array.includes.js");
 ;// CONCATENATED MODULE: external "@turf/turf"
 var turf_namespaceObject = require("@turf/turf");
+;// CONCATENATED MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
+var const_image_namespaceObject = require("@kq_npm/client_common_vue/_utils/const-image");
 ;// CONCATENATED MODULE: ./src/webgl/scenceview/DrawManager.js
 
 
+
+
  //绘制操作类
 
 class DrawManager {
@@ -584,7 +582,7 @@ class DrawManager {
       },
       //点-图标样式
       marker: {
-        image: __webpack_require__(159),
+        image: const_image_namespaceObject.MARKER_URL,
         //图标路径
         width: 32,
         //图标宽度
@@ -635,21 +633,25 @@ class DrawManager {
         font: "25px 微软雅黑"
       },
       billboard: {
-        image: __webpack_require__(159),
+        image: const_image_namespaceObject.MARKER_URL,
         width: 32,
         height: 32
       },
       polyline: {
         color: "#ff0000",
         opacity: 1.0,
-        width: 2
+        width: 2,
+        dash: false
       },
       polygon: {
         color: "#0000ff",
         opacity: 0.3,
         outline: true,
         outlineColor: "#ff0000",
-        perPositionHeight: true
+        outlineWidth: 1,
+        outlineDash: false,
+        fill: false,
+        fillStyle: null
       }
     });
 
@@ -688,6 +690,45 @@ class DrawManager {
     this._drawStyle.freehandpolygon = this._drawStyle.polygon; //手绘面
 
     this._drawStyle.rectangle = this._drawStyle.polygon; //矩形
+  }
+
+  getFillStyle(fillStyle) {
+    let lineColor = fillStyle.lineColor || "rgba(0, 0, 255, 1)";
+    let lineWidth = fillStyle.lineWidth || "2px";
+    let style = "stroke-linecap: square;stroke-linejoin: miter;overflow: inherit;stroke: " + lineColor + ";stroke-width: " + lineWidth + ";";
+    let width = 10;
+    let height = 10;
+    let lineType = "left";
+
+    if (fillStyle.lineSpacing !== undefined) {
+      width = height = fillStyle.lineSpacing;
+    }
+
+    if (fillStyle.lineType !== undefined) {
+      lineType = fillStyle.lineType;
+    }
+
+    let svgLine = "";
+
+    if (lineType === "left") {
+      svgLine = '<line x1="' + width / 2 + '" y1="' + 0 + '" x2="' + width / 2 + '" y2="' + height + '" style="' + style + '"></line>';
+    } else if (lineType === "right") {
+      svgLine = '<line x1="' + 0 + '" y1="' + height / 2 + '" x2="' + width + '" y2="' + height / 2 + '" style="' + style + '"></line>';
+    } else {
+      svgLine = '<line x1="' + width / 2 + '" y1="' + 0 + '" x2="' + width / 2 + '" y2="' + height + '" style="' + style + '"></line>';
+      svgLine += '<line x1="' + 0 + '" y1="' + height / 2 + '" x2="' + width + '" y2="' + height / 2 + '" style="' + style + '"></line>';
+    }
+
+    let svgStr = '<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" width="' + width + '" height="' + height + '" style="overflow: inherit;">' + svgLine + "</svg>";
+    let imgUrl = "data:image/svg+xml;base64," + window.btoa(svgStr) + "";
+    var myImage = new Image(width, height);
+    myImage.src = imgUrl;
+    let material = new Cesium.ImageMaterialProperty({
+      image: myImage,
+      repeat: new Cesium.Cartesian2(15, 15),
+      transparent: true
+    });
+    return material;
   } //开始绘制
 
 
@@ -850,12 +891,37 @@ class DrawManager {
       if (style[type].hasOwnProperty("pixelOffset")) {
         style[type].pixelOffset = new Cesium.Cartesian2(style[type].pixelOffset[0], style[type].pixelOffset[1]);
       }
+
+      if (type === "polyline" && style.polyline.dash) {
+        style.polyline.material = new Cesium.PolylineDashMaterialProperty({
+          color: style.polyline.material
+        });
+      }
+
+      if (type === "polygon" && style.polygon.fill && style.polygon.fillStyle) {
+        style.polygon.material = this.getFillStyle(style.polygon.fillStyle);
+      }
     }
 
     this._viewer.scene.globe.depthTestAgainstTerrain = false;
     let geojsonDs = new Cesium.Kq3dGeoJsonDataSource(idCustom);
     let that = this;
     geojsonDs.load(geojsonData, style).then(ds => {
+      if (style.polygon.outline && style.polygon.outlineDash) {
+        ds.entities.values.forEach(entity => {
+          if (entity.polygon) {
+            entity.polygon.outline = false;
+            entity.polyline = {
+              positions: entity.polygon.hierarchy._value.positions,
+              width: style.polygon.outlineWidth,
+              material: style.polygon.outlineDash ? new Cesium.PolylineDashMaterialProperty({
+                color: style.polygon.outlineColor
+              }) : style.polygon.outlineColor
+            };
+          }
+        });
+      }
+
       that._viewer.dataSources.add(ds);
 
       if (!that._layerGroup.includes(idCustom)) {
@@ -2083,7 +2149,9 @@ const __default__ = {
     }
   },
 
-  setup(__props) {
+  setup(__props, {
+    expose
+  }) {
     const props = __props;
     const {
       proxy
@@ -2138,6 +2206,12 @@ const __default__ = {
       viewModel && viewModel.resetOrientation();
     }
 
+    expose({
+      zoomIn,
+      zoomOut,
+      resetView,
+      resetOrientation
+    });
     return (_ctx, _cache) => {
       const _component_kq_icon = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-icon");
 
@@ -2325,8 +2399,6 @@ class BaseterrainGalleryViewModel {
   }
 
 }
-;// CONCATENATED MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
-var const_image_namespaceObject = require("@kq_npm/client_common_vue/_utils/const-image");
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/baseterraingallery/BaseterrainGallery.vue?vue&type=script&setup=true&lang=js
 
 const BaseterrainGalleryvue_type_script_setup_true_lang_js_hoisted_1 = {
@@ -6552,7 +6624,8 @@ const ShadowAnalysisvue_type_script_setup_true_lang_js_default_ = {
 
 
     function startAnalysis() {
-      this.clearResult();
+      // this.clearResult();
+      viewModel && viewModel.clear();
       viewModel && viewModel.start();
     } // 日照效果
 
@@ -7355,6 +7428,8 @@ class ProfileAnalysisViewModel {
 
 
   destroy() {
+    this.remove();
+
     this._globaOptions._handler.removeInputAction(window.Cesium.ScreenSpaceEventType.LEFT_CLICK);
 
     this._globaOptions._handler = null;
@@ -9134,7 +9209,9 @@ const ExcavateFillAnalysisvue_type_script_setup_true_lang_js_default_ = {
     }); //开始分析
 
     function startAnalysis() {
-      this.clearResult();
+      // this.clearResult();
+      showResult.value = false;
+      viewModel && viewModel.clear();
       viewModel && viewModel.start();
     } //清除结果
 
@@ -13925,7 +14002,8 @@ const BoxClipvue_type_script_setup_true_lang_js_default_ = {
 
 
     function clip() {
-      this.clearResult();
+      // this.clearResult();
+      viewModel && viewModel.clear();
       viewModel && viewModel.start();
     } // 清除
 
@@ -16848,7 +16926,7 @@ const ParticleEffectvue_type_script_setup_true_lang_js_default_ = {
 
     function changeMode(mode) {
       if (formItem.mode !== mode) {
-        this.clear();
+        viewModel && viewModel.clear();
         formItem.mode = mode;
 
         if (mode === "flame") {
@@ -17785,7 +17863,7 @@ const WeatherEffectvue_type_script_setup_true_lang_js_default_ = {
 
     function changeMode(mode) {
       if (formItem.mode !== mode) {
-        this.clear();
+        viewModel && viewModel.clear();
         formItem.mode = mode;
 
         if (mode === "rain") {

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"0.1.2-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","@turf/turf":"^6.5.0","css-vars-ponyfill":"^2.4.7","xe-utils":"^3.5.4"}}
+{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"0.1.4-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","@turf/turf":"^6.5.0","css-vars-ponyfill":"^2.4.7","xe-utils":"^3.5.4"}}

package/particleeffect/index.js

@@ -353,7 +353,7 @@ const __default__ = {
 
     function changeMode(mode) {
       if (formItem.mode !== mode) {
-        this.clear();
+        viewModel && viewModel.clear();
         formItem.mode = mode;
 
         if (mode === "flame") {

package/profileanalysis/index.js

@@ -312,6 +312,8 @@ class ProfileAnalysisViewModel {
 
 
   destroy() {
+    this.remove();
+
     this._globaOptions._handler.removeInputAction(window.Cesium.ScreenSpaceEventType.LEFT_CLICK);
 
     this._globaOptions._handler = null;

package/scenceview/index.js

@@ -1,40 +1,7 @@
 /******/ (function() { // webpackBootstrap
 /******/ 	"use strict";
-/******/ 	var __webpack_modules__ = ({
-
-/***/ 159:
-/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
-
-__webpack_require__.r(__webpack_exports__);
-/* harmony default export */ __webpack_exports__["default"] = ("data:image/png;base64,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");
-
-/***/ })
-
-/******/ 	});
-/************************************************************************/
-/******/ 	// The module cache
-/******/ 	var __webpack_module_cache__ = {};
-/******/ 	
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/ 		// Check if module is in cache
-/******/ 		var cachedModule = __webpack_module_cache__[moduleId];
-/******/ 		if (cachedModule !== undefined) {
-/******/ 			return cachedModule.exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = __webpack_module_cache__[moduleId] = {
-/******/ 			// no module.id needed
-/******/ 			// no module.loaded needed
-/******/ 			exports: {}
-/******/ 		};
-/******/ 	
-/******/ 		// Execute the module function
-/******/ 		__webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-/******/ 	
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
+/******/ 	// The require scope
+/******/ 	var __webpack_require__ = {};
 /******/ 	
 /************************************************************************/
 /******/ 	/* webpack/runtime/compat get default export */
@@ -79,8 +46,6 @@ __webpack_require__.r(__webpack_exports__);
 /******/ 	
 /************************************************************************/
 var __webpack_exports__ = {};
-// This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk.
-!function() {
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
@@ -114,13 +79,19 @@ function _defineProperty(obj, key, value) {
 ;// CONCATENATED MODULE: external "@kq_npm/client_common_vue/_utils/mitt"
 var mitt_namespaceObject = require("@kq_npm/client_common_vue/_utils/mitt");
 var mitt_default = /*#__PURE__*/__webpack_require__.n(mitt_namespaceObject);
+;// CONCATENATED MODULE: external "core-js/modules/web.dom-exception.stack.js"
+var web_dom_exception_stack_js_namespaceObject = require("core-js/modules/web.dom-exception.stack.js");
 ;// CONCATENATED MODULE: external "core-js/modules/es.array.includes.js"
 var es_array_includes_js_namespaceObject = require("core-js/modules/es.array.includes.js");
 ;// CONCATENATED MODULE: external "@turf/turf"
 var turf_namespaceObject = require("@turf/turf");
+;// CONCATENATED MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
+var const_image_namespaceObject = require("@kq_npm/client_common_vue/_utils/const-image");
 ;// CONCATENATED MODULE: ./src/webgl/scenceview/DrawManager.js
 
 
+
+
  //绘制操作类
 
 class DrawManager {
@@ -164,7 +135,7 @@ class DrawManager {
       },
       //点-图标样式
       marker: {
-        image: __webpack_require__(159),
+        image: const_image_namespaceObject.MARKER_URL,
         //图标路径
         width: 32,
         //图标宽度
@@ -215,21 +186,25 @@ class DrawManager {
         font: "25px 微软雅黑"
       },
       billboard: {
-        image: __webpack_require__(159),
+        image: const_image_namespaceObject.MARKER_URL,
         width: 32,
         height: 32
       },
       polyline: {
         color: "#ff0000",
         opacity: 1.0,
-        width: 2
+        width: 2,
+        dash: false
       },
       polygon: {
         color: "#0000ff",
         opacity: 0.3,
         outline: true,
         outlineColor: "#ff0000",
-        perPositionHeight: true
+        outlineWidth: 1,
+        outlineDash: false,
+        fill: false,
+        fillStyle: null
       }
     });
 
@@ -268,6 +243,45 @@ class DrawManager {
     this._drawStyle.freehandpolygon = this._drawStyle.polygon; //手绘面
 
     this._drawStyle.rectangle = this._drawStyle.polygon; //矩形
+  }
+
+  getFillStyle(fillStyle) {
+    let lineColor = fillStyle.lineColor || "rgba(0, 0, 255, 1)";
+    let lineWidth = fillStyle.lineWidth || "2px";
+    let style = "stroke-linecap: square;stroke-linejoin: miter;overflow: inherit;stroke: " + lineColor + ";stroke-width: " + lineWidth + ";";
+    let width = 10;
+    let height = 10;
+    let lineType = "left";
+
+    if (fillStyle.lineSpacing !== undefined) {
+      width = height = fillStyle.lineSpacing;
+    }
+
+    if (fillStyle.lineType !== undefined) {
+      lineType = fillStyle.lineType;
+    }
+
+    let svgLine = "";
+
+    if (lineType === "left") {
+      svgLine = '<line x1="' + width / 2 + '" y1="' + 0 + '" x2="' + width / 2 + '" y2="' + height + '" style="' + style + '"></line>';
+    } else if (lineType === "right") {
+      svgLine = '<line x1="' + 0 + '" y1="' + height / 2 + '" x2="' + width + '" y2="' + height / 2 + '" style="' + style + '"></line>';
+    } else {
+      svgLine = '<line x1="' + width / 2 + '" y1="' + 0 + '" x2="' + width / 2 + '" y2="' + height + '" style="' + style + '"></line>';
+      svgLine += '<line x1="' + 0 + '" y1="' + height / 2 + '" x2="' + width + '" y2="' + height / 2 + '" style="' + style + '"></line>';
+    }
+
+    let svgStr = '<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" width="' + width + '" height="' + height + '" style="overflow: inherit;">' + svgLine + "</svg>";
+    let imgUrl = "data:image/svg+xml;base64," + window.btoa(svgStr) + "";
+    var myImage = new Image(width, height);
+    myImage.src = imgUrl;
+    let material = new Cesium.ImageMaterialProperty({
+      image: myImage,
+      repeat: new Cesium.Cartesian2(15, 15),
+      transparent: true
+    });
+    return material;
   } //开始绘制
 
 
@@ -430,12 +444,37 @@ class DrawManager {
       if (style[type].hasOwnProperty("pixelOffset")) {
         style[type].pixelOffset = new Cesium.Cartesian2(style[type].pixelOffset[0], style[type].pixelOffset[1]);
       }
+
+      if (type === "polyline" && style.polyline.dash) {
+        style.polyline.material = new Cesium.PolylineDashMaterialProperty({
+          color: style.polyline.material
+        });
+      }
+
+      if (type === "polygon" && style.polygon.fill && style.polygon.fillStyle) {
+        style.polygon.material = this.getFillStyle(style.polygon.fillStyle);
+      }
     }
 
     this._viewer.scene.globe.depthTestAgainstTerrain = false;
     let geojsonDs = new Cesium.Kq3dGeoJsonDataSource(idCustom);
     let that = this;
     geojsonDs.load(geojsonData, style).then(ds => {
+      if (style.polygon.outline && style.polygon.outlineDash) {
+        ds.entities.values.forEach(entity => {
+          if (entity.polygon) {
+            entity.polygon.outline = false;
+            entity.polyline = {
+              positions: entity.polygon.hierarchy._value.positions,
+              width: style.polygon.outlineWidth,
+              material: style.polygon.outlineDash ? new Cesium.PolylineDashMaterialProperty({
+                color: style.polygon.outlineColor
+              }) : style.polygon.outlineColor
+            };
+          }
+        });
+      }
+
       that._viewer.dataSources.add(ds);
 
       if (!that._layerGroup.includes(idCustom)) {
@@ -1663,7 +1702,9 @@ const __default__ = {
     }
   },
 
-  setup(__props) {
+  setup(__props, {
+    expose
+  }) {
     const props = __props;
     const {
       proxy
@@ -1718,6 +1759,12 @@ const __default__ = {
       viewModel && viewModel.resetOrientation();
     }
 
+    expose({
+      zoomIn,
+      zoomOut,
+      resetView,
+      resetOrientation
+    });
     return (_ctx, _cache) => {
       const _component_kq_icon = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-icon");
 
@@ -1833,7 +1880,6 @@ ScenceView.install = (Vue, opts) => {
 };
 
 
-}();
 module.exports = __webpack_exports__;
 /******/ })()
 ;

package/shadowanalysis/index.js

@@ -469,7 +469,8 @@ const __default__ = {
 
 
     function startAnalysis() {
-      this.clearResult();
+      // this.clearResult();
+      viewModel && viewModel.clear();
       viewModel && viewModel.start();
     } // 日照效果
 

package/weathereffect/index.js

@@ -297,7 +297,7 @@ const __default__ = {
 
     function changeMode(mode) {
       if (formItem.mode !== mode) {
-        this.clear();
+        viewModel && viewModel.clear();
         formItem.mode = mode;
 
         if (mode === "rain") {