Skip to content

Commit 55e3527

Browse files
hhyu1hhyu1
committed
2 parents e8d6265 + 038bc88 commit 55e3527

Some content is hidden

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

52 files changed

+801
-532
lines changed

‎build/deps.js‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,13 @@ deps = {
545545
"des_en": "Logo control"
546546
}]
547547
},
548+
},
549+
550+
"Widget":{
551+
"title": "微件",
552+
"description": "微件模块",
553+
"description_en": "Widget module",
554+
548555
"OpenFile": {
549556
"name": "打开文件微件",
550557
"src": [
@@ -611,7 +618,8 @@ deps = {
611618
"des_en": "Data service query"
612619
}]
613620
},
614-
}
621+
622+
},
615623

616624
},
617625

‎dist/classic/include-classic.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,16 @@
5050
var includes = (targetScript.getAttribute('include') || "").split(",");
5151
var excludes = (targetScript.getAttribute('exclude') || "").split(",");
5252
if (!inArray(excludes, 'iclient8c')) {
53+
if (!inArray(includes, 'iclient8c-plot')) {
54+
window.excludePlot = true;
55+
}
5356
inputScript("http://iclient.supermap.io/libs/iclient8c/libs/SuperMap.Include.js");
5457
}
5558
if (inArray(includes, 'mapv')) {
5659
inputScript("http://mapv.baidu.com/build/mapv.min.js");
5760
}
5861
if (inArray(includes, 'echarts')) {
59-
inputScript("https://cdnjs.cloudflare.com/ajax/libs/echarts/3.8.5/echarts.min.js");
62+
inputScript("https://cdnjs.cloudflare.com/ajax/libs/echarts/4.1.0/echarts.min.js");
6063
}
6164
if (inArray(includes, 'nanoscroller')) {
6265
inputCSS("http://iclient.supermap.io/libs/iclient8c/examples/css/nanoscroller.css");

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

Lines changed: 119 additions & 50 deletions
Large diffs are not rendered by default.

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

Lines changed: 219 additions & 219 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: 122 additions & 50 deletions
Large diffs are not rendered by default.

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

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

‎examples/classic/config.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ var exampleConfig = {
7070
fileName: "map_3baidu"
7171

7272
}, {
73-
name: "google layer",
73+
name: "谷歌地图",
7474
name_en: "google layer",
7575
thumbnail: "map_3googlelayer.png",
7676
fileName: "map_3googlelayer"
@@ -82,7 +82,7 @@ var exampleConfig = {
8282
fileName: "map_3bing"
8383

8484
}, {
85-
name: "OSM",
85+
name: "OSM地图",
8686
name_en: "OSM layer",
8787
thumbnail: "map_3osm.png",
8888
fileName: "map_3osm"
@@ -231,7 +231,7 @@ var exampleConfig = {
231231
thumbnail: "controler_navigation.png",
232232
fileName: "controler_navigation"
233233
}, {
234-
name: "layerswitcher",
234+
name: "图层管理器",
235235
name_en: "layer switch control",
236236
thumbnail: "controler_layerswitcher.png",
237237
fileName: "controler_layerswitcher"
@@ -797,7 +797,7 @@ var exampleConfig = {
797797
thumbnail: "vizLayer_gois.png",
798798
fileName: "vizLayer_gois"
799799
}, {
800-
name: "Elements Layer 扩展",
800+
name: "要素图层扩展",
801801
name_en: "elements layer extension",
802802
thumbnail: "vizLayer_elements.png",
803803
fileName: "vizLayer_elements"

‎examples/classic/map_3bing.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<html>
66
<head>
77
<meta charset="utf-8">
8-
<title>Bing Map</title>
8+
<title data-i18n="resources.title_binglayer"></title>
99
<script type="text/javascript" src="../js/include-web.js"></script>
1010
</head>
1111
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">

‎examples/classic/map_3googlelayer.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<html>
66
<head>
77
<meta charset="utf-8">
8-
<title>google layer</title>
8+
<title data-i18n="resources.title_googlelayer"></title>
99
</head>
1010
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
1111
<div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>

‎examples/classic/map_3osm.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<html>
66
<head>
77
<meta charset="utf-8">
8-
<title>OSM</title>
8+
<title data-i18n="resources.title_osmlayer"></title>
99
</head>
1010
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
1111
<div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>

0 commit comments

Comments
 (0)