@kq_npm/client3d_webgl_vue 4.5.36 → 4.5.38

package/measure/index.js

@@ -635,7 +635,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) => {
@@ -647,7 +648,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, [

package/modelfilter/index.js

@@ -180,12 +180,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裁剪存储参数对象
@@ -196,19 +197,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
@@ -269,6 +282,7 @@ class ModelFilterViewModel {
 
   //销毁
   destroy() {
+    gis_utils_.mapViewUtils.offViewEvents("resetLayerDatas", this._resetListData, this._viewer._container.id);
     this.clear();
   }
 }
@@ -412,7 +426,7 @@ headerTempTitle.value = language.value.modelFilterPick;
         saturation: formItem.saturation,
         gamma: formItem.gamma
       };
-      viewModel = new ModelFilterViewModel(scenceView, options);
+      viewModel = new ModelFilterViewModel(scenceView, options, callbackParams);
     }
   });
   setTimeout(() => {
@@ -421,7 +435,13 @@ headerTempTitle.value = language.value.modelFilterPick;
     }
   }, 1000);
 });
-
+function callbackParams (key, val) {
+   if (viewModel) {
+      tiles.value = viewModel.findLayers(); // 获取所有tileset对象
+      formItem.tileset = "";
+      paramsChanged("tileset");
+    }
+}
 /**
  * @description 监听header生成
  */

package/modelselect/index.js

@@ -188,6 +188,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;
@@ -216,15 +219,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);
@@ -277,6 +295,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;
+    }
   }
 
   //销毁

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"4.5.36","homepage":"","keywords":["KQGIS","webGL","Vue"],"sdkNames":["@kq_npm/client_icons_vue"],"restrictedVersion":true,"validateSDK":true,"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","jsdelivr":"index.js","dependencies":{"save":"2.5.0","papaparse":"5.4.1"}}
+{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"4.5.38","homepage":"","keywords":["KQGIS","webGL","Vue"],"sdkNames":["@kq_npm/client_icons_vue"],"restrictedVersion":true,"validateSDK":true,"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"zhupc_npm","license":"Apache-2.0","jsdelivr":"index.js","dependencies":{"html2canvas-pro":"1.5.10","save":"2.5.0","papaparse":"5.4.1"}}

package/planeclip/index.js

@@ -179,6 +179,7 @@ var message = __webpack_require__(1705);
  */
 //平面裁剪逻辑类
 
+
 class PlaneClipViewModel {
   _viewer = null; //三维viewer对象
   _options = {}; //平面裁剪存储参数对象
@@ -209,13 +210,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) {
@@ -225,14 +228,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
@@ -257,7 +271,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;
       }
     }
@@ -287,6 +301,7 @@ class PlaneClipViewModel {
     //移除监听事件
     this._removeEventListener && this._removeEventListener();
     this._removeEventListener = null;
+    gis_utils_.mapViewUtils.offViewEvents("resetLayerDatas", this._resetListData, this._viewer._container.id);
   }
 
   // 设置裁剪对象
@@ -473,20 +488,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生成
  */