Skip to content

Commit c1b9ff5

Browse files
committed
【API】 微件 view 层代码结构,公用组件代码结构,以及微件css 第一次重构(并优化部分代码), review by zhurc.
1 parent f586ca8 commit c1b9ff5

58 files changed

Lines changed: 5999 additions & 6321 deletions

Some content is hidden

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

dist/leaflet/iclient9-leaflet-es6.js

Lines changed: 1064 additions & 1114 deletions
Large diffs are not rendered by default.

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

Lines changed: 176 additions & 172 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: 357 additions & 372 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: 2755 additions & 2702 deletions
Large diffs are not rendered by default.

dist/leaflet/iclient9-leaflet.min.css

Lines changed: 1 addition & 46 deletions
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: 310 additions & 297 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/leaflet/include-leaflet.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
var excludes = (targetScript.getAttribute('exclude') || "").split(",");
5151
if (!inArray(excludes, 'leaflet')) {
5252
inputCSS("https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/leaflet.css");
53-
inputScript("https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/leaflet.js");
53+
inputScript("https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/leaflet-src.js");
5454
}
5555
if (inArray(includes, 'mapv')) {
5656
inputScript("http://mapv.baidu.com/build/mapv.min.js");

dist/openlayers/iclient9-openlayers-es6.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3207,16 +3207,16 @@ var MessageBox = __webpack_require__(100);
32073207
// EXTERNAL MODULE: ./src/common/widgets/css/DataFlow.css
32083208
var DataFlow = __webpack_require__(99);
32093209

3210-
// EXTERNAL MODULE: ./src/common/widgets/css/POISearch.css
3210+
// EXTERNAL MODULE: ./src/common/widgets/css/Search.css
32113211
var POISearch = __webpack_require__(98);
32123212

3213-
// EXTERNAL MODULE: ./src/common/widgets/css/WidgetContainer.css
3213+
// EXTERNAL MODULE: ./src/common/widgets/css/CommonContainer.css
32143214
var WidgetContainer = __webpack_require__(97);
32153215

3216-
// EXTERNAL MODULE: ./src/common/widgets/css/WidgetDropDownBox.css
3216+
// EXTERNAL MODULE: ./src/common/widgets/css/DropDownBox.css
32173217
var WidgetDropDownBox = __webpack_require__(96);
32183218

3219-
// EXTERNAL MODULE: ./src/common/widgets/css/WidgetSelect.css
3219+
// EXTERNAL MODULE: ./src/common/widgets/css/Select.css
32203220
var WidgetSelect = __webpack_require__(95);
32213221

32223222
// EXTERNAL MODULE: ./src/common/widgets/css/CityTabsPage.css

examples/leaflet/widgets_Search.html

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,20 @@
3333

3434
L.supermap.tiledMapLayer(url).addTo(map);
3535
//添加微件:
36-
var poiSearch = L.supermap.widgets.search();
36+
var poiSearch = L.supermap.widgets.search({
37+
//设置结果图层样式:
38+
/*style: (feature, latLng) => {
39+
if (latLng /!*&& feature instanceof L.latLng || feature.geometry.type.toLowerCase() === "point"*!/) {
40+
return L.circleMarker(latLng, {
41+
fillColor: 'red',
42+
weight: 1,
43+
opacity: 1,
44+
color: 'red',
45+
fillOpacity: 0.6
46+
});
47+
}
48+
}*/
49+
});
3750
poiSearch.addTo(map);
3851

3952
//添加示例图层:
@@ -50,11 +63,18 @@
5063
.queryService(sqlurl)
5164
.queryByBounds(param, function (serviceResult) {
5265
var result = serviceResult.result;
53-
var resultLayer = L.geoJSON(result.recordsets[0].features).addTo(map);
54-
poiSearch.addSearchLayer([L.supermap.widgets.geoJSONLayerWithName({
55-
layerName: "首都",
56-
layer: resultLayer
57-
})]);
66+
var resultLayer = L.geoJSON(result.recordsets[0].features, {
67+
pointToLayer: (geoJsonPoint, latlng) => {
68+
return L.circleMarker(latlng, {
69+
fillColor: 'blue',
70+
weight: 1,
71+
opacity: 1,
72+
color: 'blue',
73+
fillOpacity: 0.6
74+
});
75+
},
76+
}).addTo(map);
77+
poiSearch.addSearchLayer([L.supermap.widgets.geoJSONLayerWithName("首都", resultLayer)]);
5878
});
5979
}
6080
</script>

examples/leaflet/widgets_openFileWidget.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
});
3434

3535
//避免与"源码"控件重叠
36-
openFileWidgets.setViewStyle("margin", "40px 4px 0px 0px");
37-
36+
openFileWidgets.rootContainer.style.margin = "40px 4px 0px 0px";
3837

3938
</script>
4039
</body>

0 commit comments

Comments
 (0)