p90524618
/
antv-l7
mirror of https://gitee.com/antv-l7/antv-l7
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Shihui (#1021) 

* chore: update version 2.8.12 -> 2.8.13

* fix: 修复 layer cursor 在 GAODE2.x 下的兼容问题

* style: lint style
This commit is contained in:
YiQianYao 2022-03-28 16:54:12 +08:00 committed by GitHub
parent fe300a4c9b
commit 059625f66f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 57 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -14,7 +14,7 @@
"message": "chore: publish" "message": "chore: publish"
} }
}, },
"version": "2.8.12", "version": "2.8.13",
"npmClient": "yarn", "npmClient": "yarn",
"useWorkspaces": true, "useWorkspaces": true,
"publishConfig": { "publishConfig": {

6
packages/component/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-component", "name": "@antv/l7-component",
"version": "2.8.12", "version": "2.8.13",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -25,8 +25,8 @@
"author": "lzxue", "author": "lzxue",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@antv/l7-core": "^2.8.12", "@antv/l7-core": "^2.8.13",
"@antv/l7-utils": "^2.8.12", "@antv/l7-utils": "^2.8.13",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"eventemitter3": "^4.0.0", "eventemitter3": "^4.0.0",
"inversify": "^5.0.1", "inversify": "^5.0.1",

4
packages/core/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-core", "name": "@antv/l7-core",
"version": "2.8.12", "version": "2.8.13",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -24,7 +24,7 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@antv/async-hook": "^2.1.0", "@antv/async-hook": "^2.1.0",
"@antv/l7-utils": "^2.8.12", "@antv/l7-utils": "^2.8.13",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"ajv": "^6.10.2", "ajv": "^6.10.2",
"element-resize-event": "^3.0.3", "element-resize-event": "^3.0.3",

10
packages/core/src/services/interaction/PickingService.ts
View File

@ -156,7 +156,13 @@ export default class PickingService implements IPickingService {
public handleCursor(layer: ILayer, type: string) { public handleCursor(layer: ILayer, type: string) {
const { cursor = '', cursorEnabled } = layer.getLayerConfig(); const { cursor = '', cursorEnabled } = layer.getLayerConfig();
if (cursorEnabled) { 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'); const defaultCursor = domContainer?.style.getPropertyValue('cursor');
if (type === 'unmousemove' && defaultCursor !== '') { if (type === 'unmousemove' && defaultCursor !== '') {
domContainer?.style.setProperty('cursor', ''); domContainer?.style.setProperty('cursor', '');
@ -164,6 +170,8 @@ export default class PickingService implements IPickingService {
domContainer?.style.setProperty('cursor', cursor); domContainer?.style.setProperty('cursor', cursor);
} }
} }
// const domContainer = this.mapService.getMapContainer()
// domContainer?.style.setProperty('cursor', 'move');
} }
// 获取容器的大小 - 兼容小程序环境 // 获取容器的大小 - 兼容小程序环境

16
packages/l7/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7", "name": "@antv/l7",
"version": "2.8.12", "version": "2.8.13",
"description": "A Large-scale WebGL-powered Geospatial Data Visualization", "description": "A Large-scale WebGL-powered Geospatial Data Visualization",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -25,13 +25,13 @@
"author": "antv", "author": "antv",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@antv/l7-component": "^2.8.12", "@antv/l7-component": "^2.8.13",
"@antv/l7-core": "^2.8.12", "@antv/l7-core": "^2.8.13",
"@antv/l7-layers": "^2.8.12", "@antv/l7-layers": "^2.8.13",
"@antv/l7-maps": "^2.8.12", "@antv/l7-maps": "^2.8.13",
"@antv/l7-scene": "^2.8.12", "@antv/l7-scene": "^2.8.13",
"@antv/l7-source": "^2.8.12", "@antv/l7-source": "^2.8.13",
"@antv/l7-utils": "^2.8.12", "@antv/l7-utils": "^2.8.13",
"@babel/runtime": "^7.7.7" "@babel/runtime": "^7.7.7"
}, },
"gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31", "gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31",

2
packages/l7/src/version.ts
View File

@ -1,2 +1,2 @@
const version = '2.8.12'; const version = '2.8.13';
export { version }; export { version };

8
packages/layers/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-layers", "name": "@antv/l7-layers",
"version": "2.8.12", "version": "2.8.13",
"description": "L7's collection of built-in layers", "description": "L7's collection of built-in layers",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -24,9 +24,9 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@antv/geo-coord": "^1.0.8", "@antv/geo-coord": "^1.0.8",
"@antv/l7-core": "^2.8.12", "@antv/l7-core": "^2.8.13",
"@antv/l7-source": "^2.8.12", "@antv/l7-source": "^2.8.13",
"@antv/l7-utils": "^2.8.12", "@antv/l7-utils": "^2.8.13",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"@mapbox/martini": "^0.2.0", "@mapbox/martini": "^0.2.0",
"@turf/meta": "^6.0.2", "@turf/meta": "^6.0.2",

4
packages/map/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-map", "name": "@antv/l7-map",
"version": "2.8.12", "version": "2.8.13",
"description": "l7 map", "description": "l7 map",
"keywords": [], "keywords": [],
"author": "thinkinggis <lzx199065@gmail.com>", "author": "thinkinggis <lzx199065@gmail.com>",
@ -37,7 +37,7 @@
}, },
"homepage": "https://github.com/antvis/L7#readme", "homepage": "https://github.com/antvis/L7#readme",
"dependencies": { "dependencies": {
"@antv/l7-utils": "^2.8.12", "@antv/l7-utils": "^2.8.13",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"@mapbox/point-geometry": "^0.1.0", "@mapbox/point-geometry": "^0.1.0",
"@mapbox/unitbezier": "^0.0.0", "@mapbox/unitbezier": "^0.0.0",

8
packages/maps/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-maps", "name": "@antv/l7-maps",
"version": "2.8.12", "version": "2.8.13",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -27,9 +27,9 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@amap/amap-jsapi-loader": "^0.0.3", "@amap/amap-jsapi-loader": "^0.0.3",
"@antv/l7-core": "^2.8.12", "@antv/l7-core": "^2.8.13",
"@antv/l7-map": "^2.8.12", "@antv/l7-map": "^2.8.13",
"@antv/l7-utils": "^2.8.12", "@antv/l7-utils": "^2.8.13",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"@types/amap-js-api": "^1.4.6", "@types/amap-js-api": "^1.4.6",
"@types/mapbox-gl": "^1.11.2", "@types/mapbox-gl": "^1.11.2",

12
packages/mini/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-mini", "name": "@antv/l7-mini",
"version": "2.8.12", "version": "2.8.13",
"description": "A Large-scale WebGL-powered Geospatial Data Visualization", "description": "A Large-scale WebGL-powered Geospatial Data Visualization",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -25,11 +25,11 @@
"author": "antv", "author": "antv",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@antv/l7-core": "^2.8.12", "@antv/l7-core": "^2.8.13",
"@antv/l7-layers": "^2.8.12", "@antv/l7-layers": "^2.8.13",
"@antv/l7-maps": "^2.8.12", "@antv/l7-maps": "^2.8.13",
"@antv/l7-scene": "^2.8.12", "@antv/l7-scene": "^2.8.13",
"@antv/l7-utils": "^2.8.12", "@antv/l7-utils": "^2.8.13",
"@babel/runtime": "^7.7.7" "@babel/runtime": "^7.7.7"
}, },
"gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31", "gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31",

4
packages/renderer/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-renderer", "name": "@antv/l7-renderer",
"version": "2.8.12", "version": "2.8.13",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -26,7 +26,7 @@
"gl": "^4.4.0" "gl": "^4.4.0"
}, },
"dependencies": { "dependencies": {
"@antv/l7-core": "^2.8.12", "@antv/l7-core": "^2.8.13",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"inversify": "^5.0.1", "inversify": "^5.0.1",
"l7regl": "^0.0.20", "l7regl": "^0.0.20",

14
packages/scene/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-scene", "name": "@antv/l7-scene",
"version": "2.8.12", "version": "2.8.13",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -23,12 +23,12 @@
"author": "xiaoiver", "author": "xiaoiver",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@antv/l7-component": "^2.8.12", "@antv/l7-component": "^2.8.13",
"@antv/l7-core": "^2.8.12", "@antv/l7-core": "^2.8.13",
"@antv/l7-layers": "^2.8.12", "@antv/l7-layers": "^2.8.13",
"@antv/l7-maps": "^2.8.12", "@antv/l7-maps": "^2.8.13",
"@antv/l7-renderer": "^2.8.12", "@antv/l7-renderer": "^2.8.13",
"@antv/l7-utils": "^2.8.12", "@antv/l7-utils": "^2.8.13",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"inversify": "^5.0.1", "inversify": "^5.0.1",
"mapbox-gl": "^1.2.1", "mapbox-gl": "^1.2.1",

6
packages/source/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-source", "name": "@antv/l7-source",
"version": "2.8.12", "version": "2.8.13",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -26,8 +26,8 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@antv/async-hook": "^2.1.0", "@antv/async-hook": "^2.1.0",
"@antv/l7-core": "^2.8.12", "@antv/l7-core": "^2.8.13",
"@antv/l7-utils": "^2.8.12", "@antv/l7-utils": "^2.8.13",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"@mapbox/geojson-rewind": "^0.4.0", "@mapbox/geojson-rewind": "^0.4.0",
"@turf/helpers": "^6.1.4", "@turf/helpers": "^6.1.4",

8
packages/three/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-three", "name": "@antv/l7-three",
"version": "2.8.12", "version": "2.8.13",
"description": "three for L7 ", "description": "three for L7 ",
"keywords": [ "keywords": [
"3D", "3D",
@ -44,9 +44,9 @@
}, },
"homepage": "https://github.com/antvis/L7#readme", "homepage": "https://github.com/antvis/L7#readme",
"dependencies": { "dependencies": {
"@antv/l7-core": "^2.8.12", "@antv/l7-core": "^2.8.13",
"@antv/l7-layers": "^2.8.12", "@antv/l7-layers": "^2.8.13",
"@antv/l7-scene": "^2.8.12", "@antv/l7-scene": "^2.8.13",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"inversify": "^5.0.1", "inversify": "^5.0.1",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.1.13",

2
packages/utils/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-utils", "name": "@antv/l7-utils",
"version": "2.8.12", "version": "2.8.13",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",