Skip to content

Commit 237bbe7

Browse files
committed
客户端计算微件图层类型判断 & 微件 css 优化 review by songym
1 parent 80e458b commit 237bbe7

File tree

16 files changed

+879
-625
lines changed

16 files changed

+879
-625
lines changed

dist/leaflet/iclient9-leaflet-es6.js

Lines changed: 544 additions & 444 deletions
Large diffs are not rendered by default.

dist/leaflet/iclient9-leaflet-es6.min.js

Lines changed: 39 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/leaflet/iclient9-leaflet.css

Lines changed: 3 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/leaflet/iclient9-leaflet.js

Lines changed: 144 additions & 35 deletions
Large diffs are not rendered by default.

dist/leaflet/iclient9-leaflet.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/leaflet/iclient9-leaflet.min.js

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/leaflet/widgets_clientComputation.html

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,19 +82,14 @@
8282

8383
openFile.viewModel.on('openfilesuccess', function (e) {
8484
var layer = L.geoJSON(e.result, {
85-
style: { fillColor: '#ff7373', color: '#ff7373', opacity: 1, fillOpacity: 0.8 },
86-
pointToLayer: function (geoJsonPoint, latLng) {
87-
return L.circleMarker(latLng, { radius: 6, color: '#ff7373', fillColor: '#ff7373' })
88-
}
85+
style: { fillColor: '#ff7373', color: '#ff7373', opacity: 1, fillOpacity: 0.8 }
8986
}).addTo(map);
90-
9187
var setLayer = {
9288
'layerName': e.layerName,
9389
'layer': layer
9490
};
9591
map.flyToBounds(layer.getBounds());
9692
control.addOverlay(layer, e.layerName);
97-
9893
var clientComputationLayer = L.supermap.widgets.clientComputationLayer(setLayer);
9994
clientComputation.addLayer(clientComputationLayer);
10095
})

src/common/REST.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1272,4 +1272,32 @@ var AggregationQueryBuilderType = SuperMap.AggregationQueryBuilderType = {
12721272
}
12731273
export {
12741274
AggregationQueryBuilderType
1275+
}
1276+
1277+
/**
1278+
* @enum GetFeatureMode
1279+
* @memberOf SuperMap
1280+
* @description feature 查询方式。
1281+
* @type {string}
1282+
*/
1283+
var GetFeatureMode = SuperMap.GetFeatureMode = {
1284+
/** 通过范围查询来获取要素。 */
1285+
BOUNDS: "BOUNDS",
1286+
/** 通过范围查询加属性过滤器的模式来获取要素。 */
1287+
BOUNDS_ATTRIBUTEFILTER: "BOUNDS_ATTRIBUTEFILTER",
1288+
/** 通过几何对象的缓冲区来获取要素。 */
1289+
BUFFER: "BUFFER",
1290+
/** 通过缓冲区加属性过滤器的模式来获取要素。 */
1291+
BUFFER_ATTRIBUTEFILTER: "BUFFER_ATTRIBUTEFILTER",
1292+
/** 通过 ID 来获取要素。 */
1293+
ID: "ID",
1294+
/** 通过空间查询模式来获取要素。 */
1295+
SPATIAL: "SPATIAL",
1296+
/** 通过空间查询加属性过滤器的模式来获取要素。 */
1297+
SPATIAL_ATTRIBUTEFILTER: 'SPATIAL_ATTRIBUTEFILTER',
1298+
/** 通过 SQL 查询来获取要素。 */
1299+
SQL: 'SQL'
1300+
}
1301+
export {
1302+
GetFeatureMode
12751303
}

src/common/index.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ import {
5858
TopologyValidatorRule,
5959
OutputType,
6060
AggregationQueryBuilderType,
61-
AggregationType
61+
AggregationType,
62+
GetFeatureMode
6263
} from './REST';
6364
import {
6465
Collection,
@@ -523,7 +524,8 @@ export {
523524
TopologyValidatorRule,
524525
OutputType,
525526
AggregationQueryBuilderType,
526-
AggregationType
527+
AggregationType,
528+
GetFeatureMode
527529
};
528530
export {
529531
Collection,

src/common/widgets/css/Analysis.css

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,14 @@
100100
color: #FFFFFF;
101101
padding-right: 0px;
102102
line-height: 2em;
103+
text-transform: none;
104+
103105
}
104106

105107
.run-btn button.disabled {
106108
cursor: not-allowed;
107109
background-color: #80B5CF;
108110
}
109-
button{
110-
text-transform: none;
111-
}
112111

113112
.run-btn .analysis-btn,
114113
.run-btn .analysising-container {
@@ -166,9 +165,6 @@ button{
166165
margin-left: 10px;
167166
color: #FFFFFF;
168167
}
169-
span {
170-
color: #595959;
171-
}
172168

173169
.svg-container{
174170
position: relative;

0 commit comments

Comments
 (0)