@kq_npm/client3d_webgl_vue 3.1.1-beta → 3.1.3-beta

package/adddata/index.js

@@ -802,7 +802,8 @@ class AddDataViewModel {
           serverType: "imagerylayer",
           lsType: "ls",
           url: url,
-          addType: type
+          addType: type,
+          layerName: name
         };
 
         this._layerManager.addTempLayerNode(node);
@@ -863,13 +864,13 @@ class AddDataViewModel {
             });
           }
 
+          setChildrenAddType(mapServerInfo.layerTreeData, type);
           mapServerInfo.layerTreeData.forEach(node => {
             node.lsType = "ls";
-            node.serverType = "imagerylayer";
-            node.addType = type;
 
             this._layerManager.addTempLayerNode(node, 1);
 
+            console.log(node);
             cb && cb(node);
           }, this);
         });
@@ -919,7 +920,7 @@ class AddDataViewModel {
                 serverType: "imagerylayer",
                 url: url,
                 addType: type,
-                id: layers[i].layers
+                id: layers[i]._imageryProvider.layers
               });
             }
           }
@@ -954,7 +955,7 @@ class AddDataViewModel {
                 serverType: "imagerylayer",
                 url: url,
                 addType: type,
-                id: layers[i]._layer
+                id: layers[i]._imageryProvider._layer
               });
             }
           }
@@ -1117,6 +1118,18 @@ class AddDataViewModel {
     }
   }
 
+} // 设置子节点addType属性
+
+function setChildrenAddType(nodeList, addType) {
+  for (let i = 0; i < nodeList.length; i++) {
+    const node = nodeList[i];
+
+    if (node.children) {
+      setChildrenAddType(node.children, addType);
+    } else {
+      node.addType = addType;
+    }
+  }
 }
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/adddata/AddData.vue?vue&type=script&setup=true&lang=js
 

package/gpuspatialquery/index.js

@@ -47,13 +47,15 @@ class GPUSpatialQueryViewModel {
     var that = this;
     that._removeEventListener = that._drawManager.drawFinishedEvent.addEventListener(shape => {
       if (shape) {
-        that._drawManager.clear();
-
+        that._drawManager && that._drawManager.clear();
         that._center = shape.position; //that.startQuery();
 
         setTimeout(() => {
           //绘制跟高亮显示有冲突，所以延时执行查询
           that.startQuery();
+          that._drawManager && that._drawManager.startDraw("marker", {
+            image: null
+          });
         }, 10);
       }
     });
@@ -111,6 +113,7 @@ class GPUSpatialQueryViewModel {
     }
 
     if (flag) {
+      this.clear();
       this.findLayers();
 
       this._drawManager.startDraw("marker", {

package/index.js

@@ -5979,13 +5979,15 @@ class GPUSpatialQueryViewModel {
     var that = this;
     that._removeEventListener = that._drawManager.drawFinishedEvent.addEventListener(shape => {
       if (shape) {
-        that._drawManager.clear();
-
+        that._drawManager && that._drawManager.clear();
         that._center = shape.position; //that.startQuery();
 
         setTimeout(() => {
           //绘制跟高亮显示有冲突，所以延时执行查询
           that.startQuery();
+          that._drawManager && that._drawManager.startDraw("marker", {
+            image: null
+          });
         }, 10);
       }
     });
@@ -6043,6 +6045,7 @@ class GPUSpatialQueryViewModel {
     }
 
     if (flag) {
+      this.clear();
       this.findLayers();
 
       this._drawManager.startDraw("marker", {
@@ -6892,6 +6895,7 @@ class ModelSelectViewModel {
   //屏幕空间事件处理程序三维对象
   //拾取状态
   //高亮三维对象
+  //高亮颜色
   constructor(scenceView, pickCallFunc) {
     _defineProperty(this, "_viewer", null);
 
@@ -6901,7 +6905,7 @@ class ModelSelectViewModel {
 
     _defineProperty(this, "_highlight", null);
 
-    _defineProperty(this, "_modeFiled", 'id');
+    _defineProperty(this, "_highlightColor", "#FF0000");
 
     this._viewer = scenceView._viewer;
     this._drawManager = scenceView._drawManager;
@@ -6910,32 +6914,42 @@ class ModelSelectViewModel {
 
     this._handler.setInputAction(function (movement) {
       if (that._isPick) {
-        let pickedObject = that._viewer.scene.pick(movement.position); //console.log(pickedObject);
+        that.clearHighlight();
+
+        let pickedObject = that._viewer.scene.pick(movement.position); // console.log(pickedObject);
 
 
         if (pickedObject) {
           if (pickedObject instanceof Cesium.Cesium3DTileFeature) {
-            let properties = pickedObject.getPropertyNames() || [];
-            console.log(properties);
-
-            if (properties.indexOf(that._modeFiled) > -1) {
-              let id = pickedObject.getProperty(that._modeFiled); // that.clear();
-
-              that._highlight = new Cesium.Kq3dHighlight({
-                viewer: that._viewer,
-                tileset: pickedObject.tileset,
-                attrName: that._modeFiled,
-                attrValue: [id],
-                color: [Cesium.Color.RED]
-              });
-              let attrs = {};
-              properties.forEach(prop => {
-                attrs[prop] = pickedObject.getProperty(prop);
-              });
-              pickCallFunc && pickCallFunc(pickedObject.tileset.name || "LayerName", attrs);
-            } else {
-              console.log("Feature has no id attribute!");
-            }
+            let properties = pickedObject.getPropertyNames() || []; // console.log(properties);
+
+            that._highlight = {
+              object: pickedObject.pickId.object,
+              color: pickedObject.pickId.object.color
+            };
+            pickedObject.pickId.object.color = Cesium.Color.fromCssColorString(that._highlightColor);
+            let attrs = {};
+            properties.forEach(prop => {
+              attrs[prop] = pickedObject.getProperty(prop);
+            });
+            pickCallFunc && pickCallFunc(pickedObject.tileset.name || "LayerName", attrs); // if (properties.indexOf(that._modeFiled) > -1) {
+            //   let id = pickedObject.getProperty(that._modeFiled);
+            //   // that.clear();
+            //   that._highlight = new Cesium.Kq3dHighlight({
+            //     viewer: that._viewer,
+            //     tileset: pickedObject.tileset,
+            //     attrName: that._modeFiled,
+            //     attrValue: [id],
+            //     color: [Cesium.Color.RED]
+            //   });
+            //   let attrs = {};
+            //   properties.forEach(prop => {
+            //     attrs[prop] = pickedObject.getProperty(prop);
+            //   });
+            //   pickCallFunc && pickCallFunc(pickedObject.tileset.name || "LayerName", attrs);
+            // } else {
+            //   console.log("Feature has no id attribute!");
+            // }
           }
         }
       }
@@ -6964,12 +6978,21 @@ class ModelSelectViewModel {
     } else {
       throw "请添加模型后拾取!";
     }
+  }
+
+  clearHighlight() {
+    if (this._highlight) {
+      this._highlight.object.color = this._highlight.color;
+    }
+
+    this._highlight = null;
   } //清除
 
 
   clear() {
-    this._highlight && this._highlight.remove();
-    this._highlight = null;
+    this.clearHighlight(); // this._highlight && this._highlight.remove();
+    // this._highlight = null;
+
     this.setCursor("default");
     this._isPick = false;
   } //销毁
@@ -6987,16 +7010,21 @@ const ModelSelectvue_type_script_setup_true_lang_js_hoisted_1 = {
   class: "kq3d-model-select-box"
 };
 const ModelSelectvue_type_script_setup_true_lang_js_hoisted_2 = {
-  class: "modelTree"
+  class: "title"
 };
-const ModelSelectvue_type_script_setup_true_lang_js_hoisted_3 = {
+
+const ModelSelectvue_type_script_setup_true_lang_js_hoisted_3 = /*#__PURE__*/(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("span", null, "所属图层名称：", -1
+/* HOISTED */
+);
+
+const ModelSelectvue_type_script_setup_true_lang_js_hoisted_4 = {
   class: "footer-buttons"
 };
 
 
 
 
- // 树绑定字段
+ // tree数据源
 
 const ModelSelectvue_type_script_setup_true_lang_js_default_ = {
   name: "Kq3dModelSelect"
@@ -7005,14 +7033,15 @@ const ModelSelectvue_type_script_setup_true_lang_js_default_ = {
   props: {
     //指定组件绑定的viewer对象的div的id
     mapTarget: String,
-    modeFiled: {
-      default: "id",
-      type: String
-    },
     // 外部字段别名映射
     aliasNameReflection: {
       type: Function
     },
+    // 高亮颜色
+    highlightColor: {
+      type: String,
+      default: "#FF0000"
+    },
     // 是否显示阴影效果
     showShadow: {
       type: Boolean,
@@ -7053,12 +7082,7 @@ const ModelSelectvue_type_script_setup_true_lang_js_default_ = {
     expose
   }) {
     const props = __props;
-    const defaultProps = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.reactive)({
-      children: "children",
-      label: "label"
-    }); // tree数据源
-
-    let treeData = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)([]); // 属性值
+    let layerNameTitle = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)(""); // 属性值
 
     let tableData = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)([]); //语言
 
@@ -7093,6 +7117,7 @@ const ModelSelectvue_type_script_setup_true_lang_js_default_ = {
         if (scenceView) {
           language.value = scenceView._language;
           viewModel = new ModelSelectViewModel(scenceView, pickCallFunc);
+          viewModel._highlightColor = props.highlightColor;
         }
       });
     });
@@ -7107,36 +7132,45 @@ const ModelSelectvue_type_script_setup_true_lang_js_default_ = {
       }
     };
 
-    function setModeFiled(val) {
-      viewModel._modeFiled = val;
-    }
-
     function pick() {
       viewModel && viewModel.pick();
     }
 
     function pickCallFunc(layerName, properties) {
-      let newTreeData = [{
-        label: layerName,
-        children: [{
-          label: properties.id || "Model1"
-        }]
-      }];
-      treeData.value = newTreeData;
+      layerNameTitle.value = layerName;
       let propertiesData = [];
 
-      for (let key in properties) {
-        propertiesData.push({
-          field: key,
-          value: properties[key]
+      if (props.aliasNameReflection) {
+        let arrKeys = [];
+
+        for (let key in properties) {
+          arrKeys.push(key);
+        }
+
+        props.aliasNameReflection(arrKeys, item => {
+          console.log(item);
+
+          for (let key in properties) {
+            propertiesData.push({
+              field: item[key] ? item[key] : key,
+              value: properties[key]
+            });
+          }
         });
+      } else {
+        for (let key in properties) {
+          propertiesData.push({
+            field: key,
+            value: properties[key]
+          });
+        }
       }
 
       tableData.value = propertiesData;
     }
 
     function clear() {
-      treeData.value = [];
+      layerNameTitle.value = "";
       tableData.value = [];
       viewModel && viewModel.clear();
     } // 销毁
@@ -7148,22 +7182,15 @@ const ModelSelectvue_type_script_setup_true_lang_js_default_ = {
     expose({
       pick,
       clear,
-      pickCallFunc,
-      setModeFiled
+      pickCallFunc
     });
     return (_ctx, _cache) => {
-      const _component_KqTree = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("KqTree");
-
-      const _component_kq_scrollbar = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-scrollbar");
-
-      const _component_kq_col = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-col");
+      const _component_kq_row = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-row");
 
       const _component_kq_table_column = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-table-column");
 
       const _component_kq_table = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-table");
 
-      const _component_kq_row = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-row");
-
       const _component_kq_button = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-button");
 
       return (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementBlock)("section", {
@@ -7179,72 +7206,51 @@ const ModelSelectvue_type_script_setup_true_lang_js_default_ = {
       }, null, 512
       /* NEED_PATCH */
       )) : (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createCommentVNode)("v-if", true), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", ModelSelectvue_type_script_setup_true_lang_js_hoisted_1, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_row, null, {
-        default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_col, {
-          span: 8
-        }, {
-          default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", ModelSelectvue_type_script_setup_true_lang_js_hoisted_2, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_scrollbar, {
-            class: "scrollbarClass"
-          }, {
-            default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_KqTree, {
-              data: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(treeData),
-              props: defaultProps,
-              "expand-on-click-node": false,
-              "default-expand-all": "",
-              "highlight-current": "",
-              "node-key": "id"
-            }, null, 8
-            /* PROPS */
-            , ["data", "props"])]),
-            _: 1
-            /* STABLE */
-
-          })])]),
-          _: 1
-          /* STABLE */
+        default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", ModelSelectvue_type_script_setup_true_lang_js_hoisted_2, [ModelSelectvue_type_script_setup_true_lang_js_hoisted_3, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("span", null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(layerNameTitle)), 1
+        /* TEXT */
+        )])]),
+        _: 1
+        /* STABLE */
 
-        }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_col, {
-          span: 16
+      }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_row, {
+        class: "modelTable"
+      }, {
+        default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_table, {
+          border: "",
+          stripe: "",
+          data: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(tableData),
+          style: {
+            "width": "100%",
+            "height": "100%"
+          },
+          "cell-style": {
+            padding: '8px 0'
+          },
+          "header-cell-style": (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(headClass)
         }, {
-          default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_table, {
-            border: "",
-            stripe: "",
-            data: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(tableData),
-            style: {
-              "width": "100%",
-              "height": "100%"
-            },
-            "cell-style": {
-              padding: '8px 0'
-            },
-            "header-cell-style": (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(headClass)
-          }, {
-            default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_table_column, {
-              label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).fieldName,
-              prop: "field",
-              align: "center"
-            }, null, 8
-            /* PROPS */
-            , ["label"]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_table_column, {
-              label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).fieldValue,
-              prop: "value",
-              align: "center"
-            }, null, 8
-            /* PROPS */
-            , ["label"])]),
-            _: 1
-            /* STABLE */
-
-          }, 8
+          default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_table_column, {
+            label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).fieldName,
+            prop: "field",
+            align: "center"
+          }, null, 8
           /* PROPS */
-          , ["data", "header-cell-style"])]),
+          , ["label"]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_table_column, {
+            label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).fieldValue,
+            prop: "value",
+            align: "center"
+          }, null, 8
+          /* PROPS */
+          , ["label"])]),
           _: 1
           /* STABLE */
 
-        })]),
+        }, 8
+        /* PROPS */
+        , ["data", "header-cell-style"])]),
         _: 1
         /* STABLE */
 
-      }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", ModelSelectvue_type_script_setup_true_lang_js_hoisted_3, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_button, {
+      }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", ModelSelectvue_type_script_setup_true_lang_js_hoisted_4, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_button, {
         onClick: _cache[0] || (_cache[0] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withModifiers)($event => pick(), ["stop"])),
         title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).pick,
         type: "primary"
@@ -19981,7 +19987,8 @@ class AddDataViewModel {
           serverType: "imagerylayer",
           lsType: "ls",
           url: url,
-          addType: type
+          addType: type,
+          layerName: name
         };
 
         this._layerManager.addTempLayerNode(node);
@@ -20042,13 +20049,13 @@ class AddDataViewModel {
             });
           }
 
+          setChildrenAddType(mapServerInfo.layerTreeData, type);
           mapServerInfo.layerTreeData.forEach(node => {
             node.lsType = "ls";
-            node.serverType = "imagerylayer";
-            node.addType = type;
 
             this._layerManager.addTempLayerNode(node, 1);
 
+            console.log(node);
             cb && cb(node);
           }, this);
         });
@@ -20098,7 +20105,7 @@ class AddDataViewModel {
                 serverType: "imagerylayer",
                 url: url,
                 addType: type,
-                id: layers[i].layers
+                id: layers[i]._imageryProvider.layers
               });
             }
           }
@@ -20133,7 +20140,7 @@ class AddDataViewModel {
                 serverType: "imagerylayer",
                 url: url,
                 addType: type,
-                id: layers[i]._layer
+                id: layers[i]._imageryProvider._layer
               });
             }
           }
@@ -20296,6 +20303,18 @@ class AddDataViewModel {
     }
   }
 
+} // 设置子节点addType属性
+
+function setChildrenAddType(nodeList, addType) {
+  for (let i = 0; i < nodeList.length; i++) {
+    const node = nodeList[i];
+
+    if (node.children) {
+      setChildrenAddType(node.children, addType);
+    } else {
+      node.addType = addType;
+    }
+  }
 }
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/adddata/AddData.vue?vue&type=script&setup=true&lang=js