@fleet-frontend/mower-maps 0.2.0-beta.47 → 0.2.0-beta.49

package/dist/index.esm.js

@@ -25765,10 +25765,15 @@ const DoodleTransform = ({ data, isSelected: _isSelected, onSelect }) => {
         if (!editMap)
             return false;
         if (platform === PlatformType.H5) {
-            return editMapInfo?.elementType === DataType.DOODLE;
+            // return editMapInfo?.elementType === DataType.DOODLE;
+            if (editMapInfo.mobileMode === MobileEditMode.CREATE ||
+                editMapInfo.mobileMode === MobileEditMode.EDIT) {
+                return false;
+            }
+            return true;
         }
         return !editMapInfo?.elementType;
-    }, [editMapInfo?.elementType, platform, editMap]);
+    }, [editMapInfo?.elementType, editMapInfo.mobileMode, platform, editMap]);
     // 将 DoodleData 转换为父 SVG 坐标系的元素点数组
     const transformedElements = useMemo(() => {
         return transformSvgElements(data);
@@ -26891,6 +26896,8 @@ const useChargingPile = ({ viewBox, rotation = 0 }) => {
         if (!svgElementDatas || !viewBox)
             return [];
         const chargingPiles = svgElementDatas?.[DataType.CHARGING_PILE];
+        if (!chargingPiles)
+            return [];
         const results = [];
         for (const element of chargingPiles) {
             const center = element.points?.[0];
@@ -26929,7 +26936,7 @@ const CharginPile = React__default.memo(({ viewBox, rotation = 0 }) => {
         pointerEvents: 'none',
         zIndex: 750,
     }), []);
-    return (jsx("div", { style: containerStyle, children: items.map((item, idx) => (jsx("div", { className: "charging-pile", style: {
+    return (jsx("div", { style: containerStyle, children: items?.map((item, idx) => (jsx("div", { className: "charging-pile", style: {
                 position: 'absolute',
                 width: item.size,
                 height: item.size,
@@ -28821,7 +28828,7 @@ const getValidGpsBounds = (mapData, rotation = 0) => {
     return bounds;
 };
 // 默认配置
-const defaultMapConfig = DEFAULT_STYLES;
+const defaultMapConfig$1 = DEFAULT_STYLES;
 // 地图渲染器组件
 const MowerMapRenderer = forwardRef(({ sn, mowerIconConfig = {}, platform = PlatformType.WEB, edger = false, unitType = UnitsType.Imperial, language = 'en', onlyRead = false, mapConfig, 
 // pathConfig,
@@ -28917,7 +28924,7 @@ modelType, showStraddleBoundaryBorder = true, mapRef, mapJson, pathJson, realTim
     ]);
     // 合并配置
     const mergedMapConfig = useMemo(() => {
-        return merge$1(defaultMapConfig, mapConfig);
+        return merge$1(defaultMapConfig$1, mapConfig);
     }, [mapConfig]);
     const svgElementDatas = useMemo(() => {
         if (unStructMapData) {
@@ -29349,7 +29356,25 @@ modelType, showStraddleBoundaryBorder = true, mapRef, mapJson, pathJson, realTim
 });
 MowerMapRenderer.displayName = 'MowerMapRenderer';
 
-const BoundarySvgRender = React__default.memo(({ mapJson, unStructMapData, id, maxWidth = 300 }) => {
+// 默认配置
+const defaultMapConfig = DEFAULT_STYLES;
+const BoundarySvgRender = React__default.memo(({ mapJson, unStructMapData, id, maxWidth = 300, mapConfig }) => {
+    // 合并配置
+    const mergedMapConfig = useMemo(() => {
+        return merge$1(defaultMapConfig, mapConfig);
+    }, [mapConfig]);
+    const svgElementDatas = useMemo(() => {
+        if (unStructMapData) {
+            return (UnifiedMapDataProcessor.processUnstructMapData(unStructMapData, mergedMapConfig || {}) ||
+                {});
+        }
+        return UnifiedMapDataProcessor.processMapData(mapJson, mergedMapConfig || {}) || {};
+    }, [unStructMapData, mergedMapConfig, mapJson]);
+    const svgEditValue = useMemo(() => {
+        return {
+            svgElementDatas,
+        };
+    }, [svgElementDatas]);
     const svgElementData = useMemo(() => {
         if (unStructMapData) {
             const data = UnifiedMapDataProcessor.processUnstructMapData(unStructMapData, DEFAULT_STYLES) || {};
@@ -29401,18 +29426,18 @@ const BoundarySvgRender = React__default.memo(({ mapJson, unStructMapData, id, m
             height: maxWidth,
         };
     }, [boundaryViewBox, maxWidth]);
-    return (jsxs("div", { style: {
-            position: 'relative',
-            width: style.width,
-            height: style.height,
-            margin: '0 auto',
-        }, children: [jsx("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: `${boundaryViewBox.x} ${boundaryViewBox.y} ${boundaryViewBox.width} ${boundaryViewBox.height}`, width: `${style.width}px`, height: `${style.height}px`, style: { position: 'absolute', inset: 0, pointerEvents: 'none' }, children: Object.keys(svgElementData)?.map((key) => {
-                    return svgElementData[key]?.map((element) => {
-                        if (key === DataType.VISION_OFF)
-                            return null;
-                        return (jsx(GElement, { type: key, data: svgElementData[key], children: jsx(SvgElement, { type: key, data: element, onSelect: () => { }, onCancel: () => { } }, element.id) }, key));
-                    });
-                }) }), jsx(CharginPile, { mapData: mapJson, mapConfig: DEFAULT_STYLES, viewBox: boundaryViewBox || null, rotation: 0 })] }));
+    return (jsx(SvgEditContextProvider, { value: svgEditValue, children: jsxs("div", { style: {
+                position: 'relative',
+                width: style.width,
+                height: style.height,
+                margin: '0 auto',
+            }, children: [jsx("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: `${boundaryViewBox.x} ${boundaryViewBox.y} ${boundaryViewBox.width} ${boundaryViewBox.height}`, width: `${style.width}px`, height: `${style.height}px`, style: { position: 'absolute', inset: 0, pointerEvents: 'none' }, children: Object.keys(svgElementData)?.map((key) => {
+                        return svgElementData[key]?.map((element) => {
+                            if (key === DataType.VISION_OFF)
+                                return null;
+                            return (jsx(GElement, { type: key, data: svgElementData[key], children: jsx(SvgElement, { type: key, data: element }, element.id) }, key));
+                        });
+                    }) }), jsx(CharginPile, { viewBox: boundaryViewBox || null, rotation: 0 })] }) }));
 });
 
 export { ALL_DIRECTION_SELECTED, AntennaData, BaseData, BoundaryData, BoundarySvgRender, ChannelData, ChargingPileData, CheckDoodleErrorType, CheckObstaclePointErrorType, ClickEventType, CreateStatus, DataType, DoodleData, MAX_DIRECTION_ANGLE, MIN_DIRECTION_ANGLE, MobileEditMode, MowGateData, MowerMapRenderer, ObstacleData, PathData, PlatformType, RecordFunctionEnum, RecordTypeEnum, RenderType, SCALE_FACTOR, SvgParserNative, UnifiedMapDataProcessor, VisionOffData, calculateMapGpsCenter, estimateGpsFromMapBounds, initBoundary, initChannel, initDoodle, initObstacle, initVisionOff, restorePointsFormat };

package/dist/index.js

@@ -25785,10 +25785,15 @@ const DoodleTransform = ({ data, isSelected: _isSelected, onSelect }) => {
         if (!editMap)
             return false;
         if (platform === exports.PlatformType.H5) {
-            return editMapInfo?.elementType === exports.DataType.DOODLE;
+            // return editMapInfo?.elementType === DataType.DOODLE;
+            if (editMapInfo.mobileMode === exports.MobileEditMode.CREATE ||
+                editMapInfo.mobileMode === exports.MobileEditMode.EDIT) {
+                return false;
+            }
+            return true;
         }
         return !editMapInfo?.elementType;
-    }, [editMapInfo?.elementType, platform, editMap]);
+    }, [editMapInfo?.elementType, editMapInfo.mobileMode, platform, editMap]);
     // 将 DoodleData 转换为父 SVG 坐标系的元素点数组
     const transformedElements = React.useMemo(() => {
         return transformSvgElements(data);
@@ -26911,6 +26916,8 @@ const useChargingPile = ({ viewBox, rotation = 0 }) => {
         if (!svgElementDatas || !viewBox)
             return [];
         const chargingPiles = svgElementDatas?.[exports.DataType.CHARGING_PILE];
+        if (!chargingPiles)
+            return [];
         const results = [];
         for (const element of chargingPiles) {
             const center = element.points?.[0];
@@ -26949,7 +26956,7 @@ const CharginPile = React.memo(({ viewBox, rotation = 0 }) => {
         pointerEvents: 'none',
         zIndex: 750,
     }), []);
-    return (jsxRuntime.jsx("div", { style: containerStyle, children: items.map((item, idx) => (jsxRuntime.jsx("div", { className: "charging-pile", style: {
+    return (jsxRuntime.jsx("div", { style: containerStyle, children: items?.map((item, idx) => (jsxRuntime.jsx("div", { className: "charging-pile", style: {
                 position: 'absolute',
                 width: item.size,
                 height: item.size,
@@ -28841,7 +28848,7 @@ const getValidGpsBounds = (mapData, rotation = 0) => {
     return bounds;
 };
 // 默认配置
-const defaultMapConfig = DEFAULT_STYLES;
+const defaultMapConfig$1 = DEFAULT_STYLES;
 // 地图渲染器组件
 const MowerMapRenderer = React.forwardRef(({ sn, mowerIconConfig = {}, platform = exports.PlatformType.WEB, edger = false, unitType = UnitsType.Imperial, language = 'en', onlyRead = false, mapConfig, 
 // pathConfig,
@@ -28937,7 +28944,7 @@ modelType, showStraddleBoundaryBorder = true, mapRef, mapJson, pathJson, realTim
     ]);
     // 合并配置
     const mergedMapConfig = React.useMemo(() => {
-        return merge$1(defaultMapConfig, mapConfig);
+        return merge$1(defaultMapConfig$1, mapConfig);
     }, [mapConfig]);
     const svgElementDatas = React.useMemo(() => {
         if (unStructMapData) {
@@ -29369,7 +29376,25 @@ modelType, showStraddleBoundaryBorder = true, mapRef, mapJson, pathJson, realTim
 });
 MowerMapRenderer.displayName = 'MowerMapRenderer';
 
-const BoundarySvgRender = React.memo(({ mapJson, unStructMapData, id, maxWidth = 300 }) => {
+// 默认配置
+const defaultMapConfig = DEFAULT_STYLES;
+const BoundarySvgRender = React.memo(({ mapJson, unStructMapData, id, maxWidth = 300, mapConfig }) => {
+    // 合并配置
+    const mergedMapConfig = React.useMemo(() => {
+        return merge$1(defaultMapConfig, mapConfig);
+    }, [mapConfig]);
+    const svgElementDatas = React.useMemo(() => {
+        if (unStructMapData) {
+            return (UnifiedMapDataProcessor.processUnstructMapData(unStructMapData, mergedMapConfig || {}) ||
+                {});
+        }
+        return UnifiedMapDataProcessor.processMapData(mapJson, mergedMapConfig || {}) || {};
+    }, [unStructMapData, mergedMapConfig, mapJson]);
+    const svgEditValue = React.useMemo(() => {
+        return {
+            svgElementDatas,
+        };
+    }, [svgElementDatas]);
     const svgElementData = React.useMemo(() => {
         if (unStructMapData) {
             const data = UnifiedMapDataProcessor.processUnstructMapData(unStructMapData, DEFAULT_STYLES) || {};
@@ -29421,18 +29446,18 @@ const BoundarySvgRender = React.memo(({ mapJson, unStructMapData, id, maxWidth =
             height: maxWidth,
         };
     }, [boundaryViewBox, maxWidth]);
-    return (jsxRuntime.jsxs("div", { style: {
-            position: 'relative',
-            width: style.width,
-            height: style.height,
-            margin: '0 auto',
-        }, children: [jsxRuntime.jsx("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: `${boundaryViewBox.x} ${boundaryViewBox.y} ${boundaryViewBox.width} ${boundaryViewBox.height}`, width: `${style.width}px`, height: `${style.height}px`, style: { position: 'absolute', inset: 0, pointerEvents: 'none' }, children: Object.keys(svgElementData)?.map((key) => {
-                    return svgElementData[key]?.map((element) => {
-                        if (key === exports.DataType.VISION_OFF)
-                            return null;
-                        return (jsxRuntime.jsx(GElement, { type: key, data: svgElementData[key], children: jsxRuntime.jsx(SvgElement, { type: key, data: element, onSelect: () => { }, onCancel: () => { } }, element.id) }, key));
-                    });
-                }) }), jsxRuntime.jsx(CharginPile, { mapData: mapJson, mapConfig: DEFAULT_STYLES, viewBox: boundaryViewBox || null, rotation: 0 })] }));
+    return (jsxRuntime.jsx(SvgEditContextProvider, { value: svgEditValue, children: jsxRuntime.jsxs("div", { style: {
+                position: 'relative',
+                width: style.width,
+                height: style.height,
+                margin: '0 auto',
+            }, children: [jsxRuntime.jsx("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: `${boundaryViewBox.x} ${boundaryViewBox.y} ${boundaryViewBox.width} ${boundaryViewBox.height}`, width: `${style.width}px`, height: `${style.height}px`, style: { position: 'absolute', inset: 0, pointerEvents: 'none' }, children: Object.keys(svgElementData)?.map((key) => {
+                        return svgElementData[key]?.map((element) => {
+                            if (key === exports.DataType.VISION_OFF)
+                                return null;
+                            return (jsxRuntime.jsx(GElement, { type: key, data: svgElementData[key], children: jsxRuntime.jsx(SvgElement, { type: key, data: element }, element.id) }, key));
+                        });
+                    }) }), jsxRuntime.jsx(CharginPile, { viewBox: boundaryViewBox || null, rotation: 0 })] }) }));
 });
 
 exports.ALL_DIRECTION_SELECTED = ALL_DIRECTION_SELECTED;

package/dist/render/BoundarySvgRender.d.ts

@@ -1,4 +1,4 @@
-import { MapData } from '../types';
+import { MapConfig, MapData } from '../types';
 import React from 'react';
 import { UnstructMapData } from '../types';
 interface BoundarySvgRenderProps {
@@ -6,7 +6,9 @@ interface BoundarySvgRenderProps {
     unStructMapData: UnstructMapData;
     id: number;
     maxWidth?: number;
+    mapConfig?: MapConfig;
+    sn?: string;
 }
-declare const BoundarySvgRender: React.MemoExoticComponent<({ mapJson, unStructMapData, id, maxWidth }: BoundarySvgRenderProps) => import("react/jsx-runtime").JSX.Element>;
+declare const BoundarySvgRender: React.MemoExoticComponent<({ mapJson, unStructMapData, id, maxWidth, mapConfig }: BoundarySvgRenderProps) => import("react/jsx-runtime").JSX.Element>;
 export default BoundarySvgRender;
 //# sourceMappingURL=BoundarySvgRender.d.ts.map

package/dist/render/BoundarySvgRender.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BoundarySvgRender.d.ts","sourceRoot":"","sources":["../../src/render/BoundarySvgRender.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAKnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,UAAU,sBAAsB;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe,EAAE,eAAe,CAAC;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,QAAA,MAAM,iBAAiB,yEAC8B,sBAAsB,6CAuG1E,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"BoundarySvgRender.d.ts","sourceRoot":"","sources":["../../src/render/BoundarySvgRender.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAK9C,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAI3C,UAAU,sBAAsB;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe,EAAE,eAAe,CAAC;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAID,QAAA,MAAM,iBAAiB,oFACyC,sBAAsB,6CAmHrF,CAAC;AAEF,eAAe,iBAAiB,CAAC"}

package/dist/render/charginPile/useChargingPile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useChargingPile.d.ts","sourceRoot":"","sources":["../../../src/render/charginPile/useChargingPile.ts"],"names":[],"mappings":"AAMA,UAAU,sBAAsB;IAC9B,OAAO,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACzE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,eAAe,GAAI,uBAA2B,sBAAsB,uBAiChF,CAAC"}
+{"version":3,"file":"useChargingPile.d.ts","sourceRoot":"","sources":["../../../src/render/charginPile/useChargingPile.ts"],"names":[],"mappings":"AAMA,UAAU,sBAAsB;IAC9B,OAAO,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACzE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,eAAe,GAAI,uBAA2B,sBAAsB,uBAkChF,CAAC"}

package/dist/render/svgElement/DoodleTransform/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/render/svgElement/DoodleTransform/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAY,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAO3D,UAAU,oBAAoB;IAC5B,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;CACxC;AAED,QAAA,MAAM,eAAe,GAAI,6CAA6C,oBAAoB,4CAwGzF,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/render/svgElement/DoodleTransform/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAY,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAO3D,UAAU,oBAAoB;IAC5B,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;CACxC;AAED,QAAA,MAAM,eAAe,GAAI,6CAA6C,oBAAoB,4CA+GzF,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fleet-frontend/mower-maps",
-  "version": "0.2.0-beta.47",
+  "version": "0.2.0-beta.49",
   "type": "module",
   "description": "a mower maps in google maps",
   "main": "dist/index.js",