hy-dispatch-ui-v3 0.2.67 → 0.2.68

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

@@ -12,9 +12,7 @@ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { en
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 const CIRCLE_SEGMENTS = 36;
 function remToPx(rem) {
-  const rootFontSize = parseFloat(
-    getComputedStyle(document.documentElement).fontSize
-  );
+  const rootFontSize = parseFloat(getComputedStyle(document.documentElement).fontSize);
   return rem * rootFontSize;
 }
 function rangingStartIconOption(options, dicId) {
@@ -312,11 +310,7 @@ class bigMap extends events.EventEmitter {
             if (!newEvent.layer.getLatLngs) {
               newEvent.layer.getLatLngs = () => {
                 const circle = newEvent.layer;
-                const points = circleToPolygonPoints(
-                  circle.getLatLng(),
-                  circle.getRadius() / 1e3,
-                  true
-                );
+                const points = circleToPolygonPoints(circle.getLatLng(), circle.getRadius() / 1e3, true);
                 return [latLngListCheckExport(points)];
               };
             } else {
@@ -449,9 +443,7 @@ class bigMap extends events.EventEmitter {
     map.addLayer(displayCluster);
     const toNativeMarkers = (list = []) => {
       const markers = Array.isArray(list) ? list : [list];
-      return markers.map(
-        (marker) => marker?.getInitMarker ? marker.getInitMarker() : marker
-      ).filter(Boolean);
+      return markers.map((marker) => marker?.getInitMarker ? marker.getInitMarker() : marker).filter(Boolean);
     };
     const handlers = {
       remove: function(target) {
@@ -493,10 +485,7 @@ class bigMap extends events.EventEmitter {
       },
       // 圆形转多边形坐标
       getLatLngs: function(target) {
-        const points = circleToPolygonPoints(
-          target.getLatLng(),
-          target.getRadius() / 1e3
-        );
+        const points = circleToPolygonPoints(target.getLatLng(), target.getRadius() / 1e3);
         return [latLngListCheckExport(points)];
       }
     };
@@ -667,9 +656,7 @@ class bigMap extends events.EventEmitter {
       layer = e.layer;
       if (!layer._latlngs) {
         const center = latAndLngCheckExport(layer.getLatLng());
-        layer._latlngs = [
-          circleToPolygonPoints(center, layer.getRadius() / 1e3, true)
-        ];
+        layer._latlngs = [circleToPolygonPoints(center, layer.getRadius() / 1e3, true)];
       } else {
         layer._latlngs[0] = latLngListCheckExport(layer._latlngs[0]);
       }
@@ -808,12 +795,8 @@ class bigMap extends events.EventEmitter {
     function calcTotalDistance(index, preIndex) {
       const current = rangingMarker[index].options.extData.latlng;
       const previous = rangingMarker[preIndex].options.extData.latlng;
-      const distance = parseFloat(
-        (map.distance(current, previous) / 1e3).toFixed(2)
-      );
-      const total = parseFloat(
-        rangingMarker[preIndex].options.extData.distance || 0
-      );
+      const distance = parseFloat((map.distance(current, previous) / 1e3).toFixed(2));
+      const total = parseFloat(rangingMarker[preIndex].options.extData.distance || 0);
       return (distance + total).toFixed(2);
     }
     function removeLineBetween(groupIndex, aIndex, bIndex) {
@@ -829,9 +812,7 @@ class bigMap extends events.EventEmitter {
     function setStartIcon(index) {
       const markerItem = rangingMarker[index];
       markerItem.setIcon({
-        divIcon: _this.DivIcon(
-          rangingStartIconOption(options, markerItem.options.extData.dicId)
-        )
+        divIcon: _this.DivIcon(rangingStartIconOption(options, markerItem.options.extData.dicId))
       });
       markerItem.options.extData.distance = 0;
     }
@@ -839,14 +820,7 @@ class bigMap extends events.EventEmitter {
       const markerItem = rangingMarker[index];
       const isLast = showDeleteAll ?? !rangingMarker[index + 1]?.options?.extData?.distance;
       markerItem.setIcon({
-        divIcon: _this.DivIcon(
-          rangingPointIconOption(
-            options,
-            distance,
-            markerItem.options.extData.dicId,
-            isLast
-          )
-        )
+        divIcon: _this.DivIcon(rangingPointIconOption(options, distance, markerItem.options.extData.dicId, isLast))
       });
       markerItem.options.extData.distance = distance;
     }
@@ -874,10 +848,7 @@ class bigMap extends events.EventEmitter {
         rangingPointsIng.push({ lat, lng });
       } else {
         const latlngs = [
-          [
-            rangingPointsIng[rangingPointsIng.length - 1].lat,
-            rangingPointsIng[rangingPointsIng.length - 1].lng
-          ],
+          [rangingPointsIng[rangingPointsIng.length - 1].lat, rangingPointsIng[rangingPointsIng.length - 1].lng],
           [lat, lng]
         ];
         const polyline = _this.Polyline(latlngs, {
@@ -895,13 +866,9 @@ class bigMap extends events.EventEmitter {
           { lat: latlngs[1][0], lng: latlngs[1][1] }
         );
         distance = parseFloat((distance / 1e3).toFixed(2));
-        const total = parseFloat(
-          rangingMarker[rangingMarker.length - 1].options.extData.distance || 0
-        );
+        const total = parseFloat(rangingMarker[rangingMarker.length - 1].options.extData.distance || 0);
         distance = (distance + total).toFixed(2);
-        const customIcon = _this.DivIcon(
-          rangingPointIconOption(options, distance, dicId)
-        );
+        const customIcon = _this.DivIcon(rangingPointIconOption(options, distance, dicId));
         const markerItem = _this.Marker({
           position: { lat, lng },
           icon: customIcon,
@@ -967,10 +934,7 @@ class bigMap extends events.EventEmitter {
               if (changeIndex - 1 === index) {
                 setStartIcon(changeIndex);
               } else {
-                setPointIcon(
-                  changeIndex,
-                  calcTotalDistance(changeIndex, changeIndex - 1)
-                );
+                setPointIcon(changeIndex, calcTotalDistance(changeIndex, changeIndex - 1));
               }
               changeIndex++;
             }
@@ -1003,10 +967,7 @@ class bigMap extends events.EventEmitter {
             let changeIndex = index + 1;
             while (rangingMarker[changeIndex]?.options?.extData?.distance) {
               const disIndex = changeIndex - 1 === index ? changeIndex - 2 : changeIndex - 1;
-              setPointIcon(
-                changeIndex,
-                calcTotalDistance(changeIndex, disIndex)
-              );
+              setPointIcon(changeIndex, calcTotalDistance(changeIndex, disIndex));
               changeIndex++;
             }
             setTimeout(() => {

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

@@ -126,9 +126,7 @@ class Google extends events.EventEmitter {
           "AMap.MouseTool"
         ],
         () => {
-          this.layerSateGroup = new window.AMap.LayerGroup([
-            new window.AMap.TileLayer.Satellite()
-          ]);
+          this.layerSateGroup = new window.AMap.LayerGroup([new window.AMap.TileLayer.Satellite()]);
           this.layerSateGroup.setMap(newMap);
           this.layerSateGroup.hide();
           setTimeout(() => {
@@ -145,10 +143,7 @@ class Google extends events.EventEmitter {
     const handlers = {
       // return 单位：m
       distance: function(target, latAndlng1, latAndlng2) {
-        return AMap.GeometryUtil.distance(
-          [latAndlng1.lng, latAndlng1.lat],
-          [latAndlng2.lng, latAndlng2.lat]
-        );
+        return AMap.GeometryUtil.distance([latAndlng1.lng, latAndlng1.lat], [latAndlng2.lng, latAndlng2.lat]);
       },
       // 删除地图
       removeMap: function(target) {
@@ -244,10 +239,7 @@ class Google extends events.EventEmitter {
     let offset = null;
     const { html, iconSize, iconAnchor } = markerOptions.icon.option;
     if (markerOptions.offset) {
-      offset = new window.AMap.Pixel(
-        markerOptions.offset[0],
-        markerOptions.offset[1]
-      );
+      offset = new window.AMap.Pixel(markerOptions.offset[0], markerOptions.offset[1]);
     } else {
       const offsetX = iconAnchor[0] - iconSize[0] / 2;
       const offsetY = -iconAnchor[1];
@@ -282,10 +274,7 @@ class Google extends events.EventEmitter {
         target.setContent(html2);
         let setOffset = null;
         if (iconParams.offset) {
-          setOffset = new window.AMap.Pixel(
-            iconParams.offset[0],
-            iconParams.offset[1]
-          );
+          setOffset = new window.AMap.Pixel(iconParams.offset[0], iconParams.offset[1]);
         } else {
           const offsetX = iconAnchor2[0] - iconSize2[0] / 2;
           const offsetY = -iconAnchor2[1];
@@ -319,11 +308,7 @@ class Google extends events.EventEmitter {
       gridSize: option.maxClusterRadius
       // 聚合计算时网格的像素大小，默认60
     };
-    const displayCluster = new window.AMap.MarkerClusterer(
-      map,
-      markerList,
-      option
-    );
+    const displayCluster = new window.AMap.MarkerClusterer(map, markerList, option);
     const handlers = {
       // 清除聚合点
       remove: function(target) {

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

@@ -72,9 +72,7 @@ const DEFAULT_MAP_OPTIONS = {
   // 禁止鼠标滚动缩放
 };
 const remToPx = (rem) => {
-  const rootFontSize = parseFloat(
-    getComputedStyle(document.documentElement).fontSize
-  );
+  const rootFontSize = parseFloat(getComputedStyle(document.documentElement).fontSize);
   return rem * rootFontSize;
 };
 const createUniqueId = () => {
@@ -188,11 +186,7 @@ function wrapDrawLayer(layer) {
   const bounds = layer.getBounds();
   if (!layer.getLatLngs) {
     layer.getLatLngs = () => {
-      const points = circleToPolygonPoints(
-        layer.getLatLng(),
-        layer.getRadius() / 1e3,
-        true
-      );
+      const points = circleToPolygonPoints(layer.getLatLng(), layer.getRadius() / 1e3, true);
       return [latLngListCheckExport(points)];
     };
   } else {
@@ -253,11 +247,11 @@ function getCrs(crs) {
       70.53121499999999,
       35.26560700000001
     ].map((item) => 0.0254 * item / (96 * (Math.PI * 2 * 6378137 / 360)));
-    L.CRS.CRS4490 = new L.Proj.CRS(
-      "EPSG:4490",
-      "+proj=longlat +ellps=GRS80 +no_defs +type=crs",
-      { matrixIds, resolutions, origin: [-180, 90] }
-    );
+    L.CRS.CRS4490 = new L.Proj.CRS("EPSG:4490", "+proj=longlat +ellps=GRS80 +no_defs +type=crs", {
+      matrixIds,
+      resolutions,
+      origin: [-180, 90]
+    });
   }
   return crs ? L.CRS[`${crs}`] : DEFAULT_CRS;
 }
@@ -470,12 +464,7 @@ class Leafletjs extends events.EventEmitter {
   }
   // 超图 WMTS 图层（不适用所有的WMTS图层，目前仅支持超图WMTS，因不同的WMTS服务规范不一样，主要体现在路由访问参数）
   createWMTSLayer(map, option = {}) {
-    const {
-      url,
-      layer,
-      tilematrixSet,
-      format = "image/png"
-    } = typeof option === "string" ? { url: option } : option;
+    const { url, layer, tilematrixSet, format = "image/png" } = typeof option === "string" ? { url: option } : option;
     const crs = getCrs(this.initParams.crs);
     if (!L.WMTSLayer) {
       L.WMTSLayer = L.TileLayer.extend({
@@ -551,8 +540,7 @@ class Leafletjs extends events.EventEmitter {
   createLayers(map, url, option = {}) {
     const { zoomOffset, mapServerType } = this.initParams;
     if (mapServerType === "WMTS") return this.createWMTSLayer(map, url);
-    if (mapServerType === "Dynamic")
-      return this.createDynamicLayer(map, url.url || url);
+    if (mapServerType === "Dynamic") return this.createDynamicLayer(map, url.url || url);
     const newLeayer = L.tileLayer(url, {
       ...option,
       zoomOffset: zoomOffset || 0
@@ -564,8 +552,7 @@ class Leafletjs extends events.EventEmitter {
   createCustomLayers(map, url, option = {}) {
     const { zoomOffset, mapServerType } = this.initParams;
     if (mapServerType === "WMTS") return this.createWMTSLayer(map, url);
-    if (mapServerType === "Dynamic")
-      return this.createDynamicLayer(map, url.url || url);
+    if (mapServerType === "Dynamic") return this.createDynamicLayer(map, url.url || url);
     const filter = option.filter || DEFAULT_TILE_FILTER;
     const CustomTileLayer = L.TileLayer.extend({
       options: {
@@ -669,12 +656,7 @@ class Leafletjs extends events.EventEmitter {
       },
       on: function(target, types, fn, context) {
         if (types === "click") {
-          const customClickHandler = createClickHandler(
-            fn,
-            context,
-            target,
-            true
-          );
+          const customClickHandler = createClickHandler(fn, context, target, true);
           wrappedHandlers.remember(types, fn, customClickHandler);
           return target.on(types, customClickHandler, context);
         }
@@ -762,10 +744,7 @@ class Leafletjs extends events.EventEmitter {
       },
       // 圆形转多边形坐标
       getLatLngs: function(target) {
-        const points = circleToPolygonPoints(
-          target.getLatLng(),
-          target.getRadius() / 1e3
-        );
+        const points = circleToPolygonPoints(target.getLatLng(), target.getRadius() / 1e3);
         return [latLngListCheckExport(points)];
       }
     };
@@ -847,12 +826,7 @@ class Leafletjs extends events.EventEmitter {
     if (latLngList && latLngList.length !== 0) {
       latLngList = latLngListCheck(latLngList);
     }
-    const polyline = L.motion.polyline(
-      latLngList,
-      option,
-      motionOption,
-      markerOption
-    );
+    const polyline = L.motion.polyline(latLngList, option, motionOption, markerOption);
     return mapProxy.createMapProxy(polyline, {
       addTo: function(target, map) {
         return target.addTo(generalMapMethods.getMap(map));
@@ -1073,20 +1047,14 @@ class Leafletjs extends events.EventEmitter {
     function calcTotalDistance(index, preIndex) {
       const current = rangingMarker[index].options.extData.latlng;
       const previous = rangingMarker[preIndex].options.extData.latlng;
-      const distance = parseFloat(
-        (map.distance(current, previous) / 1e3).toFixed(2)
-      );
-      const total = parseFloat(
-        rangingMarker[preIndex].options.extData.distance || 0
-      );
+      const distance = parseFloat((map.distance(current, previous) / 1e3).toFixed(2));
+      const total = parseFloat(rangingMarker[preIndex].options.extData.distance || 0);
       return (distance + total).toFixed(2);
     }
     function setStartIcon(index) {
       const markerItem = rangingMarker[index];
       markerItem.setIcon({
-        divIcon: _this.DivIcon(
-          rangingStartIconOption(options, markerItem.options.extData.dicId)
-        )
+        divIcon: _this.DivIcon(rangingStartIconOption(options, markerItem.options.extData.dicId))
       });
       markerItem.options.extData.distance = 0;
     }
@@ -1104,14 +1072,7 @@ class Leafletjs extends events.EventEmitter {
       const markerItem = rangingMarker[index];
       const isLast = showDeleteAll ?? !rangingMarker[index + 1]?.options?.extData?.distance;
       markerItem.setIcon({
-        divIcon: _this.DivIcon(
-          rangingPointIconOption(
-            options,
-            distance,
-            markerItem.options.extData.dicId,
-            isLast
-          )
-        )
+        divIcon: _this.DivIcon(rangingPointIconOption(options, distance, markerItem.options.extData.dicId, isLast))
       });
       markerItem.options.extData.distance = distance;
     }
@@ -1139,10 +1100,7 @@ class Leafletjs extends events.EventEmitter {
         rangingPointsIng.push({ lat, lng });
       } else {
         const latlngs = [
-          [
-            rangingPointsIng[rangingPointsIng.length - 1].lat,
-            rangingPointsIng[rangingPointsIng.length - 1].lng
-          ],
+          [rangingPointsIng[rangingPointsIng.length - 1].lat, rangingPointsIng[rangingPointsIng.length - 1].lng],
           [lat, lng]
         ];
         const polyline = _this.Polyline(latlngs, {
@@ -1160,13 +1118,9 @@ class Leafletjs extends events.EventEmitter {
           { lat: latlngs[1][0], lng: latlngs[1][1] }
         );
         distance = parseFloat((distance / 1e3).toFixed(2));
-        const total = parseFloat(
-          rangingMarker[rangingMarker.length - 1].options.extData.distance || 0
-        );
+        const total = parseFloat(rangingMarker[rangingMarker.length - 1].options.extData.distance || 0);
         distance = (distance + total).toFixed(2);
-        const customIcon = _this.DivIcon(
-          rangingPointIconOption(options, distance, dicId)
-        );
+        const customIcon = _this.DivIcon(rangingPointIconOption(options, distance, dicId));
         const markerItem = _this.Marker({
           icon: customIcon,
           position: { lat, lng },
@@ -1232,10 +1186,7 @@ class Leafletjs extends events.EventEmitter {
               if (changeIndex - 1 === index) {
                 setStartIcon(changeIndex);
               } else {
-                setPointIcon(
-                  changeIndex,
-                  calcTotalDistance(changeIndex, changeIndex - 1)
-                );
+                setPointIcon(changeIndex, calcTotalDistance(changeIndex, changeIndex - 1));
               }
               changeIndex++;
             }
@@ -1268,10 +1219,7 @@ class Leafletjs extends events.EventEmitter {
             let changeIndex = index + 1;
             while (rangingMarker[changeIndex]?.options?.extData?.distance) {
               const disIndex = changeIndex - 1 === index ? changeIndex - 2 : changeIndex - 1;
-              setPointIcon(
-                changeIndex,
-                calcTotalDistance(changeIndex, disIndex)
-              );
+              setPointIcon(changeIndex, calcTotalDistance(changeIndex, disIndex));
               changeIndex++;
             }
             setTimeout(() => {
@@ -1282,11 +1230,7 @@ class Leafletjs extends events.EventEmitter {
             const beforeDistance = rangingMarker[index - 1]?.options?.extData?.distance;
             if (beforeDistance) {
               removeLineBetween(rangEndIndex, index - 1, index);
-              setPointIcon(
-                index - 1,
-                rangingMarker[index - 1].options.extData.distance,
-                true
-              );
+              setPointIcon(index - 1, rangingMarker[index - 1].options.extData.distance, true);
               setTimeout(() => {
                 rangingMarker[index].remove();
                 rangingMarker.splice(index, 1);

package/lib/utils/map/index.js

@@ -21,15 +21,9 @@ const AMAP_PLUGINS = [
 ];
 const staticAssets = {
   "bigemap.js": new URL("../../static/map/bigemap.js", (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('utils/map/index.js', document.baseURI).href))).href,
-  "markercluster.js": new URL(
-    "../../static/map/markercluster.js",
-    (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('utils/map/index.js', document.baseURI).href))
-  ).href,
+  "markercluster.js": new URL("../../static/map/markercluster.js", (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('utils/map/index.js', document.baseURI).href))).href,
   "bmDraw.js": new URL("../../static/map/bmDraw.js", (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('utils/map/index.js', document.baseURI).href))).href,
-  "bm.geometryutil.js": new URL(
-    "../../static/map/bm.geometryutil.js",
-    (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('utils/map/index.js', document.baseURI).href))
-  ).href,
+  "bm.geometryutil.js": new URL("../../static/map/bm.geometryutil.js", (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('utils/map/index.js', document.baseURI).href))).href,
   "moveMarker.js": new URL("../../static/map/moveMarker.js", (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('utils/map/index.js', document.baseURI).href))).href
 };
 const normalizeStaticBaseUrl = (baseUrl) => {

package/lib/utils/map/js/webgis.js

@@ -34,9 +34,9 @@ function ToLon(x, y) {
   return ret;
 }
 const Coordinate = {
-  "WGS84": 0,
-  "GCJ02": 1,
-  "BD09": 2
+  WGS84: 0,
+  GCJ02: 1,
+  BD09: 2
 };
 const reverseCoordinate = {
   0: "WGS84",
@@ -44,17 +44,17 @@ const reverseCoordinate = {
   2: "BD09"
 };
 const conversionCoordinateMap = {
-  "WGS84": {
-    "GCJ02": WGS84ToGCJ02,
-    "BD09": WGS84ToBD09
+  WGS84: {
+    GCJ02: WGS84ToGCJ02,
+    BD09: WGS84ToBD09
   },
-  "GCJ02": {
-    "WGS84": GCJ02ToWGS84,
-    "BD09": GCJ02ToBD09
+  GCJ02: {
+    WGS84: GCJ02ToWGS84,
+    BD09: GCJ02ToBD09
   },
-  "BD09": {
-    "GCJ02": BD09ToGCJ02,
-    "WGS84": BD09ToWGS84
+  BD09: {
+    GCJ02: BD09ToGCJ02,
+    WGS84: BD09ToWGS84
   }
 };
 function getMapConfig() {

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hy-dispatch-ui-v3",
-  "version": "0.2.67",
+  "version": "0.2.68",
   "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.10",
+    "hy-virtual-tree": "2.5.0",
     "leaflet": "^1.5.1",
     "leaflet-pip": "^1.1.0",
     "leaflet-polylinedecorator": "^1.6.0",
@@ -96,6 +96,7 @@
     "vue": "^3.5.25",
     "vue-draggable-plus": "^0.6.1",
     "vue-eslint-parser": "^9.4.3",
+    "vue-i18n": "^11.4.12",
     "vue-router": "^5.2.0"
   },
   "browserslist": [