@vtx/cs-map-layer 1.0.18 → 1.0.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/Layer/layerConfig.js +6 -6
- package/lib/WaterSupplyPointLayer/index.js +2 -2
- package/lib/_components/Template/DeviceCustomContent.d.ts +1 -1
- package/lib/_components/Template/FacilityCustomContent.d.ts +1 -1
- package/lib/_components/Template/index.less +9 -9
- package/lib/_util/http.js +18 -18
- package/lib/_util/interface.js +2 -2
- package/lib/_util/layerConfig.js +9 -2
- package/lib/typings.d.ts +4 -4
- package/package.json +105 -102
package/lib/Layer/layerConfig.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
/* type:类型 FacilityLayer-设施 DeviceLayer-设备 排水管点-WaterDrainPointLayer 排水管线-WaterDrainLineLayer 排水窨井-WaterSupplyPointLayer
|
|
2
|
-
视频-VideoLayer 行政区划-DivisionLayer 排水-雨水-管点-RainPointLayer 排水-雨水-管线-RainLineLayer 排水-雨水-窨井-RainManholeLayer
|
|
3
|
-
排水-污水-管点-SewagePointLayer 排水-污水-管线-SewageLineLayer 排水-污水-窨井-SewageManholeLayer 排水-合流-管点-ConfluencePointLayer
|
|
4
|
-
排水-合流-管线-ConfluenceLineLayer 排水-合流-窨井-ConfluenceManholeLayer 供水-管点-WaterSupplyPointLayer 供水-管线-WaterSupplyLineLayer
|
|
5
|
-
原水-管点-RawWaterPointLayer 原水-管线-RawWaterLineLayer
|
|
6
|
-
自定义图层-CustomLayer
|
|
1
|
+
/* type:类型 FacilityLayer-设施 DeviceLayer-设备 排水管点-WaterDrainPointLayer 排水管线-WaterDrainLineLayer 排水窨井-WaterSupplyPointLayer
|
|
2
|
+
视频-VideoLayer 行政区划-DivisionLayer 排水-雨水-管点-RainPointLayer 排水-雨水-管线-RainLineLayer 排水-雨水-窨井-RainManholeLayer
|
|
3
|
+
排水-污水-管点-SewagePointLayer 排水-污水-管线-SewageLineLayer 排水-污水-窨井-SewageManholeLayer 排水-合流-管点-ConfluencePointLayer
|
|
4
|
+
排水-合流-管线-ConfluenceLineLayer 排水-合流-窨井-ConfluenceManholeLayer 供水-管点-WaterSupplyPointLayer 供水-管线-WaterSupplyLineLayer
|
|
5
|
+
原水-管点-RawWaterPointLayer 原水-管线-RawWaterLineLayer
|
|
6
|
+
自定义图层-CustomLayer
|
|
7
7
|
*/
|
|
8
8
|
|
|
9
9
|
var layerConfig = [{
|
|
@@ -8,8 +8,8 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
|
|
|
8
8
|
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
9
9
|
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
|
|
10
10
|
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
11
|
-
/**
|
|
12
|
-
*供水管点
|
|
11
|
+
/**
|
|
12
|
+
*供水管点
|
|
13
13
|
*/
|
|
14
14
|
import { ImageLayer } from '@vtx/cs-map';
|
|
15
15
|
import { isArray, isEmpty } from 'lodash';
|
|
@@ -13,7 +13,7 @@ declare namespace CustomContent {
|
|
|
13
13
|
deviceDetail: PropTypes.Requireable<object>;
|
|
14
14
|
deviceData: PropTypes.Requireable<object>;
|
|
15
15
|
valueField: PropTypes.Requireable<string>;
|
|
16
|
-
customButton: PropTypes.Requireable<NonNullable<((...args: any[]) => any) |
|
|
16
|
+
customButton: PropTypes.Requireable<NonNullable<PropTypes.ReactElementLike | ((...args: any[]) => any) | null | undefined>>;
|
|
17
17
|
popup: PropTypes.Requireable<object>;
|
|
18
18
|
detail: PropTypes.Requireable<object>;
|
|
19
19
|
};
|
|
@@ -12,7 +12,7 @@ declare namespace CustomContent {
|
|
|
12
12
|
onClick: PropTypes.Requireable<(...args: any[]) => any>;
|
|
13
13
|
facilityDetail: PropTypes.Requireable<object>;
|
|
14
14
|
valueField: PropTypes.Requireable<string>;
|
|
15
|
-
customButton: PropTypes.Requireable<NonNullable<((...args: any[]) => any) |
|
|
15
|
+
customButton: PropTypes.Requireable<NonNullable<PropTypes.ReactElementLike | ((...args: any[]) => any) | null | undefined>>;
|
|
16
16
|
popup: PropTypes.Requireable<object>;
|
|
17
17
|
detail: PropTypes.Requireable<object>;
|
|
18
18
|
};
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
.close-btn {
|
|
2
|
-
position: absolute;
|
|
3
|
-
top: 12px;
|
|
4
|
-
right: 30px;
|
|
5
|
-
cursor: pointer;
|
|
6
|
-
}
|
|
7
|
-
|
|
8
|
-
.cesium-popup-v1{
|
|
9
|
-
width: 300px;
|
|
1
|
+
.close-btn {
|
|
2
|
+
position: absolute;
|
|
3
|
+
top: 12px;
|
|
4
|
+
right: 30px;
|
|
5
|
+
cursor: pointer;
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
.cesium-popup-v1{
|
|
9
|
+
width: 300px;
|
|
10
10
|
}
|
package/lib/_util/http.js
CHANGED
|
@@ -19,10 +19,10 @@ import { getVtxToken } from "@vtx/utils";
|
|
|
19
19
|
// 默认30秒超时
|
|
20
20
|
var SECOND = 30;
|
|
21
21
|
var MILL_SECOND = 1000;
|
|
22
|
-
/**
|
|
23
|
-
* 基于 axios 封装的请求封装
|
|
24
|
-
* axios文档 http://www.axios-js.com/zh-cn/docs/
|
|
25
|
-
* 支持 Get 和 Post 请求
|
|
22
|
+
/**
|
|
23
|
+
* 基于 axios 封装的请求封装
|
|
24
|
+
* axios文档 http://www.axios-js.com/zh-cn/docs/
|
|
25
|
+
* 支持 Get 和 Post 请求
|
|
26
26
|
*/
|
|
27
27
|
var Http = /*#__PURE__*/function () {
|
|
28
28
|
function Http(options) {
|
|
@@ -57,10 +57,10 @@ var Http = /*#__PURE__*/function () {
|
|
|
57
57
|
return instance;
|
|
58
58
|
}
|
|
59
59
|
|
|
60
|
-
/**
|
|
61
|
-
* get 请求
|
|
62
|
-
* @param {*} url
|
|
63
|
-
* @param {*} options {body}
|
|
60
|
+
/**
|
|
61
|
+
* get 请求
|
|
62
|
+
* @param {*} url
|
|
63
|
+
* @param {*} options {body}
|
|
64
64
|
*/
|
|
65
65
|
}, {
|
|
66
66
|
key: "get",
|
|
@@ -78,10 +78,10 @@ var Http = /*#__PURE__*/function () {
|
|
|
78
78
|
});
|
|
79
79
|
}
|
|
80
80
|
|
|
81
|
-
/**
|
|
82
|
-
* post 请求
|
|
83
|
-
* @param {*} url
|
|
84
|
-
* @param {*} options
|
|
81
|
+
/**
|
|
82
|
+
* post 请求
|
|
83
|
+
* @param {*} url
|
|
84
|
+
* @param {*} options
|
|
85
85
|
*/
|
|
86
86
|
}, {
|
|
87
87
|
key: "post",
|
|
@@ -99,9 +99,9 @@ var Http = /*#__PURE__*/function () {
|
|
|
99
99
|
});
|
|
100
100
|
}
|
|
101
101
|
|
|
102
|
-
/**
|
|
103
|
-
* 响应数据的处理
|
|
104
|
-
* @param {*} response
|
|
102
|
+
/**
|
|
103
|
+
* 响应数据的处理
|
|
104
|
+
* @param {*} response
|
|
105
105
|
*/
|
|
106
106
|
}, {
|
|
107
107
|
key: "_responseHandler",
|
|
@@ -122,9 +122,9 @@ var Http = /*#__PURE__*/function () {
|
|
|
122
122
|
throw error;
|
|
123
123
|
}
|
|
124
124
|
|
|
125
|
-
/**
|
|
126
|
-
* 请求错误处理
|
|
127
|
-
* @param {*} error
|
|
125
|
+
/**
|
|
126
|
+
* 请求错误处理
|
|
127
|
+
* @param {*} error
|
|
128
128
|
*/
|
|
129
129
|
}, {
|
|
130
130
|
key: "_errorHandler",
|
package/lib/_util/interface.js
CHANGED
|
@@ -71,8 +71,8 @@ export var DEVICE_CODE = /*#__PURE__*/function (DEVICE_CODE) {
|
|
|
71
71
|
return DEVICE_CODE;
|
|
72
72
|
}({});
|
|
73
73
|
|
|
74
|
-
/**
|
|
75
|
-
* 管点特征枚举
|
|
74
|
+
/**
|
|
75
|
+
* 管点特征枚举
|
|
76
76
|
*/
|
|
77
77
|
export var POINT_CHARACTERISTICS = /*#__PURE__*/function (POINT_CHARACTERISTICS) {
|
|
78
78
|
POINT_CHARACTERISTICS[POINT_CHARACTERISTICS["GD_BZ"] = 1] = "GD_BZ";
|
package/lib/_util/layerConfig.js
CHANGED
|
@@ -355,10 +355,17 @@ var facilityPopup = {
|
|
|
355
355
|
// 基础信息:设施类型、设施名称、地址
|
|
356
356
|
// 设施类型
|
|
357
357
|
facilityClassStr: '泵站',
|
|
358
|
+
// // 关键参数: 额定流量(m³/s)
|
|
359
|
+
// keyParamList: [
|
|
360
|
+
// {
|
|
361
|
+
// label: '额定流量(m³/s)',
|
|
362
|
+
// value: 'totalRatedFlow',
|
|
363
|
+
// },
|
|
364
|
+
// ],
|
|
358
365
|
// 关键参数: 额定流量(m³/s)
|
|
359
366
|
keyParamList: [{
|
|
360
|
-
label: '
|
|
361
|
-
value: '
|
|
367
|
+
label: '设计规模(吨/天)',
|
|
368
|
+
value: 'designScale'
|
|
362
369
|
}],
|
|
363
370
|
// 展示所有配置因子
|
|
364
371
|
showKeyIndicatorsListAll: false,
|
package/lib/typings.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
declare module '@vtx/cs-map'
|
|
2
|
-
declare module '@vtx/utils'
|
|
3
|
-
declare module '@vtx/map-icon'
|
|
4
|
-
declare module '@ant-design/icons'
|
|
1
|
+
declare module '@vtx/cs-map'
|
|
2
|
+
declare module '@vtx/utils'
|
|
3
|
+
declare module '@vtx/map-icon'
|
|
4
|
+
declare module '@ant-design/icons'
|
package/package.json
CHANGED
|
@@ -1,102 +1,105 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "@vtx/cs-map-layer",
|
|
3
|
-
"version": "1.0.
|
|
4
|
-
"description": "React components for Vortex",
|
|
5
|
-
"license": "MIT",
|
|
6
|
-
"module": "lib/index.js",
|
|
7
|
-
"types": "lib/index.d.ts",
|
|
8
|
-
"files": [
|
|
9
|
-
"lib"
|
|
10
|
-
],
|
|
11
|
-
"scripts": {
|
|
12
|
-
"build": "father build",
|
|
13
|
-
"build:watch": "father dev",
|
|
14
|
-
"cesium:fix": "node ./scripts/cesium-fix.js",
|
|
15
|
-
"dev": "npm run cesium:fix && dumi dev",
|
|
16
|
-
"docs:build": "npm run cesium:fix && dumi build",
|
|
17
|
-
"doctor": "father doctor",
|
|
18
|
-
"lint": "npm run lint:es && npm run lint:css",
|
|
19
|
-
"lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
|
|
20
|
-
"lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
|
|
21
|
-
"
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
"
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
"
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
"
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
"
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
"@vtx/utils": "latest",
|
|
54
|
-
"
|
|
55
|
-
"
|
|
56
|
-
"
|
|
57
|
-
"
|
|
58
|
-
"
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
"@
|
|
64
|
-
"@
|
|
65
|
-
"@
|
|
66
|
-
"@
|
|
67
|
-
"@
|
|
68
|
-
"@types/
|
|
69
|
-
"@types/
|
|
70
|
-
"@
|
|
71
|
-
"@
|
|
72
|
-
"@
|
|
73
|
-
"
|
|
74
|
-
"
|
|
75
|
-
"
|
|
76
|
-
"
|
|
77
|
-
"
|
|
78
|
-
"
|
|
79
|
-
"
|
|
80
|
-
"
|
|
81
|
-
"
|
|
82
|
-
"
|
|
83
|
-
"
|
|
84
|
-
"
|
|
85
|
-
"
|
|
86
|
-
"
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
"
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
"
|
|
93
|
-
"
|
|
94
|
-
"
|
|
95
|
-
"
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
"
|
|
99
|
-
},
|
|
100
|
-
"
|
|
101
|
-
|
|
102
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"name": "@vtx/cs-map-layer",
|
|
3
|
+
"version": "1.0.19",
|
|
4
|
+
"description": "React components for Vortex",
|
|
5
|
+
"license": "MIT",
|
|
6
|
+
"module": "lib/index.js",
|
|
7
|
+
"types": "lib/index.d.ts",
|
|
8
|
+
"files": [
|
|
9
|
+
"lib"
|
|
10
|
+
],
|
|
11
|
+
"scripts": {
|
|
12
|
+
"build": "father build",
|
|
13
|
+
"build:watch": "father dev",
|
|
14
|
+
"cesium:fix": "node ./scripts/cesium-fix.js",
|
|
15
|
+
"dev": "npm run cesium:fix && dumi dev",
|
|
16
|
+
"docs:build": "npm run cesium:fix && dumi build",
|
|
17
|
+
"doctor": "father doctor",
|
|
18
|
+
"lint": "npm run lint:es && npm run lint:css",
|
|
19
|
+
"lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
|
|
20
|
+
"lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
|
|
21
|
+
"start": "npm run dev"
|
|
22
|
+
},
|
|
23
|
+
"husky": {
|
|
24
|
+
"hooks": {
|
|
25
|
+
"pre-commit": "lint-staged",
|
|
26
|
+
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
|
|
27
|
+
}
|
|
28
|
+
},
|
|
29
|
+
"commitlint": {
|
|
30
|
+
"extends": [
|
|
31
|
+
"@commitlint/config-conventional"
|
|
32
|
+
]
|
|
33
|
+
},
|
|
34
|
+
"lint-staged": {
|
|
35
|
+
"*.{md,json}": [
|
|
36
|
+
"prettier --write --no-error-on-unmatched-pattern"
|
|
37
|
+
],
|
|
38
|
+
"*.{css,less}": [
|
|
39
|
+
"stylelint --fix",
|
|
40
|
+
"prettier --write"
|
|
41
|
+
],
|
|
42
|
+
"*.{js,jsx}": [
|
|
43
|
+
"eslint --fix",
|
|
44
|
+
"prettier --write"
|
|
45
|
+
],
|
|
46
|
+
"*.{ts,tsx}": [
|
|
47
|
+
"eslint --fix",
|
|
48
|
+
"prettier --parser=typescript --write"
|
|
49
|
+
]
|
|
50
|
+
},
|
|
51
|
+
"dependencies": {
|
|
52
|
+
"@ant-design/icons-svg": "^4.4.2",
|
|
53
|
+
"@vtx/utils": "latest",
|
|
54
|
+
"ahooks": "^3.1.5",
|
|
55
|
+
"cesium": "1.90.0",
|
|
56
|
+
"classnames": "^2.5.1",
|
|
57
|
+
"lodash": "^4.17.21",
|
|
58
|
+
"moment": "^2.29.1",
|
|
59
|
+
"prop-types": "^15.8.1",
|
|
60
|
+
"qs": "^6.0.0"
|
|
61
|
+
},
|
|
62
|
+
"devDependencies": {
|
|
63
|
+
"@ant-design/icons": "4.7.0",
|
|
64
|
+
"@babel/runtime": "^7.6.3",
|
|
65
|
+
"@commitlint/cli": "^17.1.2",
|
|
66
|
+
"@commitlint/config-conventional": "^17.1.0",
|
|
67
|
+
"@turf/turf": "^6.5.0",
|
|
68
|
+
"@types/lodash": "^4.14.202",
|
|
69
|
+
"@types/prop-types": "^15.7.15",
|
|
70
|
+
"@types/qs": "^6.9.11",
|
|
71
|
+
"@types/react": "^18.0.0",
|
|
72
|
+
"@types/react-dom": "^18.0.0",
|
|
73
|
+
"@umijs/lint": "^4.0.0",
|
|
74
|
+
"@vtx/cs-map": "latest",
|
|
75
|
+
"@vtx/map-icon": "^2.0.16",
|
|
76
|
+
"antd": "4.20.5",
|
|
77
|
+
"axios": "^0.21.1",
|
|
78
|
+
"babel-plugin-import": "^1.13.8",
|
|
79
|
+
"dumi": "^2.2.13",
|
|
80
|
+
"eslint": "^8.23.0",
|
|
81
|
+
"father": "^4.1.0",
|
|
82
|
+
"husky": "^8.0.1",
|
|
83
|
+
"lint-staged": "^13.0.3",
|
|
84
|
+
"prettier": "^2.7.1",
|
|
85
|
+
"prettier-plugin-organize-imports": "^3.0.0",
|
|
86
|
+
"prettier-plugin-packagejson": "^2.2.18",
|
|
87
|
+
"react": "^18.0.0",
|
|
88
|
+
"react-dom": "^18.0.0",
|
|
89
|
+
"stylelint": "^14.9.1"
|
|
90
|
+
},
|
|
91
|
+
"peerDependencies": {
|
|
92
|
+
"@ant-design/icons": ">=4.0.0",
|
|
93
|
+
"@vtx/cs-map": ">=1.0.40",
|
|
94
|
+
"@vtx/map-icon": ">=2.0.0",
|
|
95
|
+
"antd": ">4.0.0",
|
|
96
|
+
"axios": ">=0.21.1",
|
|
97
|
+
"react": ">=16.9.0",
|
|
98
|
+
"react-dom": ">=16.9.0"
|
|
99
|
+
},
|
|
100
|
+
"publishConfig": {
|
|
101
|
+
"access": "public"
|
|
102
|
+
},
|
|
103
|
+
"authors": [],
|
|
104
|
+
"slideEffects": false
|
|
105
|
+
}
|