Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

Author: hhyu1

build/jsdocs/classic/docs.json

@@ -50,6 +50,7 @@
  "src/common/REST.js"
  ],
  "exclude": [
+ "src/common/thirdparty/ai",
  "src/classic/libs",
  "src/classic/theme",
  "src/classic/resource",

build/jsdocs/leaflet/docs.json

@@ -24,6 +24,7 @@
  ],
  "exclude": [
  "src/common/overlay/levelRenderer",
+ "src/common/thirdparty/ai",
  "src/common/lang/locales",
  "src/common/iPortal/iPortalQueryResult",
  "src/common/online/OnlineServiceBase",

build/jsdocs/leaflet/index.md

@@ -27,7 +27,7 @@ SuperMap iClient for Leaflet 是一套基于Leaflet的云GIS网络客户端开
 <table><tr>
  <th width="33.3%">可视化</th><th width="33.3%">地图</th><th width="33.3%">投影</th>
 </tr><tr>
- <td><p>丰富的可视化效果，矢量瓦片、客户端专题图、开源可视化库[ECharts](https://echarts.baidu.com/)，[MapV](https://mapv.baidu.com/)</p>
+ <td><p>丰富的可视化效果，矢量瓦片、客户端专题图、开源可视化库 <a href="https://echarts.baidu.com/">ECharts</a>，<a href="https://mapv.baidu.com/">MapV</a></p>
   <a href="TiledVectorLayer.html">TiledVectorLayer</a><br>
   <a href="GraphicLayer.html">GraphicLayer</a><br>
   <a href="DataFlowLayer.html">DataFlowLayer</a><br>
@@ -49,6 +49,6 @@ SuperMap iClient for Leaflet 是一套基于Leaflet的云GIS网络客户端开
 
 ## 参考API
 
-* Leaflet API：<a href="https://leafletjs.com/reference.html" target="_blank">https://leafletjs.com/reference.html</a>
+* Leaflet API:<a href="https://leafletjs.com/reference.html" target="_blank">https://leafletjs.com/reference.html</a>
 * ECharts API:<a href="https://echarts.baidu.com/api.html#echarts" target="_blank">https://echarts.baidu.com/api.html#echarts</a>
 * 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

@@ -23,6 +23,7 @@
  ],
  "exclude": [
  "src/common/overlay/levelRenderer",
+ "src/common/thirdparty/ai",
  "src/common/lang/locales",
  "src/common/iPortal/iPortalQueryResult",
  "src/common/online/OnlineServiceBase",

build/jsdocs/openlayers/docs.json

@@ -23,6 +23,7 @@
  ],
  "exclude": [
  "src/common/overlay/levelRenderer",
+ "src/common/thirdparty/ai",
  "src/common/lang/locales",
  "src/common/iPortal/iPortalQueryResult",
  "src/common/online/OnlineServiceBase",

build/jsdocs/openlayers/index.md

@@ -27,7 +27,7 @@ SuperMap iClient for OpenLayers 是一套基于OpenLayers的云GIS网络客户
 <table><tr>
  <th width="33.3%">可视化</th><th width="33.3%">地图</th><th width="33.3%"></th>
 </tr><tr>
- <td><p>丰富的可视化效果，矢量瓦片、客户端专题图、开源可视化库[ECharts](https://echarts.baidu.com/)，[MapV](https://mapv.baidu.com/)</p>
+ <td><p>丰富的可视化效果，矢量瓦片、客户端专题图、开源可视化库 <a href="https://echarts.baidu.com/">ECharts</a>，<a href="https://mapv.baidu.com/">MapV</a></p>
   <a href="VectorTileSuperMapRest.html">VectorTileSuperMapRest</a><br>
   <a href="Graphic.html">Graphic</a><br>
   <a href="DataFlow.html">DataFlow</a><br>

build/jsdocs/template/config.json

@@ -387,6 +387,9 @@
  },
  "GraticuleLayer": {
  "name": "经纬网"
+ },
+ "FGB": {
+ "name": "FGB"
  }
  }
  },

build/jsdocs/template/publish.js

@@ -243,7 +243,27 @@ function attachModuleSymbols(doclets, modules) {
 function buildNav(members, view, templatePath) {
  var sorted = sortNav(members);
  view.categories = buildCategories(sorted, templatePath);
- view.navMap = buildNavMap(sorted);
+ view.navMap = buildNavMap(sorted,view.linkto);
+ var methods = {};
+ for (const key in view.navMap ) {
+ if (Object.hasOwnProperty.call(view.navMap , key)) {
+ const element = view.navMap[key];
+ const m = element.methods.map(e => {
+ return e.name;
+ });
+ if(!element.fileName && m.length>0){
+ console.log("没有文件名的类：", element.longname,element.type,m)
+ }
+ if(methods[element.fileName]){
+ console.log("重复的文件名：", element.longname,element.fileName,element.type,m)
+ }else{
+ methods[element.fileName] = m;
+ }
+ 
+ }
+ }
+ var methodsPath = path.join(outdir, 'methods.json');
+ fs.writeFileSync(methodsPath, JSON.stringify(methods), 'utf8');
 }
 
 function sortNav(members) {
@@ -291,12 +311,13 @@ function buildCategories(members, templatePath) {
  * @param {array<object>} members.events
  * @return {string} The HTML for the navigation sidebar.
  */
-function buildNavMap(members) {
+function buildNavMap(members,linkto) {
  this.navMap = {};
  _.each(members, function (v) {
  var nav;
  if (v.kind == 'namespace') {
  nav = {
+ fileName:`${linkto(v.meta.filename)}#${v.name}`,
  type: 'namespace',
  longname: v.longname,
  version: v.version,
@@ -320,6 +341,7 @@ function buildNavMap(members) {
  };
  } else if (v.kind == 'class') {
  nav = {
+ fileName:`${linkto(v.meta.filename)}#${v.name}`,
  type: 'class',
  longname: v.longname,
  name: v.name,
@@ -344,6 +366,7 @@ function buildNavMap(members) {
  };
  } else if (v.scope === 'global') {
  nav = {
+ fileName:`${linkto(v.meta.filename)}#${v.name}`,
  type: 'global',
  longname: v.longname,
  version: v.version,

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

@@ -69,7 +69,7 @@ function build(nav,navOrder,level){
 }
 function buildLi(obj){
  ?>
- <li class="item" data-name="<?js= obj.longname ?>">
+ <li class="item" file-name="<?js= obj.fileName ?>" data-name="<?js= obj.longname ?>">
  <span class="title" title="<?js= obj.longname ?>">
  <?js= self.linkto(obj.longname, obj.longname) ?>
  </span>