Skip to content

Commit 3906216

Browse files
committed
2 parents 552012e + 6e3836d commit 3906216

File tree

672 files changed

+345936
-341095
lines changed

Some content is hidden

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

672 files changed

+345936
-341095
lines changed

build/jsdocs/classic/docs.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
"src/common/REST.js"
5151
],
5252
"exclude": [
53+
"src/common/thirdparty/ai",
5354
"src/classic/libs",
5455
"src/classic/theme",
5556
"src/classic/resource",

build/jsdocs/leaflet/docs.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
],
2525
"exclude": [
2626
"src/common/overlay/levelRenderer",
27+
"src/common/thirdparty/ai",
2728
"src/common/lang/locales",
2829
"src/common/iPortal/iPortalQueryResult",
2930
"src/common/online/OnlineServiceBase",

build/jsdocs/leaflet/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SuperMap iClient for Leaflet 是一套基于Leaflet的云GIS网络客户端开
2727
<table><tr>
2828
<th width="33.3%">可视化</th><th width="33.3%">地图</th><th width="33.3%">投影</th>
2929
</tr><tr>
30-
<td><p>丰富的可视化效果,矢量瓦片、客户端专题图、开源可视化库[ECharts](https://echarts.baidu.com/),[MapV](https://mapv.baidu.com/)</p>
30+
<td><p>丰富的可视化效果,矢量瓦片、客户端专题图、开源可视化库 <a href="https://echarts.baidu.com/">ECharts</a>,<a href="https://mapv.baidu.com/">MapV</a></p>
3131
<a href="TiledVectorLayer.html">TiledVectorLayer</a><br>
3232
<a href="GraphicLayer.html">GraphicLayer</a><br>
3333
<a href="DataFlowLayer.html">DataFlowLayer</a><br>
@@ -49,6 +49,6 @@ SuperMap iClient for Leaflet 是一套基于Leaflet的云GIS网络客户端开
4949

5050
## 参考API
5151

52-
* Leaflet API<a href="https://leafletjs.com/reference.html" target="_blank">https://leafletjs.com/reference.html</a>
52+
* Leaflet API:<a href="https://leafletjs.com/reference.html" target="_blank">https://leafletjs.com/reference.html</a>
5353
* ECharts API:<a href="https://echarts.baidu.com/api.html#echarts" target="_blank">https://echarts.baidu.com/api.html#echarts</a>
5454
* MapV API:<a href="https://github.com/huiyan-fe/mapv/blob/master/API.md" target="_blank">https://github.com/huiyan-fe/mapv/blob/master/API.md</a>

build/jsdocs/mapboxgl/docs.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
],
2424
"exclude": [
2525
"src/common/overlay/levelRenderer",
26+
"src/common/thirdparty/ai",
2627
"src/common/lang/locales",
2728
"src/common/iPortal/iPortalQueryResult",
2829
"src/common/online/OnlineServiceBase",

build/jsdocs/openlayers/docs.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
],
2424
"exclude": [
2525
"src/common/overlay/levelRenderer",
26+
"src/common/thirdparty/ai",
2627
"src/common/lang/locales",
2728
"src/common/iPortal/iPortalQueryResult",
2829
"src/common/online/OnlineServiceBase",

build/jsdocs/openlayers/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SuperMap iClient for OpenLayers 是一套基于OpenLayers的云GIS网络客户
2727
<table><tr>
2828
<th width="33.3%">可视化</th><th width="33.3%">地图</th><th width="33.3%"></th>
2929
</tr><tr>
30-
<td><p>丰富的可视化效果,矢量瓦片、客户端专题图、开源可视化库[ECharts](https://echarts.baidu.com/),[MapV](https://mapv.baidu.com/)</p>
30+
<td><p>丰富的可视化效果,矢量瓦片、客户端专题图、开源可视化库 <a href="https://echarts.baidu.com/">ECharts</a>,<a href="https://mapv.baidu.com/">MapV</a></p>
3131
<a href="VectorTileSuperMapRest.html">VectorTileSuperMapRest</a><br>
3232
<a href="Graphic.html">Graphic</a><br>
3333
<a href="DataFlow.html">DataFlow</a><br>

build/jsdocs/template/config.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,9 @@
387387
},
388388
"GraticuleLayer": {
389389
"name": "经纬网"
390+
},
391+
"FGB": {
392+
"name": "FGB"
390393
}
391394
}
392395
},

build/jsdocs/template/publish.js

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,27 @@ function attachModuleSymbols(doclets, modules) {
243243
function buildNav(members, view, templatePath) {
244244
var sorted = sortNav(members);
245245
view.categories = buildCategories(sorted, templatePath);
246-
view.navMap = buildNavMap(sorted);
246+
view.navMap = buildNavMap(sorted,view.linkto);
247+
var methods = {};
248+
for (const key in view.navMap ) {
249+
if (Object.hasOwnProperty.call(view.navMap , key)) {
250+
const element = view.navMap[key];
251+
const m = element.methods.map(e => {
252+
return e.name;
253+
});
254+
if(!element.fileName && m.length>0){
255+
console.log("没有文件名的类:", element.longname,element.type,m)
256+
}
257+
if(methods[element.fileName]){
258+
console.log("重复的文件名:", element.longname,element.fileName,element.type,m)
259+
}else{
260+
methods[element.fileName] = m;
261+
}
262+
263+
}
264+
}
265+
var methodsPath = path.join(outdir, 'methods.json');
266+
fs.writeFileSync(methodsPath, JSON.stringify(methods), 'utf8');
247267
}
248268

249269
function sortNav(members) {
@@ -291,12 +311,13 @@ function buildCategories(members, templatePath) {
291311
* @param {array<object>} members.events
292312
* @return {string} The HTML for the navigation sidebar.
293313
*/
294-
function buildNavMap(members) {
314+
function buildNavMap(members,linkto) {
295315
this.navMap = {};
296316
_.each(members, function (v) {
297317
var nav;
298318
if (v.kind == 'namespace') {
299319
nav = {
320+
fileName:`${linkto(v.meta.filename)}#${v.name}`,
300321
type: 'namespace',
301322
longname: v.longname,
302323
version: v.version,
@@ -320,6 +341,7 @@ function buildNavMap(members) {
320341
};
321342
} else if (v.kind == 'class') {
322343
nav = {
344+
fileName:`${linkto(v.meta.filename)}#${v.name}`,
323345
type: 'class',
324346
longname: v.longname,
325347
name: v.name,
@@ -344,6 +366,7 @@ function buildNavMap(members) {
344366
};
345367
} else if (v.scope === 'global') {
346368
nav = {
369+
fileName:`${linkto(v.meta.filename)}#${v.name}`,
347370
type: 'global',
348371
longname: v.longname,
349372
version: v.version,

build/jsdocs/template/static/scripts/jquery.min.js

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

build/jsdocs/template/tmpl/navigation.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function build(nav,navOrder,level){
6969
}
7070
function buildLi(obj){
7171
?>
72-
<li class="item" data-name="<?js= obj.longname ?>">
72+
<li class="item" file-name="<?js= obj.fileName ?>" data-name="<?js= obj.longname ?>">
7373
<span class="title" title="<?js= obj.longname ?>">
7474
<?js= self.linkto(obj.longname, obj.longname) ?>
7575
</span>

build/jsdocs/template/typeLinkExt.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var olapi = "https://openlayers.org/en/v6.14.1/apidoc/";
2-
var lfapi = "https://leafletjs.com/reference-1.7.1.html";
2+
var lfapi = "https://leafletjs.com/reference.html";
33
var mbglapi = "https://www.mapbox.com/mapbox-gl-js/api/";
44
var mapv = "https://github.com/huiyan-fe/mapv/blob/master/src/";
55
var classicapi="https://iclient.supermap.io/web/libs/iclient8c/apidoc/files/SuperMap"
@@ -69,6 +69,7 @@ var typeLinks = {
6969
"L.Rectangle": lfapi + '#rectangle',
7070
'L.LatLngBounds': lfapi+ '#latlngbounds',
7171
'L.Map': lfapi + '#map-example',
72+
'L.MapOptions': lfapi + '#map-option',
7273
'L.Evented':lfapi +'#evented',
7374
'L.Browser':lfapi +'#browser',
7475

@@ -78,6 +79,7 @@ var typeLinks = {
7879
"mapboxgl.LngLatBounds": mbglapi + '#lnglatbounds',
7980
"mapboxgl.LngLat": mbglapi + '#lnglat',
8081
"mapboxgl.Point": mbglapi + '#point',
82+
"mapboxgl.source": 'https://docs.mapbox.com/mapbox-gl-js/style-spec/sources/#geojson',
8183
//mapv
8284
"Mapv.DataSet": mapv + 'data/DataSet.md',
8385
"Mapv.BaiduMapLayer": mapv + 'map/baidu-map/Layer.md',

build/webpack.config.base.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ module.exports = {
9797

9898
bannerInfo: function (libName) {
9999
return `
100-
${libName}.(${pkg.homepage})
100+
${libName}
101101
Copyright© 2000 - 2022 SuperMap Software Co.Ltd
102102
license: ${pkg.license}
103103
version: v${pkg.version}

build/webpack.config.leaflet.js

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,28 @@ module.exports = {
3232
rules: (function () {
3333
let moduleRules = [];
3434
moduleRules.push(configBase.module.rules.img);
35-
if (configBase.moduleVersion === "es5") {
36-
//打包为es5相关配置
37-
moduleRules.push({
38-
test: [/\.js$/],
39-
exclude: /setImmediate|webgl-debug/,
40-
loader: 'babel-loader',
41-
options: {
42-
presets: ['@babel/preset-env']
43-
}
44-
});
45-
//兼容es3相关配置
46-
// moduleRules.push({
47-
// test: /\.js$/,
48-
// enforce: "post",
49-
// loaders: ['es3ify-loader']
50-
// });
35+
const babelConfig = {
36+
test: [/\.js$/],
37+
exclude: /setImmediate|webgl-debug/,
38+
loader: 'babel-loader',
39+
options: {
40+
presets: ['@babel/preset-env'],
41+
plugins: [
42+
[
43+
'@babel/plugin-transform-runtime',
44+
{
45+
absoluteRuntime: false,
46+
corejs: false,
47+
helpers: false,
48+
regenerator: true,
49+
useESModules: false
50+
}
51+
]
52+
]
53+
}
5154
}
55+
configBase.moduleVersion === "es6" && (babelConfig.include = /FGBLayer|flatgeobuf/);
56+
moduleRules.push(babelConfig);
5257
moduleRules.push(configBase.module.rules.css);
5358
return moduleRules
5459
})()

build/webpack.config.mapboxgl.js

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,28 @@ module.exports = {
3636
rules: (function() {
3737
let moduleRules = [];
3838
moduleRules.push(configBase.module.rules.img);
39-
if (configBase.moduleVersion === 'es5') {
40-
//打包为es5相关配置
41-
moduleRules.push({
42-
test: [/\.js$/],
43-
exclude: /node_modules[\/\\]proj4|classic|webgl-debug/,
44-
loader: 'babel-loader',
45-
options: {
46-
presets: ['@babel/preset-env']
47-
}
48-
});
39+
const babelConfig = {
40+
test: [/\.js$/],
41+
exclude: /node_modules[\/\\]proj4|classic|webgl-debug/,
42+
loader: 'babel-loader',
43+
options: {
44+
presets: ['@babel/preset-env'],
45+
plugins: [
46+
[
47+
'@babel/plugin-transform-runtime',
48+
{
49+
absoluteRuntime: false,
50+
corejs: false,
51+
helpers: false,
52+
regenerator: true,
53+
useESModules: false
54+
}
55+
]
56+
]
57+
}
4958
}
59+
configBase.moduleVersion === "es6" && (babelConfig.include = /FGBLayer|flatgeobuf/);
60+
moduleRules.push(babelConfig);
5061
moduleRules.push(configBase.module.rules.css);
5162
return moduleRules;
5263
})()

build/webpack.config.openlayers.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,8 @@ module.exports = {
4949
rules: (function() {
5050
let moduleRules = [];
5151
moduleRules.push(configBase.module.rules.img);
52-
if (configBase.moduleVersion === 'es5') {
53-
//打包为es5相关配置
54-
moduleRules.push({
55-
test: [/\.js$/],
52+
const babelConfig = {
53+
test: [/\.js$/],
5654
exclude: /classic | webgl-debug/,
5755
loader: 'babel-loader',
5856
options: {
@@ -70,8 +68,9 @@ module.exports = {
7068
]
7169
]
7270
}
73-
});
7471
}
72+
configBase.moduleVersion === "es6" && (babelConfig.include = /FGB|flatgeobuf/);
73+
moduleRules.push(babelConfig);
7574
moduleRules.push(configBase.module.rules.css);
7675
return moduleRules;
7776
})()

0 commit comments

Comments
 (0)