【文档】【修复】【修复三方依赖的jsdoc的引入问题】

潘卓然ParnDeedlit · 潘卓然ParnDeedlit · commit 9763ade8def1 · 2021-05-17T23:55:44.000+08:00
diff --git a/docs/jsdoc-config/mapboxgl/docs.json b/docs/jsdoc-config/mapboxgl/docs.json
@@ -1,55 +1,61 @@
 {
-  "opts": {
-    "encoding": "utf8",
-    "private": false,
-    "recurse": true,
-    "lenient": true,
-    "tutorials": "./docs/jsdoc-config/mapboxgl/tutorials",
-    "destination": "./website/public/docs/mapboxgl",
-    "template": "./docs/templates/better-docs"
-  },
-  "disqus": "",
-  "tags": {
-    "allowUnknownTags": true
-  },
-  "source": {
-    "includePattern": ".+\\.js?$",
-    "include": ["src/service/", "src/mapboxgl/"],
-    "exclude": ["src/service/baseserver"]
-  },
-  "plugins": ["plugins/markdown"],
-  "templates": {
-    "search": true,
-    "cleverLinks": true,
-    "monospaceLinks": true,
-    "outputSourceFiles": true,
-    "outputSourcePath": true,
-    "default": {
-      "outputSourceFiles": true
+    "opts": {
+        "encoding": "utf8",
+        "private": false,
+        "recurse": true,
+        "lenient": true,
+        "tutorials": "./docs/jsdoc-config/mapboxgl/tutorials",
+        "destination": "./website/public/docs/mapboxgl",
+        "template": "./docs/templates/better-docs"
     },
-    "better-docs": {
-      "logo": "../image/mapgis_blue.png",
-      "title": "",
-      "hideGenerator": false,
-      "navLinks": [
-        {
-          "label": "Cesium",
-          "href": "/docs/cesium/index.html"
-        },
-        {
-          "label": "MapboxGL",
-          "href": "/docs/mapboxgl/index.html"
+    "disqus": "",
+    "tags": {
+        "allowUnknownTags": true
+    },
+    "source": {
+        "includePattern": ".+\\.js?$",
+        "include": ["src/service/", "src/mapboxgl/"],
+        "exclude": [
+            "src/service/baseserver",
+            "src/service/node_modules/turf-jsts/",
+            "src/service/node_modules/@turf",
+            "src/service/node_modules/polygon-clipping",
+            "src/service/node_modules/splaytree"
+        ]
+    },
+    "plugins": ["plugins/markdown"],
+    "templates": {
+        "search": true,
+        "cleverLinks": true,
+        "monospaceLinks": true,
+        "outputSourceFiles": true,
+        "outputSourcePath": true,
+        "default": {
+            "outputSourceFiles": true
         },
-        {
-          "label": "Leaflet",
-          "href": "/docs/leaflet/index.html"
+        "better-docs": {
+            "logo": "../image/mapgis_blue.png",
+            "title": "",
+            "hideGenerator": false,
+            "navLinks": [
+                {
+                    "label": "Cesium",
+                    "href": "/docs/cesium/index.html"
+                },
+                {
+                    "label": "MapboxGL",
+                    "href": "/docs/mapboxgl/index.html"
+                },
+                {
+                    "label": "Leaflet",
+                    "href": "/docs/leaflet/index.html"
+                },
+                {
+                    "label": "OpenLayers",
+                    "href": "/docs/openlayers/index.html"
+                }
+            ]
         },
-        {
-          "label": "OpenLayers",
-          "href": "/docs/openlayers/index.html"
-        }
-      ]
-    },
-    "linenums": true
-  }
+        "linenums": true
+    }
 }
diff --git a/src/config/opensource/mapbox_index.js b/src/config/opensource/mapbox_index.js
@@ -212,6 +212,9 @@ import {
     ThemesInfo
 } from '../../service/Igserver/theme';
 
+import { GeoDatasetService, CalculateModelService } from '../../service/clouddisk';
+export { GeoDatasetService, CalculateModelService };
+
 export { ServiceBase };
 
 export {
@@ -391,28 +394,28 @@ export {
 };
 
 import {
-	GeoFeatureThemeLayer,
-	ThemeLayer,
-	RangeThemeLayer,
-	UniqueThemeLayer,
-	GraphThemeLayer,
-	graphThemeLayer,
-	RandomThemeLayer,
-	SimpleThemeLayer,
-	RankSymbolThemeLayer,
-	ThemeStyle
+    GeoFeatureThemeLayer,
+    ThemeLayer,
+    RangeThemeLayer,
+    UniqueThemeLayer,
+    GraphThemeLayer,
+    graphThemeLayer,
+    RandomThemeLayer,
+    SimpleThemeLayer,
+    RankSymbolThemeLayer,
+    ThemeStyle
 } from '../../mapboxgl/theme';
 export {
-	GeoFeatureThemeLayer,
-	ThemeLayer,
-	RangeThemeLayer,
-	UniqueThemeLayer,
-	GraphThemeLayer,
-	graphThemeLayer,
-	RandomThemeLayer,
-	SimpleThemeLayer,
-	RankSymbolThemeLayer,
-	ThemeStyle
+    GeoFeatureThemeLayer,
+    ThemeLayer,
+    RangeThemeLayer,
+    UniqueThemeLayer,
+    GraphThemeLayer,
+    graphThemeLayer,
+    RandomThemeLayer,
+    SimpleThemeLayer,
+    RankSymbolThemeLayer,
+    ThemeStyle
 };
 
 // 大数据相关
diff --git a/src/service/clouddisk/ServiceBase.js b/src/service/clouddisk/ServiceBase.js
@@ -15,7 +15,6 @@ export class CloudDiskService extends ServiceBase {
     }
 
     /**
-     *
      * @param {String} authorization 验证令牌
      */
     setAuthorization(authorization) {
diff --git a/src/service/clouddisk/file/file.js b/src/service/clouddisk/file/file.js
@@ -19,13 +19,6 @@ export class FileService extends CloudDiskService {
         this.serviceUrl = '/clouddisk/rest/file/';
     }
 
-    /**
-     * @private 修正get/post需要的真正参数
-     */
-    fixOption(option) {
-        this.option = {};
-    }
-
     /**
      * @function module:CloudDisk.FileService.prototype.schema
      * @description 空间数据元数据
diff --git a/src/service/clouddisk/giscore/geodataset/geodataset.js b/src/service/clouddisk/giscore/geodataset/geodataset.js
@@ -7,7 +7,7 @@ const RasterMetadataPath = 'raster/metadata';
 const StatisticsPath = 'featureclass/statistics';
 
 /**
- * @class module:CloudDisk.GisCore.GeoDatasetService
+ * @class module:CloudDisk.GeoDatasetService
  * @description DataStore的云盘数据转换服务
  * @see 该方法强依赖java版本的mapgis.so动态库
  * @author 基础平台-潘卓然
@@ -22,14 +22,6 @@ export class GeoDatasetService extends CloudDiskService {
     this.serviceUrl = '/giscore/dataconvert/rest/geodataset/';
   }
 
-  /**
-   * @private 修正get/post需要的真正参数
-   */
-  fixOption(option) {
-    this.option = {
-    };
-  }
-
   /**
    * @function module:CloudDisk.GeoDatasetService.prototype.schema
    * @description 空间数据元数据
diff --git a/src/service/clouddisk/giscore/geodataset/index.js b/src/service/clouddisk/giscore/geodataset/index.js
@@ -1,6 +1,3 @@
-/**
- * @module
- */
 import { GeoDatasetService } from './geodataset';
 
 export { GeoDatasetService };
diff --git a/src/service/clouddisk/giscore/index.js b/src/service/clouddisk/giscore/index.js
@@ -1,6 +1,3 @@
-/**
- * @module CloudDisk
- */
 import { GeoDatasetService } from './geodataset/index.js';
 
 export { GeoDatasetService };
diff --git a/src/service/clouddisk/index.js b/src/service/clouddisk/index.js
@@ -1,3 +1,8 @@
+/**
+ * @module CloudDisk
+ */
+
 import { GeoDatasetService } from './giscore';
+import { CalculateModelService } from './model';
 
-export { GeoDatasetService };
+export { GeoDatasetService, CalculateModelService };
diff --git a/src/service/clouddisk/model/calculate.js b/src/service/clouddisk/model/calculate.js
@@ -14,7 +14,7 @@ const NodesPath = '/nodes';
 const NodesIdPath = '/nodes/{nodeId}?';
 
 /**
- * @class module:CloudDisk.GisCore.CalculateModelService
+ * @class module:CloudDisk.CalculateModelService
  * @description DataStore的云盘数据转换服务
  * @see 该方法强依赖datastore
  * @author 基础平台-潘卓然
@@ -34,13 +34,6 @@ export class CalculateModelService extends CloudDiskService {
         this.serviceUrl = '/clouddisk/rest/CalculateModel';
     }
 
-    /**
-     * @private 修正get/post需要的真正参数
-     */
-    fixOption(option) {
-        this.option = {};
-    }
-
     /**
      * @function module:CloudDisk.CalculateModelService.prototype.add
      * @description 空间数据元数据
diff --git a/src/service/clouddisk/model/index.js b/src/service/clouddisk/model/index.js
@@ -0,0 +1,2 @@
+import { CalculateModelService } from './calculate';
+export { CalculateModelService };
diff --git a/src/service/index.js b/src/service/index.js
@@ -343,7 +343,14 @@ export const MRGS = {
     TopAnalysis
 };
 
-import { GetDocImageService, GetLayerImageService, GetMapImageService, GetMapInfoService, GetTileImageService, MapServiceBase } from './Igserver/MRMS';
+import {
+    GetDocImageService,
+    GetLayerImageService,
+    GetMapImageService,
+    GetMapInfoService,
+    GetTileImageService,
+    MapServiceBase
+} from './Igserver/MRMS';
 
 export const MRMS = {
     GetDocImageService,
@@ -422,12 +429,20 @@ export const OGC = {
     WMSCapabilities,
     WMTSCapabilities,
     OGCWMTSInfo,
-    OGCWMSInfo,
+    OGCWMSInfo
 };
 
 import {
-  EsCatlogType,
-  EsCatlogName, EsGeoHashType, EsCatlogService, ESGeoCode, ESGeoDecode, ESQueryStats, EsTableService, EsSpaceTimeQueryByAgg } from './datastore/elasticsearch';
+    EsCatlogType,
+    EsCatlogName,
+    EsGeoHashType,
+    EsCatlogService,
+    ESGeoCode,
+    ESGeoDecode,
+    ESQueryStats,
+    EsTableService,
+    EsSpaceTimeQueryByAgg
+} from './datastore/elasticsearch';
 
 import {
     PostgisCatlogService,
@@ -469,12 +484,11 @@ export const DataStore = {
     EsSpaceTimeQueryByAgg
 };
 
-import {
-  GeoDatasetService
-} from './clouddisk';
+import { GeoDatasetService, CalculateModelService } from './clouddisk';
 
 export const CloudDisk = {
-  GeoDatasetService
+    GeoDatasetService,
+    CalculateModelService
 };
 
 import {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ export class CloudDiskService extends ServiceBase {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`/**`
`18`		`- *`
`19`	`18`	`* @param {String} authorization 验证令牌`
`20`	`19`	`*/`
`21`	`20`	`setAuthorization(authorization) {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+import { CalculateModelService } from './calculate';`
	`2`	`+export { CalculateModelService };`