my-openlayer 3.1.0 → 3.1.1

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [3.1.1] - 2026-06-09
+
+### Bug Fixes
+
+- **GeoJSON:** 修复 `addGeoJSON` 传入字符串 `layerName` 时被追加 `groupKey` 和 `geometryType` 的问题；字符串现在作为最终图层名原样使用。
+- **GeoJSON:** 调整混合点线面渲染顺序，避免字符串 `layerName` 同名时面图层清理逻辑误删本次创建的点/线图层。
+
+### Tests
+
+- 更新 `addGeoJSON` 图层命名回归测试，覆盖字符串 `layerName` 原样使用且混合图层完整保留。
+
 ## [3.1.0] - 2026-06-09
 
 ### Features

package/core/geojson/GeoJSONRenderer.js

@@ -18,12 +18,12 @@ function resolveGeoJSONLayerName(layerName, groupKey, geometryType, datasetKey,
     if (typeof layerName === 'function') {
         return layerName({ datasetKey, groupKey, geometryType, index });
     }
-    // 确定 base 名称
-    let base;
     if (typeof layerName === 'string') {
-        base = layerName;
+        return layerName;
     }
-    else if (Array.isArray(layerName)) {
+    // 确定 base 名称
+    let base;
+    if (Array.isArray(layerName)) {
         base = layerName[Number(datasetKey)] ?? `${layerName[0] ?? 'geojson'}_${datasetKey}`;
     }
     else {
@@ -200,13 +200,13 @@ export function renderGeoJSON(data, options, deps) {
         const pointDatasetKey = pointFeatures[0]?._datasetKey ?? 'default';
         const lineDatasetKey = lineFeatures[0]?._datasetKey ?? 'default';
         const polygonDatasetKey = polygonFeatures[0]?._datasetKey ?? 'default';
-        // 点图层
-        if (pointFeatures.length > 0) {
-            const result = createPointLayerHandle(pointFeatures, options, groupKey, pointDatasetKey, singleGroup, deps.getPoint());
-            pointHandle = result.handle;
-            if (pointHandle) {
-                groupAllHandles.push(pointHandle);
-                allHandles.push(pointHandle);
+        // 面图层会清理同名旧图层；当 layerName 是字符串时点线面同名，
+        // 因此先创建面图层，避免它误删本次刚创建的点/线图层。
+        if (polygonFeatures.length > 0) {
+            polygonHandle = createPolygonHandle(polygonFeatures, options, groupKey, polygonDatasetKey, singleGroup, deps.getPolygon());
+            if (polygonHandle) {
+                groupAllHandles.push(polygonHandle);
+                allHandles.push(polygonHandle);
             }
         }
         // 线图层
@@ -217,12 +217,13 @@ export function renderGeoJSON(data, options, deps) {
                 allHandles.push(lineHandle);
             }
         }
-        // 面图层
-        if (polygonFeatures.length > 0) {
-            polygonHandle = createPolygonHandle(polygonFeatures, options, groupKey, polygonDatasetKey, singleGroup, deps.getPolygon());
-            if (polygonHandle) {
-                groupAllHandles.push(polygonHandle);
-                allHandles.push(polygonHandle);
+        // 点图层
+        if (pointFeatures.length > 0) {
+            const result = createPointLayerHandle(pointFeatures, options, groupKey, pointDatasetKey, singleGroup, deps.getPoint());
+            pointHandle = result.handle;
+            if (pointHandle) {
+                groupAllHandles.push(pointHandle);
+                allHandles.push(pointHandle);
             }
         }
         /** *********************组装分组句柄*********************/

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "my-openlayer",
   "private": false,
-  "version": "3.1.0",
+  "version": "3.1.1",
   "type": "module",
   "license": "MIT",
   "main": "index.js",