@kq_npm/client3d_webgl_vue 4.5.37 → 4.5.38

package/adddata/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/_utils/webmapservice"), require("@kq_npm/client_common_vue/_utils/util"), require("@kq_npm/client_common_vue/init.js"), require("@kq_npm/client_common_vue/_utils/const-image"), require("papaparse"));
+		module.exports = factory(require("vue"), require("@kq_npm/client_common_vue/_utils/gis-utils"), require("@kq_npm/client_common_vue/_utils/webmapservice"), require("@kq_npm/client_common_vue/_utils/util"), require("@kq_npm/client_common_vue/init.js"), require("@kq_npm/client_common_vue/_utils/const-image"));
 	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/_utils/webmapservice", "@kq_npm/client_common_vue/_utils/util", "@kq_npm/client_common_vue/init.js", "@kq_npm/client_common_vue/_utils/const-image", "papaparse"], factory);
+		define("@kq_npm/client3d_webgl_vue", ["vue", "@kq_npm/client_common_vue/_utils/gis-utils", "@kq_npm/client_common_vue/_utils/webmapservice", "@kq_npm/client_common_vue/_utils/util", "@kq_npm/client_common_vue/init.js", "@kq_npm/client_common_vue/_utils/const-image"], 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/_utils/webmapservice"), require("@kq_npm/client_common_vue/_utils/util"), require("@kq_npm/client_common_vue/init.js"), require("@kq_npm/client_common_vue/_utils/const-image"), require("papaparse"));
+		exports["@kq_npm/client3d_webgl_vue"] = factory(require("vue"), require("@kq_npm/client_common_vue/_utils/gis-utils"), require("@kq_npm/client_common_vue/_utils/webmapservice"), require("@kq_npm/client_common_vue/_utils/util"), require("@kq_npm/client_common_vue/init.js"), require("@kq_npm/client_common_vue/_utils/const-image"));
 	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/_utils/webmapservice"], root["@kq_npm/client_common_vue/_utils/util"], root["@kq_npm/client_common_vue/init.js"], root["@kq_npm/client_common_vue/_utils/const-image"], root["_"]);
-})(this, function(__WEBPACK_EXTERNAL_MODULE__1895__, __WEBPACK_EXTERNAL_MODULE__7135__, __WEBPACK_EXTERNAL_MODULE__3217__, __WEBPACK_EXTERNAL_MODULE__3458__, __WEBPACK_EXTERNAL_MODULE__7997__, __WEBPACK_EXTERNAL_MODULE__6277__, __WEBPACK_EXTERNAL_MODULE__7747__) {
+		root["@kq_npm/client3d_webgl_vue"] = factory(root["Vue"], root["@kq_npm/client_common_vue/_utils/gis-utils"], root["@kq_npm/client_common_vue/_utils/webmapservice"], root["@kq_npm/client_common_vue/_utils/util"], root["@kq_npm/client_common_vue/init.js"], root["@kq_npm/client_common_vue/_utils/const-image"]);
+})(this, function(__WEBPACK_EXTERNAL_MODULE__1895__, __WEBPACK_EXTERNAL_MODULE__7135__, __WEBPACK_EXTERNAL_MODULE__3217__, __WEBPACK_EXTERNAL_MODULE__3458__, __WEBPACK_EXTERNAL_MODULE__7997__, __WEBPACK_EXTERNAL_MODULE__6277__) {
 return /******/ (function() { // webpackBootstrap
 /******/ 	"use strict";
 /******/ 	var __webpack_modules__ = ({
@@ -105,13 +105,6 @@ module.exports = __WEBPACK_EXTERNAL_MODULE__7997__;
 
 module.exports = __WEBPACK_EXTERNAL_MODULE__1895__;
 
-/***/ }),
-
-/***/ 7747:
-/***/ (function(module) {
-
-module.exports = __WEBPACK_EXTERNAL_MODULE__7747__;
-
 /***/ })
 
 /******/ 	});
@@ -211,9 +204,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.
@@ -361,7 +354,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;

package/boxclip/index.js

@@ -179,6 +179,7 @@ var message = __webpack_require__(1705);
  */
 //Box裁剪逻辑类
 
+
 class BoxClipViewModel {
   _viewer = null; //三维viewer对象
   _options = {}; //Box裁剪存储参数对象
@@ -205,13 +206,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 => {
@@ -222,14 +224,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
@@ -254,7 +267,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;
       }
     }
@@ -285,6 +298,7 @@ class BoxClipViewModel {
     //移除监听事件
     this._removeEventListener && this._removeEventListener();
     this._removeEventListener = null;
+    gis_utils_.mapViewUtils.offViewEvents("resetLayerDatas", this._resetListData, this._viewer._container.id);
   }
 
   // 设置裁剪对象
@@ -498,20 +512,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生成
  */