@kq_npm/client3d_webgl_vue 0.5.8-beta → 0.6.0-beta

package/boxclip/index.js

@@ -78,12 +78,18 @@ function _defineProperty(obj, key, value) {
 
 //Box裁剪逻辑类
 class BoxClipViewModel {
+  //三维viewer对象
+  //Box裁剪存储参数对象
+  //Box裁剪三维对象
+  //绘制管理对象
+  //绘制完成监听事件
   constructor(scenceView, options) {
     _defineProperty(this, "_viewer", null);
 
     _defineProperty(this, "_options", {});
 
     _defineProperty(this, "_defaultOptions", {
+      //默认参数对象
       clipTyp: 1,
       boxColor: Cesium.Color.fromCssColorString("#316882").withAlpha(0.4),
       clipEdgeWidth: 6.0,
@@ -110,8 +116,8 @@ class BoxClipViewModel {
     _defineProperty(this, "_removeEventListener", null);
 
     this._options = Object.assign({}, options, this._defaultOptions);
-    this._viewer = scenceView._viewer;
-    this._viewer.enabledFXAA = true;
+    this._viewer = scenceView._viewer; // this._viewer.enabledFXAA = true;
+
     this._options.viewer = this._viewer;
     this._drawManager = scenceView._drawManager;
     let that = this;
@@ -192,13 +198,8 @@ class BoxClipViewModel {
 
 
   setLayer(layerId) {
-    this._options.tileset = this.findLayerById(layerId);
     this.clear();
-
-    if (this._boxclipAnalysis) {
-      this._boxclipAnalysis = new Cesium.Kq3dBoxClip(this._options);
-    } //if (this._boxclipAnalysis) this._boxclipAnalysis.tileset = layer;
-
+    this._options.tileset = this.findLayerById(layerId);
   } // 设置裁剪方式,为true时，则为外部裁剪，否则为内部裁剪
 
 
@@ -408,8 +409,6 @@ const __default__ = {
 
 
     function clip() {
-      // this.clearResult();
-      viewModel && viewModel.clear();
       viewModel && viewModel.start();
     } // 清除
 
@@ -423,6 +422,8 @@ const __default__ = {
       viewModel && viewModel.destroy();
     });
     expose({
+      paramsChanged,
+      clip,
       clearResult
     });
     return (_ctx, _cache) => {

package/excavatefillanalysis/index.js

@@ -86,7 +86,7 @@ window.turf = turf_namespaceObject; //填挖方分析逻辑类
 class ExcavateFillAnalysisViewModel {
   //填挖方分析三维对象
   //绘制管理对象
-  //填挖方分析参数对象
+  //填挖方分析存储参数对象
   //绘制完成监听事件
   constructor(scenceView, options, callback) {
     _defineProperty(this, "_excavateFillAnalysis", null);

package/index.js

@@ -1115,6 +1115,7 @@ class LayerManager {
             }
 
             source.mapServerInfo = (0,util_namespaceObject.formatKQMapInfo)(mapInfo.result, serverUrl, serverName, token, null, true);
+            this._layerListData_old = this._layerListData_old.concat(source.mapServerInfo.layers_old);
           });
           sourcePromises.push(sourcePromise);
         }
@@ -1160,6 +1161,10 @@ class LayerManager {
               layerData.sourceLayers = source.mapServerInfo.layers_show;
             } else {
               layerData.url += "/" + layerData.renderType;
+
+              if (source.token) {
+                layerData.url += "?ua_token=" + source.token;
+              }
             }
           } else if (layerData.sourceType === "arcserver") {
             if (!layerData.renderType || layerData.renderType === "rest") {
@@ -1662,6 +1667,7 @@ class LayerManager {
           showLayers.reverse();
           that._layerListData = that._layerListData.concat(showLayers); // console.log(that._layerTreeData);
           // console.log(that._layerListData);
+          // console.log(that._layerListData_old);
 
           that.addMapServerLayers(showLayers, mapInfo.rect84);
         }, error => {
@@ -10107,7 +10113,7 @@ window.turf = turf_namespaceObject; //填挖方分析逻辑类
 class ExcavateFillAnalysisViewModel {
   //填挖方分析三维对象
   //绘制管理对象
-  //填挖方分析参数对象
+  //填挖方分析存储参数对象
   //绘制完成监听事件
   constructor(scenceView, options, callback) {
     _defineProperty(this, "_excavateFillAnalysis", null);
@@ -11678,8 +11684,8 @@ class SlopeAnalysisViewModel {
 
   destroy() {
     // 移除监听事件
-    this._drawFinishedEventListener && this._drawFinishedEventListener();
-    this._drawFinishedEventListener = null;
+    this._globaOptions._drawFinishedEventListener && this._globaOptions._drawFinishedEventListener();
+    this._globaOptions._drawFinishedEventListener = null;
     this._slopeAnalysis && this._slopeAnalysis.destroy();
     this._slopeAnalysis = null;
   }
@@ -12427,6 +12433,12 @@ SlopeAnalysis.install = (Vue, opts) => {
 
 class IsolineAnalysisViewModel {
   //等值线分析三维对象
+  //等高面高度区间
+  //等高面区间颜色数组
+  //等高面渐变纹理图片
+  //绘制管理对象
+  //绘制完成监听事件
+  //等值线分析存储参数对象
   constructor(scenceView, options) {
     _defineProperty(this, "_elevation", null);
 
@@ -12436,17 +12448,12 @@ class IsolineAnalysisViewModel {
 
     _defineProperty(this, "_surfaceColorImage", null);
 
-    _defineProperty(this, "_surfaceLineColorImage", null);
-
     _defineProperty(this, "_drawManager", null);
 
     _defineProperty(this, "_removeEventListener", null);
 
-    _defineProperty(this, "_surfaceLineColorTableValue", [0.0, 0.1, 0.2, 0.3, 0.4]);
-
-    _defineProperty(this, "_surfaceLineColorTable", ["#2a2828", "#2747E0", "#D33B7D", "#D33038", "#FF9742"]);
-
-    _defineProperty(this, "_colorImages", [{
+    _defineProperty(this, "_colorImages", [//渐变纹理编号和图片地址对象
+    {
       value: 0,
       src: const_image_namespaceObject.RED_TO_PURPLE_URL
     }, {
@@ -12622,9 +12629,7 @@ class IsolineAnalysisViewModel {
         this._options.type = Cesium.Kq3dContourAnalysisType.SUFACE_LINE;
 
         if (this._elevation) {
-          this._elevation.type = Cesium.Kq3dContourAnalysisType.SUFACE_LINE; // this._surfaceLineColorImage = this.setColorLine(value)
-          // this._elevation.colorImage = this._surfaceLineColorImage;
-
+          this._elevation.type = Cesium.Kq3dContourAnalysisType.SUFACE_LINE;
           this._elevation.colorImage = this._surfaceColorImage;
         }
 
@@ -12649,10 +12654,7 @@ class IsolineAnalysisViewModel {
   clear() {
     this._drawManager && this._drawManager.stopDraw();
     this._elevation && this._elevation.destroy();
-    this._elevation = null; //移除监听事件
-
-    this._removeEventListener && this._removeEventListener();
-    this._removeEventListener = null;
+    this._elevation = null;
   } //销毁
 
 
@@ -14870,12 +14872,18 @@ IsolineAnalysis.install = (Vue, opts) => {
 
 //Box裁剪逻辑类
 class BoxClipViewModel {
+  //三维viewer对象
+  //Box裁剪存储参数对象
+  //Box裁剪三维对象
+  //绘制管理对象
+  //绘制完成监听事件
   constructor(scenceView, options) {
     _defineProperty(this, "_viewer", null);
 
     _defineProperty(this, "_options", {});
 
     _defineProperty(this, "_defaultOptions", {
+      //默认参数对象
       clipTyp: 1,
       boxColor: Cesium.Color.fromCssColorString("#316882").withAlpha(0.4),
       clipEdgeWidth: 6.0,
@@ -14902,8 +14910,8 @@ class BoxClipViewModel {
     _defineProperty(this, "_removeEventListener", null);
 
     this._options = Object.assign({}, options, this._defaultOptions);
-    this._viewer = scenceView._viewer;
-    this._viewer.enabledFXAA = true;
+    this._viewer = scenceView._viewer; // this._viewer.enabledFXAA = true;
+
     this._options.viewer = this._viewer;
     this._drawManager = scenceView._drawManager;
     let that = this;
@@ -14984,13 +14992,8 @@ class BoxClipViewModel {
 
 
   setLayer(layerId) {
-    this._options.tileset = this.findLayerById(layerId);
     this.clear();
-
-    if (this._boxclipAnalysis) {
-      this._boxclipAnalysis = new Cesium.Kq3dBoxClip(this._options);
-    } //if (this._boxclipAnalysis) this._boxclipAnalysis.tileset = layer;
-
+    this._options.tileset = this.findLayerById(layerId);
   } // 设置裁剪方式,为true时，则为外部裁剪，否则为内部裁剪
 
 
@@ -15200,8 +15203,6 @@ const BoxClipvue_type_script_setup_true_lang_js_default_ = {
 
 
     function clip() {
-      // this.clearResult();
-      viewModel && viewModel.clear();
       viewModel && viewModel.start();
     } // 清除
 
@@ -15215,6 +15216,8 @@ const BoxClipvue_type_script_setup_true_lang_js_default_ = {
       viewModel && viewModel.destroy();
     });
     expose({
+      paramsChanged,
+      clip,
       clearResult
     });
     return (_ctx, _cache) => {
@@ -15878,17 +15881,20 @@ BoxClip.install = (Vue, opts) => {
 
 ;// CONCATENATED MODULE: ./src/webgl/planeclip/PlaneClipViewModel.js
 
-//Box裁剪逻辑类
+//平面裁剪逻辑类
 class PlaneClipViewModel {
+  //三维viewer对象
+  //平面裁剪存储参数对象
+  //平面裁剪三维逻辑类
+  //绘制管理对象
+  //绘制完成事件监听
   constructor(scenceView, options) {
     _defineProperty(this, "_viewer", null);
 
     _defineProperty(this, "_options", {});
 
     _defineProperty(this, "_defaultOptions", {
-      axisX: 0,
-      axisY: 0,
-      axisZ: 0,
+      //默认参数对象
       x: 0,
       y: 0,
       z: 0,
@@ -15919,21 +15925,16 @@ class PlaneClipViewModel {
     _defineProperty(this, "_removeEventListener", null);
 
     this._options = Object.assign({}, options, this._defaultOptions);
-    this._viewer = scenceView._viewer;
-    this._viewer.enabledFXAA = true;
+    this._viewer = scenceView._viewer; // this._viewer.enabledFXAA = true;
+
     this._options.viewer = this._viewer;
     this._drawManager = scenceView._drawManager;
     let that = this;
     this._removeEventListener = this._drawManager.drawFinishedEvent.addEventListener(shape => {
       if (shape) {
-        that._options.position = shape.position;
+        that._options.position = shape.position; // 实例化分析对象
 
-        if (that._planeclipAnalysis) {
-          that._planeclipAnalysis.position = that._options.position;
-        } else {
-          // 实例化分析对象
-          that._planeclipAnalysis = new Cesium.Kq3dBoxClip(that._options);
-        }
+        that._planeclipAnalysis = new Cesium.Kq3dBoxClip(that._options);
 
         that._drawManager.clear();
       }
@@ -16182,6 +16183,8 @@ const PlaneClipvue_type_script_setup_true_lang_js_default_ = {
       viewModel && viewModel.destroy();
     });
     expose({
+      paramsChanged,
+      clip,
       clearResult
     });
     return (_ctx, _cache) => {
@@ -17857,7 +17860,13 @@ let _gravityScratch = null;
 let _gravity = 1.0; //粒子特效逻辑类
 
 class ParticleEffectViewModel {
+  //三维球场景视图对象
   //粒子特效集合
+  //绘制管理对象
+  //绘制完成监听事件
+  //粒子特效存储参数对象
+  //火焰图片url地址
+  //烟雾图片url地址
   constructor(scenceView) {
     _defineProperty(this, "_scene", null);
 
@@ -18222,6 +18231,9 @@ const ParticleEffectvue_type_script_setup_true_lang_js_default_ = {
       viewModel && viewModel.destroy();
     });
     expose({
+      changeMode,
+      paramsChanged,
+      add,
       clear
     });
     return (_ctx, _cache) => {
@@ -18867,6 +18879,13 @@ let _gravityEnd = -1.0; //天气特效逻辑类
 
 
 class WeatherEffectViewModel {
+  //三维球场景视图对象
+  //粒子系统三维对象
+  //绘制管理对象
+  //绘制完成监听事件
+  //天气特效存储参数对象
+  //雨图片url地址
+  //雪图片url地址
   constructor(scenceView) {
     _defineProperty(this, "_scene", null);
 
@@ -19153,6 +19172,9 @@ const WeatherEffectvue_type_script_setup_true_lang_js_default_ = {
       viewModel && viewModel.destroy();
     });
     expose({
+      changeMode,
+      paramsChanged,
+      add,
       clear
     });
     return (_ctx, _cache) => {
@@ -20022,10 +20044,10 @@ CompareMap.install = (Vue, opts) => {
 
 ;// CONCATENATED MODULE: ./src/webgl/screenshot/ScreenshotViewModel.js
 
-//Box裁剪逻辑类
+//截图逻辑类
 class ScreenshotViewModel {
   //三维viewer对象
-  //参数对象
+  //截图存储参数对象
   //截图三维对象
   constructor(viewer, options) {
     _defineProperty(this, "_viewer", null);

package/isolineanalysis/index.js

@@ -82,6 +82,12 @@ var const_image_namespaceObject = require("@kq_npm/client_common_vue/_utils/cons
 
 class IsolineAnalysisViewModel {
   //等值线分析三维对象
+  //等高面高度区间
+  //等高面区间颜色数组
+  //等高面渐变纹理图片
+  //绘制管理对象
+  //绘制完成监听事件
+  //等值线分析存储参数对象
   constructor(scenceView, options) {
     _defineProperty(this, "_elevation", null);
 
@@ -91,17 +97,12 @@ class IsolineAnalysisViewModel {
 
     _defineProperty(this, "_surfaceColorImage", null);
 
-    _defineProperty(this, "_surfaceLineColorImage", null);
-
     _defineProperty(this, "_drawManager", null);
 
     _defineProperty(this, "_removeEventListener", null);
 
-    _defineProperty(this, "_surfaceLineColorTableValue", [0.0, 0.1, 0.2, 0.3, 0.4]);
-
-    _defineProperty(this, "_surfaceLineColorTable", ["#2a2828", "#2747E0", "#D33B7D", "#D33038", "#FF9742"]);
-
-    _defineProperty(this, "_colorImages", [{
+    _defineProperty(this, "_colorImages", [//渐变纹理编号和图片地址对象
+    {
       value: 0,
       src: const_image_namespaceObject.RED_TO_PURPLE_URL
     }, {
@@ -277,9 +278,7 @@ class IsolineAnalysisViewModel {
         this._options.type = Cesium.Kq3dContourAnalysisType.SUFACE_LINE;
 
         if (this._elevation) {
-          this._elevation.type = Cesium.Kq3dContourAnalysisType.SUFACE_LINE; // this._surfaceLineColorImage = this.setColorLine(value)
-          // this._elevation.colorImage = this._surfaceLineColorImage;
-
+          this._elevation.type = Cesium.Kq3dContourAnalysisType.SUFACE_LINE;
           this._elevation.colorImage = this._surfaceColorImage;
         }
 
@@ -304,10 +303,7 @@ class IsolineAnalysisViewModel {
   clear() {
     this._drawManager && this._drawManager.stopDraw();
     this._elevation && this._elevation.destroy();
-    this._elevation = null; //移除监听事件
-
-    this._removeEventListener && this._removeEventListener();
-    this._removeEventListener = null;
+    this._elevation = null;
   } //销毁
 
 

package/package.json

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

package/particleeffect/index.js

@@ -85,7 +85,13 @@ let _gravityScratch = null;
 let _gravity = 1.0; //粒子特效逻辑类
 
 class ParticleEffectViewModel {
+  //三维球场景视图对象
   //粒子特效集合
+  //绘制管理对象
+  //绘制完成监听事件
+  //粒子特效存储参数对象
+  //火焰图片url地址
+  //烟雾图片url地址
   constructor(scenceView) {
     _defineProperty(this, "_scene", null);
 
@@ -450,6 +456,9 @@ const __default__ = {
       viewModel && viewModel.destroy();
     });
     expose({
+      changeMode,
+      paramsChanged,
+      add,
       clear
     });
     return (_ctx, _cache) => {

package/planeclip/index.js

@@ -76,17 +76,20 @@ function _defineProperty(obj, key, value) {
 }
 ;// CONCATENATED MODULE: ./src/webgl/planeclip/PlaneClipViewModel.js
 
-//Box裁剪逻辑类
+//平面裁剪逻辑类
 class PlaneClipViewModel {
+  //三维viewer对象
+  //平面裁剪存储参数对象
+  //平面裁剪三维逻辑类
+  //绘制管理对象
+  //绘制完成事件监听
   constructor(scenceView, options) {
     _defineProperty(this, "_viewer", null);
 
     _defineProperty(this, "_options", {});
 
     _defineProperty(this, "_defaultOptions", {
-      axisX: 0,
-      axisY: 0,
-      axisZ: 0,
+      //默认参数对象
       x: 0,
       y: 0,
       z: 0,
@@ -117,21 +120,16 @@ class PlaneClipViewModel {
     _defineProperty(this, "_removeEventListener", null);
 
     this._options = Object.assign({}, options, this._defaultOptions);
-    this._viewer = scenceView._viewer;
-    this._viewer.enabledFXAA = true;
+    this._viewer = scenceView._viewer; // this._viewer.enabledFXAA = true;
+
     this._options.viewer = this._viewer;
     this._drawManager = scenceView._drawManager;
     let that = this;
     this._removeEventListener = this._drawManager.drawFinishedEvent.addEventListener(shape => {
       if (shape) {
-        that._options.position = shape.position;
+        that._options.position = shape.position; // 实例化分析对象
 
-        if (that._planeclipAnalysis) {
-          that._planeclipAnalysis.position = that._options.position;
-        } else {
-          // 实例化分析对象
-          that._planeclipAnalysis = new Cesium.Kq3dBoxClip(that._options);
-        }
+        that._planeclipAnalysis = new Cesium.Kq3dBoxClip(that._options);
 
         that._drawManager.clear();
       }
@@ -380,6 +378,8 @@ const __default__ = {
       viewModel && viewModel.destroy();
     });
     expose({
+      paramsChanged,
+      clip,
       clearResult
     });
     return (_ctx, _cache) => {

package/scenceview/index.js

@@ -662,6 +662,7 @@ class LayerManager {
             }
 
             source.mapServerInfo = (0,util_namespaceObject.formatKQMapInfo)(mapInfo.result, serverUrl, serverName, token, null, true);
+            this._layerListData_old = this._layerListData_old.concat(source.mapServerInfo.layers_old);
           });
           sourcePromises.push(sourcePromise);
         }
@@ -707,6 +708,10 @@ class LayerManager {
               layerData.sourceLayers = source.mapServerInfo.layers_show;
             } else {
               layerData.url += "/" + layerData.renderType;
+
+              if (source.token) {
+                layerData.url += "?ua_token=" + source.token;
+              }
             }
           } else if (layerData.sourceType === "arcserver") {
             if (!layerData.renderType || layerData.renderType === "rest") {
@@ -1209,6 +1214,7 @@ class LayerManager {
           showLayers.reverse();
           that._layerListData = that._layerListData.concat(showLayers); // console.log(that._layerTreeData);
           // console.log(that._layerListData);
+          // console.log(that._layerListData_old);
 
           that.addMapServerLayers(showLayers, mapInfo.rect84);
         }, error => {

package/screenshot/index.js

@@ -76,10 +76,10 @@ function _defineProperty(obj, key, value) {
 }
 ;// CONCATENATED MODULE: ./src/webgl/screenshot/ScreenshotViewModel.js
 
-//Box裁剪逻辑类
+//截图逻辑类
 class ScreenshotViewModel {
   //三维viewer对象
-  //参数对象
+  //截图存储参数对象
   //截图三维对象
   constructor(viewer, options) {
     _defineProperty(this, "_viewer", null);

package/slopeanalysis/index.js

@@ -326,8 +326,8 @@ class SlopeAnalysisViewModel {
 
   destroy() {
     // 移除监听事件
-    this._drawFinishedEventListener && this._drawFinishedEventListener();
-    this._drawFinishedEventListener = null;
+    this._globaOptions._drawFinishedEventListener && this._globaOptions._drawFinishedEventListener();
+    this._globaOptions._drawFinishedEventListener = null;
     this._slopeAnalysis && this._slopeAnalysis.destroy();
     this._slopeAnalysis = null;
   }

package/weathereffect/index.js

@@ -88,6 +88,13 @@ let _gravityEnd = -1.0; //天气特效逻辑类
 
 
 class WeatherEffectViewModel {
+  //三维球场景视图对象
+  //粒子系统三维对象
+  //绘制管理对象
+  //绘制完成监听事件
+  //天气特效存储参数对象
+  //雨图片url地址
+  //雪图片url地址
   constructor(scenceView) {
     _defineProperty(this, "_scene", null);
 
@@ -374,6 +381,9 @@ const __default__ = {
       viewModel && viewModel.destroy();
     });
     expose({
+      changeMode,
+      paramsChanged,
+      add,
       clear
     });
     return (_ctx, _cache) => {