【update】优化api和测试配置文件 review by zhurongch

songyumeng · songyumeng · commit 3025a23002b9 · 2019-01-09T09:55:28.000+08:00
diff --git a/build/jsdocs/classic/docs.json b/build/jsdocs/classic/docs.json
@@ -21,7 +21,7 @@
             "src/common/iServer/GeoCodingParameter.js","src/common/iServer/GeoDecodingParameter.js"
         ],
         "exclude": [
-            "src/classic/libs","src/classic/theme","src/classic/resource","src/common/overlay/levelRenderer","src/common/widgets"
+            "src/classic/libs","src/classic/theme","src/classic/resource","src/common/overlay/levelRenderer"
         ]
     },
     "plugins": ["plugins/markdown"],
diff --git a/build/jsdocs/mapboxgl/docs.json b/build/jsdocs/mapboxgl/docs.json
@@ -22,7 +22,7 @@
             "src/common","src/mapboxgl"
         ],
         "exclude": [
-            "src/common/overlay/levelRenderer","src/common/widgets"
+            "src/common/overlay/levelRenderer"
         ]
     },
     "plugins": ["plugins/markdown"],
diff --git a/build/jsdocs/openlayers/docs.json b/build/jsdocs/openlayers/docs.json
@@ -22,7 +22,7 @@
             "src/common","src/openlayers"
         ],
         "exclude": [
-            "src/common/overlay/levelRenderer","src/common/widgets"
+            "src/common/overlay/levelRenderer"
         ]
     },
     "plugins": ["plugins/markdown"],
diff --git a/build/jsdocs/template/config.json b/build/jsdocs/template/config.json
@@ -358,6 +358,10 @@
             "DataServiceQuery": {
                 "name": "数据服务查询微件",
                 "name_en": "DataServiceQuery"
+            },
+            "Chart": {
+                "name": "图表微件",
+                "name_en": "Chart"
             }
         }
     },
diff --git a/src/common/widgets/chart/ChartModel.js b/src/common/widgets/chart/ChartModel.js
@@ -2,13 +2,13 @@
  * This program are made available under the terms of the Apache License, Version 2.0
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
 import { SuperMap } from '../../SuperMap';
-import { FetchRequest } from '@supermap/iclient-common';
+import { FetchRequest } from '../../util/FetchRequest';
 /**
  * @class SuperMap.Widgets.ChartModel
  * @classdesc 图表微件数据模型
  * @private
  * @param {Object} datasets - 数据来源。
- * @category Widgets Common
+ * @category Widgets Chart
  */
 
 export class ChartModel {
diff --git a/src/common/widgets/chart/ChartView.js b/src/common/widgets/chart/ChartView.js
@@ -8,7 +8,6 @@ import { ChartViewModel } from "./ChartViewModel";
 /**
  * @class SuperMap.Widgets.Chart
  * @classdesc 图表微件
- * @private
  * @version 10.X.X
  * @param {string} domID - 图表dom元素ID。
  * @param {Object} options - 可选参数。
@@ -21,7 +20,7 @@ import { ChartViewModel } from "./ChartViewModel";
  * @param {Array.<Object>} options.chartOptions.yAxis - 图表Y轴。
  * @param {string} options.chartOptions.yAxis.field - 图表Y轴字段名。
  * @param {string} options.chartOptions.yAxis.name - 图表Y轴名称。
- * @category Widgets Common
+ * @category Widgets Chart
  */
 export class ChartView {
 
diff --git a/src/common/widgets/chart/ChartViewModel.js b/src/common/widgets/chart/ChartViewModel.js
@@ -7,7 +7,7 @@ import { ChartModel } from "./ChartModel";
 /**
  * @class SuperMap.Widgets.ChartViewModel
  * @classdesc 图表微件功能类
- * @private
+ * @category Widgets Chart
  * @version 10.X.X
  * @param {Object} options - 可选参数。
  * @param {string} options.type - 图表类型。
diff --git a/test/karma.conf.js b/test/karma.conf.js
@@ -38,7 +38,7 @@ module.exports = function (config) {
             {pattern: '../src/classic/libs/Lang/*.js', include: false},
             {pattern: '../src/classic/theme/default/*.css', include: false},
             /**测试文件**/
-             './test-main-classic.js',
+            './test-main-classic.js',
 
             /***common的源码***/
             '../src/common/**/*.js',
@@ -50,7 +50,7 @@ module.exports = function (config) {
             {pattern: './libs/workers/TurfWorkerForTest.js', include: false},
             {pattern: '../node_modules/leaflet/dist/leaflet.css', include: false},
             {pattern: '../src/leaflet/**/**/*.css', include: false},
-            '../src/leaflet/**/!(ClientComputationView|index).js',
+            '../src/leaflet/**/index.js',
             /**测试文件**/
             './test-main-leaflet.js',
 
@@ -87,7 +87,7 @@ module.exports = function (config) {
             './test-main-common.js': ['browserify'],
 
             '../node_modules/leaflet/dist/leaflet-src.js': ['browserify'],
-            '../src/leaflet/**/!(ClientComputationView|index).js': ['browserify'],
+            '../src/leaflet/**/!index.js': ['browserify'],
             './leaflet/**/*Spec.js': ['browserify'],
             './test-main-leaflet.js': ['browserify'],
 
diff --git a/test/test-main-common.js b/test/test-main-common.js
@@ -169,6 +169,11 @@ import './common/thirdparty/elasticsearch/ElasticSearchSpec.js';
 import './common/widgets/templates/IndexTabsPageContainerSpec.js';
 import './common/widgets/templates/NavTabsPageSpec.js';
 import './common/widgets/templates/CommonContainerSpec.js';
+import './common/widgets/chart/ChartModelSpec.js';
+import './common/widgets/chart/ChartViewModelSpec';
+import './common/widgets/chart/ChartViewSpec';
+
+import './common/util/FetchRequestSpec';
 
 
 

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`"src/common/iServer/GeoCodingParameter.js","src/common/iServer/GeoDecodingParameter.js"`
`22`	`22`	`],`
`23`	`23`	`"exclude": [`
`24`		`- "src/classic/libs","src/classic/theme","src/classic/resource","src/common/overlay/levelRenderer","src/common/widgets"`
	`24`	`+ "src/classic/libs","src/classic/theme","src/classic/resource","src/common/overlay/levelRenderer"`
`25`	`25`	`]`
`26`	`26`	`},`
`27`	`27`	`"plugins": ["plugins/markdown"],`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`"src/common","src/mapboxgl"`
`23`	`23`	`],`
`24`	`24`	`"exclude": [`
`25`		`- "src/common/overlay/levelRenderer","src/common/widgets"`
	`25`	`+ "src/common/overlay/levelRenderer"`
`26`	`26`	`]`
`27`	`27`	`},`
`28`	`28`	`"plugins": ["plugins/markdown"],`
Original file line number	Diff line number	Diff line change
`@@ -358,6 +358,10 @@`
`358`	`358`	`"DataServiceQuery": {`
`359`	`359`	`"name": "数据服务查询微件",`
`360`	`360`	`"name_en": "DataServiceQuery"`
	`361`	`+ },`
	`362`	`+ "Chart": {`
	`363`	`+ "name": "图表微件",`
	`364`	`+ "name_en": "Chart"`
`361`	`365`	`}`
`362`	`366`	`}`
`363`	`367`	`},`