Skip to content

Commit 3c64918

Browse files
author
潘卓然ParnDeedlit
committed
【站点】【分支】【合并Dev分支代码】
2 parents 6ffb7a4 + fb65cf7 commit 3c64918

Some content is hidden

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

60 files changed

+4879
-3719
lines changed

‎.babelrc‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
2-
"compact": false,
3-
"ast": false,
4-
"presets": [
5-
["es2015", { "modules": false }]
6-
]
2+
"compact": false,
3+
"ast": false,
4+
"presets": [["es2015", { "modules": false }]]
75
}

‎package.json‎

Lines changed: 93 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,95 @@
11
{
2-
"name": "@mapgis/webclient",
3-
"version": "10.5.3",
4-
"description": "",
5-
"main": "index.js",
6-
"scripts": {
7-
"website": "cd website && npm run serve",
8-
"website-build": "cd website && npm run build",
9-
"leaflet-debug": "webpack --config src/config/opensource/leaflet-debug-config.js",
10-
"leaflet-release": "webpack --config src/config/opensource/leaflet-release-config.js --progress",
11-
"openlayers-debug": "webpack --config src/config/opensource/openlayers-debug-config.js",
12-
"openlayers-release": "webpack --config src/config/opensource/openlayers-release-config.js --progress",
13-
"mapbox-debug": "webpack --config src/config/opensource/mapbox-debug-config.js",
14-
"mapbox-release": "webpack --config src/config/opensource/mapbox-release-config.js --progress",
15-
"leaflet-plugin-debug": "webpack --config src/config/opensource/leaflet-plugin-debug-config.js",
16-
"leaflet-plugin-release": "webpack --config src/config/opensource/leaflet-plugin-release-config.js --progress",
17-
"openlayers-plugin-debug": "webpack --config src/config/opensource/openlayers-plugin-debug-config.js",
18-
"openlayers-plugin-release": "webpack --config src/config/opensource/openlayers-plugin-release-config.js --progress",
19-
"mapbox-plugin-debug": "webpack --config src/config/opensource/mapbox-plugin-debug-config.js",
20-
"mapbox-plugin-release": "webpack --config src/config/opensource/mapbox-plugin-release-config.js --progress",
21-
"cesium-plugin-debug": "webpack --config src/config/opensource/cesium-plugin-debug-config.js",
22-
"cesium-plugin-release": "webpack --config src/config/opensource/cesium-plugin-release-config.js --progress",
23-
"service-debug": "webpack --config src/config/opensource/service-debug-config.js",
24-
"service-release": "webpack --config src/config/opensource/service-release-config.js --progress",
25-
"build-docs-leaflet": "jsdoc -c ./docs/jsdoc-config/leaflet/docs.json -R ./docs/jsdoc-config/leaflet/index.md -r",
26-
"build-docs-mapboxgl": "jsdoc -c ./docs/jsdoc-config/mapboxgl/docs.json -R ./docs/jsdoc-config/mapboxgl/index.md -r",
27-
"build-docs-openlayers": "jsdoc -c ./docs/jsdoc-config/openlayers/docs.json -R ./docs/jsdoc-config/openlayers/index.md -r",
28-
"build-docs-cesium": "jsdoc -c ./docs/jsdoc-config/cesium/docs.json -R ./docs/jsdoc-config/cesium/index.md -r"
29-
},
30-
"author": "mapgis",
31-
"license": "Apache2",
32-
"devDependencies": {
33-
"babel-core": "^6.26.0",
34-
"babel-eslint": "^10.1.0",
35-
"babel-loader": "^7.1.2",
36-
"babel-plugin-import": "^1.13.0",
37-
"babel-plugin-transform-class-properties": "^6.11.5",
38-
"babel-plugin-transform-decorators-legacy": "^1.3.4",
39-
"babel-plugin-transform-flow-strip-types": "^6.21.0",
40-
"babel-plugin-transform-object-rest-spread": "^6.8.0",
41-
"babel-plugin-transform-runtime": "^6.15.0",
42-
"babel-preset-env": "^1.6.1",
43-
"babel-preset-es2015": "^6.24.1",
44-
"babel-runtime": "^6.11.6",
45-
"clean-webpack-plugin": "^0.1.18",
46-
"copy-webpack-plugin": "^4.5.1",
47-
"eslint": "^7.4.0",
48-
"eslint-config-airbnb": "^18.2.0",
49-
"eslint-config-prettier": "^6.11.0",
50-
"eslint-loader": "^1.9.0",
51-
"eslint-plugin-import": "^2.22.0",
52-
"eslint-plugin-jsx-a11y": "^6.3.1",
53-
"eslint-plugin-prettier": "^3.1.4",
54-
"eslint-plugin-react": "^7.20.3",
55-
"happypack": "^5.0.0",
56-
"json-loader": "^0.5.4",
57-
"prettier": "^2.0.5",
58-
"react-hot-loader": "^3.0.0-beta.6",
59-
"source-map-loader": "^0.2.3",
60-
"url-loader": "^0.5.9",
61-
"webpack": "4.19.1",
62-
"webpack-cleanup-plugin": "0.4.2",
63-
"webpack-cli": "2.1.5",
64-
"webpack-parallel-uglify-plugin": "0.4.2"
65-
},
66-
"dependencies": {
67-
"@mapbox/leaflet-omnivore": "^0.3.4",
68-
"@mapbox/mapbox-gl-style-spec": "^13.15.0",
69-
"@mapgis/mapbox-gl": "^1.9.0",
70-
"axios": "^0.18.0",
71-
"cesium": "^1.70.1",
72-
"d3": "^5.16.0",
73-
"echarts": "^4.4.0",
74-
"fast-xml-parser": "^3.17.6",
75-
"html-webpack-plugin": "^4.3.0",
76-
"jsdoc": "^3.6.3",
77-
"leaflet": "^1.7.1",
78-
"mapv": "^2.0.40",
79-
"ol": "5.3.3",
80-
"proj4": "2.3.15",
81-
"qs": "^6.9.4",
82-
"webfont-matcher": "^1.1.0"
83-
}
2+
"name": "@mapgis/webclient",
3+
"version": "10.5.3",
4+
"description": "",
5+
"main": "index.js",
6+
"scripts": {
7+
"website": "cd website && npm run serve",
8+
"website-build": "cd website && npm run build",
9+
"leaflet-debug": "webpack --config src/config/opensource/leaflet-debug-config.js",
10+
"leaflet-release": "webpack --config src/config/opensource/leaflet-release-config.js --progress",
11+
"openlayers-debug": "webpack --config src/config/opensource/openlayers-debug-config.js",
12+
"openlayers-release": "webpack --config src/config/opensource/openlayers-release-config.js --progress",
13+
"mapbox-debug": "webpack --config src/config/opensource/mapbox-debug-config.js",
14+
"mapbox-release": "webpack --config src/config/opensource/mapbox-release-config.js --progress",
15+
"leaflet-plugin-debug": "webpack --config src/config/opensource/leaflet-plugin-debug-config.js",
16+
"leaflet-plugin-release": "webpack --config src/config/opensource/leaflet-plugin-release-config.js --progress",
17+
"openlayers-plugin-debug": "webpack --config src/config/opensource/openlayers-plugin-debug-config.js",
18+
"openlayers-plugin-release": "webpack --config src/config/opensource/openlayers-plugin-release-config.js --progress",
19+
"mapbox-plugin-debug": "webpack --config src/config/opensource/mapbox-plugin-debug-config.js",
20+
"mapbox-plugin-release": "webpack --config src/config/opensource/mapbox-plugin-release-config.js --progress",
21+
"cesium-plugin-debug": "webpack --config src/config/opensource/cesium-plugin-debug-config.js",
22+
"cesium-plugin-release": "webpack --config src/config/opensource/cesium-plugin-release-config.js --progress",
23+
"service-debug": "webpack --config src/config/opensource/service-debug-config.js",
24+
"service-release": "webpack --config src/config/opensource/service-release-config.js --progress",
25+
"build-docs-leaflet": "jsdoc -c ./docs/jsdoc-config/leaflet/docs.json -R ./docs/jsdoc-config/leaflet/index.md -r",
26+
"build-docs-mapboxgl": "jsdoc -c ./docs/jsdoc-config/mapboxgl/docs.json -R ./docs/jsdoc-config/mapboxgl/index.md -r",
27+
"build-docs-openlayers": "jsdoc -c ./docs/jsdoc-config/openlayers/docs.json -R ./docs/jsdoc-config/openlayers/index.md -r",
28+
"build-docs-cesium": "jsdoc -c ./docs/jsdoc-config/cesium/docs.json -R ./docs/jsdoc-config/cesium/index.md -r",
29+
"test-service": "node ./node_modules/karma/bin/karma start ./src/unittest/karma.conf.js",
30+
"test-init": "node ./node_modules/karma/bin/karma init karma.conf.js"
31+
},
32+
"author": "mapgis",
33+
"license": "Apache2",
34+
"devDependencies": {
35+
"babel-core": "^6.26.3",
36+
"babel-eslint": "^10.1.0",
37+
"babel-loader": "^7.1.2",
38+
"babel-plugin-import": "^1.13.0",
39+
"babel-plugin-transform-class-properties": "^6.11.5",
40+
"babel-plugin-transform-decorators-legacy": "^1.3.4",
41+
"babel-plugin-transform-flow-strip-types": "^6.21.0",
42+
"babel-plugin-transform-object-rest-spread": "^6.8.0",
43+
"babel-plugin-transform-runtime": "^6.15.0",
44+
"babel-preset-env": "^1.7.0",
45+
"babel-preset-es2015": "^6.24.1",
46+
"babel-runtime": "^6.11.6",
47+
"babelify": "8",
48+
"browserify": "^17.0.0",
49+
"clean-webpack-plugin": "^0.1.18",
50+
"copy-webpack-plugin": "^4.5.1",
51+
"eslint": "^7.4.0",
52+
"eslint-config-airbnb": "^18.2.0",
53+
"eslint-config-prettier": "^6.11.0",
54+
"eslint-loader": "^1.9.0",
55+
"eslint-plugin-import": "^2.22.0",
56+
"eslint-plugin-jsx-a11y": "^6.3.1",
57+
"eslint-plugin-prettier": "^3.1.4",
58+
"eslint-plugin-react": "^7.20.3",
59+
"happypack": "^5.0.0",
60+
"html-webpack-plugin": "^4.3.0",
61+
"jasmine-core": "^3.7.1",
62+
"json-loader": "^0.5.4",
63+
"karma": "^6.3.2",
64+
"karma-browserify": "^8.0.0",
65+
"karma-chrome-launcher": "^3.1.0",
66+
"karma-firefox-launcher": "^2.1.0",
67+
"karma-jasmine": "^4.0.1",
68+
"prettier": "^2.0.5",
69+
"react-hot-loader": "^3.0.0-beta.6",
70+
"source-map-loader": "^0.2.3",
71+
"url-loader": "^0.5.9",
72+
"watchify": "^4.0.0",
73+
"webpack": "4.19.1",
74+
"webpack-cleanup-plugin": "0.4.2",
75+
"webpack-cli": "2.1.5",
76+
"webpack-parallel-uglify-plugin": "0.4.2"
77+
},
78+
"dependencies": {
79+
"@mapbox/leaflet-omnivore": "^0.3.4",
80+
"@mapbox/mapbox-gl-style-spec": "^13.15.0",
81+
"@mapgis/mapbox-gl": "^1.9.0",
82+
"axios": "^0.18.0",
83+
"cesium": "^1.70.1",
84+
"d3": "^5.16.0",
85+
"echarts": "^4.4.0",
86+
"fast-xml-parser": "^3.17.6",
87+
"jsdoc": "^3.6.3",
88+
"leaflet": "^1.7.1",
89+
"mapv": "^2.0.40",
90+
"ol": "5.3.3",
91+
"proj4": "2.3.15",
92+
"qs": "^6.9.4",
93+
"webfont-matcher": "^1.1.0"
94+
}
8495
}

‎src/config/opensource/mapbox_index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ import {
212212
ThemesInfo
213213
} from '../../service/Igserver/theme';
214214

215-
import { GeoDatasetService, CalculateModelService } from '../../service/clouddisk';
216-
export { GeoDatasetService, CalculateModelService };
215+
import { UserService, GeoDatasetService, CalculateModelService } from '../../service/clouddisk';
216+
export { UserService, GeoDatasetService, CalculateModelService };
217217

218218
export { ServiceBase };
219219

‎src/service/clouddisk/ServiceBase.js‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ import { IgsServiceBase } from '../baseserver/IServiceBase';
1111
export class CloudDiskService extends ServiceBase {
1212
constructor(options) {
1313
super(options);
14+
const { headers } = options;
1415
this.fixParams(options);
16+
this.headers = headers ? headers : undefined;
1517
}
1618

17-
/**
18-
* @param {String} authorization 验证令牌
19-
*/
20-
setAuthorization(authorization) {
21-
this.options.Authorization = authorization;
19+
setHeaders(headers) {
20+
this.headers = headers;
2221
}
2322

2423
fixParams(option) {
@@ -70,15 +69,18 @@ export class CloudDiskService extends ServiceBase {
7069
* @param {Function} onError 查询失败回调函数。
7170
*/
7271
get(url, onSuccess, onError) {
73-
var me = this;
74-
var service = new IgsServiceBase(url, {
72+
let me = this;
73+
let service = new IgsServiceBase(url, {
7574
eventListeners: {
7675
scope: me,
7776
processCompleted: onSuccess,
7877
processFailed: onError
7978
}
8079
});
81-
service.processAsync();
80+
service.processAsync({
81+
method: 'GET',
82+
headers: this.headers || { 'Content-Type': 'text/plain;charset=UTF-8' }
83+
});
8284
}
8385

8486
/**
@@ -89,8 +91,8 @@ export class CloudDiskService extends ServiceBase {
8991
* @param {Function} onError 查询失败回调函数。
9092
*/
9193
post(url, param, onSuccess, onError) {
92-
var me = this;
93-
var service = new IgsServiceBase(url, {
94+
let me = this;
95+
let service = new IgsServiceBase(url, {
9496
eventListeners: {
9597
scope: me,
9698
processCompleted: onSuccess,
@@ -100,7 +102,7 @@ export class CloudDiskService extends ServiceBase {
100102
service.processAsync({
101103
method: 'POST',
102104
data: JSON.stringify(param),
103-
headers: { 'Content-Type': 'text/plain;charset=UTF-8' }
105+
headers: this.headers || { 'Content-Type': 'text/plain;charset=UTF-8' }
104106
});
105107
}
106108
}

‎src/service/clouddisk/file/file.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export class FileService extends CloudDiskService {
2020
}
2121

2222
/**
23-
* @function module:CloudDisk.FileService.prototype.schema
23+
* @function module:CloudDisk.FileService.prototype.copy
2424
* @description 空间数据元数据
2525
* @param {Object} options 请求参数
2626
* @param {String} options.destFileName 目地名称

‎src/service/clouddisk/index.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
* @module CloudDisk
33
*/
44

5+
import { UserService } from './user';
56
import { GeoDatasetService } from './giscore';
67
import { CalculateModelService } from './model';
78

8-
export { GeoDatasetService, CalculateModelService };
9+
export { UserService, GeoDatasetService, CalculateModelService };

‎src/service/clouddisk/model/calculate.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ const NodesIdPath = '/nodes/{nodeId}?';
1818
* @description DataStore的云盘数据转换服务
1919
* @see 该方法强依赖datastore
2020
* @author 基础平台-潘卓然
21+
* @see http://192.168.199.53:9011/clouddisk/rest/swagger-ui.html
2122
* @example
2223
* let service = new CalculateModelService({ domain: "http://192.168.199.53:9011"});
23-
* service.setAuthorization('pk.sdfsedfsxseres');
24+
* service.setHeaders({authorization: 'pk.xxxxxx'});
2425
* service.add({nodeId: 100}, (res) => {}, (error) => {});
2526
* service.catalog({nodeId: 100}, (res) => {}, (error) => {});
2627
*/

‎src/service/clouddisk/tools/index.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
import { ToolsService } from './tool';
2+
export { ToolsService };

‎src/service/clouddisk/tools/tool.js‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
import Qs from 'qs';
2+
3+
import { Zondy } from '../../common/Base';
4+
import { CloudDiskService } from '../ServiceBase';
5+
6+
const TasksPath = '/tasks';
7+
8+
/**
9+
* @class module:CloudDisk.ToolsService
10+
* @description DataStore的云盘数据转换服务
11+
* @see 该方法强依赖datastore
12+
* @author 基础平台-潘卓然
13+
* @see http://192.168.199.53:9011/clouddisk/rest/swagger-ui.html
14+
* @example
15+
* let service = new ToolsService({ domain: "http://192.168.199.53:9011"});
16+
* service.setHeaders({authorization: 'pk.xxxxxx'});
17+
* service.gettasks({
18+
* taskid: "9baaeff5-7b08-4681-b0d4-ce2e70c1d61e",
19+
* taskName: "创建缓冲分析任务",
20+
* srcUrl: "",
21+
* taskType: 13,
22+
* beginTime: 1621305760000
23+
* endTime: 1621305770000
24+
* }, (res) => {}, (error) => {});
25+
*/
26+
export class ToolsService extends CloudDiskService {
27+
constructor(options) {
28+
super(options);
29+
/**
30+
* @member module:CloudDisk.ToolsService.prototype.serviceUrl
31+
* @description 服务地址
32+
*/
33+
this.serviceUrl = '/clouddisk/rest/tools/tasks';
34+
}
35+
36+
/**
37+
* @function module:CloudDisk.ToolsService.prototype.gettasks
38+
* @description 空间数据元数据
39+
* @param {Object} options 请求参数
40+
* @param {String} [options.taskID] taskID
41+
* @param {String} [options.taskName] taskName
42+
* @param {String} [options.srcUrl] srcUrl
43+
* @param {Number} [options.taskType] 任务类型id，从字典接口获取（task）
44+
* @param {Number} [options.beginTime] 开始时间 时间戳 毫秒
45+
* @param {Number} [options.endTime] 结束时间 时间戳 毫秒
46+
* @param {Number} [options.pageSize = 20] pageSize
47+
* @param {Number} [options.pageNum = 1] pageNum
48+
* @param {Function} onSuccess 成功回调
49+
* @param {Function} onError 失败回调
50+
* @example http://192.168.199.53:9011/clouddisk/rest/CalculateModel/catalog
51+
*/
52+
gettasks(options, onSuccess, onError) {
53+
let { serviceUrl } = this;
54+
serviceUrl += TasksPath;
55+
let url = this.getFullUrl(serviceUrl, options);
56+
this.get(url, onSuccess, onError);
57+
}
58+
}
59+
60+
export default ToolsService;
61+
Zondy.CloudDisk.Model.ToolsService = ToolsService;

‎src/service/clouddisk/user/index.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
import { UserService } from './user';
2+
export { UserService };

0 commit comments

Comments
 (0)