Skip to content

Commit

Permalink
[fix]merge dev冲突
Browse files Browse the repository at this point in the history
  • Loading branch information
@luoxiao-supermap
luoxiao-supermap committed Sep 27, 2023
2 parents f3edead + 4a99d01 commit 987de74
Show file tree
Hide file tree
Showing 41 changed files with 826 additions and 160 deletions.
6 changes: 3 additions & 3 deletions docs/zh/api/common/slideshow.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
| mousewheel | 是否开启鼠标滚轮控制播放 | boolean | - | false |
| keyboard | 是否开启键盘控制播放 | boolean | - | false |
| grabCursor | 是否开启鼠标手掌形状。在 hover 状态或拖动时触发 | boolean | - | true |
| navigation | 前进后退按钮配置。参照[swiper](https://www.swiper.com.cn/api/navigation/355.html) | object \| [slot](https://github.com/surmon-china/surmon-china.github.io/blob/source/projects/vue-awesome-swiper/examples/30-thumbs-gallery.vue) | - | - |
| pagination | 分页器导航配置。参照[swiper](https://www.swiper.com.cn/api/pagination/362.html) | object \| [slot](https://github.com/surmon-china/surmon-china.github.io/blob/source/projects/vue-awesome-swiper/examples/14-centered-auto.vue) | - | - |
| scrollbar | 滚动条配置。参照[swiper](https://www.swiper.com.cn/api/scrollbar/369.html) | object \| [slot](https://github.com/surmon-china/surmon-china.github.io/blob/source/projects/vue-awesome-swiper/examples/16-scroll-container.vue) | - | - |
| navigation | 前进后退按钮配置。参照[swiper](https://www.swiper.com.cn/api/navigation/355.html) | object \| [slot](https://github.com/surmon-china/surmon-china.github.io/blob/source/examples/vue-awesome-swiper/33-thumbs-gallery.vue) | - | - |
| pagination | 分页器导航配置。参照[swiper](https://www.swiper.com.cn/api/pagination/362.html) | object \| [slot](https://github.com/surmon-china/surmon-china.github.io/blob/source/examples/vue-awesome-swiper/15-centered-auto.vue) | - | - |
| scrollbar | 滚动条配置。参照[swiper](https://www.swiper.com.cn/api/scrollbar/369.html) | object \| [slot](https://github.com/surmon-china/surmon-china.github.io/blob/source/examples/vue-awesome-swiper/17-scroll-container.vue) | - | - |
| effect | 幻灯片播放效果 | string | 'slide' \| 'cube' \| 'coverflow' \| 'flip' | 'slide' |
| autoresize | 组件根元素尺寸变化时幻灯片是否自适应 | boolean | - | true |

Expand Down
3 changes: 2 additions & 1 deletion docs/zh/api/control/fly-to.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,5 @@ new Vue({
| next() | 激活播放播放到下一数据项 |
| prev() | 激活播放播放到上一数据项 |

> 仅支持 [\$ref](https://cn.vuejs.org/v2/api/#ref) 引用组件实例的方式调用
> 仅支持 [\$ref](https://v2.cn.vuejs.org/v2/api/#ref) 引用组件实例的方式调用
2 changes: 1 addition & 1 deletion docs/zh/api/control/legend.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
| mode | 图例样式 | string | 'simple' \| 'panel' | 'simple' |
| isShowTitle | 是否显示图层名 | boolean | - | false |
| isShowField | 是否显示图层专题字段 | boolean | - | false |
| position | 控件添加到地图上的位置。添加为地图的子组件（[slot](https://cn.vuejs.org/v2/api/#slot)）时生效 | string | 'top-left' \| 'top-right' \| 'bottom-left' \| 'bottom-right' | 'bottom-left' |
| position | 控件添加到地图上的位置。添加为地图的子组件（[slot](https://v2.cn.vuejs.org/v2/api/#slot)）时生效 | string | 'top-left' \| 'top-right' \| 'bottom-left' \| 'bottom-right' | 'bottom-left' |
| iconClass | 收缩按钮的 Font class 类 | string | - | 'sm-components-icon-list' |
| headerName | 标题名 | string | - | '图例' |

Expand Down
4 changes: 2 additions & 2 deletions docs/zh/api/guide/quick-start.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

高效的开发，离不开基础工程的搭建。在开始使用 Vue-iClient-MapboxGL 之前，有必要先了解以下基础知识，我们也假设您已经写过 Vue，并掌握了下面的内容。

- [Vue 组件](https://cn.vuejs.org/v2/guide/components.html)
- [单文件组件](https://cn.vuejs.org/v2/guide/single-file-components.html)
- [Vue 组件](https://v2.cn.vuejs.org/v2/guide/components.html)
- [单文件组件](https://v2.cn.vuejs.org/v2/guide/single-file-components.html)

以下概念贯穿 Vue-iClient-MapboxGL 前后，建议开发者花点时间来了解。

Expand Down
2 changes: 1 addition & 1 deletion docs/zh/api/layer/animate-marker.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
| textFontSize | 字体大小 | number | - | 14 |
| textColor | 字体颜色 | string | - | '#fff' |
| textField | 显示字段 | string | - | - |
| fitBounds | 是否自适应 | boolean | - | false |
| fitBounds | 是否自适应 | boolean | - | true |
| mapTarget | 关联地图容器 ID。如果该参数省略，则默认绑定其父组件为地图组件的 Map 实例或者第一个地图组件的 Map 实例 | string | - | - |
2 changes: 1 addition & 1 deletion docs/zh/api/layer/dataflow.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
| 参数 | 说明 | 类型 | 可选值 | 默认值 |
| :------------ | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :----- | :----- |
| serviceUrl | 数据流服务地址 | string | - | - |
| registerToken | SuperMap iServer 提供的一种基于 Token（令牌）的用户身份验证机制。参照 [SuperMap iClient API](https://iclient.supermap.io/docs/mapboxgl/SuperMap.SecurityManager.html#.registerToken) | string | - | - |
| registerToken | SuperMap iServer 提供的一种基于 Token（令牌）的用户身份验证机制。参照 [SuperMap iClient API](https://iclient.supermap.io/docs/mapboxgl/SecurityManager.html#.registerToken) | string | - | - |
| geometry | 指定几何范围。该范围内的要素才能被订阅 | object | - | - |
| excludeField | 排除字段 | object | - | - |
| layerStyle | 图层样式 | [LayerStyle](/zh/api/common-types/common-types.md#layerstyle) | - | - |
Expand Down
2 changes: 1 addition & 1 deletion docs/zh/api/layer/deckgl.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,6 @@
| 参数 | 说明 | 类型 | 可选值 | 默认值 |
| :-------- | :-------------------------------------------------------------------------------------------------------------------------- | :----- | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :----- |
| layerType | 高效率图层类型 | object | 'scatter-plot'高效率点图层 \| 'path-layer'（路径线图层） \| 'polygon-layer'（高效率面图层） \| 'arc-layer'（曲线图层） \| 'hexagon-layer'（ 正六边形图层） \| 'screen-grid-layer'（网格图层） | - |
| options | 图层可选参数，参照 [SuperMap echartsLayer API](https://iclient.supermap.io/docs/mapboxgl/mapboxgl.supermap.DeckglLayer.html) | object | - | - |
| options | 图层可选参数，参照 [SuperMap DeckglLayer API](https://iclient.supermap.io/docs/mapboxgl/DeckglLayer.html) | object | - | - |

> 支持 [Layer 混入参数](/zh/api/mixin/mixin.md#layer)
4 changes: 2 additions & 2 deletions docs/zh/api/layer/graph-theme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
| :--------- | :-------------------------------------------------------------------------------------------------------------------------- | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :----------------------- | :----- |
| layerName | 图层名 | string | - | - |
| chartsType | 图表类别 | string | 'Bar' \| 'Line' \| 'Pie' | 'Bar' |
| options | 图层可选参数，参照 [SuperMap iClient API](https://iclient.supermap.io/docs/mapboxgl/mapboxgl.supermap.GraphThemeLayer.html) | object | - | - |
| data | 图层数据 | [mapboxgl.supermap.ThemeFeature](https://iclient.supermap.io/docs/mapboxgl/mapboxgl.supermap.ThemeFeature.html) \| [SuperMap.ServerFeature](https://iclient.supermap.io/web/apis/mapboxgl.html) | - | - |
| options | 图层可选参数，参照 [SuperMap iClient API](https://iclient.supermap.io/docs/mapboxgl/GraphThemeLayer.html) | object | - | - |
| data | 图层数据 | [mapboxgl.supermap.ThemeFeature](https://iclient.supermap.io/docs/mapboxgl/ThemeFeature.html) \| [mapboxgl.supermap.ServerFeature](https://iclient.supermap.io/docs/mapboxgl/ServerFeature.html) | - | - |

> 支持 [Layer 混入参数](/zh/api/mixin/mixin.md#layer)
Expand Down
4 changes: 2 additions & 2 deletions docs/zh/api/layer/label-theme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
| 参数 | 说明 | 类型 | 可选值 | 默认值 |
| :-------- | :-------------------------------------------------------------------------------------------------------------------------- | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :----- | :----- |
| layerName | 图层名 | string | - | - |
| options | 图层可选参数，参照 [SuperMap iClient API](https://iclient.supermap.io/docs/mapboxgl/mapboxgl.supermap.LabelThemeLayer.html) | object | - | - |
| data | 图层数据 | [mapboxgl.supermap.ThemeFeature](https://iclient.supermap.io/docs/mapboxgl/mapboxgl.supermap.ThemeFeature.html) \| [SuperMap.ServerFeature](https://iclient.supermap.io/web/apis/mapboxgl.html) | - | - |
| options | 图层可选参数，参照 [SuperMap iClient API](https://iclient.supermap.io/docs/mapboxgl/LabelThemeLayer.html) | object | - | - |
| data | 图层数据 | [mapboxgl.supermap.ThemeFeature](https://iclient.supermap.io/docs/mapboxgl/ThemeFeature.html) \| [mapboxgl.supermap.ServerFeature](https://iclient.supermap.io/docs/mapboxgl/ServerFeature.html) | - | - |

> 支持 [Layer 混入参数](/zh/api/mixin/mixin.md#layer)
Expand Down
2 changes: 1 addition & 1 deletion docs/zh/api/layer/mapv.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

| 参数 | 说明 | 类型 | 可选值 | 默认值 |
| :------ | :------------------------------------------------------------------------------------------------------------------------- | :------------------------------ | :----- | :----- |
| options | 图层可选参数，参照 [SuperMap iClient API](https://iclient.supermap.io/docs/mapboxgl/mapboxgl.supermap.MapvLayer.html) | object | - | - |
| options | 图层可选参数，参照 [SuperMap iClient API](https://iclient.supermap.io/docs/mapboxgl/MapvLayer.html) | object | - | - |
| data | MapV 图层数据集 | [GeoJSON](https://geojson.org/) | - | - |

> 支持 [Layer 混入参数](/zh/api/mixin/mixin.md#layer)
Loading

0 comments on commit 987de74

Please sign in to comment.