@kq_npm/client3d_webgl_vue 0.6.4-beta → 0.6.6-beta

package/adddata/index.js

@@ -587,7 +587,11 @@ class AddDataViewModel {
           let mapServerInfo = (0,util_namespaceObject.formatKQMapInfo)(mapInfo, serverUrl, serverName, token, null, true);
           let showLayers = [];
           showLayers = showLayers.concat(mapServerInfo.layers_show);
-          showLayers.reverse();
+          showLayers.reverse(); //获取图层筛选类型时用
+
+          showLayers.forEach(layer => {
+            layer.sourceType = 'kqserver';
+          });
           this._layerManager._layerListData = this._layerManager._layerListData.concat(showLayers);
           showLayers.forEach(layer => {
             var imageryProvider = new Cesium.Kq3dKQGISMapServerImageryProviderExt({

package/index.js

@@ -1156,16 +1156,17 @@ class LayerManager {
           if (layerData.sourceType === "kqserver") {
             if (!layerData.renderType || layerData.renderType === "rest") {
               type = "kqgismapserver";
-              layerData.token = source.token; //记录数据源里所有图层信息
-
-              layerData.sourceLayers = source.mapServerInfo.layers_show;
+              layerData.token = source.token;
             } else {
               layerData.url += "/" + layerData.renderType;
 
               if (source.token) {
                 layerData.url += "?ua_token=" + source.token;
               }
-            }
+            } //记录数据源里所有图层信息
+
+
+            layerData.sourceLayers = source.mapServerInfo.layers_show;
           } else if (layerData.sourceType === "arcserver") {
             if (!layerData.renderType || layerData.renderType === "rest") {
               type = "arcgismapserver";
@@ -1455,7 +1456,21 @@ class LayerManager {
           var layers = group._addedLayers || group._layers;
 
           if (layers && layers.length > 0) {
-            //layerData.guid = layers[0].guid;
+            //如果是kqserver类型，记录服务返回的图层信息
+            if (layerData.sourceLayers) {
+              var layerInfo = layerData.sourceLayers.find(item => {
+                return item.id + "" == layerData.id + "";
+              });
+
+              if (layerInfo) {
+                for (var key in layerInfo) {
+                  if (!layerData[key]) {
+                    layerData[key] = layerInfo[key];
+                  }
+                }
+              }
+            }
+
             layerData.guid = layerData.sourceName + "@@@" + layerData.id;
             this._guidMapping[layerData.guid] = layers[0].guid;
             layerData.name = name || layers[0].name;
@@ -1478,7 +1493,21 @@ class LayerManager {
           var layers = group._addedLayers || group._layers;
 
           if (layers && layers.length > 0) {
-            //layerData.guid = layers[0].guid;
+            //如果是kqserver类型，记录服务返回的图层信息
+            if (layerData.sourceLayers) {
+              var layerInfo = layerData.sourceLayers.find(item => {
+                return item.id + "" == layerData.id + "";
+              });
+
+              if (layerInfo) {
+                for (var key in layerInfo) {
+                  if (!layerData[key]) {
+                    layerData[key] = layerInfo[key];
+                  }
+                }
+              }
+            }
+
             layerData.guid = layerData.sourceName + "@@@" + layerData.id;
             this._guidMapping[layerData.guid] = layers[0].guid;
             layerData.name = name || layers[0].name;
@@ -1664,7 +1693,11 @@ class LayerManager {
           });
           let showLayers = [];
           showLayers = showLayers.concat(mapServerInfo.layers_show);
-          showLayers.reverse();
+          showLayers.reverse(); //获取图层筛选类型时用
+
+          showLayers.forEach(layer => {
+            layer.sourceType = 'kqserver';
+          });
           that._layerListData = that._layerListData.concat(showLayers); // console.log(that._layerTreeData);
           // console.log(that._layerListData);
           // console.log(that._layerListData_old);
@@ -1938,30 +1971,51 @@ class LayerManager {
 
   getLayerTreeData() {
     return JSON.parse(JSON.stringify(this._layerTreeData));
+  } //是否包含值
+
+
+  _isContainValue(target, value) {
+    let contain = false;
+
+    if (target) {
+      if (typeof target === "string") {
+        contain = target === value;
+      } else if (target instanceof Array) {
+        target.forEach(item => {
+          if (item === value) {
+            contain = true;
+          }
+        });
+      }
+    } else {
+      contain = true;
+    }
+
+    return contain;
   } //获取选中或未选中图层集合
 
 
-  getLayerCheckedList() {
+  getLayerCheckedList(serverType) {
     let checkedLayers = [];
 
     this._layerListData.forEach(layer => {
-      if (layer.visible) {
+      if (layer.visible && this._isContainValue(serverType, layer.sourceType)) {
         checkedLayers.push(layer);
       }
-    });
+    }, this);
 
     return checkedLayers;
   } //获取选中图层key集合
 
 
-  getLayerCheckedListKey(isCheck = true) {
+  getLayerCheckedListKey(isCheck = true, serverType) {
     let checkedKeys = [];
 
     this._layerListData.forEach(layer => {
-      if (layer.visible === isCheck) {
+      if (layer.visible === isCheck && this._isContainValue(serverType, layer.sourceType)) {
         checkedKeys.push(layer.guid);
       }
-    });
+    }, this);
 
     return checkedKeys;
   }
@@ -1970,9 +2024,9 @@ class LayerManager {
    */
 
 
-  getLayerDataByLayerChecked() {
+  getLayerDataByLayerChecked(serverType) {
     let layerData = [];
-    const layers_checked = this.getLayerCheckedList();
+    const layers_checked = this.getLayerCheckedList(serverType);
     const layers_old = this._layerListData_old;
 
     for (let i = 0; i < layers_checked.length; i++) {
@@ -16984,7 +17038,11 @@ class AddDataViewModel {
           let mapServerInfo = (0,util_namespaceObject.formatKQMapInfo)(mapInfo, serverUrl, serverName, token, null, true);
           let showLayers = [];
           showLayers = showLayers.concat(mapServerInfo.layers_show);
-          showLayers.reverse();
+          showLayers.reverse(); //获取图层筛选类型时用
+
+          showLayers.forEach(layer => {
+            layer.sourceType = 'kqserver';
+          });
           this._layerManager._layerListData = this._layerManager._layerListData.concat(showLayers);
           showLayers.forEach(layer => {
             var imageryProvider = new Cesium.Kq3dKQGISMapServerImageryProviderExt({

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"0.6.4-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"^1.1.1","echarts":"^5.3.3","js-cookie":"^3.0.1","omit.js":"^2.0.2","save":"^2.5.0","tinycolor2":"^1.4.2","vue-i18n":"^9.2.0-beta.36","xlsx":"^0.18.5","@turf/turf":"^6.5.0","css-vars-ponyfill":"^2.4.8","xe-utils":"^3.5.4"}}
+{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"0.6.6-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"^1.1.1","echarts":"^5.3.3","js-cookie":"^3.0.1","omit.js":"^2.0.2","save":"^2.5.0","tinycolor2":"^1.4.2","vue-i18n":"^9.2.0-beta.36","xlsx":"^0.18.5","@turf/turf":"^6.5.0","css-vars-ponyfill":"^2.4.8","xe-utils":"^3.5.4"}}

package/scenceview/index.js

@@ -703,16 +703,17 @@ class LayerManager {
           if (layerData.sourceType === "kqserver") {
             if (!layerData.renderType || layerData.renderType === "rest") {
               type = "kqgismapserver";
-              layerData.token = source.token; //记录数据源里所有图层信息
-
-              layerData.sourceLayers = source.mapServerInfo.layers_show;
+              layerData.token = source.token;
             } else {
               layerData.url += "/" + layerData.renderType;
 
               if (source.token) {
                 layerData.url += "?ua_token=" + source.token;
               }
-            }
+            } //记录数据源里所有图层信息
+
+
+            layerData.sourceLayers = source.mapServerInfo.layers_show;
           } else if (layerData.sourceType === "arcserver") {
             if (!layerData.renderType || layerData.renderType === "rest") {
               type = "arcgismapserver";
@@ -1002,7 +1003,21 @@ class LayerManager {
           var layers = group._addedLayers || group._layers;
 
           if (layers && layers.length > 0) {
-            //layerData.guid = layers[0].guid;
+            //如果是kqserver类型，记录服务返回的图层信息
+            if (layerData.sourceLayers) {
+              var layerInfo = layerData.sourceLayers.find(item => {
+                return item.id + "" == layerData.id + "";
+              });
+
+              if (layerInfo) {
+                for (var key in layerInfo) {
+                  if (!layerData[key]) {
+                    layerData[key] = layerInfo[key];
+                  }
+                }
+              }
+            }
+
             layerData.guid = layerData.sourceName + "@@@" + layerData.id;
             this._guidMapping[layerData.guid] = layers[0].guid;
             layerData.name = name || layers[0].name;
@@ -1025,7 +1040,21 @@ class LayerManager {
           var layers = group._addedLayers || group._layers;
 
           if (layers && layers.length > 0) {
-            //layerData.guid = layers[0].guid;
+            //如果是kqserver类型，记录服务返回的图层信息
+            if (layerData.sourceLayers) {
+              var layerInfo = layerData.sourceLayers.find(item => {
+                return item.id + "" == layerData.id + "";
+              });
+
+              if (layerInfo) {
+                for (var key in layerInfo) {
+                  if (!layerData[key]) {
+                    layerData[key] = layerInfo[key];
+                  }
+                }
+              }
+            }
+
             layerData.guid = layerData.sourceName + "@@@" + layerData.id;
             this._guidMapping[layerData.guid] = layers[0].guid;
             layerData.name = name || layers[0].name;
@@ -1211,7 +1240,11 @@ class LayerManager {
           });
           let showLayers = [];
           showLayers = showLayers.concat(mapServerInfo.layers_show);
-          showLayers.reverse();
+          showLayers.reverse(); //获取图层筛选类型时用
+
+          showLayers.forEach(layer => {
+            layer.sourceType = 'kqserver';
+          });
           that._layerListData = that._layerListData.concat(showLayers); // console.log(that._layerTreeData);
           // console.log(that._layerListData);
           // console.log(that._layerListData_old);
@@ -1485,30 +1518,51 @@ class LayerManager {
 
   getLayerTreeData() {
     return JSON.parse(JSON.stringify(this._layerTreeData));
+  } //是否包含值
+
+
+  _isContainValue(target, value) {
+    let contain = false;
+
+    if (target) {
+      if (typeof target === "string") {
+        contain = target === value;
+      } else if (target instanceof Array) {
+        target.forEach(item => {
+          if (item === value) {
+            contain = true;
+          }
+        });
+      }
+    } else {
+      contain = true;
+    }
+
+    return contain;
   } //获取选中或未选中图层集合
 
 
-  getLayerCheckedList() {
+  getLayerCheckedList(serverType) {
     let checkedLayers = [];
 
     this._layerListData.forEach(layer => {
-      if (layer.visible) {
+      if (layer.visible && this._isContainValue(serverType, layer.sourceType)) {
         checkedLayers.push(layer);
       }
-    });
+    }, this);
 
     return checkedLayers;
   } //获取选中图层key集合
 
 
-  getLayerCheckedListKey(isCheck = true) {
+  getLayerCheckedListKey(isCheck = true, serverType) {
     let checkedKeys = [];
 
     this._layerListData.forEach(layer => {
-      if (layer.visible === isCheck) {
+      if (layer.visible === isCheck && this._isContainValue(serverType, layer.sourceType)) {
         checkedKeys.push(layer.guid);
       }
-    });
+    }, this);
 
     return checkedKeys;
   }
@@ -1517,9 +1571,9 @@ class LayerManager {
    */
 
 
-  getLayerDataByLayerChecked() {
+  getLayerDataByLayerChecked(serverType) {
     let layerData = [];
-    const layers_checked = this.getLayerCheckedList();
+    const layers_checked = this.getLayerCheckedList(serverType);
     const layers_old = this._layerListData_old;
 
     for (let i = 0; i < layers_checked.length; i++) {