@kq_npm/client3d_webgl_vue 4.5.36 → 4.5.38

package/sceneview/index.js

@@ -1,13 +1,13 @@
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory(require("vue"), require("@kq_npm/client_common_vue/_utils/gis-utils"), require("@kq_npm/client_common_vue/init.js"), require("@kq_npm/client_common_vue/_utils/mitt"), require("@kq_npm/client_common_vue/_utils/util"), require("@kq_npm/client_common_vue/_types/global-event"), require("@kq_npm/client_common_vue/_utils/const-image"), require("@kq_npm/client_common_vue"), require("@kq_npm/client_common_vue/_utils/webmapservice"), require("papaparse"), require("@kq_npm/client_common_vue/_lang/index.js"), require("@kq_npm/client_common_vue/_mixin/render"), require("@kq_npm/client_common_vue/_utils/dictionaries"), require("@kq_npm/client3d_webgl_vue"));
+		module.exports = factory(require("vue"), require("@kq_npm/client_common_vue/_utils/gis-utils"), require("@kq_npm/client_common_vue/init.js"), require("@kq_npm/client_common_vue/_utils/mitt"), require("@kq_npm/client_common_vue/_utils/util"), require("@kq_npm/client_common_vue/_types/global-event"), require("@kq_npm/client_common_vue/_utils/const-image"), require("@kq_npm/client_common_vue"), require("@kq_npm/client_common_vue/_utils/webmapservice"), require("@kq_npm/client_common_vue/_lang/index.js"), require("@kq_npm/client_common_vue/_mixin/render"), require("@kq_npm/client_common_vue/_utils/dictionaries"), require("@kq_npm/client3d_webgl_vue"));
 	else if(typeof define === 'function' && define.amd)
-		define("@kq_npm/client3d_webgl_vue", ["vue", "@kq_npm/client_common_vue/_utils/gis-utils", "@kq_npm/client_common_vue/init.js", "@kq_npm/client_common_vue/_utils/mitt", "@kq_npm/client_common_vue/_utils/util", "@kq_npm/client_common_vue/_types/global-event", "@kq_npm/client_common_vue/_utils/const-image", "@kq_npm/client_common_vue", "@kq_npm/client_common_vue/_utils/webmapservice", "papaparse", "@kq_npm/client_common_vue/_lang/index.js", "@kq_npm/client_common_vue/_mixin/render", "@kq_npm/client_common_vue/_utils/dictionaries", "@kq_npm/client3d_webgl_vue"], factory);
+		define("@kq_npm/client3d_webgl_vue", ["vue", "@kq_npm/client_common_vue/_utils/gis-utils", "@kq_npm/client_common_vue/init.js", "@kq_npm/client_common_vue/_utils/mitt", "@kq_npm/client_common_vue/_utils/util", "@kq_npm/client_common_vue/_types/global-event", "@kq_npm/client_common_vue/_utils/const-image", "@kq_npm/client_common_vue", "@kq_npm/client_common_vue/_utils/webmapservice", "@kq_npm/client_common_vue/_lang/index.js", "@kq_npm/client_common_vue/_mixin/render", "@kq_npm/client_common_vue/_utils/dictionaries", "@kq_npm/client3d_webgl_vue"], factory);
 	else if(typeof exports === 'object')
-		exports["@kq_npm/client3d_webgl_vue"] = factory(require("vue"), require("@kq_npm/client_common_vue/_utils/gis-utils"), require("@kq_npm/client_common_vue/init.js"), require("@kq_npm/client_common_vue/_utils/mitt"), require("@kq_npm/client_common_vue/_utils/util"), require("@kq_npm/client_common_vue/_types/global-event"), require("@kq_npm/client_common_vue/_utils/const-image"), require("@kq_npm/client_common_vue"), require("@kq_npm/client_common_vue/_utils/webmapservice"), require("papaparse"), require("@kq_npm/client_common_vue/_lang/index.js"), require("@kq_npm/client_common_vue/_mixin/render"), require("@kq_npm/client_common_vue/_utils/dictionaries"), require("@kq_npm/client3d_webgl_vue"));
+		exports["@kq_npm/client3d_webgl_vue"] = factory(require("vue"), require("@kq_npm/client_common_vue/_utils/gis-utils"), require("@kq_npm/client_common_vue/init.js"), require("@kq_npm/client_common_vue/_utils/mitt"), require("@kq_npm/client_common_vue/_utils/util"), require("@kq_npm/client_common_vue/_types/global-event"), require("@kq_npm/client_common_vue/_utils/const-image"), require("@kq_npm/client_common_vue"), require("@kq_npm/client_common_vue/_utils/webmapservice"), require("@kq_npm/client_common_vue/_lang/index.js"), require("@kq_npm/client_common_vue/_mixin/render"), require("@kq_npm/client_common_vue/_utils/dictionaries"), require("@kq_npm/client3d_webgl_vue"));
 	else
-		root["@kq_npm/client3d_webgl_vue"] = factory(root["Vue"], root["@kq_npm/client_common_vue/_utils/gis-utils"], root["@kq_npm/client_common_vue/init.js"], root["@kq_npm/client_common_vue/_utils/mitt"], root["@kq_npm/client_common_vue/_utils/util"], root["@kq_npm/client_common_vue/_types/global-event"], root["@kq_npm/client_common_vue/_utils/const-image"], root["@kq_npm/client_common_vue"], root["@kq_npm/client_common_vue/_utils/webmapservice"], root["_"], root["@kq_npm/client_common_vue/_lang/index.js"], root["@kq_npm/client_common_vue/_mixin/render"], root["@kq_npm/client_common_vue/_utils/dictionaries"], root["@kq_npm/client3d_webgl_vue"]);
-})(this, function(__WEBPACK_EXTERNAL_MODULE__1895__, __WEBPACK_EXTERNAL_MODULE__7135__, __WEBPACK_EXTERNAL_MODULE__7997__, __WEBPACK_EXTERNAL_MODULE__8905__, __WEBPACK_EXTERNAL_MODULE__3458__, __WEBPACK_EXTERNAL_MODULE__3536__, __WEBPACK_EXTERNAL_MODULE__6277__, __WEBPACK_EXTERNAL_MODULE__7064__, __WEBPACK_EXTERNAL_MODULE__3217__, __WEBPACK_EXTERNAL_MODULE__7747__, __WEBPACK_EXTERNAL_MODULE__5775__, __WEBPACK_EXTERNAL_MODULE__9678__, __WEBPACK_EXTERNAL_MODULE__3569__, __WEBPACK_EXTERNAL_MODULE__6459__) {
+		root["@kq_npm/client3d_webgl_vue"] = factory(root["Vue"], root["@kq_npm/client_common_vue/_utils/gis-utils"], root["@kq_npm/client_common_vue/init.js"], root["@kq_npm/client_common_vue/_utils/mitt"], root["@kq_npm/client_common_vue/_utils/util"], root["@kq_npm/client_common_vue/_types/global-event"], root["@kq_npm/client_common_vue/_utils/const-image"], root["@kq_npm/client_common_vue"], root["@kq_npm/client_common_vue/_utils/webmapservice"], root["@kq_npm/client_common_vue/_lang/index.js"], root["@kq_npm/client_common_vue/_mixin/render"], root["@kq_npm/client_common_vue/_utils/dictionaries"], root["@kq_npm/client3d_webgl_vue"]);
+})(this, function(__WEBPACK_EXTERNAL_MODULE__1895__, __WEBPACK_EXTERNAL_MODULE__7135__, __WEBPACK_EXTERNAL_MODULE__7997__, __WEBPACK_EXTERNAL_MODULE__8905__, __WEBPACK_EXTERNAL_MODULE__3458__, __WEBPACK_EXTERNAL_MODULE__3536__, __WEBPACK_EXTERNAL_MODULE__6277__, __WEBPACK_EXTERNAL_MODULE__7064__, __WEBPACK_EXTERNAL_MODULE__3217__, __WEBPACK_EXTERNAL_MODULE__5775__, __WEBPACK_EXTERNAL_MODULE__9678__, __WEBPACK_EXTERNAL_MODULE__3569__, __WEBPACK_EXTERNAL_MODULE__6459__) {
 return /******/ (function() { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
@@ -1157,7 +1157,8 @@ return (_ctx, _cache) => {
           (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", _hoisted_4, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).mode), 1 /* 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))
+            "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)
           }, {
             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) => {
@@ -1169,7 +1170,7 @@ return (_ctx, _cache) => {
               }), 128 /* KEYED_FRAGMENT */))
             ]),
             _: 1 /* STABLE */
-          }, 8 /* PROPS */, ["modelValue"])
+          }, 8 /* PROPS */, ["modelValue", "disabled"])
         ])
       ]),
       (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_5, [
@@ -1810,7 +1811,7 @@ element_plus_dist_index_full_js__WEBPACK_IMPORTED_MODULE_0__.ElMessage.install =
 
 /***/ }),
 
-/***/ 6651:
+/***/ 1358:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -1839,9 +1840,9 @@ var util_ = __webpack_require__(3458);
 var message = __webpack_require__(1705);
 // EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
 var const_image_ = __webpack_require__(6277);
-// EXTERNAL MODULE: external {"root":"_","commonjs":"papaparse","commonjs2":"papaparse","amd":"papaparse"}
-var external_root_commonjs_papaparse_commonjs2_papaparse_amd_papaparse_ = __webpack_require__(7747);
-var external_root_commonjs_papaparse_commonjs2_papaparse_amd_papaparse_default = /*#__PURE__*/__webpack_require__.n(external_root_commonjs_papaparse_commonjs2_papaparse_amd_papaparse_);
+;// CONCATENATED MODULE: external "papaparse"
+var external_papaparse_namespaceObject = require("papaparse");
+var external_papaparse_default = /*#__PURE__*/__webpack_require__.n(external_papaparse_namespaceObject);
 ;// CONCATENATED MODULE: ./src/webgl/adddata/AddDataViewModel.js
 /*
  * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
@@ -1989,7 +1990,7 @@ class AddDataViewModel {
         });
       } else if (ext === "csv") {
         (0,util_.readFile)(file, res => {
-          var features = external_root_commonjs_papaparse_commonjs2_papaparse_amd_papaparse_default().parse(res, {
+          var features = external_papaparse_default().parse(res, {
             skipEmptyLines: true,
             header: true
           }).data;
@@ -4924,6 +4925,7 @@ var message = __webpack_require__(1705);
  */
 //Box裁剪逻辑类
 
+
 class BoxClipViewModel {
   _viewer = null; //三维viewer对象
   _options = {}; //Box裁剪存储参数对象
@@ -4950,13 +4952,14 @@ class BoxClipViewModel {
   _drawManager = null; //绘制管理对象
   _removeEventListener = null; //绘制完成监听事件
   _language = {};
-  constructor(scenceView, options) {
+  callbackParams = null;
+  constructor(scenceView, options, callbackParams) {
     this._language = scenceView._language;
     this._options = Object.assign({}, options, this._defaultOptions);
     this._viewer = scenceView._viewer;
+    this.callbackParams = callbackParams;
     // this._viewer.enabledFXAA = true;
     this._options.viewer = this._viewer;
-
     this._drawManager = scenceView._drawManager;
     let that = this;
     this._removeEventListener = this._drawManager.drawFinishedEvent.addEventListener(shape => {
@@ -4967,14 +4970,25 @@ class BoxClipViewModel {
         that._drawManager.clear();
       }
     });
+     // 事件绑定this
+    this._resetListData = this._resetListData.bind(this);
+     // 添加图层数据源变化监听
+    gis_utils_.mapViewUtils.bindViewEvents("resetLayerDatas", this._resetListData, scenceView._viewerId);
+  }
+  _resetListData(e) {
+    // 如果图层变化事件是自己触发的 则不继续执行 避免死循环
+    if (e.eventTarget && e.eventTarget === this) {
+      return;
+    }
+    this.callbackParams && this.callbackParams("setData")
   }
-
   // 查找所有3dtiles模型对象
   findLayers() {
     let tilesets = [];
     const primitives = this._options.viewer.scene.primitives._primitives;
     for (let m = 0; m < primitives.length; m++) {
       if (primitives[m] instanceof Cesium.Cesium3DTileset) {
+        if(!primitives[m].show) continue;
         tilesets.push({
           guid: primitives[m].guid,
           name: primitives[m].name ? primitives[m].name : primitives[m].guid
@@ -4999,7 +5013,7 @@ class BoxClipViewModel {
     var flag = false;
     var models = this._options.viewer.scene.primitives._primitives;
     for (let i = 0; i < models.length; i++) {
-      if (models[i]._url) {
+      if (models[i]._url && models[i].show) {
         flag = true;
       }
     }
@@ -5030,6 +5044,7 @@ class BoxClipViewModel {
     //移除监听事件
     this._removeEventListener && this._removeEventListener();
     this._removeEventListener = null;
+    gis_utils_.mapViewUtils.offViewEvents("resetLayerDatas", this._resetListData, this._viewer._container.id);
   }
 
   // 设置裁剪对象
@@ -5243,20 +5258,23 @@ headerTempTitle.value = language.value.boxClip;
         axisZ: formItem.clipHeight,
         angle: formItem.clipRotation
       };
-      viewModel = new BoxClipViewModel(scenceView, options);
+      viewModel = new BoxClipViewModel(scenceView, options, callbackParams);
     }
   });
   setTimeout(() => {
-    if (viewModel) {
-      tiles.value = viewModel.findLayers(); // 获取所有tileset对象
-      if (tiles.value.length > 0) {
-        formItem.tileset = tiles.value[0].guid;
-        paramsChanged("tileset");
-      }
-    }
+    callbackParams();
   }, 1000);
 });
-
+function callbackParams (key, val) {
+  if (viewModel) {
+    tiles.value = viewModel.findLayers(); // 获取所有tileset对象
+    formItem.tileset = "";
+    if (tiles.value.length > 0) {
+      formItem.tileset = tiles.value[0].guid;
+    }
+    paramsChanged("tileset");
+  }
+}
 /**
  * @description 监听header生成
  */
@@ -9657,7 +9675,7 @@ Compass.install = (Vue, opts) => {
 /* harmony import */ var _webgl_isolineanalysis__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(6209);
 /* harmony import */ var _webgl_boxclip__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(5066);
 /* harmony import */ var _webgl_planeclip__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(6597);
-/* harmony import */ var _webgl_adddata__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(6651);
+/* harmony import */ var _webgl_adddata__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(1358);
 /* harmony import */ var _webgl_particleeffect__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(4545);
 /* harmony import */ var _webgl_weathereffect__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(8498);
 /* harmony import */ var _webgl_comparemap__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(8752);
@@ -12903,16 +12921,19 @@ var message = __webpack_require__(1705);
  */
 //地质体分析逻辑类
 
+
 class GeologicalBodyAnalysisViewModel {
   _viewer = null; //三维viewer对象
   _options = {}; //地质体分析存储参数对象
   _geologyBody = null; //地质体分析三维对象
   _measureHandler = null;
   _language = {};
-  constructor(scenceView, options) {
+  callbackParams = null;
+  constructor(scenceView, options, callbackParams) {
     this._language = scenceView._language;
     this._options = options;
     this._viewer = scenceView._viewer;
+    this.callbackParams = callbackParams;
     this._measureHandler = new Cesium.Kq3dMeasureHandler(scenceView._viewer);
     this._measureHandler.measureEvent.addEventListener(function (result) {
       if(result.measureResult.labels) result.measureResult.labels.show = false;
@@ -12958,8 +12979,18 @@ class GeologicalBodyAnalysisViewModel {
         }
       }
     });
+    // 事件绑定this
+    this._resetListData = this._resetListData.bind(this);
+    // 添加图层数据源变化监听
+    gis_utils_.mapViewUtils.bindViewEvents("resetLayerDatas", this._resetListData, scenceView._viewerId);
+  }
+  _resetListData(e) {
+    // 如果图层变化事件是自己触发的 则不继续执行 避免死循环
+    if (e.eventTarget && e.eventTarget === this) {
+      return;
+    }
+    this.callbackParams && this.callbackParams("setData")
   }
-
   // 查找所有地质体对象
   findLayers() {
     let geologys = [];
@@ -12967,6 +12998,7 @@ class GeologicalBodyAnalysisViewModel {
     for (let i = 0; i < geologyBodyCollection.length; i++) {
       if(geologyBodyCollection[i].geologyPrimitiveCollection) {
         if(!geologyBodyCollection[i].guid) geologyBodyCollection[i].guid = Cesium.createGuid();
+        if(geologyBodyCollection[i]?.show == false) continue;
         geologys.push({
           guid: geologyBodyCollection[i].guid,
           name: geologyBodyCollection[i].name ? geologyBodyCollection[i].name : geologyBodyCollection[i].guid
@@ -13029,6 +13061,7 @@ class GeologicalBodyAnalysisViewModel {
     this.clear();
     this._measureHandler && this._measureHandler.destroy();
     this._measureHandler = null;
+    gis_utils_.mapViewUtils.offViewEvents("resetLayerDatas", this._resetListData, this._viewer._container.id);
   }
 }
 
@@ -13162,7 +13195,7 @@ headerTempTitle.value = language.value.geologyBodyAnalysis;
   //父组 件ScenceView初始化完成后执行
   gis_utils_.utils.getWebMap(null, scenceView => {
     if (scenceView) {
-      viewModel = new GeologicalBodyAnalysisViewModel(scenceView, formItem);
+      viewModel = new GeologicalBodyAnalysisViewModel(scenceView, formItem, callbackParams);
     }
   });
   setTimeout(() => {
@@ -13175,7 +13208,13 @@ headerTempTitle.value = language.value.geologyBodyAnalysis;
     }
   }, 1000);
 });
-
+function callbackParams (key, val) {
+   if (viewModel) {
+      tiles.value = viewModel.findLayers(); // 获取所有tileset对象
+      formItem.geology = null;
+      paramsChanged("geology");
+    }
+}
 /**
  * @description 监听header生成
  */
@@ -21215,12 +21254,13 @@ var gis_utils_ = __webpack_require__(7135);
 // EXTERNAL MODULE: ./src/common/_ui/message/index.js
 var message = __webpack_require__(1705);
 ;// CONCATENATED MODULE: ./src/webgl/modelfilter/ModelFilterViewModel.js
-/*
- * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
- * All rights reserved.
- */
+/*
+ * Copyright (C) 2019 KQ GEO Technologies Co., Ltd.
+ * All rights reserved.
+ */
 //模型滤镜逻辑类
 
+
 class ModelFilterViewModel {
   _viewer = null; //三维viewer对象
   _options = {}; //Box裁剪存储参数对象
@@ -21231,19 +21271,31 @@ class ModelFilterViewModel {
     saturation:1,
     gamma: 1
   }
-
-  constructor(scenceView, options) {
+  callbackParams = null;
+  constructor(scenceView, options, callbackParams) {
     this._options = Object.assign({}, options, this._defaultOptions);
     this._viewer = scenceView._viewer;
     this._options.viewer = this._viewer;
+    this.callbackParams = callbackParams;
+     // 事件绑定this
+     this._resetListData = this._resetListData.bind(this);
+     // 添加图层数据源变化监听
+    gis_utils_.mapViewUtils.bindViewEvents("resetLayerDatas", this._resetListData, scenceView._viewerId);
+  }
+  _resetListData(e) {
+    // 如果图层变化事件是自己触发的 则不继续执行 避免死循环
+    if (e.eventTarget && e.eventTarget === this) {
+      return;
+    }
+    this.callbackParams && this.callbackParams("setData")
   }
-
    // 查找所有3dtiles模型对象
    findLayers() {
     let tilesets = [];
     const primitives = this._viewer.scene.primitives._primitives;
     for (let m = 0; m < primitives.length; m++) {
       if (primitives[m] instanceof Cesium.Cesium3DTileset) {
+        if(!primitives[m].show) continue;
         tilesets.push({
           guid: primitives[m].guid,
           name: primitives[m].name ? primitives[m].name : primitives[m].guid
@@ -21304,6 +21356,7 @@ class ModelFilterViewModel {
 
   //销毁
   destroy() {
+    gis_utils_.mapViewUtils.offViewEvents("resetLayerDatas", this._resetListData, this._viewer._container.id);
     this.clear();
   }
 }
@@ -21447,7 +21500,7 @@ headerTempTitle.value = language.value.modelFilterPick;
         saturation: formItem.saturation,
         gamma: formItem.gamma
       };
-      viewModel = new ModelFilterViewModel(scenceView, options);
+      viewModel = new ModelFilterViewModel(scenceView, options, callbackParams);
     }
   });
   setTimeout(() => {
@@ -21456,7 +21509,13 @@ headerTempTitle.value = language.value.modelFilterPick;
     }
   }, 1000);
 });
-
+function callbackParams (key, val) {
+   if (viewModel) {
+      tiles.value = viewModel.findLayers(); // 获取所有tileset对象
+      formItem.tileset = "";
+      paramsChanged("tileset");
+    }
+}
 /**
  * @description 监听header生成
  */
@@ -22658,6 +22717,9 @@ class ModelSelectViewModel {
   _modeFiledArray = null; // 模型属性唯一值字段集合
   _modeFiled = "id"; // 模型属性匹配字段
   _language = {};
+  selectedKey = null;
+  oldColor = null;
+  selectedFeature = null;
   constructor(scenceView, pickCallFunc) {
     this._language = scenceView._language;
     this._viewer = scenceView._viewer;
@@ -22686,15 +22748,30 @@ class ModelSelectViewModel {
               })
             }
             if (properties.indexOf(that._modeFiled) > -1) {
-              let id = pickedObject.getProperty(that._modeFiled);
+              // let id = pickedObject.getProperty(that._modeFiled);
+              var newKey = pickedObject ? pickedObject.getProperty(that._modeFiled) : null;
+              if (newKey != that.selectedKey) {
+                  if (that.selectedFeature) {
+                    that.selectedFeature.color = that.oldColor;
+                    that.selectedFeature = null;
+                    that.selectedKey = null;
+                  }
+
+                  if (newKey != null) {
+                    that.selectedKey = newKey;
+                    that.selectedFeature = pickedObject;
+                    that.oldColor = that.selectedFeature.color;
+                    that.selectedFeature.color = Cesium.Color.fromCssColorString(that._highlightColor);
+                  }
+              }
               // that.clear();
-              that._highlight = new Cesium.Kq3dHighlight({
-                viewer: that._viewer,
-                tileset: pickedObject.tileset,
-                attrName: that._modeFiled,
-                attrValue: [id],
-                color: [Cesium.Color.fromCssColorString(that._highlightColor)]
-              });
+              // that._highlight = new Cesium.Kq3dHighlight({
+              //   viewer: that._viewer,
+              //   tileset: pickedObject.tileset,
+              //   attrName: that._modeFiled,
+              //   attrValue: [id],
+              //   color: [Cesium.Color.fromCssColorString(that._highlightColor)]
+              // });
               let attrs = {};
               properties.forEach(prop => {
                 attrs[prop] = pickedObject.getProperty(prop);
@@ -22747,6 +22824,11 @@ class ModelSelectViewModel {
     this._highlight = null;
     this.setCursor("default");
     this._isPick = false;
+    if (this.selectedFeature) {
+      this.selectedFeature.color = this.oldColor;
+      this.selectedFeature = null;
+      this.selectedKey = null;
+    }
   }
 
   //销毁
@@ -24067,6 +24149,7 @@ var message = __webpack_require__(1705);
  */
 //平面裁剪逻辑类
 
+
 class PlaneClipViewModel {
   _viewer = null; //三维viewer对象
   _options = {}; //平面裁剪存储参数对象
@@ -24097,13 +24180,15 @@ class PlaneClipViewModel {
   _drawManager = null; //绘制管理对象
   _removeEventListener = null; //绘制完成事件监听
   _language = {};
-  constructor(scenceView, options) {
+  callbackParams = null;
+  constructor(scenceView, options, callbackParams) {
     this._options = Object.assign({}, options, this._defaultOptions);
     this._viewer = scenceView._viewer;
     // this._viewer.enabledFXAA = true;
     this._options.viewer = this._viewer;
     this._language = scenceView._language;
     this._drawManager = scenceView._drawManager;
+    this.callbackParams = callbackParams;
     let that = this;
     this._removeEventListener = this._drawManager.drawFinishedEvent.addEventListener(shape => {
       if (shape) {
@@ -24113,14 +24198,25 @@ class PlaneClipViewModel {
         that._drawManager.clear();
       }
     });
+    // 事件绑定this
+    this._resetListData = this._resetListData.bind(this);
+    // 添加图层数据源变化监听
+    gis_utils_.mapViewUtils.bindViewEvents("resetLayerDatas", this._resetListData, scenceView._viewerId);
+  }
+  _resetListData(e) {
+    // 如果图层变化事件是自己触发的 则不继续执行 避免死循环
+    if (e.eventTarget && e.eventTarget === this) {
+      return;
+    }
+    this.callbackParams && this.callbackParams("setData")
   }
-
   // 查找所有3dtiles模型对象
   findLayers() {
     let tilesets = [];
     const primitives = this._options.viewer.scene.primitives._primitives;
     for (let m = 0; m < primitives.length; m++) {
       if (primitives[m] instanceof Cesium.Cesium3DTileset) {
+        if(!primitives[m].show) continue;
         tilesets.push({
           guid: primitives[m].guid,
           name: primitives[m].name ? primitives[m].name : primitives[m].guid
@@ -24145,7 +24241,7 @@ class PlaneClipViewModel {
     var flag = false;
     var models = this._options.viewer.scene.primitives._primitives;
     for (let i = 0; i < models.length; i++) {
-      if (models[i]._url) {
+      if (models[i]._url  && models[i].show) {
         flag = true;
       }
     }
@@ -24175,6 +24271,7 @@ class PlaneClipViewModel {
     //移除监听事件
     this._removeEventListener && this._removeEventListener();
     this._removeEventListener = null;
+    gis_utils_.mapViewUtils.offViewEvents("resetLayerDatas", this._resetListData, this._viewer._container.id);
   }
 
   // 设置裁剪对象
@@ -24361,20 +24458,23 @@ headerTempTitle.value = language.value.planeClip;
         boxEnable: formItem.boxEnable,
         distance: formItem.clipDistance
       };
-      viewModel = new PlaneClipViewModel(scenceView, options);
+      viewModel = new PlaneClipViewModel(scenceView, options, callbackParams);
     }
   });
   setTimeout(() => {
-    if (viewModel) {
-      tiles.value = viewModel.findLayers(); // 获取所有tileset对象
-      if (tiles.value.length > 0) {
-        formItem.tileset = tiles.value[0].guid;
-        paramsChanged("tileset");
-      }
-    }
+   callbackParams();
   }, 1000);
 });
-
+function callbackParams (key, val) {
+  if (viewModel) {
+    tiles.value = viewModel.findLayers(); // 获取所有tileset对象
+    formItem.tileset = "";
+    if (tiles.value.length > 0) {
+      formItem.tileset = tiles.value[0].guid;
+    }
+    paramsChanged("tileset");
+  }
+}
 /**
  * @description 监听header生成
  */
@@ -29069,6 +29169,8 @@ function resetWebMapInfo(webMapInfo, cb, defaultShowLayerNames, isShowAllLayers)
               return { ..._layerSources[i], ...layerData };
             }
           }
+        } else {
+          layerData.visible = getLayerDefaultState(layerData);
         }
       }
     } else {
@@ -31069,10 +31171,7 @@ const updatePosition = (boxElem, props) => {
     if (!boxElem) {
       return false;
     }
-    boxElem.style.top = "auto";
-    boxElem.style.left = "auto";
-    boxElem.style.bottom = "auto";
-    boxElem.style.right = "auto";
+
     const { position } = props;
     let _fixed = "static";
     if (position) {
@@ -31080,6 +31179,11 @@ const updatePosition = (boxElem, props) => {
     } else {
       return false;
     }
+    boxElem.style.top = "auto";
+    boxElem.style.left = "auto";
+    boxElem.style.bottom = "auto";
+    boxElem.style.right = "auto";
+    
     addClass(boxElem, "kq-is-absolute");
     const clientVisibleWidth =
       _fixed === "fixed" ? document.documentElement.clientWidth || document.body.clientWidth : "auto";
@@ -31540,15 +31644,6 @@ function specialSymbols(name) {
       '"/></DecorateStyle>' +
       "</PolygonSymbol>" +
       "</StyleItem>";
-  } else if (name === "圆点") {
-    xml =
-      '<StyleItem TypeID="109">' +
-      '<CirclePoint Name="' +
-      name +
-      '" AliasName="' +
-      name +
-      '" Color="4278190080" Units="1" Mask="-5" EnableReallyMeter="0" Light="0" EnableXRay="0" XRayColor="4294967295" OffsetX="0" OffsetY="0" Degree="0" Width="3" Height="3" PivotX="0.5" PivotY="0.5" PivotZ="0" m="Y" md="1" mot_h="1" mov_rel_h="0" mov_abs_h="0" mot_v="1" mov_rel_v="0" mov_abs_v="0" vectortype="1" vectorpath="" vectoruuid="" StrokeColor="4294901760" StrokeWidth="0.5" Cap="512" Join="8192" PenStyle="1" FillColor="4294901760" FillStyle="1" GradientType="0" StartGradientColor="4278190080" EndGradientColor="4294967295" GradientDegree="0" GradientRatio="0" scaleWithStyle="N" SourceStyleLocked="N"/>' +
-      "</StyleItem>";
   }
   let x2js = new X2JS();
   let styleItem = x2js.xml2js(xml).StyleItem;
@@ -31758,8 +31853,7 @@ function getStyleItem(symbolInfo) {
     symbolInfo.ITEM_NAME === "运载火箭航天发射" ||
     symbolInfo.ITEM_NAME === "地空导弹营火力范围" ||
     symbolInfo.ITEM_NAME === "近程常规导弹火力发射圈箭头线" ||
-    symbolInfo.ITEM_NAME === "直瞄打击炮队展开地区" ||
-    symbolInfo[j].ITEM_NAME === "圆点"
+    symbolInfo.ITEM_NAME === "直瞄打击炮队展开地区"
   ) {
     styleItem = specialSymbols(symbolInfo);
   } else {
@@ -53261,6 +53355,31 @@ function openelement(ChildList, thirdName) {
     thirdName.children.push(element);
   }
 }
+
+function getPlotColor(colorValue) {
+  if (colorValue.toString().indexOf("rgba") >= 0) {
+    let value = colorValue.substring(colorValue.indexOf("(") + 1, colorValue.indexOf(")"));
+    let values = value.split(",");
+    let r = Number(values[0]);
+    let g = Number(values[1]);
+    let b = Number(values[2]);
+    let a = Math.round((Number(values[3]) / 255) * 100) / 100;
+    return "rgba(" + r + "," + g + "," + b + "," + a + ")";
+  }
+  if (colorValue === undefined) {
+    return "rgba(0,0,0,1)";
+  }
+  colorValue = Number(colorValue);
+  if (colorValue === 0) {
+    return "rgba(255,0,0,1)";
+  }
+  // colorValue = colorValue >>> 0;
+  let r = (colorValue >> 16) & 0xff;
+  let g = (colorValue >> 8) & 0xff;
+  let b = colorValue & 0xff;
+  let a = Math.round(((colorValue >>> 24) / 255) * 100) / 100;
+  return "rgba(" + r + "," + g + "," + b + "," + a + ")";
+}
 
 ;// CONCATENATED MODULE: ./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/webgl/sceneapp/components/AppPlotting.vue?vue&type=script&setup=true&lang=js
 
@@ -58192,7 +58311,7 @@ class DrawManager {
   }
 
   //开始绘制
-  startDraw(type, style, callback, groupName, isMulti=false) {
+  startDraw(type, style, callback, groupName, isMulti = false) {
     // 开始绘制之前停止编辑和关闭样式设置框
     if (this._drawHandler.editHandler.shapeObject) {
       this._drawHandler.startEdit(null);
@@ -58214,7 +58333,7 @@ class DrawManager {
       this._viewer.scene.globe.depthTestAgainstTerrain = true;
     }
     var unionOptions = { ...this._drawStyle[type] };
-    if(type === "CatmullRomSpline") unionOptions = { ...this._drawStyle["polyline"] };
+    if (type === "CatmullRomSpline") unionOptions = { ...this._drawStyle["polyline"] };
     for (const key in unionOptions) {
       if (Object.hasOwnProperty.call(options, key)) {
         unionOptions[key] = options[key];
@@ -58260,16 +58379,16 @@ class DrawManager {
         var feature = that.shapeToGeoFeature(shape);
         callback(feature.geometry, { layer: shape.guid });
       }
-      if(that.removeEventListener)that.removeEventListener();
+      if (that.removeEventListener) that.removeEventListener();
       that.removeEventListener = null;
-      if(isMulti) {
+      if (isMulti) {
         that.startDraw(type, style, callback, groupName, isMulti);
       }
     });
   }
 
   stopDraw() {
-    if(this.removeEventListener) {
+    if (this.removeEventListener) {
       this.removeEventListener();
       this.removeEventListener = null;
     }
@@ -58392,7 +58511,7 @@ class DrawManager {
   }
 
   //通过geojson进行绘制，支持定位和闪烁
-  drawFromGeojson(geojsonData, idCustom = "result", callFun, geojsonStyle, isLocation, flashing=false) {
+  drawFromGeojson(geojsonData, idCustom = "result", callFun, geojsonStyle, isLocation, flashing = false) {
     if (!geojsonStyle) geojsonStyle = {};
     let style = JSON.parse(JSON.stringify(this._geojsonStyle));
     for (var type in geojsonStyle) {
@@ -58432,6 +58551,7 @@ class DrawManager {
       style.point.color = style.point.material;
       delete style.billboard;
     }
+
     this._viewer.scene.globe.depthTestAgainstTerrain = false;
     let geojsonDs = this._viewer.dataSources.getByName(idCustom);
     if (geojsonDs.length === 0) {
@@ -58467,11 +58587,11 @@ class DrawManager {
         let offset = new Cesium.HeadingPitchRange(0, Cesium.Math.toRadians(-90), 0);
         that._viewer.flyTo(ds, { duration: 1.5, offset });
       }
-      if(flashing) {
+      if (flashing) {
         // 闪烁效果
         let count = 0;
         let interval = setInterval(() => {
-          if(ds._destroyed) {
+          if (ds._destroyed) {
             clearInterval(interval);
             return;
           }
@@ -58493,12 +58613,10 @@ class DrawManager {
 
   //删除指定绘图分组的所有图形
   removeGeojsonByIdCustom(idCustom) {
+    if (idCustom === "draw") this.clear();
     let dsList = this._viewer.dataSources.getByName(idCustom);
 
-    if (dsList.length <= 0) {
-      this.clear();
-      return;
-    }
+    if (dsList.length <= 0) return;
     for (let i = 0; i < dsList.length; i++) {
       this._viewer.dataSources.remove(dsList[i], true);
     }
@@ -58506,7 +58624,6 @@ class DrawManager {
     if (index > -1) {
       this._layerGroup.splice(index, 1);
     }
-    if(idCustom === 'draw') this.clear();
   }
 
   getGeometry(idCustom) {
@@ -58734,8 +58851,8 @@ class DrawManager {
       const layer = layerList[i];
       const name = layer.name || "";
       const info = this.getShapeInfo(layer.guid);
-
-      items.push({ name: name, info: info, shape: layer.shape });
+      // edited by ly
+      items.push({ name: name, info: info, shape: layer.shape, guid: layer.guid });
     }
 
     return JSON.stringify(items);
@@ -58919,7 +59036,7 @@ class DrawManager {
     let shape = this._drawLayer.getById(id);
     if (shape) {
       let offset = new Cesium.HeadingPitchRange(0, Cesium.Math.toRadians(-90), 0);
-      if(shape.type === 'marker' || shape.type === 'text') {
+      if (shape.type === "marker" || shape.type === "text") {
         let boundingSphere = new Cesium.BoundingSphere(shape.position, 50000);
         this._viewer.camera.flyToBoundingSphere(boundingSphere, { duration: 1.5, offset });
       } else {
@@ -59063,29 +59180,55 @@ class DrawManager {
       }
     }
   }
+  setLabelList(v, g) {
+    this._labelInfo = {
+      labelList: v,
+      groupName: g
+    };
+  }
 
   /********** 地理编码通用组件使用 start ************/
   // 绘制点图标自带点击弹出气泡, 地理编码通用组件使用
-  drawPointWithPoup(data, idCustom = "geocode") {
-    if (!this._handler) {
-      // 注册点击事件
-      let scene = this._viewer.scene;
-      this._handler = new Cesium.ScreenSpaceEventHandler(scene.canvas);
-      let that = this;
-      this._handler.setInputAction(function (movement) {
-        var pickedObject = scene.pick(movement.position);
-        if (pickedObject && pickedObject.id && pickedObject.id instanceof Cesium.Entity) {
-          let entity = pickedObject.id;
-          that.createPointPoup(entity);
-        }
-      }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
-      this._handler.setInputAction(function (movement) {
-        // that.closePointPoup();
-        that.openPointPoup("1002", "AAA");
-        //  that.removePointAll();
-        //that.clearPointByIdCustom();
-      }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+  drawPointWithPoup(data, showPoup = false, idCustom = "geocode", isLocation = true) {
+    const that = this;
+    let scene = this._viewer.scene;
+    if (showPoup) {
+      if (!this.geocodeSelected) {
+        this.geocodeSelected = [];
+      }
+
+      if (!this._handler) {
+        // 注册点击事件
+        let scene = this._viewer.scene;
+        this._handler = new Cesium.ScreenSpaceEventHandler(scene.canvas);
+        // let that = this;
+        this._handler.setInputAction(function (movement) {
+          var pickedObject = scene.pick(movement.position);
+          if (pickedObject && pickedObject.id && pickedObject.id instanceof Cesium.Entity) {
+            let entity = pickedObject.id;
+            that.createPointPoup(entity);
+          }
+        }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+        this._handler.setInputAction(function (movement) {
+          // that.closePointPoup();
+          that.openPointPoup("1002", "AAA");
+          //  that.removePointAll();
+          //that.clearPointByIdCustom();
+        }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+        this._handler.setInputAction(function (movement) {
+          const pickedObject = scene.pick(movement.endPosition);
+          if (Cesium.defined(pickedObject) && pickedObject.id && pickedObject.id instanceof Cesium.Entity) {
+            that.geocodeSelected = [pickedObject.id];
+            pickedObject.id.billboard.image = pickedObject.id.properties.image1;
+          } else {
+            if (that.geocodeSelected && that.geocodeSelected.length > 0) {
+              that.geocodeSelected[0].billboard.image = that.geocodeSelected[0].properties.image;
+            }
+          }
+        }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
+      }
     }
+
     let pointDs = this._viewer.dataSources.getByName(idCustom);
     if (pointDs.length === 0) {
       pointDs = new Cesium.CustomDataSource(idCustom);
@@ -59094,28 +59237,52 @@ class DrawManager {
     } else {
       pointDs = pointDs[0];
     }
-    let position = Cesium.Cartesian3.fromDegrees(data.lat, data.lon);
+    let position = Cesium.Cartesian3.fromDegrees(data.lon, data.lat);
     pointDs.entities.add({
       position: position,
       billboard: {
         image: data.image,
+        image1: data.image1,
         width: data.width,
         height: data.height,
         verticalOrigin: Cesium.VerticalOrigin.BOTTOM
-      }
-      // properties: data
+      },
+      properties: data
     });
+    // 是否定位
+    if (isLocation) {
+      let offset = new Cesium.HeadingPitchRange(0, Cesium.Math.toRadians(-90), 0);
+      that._viewer.flyTo(pointDs, { duration: 1.5, offset });
+    }
   }
 
   // 通过entity创建关联气泡
   createPointPoup(entity) {
     if (this._htmlTag) this._htmlTag.destroy();
+    const id = entity.properties.id._value;
+    const comp = id.component;
+
+    let popHtml = `<div class='kq-label-popup' style='background-color:var(--kq-bg-color); border-radius: 8px;  padding: 10px;'>
+                <div id='tag_vue_${id.id}'></div>
+                <span class='triangle' ></span>
+                <a class='close' style='color: #757575' href="javascript:void(0)" onclick="document.getElementsByClassName('kq-label-popup')[0].style.display='none';"><span>×</span></a>
+              </div>`;
     this._htmlTag = new Cesium.Kq3dHtmlTag(this._viewer, {
-      html: "<div>" + entity.properties.id._value + "</div>",
+      // html: "<div>" + entity.properties.id._value + "</div>",
+      html: popHtml,
       position: entity.position,
-      anchor: [0, -entity.properties.height._value],
-      alignmentMode: 7
+      anchor: [0, -entity.properties.height._value - 4],
+      alignmentMode: 7,
+      noEvent: false
     });
+    if (comp) {
+      const pop = id.createVNode(id.component, id.componentProps);
+      // 传入外部vue的appContext到createVNode创建的vue组件对象中
+      if (id.appContext) pop.appContext = id.appContext;
+      setTimeout(() => {
+        id.render(pop, document.getElementById("tag_vue_" + id.id));
+      }, 0);
+    }
   }
 
   // 通过id打开地理编码图标气泡
@@ -60851,7 +61018,8 @@ class LayerManager {
     let that = this;
     this._layerListData.forEach(layer => {
       if (layer.visible) {
-        layers_checked.push(layer);
+        // layers_checked.push(layer);
+        layers_checked.unshift(layer);
       }
     }, this);
     const layers_old = this._layerListData_old;
@@ -73806,7 +73974,8 @@ class WindySlicingViewModel {
       attrRange: [ranges[0], ranges[ranges.length - 1]],
       varName: this._windySlicingLayerconfig?.params?.varNames,
     };
-    return new Cesium.Kq3dGridVolumeProvider(Object.assign({}, this._currentVolumeOption, params || {}));
+    Object.assign(this._currentVolumeOption, params || {})
+    return new Cesium.Kq3dGridVolumeProvider(this._currentVolumeOption);
   }
   /**
    * 创建线剖切
@@ -74367,6 +74536,7 @@ function formatTooltip(val) {
 }
 // 销毁
 (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.onBeforeUnmount)(() => {
+  global_event_default().off("windyTypeChange", handleWindyTypeChange);
   viewModel && viewModel.destroy();
 });
 
@@ -75648,14 +75818,6 @@ module.exports = __WEBPACK_EXTERNAL_MODULE__7997__;
 "use strict";
 module.exports = __WEBPACK_EXTERNAL_MODULE__1895__;
 
-/***/ }),
-
-/***/ 7747:
-/***/ (function(module) {
-
-"use strict";
-module.exports = __WEBPACK_EXTERNAL_MODULE__7747__;
-
 /***/ })
 
 /******/ 	});