Skip to content

Commit 3d6b2c6

Browse files
MyShallowTimeMyShallowTime
committed
Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript into master
2 parents 030eac5 + 4e1e335 commit 3d6b2c6

Some content is hidden

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

45 files changed

+119
-74
lines changed

‎build/webpack.config.mapboxgl.js‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,24 @@ module.exports = {
2020
//其它解决方案配置
2121
resolve: configBase.resolve,
2222

23-
externals: Object.assign({}, configBase.externals, {
24-
'mapbox-gl': 'mapboxgl',
25-
three: 'function(){try{return THREE}catch(e){return {}}}()',
26-
'deck.gl': '(function(){try{return DeckGL}catch(e){return {}}})()',
27-
'luma.gl': '(function(){try{return luma}catch(e){return {}}})()',
28-
'webgl-debug': '(function(){try{return webgl-debug}catch(e){return {}}})()',
29-
xlsx: 'function(){try{return XLSX}catch(e){return {}}}()',
30-
canvg: 'function(){try{return canvg}catch(e){return {}}}()',
31-
jsonsql: 'function(){try{return jsonsql}catch(e){return {}}}()',
32-
'xml-js': 'function(){try{return convert}catch(e){return {}}}()'
33-
}),
23+
externals: [
24+
Object.assign({}, configBase.externals, {
25+
'mapbox-gl': 'mapboxgl',
26+
three: 'function(){try{return THREE}catch(e){return {}}}()',
27+
'deck.gl': '(function(){try{return DeckGL}catch(e){return {}}})()',
28+
'luma.gl': '(function(){try{return luma}catch(e){return {}}})()',
29+
'webgl-debug': '(function(){try{return webgl-debug}catch(e){return {}}})()',
30+
xlsx: 'function(){try{return XLSX}catch(e){return {}}}()',
31+
canvg: 'function(){try{return canvg}catch(e){return {}}}()',
32+
jsonsql: 'function(){try{return jsonsql}catch(e){return {}}}()'
33+
}),
34+
function ({context, request}, callback) {
35+
if (/xml-js\/lib\/xml2json/.test(request)) {
36+
return callback(null, 'function(){try{return xml2json}catch(e){return {}}}()');
37+
}
38+
callback();
39+
}
40+
],
3441

3542
module: {
3643
noParse: /[\/\\]node_modules[\/\\]mapbox-gl[\/\\]dist[\/\\]mapbox-gl\.js$/,

‎examples/classic/editor-wechat.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport" />
1111
<script
1212
type="text/javascript"
13-
include="jquery,bootstrap,template,admin-lte,ace,i18n"
13+
include="jquery,bootstrap,template,admin-lte,ace,i18n,theme"
1414
src="../js/include-web.js"
1515
></script>
1616
<link rel="stylesheet" href="../css/common.css" />

‎examples/classic/editor.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<title data-i18n="resources.title_editorClassic"></title>
99
<link rel="shortcut icon" type="image/x-icon" href="../img/favicon.ico"/>
1010
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
11-
<script type="text/javascript" include="jquery,bootstrap,template,admin-lte,ace,i18n"
11+
<script type="text/javascript" include="jquery,bootstrap,template,admin-lte,ace,i18n,theme"
1212
src="../js/include-web.js"></script>
1313
<link rel="stylesheet" href="../css/common.css">
1414
<link rel="stylesheet" href="../css/header.css">

‎examples/classic/examples-wechat.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport" />
1212
<script
1313
type="text/javascript"
14-
include="jquery,bootstrap,template,admin-lte,jquery.scrollto,i18n,lazyload"
14+
include="jquery,bootstrap,template,admin-lte,jquery.scrollto,i18n,lazyload,theme"
1515
src="../js/include-web.js"
1616
></script>
1717
<link rel="stylesheet" href="../css/common.css" />

‎examples/classic/examples.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<link rel="shortcut icon" type="image/x-icon" href="../img/favicon.ico"/>
1111
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
1212
<script type="text/javascript"
13-
include="jquery,bootstrap,template,admin-lte,jquery.scrollto,i18n,lazyload"
13+
include="jquery,bootstrap,template,admin-lte,jquery.scrollto,i18n,lazyload,theme"
1414
src="../js/include-web.js"></script>
1515
<link rel="stylesheet" href="../css/common.css">
1616
<link rel="stylesheet" href="../css/header.css">

‎examples/component/editor-wechat.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport" />
1111
<script
1212
type="text/javascript"
13-
include="jquery,bootstrap,template,admin-lte,ace,i18n"
13+
include="jquery,bootstrap,template,admin-lte,ace,i18n,theme"
1414
src="../js/include-web.js"
1515
></script>
1616
<link rel="stylesheet" href="../css/common.css" />

‎examples/component/editor.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<title data-i18n="resources.title_editorComponent"></title>
99
<link rel="shortcut icon" type="image/x-icon" href="../img/favicon.ico"/>
1010
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
11-
<script type="text/javascript" include="jquery,bootstrap,template,admin-lte,ace,i18n"
11+
<script type="text/javascript" include="jquery,bootstrap,template,admin-lte,ace,i18n,theme"
1212
src="../js/include-web.js"></script>
1313
<link rel="stylesheet" href="../css/common.css">
1414
<link rel="stylesheet" href="../css/header.css">

‎examples/component/examples-wechat.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport" />
1212
<script
1313
type="text/javascript"
14-
include="jquery,bootstrap,template,admin-lte,jquery.scrollto,i18n,lazyload"
14+
include="jquery,bootstrap,template,admin-lte,jquery.scrollto,i18n,lazyload,theme"
1515
src="../js/include-web.js"
1616
></script>
1717
<link rel="stylesheet" href="../css/common.css" />

‎examples/component/examples.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport" />
1212
<script
1313
type="text/javascript"
14-
include="jquery,bootstrap,template,admin-lte,jquery.scrollto,i18n,lazyload"
14+
include="jquery,bootstrap,template,admin-lte,jquery.scrollto,i18n,lazyload,theme"
1515
src="../js/include-web.js"
1616
></script>
1717
<link rel="stylesheet" href="../css/common.css" />

‎examples/component/templates.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport" />
1212
<script
1313
type="text/javascript"
14-
include="jquery,bootstrap,template,admin-lte,jquery.scrollto,i18n,lazyload"
14+
include="jquery,bootstrap,template,admin-lte,jquery.scrollto,i18n,lazyload,theme"
1515
src="../js/include-web.js"
1616
></script>
1717
<link rel="stylesheet" href="../css/common.css" />

0 commit comments

Comments
 (0)