Merge branch 'dev'

SuperMap · Jul 30, 2024 · 1e96d82 · 1e96d82
2 parents 590fb12 + e617b76
commit 1e96d82
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/config/webpack.prod.config.js b/config/webpack.prod.config.js
@@ -93,7 +93,7 @@ function getProdConfig(isMinify) {
     plugins: [
       new webpack.BannerPlugin(`
       ${pkg.name}.(${pkg.homepage})
-      Copyright© 2000 - 2023 SuperMap Software Co.Ltd
+      Copyright© 2000 - 2024 SuperMap Software Co.Ltd
       license: ${pkg.license}
       version: v${pkg.version}
      `),

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@supermap/react-iclient",
-  "version": "11.1.1",
+  "name": "@supermapgis/react-iclient",
+  "version": "11.2.0",
   "description": "SuperMap iClient for React.js",
   "homepage": "https://iclient.supermap.io",
   "scripts": {

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,7 +1,7 @@
 # Required metadata
 sonar.projectKey=com.supermap:react-iclient
 sonar.projectName=react-iclient
-sonar.projectVersion=11.1.1
+sonar.projectVersion=11.2.0
 
 # Comma-separated paths to directories with sources (required)
 sonar.sources=src/

diff --git a/src/mapboxgl/README.md b/src/mapboxgl/README.md
@@ -8,14 +8,14 @@
 ## 安装
 
 ```
-npm install @supermap/react-iclient-mapboxgl
+npm install @supermapgis/react-iclient-mapboxgl
 ```
 
 ## 开发
 
 ```js
 import React from 'react';
-import { SmWebMap } from '@supermap/react-iclient-mapboxgl';
+import { SmWebMap } from '@supermapgis/react-iclient-mapboxgl';
 
 const App = () => (
   <>

diff --git a/src/mapboxgl/package-config.json b/src/mapboxgl/package-config.json
@@ -1,6 +1,6 @@
 {
-  "name": "@supermap/react-iclient-mapboxgl",
-  "version": "11.1.1",
+  "name": "@supermapgis/react-iclient-mapboxgl",
+  "version": "11.2.0",
   "description": "SuperMap iClient for React.js",
   "main": "dist/index",
   "dependencies": {

diff --git a/src/mapboxgl/web-map/WebMapViewModel.ts b/src/mapboxgl/web-map/WebMapViewModel.ts
@@ -1,5 +1,5 @@
 /* eslint-disable */
-/* Copyright© 2000 - 2023 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2024 SuperMap Software Co.Ltd. All rights reserved.
  * This program are made available under the terms of the Apache License, Version 2.0
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html. */
  import mapboxgl from '../../../public/libs/mapboxgl/mapbox-gl-enhance';
@@ -400,7 +400,7 @@
     */
    private _createMap(mapInfo: any): void {
      // 获取字体样式
-     let fonts: string[] = [];
+     let fonts: string[] = ['sans-serif'];
      let layers = mapInfo.layers;
      // 获取 label 图层字体类型
      if (layers && layers.length > 0) {

diff --git a/src/mapboxgl/web-map/layer/cluster/ClusterLayerViewModel.js b/src/mapboxgl/web-map/layer/cluster/ClusterLayerViewModel.js
@@ -105,7 +105,7 @@ export default class ClusterLayerViewModel extends mapboxgl.Evented {
       filter: ['has', 'point_count'],
       layout: this.options.clusteredPointTextLayout || {
         'text-field': '{point_count_abbreviated}',
-        'text-font': ['DIN Offc Pro Medium', 'Arial Unicode MS Bold'],
+        'text-font': ['sans-serif'],
         'text-size': 12
       }
     });