Skip to content

Commit 15695a4

Browse files
Yuki-ZhaoYuki-Zhao
committed
2 parents a336b7c + 1ade36f commit 15695a4

File tree

98 files changed

+2764
-1990
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+2764
-1990
lines changed

‎CHANGELOG.md‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
## 新特性
55

6-
### iClient for MapboxGL 新增微件（for vue）
6+
### iClient for MapboxGL 新增组件（for vue）
77

8-
- iClient for MapboxGL 新增 WebMap 地图微件，图表微件，图例微件，图层列表微件，量算微件，查询/搜索微件，进度条等基础微件，支持多种主题（可一键切换风格）
8+
- iClient for MapboxGL 新增 WebMap 地图组件，图表组件，图例组件，图层列表组件，量算组件，查询/搜索组件，进度条等基础组件，支持多种主题（可一键切换风格）
99

1010
![whatsNewMapboxGlWidgets](https://github.com/SuperMap/iClient-JavaScript/blob/master/.github/912-1.png)
1111

@@ -69,13 +69,13 @@
6969

7070
### for Leaflet
7171

72-
- 新增 “微件 - 基础 - 图表_iServer” 示例
73-
- 新增 “微件 - 基础 - 图表_iPortal” 示例
72+
- 新增 “组件 - 基础 - 图表_iServer” 示例
73+
- 新增 “组件 - 基础 - 图表_iPortal” 示例
7474

7575
### for MapboxGL
7676

7777
- 新增 “iPortal - 地图” 分类及相关示例
78-
- 新增 “微件 - for Vue” 分类及相关示例
78+
- 新增 “组件 - for Vue” 分类及相关示例
7979
- 新增 “可视化 - 矢量瓦片 - 矢量瓦片叠加” 示例
8080

8181

@@ -92,23 +92,23 @@
9292

9393
![whatsNewMultiCoordinate](https://github.com/SuperMap/iClient-JavaScript/blob/master/.github/911-1.png)
9494

95-
### 新增多款功能微件
95+
### 新增多款功能组件
9696

97-
- iClient for Leaflet新增：文件打开微件、数据流微件、地址匹配与图层查询微件、客户端计算微件、分布式分析微件、数据服务查询微件
97+
- iClient for Leaflet新增：文件打开组件、数据流组件、地址匹配与图层查询组件、客户端计算组件、分布式分析组件、数据服务查询组件
9898

9999
![whatsNewWidgets](https://github.com/SuperMap/iClient-JavaScript/blob/master/.github/911-2.png)
100100

101101
## API changes
102102

103103
### for Leaflet
104104

105-
- 微件
106-
- 新增打开文件微件 `L.supermap.widgets.openFile` 及功能类 `L.supermap.widgets.openFileViewModel`
107-
- 新增数据流微件 `L.supermap.widgets.dataFlow` 及功能类 `L.supermap.widgets.dataFlowViewModel`
108-
- 新增图层查询微件 `L.supermap.widgets.search` 及功能类 `L.supermap.widgets.searchViewModel`
109-
- 新增客户端计算微件 `L.supermap.widgets.clientComputation` 及功能类 `L.supermap.widgets.clientComputationViewModel`
110-
- 新增分布式分析微件 `L.supermap.widgets.distributedAnalysis` 及功能类 `L.supermap.widgets.distributedAnalysisViewModel`
111-
- 新增数据服务查询微件`L.supermap.widgets.dataServiceQuery` 及功能类 `L.supermap.widgets.dataServiceQueryViewModel`
105+
- 组件
106+
- 新增打开文件组件 `L.supermap.widgets.openFile` 及功能类 `L.supermap.widgets.openFileViewModel`
107+
- 新增数据流组件 `L.supermap.widgets.dataFlow` 及功能类 `L.supermap.widgets.dataFlowViewModel`
108+
- 新增图层查询组件 `L.supermap.widgets.search` 及功能类 `L.supermap.widgets.searchViewModel`
109+
- 新增客户端计算组件 `L.supermap.widgets.clientComputation` 及功能类 `L.supermap.widgets.clientComputationViewModel`
110+
- 新增分布式分析组件 `L.supermap.widgets.distributedAnalysis` 及功能类 `L.supermap.widgets.distributedAnalysisViewModel`
111+
- 新增数据服务查询组件`L.supermap.widgets.dataServiceQuery` 及功能类 `L.supermap.widgets.dataServiceQueryViewModel`
112112

113113
### for OpenLayers
114114

@@ -157,7 +157,7 @@
157157

158158
### for Leaflet
159159

160-
- 新增 “微件” 分类及相关示例
160+
- 新增 “组件” 分类及相关示例
161161

162162
### for OpenLayers
163163

‎build/deps.js‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -544,82 +544,82 @@ deps = {
544544
"des": "Logo 控件",
545545
"des_en": "Logo control"
546546
}]
547-
},
547+
}
548548
},
549549

550-
"Widget": {
551-
"title": "微件",
552-
"description": "微件模块",
553-
"description_en": "Widget module",
550+
"Components": {
551+
"title": "组件",
552+
"description": "组件模块",
553+
"description_en": "Component module",
554554

555555
"OpenFile": {
556-
"name": "打开文件微件",
556+
"name": "打开文件组件",
557557
"src": [
558558
"./src/leaflet/widgets/openfile/OpenFileView.js"
559559
],
560560
"modules": [{
561561
"name": "L.supermap.widgets.openFile",
562-
"des": "打开文件微件",
563-
"des_en": "Open file widgets"
562+
"des": "打开文件组件",
563+
"des_en": "Open file components"
564564
}]
565565
},
566566
"ClientComputation ": {
567-
"name": "客户端计算微件",
567+
"name": "客户端计算组件",
568568
"src": [
569569
"./src/leaflet/widgets/clientcomputation/ClientComputationView.js"
570570
],
571571
"modules": [{
572572
"name": "L.supermap.widgets.clientComputation",
573-
"des": "客户端计算微件",
574-
"des_en": "Client computation widget"
573+
"des": "客户端计算组件",
574+
"des_en": "Client computation component"
575575
}]
576576
},
577577
"DistributedAnalysis": {
578-
"name": "分布式分析微件",
578+
"name": "分布式分析组件",
579579
"src": [
580580
"./src/leaflet/widgets/distributedanalysis/DistributedAnalysisView.js"
581581
],
582582
"modules": [{
583583
"name": "L.supermap.widgets.distributedAnalysis",
584-
"des": "分布式分析微件",
585-
"des_en": "Distributed analysis widget"
584+
"des": "分布式分析组件",
585+
"des_en": "Distributed analysis component"
586586
}]
587587
},
588588
"Search": {
589-
"name": "图层查询微件",
589+
"name": "图层查询组件",
590590
"src": [
591591
"./src/leaflet/widgets/search/SearchView.js"
592592
],
593593
"modules": [{
594594
"name": "L.supermap.widgets.search",
595-
"des": "图层查询微件",
595+
"des": "图层查询组件",
596596
"des_en": "Search"
597597
}]
598598
},
599599
"DataFlow": {
600-
"name": "数据流微件",
600+
"name": "数据流组件",
601601
"src": [
602602
"./src/leaflet/widgets/dataflow/DataFlowView.js"
603603
],
604604
"modules": [{
605605
"name": "L.supermap.widgets.dataFlow",
606-
"des": "数据流微件",
606+
"des": "数据流组件",
607607
"des_en": "Data flow"
608608
}]
609609
},
610610
"DataServiceQuery": {
611-
"name": "数据服务查询微件",
611+
"name": "数据服务查询组件",
612612
"src": [
613613
"./src/leaflet/widgets/dataservicequery/DataServiceQueryView.js"
614614
],
615615
"modules": [{
616616
"name": "L.supermap.widgets.dataServiceQuery",
617-
"des": "数据服务查询微件",
617+
"des": "数据服务查询组件",
618618
"des_en": "Data service query"
619619
}]
620-
},
620+
}
621621

622-
},
622+
}
623623

624624
},
625625

@@ -1220,7 +1220,7 @@ deps = {
12201220
"MapV": {
12211221
"name": "MapV",
12221222
"src": [
1223-
"./src/mapboxgl/overlay/MapvLayer.js",
1223+
"./src/mapboxgl/overlay/MapvLayer.js"
12241224
],
12251225
"modules": [{
12261226
"name": "mapboxgl.supermap.MapvLayer",

‎build/jsdocs/template/config.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -327,40 +327,40 @@
327327
"name": "控件",
328328
"name_en": "Control"
329329
},
330-
"Widgets": {
331-
"name": "微件",
332-
"name_en": "Widgets",
330+
"Components": {
331+
"name": "组件",
332+
"name_en": "Components",
333333
"content": {
334334
"Common": {
335335
"name": "通用",
336336
"name_en": "Common"
337337
},
338338
"OpenFile": {
339-
"name": "打开本地文件微件",
339+
"name": "打开本地文件组件",
340340
"name_en": "OpenFile"
341341
},
342342
"DataFlow": {
343-
"name": "数据流微件",
343+
"name": "数据流组件",
344344
"name_en": "DataFlow"
345345
},
346346
"ClientComputation": {
347-
"name": "客户端计算微件",
347+
"name": "客户端计算组件",
348348
"name_en": "ClientComputation"
349349
},
350350
"DistributedAnalysis": {
351-
"name": "分布式分析微件",
351+
"name": "分布式分析组件",
352352
"name_en": "DistributedAnalysis"
353353
},
354354
"Search": {
355-
"name": "图层查询微件",
355+
"name": "图层查询组件",
356356
"name_en": "Search"
357357
},
358358
"DataServiceQuery": {
359-
"name": "数据服务查询微件",
359+
"name": "数据服务查询组件",
360360
"name_en": "DataServiceQuery"
361361
},
362362
"Chart": {
363-
"name": "图表微件",
363+
"name": "图表组件",
364364
"name_en": "Chart"
365365
}
366366
}

‎dist/mapboxgl/iclient9-mapboxgl-vue.css‎

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8810,7 +8810,7 @@ body {
88108810
/* link */
88118811
/* border */
88128812
/* fill */
8813-
.sm-component-minimap #miniMap {
8813+
.sm-component-minimap .miniMap {
88148814
height: 180px; }
88158815

88168816
.sm-component-measure__panel {
@@ -8978,11 +8978,11 @@ body {
89788978
.sm-component-legend .ant-collapse {
89798979
border: 0;
89808980
background: transparent; }
8981-
.sm-component-legend .ant-collapse .ant-collapse-item {
8982-
border: 0; }
8981+
.sm-component-legend .ant-collapse .ant-collapse-item:last-child {
8982+
border-bottom-color: transparent; }
89838983
.sm-component-legend .ant-collapse-content {
89848984
background: transparent; }
8985-
.sm-component-legend .ant-collapse-content.ant-collapse-content-active {
8985+
.sm-component-legend .ant-collapse-content.ant-collapse-content {
89868986
border-top-color: transparent; }
89878987
.sm-component-legend .ant-collapse-content .ant-collapse-content-box {
89888988
padding: 0px;
@@ -9161,7 +9161,7 @@ body {
91619161
padding: 10px 15px;
91629162
overflow-y: auto; }
91639163
.sm-component-query__body > div {
9164-
width: 244px; }
9164+
width: 100%; }
91659165
.sm-component-query__body::-webkit-scrollbar {
91669166
width: 6px;
91679167
height: 6px;
@@ -9214,7 +9214,8 @@ body {
92149214
.sm-component-query__a-select {
92159215
margin-top: 10px;
92169216
margin-left: 7%;
9217-
font-weight: 100; }
9217+
font-weight: 100;
9218+
width: 84%; }
92189219
.sm-component-query__a-button {
92199220
width: 100%;
92209221
margin-top: 70px;
@@ -9226,7 +9227,6 @@ body {
92269227
margin-top: 10px;
92279228
overflow: auto;
92289229
line-height: normal;
9229-
max-width: 300px;
92309230
height: 86%; }
92319231
.sm-component-query__result-info::-webkit-scrollbar {
92329232
width: 6px;
@@ -9244,6 +9244,11 @@ body {
92449244
color: #409eff;
92459245
margin: 7px;
92469246
font-weight: bolder; }
9247+
.sm-component-query__result-header .sm-components-icons-close {
9248+
float: right;
9249+
font-size: 10px;
9250+
margin-top: 5px;
9251+
cursor: pointer; }
92479252
.sm-component-query__no-result, .sm-component-query__result-loading {
92489253
height: 100%;
92499254
display: flex;
@@ -9264,33 +9269,24 @@ body {
92649269
color: #409eff; }
92659270

92669271
.sm-component-open-file {
9267-
margin-left: 30px; }
9272+
width: 110px;
9273+
height: 32px;
9274+
font-size: 14px;
9275+
background-color: #fff;
9276+
border: 1px solid;
9277+
border-radius: 4px;
9278+
color: #38adf5; }
92689279
.sm-component-open-file__title {
9269-
position: relative;
9270-
width: 110px;
9271-
height: 32px;
9272-
font-size: 14px;
9273-
text-align: center;
92749280
letter-spacing: 0.75px;
9275-
line-height: 32px;
9276-
border: 1px solid #d9d9d9;
9277-
border-radius: 4px;
92789281
cursor: pointer;
9279-
background-color: #fff;
9280-
display: block;
9281-
border: 1px solid #38adf5;
9282-
color: #38adf5;
9283-
cursor: pointer; }
9284-
.sm-component-open-file__title:hover {
9285-
color: #fff;
9286-
background-color: #38adf5; }
9282+
margin: 0 auto;
9283+
display: flex;
9284+
align-items: center;
9285+
justify-content: center;
9286+
width: 100%;
9287+
height: 100%; }
92879288
.sm-component-open-file__input {
9288-
position: relative;
9289-
left: 190px;
9290-
top: 49px;
9291-
height: 32px;
9292-
width: 160px;
9293-
display: none !important; }
9289+
display: none; }
92949290

92959291
.sm-component-chart .sm-component-card__content {
92969292
width: 400px;

0 commit comments

Comments
 (0)