Merge branch 'dev'

Author: xiongjiaojiao

demo/iconfont/iconfont.html

@@ -54,6 +54,12 @@ <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" targ
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
 
+            <li class="dib">
+              <span class="icon sm-components-icon-">&#xe662;</span>
+                <div class="name">地图切换</div>
+                <div class="code-name">&amp;#xe662;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon sm-components-icon-">&#xe6a0;</span>
                 <div class="name">complete</div>
@@ -438,9 +444,9 @@ <h3 id="-font-face">第一步：拷贝项目下面生成的 <code>@font-face</co
 <pre><code class="language-css"
 >@font-face {
   font-family: 'sm-components-icon-';
-  src: url('iconfont.woff2?t=1730441116037') format('woff2'),
-       url('iconfont.woff?t=1730441116037') format('woff'),
-       url('iconfont.ttf?t=1730441116037') format('truetype');
+  src: url('iconfont.woff2?t=1754981391771') format('woff2'),
+       url('iconfont.woff?t=1754981391771') format('woff'),
+       url('iconfont.ttf?t=1754981391771') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -466,6 +472,15 @@ <h3 id="-">第三步：挑选相应图标并获取字体编码，应用于页面
       <div class="content font-class">
         <ul class="icon_lists dib-box">
 
+          <li class="dib">
+            <span class="icon sm-components-icon- sm-components-icon-dituqiehuan"></span>
+            <div class="name">
+              地图切换
+            </div>
+            <div class="code-name">.sm-components-icon-dituqiehuan
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon sm-components-icon- sm-components-icon-complete"></span>
             <div class="name">
@@ -1042,6 +1057,14 @@ <h3 id="-">第二步：挑选相应图标并获取类名，应用于页面：</h
       <div class="content symbol">
           <ul class="icon_lists dib-box">
 
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#sm-components-icon-dituqiehuan"></use>
+                </svg>
+                <div class="name">地图切换</div>
+                <div class="code-name">#sm-components-icon-dituqiehuan</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#sm-components-icon-complete"></use>

demo/iconfont/iconfont.js

@@ -138,7 +138,8 @@ module.exports = {
                     'control/layer-manager',
                     'control/coordinate-conversion',
                     'control/fly-to',
-                    'control/layer-color'
+                    'control/layer-color',
+                    'control/base-layer-switcher'
                   ]
                 },
                 {

docs/.vuepress/config.js

@@ -0,0 +1,35 @@
+# 底图切换
+
+```vue
+<sm-web-map server-url="https://iportal.supermap.io/iportal/" map-id="801571284">
+  <sm-base-layer-switcher position="bottom-right" :layers="layers" />
+</sm-web-map>
+```
+
+### Attributes
+
+| 参数          | 说明               | 类型                            | 可选值  | 默认值 |
+|:--------------|:-----------------|:--------------------------------|:--------|:-------|
+| layers        | 底图列表           | Array<[LayerItem](#layeritem)>  | -       | -      |
+| defaultLayer  | 默认底图的唯一标识 | string                          | string  | -      |
+| baseLayerInfo | 原始底图信息       | [BaseLayerInfo](#baselayerinfo) | boolean | true   |
+
+> 支持[主题混入参数](/zh/api/mixin/mixin.md#theme)和 [Control 混入参数](/zh/api/mixin/mixin.md#control)
+
+### LayerItem
+
+| 参数      | 说明            | 类型                                                                    | 是否必填 |
+|:----------|:--------------|:------------------------------------------------------------------------|:--------|
+| id        | 底图唯一标识    | string                                                                  | 是       |
+| title     | 底图名称        | string                                                                  | 是       |
+| layers    | MapboxGL 图层   | Array<[Layers](https://docs.mapbox.com/style-spec/reference/layers/)>   | 是       |
+| sources   | MapboxGL 数据源 | Array<[Sources](https://docs.mapbox.com/style-spec/reference/sources/)> | 是       |
+| thumbnail | 底图缩略图      | string                                                                  | 否       |
+
+### BaseLayerInfo
+
+| 参数      | 说明       | 类型    | 是否必填 |
+|:----------|:---------|:--------|:--------|
+| show      | 显示原底图 | boolean | 是       |
+| title     | 底图名称   | string  | 是       |
+| thumbnail | 底图缩略图 | string  | 否       |

docs/zh/api/control/base-layer-switcher.md

@@ -43,7 +43,7 @@ module.exports = {
     '!mapboxgl/*/__tests__/**/type.{js,jsx}'
   ],
   transformIgnorePatterns: [
-    'node_modules/(?!(mapbox-gl|axios|element-ui|ant-design-vue|geographic-coordinate-converter|videojs-flvjs-es6|vue-videojs7|three)/)'
+    'node_modules/(?!(ol|mapbox-gl|axios|element-ui|ant-design-vue|geographic-coordinate-converter|videojs-flvjs-es6|vue-videojs7|three)/)'
   ],
   modulePaths: ['src', 'node_modules'],
   reporters: ["default", "jest-teamcity"],

jest.config.js

@@ -1,6 +1,6 @@
 {
   "name": "@supermapgis/vue-iclient",
-  "version": "12.0.0-r",
+  "version": "12.0.1-r",
   "description": "SuperMap iClient for Vue.js",
   "homepage": "https://iclient.supermap.io",
   "scripts": {
@@ -53,6 +53,7 @@
     "css-vars-ponyfill": "2.2.1",
     "echarts": "^4.8.0",
     "echarts-liquidfill": "^2.0.5",
+    "fast-xml-parser": "^5.2.5",
     "flush-promises": "^1.0.2",
     "flv.js": "^1.5.0",
     "geojson": "^0.5.0",
@@ -77,6 +78,7 @@
     "mapbox-gl-compare": "^0.4.0",
     "mapv": "^2.0.34",
     "mux.js": "^5.6.7",
+    "ol": "^6.15.1",
     "omit.js": "^2.0.2",
     "proj4": "^2.8.0",
     "resize-detector": "^0.2.0",

package.json

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "sm-components-icon-"; /* Project id 2236405 */
-  src: url('icon-sm-components.woff2?t=1728443762490') format('woff2'),
-       url('icon-sm-components.woff?t=1728443762490') format('woff'),
-       url('icon-sm-components.ttf?t=1728443762490') format('truetype');
+  src: url('icon-sm-components.woff2?t=1754981391771') format('woff2'),
+       url('icon-sm-components.woff?t=1754981391771') format('woff'),
+       url('icon-sm-components.ttf?t=1754981391771') format('truetype');
 }
 
 [class^="sm-components-icon-"], [class*=" sm-components-icon-"], .sm-components-icon {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.sm-components-icon-dituqiehuan:before {
+  content: "\e662";
+}
+
 .sm-components-icon-complete:before {
   content: "\e6a0";
 }