Shihui (#1021)

* chore: update version 2.8.12 -> 2.8.13 * fix: 修复 layer cursor 在 GAODE2.x 下的兼容问题 * style: lint style
2022-03-28 16:54:12 +08:00 · 2022-03-28 16:54:12 +08:00 · 059625f66f
parent fe300a4c9b
commit 059625f66f
15 changed files with 57 additions and 49 deletions
--- a/lerna.json
+++ b/lerna.json
@ -14,7 +14,7 @@
      "message": "chore: publish"
    }
  },
-  "version": "2.8.12",
+  "version": "2.8.13",
  "npmClient": "yarn",
  "useWorkspaces": true,
  "publishConfig": {
--- a/packages/component/package.json
+++ b/packages/component/package.json
@ -1,6 +1,6 @@
 {
  "name": "@antv/l7-component",
-  "version": "2.8.12",
+  "version": "2.8.13",
  "description": "",
  "main": "lib/index.js",
  "module": "es/index.js",
@ -25,8 +25,8 @@
  "author": "lzxue",
  "license": "ISC",
  "dependencies": {
-    "@antv/l7-core": "^2.8.12",
-    "@antv/l7-utils": "^2.8.12",
+    "@antv/l7-core": "^2.8.13",
+    "@antv/l7-utils": "^2.8.13",
    "@babel/runtime": "^7.7.7",
    "eventemitter3": "^4.0.0",
    "inversify": "^5.0.1",
--- a/packages/core/package.json
+++ b/packages/core/package.json
@ -1,6 +1,6 @@
 {
  "name": "@antv/l7-core",
-  "version": "2.8.12",
+  "version": "2.8.13",
  "description": "",
  "main": "lib/index.js",
  "module": "es/index.js",
@ -24,7 +24,7 @@
  "license": "ISC",
  "dependencies": {
    "@antv/async-hook": "^2.1.0",
-    "@antv/l7-utils": "^2.8.12",
+    "@antv/l7-utils": "^2.8.13",
    "@babel/runtime": "^7.7.7",
    "ajv": "^6.10.2",
    "element-resize-event": "^3.0.3",
--- a/packages/core/src/services/interaction/PickingService.ts
+++ b/packages/core/src/services/interaction/PickingService.ts
@ -156,7 +156,13 @@ export default class PickingService implements IPickingService {
  public handleCursor(layer: ILayer, type: string) {
    const { cursor = '', cursorEnabled } = layer.getLayerConfig();
    if (cursorEnabled) {
-      const domContainer = this.mapService.getMarkerContainer();
+      const version = this.mapService.version;
+      const domContainer =
+        version === 'GAODE2.x'
+          ? this.mapService.getMapContainer()
+          : this.mapService.getMarkerContainer();
+      // const domContainer = this.mapService.getMarkerContainer();
+      // const domContainer = this.mapService.getMapContainer();
      const defaultCursor = domContainer?.style.getPropertyValue('cursor');
      if (type === 'unmousemove' && defaultCursor !== '') {
        domContainer?.style.setProperty('cursor', '');
@ -164,6 +170,8 @@ export default class PickingService implements IPickingService {
        domContainer?.style.setProperty('cursor', cursor);
      }
    }
+    // const domContainer = this.mapService.getMapContainer()
+    // domContainer?.style.setProperty('cursor', 'move');
  }

  // 获取容器的大小 - 兼容小程序环境
--- a/packages/l7/package.json
+++ b/packages/l7/package.json
@ -1,6 +1,6 @@
 {
  "name": "@antv/l7",
-  "version": "2.8.12",
+  "version": "2.8.13",
  "description": "A Large-scale WebGL-powered Geospatial Data Visualization",
  "main": "lib/index.js",
  "module": "es/index.js",
@ -25,13 +25,13 @@
  "author": "antv",
  "license": "MIT",
  "dependencies": {
-    "@antv/l7-component": "^2.8.12",
-    "@antv/l7-core": "^2.8.12",
-    "@antv/l7-layers": "^2.8.12",
-    "@antv/l7-maps": "^2.8.12",
-    "@antv/l7-scene": "^2.8.12",
-    "@antv/l7-source": "^2.8.12",
-    "@antv/l7-utils": "^2.8.12",
+    "@antv/l7-component": "^2.8.13",
+    "@antv/l7-core": "^2.8.13",
+    "@antv/l7-layers": "^2.8.13",
+    "@antv/l7-maps": "^2.8.13",
+    "@antv/l7-scene": "^2.8.13",
+    "@antv/l7-source": "^2.8.13",
+    "@antv/l7-utils": "^2.8.13",
    "@babel/runtime": "^7.7.7"
  },
  "gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31",
--- a/packages/l7/src/version.ts
+++ b/packages/l7/src/version.ts
@ -1,2 +1,2 @@
-const version = '2.8.12';
+const version = '2.8.13';
 export { version };
--- a/packages/layers/package.json
+++ b/packages/layers/package.json
@ -1,6 +1,6 @@
 {
  "name": "@antv/l7-layers",
-  "version": "2.8.12",
+  "version": "2.8.13",
  "description": "L7's collection of built-in layers",
  "main": "lib/index.js",
  "module": "es/index.js",
@ -24,9 +24,9 @@
  "license": "ISC",
  "dependencies": {
    "@antv/geo-coord": "^1.0.8",
-    "@antv/l7-core": "^2.8.12",
-    "@antv/l7-source": "^2.8.12",
-    "@antv/l7-utils": "^2.8.12",
+    "@antv/l7-core": "^2.8.13",
+    "@antv/l7-source": "^2.8.13",
+    "@antv/l7-utils": "^2.8.13",
    "@babel/runtime": "^7.7.7",
    "@mapbox/martini": "^0.2.0",
    "@turf/meta": "^6.0.2",
--- a/packages/map/package.json
+++ b/packages/map/package.json
@ -1,6 +1,6 @@
 {
  "name": "@antv/l7-map",
-  "version": "2.8.12",
+  "version": "2.8.13",
  "description": "l7 map",
  "keywords": [],
  "author": "thinkinggis <lzx199065@gmail.com>",
@ -37,7 +37,7 @@
  },
  "homepage": "https://github.com/antvis/L7#readme",
  "dependencies": {
-    "@antv/l7-utils": "^2.8.12",
+    "@antv/l7-utils": "^2.8.13",
    "@babel/runtime": "^7.7.7",
    "@mapbox/point-geometry": "^0.1.0",
    "@mapbox/unitbezier": "^0.0.0",
--- a/packages/maps/package.json
+++ b/packages/maps/package.json
@ -1,6 +1,6 @@
 {
  "name": "@antv/l7-maps",
-  "version": "2.8.12",
+  "version": "2.8.13",
  "description": "",
  "main": "lib/index.js",
  "module": "es/index.js",
@ -27,9 +27,9 @@
  "license": "ISC",
  "dependencies": {
    "@amap/amap-jsapi-loader": "^0.0.3",
-    "@antv/l7-core": "^2.8.12",
-    "@antv/l7-map": "^2.8.12",
-    "@antv/l7-utils": "^2.8.12",
+    "@antv/l7-core": "^2.8.13",
+    "@antv/l7-map": "^2.8.13",
+    "@antv/l7-utils": "^2.8.13",
    "@babel/runtime": "^7.7.7",
    "@types/amap-js-api": "^1.4.6",
    "@types/mapbox-gl": "^1.11.2",
--- a/packages/mini/package.json
+++ b/packages/mini/package.json
@ -1,6 +1,6 @@
 {
  "name": "@antv/l7-mini",
-  "version": "2.8.12",
+  "version": "2.8.13",
  "description": "A Large-scale WebGL-powered Geospatial Data Visualization",
  "main": "lib/index.js",
  "module": "es/index.js",
@ -25,11 +25,11 @@
  "author": "antv",
  "license": "MIT",
  "dependencies": {
-    "@antv/l7-core": "^2.8.12",
-    "@antv/l7-layers": "^2.8.12",
-    "@antv/l7-maps": "^2.8.12",
-    "@antv/l7-scene": "^2.8.12",
-    "@antv/l7-utils": "^2.8.12",
+    "@antv/l7-core": "^2.8.13",
+    "@antv/l7-layers": "^2.8.13",
+    "@antv/l7-maps": "^2.8.13",
+    "@antv/l7-scene": "^2.8.13",
+    "@antv/l7-utils": "^2.8.13",
    "@babel/runtime": "^7.7.7"
  },
  "gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31",
--- a/packages/renderer/package.json
+++ b/packages/renderer/package.json
@ -1,6 +1,6 @@
 {
  "name": "@antv/l7-renderer",
-  "version": "2.8.12",
+  "version": "2.8.13",
  "description": "",
  "main": "lib/index.js",
  "module": "es/index.js",
@ -26,7 +26,7 @@
    "gl": "^4.4.0"
  },
  "dependencies": {
-    "@antv/l7-core": "^2.8.12",
+    "@antv/l7-core": "^2.8.13",
    "@babel/runtime": "^7.7.7",
    "inversify": "^5.0.1",
    "l7regl": "^0.0.20",
--- a/packages/scene/package.json
+++ b/packages/scene/package.json
@ -1,6 +1,6 @@
 {
  "name": "@antv/l7-scene",
-  "version": "2.8.12",
+  "version": "2.8.13",
  "description": "",
  "main": "lib/index.js",
  "module": "es/index.js",
@ -23,12 +23,12 @@
  "author": "xiaoiver",
  "license": "ISC",
  "dependencies": {
-    "@antv/l7-component": "^2.8.12",
-    "@antv/l7-core": "^2.8.12",
-    "@antv/l7-layers": "^2.8.12",
-    "@antv/l7-maps": "^2.8.12",
-    "@antv/l7-renderer": "^2.8.12",
-    "@antv/l7-utils": "^2.8.12",
+    "@antv/l7-component": "^2.8.13",
+    "@antv/l7-core": "^2.8.13",
+    "@antv/l7-layers": "^2.8.13",
+    "@antv/l7-maps": "^2.8.13",
+    "@antv/l7-renderer": "^2.8.13",
+    "@antv/l7-utils": "^2.8.13",
    "@babel/runtime": "^7.7.7",
    "inversify": "^5.0.1",
    "mapbox-gl": "^1.2.1",
--- a/packages/source/package.json
+++ b/packages/source/package.json
@ -1,6 +1,6 @@
 {
  "name": "@antv/l7-source",
-  "version": "2.8.12",
+  "version": "2.8.13",
  "description": "",
  "main": "lib/index.js",
  "module": "es/index.js",
@ -26,8 +26,8 @@
  "license": "ISC",
  "dependencies": {
    "@antv/async-hook": "^2.1.0",
-    "@antv/l7-core": "^2.8.12",
-    "@antv/l7-utils": "^2.8.12",
+    "@antv/l7-core": "^2.8.13",
+    "@antv/l7-utils": "^2.8.13",
    "@babel/runtime": "^7.7.7",
    "@mapbox/geojson-rewind": "^0.4.0",
    "@turf/helpers": "^6.1.4",
--- a/packages/three/package.json
+++ b/packages/three/package.json
@ -1,6 +1,6 @@
 {
  "name": "@antv/l7-three",
-  "version": "2.8.12",
+  "version": "2.8.13",
  "description": "three for L7 ",
  "keywords": [
    "3D",
@ -44,9 +44,9 @@
  },
  "homepage": "https://github.com/antvis/L7#readme",
  "dependencies": {
-    "@antv/l7-core": "^2.8.12",
-    "@antv/l7-layers": "^2.8.12",
-    "@antv/l7-scene": "^2.8.12",
+    "@antv/l7-core": "^2.8.13",
+    "@antv/l7-layers": "^2.8.13",
+    "@antv/l7-scene": "^2.8.13",
    "@babel/runtime": "^7.7.7",
    "inversify": "^5.0.1",
    "reflect-metadata": "^0.1.13",
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@ -1,6 +1,6 @@
 {
  "name": "@antv/l7-utils",
-  "version": "2.8.12",
+  "version": "2.8.13",
  "description": "",
  "main": "lib/index.js",
  "module": "es/index.js",