Skip to content

Commit

Permalink
同步dev分支
Browse files Browse the repository at this point in the history
  • Loading branch information
@songyumeng
songyumeng committed Jun 30, 2020
2 parents 1dd5b98 + cedfece commit 5af848a
Show file tree
Hide file tree
Showing 244 changed files with 113,127 additions and 19,715 deletions.
6 changes: 6 additions & 0 deletions build/webpack.mapboxgl.conf.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ const webpackConfig = merge(baseWebpackConfig, {
commonjs2: 'vue-echarts',
amd: 'vue-echarts'
},
'vue-cesium': {
root: 'VueCesium',
commonjs: 'vue-cesium',
commonjs2: 'vue-cesium',
amd: 'vue-cesium'
},
'ant-design-vue': {
root: 'antd',
commonjs: 'ant-design-vue',
Expand Down
1 change: 1 addition & 0 deletions docs/.vuepress/config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ module.exports = {
children: [
'web-map/map',
'web-scene/scene',
'map-compare/compare',
{
title: '地图子组件',
collapsable: false,
Expand Down
39 changes: 15 additions & 24 deletions docs/zh/api/chart/echart.md
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/zh/api/chart/liquid.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
| 参数 | 说明 | 类型 | 可选值 | 默认值 |
| :--------------- | :----------------------------------------------------------------------------- | :--------------- | :----- | :-------- |
| url | 服务地址 | string | - | - |
| field | 指定[服务响应数据](/zh/api/service-response-data-requirements/index)中的字段 | string | - | - |
| field | 指定[服务响应数据](/zh/api/service-response-data-requirements/index.md)中的字段 | string | - | - |
| startTiming | 是否开启定时刷新 | boolean | - | false |
| frequency | 请求间隔 | number \| string | - | 3 |
| value | 百分比 | number \| string | - | 0 |
Expand Down
25 changes: 13 additions & 12 deletions docs/zh/api/chart/progress.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,17 @@

### Attributes

| 参数 | 说明 | 类型 | 可选值 | 默认值 |
| :---------- | :----------------------------------------------------------------------------- | :--------------- | :----------------------------------------------- | :------- |
| 参数 | 说明 | 类型 | 可选值 | 默认值 |
| :---------- | :------------------------------------------------------------------------------ | :--------------- | :----------------------------------------------- | :-------- |
| - |
| percent | 百分比 | number \| string | - | - |
| url | 服务地址 | string | - | - |
| field | 指定[服务响应数据](/zh/api/service-response-data-requirements/index)中的字段 | string | - | - |
| startTiming | 是否开启定时刷新 | boolean | - | false |
| frequency | 请求间隔 | number \| string | - | 3 |
| type | 类型 | string | 'line' \| 'circle' \| 'dashboard' | 'line' |
| strokeWidth | 进度条线的宽度 ( type=line ) | number \| string | - | 6 |
| strokeWidth | 进度条线的宽度 ( type=circle ) | number \| string | - | 6 |
| status | 状态 | number \| string | 'normal' \| 'success' \| 'exception' \| 'active' | 'normal' |
| strokeColor | 进度条颜色 | string | - | - |
| percent | 百分比 | number \| string | - | - |
| url | 服务地址 | string | - | - |
| field | 指定[服务响应数据](/zh/api/service-response-data-requirements/index.md)中的字段 | string | - | - |
| startTiming | 是否开启定时刷新 | boolean | - | false |
| frequency | 请求间隔 | number \| string | - | 3 |
| type | 类型 | string | 'line' \| 'circle' \| 'dashboard' | 'line' |
| strokeWidth | 进度条线的宽度 ( type=line ) | number \| string | - | 6 |
| strokeWidth | 进度条线的宽度 ( type=circle ) | number \| string | - | 6 |
| status | 状态 | number \| string | 'normal' \| 'success' \| 'exception' \| 'active' | 'normal' |
| strokeColor | 进度条颜色 | string | - | - |
| trailColor | 进度条底色 | string | - | '#f3f3f3' |
10 changes: 10 additions & 0 deletions docs/zh/api/common-types/common-types.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,13 @@ let CircleStyle = new VueiClient.commontypes.CircleStyle();
| maxFeatures | 要素最大返回数 | number | - | 20 |
| name | 服务名称 | string | - | 'SuperMap iPortal 数据' |
| withCredentials | 请求是否携带 cookie | boolean | - | false |

## GeoJSONParameter

| 参数 | 说明 | 类型 | 可选值 | 默认值 |
| :-------------- | :------------------ | :------------------------------ | :----- | :-------- |
| type | 服务类型 | string | - | 'geoJSON' |
| geoJSON | GeoJSON 数据 | [GeoJSON](https://geojson.org/) | - | - |
| attributeFilter | 属性过滤条件 | string | - | - |
| maxFeatures | 要素最大返回数 | number | - | 20 |
| withCredentials | 请求是否携带 cookie | boolean | - | false |
65 changes: 43 additions & 22 deletions docs/zh/api/common/indicator.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,46 @@

### Attributes

| 参数 | 说明 | 类型 | 可选值 | 默认值 |
| :------------------ | :----------------------------------------------------------------------------- | :--------------- | :-------------------------------- | :--------------------------------------- |
| url | 服务地址 | string | - | - |
| field | 指定[服务响应数据](/zh/api/service-response-data-requirements/index)中的字段 | string | - | - |
| startTiming | 是否开启定时刷新 | boolean | - | false |
| frequency | 请求间隔 | number \| string | - | 3 |
| showTitleUnit | 是否显示标题和单位 | boolean | - | true |
| title | 标题 | string | - | '指标标题' |
| unit | 单位 | string | - | '单位' |
| num | 数据 | string \| number | - | 0 |
| decimals | 小数位数 | number | - | -1 (计算结果的默认小数位数) |
| mode | 排列方式 | string | 'vertical' \| 'horizontal' | 'vertical' |
| separator | 千分符 | string | - | ','（英文逗号） |
| separatorBackground | 分隔符背景 | boolean | - | false |
| animated | 数字动画 | boolean | - | false |
| duration | 动画时长 | string \| number | - | 1000 |
| fontWeight | 字体粗细 | string \| number | 'lighter' \| 'normal' \| 'bolder' | 'border' |
| fontSize | 字体大小 | string \| number | - | - |
| numSpacing | 字体间距 | number | - | 0 |
| indicatorColor | 数据颜色 | string | - | - |
| numBackground | 背景样式 | object | - | { color: 'rgba(0, 0, 0, 0)', image: '' } |
| |
| 参数 | 说明 | 类型 | 可选值 | 默认值 |
| :------------------ | :------------------------------------------------------------------------------ | :---------------------------------------------- | :-------------------------------- | :--------------------------------------- |
| url | 服务地址 | string | - | - |
| field | 指定[服务响应数据](/zh/api/service-response-data-requirements/index.md)中的字段 | string | - | - |
| startTiming | 是否开启定时刷新 | boolean | - | false |
| frequency | 请求间隔 | number \| string | - | 3 |
| showTitleUnit | 是否显示标题和单位 | boolean | - | true |
| title | 标题 | string | - | '指标标题' |
| unit | 单位 | string | - | '单位' |
| num | 数据 | string \| number | - | 0 |
| decimals | 小数位数 | number | - | -1 (计算结果的默认小数位数) |
| mode | 排列方式 | string | 'vertical' \| 'horizontal' | 'vertical' |
| separator | 千分符 | string | - | ','（英文逗号） |
| separatorBackground | 分隔符背景 | boolean | - | false |
| animated | 数字动画 | boolean | - | false |
| duration | 动画时长 | string \| number | - | 1000 |
| fontWeight | 字体粗细 | string \| number | 'lighter' \| 'normal' \| 'bolder' | 'border' |
| fontSize | 字体大小 | string \| number | - | - |
| numSpacing | 字体间距 | number | - | 0 |
| indicatorColor | 数据颜色 | string | - | - |
| numBackground | 背景样式 | object | - | { color: 'rgba(0, 0, 0, 0)', image: '' } |
| thresholdsStyle | 阈值样式 | <a href="#thresholdsstyle">ThresholdsStyle </a> | - | [] |

### ThresholdsStyle

```json
// 阈值格式如下
[
{
"max": 50,
"color": "#0CD54A"
},
{
"min": 50,
"max": 80,
"color": "#F7682D"
},
{
"min": 80,
"color": "#DD2C2C"
}
]
```
Loading

0 comments on commit 5af848a

Please sign in to comment.