@kq_npm/client3d_webgl_vue 4.5.55 → 4.5.57

package/geologicalbodyanalysis/index.js

@@ -127,6 +127,8 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
       lang,
       locale
     } = (0, _useGlobalConfig.useLocale)();
+
+    // 地质体对象列表
     let geologys = (0, _vue.ref)([]);
 
     // 获取组件传参
@@ -137,6 +139,8 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
       drillingRadius: props?.settingParams?.drillingRadius ?? 10,
       drillingDepth: props?.settingParams?.drillingDepth ?? 50
     });
+
+    // 地质体分析视图模型实例
     let viewModel = null;
 
     // 组件容器Ref
@@ -144,6 +148,7 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
 
     // 生成组件默认header
     let headerTemp = (0, _vue.ref)();
+    // header组件引用Ref
     let headerTempRef = (0, _vue.ref)();
     (0, _vue.onMounted)(() => {
       (0, _util.updatePosition)(boxRef.value, props);
@@ -173,6 +178,10 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
         }
       }, 1000);
     });
+    /** @description 视图模型回调，地质体加载完成后刷新地质体列表
+     * @param {string} key 回调参数键
+     * @param {*} val 回调参数值
+     */
     function callbackParams(key, val) {
       if (viewModel) {
         tiles.value = viewModel.findLayers(); // 获取所有tileset对象
@@ -190,9 +199,12 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
       }
     };
 
-    // 参数改变
+    /** @description 参数改变处理，根据参数类型更新地质体分析状态
+     * @param {string} key 变化的参数类型（geology/drillingRadius/drillingDepth）
+     */
     function paramsChanged(key) {
       switch (key) {
+        // 地质体对象变化
         case "geology":
           viewModel.setLayer(formItem.geology);
           break;
@@ -547,6 +559,12 @@ var _useGlobalConfig = __webpack_require__(22686);
 //地质体分析逻辑类
 
 class GeologicalBodyAnalysisViewModel {
+  //外部回调函数
+  /** @description 构造函数，初始化地质体分析视图模型并绑定测量事件
+   * @param {Object} scenceView 三维场景视图对象
+   * @param {Object} options 地质体分析配置参数
+   * @param {Function} callbackParams 外部回调函数
+   */
   constructor(scenceView, options, callbackParams) {
     this._viewer = null;
     //三维viewer对象
@@ -555,7 +573,9 @@ class GeologicalBodyAnalysisViewModel {
     this._geologyBody = null;
     //地质体分析三维对象
     this._measureHandler = null;
+    //测量三维对象
     this._language = {};
+    //多语言资源对象
     this.callbackParams = null;
     const {
       locale
@@ -565,6 +585,7 @@ class GeologicalBodyAnalysisViewModel {
     this._viewer = scenceView._viewer;
     this.callbackParams = callbackParams;
     this._measureHandler = new Cesium.Kq3dMeasureHandler(scenceView._viewer);
+    // 自定义绘制提示样式
     if (scenceView._props.showDrawTipsStyle) {
       this._measureHandler.showDrawTips = scenceView._props.showDrawTipsStyle;
       this._measureHandler.drawTipsStyle = {
@@ -575,10 +596,12 @@ class GeologicalBodyAnalysisViewModel {
         }
       };
     }
+    // 测量完成事件：隐藏测量结果标签
     this._measureHandler.measureEvent.addEventListener(function (result) {
       if (result.measureResult.labels) result.measureResult.labels.show = false;
     });
     let that = this;
+    // 测量激活状态事件：测量结束(ret==false)时根据操作类型执行地质体分析
     this._measureHandler.activeEvent.addEventListener(function (ret) {
       if (ret == false) {
         if (that._measureHandler.measureResults && that._measureHandler.measureResults.length > 0) {
@@ -603,6 +626,7 @@ class GeologicalBodyAnalysisViewModel {
               break;
             case 3:
               // 钻孔
+              // 收集所有测量点位置作为钻孔位置
               let positions = [];
               for (let i = that._measureHandler.measureResults.length - 1; i >= 0; i--) {
                 positions.push(that._measureHandler.measureResults[i].entities[0].position._value);
@@ -627,6 +651,9 @@ class GeologicalBodyAnalysisViewModel {
     // 添加图层数据源变化监听
     _gisUtils.mapViewUtils.bindViewEvents("resetLayerDatas", this._resetListData, scenceView._viewerId);
   }
+  /** @description 图层数据重置回调，响应图层数据源变化事件
+   * @param {Object} e 事件对象
+   */
   _resetListData(e) {
     // 如果图层变化事件是自己触发的 则不继续执行 避免死循环
     if (e.eventTarget && e.eventTarget === this) {
@@ -639,8 +666,11 @@ class GeologicalBodyAnalysisViewModel {
     let geologys = [];
     const geologyBodyCollection = this._viewer.geologyBodyCollection;
     for (let i = 0; i < geologyBodyCollection.length; i++) {
+      // 仅处理包含地质体图元集合的对象
       if (geologyBodyCollection[i].geologyPrimitiveCollection) {
+        // 缺少guid则自动生成
         if (!geologyBodyCollection[i].guid) geologyBodyCollection[i].guid = Cesium.createGuid();
+        // 隐藏的地质体跳过
         if (geologyBodyCollection[i]?.show == false) continue;
         geologys.push({
           guid: geologyBodyCollection[i].guid,
@@ -651,7 +681,9 @@ class GeologicalBodyAnalysisViewModel {
     return geologys;
   }
 
-  // 设置地质体分析对象
+  /** @description 设置地质体分析对象，根据guid查找对应地质体
+   * @param {string} guid 地质体唯一标识
+   */
   setLayer(guid) {
     this.clear();
     this._geologyBody = this._viewer.geologyBodyCollection.find(function (item) {
@@ -664,6 +696,7 @@ class GeologicalBodyAnalysisViewModel {
     // 判断是否添加了地质体
     if (this._viewer.geologyBodyCollection.length > 0 && this._geologyBody) {
       this.clear();
+      // 根据操作类型启动对应的测量模式
       switch (this._options.operationType) {
         case 1:
           // 剖切
@@ -681,6 +714,7 @@ class GeologicalBodyAnalysisViewModel {
           break;
       }
     } else {
+      // 未选择地质体则提示
       (0, _message.default)({
         message: this._language.value.webgl["addGeologyBodyTips"],
         type: "warning"
@@ -691,7 +725,9 @@ class GeologicalBodyAnalysisViewModel {
   //清除全部
   clear() {
     if (this._geologyBody) {
+      // 移除剖切结果图元
       this._viewer.scene.primitives.remove(this._geologyBody.sectionPrimitives);
+      // 地质体图元已被清空时重新创建
       if (this._geologyBody.geologyPrimitiveCollection.length == 0) {
         this._geologyBody.createGeology(this._geologyBody.data).then(function (that) {
           if (!that.viewer.scene.primitives.contains(that.geologyPrimitives)) {
@@ -723,11 +759,11 @@ Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
 exports.kq_npm_client_leaflet_vue = exports.kq_npm_client_common_vue = exports.kq_npm_client3d_webgl_vue = void 0;
-let kq_npm_client_common_vue = exports.kq_npm_client_common_vue = window.kq_npm_client_common_vue = window.kq_npm_client_common_vue || {};
+const kq_npm_client_common_vue = exports.kq_npm_client_common_vue = window.kq_npm_client_common_vue = window.kq_npm_client_common_vue || {};
 __webpack_require__.g.kq_npm_client_common_vue = kq_npm_client_common_vue;
-let kq_npm_client_leaflet_vue = exports.kq_npm_client_leaflet_vue = window.kq_npm_client_leaflet_vue = window.kq_npm_client_leaflet_vue || {};
+const kq_npm_client_leaflet_vue = exports.kq_npm_client_leaflet_vue = window.kq_npm_client_leaflet_vue = window.kq_npm_client_leaflet_vue || {};
 __webpack_require__.g.kq_npm_client_leaflet_vue = kq_npm_client_leaflet_vue;
-let kq_npm_client3d_webgl_vue = exports.kq_npm_client3d_webgl_vue = window.kq_npm_client3d_webgl_vue = window.kq_npm_client3d_webgl_vue || {};
+const kq_npm_client3d_webgl_vue = exports.kq_npm_client3d_webgl_vue = window.kq_npm_client3d_webgl_vue = window.kq_npm_client3d_webgl_vue || {};
 __webpack_require__.g.kq_npm_client3d_webgl_vue = kq_npm_client3d_webgl_vue;
 
 /***/ })

package/gpuspatialquery/index.js

@@ -393,6 +393,10 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
     mapTarget: {
       type: String
     },
+    propertyName: {
+      type: String,
+      default: "id"
+    },
     //图形
     volumeType: {
       type: Number,
@@ -488,6 +492,8 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
       // 绕Z轴旋转最小值
       maxZRotate: props?.settingParams?.maxZRotate ?? 90 // 绕Z轴旋转最大值
     });
+
+    // GPU空间查询视图模型实例
     let viewModel = null;
 
     // 组件容器Ref
@@ -495,6 +501,7 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
 
     // 生成组件默认header
     let headerTemp = (0, _vue.ref)();
+    // header组件引用Ref
     let headerTempRef = (0, _vue.ref)();
     (0, _vue.onMounted)(() => {
       (0, _util.updatePosition)(boxRef.value, props);
@@ -510,6 +517,7 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
       _gisUtils.utils.getWebMap(props.mapTarget, scenceView => {
         if (scenceView) {
           viewModel = new _GPUSpatialQueryViewModel.default(scenceView, {
+            propertyName: props.propertyName,
             volumeType: formItem.volumeType,
             positionMode: formItem.positionMode,
             scale: formItem.scale,
@@ -531,24 +539,32 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
       }
     };
 
-    // 参数切换
+    /** @description 参数切换处理，根据参数类型更新查询体属性
+     * @param {string} key 变化的参数类型（type/mode/scale/xRotate/yRotate/zRotate）
+     */
     function paramsChanged(key) {
       switch (key) {
+        // 查询体类型变化
         case "type":
           viewModel.setType(formItem.volumeType);
           break;
+        // 空间关系模式变化
         case "mode":
           viewModel.setMode(formItem.positionMode);
           break;
+        // 缩放比例变化
         case "scale":
           viewModel.setScale(formItem.scale);
           break;
+        // X轴旋转角度变化
         case "xRotate":
           viewModel.setXangle(formItem.xRotate);
           break;
+        // Y轴旋转角度变化
         case "yRotate":
           viewModel.setYangle(formItem.yRotate);
           break;
+        // Z轴旋转角度变化
         case "zRotate":
           viewModel.setZangle(formItem.zRotate);
           break;
@@ -1007,6 +1023,11 @@ var _useGlobalConfig = __webpack_require__(22686);
 //GPU空间查询逻辑类
 
 class GPUSpatialQueryViewModel {
+  //是否使用数据库ID作为匹配字段
+  /** @description 构造函数，初始化GPU空间查询视图模型并绑定查询完成事件
+   * @param {Object} scenceView 三维场景视图对象
+   * @param {Object} options 空间查询配置参数
+   */
   constructor(scenceView, options) {
     this._gpuSpatialQuery = null;
     //GPU查询三维对象
@@ -1018,13 +1039,16 @@ class GPUSpatialQueryViewModel {
     //绘制图形的坐标
     this._options = null;
     //传入参数
-    this.finishedQuery = null;
-    //绘制后的查询事件
     this._language = {};
+    //多语言资源对象
+    this._propertyName = "id";
+    // 模型属性匹配字段名称
+    this._useDBId = true;
     const {
       locale
     } = (0, _useGlobalConfig.useLocale)();
     this._language = locale;
+    if (options.propertyName) this._propertyName = options.propertyName;
     options.viewer = scenceView._viewer;
     options.viewer.scene.globe.depthTestAgainstTerrain = true;
     options.viewer.scene.logarithmicDepthBuffer = true;
@@ -1033,9 +1057,11 @@ class GPUSpatialQueryViewModel {
     this._gpuSpatialQuery = new Cesium.Kq3dSpatialQuery({
       viewer: options.viewer
     });
-    this.finishedQuery = this._gpuSpatialQuery.finishSQ;
+    this._gpuSpatialQuery.useDBId = this._useDBId;
+    this._gpuSpatialQuery.keyPropertyName = this._propertyName;
     this._drawManager = scenceView._drawManager;
     var that = this;
+    // 查询结束后的回调事件,高亮结果
     this._gpuSpatialQuery.finishSQ.addEventListener(function () {
       // 查询结束后的回调事件,高亮结果
       for (let l = 0; l < that._gpuSpatialQuery._layers.length; l++) {
@@ -1046,17 +1072,21 @@ class GPUSpatialQueryViewModel {
           const tile = tileset._selectedTiles[n];
           const content = tile.content;
           if (content) {
+            // 遍历瓦片中所有要素，命中查询结果则高亮显示
             for (let i = 0; i < content.featuresLength; i++) {
               const feature = content.getFeature(i);
+              const idname = feature.getProperty(that._propertyName);
               let bFind = false;
-              if (feature.pickId) {
-                const id = feature.pickId.key;
-                for (let j = 0; j < queryIds.length; j++) {
-                  if (queryIds[j] == id) {
-                    bFind = true;
-                  }
+              let id = null;
+              if (feature.pickId) id = feature.pickId.key;
+              if (that._useDBId) id = idname;
+              // 比对要素ID与查询结果ID
+              for (let j = 0; j < queryIds.length; j++) {
+                if (queryIds[j] == id) {
+                  bFind = true;
                 }
               }
+              // 命中高亮为青色，否则还原为白色
               if (bFind) {
                 feature.color = Cesium.Color.AQUA;
               } else {
@@ -1082,6 +1112,7 @@ class GPUSpatialQueryViewModel {
         flag = true;
       }
     }
+    // 存在模型则启动绘制，否则提示添加模型
     if (flag) {
       this.clear();
       this.findLayers();
@@ -1091,6 +1122,7 @@ class GPUSpatialQueryViewModel {
         }, (feature, {
           shape
         }) => {
+          // 过滤非当前查询组绘制的要素
           if (!shape.groupName || shape.groupName !== "GPUSpatialQueryDraw") return;
           if (shape) {
             that._center = shape.position;
@@ -1103,6 +1135,7 @@ class GPUSpatialQueryViewModel {
         }, "GPUSpatialQueryDraw", true);
       }
     } else {
+      // 场景中无模型则提示
       (0, _message.default)({
         message: this._language.value.webgl["addModelAnalysisTips"],
         type: "warning"
@@ -1131,6 +1164,16 @@ class GPUSpatialQueryViewModel {
     this.clear();
     // this._gpuSpatialQuery && this._gpuSpatialQuery.destroy();
     this._gpuSpatialQuery = null;
+    // 清除所有3dtiles对象的监听事件
+    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].tileVisibleRemoveCallback) {
+          primitives[m].tileVisibleRemoveCallback();
+          delete primitives[m].tileVisibleRemoveCallback;
+        }
+      }
+    }
   }
 
   // 查找所有3dtiles模型对象
@@ -1140,6 +1183,53 @@ class GPUSpatialQueryViewModel {
     for (let m = 0; m < primitives.length; m++) {
       if (primitives[m] instanceof Cesium.Cesium3DTileset) {
         this._options.layers.push(new Cesium.Kq3dLayerQuery(primitives[m]));
+        if (!primitives[m].tileVisibleRemoveCallback) {
+          primitives[m].tileVisibleRemoveCallback = primitives[m].tileVisible.addEventListener(this.tileVisibleListener, this);
+        }
+      }
+    }
+  }
+
+  /** @description 3dtiles瓦片刷新时重新高亮模型
+   * @param {Object} tile 瓦片对象
+   */
+  tileVisibleListener(tile) {
+    let tileset = tile.tileset;
+    let content = tile.content;
+    let queryIds;
+    // 查找当前瓦片集对应的查询结果ID集合
+    if (this._gpuSpatialQuery) {
+      for (let c = 0; c < this._gpuSpatialQuery._layers.length; c++) {
+        if (this._gpuSpatialQuery._layers[c].layer == tileset) {
+          queryIds = this._gpuSpatialQuery._layers[c].sqResult;
+          break;
+        }
+      }
+    }
+
+    // 有查询结果时按ID匹配高亮，无结果时还原为白色
+    if (queryIds && queryIds.length > 0) {
+      for (let i = 0; i < content.featuresLength; i++) {
+        let feature = content.getFeature(i);
+        let idname = feature.getProperty(this._propertyName);
+        let bFind = false;
+        let id = null;
+        if (feature.pickId) id = feature.pickId.key;
+        let accId = id;
+        if (this._useDBId) accId = idname;
+        for (var j = 0; j < queryIds.length; j++) {
+          if (queryIds[j] == accId) {
+            bFind = true;
+          }
+        }
+        if (bFind) feature.color = Cesium.Color.AQUA;else feature.color = Cesium.Color.WHITE;
+      }
+      tileset.makeStyleDirty();
+    } else {
+      // 无查询结果，还原所有要素颜色
+      for (let i = 0; i < content.featuresLength; i++) {
+        let feature = content.getFeature(i);
+        feature.color = Cesium.Color.WHITE;
       }
     }
   }
@@ -1147,6 +1237,7 @@ class GPUSpatialQueryViewModel {
   //创建查询体
   createGeometry() {
     switch (this._options.volumeType) {
+      // 立方体
       case 0:
         var options0 = {
           length: 260,
@@ -1156,6 +1247,7 @@ class GPUSpatialQueryViewModel {
         };
         this._geometry = new Cesium.Kq3dGeoBox(options0);
         break;
+      // 球体
       case 1:
         var options1 = {
           position: this._center,
@@ -1163,6 +1255,7 @@ class GPUSpatialQueryViewModel {
         };
         this._geometry = new Cesium.Kq3dGeoSphere(options1);
         break;
+      // 圆柱体
       case 2:
         var options2 = {
           position: this._center,
@@ -1172,6 +1265,7 @@ class GPUSpatialQueryViewModel {
         };
         this._geometry = new Cesium.Kq3dGeoCylinder(options2);
         break;
+      // 椭球体
       case 3:
         var options3 = {
           position: this._center,
@@ -1181,6 +1275,7 @@ class GPUSpatialQueryViewModel {
         };
         this._geometry = new Cesium.Kq3dGeoEllipsoid(options3);
         break;
+      // 圆锥体
       case 4:
         var options4 = {
           position: this._center,
@@ -1192,6 +1287,7 @@ class GPUSpatialQueryViewModel {
       default:
         break;
     }
+    // 应用缩放与旋转参数到查询体
     if (this._geometry) {
       this._geometry.scaleX = this._options.scale;
       this._geometry.scaleY = this._options.scale;
@@ -1202,7 +1298,9 @@ class GPUSpatialQueryViewModel {
     }
   }
 
-  //查询体类型
+  /** @description 设置查询体类型并重新执行查询
+   * @param {number} type 查询体类型（0：立方体 1：球体 2：圆柱 3：椭球 4：圆锥）
+   */
   setType(type) {
     this._options.volumeType = type;
     this.createGeometry();
@@ -1213,7 +1311,9 @@ class GPUSpatialQueryViewModel {
     //this.startQuery();
   }
 
-  //查询体模式 相交  相离  包含
+  /** @description 设置查询体空间关系模式（相交/相离/包含）
+   * @param {number} mode 空间关系模式（0：相交 1：相离 2：包含）
+   */
   setMode(mode) {
     this._options.positionMode = mode;
     if (this._gpuSpatialQuery) {
@@ -1223,7 +1323,9 @@ class GPUSpatialQueryViewModel {
     //this.startQuery();
   }
 
-  //查询体缩放
+  /** @description 设置查询体缩放比例
+   * @param {number} scale 缩放比例
+   */
   setScale(scale) {
     this._options.scale = scale;
     if (this._geometry) {
@@ -1234,7 +1336,9 @@ class GPUSpatialQueryViewModel {
     }
     //this.startQuery();
   }
-  //查询体绕X轴旋转
+  /** @description 设置查询体绕X轴旋转角度
+   * @param {number} xAngle X轴旋转角度
+   */
   setXangle(xAngle) {
     this._options.xAngle = xAngle;
     if (this._geometry) {
@@ -1243,7 +1347,9 @@ class GPUSpatialQueryViewModel {
     }
     //this.startQuery();
   }
-  //查询体绕Y轴旋转
+  /** @description 设置查询体绕Y轴旋转角度
+   * @param {number} yAngle Y轴旋转角度
+   */
   setYangle(yAngle) {
     this._options.yAngle = yAngle;
     if (this._geometry) {
@@ -1252,7 +1358,9 @@ class GPUSpatialQueryViewModel {
     }
     //this.startQuery();
   }
-  //查询体绕Z轴旋转
+  /** @description 设置查询体绕Z轴旋转角度
+   * @param {number} zAngle Z轴旋转角度
+   */
   setZangle(zAngle) {
     this._options.zAngle = zAngle;
     if (this._geometry) {
@@ -2615,11 +2723,11 @@ Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
 exports.kq_npm_client_leaflet_vue = exports.kq_npm_client_common_vue = exports.kq_npm_client3d_webgl_vue = void 0;
-let kq_npm_client_common_vue = exports.kq_npm_client_common_vue = window.kq_npm_client_common_vue = window.kq_npm_client_common_vue || {};
+const kq_npm_client_common_vue = exports.kq_npm_client_common_vue = window.kq_npm_client_common_vue = window.kq_npm_client_common_vue || {};
 __webpack_require__.g.kq_npm_client_common_vue = kq_npm_client_common_vue;
-let kq_npm_client_leaflet_vue = exports.kq_npm_client_leaflet_vue = window.kq_npm_client_leaflet_vue = window.kq_npm_client_leaflet_vue || {};
+const kq_npm_client_leaflet_vue = exports.kq_npm_client_leaflet_vue = window.kq_npm_client_leaflet_vue = window.kq_npm_client_leaflet_vue || {};
 __webpack_require__.g.kq_npm_client_leaflet_vue = kq_npm_client_leaflet_vue;
-let kq_npm_client3d_webgl_vue = exports.kq_npm_client3d_webgl_vue = window.kq_npm_client3d_webgl_vue = window.kq_npm_client3d_webgl_vue || {};
+const kq_npm_client3d_webgl_vue = exports.kq_npm_client3d_webgl_vue = window.kq_npm_client3d_webgl_vue = window.kq_npm_client3d_webgl_vue || {};
 __webpack_require__.g.kq_npm_client3d_webgl_vue = kq_npm_client3d_webgl_vue;
 
 /***/ })