Skip to content

Commit 415728e

Browse files
hhyu1hhyu1
committed
修改页面风格；修改面板引用方式
1 parent 06e4b7d commit 415728e

File tree

9 files changed

+78
-17
lines changed

9 files changed

+78
-17
lines changed

‎examples/js/include-web.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
inputScript("http://iclient.supermap.io/libs/iclient8c/examples/js/jquery.colorpicker.js");
132132
}
133133
if (inArray(includes, 'fileupLoad')) {
134-
inputScript("http://iclient.supermap.io/libs/iclient8c/examples/js/jquery.js");
134+
//inputScript("http://iclient.supermap.io/libs/iclient8c/examples/js/jquery.js");
135135
inputScript("http://iclient.supermap.io/libs/iclient8c/examples/js/fileupLoad.js");
136136
}
137137
if (inArray(includes, 'sticklr')) {
@@ -146,10 +146,10 @@
146146
inputCSS("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/jquery-easyui-1.4.4/css/easyui.css");
147147
}
148148
if (inArray(includes, 'jquery-colorpicker')) {
149-
inputScript("http://iclient.supermap.io/libs/colorpicker/js/colorpicker.js");
150-
inputCSS("http://iclient.supermap.io/libs/colorpicker/css/colorpicker.css");
151-
//inputScript("../../../iClient9Website/libs/colorpicker/js/colorpicker.js");
152-
//inputCSS("../../../iClient9Website/libs/colorpicker/css/colorpicker.css");
149+
// inputScript("http://iclient.supermap.io/libs/colorpicker/js/colorpicker.js");
150+
// inputCSS("http://iclient.supermap.io/libs/colorpicker/css/colorpicker.css");
151+
inputScript("../../../iclient9-web/libs/colorpicker/js/colorpicker.js");
152+
inputCSS("../../../iclient9-web/libs/colorpicker/css/colorpicker.css");
153153
}
154154
if (inArray(includes, 'lazyload')) {
155155
inputScript("https://cdn.bootcss.com/jquery_lazyload/1.9.7/jquery.lazyload.min.js");

‎examples/js/plottingPanel/PlottingPanel.Include.js‎

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,58 @@
1-
(function() {
1+
(function () {
2+
var r = new RegExp("(^|(.*?\\/))(include-leaflet\.js)(\\?|$)"),
3+
s = document.getElementsByTagName('script'), targetScript;
4+
for (var i = 0; i < s.length; i++) {
5+
var src = s[i].getAttribute('src');
6+
if (src) {
7+
var m = src.match(r);
8+
if (m) {
9+
targetScript = s[i];
10+
break;
11+
}
12+
}
13+
}
14+
15+
function inputScript(url) {
16+
var script = '<script type="text/javascript" src="' + url + '"><' + '/script>';
17+
document.writeln(script);
18+
}
19+
20+
function inputCSS(url) {
21+
var css = '<link rel="stylesheet" href="' + url + '">';
22+
document.writeln(css);
23+
}
24+
25+
function inArray(arr, item) {
26+
for (i in arr) {
27+
if (arr[i] == item) {
28+
return true;
29+
}
30+
}
31+
return false;
32+
}
33+
34+
//加载类库资源文件
35+
function load() {
36+
var includes = (targetScript.getAttribute('include') || "").split(",");
37+
var excludes = (targetScript.getAttribute('exclude') || "").split(",");
38+
39+
if (!inArray(excludes, 'PlotPanel')) {
40+
inputScript("../js/plottingPanel/PlotPanel.js");
41+
}
42+
if (inArray(includes, 'StylePanel')) {
43+
inputScript("../js/plottingPanel/customEditor/ColorpickerEditor.js");
44+
inputScript("../js/plottingPanel/StylePanel.js");
45+
}
46+
if (!inArray(excludes, 'SMLInfosPanel')) {
47+
inputScript("../js/plottingPanel/SMLInfosPanel.js");
48+
}
49+
}
50+
51+
load();
52+
})();
53+
54+
55+
(function() {
256
var r = new RegExp("(^|(.*?\\/))(PlottingPanel.Include\.js)(\\?|$)"),
357
s = document.getElementsByTagName('script'),
458
src, m, baseurl = "";

‎examples/leaflet/plot_drawGraphics.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
}
1717

1818
#map {
19+
position: absolute;
1920
left: 200px;
2021
right: 0px;
2122
width: 100%;
@@ -65,7 +66,8 @@ <h5 class='panel-title text-center' style=" font-size: 16px;color: #ffffff;">复
6566
</div>
6667
</div>
6768
<div id="map"></div>
68-
<script type="text/javascript" include="leaflet,iclient9-leaflet,iclient9-plot-leaflet,PlottingPanel" src="../../dist/include-leaflet.js"></script>
69+
<script type="text/javascript" include="leaflet,iclient9-leaflet,iclient9-plot-leaflet" src="../../dist/include-leaflet.js"></script>
70+
<script type="text/javascript" include="StylePanel" src="../js/PlottingPanel/PlottingPanel.Include.js"></script>
6971
<script type="text/javascript">
7072
var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
7173
var url = host + "/iserver/services/map-china400/rest/maps/China_4326";

‎examples/leaflet/plot_dynamicPlot.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@
170170
<a href="javascript:void(0)" id="paste" style="border-bottom:1px solid #ccc;display:block;line-height:20px;color:#000; font-size:16px;">粘贴此处</a></a>
171171
</div>
172172
<script type="text/javascript" include="bootstrap,responsive,sticklr,jquery-colorpicker,zTree,easyui" src="../js/include-web.js"></script>
173-
<script type="text/javascript" include="leaflet,iclient9-leaflet,iclient9-plot-leaflet,PlottingPanel"
174-
src="../../dist/include-leaflet.js"></script>
173+
<script type="text/javascript" include="leaflet,iclient9-leaflet,iclient9-plot-leaflet" src="../../dist/include-leaflet.js"></script>
174+
<script type="text/javascript" include="PlotPanel,StylePanel" src="../js/PlottingPanel/PlottingPanel.Include.js"></script>
175175

176176
<script type="text/javascript">
177177
var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";

‎examples/leaflet/plot_filetransfer.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ <h5 class='panel-title text-center' style=" font-size: 16px;color: #ffffff;">态
3333
<div id="filetree" class="winContent" style=" padding: 5px;overflow-y: auto;height: 400px;"></div>
3434
</div>
3535
<div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
36-
<script type="text/javascript" include="leaflet,iclient9-leaflet,iclient9-plot-leaflet,plottingPanel" src="../../dist/include-leaflet.js"></script>
36+
<script type="text/javascript" include="leaflet,iclient9-leaflet,iclient9-plot-leaflet" src="../../dist/include-leaflet.js"></script>
37+
<script type="text/javascript" include="SMLInfosPanel" src="../js/PlottingPanel/PlottingPanel.Include.js"></script>
3738
<script type="text/javascript">
3839
var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
3940
var url = host + "/iserver/services/map-china400/rest/maps/China_4326";

‎examples/leaflet/plot_modifySymbolStyle.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="UTF-8">
55
<title data-i18n="resources.title_modifySymbolStyle"></title>
6-
<script type="text/javascript" include="bootstrap-css,jquery-colorpicker,zTree,easyui" src="../js/include-web.js"></script>
6+
<script type="text/javascript" include="bootstrap-css,jquery-colorpicker,easyui" src="../js/include-web.js"></script>
77
<style type="text/css">
88
body {
99
margin: 0;
@@ -40,7 +40,8 @@
4040
</div>
4141
</div>
4242
<div id="map"></div>
43-
<script type="text/javascript" include="leaflet,iclient9-leaflet,iclient9-plot-leaflet,PlottingPanel" src="../../dist/include-leaflet.js"></script>
43+
<script type="text/javascript" include="leaflet,iclient9-leaflet,iclient9-plot-leaflet" src="../../dist/include-leaflet.js"></script>
44+
<script type="text/javascript" include="StylePanel" src="../js/PlottingPanel/PlottingPanel.Include.js"></script>
4445
<script type="text/javascript">
4546
var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
4647
var url = host + "/iserver/services/map-world/rest/maps/World";

‎examples/leaflet/plot_plotGOAnimation.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ <h5 class="panel-title text-center" style=" font-size: 16px;color: #ffffff;">态
9595
</li>
9696
</div>
9797
<div id="map"></div>
98-
<script type="text/javascript" include="leaflet,iclient9-leaflet,iclient9-plot-leaflet,PlottingPanel"
99-
src="../../dist/include-leaflet.js"></script>
98+
<script type="text/javascript" include="leaflet,iclient9-leaflet,iclient9-plot-leaflet" src="../../dist/include-leaflet.js"></script>
99+
<script type="text/javascript" include="PlotPanel,StylePanel" src="../js/PlottingPanel/PlottingPanel.Include.js"></script>
100100
<script type="text/javascript">
101101
var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
102102
var url = host + "/iserver/services/map-world/rest/maps/World";

‎examples/leaflet/plot_plotSymbol.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ <h5 class='panel-title text-center' style=" color: #ffffff;font-size: 16px;">鼠
4040
</div>
4141
<div id="map">
4242
</div>
43-
<script type="text/javascript" include="leaflet,iclient9-leaflet,iclient9-plot-leaflet,plottingPanel" src="../../dist/include-leaflet.js"></script>
43+
<script type="text/javascript" include="leaflet,iclient9-leaflet,iclient9-plot-leaflet" src="../../dist/include-leaflet.js"></script>
44+
<script type="text/javascript" include="PlotPanel" src="../js/PlottingPanel/PlottingPanel.Include.js"></script>
4445
<script type="text/javascript">
4546
var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
4647
var url = host + "/iserver/services/map-world/rest/maps/World";

‎examples/leaflet/plot_saveload.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
<head>
44
<meta charset="UTF-8">
55
<title data-i18n="resources.title_saveload"></title>
6-
<script type="text/javascript" include="bootstrap,sticklr,widgets.alert,fileupLoad,zTree,easyui,jquery-colorpicker" src="../js/include-web.js"></script>
6+
<script type="text/javascript" include="bootstrap,sticklr,widgets.alert,zTree,easyui,jquery-colorpicker" src="../js/include-web.js"></script>
77
<style type="text/css">
88
#map {
9+
position: absolute;
910
left: 200px;
1011
right: 0px;
1112
width: 100%;
@@ -75,7 +76,8 @@ <h5 class='panel-title text-center' style=" font-size: 16px;color: #ffffff;">
7576
</li>
7677
</div>
7778
<div id="map"></div>
78-
<script type="text/javascript" include="leaflet,iclient9-leaflet,iclient9-plot-leaflet,PlottingPanel" src="../../dist/include-leaflet.js"></script>
79+
<script type="text/javascript" include="leaflet,iclient9-leaflet,iclient9-plot-leaflet" src="../../dist/include-leaflet.js"></script>
80+
<script type="text/javascript" include="PlotPanel,StylePanel" src="../js/PlottingPanel/PlottingPanel.Include.js"></script>
7981
<script type="text/javascript">
8082
var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
8183
var url = host + "/iserver/services/map-china400/rest/maps/China_4326";

0 commit comments

Comments
 (0)