hy-dispatch-ui-v3 0.2.59 → 0.2.61

package/lib/utils/map/hook/leafletjs.js

@@ -369,6 +369,10 @@ class Leafletjs extends events.EventEmitter {
         const { lng: lng2, lat: lat2 } = latAndLngCheckExport(center2);
         return L.latLng(lat2, lng2);
       },
+      // 自适应地图容器大小
+      invalidateSize: function(target) {
+        return target.invalidateSize();
+      },
       // 四个角
       getBounds: function(target) {
         const bounds = target.getBounds();
@@ -427,24 +431,20 @@ class Leafletjs extends events.EventEmitter {
     return map;
   }
   // 设置地图瓦片地址
-  setLayersUrl(map) {
+  setLayersUrl(map, changeColorType = true) {
     const layersUrlList = this.initParams.layersUrlList || [];
     const layersIndex = this.initParams.layersIndex || 0;
-    const layersOption = layersUrlList[layersIndex];
-    if (!layersOption) {
+    const layersUrls = layersUrlList[layersIndex];
+    if (!layersUrls) {
       return;
     }
     const { mapServerType } = this.initParams;
     if (mapServerType === "WMTS" || mapServerType === "Dynamic") {
-      return this.createLayers(map, layersOption);
+      return this.createLayers(map, layersUrls);
     }
-    const { layersUrls = "", filter, key } = layersOption;
     layersUrls.split(",").forEach((layersUrl) => {
-      if (layersUrl.indexOf("{mapKey}") !== -1) {
-        layersUrl = layersUrl.replace("{mapKey}", key);
-      }
-      if (filter) {
-        this.createCustomLayers(map, layersUrl, { filter });
+      if (changeColorType) {
+        this.createCustomLayers(map, layersUrl);
       } else {
         this.createLayers(map, layersUrl);
       }

package/lib/utils/map/index.js

@@ -5,6 +5,7 @@ var leafletjs = require('./hook/leafletjs.js');
 var bigMap = require('./hook/bigMap.js');
 var events = require('events');
 var hyCommon = require('hy-common');
+var useApi = require('../../hooks/useApi.js');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 const scriptPromises = new globalThis.Map();
@@ -54,17 +55,17 @@ function setMapServer(mapType, mapConfig = {}) {
   if (mapType === "gaode" && window.AMap?.Map) {
     return Promise.resolve();
   }
-  if (mapType === "bigMap" && window.BM) {
+  if (mapType === "bigmap" && window.BM) {
     return Promise.resolve();
   }
-  if (mapType !== "gaode" && mapType !== "bigMap") {
+  if (mapType !== "gaode" && mapType !== "bigmap") {
     return Promise.resolve();
   }
   if (mapServerPromises.has(mapType)) {
     return mapServerPromises.get(mapType);
   }
   const promise = (async () => {
-    if (mapType === "bigMap") {
+    if (mapType === "bigmap") {
       const staticBaseUrl = mapConfig.staticBaseUrl;
       await loadScript(staticUrl("bigemap.js", staticBaseUrl));
       await Promise.all([
@@ -109,6 +110,8 @@ function setPoiServer(mapConfig) {
     projectCoordinate: data.projectPoiCoordinate,
     mapSk: data.mapSk
   };
+  const { api } = useApi.useApi();
+  hyCommon.Common.setAxios(api.value);
   return new hyCommon.Map({
     poiServer
   });
@@ -166,6 +169,22 @@ class InitMap extends events.EventEmitter {
   }
   // 初始化地图
   NewMap(params = {}) {
+    const leftletjsObj = {};
+    if (params.mapType === "leafletjs") {
+      const { layersServer, layersUrl, mapKey, mapServerType } = params;
+      if (layersUrl && mapServerType !== "WMTS") {
+        const layersUrlList = (layersUrl || "").split(",").filter(Boolean);
+        leftletjsObj.layersUrlList = layersUrlList.map((url) => {
+          const index = url.indexOf("{mapKey}");
+          if (index !== -1) {
+            return url.replace("{mapKey}", mapKey);
+          }
+          return url;
+        });
+      } else {
+        leftletjsObj.layersUrlList = params.mapServerList;
+      }
+    }
     params = {
       mapType: "gaode",
       // 地图类型
@@ -184,13 +203,14 @@ class InitMap extends events.EventEmitter {
       // 地图瓦片地址
       zoomOffset: params.zoomOffset || 0,
       // 缩放偏移量
-      ...params
+      ...params,
+      ...leftletjsObj
     };
     if (params.mapType === "gaode") {
       this.map = new gaode.default(params);
-    } else if (params.mapType === "leaflet") {
+    } else if (params.mapType === "leafletjs") {
       this.map = new leafletjs.default(params);
-    } else if (params.mapType === "bigMap") {
+    } else if (params.mapType === "bigmap") {
       this.map = new bigMap.default(params);
     }
   }

package/lib/utils/tree.js

@@ -0,0 +1,10 @@
+'use strict';
+
+var hyVirtualTree = require('hy-virtual-tree');
+
+
+
+Object.defineProperty(exports, "setGlobalTreeConfig", {
+	enumerable: true,
+	get: function () { return hyVirtualTree.setGlobalTreeConfig; }
+});

package/lib/version.js

@@ -1,5 +1,5 @@
 'use strict';
 
-const version = "0.2.58";
+const version = "0.2.60";
 
 exports.version = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hy-dispatch-ui-v3",
-  "version": "0.2.59",
+  "version": "0.2.61",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "scripts": {
@@ -30,7 +30,7 @@
     "events": "^3.3.0",
     "express": "^5.2.1",
     "hy-common": "^0.0.39",
-    "hy-virtual-tree": "^2.4.4",
+    "hy-virtual-tree": "^2.4.5",
     "leaflet": "^1.5.1",
     "leaflet-pip": "^1.1.0",
     "leaflet-polylinedecorator": "^1.6.0",