Skip to content

Commit ce17af9

Browse files
zhurczhurc
committed
调整common通用模块下部分目录结构 review by songyumeng
1 parent 9f1a4a0 commit ce17af9

File tree

133 files changed

+4378
-4391
lines changed

Some content is hidden

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

133 files changed

+4378
-4391
lines changed

‎build/deps.js‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
var deps = {
22
"common": {
3+
"core": [
4+
"./src/common/Base.js",
5+
"./src/common/REST.js"
6+
],
37
"format": [
48
"./src/common/format/GeoJSON.js"
59
],
10+
"style": [
11+
"./src/common/style/CartoCSS.js"
12+
],
613
// "iManager" : [],
7-
// "iPortal":[],
814
"online": [
915
"./src/common/online/Online.js"
1016
],
11-
"iPortal": [
12-
"./src/common/iPortal/Portal.js",
17+
"iPortal": [
18+
"./src/common/iPortal/Portal.js"
1319
],
1420
"iServer": [
1521
//Data
@@ -75,9 +81,6 @@ var deps = {
7581
"./src/common/iServer/TerrainCurvatureCalculationService.js",
7682
"./src/common/iServer/ThiessenAnalystService.js"
7783

78-
],
79-
"visual": [
80-
"./src/common/CartoCSS.js"
8184
]
8285
},
8386

‎dist/iclient9-leaflet.js‎

Lines changed: 1940 additions & 1943 deletions
Large diffs are not rendered by default.

‎dist/iclient9-openlayers.js‎

Lines changed: 2305 additions & 2308 deletions
Large diffs are not rendered by default.

‎karma.conf.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ module.exports = function (config) {
2525
/***common文件夹下的源码添加至此***/
2626
'src/common/Base.js',
2727
'src/common/REST.js',
28-
'src/common/CartoCSS.js',
28+
'src/common/style/CartoCSS.js',
2929
'src/common/**/*.js',
3030

3131
/***Leaflet文件夹下的源码添加至此，暂未添加***/
@@ -102,7 +102,7 @@ module.exports = function (config) {
102102
// list of files to exclude 测试时排除的文件
103103
exclude: [
104104
//暂时先排除(因为Request引用了node_modules中的库，但在karma下识别不到路径，暂时找不到解决办法)
105-
'src/common/Request.js',
105+
'src/common/util/Request.js',
106106
'src/common/online/*.js'
107107
],
108108

‎src/common/Base.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
require('../legacy/libs/SuperMap_Basic-8.1.1-14426.js');
2-
require('./REST');
1+
require('../legacy/libs/SuperMap_Basic-8.1.1-14426.js');

‎src/common/REST.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
require('./Base');
2-
/**
1+
/**
32
*服务请求返回结果数据类型
43
* GEOJSON: "GEOJSON",
54
* ISERVER: "ISERVER"

‎src/common/format/Format.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Class: SuperMap.Format
33
* 读写各种格式的格式类基类。其子类应该包含并实现read和write方法。
44
*/
5-
require('../Base');
5+
66
SuperMap.Format = SuperMap.Class({
77

88
/**

‎src/common/format/GeoJSON.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Inherits from:
66
* - <SuperMap.Format.JSON>
77
*/
8-
require('../Base');
8+
99
require('./JSON');
1010

1111
SuperMap.Format.GeoJSON = SuperMap.Class(SuperMap.Format.JSON, {

‎src/common/iPortal/Portal.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
require('../Base');
21
require('./Service');
32
require('./ServicesDeleteParam');
43
require('./ServicesQueryParam');
4+
require('../util/Request');
55

66
SuperMap.Portal = SuperMap.Class({
77

‎src/common/iPortal/Service.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require('../Request');
1+
require('../util/Request');
22
require('./ServiceUpdateParam');
33

44
SuperMap.Service = SuperMap.Class({

0 commit comments

Comments
 (0)