cd-mapgis 1.1.17 → 1.1.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cd-mapgis",
-  "version": "1.1.17",
+  "version": "1.1.19",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
   "type": "module",

package/src/InnerUtil.js

@@ -1,5 +1,5 @@
 import Polygon from 'ol/geom/Polygon.js';
-import { WKT } from 'ol/format';
+import { WKT } from 'ol/format.js';
 import MapView from './MapView.js';
 
 export default class InnerUtil {

package/src/LayerUtil.js

@@ -14,7 +14,7 @@ import VectorLayer from 'ol/layer/Vector.js';
 import StyleUtil from './StyleUtil.js';
 import LineString from 'ol/geom/LineString.js';
 import Polygon from 'ol/geom/Polygon.js';
-import { WKT } from 'ol/format';
+import { WKT } from 'ol/format.js';
 
 /**
  * 图层工具

package/src/MapView.js

@@ -5,7 +5,7 @@ import StyleUtil from './StyleUtil.js';
 import MapDrawUtil from './MapDrawUtil.js';
 import SwipeUtil from './SwipeUtil.js';
 import DragPan from 'ol/interaction/DragPan.js';
-import * as OlInteraction from 'ol/interaction';
+import * as OlInteraction from 'ol/interaction.js';
 
 /**
  * ol地图显示

package/src/OM.js

@@ -39,9 +39,9 @@ export default class OM {
     static getIp(text) {
         const ipv4Regex = /\b(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b/;
         const ipv4Matches = text.match(ipv4Regex) || [];
-        if(ipv4Matches.length > 0){
+        if (ipv4Matches.length > 0) {
             return ipv4Matches[0];
-        }else{
+        } else {
             return '';
         }
     }
@@ -235,6 +235,37 @@ export default class OM {
             //
             mapView.viewLayers.push({ type: 'def', name: obj.name, layer: obj.layer });
         }
+        //直接加载固定的geoServer图层
+        if (p.geoLayers && p.geoLayers.length > 0) {
+            postRes = await OM.getDic("geoserver");
+            if (!postRes.data) {
+                throw new Error("未配置geoserver");
+            }
+            let geoserverDic = JSON.parse(postRes.data);
+            let wmsUrl = geoserverDic.url + '/' + geoserverDic.workspace + '/wms';
+            wmsUrl = InnerUtil.getGeoServerUrl(wmsUrl, geoLayerUrl);
+            let geoParam = { workspace: geoserverDic.workspace, url: wmsUrl };
+            let _layers = [];
+            let layerNames = {};
+            for (let i = 0; i < p.geoLayers.length; i++) {
+                let l = p.geoLayers[i];
+                _layers.push(l.layerName);
+                layerNames[l.layerName] = l.title;
+            }
+            postRes = await OM.checkPushLayers({ layers: _layers });
+            let pushLayers = postRes.data ? postRes.data : [];
+            for (let k = 0; k < mapViews.length; k++) {
+                let mapView = mapViews[k];
+                let map = mapView.map;
+                for (let i = 0; i < pushLayers.length; i++) {
+                    geoParam.name = pushLayers[i];
+                    let layer = LayerUtil.geoServerWmsLayer(geoParam);
+                    map.addLayer(layer);
+                    mapView.viewLayers.push({ type: 'geoLayer', name: layerNames[geoParam.name], layer: layer });
+                    mapView.geoServerLayers.push(geoParam.name);
+                }
+            }
+        }
         //再加载geoServer接口图层
         let param = p.param ? p.param : {};
         let res = await OM.post("/map/getPushLayer", param);

package/test-om.js

@@ -6,6 +6,6 @@ console.log('OM 类型:', typeof OM);
 console.log('OM 类定义:', OM);
 
 // 测试调用静态方法（不执行实际初始化，只检查方法是否存在）
-console.log('OM.initMap 存在:', typeof OM.initMap === 'function');
+console.log('OM.initMap 存在:', typeof OM.initParam === 'function');
 
 console.log('测试完成，请检查输出结果。');