@zgfe/modules-interval 1.0.23-zhongyuan.10 → 1.0.23-zhongyuan.11
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/dist/esm/components/renderContent/styles/index.css +32 -32
- package/dist/esm/components/renderContent/styles/index.less +37 -37
- package/dist/esm/constants/code.js +6 -6
- package/dist/esm/modules/chart/customTooltip.js +0 -2
- package/dist/esm/modules/chart/index.css +52 -52
- package/dist/esm/modules/chart/index.less +58 -58
- package/dist/esm/modules/chart/intervalChart copy.js +0 -4
- package/dist/esm/modules/chart/intervalChart.js +2 -2
- package/dist/esm/modules/content/utils.js +12 -12
- package/dist/esm/modules/topPanel/index.js +8 -9
- package/dist/esm/modules/topPanel/styles/index.less +219 -219
- package/dist/esm/utils/formData.d.ts +1 -1
- package/dist/esm/utils/formData.js +36 -34
- package/package.json +2 -2
|
@@ -1,32 +1,32 @@
|
|
|
1
|
-
.render-content-interval-chart-container {
|
|
2
|
-
display: flex;
|
|
3
|
-
flex-direction: column;
|
|
4
|
-
align-items: center;
|
|
5
|
-
justify-content: center;
|
|
6
|
-
min-height: 300px;
|
|
7
|
-
}
|
|
8
|
-
.render-content-interval-chart-container .echarts-for-react {
|
|
9
|
-
width: 100%;
|
|
10
|
-
background: #fff;
|
|
11
|
-
border: 1px solid var(--unnamed, #ecedf0);
|
|
12
|
-
border-radius: 8px;
|
|
13
|
-
}
|
|
14
|
-
.render-content-interval-MiNone {
|
|
15
|
-
display: flex;
|
|
16
|
-
align-items: center;
|
|
17
|
-
justify-content: center;
|
|
18
|
-
width: 100%;
|
|
19
|
-
height: 368px;
|
|
20
|
-
padding: 24px 16px;
|
|
21
|
-
border: 1px solid #ecedf0;
|
|
22
|
-
border-radius: 8px;
|
|
23
|
-
}
|
|
24
|
-
.render-content-interval-spin-container {
|
|
25
|
-
display: flex !important;
|
|
26
|
-
align-items: center;
|
|
27
|
-
justify-content: center;
|
|
28
|
-
min-height: 300px;
|
|
29
|
-
}
|
|
30
|
-
.render-content-interval-spin-container .biz-loading-wrapper {
|
|
31
|
-
width: 100%;
|
|
32
|
-
}
|
|
1
|
+
.render-content-interval-chart-container {
|
|
2
|
+
display: flex;
|
|
3
|
+
flex-direction: column;
|
|
4
|
+
align-items: center;
|
|
5
|
+
justify-content: center;
|
|
6
|
+
min-height: 300px;
|
|
7
|
+
}
|
|
8
|
+
.render-content-interval-chart-container .echarts-for-react {
|
|
9
|
+
width: 100%;
|
|
10
|
+
background: #fff;
|
|
11
|
+
border: 1px solid var(--unnamed, #ecedf0);
|
|
12
|
+
border-radius: 8px;
|
|
13
|
+
}
|
|
14
|
+
.render-content-interval-MiNone {
|
|
15
|
+
display: flex;
|
|
16
|
+
align-items: center;
|
|
17
|
+
justify-content: center;
|
|
18
|
+
width: 100%;
|
|
19
|
+
height: 368px;
|
|
20
|
+
padding: 24px 16px;
|
|
21
|
+
border: 1px solid #ecedf0;
|
|
22
|
+
border-radius: 8px;
|
|
23
|
+
}
|
|
24
|
+
.render-content-interval-spin-container {
|
|
25
|
+
display: flex !important;
|
|
26
|
+
align-items: center;
|
|
27
|
+
justify-content: center;
|
|
28
|
+
min-height: 300px;
|
|
29
|
+
}
|
|
30
|
+
.render-content-interval-spin-container .biz-loading-wrapper {
|
|
31
|
+
width: 100%;
|
|
32
|
+
}
|
|
@@ -1,37 +1,37 @@
|
|
|
1
|
-
.render-content-interval {
|
|
2
|
-
&-chart-container {
|
|
3
|
-
display: flex;
|
|
4
|
-
flex-direction: column;
|
|
5
|
-
align-items: center;
|
|
6
|
-
justify-content: center;
|
|
7
|
-
min-height: 300px;
|
|
8
|
-
|
|
9
|
-
.echarts-for-react {
|
|
10
|
-
width: 100%;
|
|
11
|
-
background: #fff;
|
|
12
|
-
border: 1px solid var(--unnamed, #ecedf0);
|
|
13
|
-
border-radius: 8px;
|
|
14
|
-
}
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
&-MiNone {
|
|
18
|
-
display: flex;
|
|
19
|
-
align-items: center;
|
|
20
|
-
justify-content: center;
|
|
21
|
-
width: 100%;
|
|
22
|
-
height: 368px;
|
|
23
|
-
padding: 24px 16px;
|
|
24
|
-
border: 1px solid #ecedf0;
|
|
25
|
-
border-radius: 8px;
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
&-spin-container {
|
|
29
|
-
display: flex !important;
|
|
30
|
-
align-items: center;
|
|
31
|
-
justify-content: center;
|
|
32
|
-
min-height: 300px;
|
|
33
|
-
.biz-loading-wrapper {
|
|
34
|
-
width: 100%;
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
}
|
|
1
|
+
.render-content-interval {
|
|
2
|
+
&-chart-container {
|
|
3
|
+
display: flex;
|
|
4
|
+
flex-direction: column;
|
|
5
|
+
align-items: center;
|
|
6
|
+
justify-content: center;
|
|
7
|
+
min-height: 300px;
|
|
8
|
+
|
|
9
|
+
.echarts-for-react {
|
|
10
|
+
width: 100%;
|
|
11
|
+
background: #fff;
|
|
12
|
+
border: 1px solid var(--unnamed, #ecedf0);
|
|
13
|
+
border-radius: 8px;
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
&-MiNone {
|
|
18
|
+
display: flex;
|
|
19
|
+
align-items: center;
|
|
20
|
+
justify-content: center;
|
|
21
|
+
width: 100%;
|
|
22
|
+
height: 368px;
|
|
23
|
+
padding: 24px 16px;
|
|
24
|
+
border: 1px solid #ecedf0;
|
|
25
|
+
border-radius: 8px;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
&-spin-container {
|
|
29
|
+
display: flex !important;
|
|
30
|
+
align-items: center;
|
|
31
|
+
justify-content: center;
|
|
32
|
+
min-height: 300px;
|
|
33
|
+
.biz-loading-wrapper {
|
|
34
|
+
width: 100%;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @description 异常状态码
|
|
1
|
+
/**
|
|
2
|
+
* @description 异常状态码
|
|
3
3
|
*/
|
|
4
4
|
export var ERROR_RESPONESE_CODE = {
|
|
5
|
-
/**
|
|
6
|
-
* @description 刷新失败
|
|
5
|
+
/**
|
|
6
|
+
* @description 刷新失败
|
|
7
7
|
*/
|
|
8
8
|
REFRESH_FAIL: '100080',
|
|
9
|
-
/**
|
|
10
|
-
* @description 用户群或标签查询异常
|
|
9
|
+
/**
|
|
10
|
+
* @description 用户群或标签查询异常
|
|
11
11
|
*/
|
|
12
12
|
EXCEPTION: '100081'
|
|
13
13
|
};
|
|
@@ -3,8 +3,6 @@ import "./index.less";
|
|
|
3
3
|
var CustomTooltip = function CustomTooltip(_ref) {
|
|
4
4
|
var payload = _ref.payload,
|
|
5
5
|
series = _ref.series;
|
|
6
|
-
console.log(payload, series, 'payload, series');
|
|
7
|
-
|
|
8
6
|
// 初始化，判断showList是否有值，如果没值，取结果的前10条
|
|
9
7
|
useEffect(function () {}, []);
|
|
10
8
|
function convertToHMS(seconds) {
|
|
@@ -1,52 +1,52 @@
|
|
|
1
|
-
.custom-tooltip-chart {
|
|
2
|
-
display: inline-block;
|
|
3
|
-
flex-direction: column;
|
|
4
|
-
flex-shrink: 0;
|
|
5
|
-
gap: 4px;
|
|
6
|
-
align-items: flex-start;
|
|
7
|
-
width: 146px;
|
|
8
|
-
height: 100%;
|
|
9
|
-
padding: 8px;
|
|
10
|
-
color: var(--io-n, #021429);
|
|
11
|
-
font-weight: 500;
|
|
12
|
-
font-size: 12px;
|
|
13
|
-
font-style: normal;
|
|
14
|
-
border-radius: 10px;
|
|
15
|
-
box-shadow: 0px 4px 10px 0px #0000001a;
|
|
16
|
-
}
|
|
17
|
-
.custom-tooltip-chart .custom-tooltip-name {
|
|
18
|
-
color: var(--io-n, #021429);
|
|
19
|
-
font-weight: 500;
|
|
20
|
-
font-size: 12px;
|
|
21
|
-
font-family: PingFang SC;
|
|
22
|
-
font-style: normal;
|
|
23
|
-
line-height: normal;
|
|
24
|
-
}
|
|
25
|
-
.custom-tooltip-chart .custom-tooltip-div {
|
|
26
|
-
display: flex;
|
|
27
|
-
flex-direction: column;
|
|
28
|
-
gap: 6px;
|
|
29
|
-
width: 100%;
|
|
30
|
-
height: 100%;
|
|
31
|
-
padding: 0px 8px;
|
|
32
|
-
background: #fff;
|
|
33
|
-
border-radius: 4px;
|
|
34
|
-
box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.04);
|
|
35
|
-
}
|
|
36
|
-
.custom-tooltip-chart .custom-tooltip-div .tooltip-span {
|
|
37
|
-
display: block;
|
|
38
|
-
color: var(--3, #5f6085);
|
|
39
|
-
font-weight: 400;
|
|
40
|
-
font-size: 12px;
|
|
41
|
-
font-family: PingFang SC;
|
|
42
|
-
font-style: normal;
|
|
43
|
-
line-height: normal;
|
|
44
|
-
}
|
|
45
|
-
.custom-tooltip-chart .custom-tooltip-div > div {
|
|
46
|
-
display: flex;
|
|
47
|
-
align-items: center;
|
|
48
|
-
justify-content: space-between;
|
|
49
|
-
}
|
|
50
|
-
.custom-tooltip-chart .custom-tooltip-div .tooltip-marker {
|
|
51
|
-
justify-content: flex-start;
|
|
52
|
-
}
|
|
1
|
+
.custom-tooltip-chart {
|
|
2
|
+
display: inline-block;
|
|
3
|
+
flex-direction: column;
|
|
4
|
+
flex-shrink: 0;
|
|
5
|
+
gap: 4px;
|
|
6
|
+
align-items: flex-start;
|
|
7
|
+
width: 146px;
|
|
8
|
+
height: 100%;
|
|
9
|
+
padding: 8px;
|
|
10
|
+
color: var(--io-n, #021429);
|
|
11
|
+
font-weight: 500;
|
|
12
|
+
font-size: 12px;
|
|
13
|
+
font-style: normal;
|
|
14
|
+
border-radius: 10px;
|
|
15
|
+
box-shadow: 0px 4px 10px 0px #0000001a;
|
|
16
|
+
}
|
|
17
|
+
.custom-tooltip-chart .custom-tooltip-name {
|
|
18
|
+
color: var(--io-n, #021429);
|
|
19
|
+
font-weight: 500;
|
|
20
|
+
font-size: 12px;
|
|
21
|
+
font-family: PingFang SC;
|
|
22
|
+
font-style: normal;
|
|
23
|
+
line-height: normal;
|
|
24
|
+
}
|
|
25
|
+
.custom-tooltip-chart .custom-tooltip-div {
|
|
26
|
+
display: flex;
|
|
27
|
+
flex-direction: column;
|
|
28
|
+
gap: 6px;
|
|
29
|
+
width: 100%;
|
|
30
|
+
height: 100%;
|
|
31
|
+
padding: 0px 8px;
|
|
32
|
+
background: #fff;
|
|
33
|
+
border-radius: 4px;
|
|
34
|
+
box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.04);
|
|
35
|
+
}
|
|
36
|
+
.custom-tooltip-chart .custom-tooltip-div .tooltip-span {
|
|
37
|
+
display: block;
|
|
38
|
+
color: var(--3, #5f6085);
|
|
39
|
+
font-weight: 400;
|
|
40
|
+
font-size: 12px;
|
|
41
|
+
font-family: PingFang SC;
|
|
42
|
+
font-style: normal;
|
|
43
|
+
line-height: normal;
|
|
44
|
+
}
|
|
45
|
+
.custom-tooltip-chart .custom-tooltip-div > div {
|
|
46
|
+
display: flex;
|
|
47
|
+
align-items: center;
|
|
48
|
+
justify-content: space-between;
|
|
49
|
+
}
|
|
50
|
+
.custom-tooltip-chart .custom-tooltip-div .tooltip-marker {
|
|
51
|
+
justify-content: flex-start;
|
|
52
|
+
}
|
|
@@ -1,58 +1,58 @@
|
|
|
1
|
-
.custom-tooltip-chart {
|
|
2
|
-
display: inline-block;
|
|
3
|
-
flex-direction: column;
|
|
4
|
-
flex-shrink: 0;
|
|
5
|
-
gap: 4px;
|
|
6
|
-
align-items: flex-start;
|
|
7
|
-
width: 146px;
|
|
8
|
-
height: 100%;
|
|
9
|
-
padding: 8px;
|
|
10
|
-
color: var(--io-n, #021429);
|
|
11
|
-
font-weight: 500;
|
|
12
|
-
font-size: 12px;
|
|
13
|
-
font-style: normal;
|
|
14
|
-
// background: rgba(250, 251, 253, 0.8);
|
|
15
|
-
border-radius: 10px;
|
|
16
|
-
box-shadow: 0px 4px 10px 0px #0000001a;
|
|
17
|
-
|
|
18
|
-
.custom-tooltip-name {
|
|
19
|
-
color: var(--io-n, #021429);
|
|
20
|
-
font-weight: 500;
|
|
21
|
-
font-size: 12px;
|
|
22
|
-
font-family: PingFang SC;
|
|
23
|
-
font-style: normal;
|
|
24
|
-
line-height: normal;
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
.custom-tooltip-div {
|
|
28
|
-
display: flex;
|
|
29
|
-
flex-direction: column;
|
|
30
|
-
gap: 6px;
|
|
31
|
-
width: 100%;
|
|
32
|
-
height: 100%;
|
|
33
|
-
padding: 0px 8px;
|
|
34
|
-
background: #fff;
|
|
35
|
-
border-radius: 4px;
|
|
36
|
-
box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.04);
|
|
37
|
-
|
|
38
|
-
.tooltip-span {
|
|
39
|
-
display: block;
|
|
40
|
-
color: var(--3, #5f6085);
|
|
41
|
-
font-weight: 400;
|
|
42
|
-
font-size: 12px;
|
|
43
|
-
font-family: PingFang SC;
|
|
44
|
-
font-style: normal;
|
|
45
|
-
line-height: normal;
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
> div {
|
|
49
|
-
display: flex;
|
|
50
|
-
align-items: center;
|
|
51
|
-
justify-content: space-between;
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
.tooltip-marker {
|
|
55
|
-
justify-content: flex-start;
|
|
56
|
-
}
|
|
57
|
-
}
|
|
58
|
-
}
|
|
1
|
+
.custom-tooltip-chart {
|
|
2
|
+
display: inline-block;
|
|
3
|
+
flex-direction: column;
|
|
4
|
+
flex-shrink: 0;
|
|
5
|
+
gap: 4px;
|
|
6
|
+
align-items: flex-start;
|
|
7
|
+
width: 146px;
|
|
8
|
+
height: 100%;
|
|
9
|
+
padding: 8px;
|
|
10
|
+
color: var(--io-n, #021429);
|
|
11
|
+
font-weight: 500;
|
|
12
|
+
font-size: 12px;
|
|
13
|
+
font-style: normal;
|
|
14
|
+
// background: rgba(250, 251, 253, 0.8);
|
|
15
|
+
border-radius: 10px;
|
|
16
|
+
box-shadow: 0px 4px 10px 0px #0000001a;
|
|
17
|
+
|
|
18
|
+
.custom-tooltip-name {
|
|
19
|
+
color: var(--io-n, #021429);
|
|
20
|
+
font-weight: 500;
|
|
21
|
+
font-size: 12px;
|
|
22
|
+
font-family: PingFang SC;
|
|
23
|
+
font-style: normal;
|
|
24
|
+
line-height: normal;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
.custom-tooltip-div {
|
|
28
|
+
display: flex;
|
|
29
|
+
flex-direction: column;
|
|
30
|
+
gap: 6px;
|
|
31
|
+
width: 100%;
|
|
32
|
+
height: 100%;
|
|
33
|
+
padding: 0px 8px;
|
|
34
|
+
background: #fff;
|
|
35
|
+
border-radius: 4px;
|
|
36
|
+
box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.04);
|
|
37
|
+
|
|
38
|
+
.tooltip-span {
|
|
39
|
+
display: block;
|
|
40
|
+
color: var(--3, #5f6085);
|
|
41
|
+
font-weight: 400;
|
|
42
|
+
font-size: 12px;
|
|
43
|
+
font-family: PingFang SC;
|
|
44
|
+
font-style: normal;
|
|
45
|
+
line-height: normal;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
> div {
|
|
49
|
+
display: flex;
|
|
50
|
+
align-items: center;
|
|
51
|
+
justify-content: space-between;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
.tooltip-marker {
|
|
55
|
+
justify-content: flex-start;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
}
|
|
@@ -226,7 +226,6 @@ var IntervalChart = function IntervalChart(props) {
|
|
|
226
226
|
echartsInstance = _useState4[0],
|
|
227
227
|
setEchartsInstance = _useState4[1];
|
|
228
228
|
useEffect(function () {
|
|
229
|
-
console.log(chartRef.current.getEchartsInstance(), 'chartRef.current.getEchartsInstance()');
|
|
230
229
|
setEchartsInstance(chartRef.current.getEchartsInstance());
|
|
231
230
|
}, []);
|
|
232
231
|
return /*#__PURE__*/React.createElement(ReactECharts, {
|
|
@@ -241,10 +240,7 @@ var IntervalChart = function IntervalChart(props) {
|
|
|
241
240
|
return updateCollapseButton(params);
|
|
242
241
|
},
|
|
243
242
|
mousemove: function mousemove(params) {
|
|
244
|
-
console.log('鼠标进入');
|
|
245
243
|
var pointInPixel = [params.offsetX, params.offsetY];
|
|
246
|
-
console.log(echartsInstance, 'echartsInstanceechartsInstance');
|
|
247
|
-
|
|
248
244
|
// 检查是否在网格区域内
|
|
249
245
|
if (echartsInstance && echartsInstance.containPixel('grid', pointInPixel)) {
|
|
250
246
|
var pointInGrid = echartsInstance && echartsInstance.convertFromPixel({
|
|
@@ -36,9 +36,9 @@ var IntervalChart = function IntervalChart(props) {
|
|
|
36
36
|
setChartInstance(aDom);
|
|
37
37
|
}, []);
|
|
38
38
|
useEffect(function () {
|
|
39
|
-
var _props$showList, _seriesData$series;
|
|
39
|
+
var _props$showList$appDa, _props$showList, _props$dataSource, _seriesData$series;
|
|
40
40
|
// chartRef && chartRef.current.getEchartsInstance().clear();
|
|
41
|
-
var seriesData = props === null || props === void 0 ? void 0 : (_props$showList = props.showList) === null || _props$showList === void 0 ? void 0 : _props$showList.appData;
|
|
41
|
+
var seriesData = (_props$showList$appDa = props === null || props === void 0 ? void 0 : (_props$showList = props.showList) === null || _props$showList === void 0 ? void 0 : _props$showList.appData) !== null && _props$showList$appDa !== void 0 ? _props$showList$appDa : props === null || props === void 0 ? void 0 : (_props$dataSource = props.dataSource) === null || _props$dataSource === void 0 ? void 0 : _props$dataSource.appData;
|
|
42
42
|
var params = props === null || props === void 0 ? void 0 : props.params;
|
|
43
43
|
var eCharts = {
|
|
44
44
|
tooltip: {
|
|
@@ -4,30 +4,30 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
|
|
|
4
4
|
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
5
5
|
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
6
6
|
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
7
|
-
/**
|
|
8
|
-
* 判断当前细分属性是否为”城市“
|
|
9
|
-
* @param name 属性名称
|
|
10
|
-
* @returns true标识为：是城市
|
|
7
|
+
/**
|
|
8
|
+
* 判断当前细分属性是否为”城市“
|
|
9
|
+
* @param name 属性名称
|
|
10
|
+
* @returns true标识为：是城市
|
|
11
11
|
*/
|
|
12
12
|
export var judgeIsCity = function judgeIsCity(name) {
|
|
13
13
|
var areaData = ['current_city', 'city'];
|
|
14
14
|
return name && areaData.indexOf(name) !== -1 ? true : false;
|
|
15
15
|
};
|
|
16
16
|
|
|
17
|
-
/**
|
|
18
|
-
* 判断当前细分属性，地图是否可选
|
|
19
|
-
* @param name 属性名称
|
|
20
|
-
* @returns true标识为：地图可选
|
|
17
|
+
/**
|
|
18
|
+
* 判断当前细分属性，地图是否可选
|
|
19
|
+
* @param name 属性名称
|
|
20
|
+
* @returns true标识为：地图可选
|
|
21
21
|
*/
|
|
22
22
|
export var judgeIsArea = function judgeIsArea(name) {
|
|
23
23
|
var areaData = ['current_area', 'current_city', 'area', 'city'];
|
|
24
24
|
return name && areaData.indexOf(name) !== -1 ? true : false;
|
|
25
25
|
};
|
|
26
26
|
|
|
27
|
-
/**
|
|
28
|
-
* 获取当前属性的全部数据
|
|
29
|
-
* @param param 属性的部分数据
|
|
30
|
-
* @returns 属性的全部数据
|
|
27
|
+
/**
|
|
28
|
+
* 获取当前属性的全部数据
|
|
29
|
+
* @param param 属性的部分数据
|
|
30
|
+
* @returns 属性的全部数据
|
|
31
31
|
*/
|
|
32
32
|
export var getValue = function getValue(param, eventGroupList, eventEnvList, userPropList) {
|
|
33
33
|
var res = undefined;
|
|
@@ -73,13 +73,12 @@ var TopPanel = function TopPanel(props) {
|
|
|
73
73
|
}, [formRef.current, propsDefaultValue]);
|
|
74
74
|
function onSearch(values) {
|
|
75
75
|
if (props.onChange) {
|
|
76
|
-
var _values$analysisSubje, _values$analysisSubje2, _values$analysisSubje3, _values$analysisSubje4;
|
|
77
76
|
props.onChange(_objectSpread(_objectSpread({}, values), {}, {
|
|
78
|
-
analysisSubject: values
|
|
79
|
-
subjectId: values
|
|
80
|
-
subjectName: values
|
|
81
|
-
subjectAlias: values
|
|
82
|
-
unit: values
|
|
77
|
+
analysisSubject: values.analysisSubject ? {
|
|
78
|
+
subjectId: values.analysisSubject.id,
|
|
79
|
+
subjectName: values.analysisSubject.subjectName,
|
|
80
|
+
subjectAlias: values.analysisSubject.subjectAlias,
|
|
81
|
+
unit: values.analysisSubject.unit
|
|
83
82
|
} : undefined
|
|
84
83
|
}), true);
|
|
85
84
|
}
|
|
@@ -116,12 +115,12 @@ var TopPanel = function TopPanel(props) {
|
|
|
116
115
|
return;
|
|
117
116
|
}
|
|
118
117
|
setInited(false);
|
|
119
|
-
if (defaultValue
|
|
118
|
+
if (defaultValue.analysisSubject) {
|
|
120
119
|
setAnalysisType('eventProp');
|
|
121
120
|
} else {
|
|
122
121
|
setAnalysisType('user');
|
|
123
122
|
}
|
|
124
|
-
if (defaultValue
|
|
123
|
+
if (defaultValue.analysisSubject) {
|
|
125
124
|
setCurrentSubject(subjectList.find(function (item) {
|
|
126
125
|
var _defaultValue$analysi;
|
|
127
126
|
return item.id === (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$analysi = defaultValue.analysisSubject) === null || _defaultValue$analysi === void 0 ? void 0 : _defaultValue$analysi.subjectId);
|
|
@@ -175,7 +174,7 @@ var TopPanel = function TopPanel(props) {
|
|
|
175
174
|
}, /*#__PURE__*/React.createElement(IconFont, {
|
|
176
175
|
type: "bangzhu",
|
|
177
176
|
onClick: function onClick() {
|
|
178
|
-
return window.open(
|
|
177
|
+
return window.open("".concat(location.origin, "/help/intro"), '_blank');
|
|
179
178
|
}
|
|
180
179
|
}))),
|
|
181
180
|
className: "panel-form-interval-item"
|
|
@@ -1,219 +1,219 @@
|
|
|
1
|
-
@import '~@zgfe/business-lib/es/assets/styles/inner.less';
|
|
2
|
-
|
|
3
|
-
.top-panel-interval {
|
|
4
|
-
&-form-botton-box {
|
|
5
|
-
display: flex;
|
|
6
|
-
justify-content: flex-end;
|
|
7
|
-
margin-top: 24px;
|
|
8
|
-
margin-right: 24px;
|
|
9
|
-
|
|
10
|
-
> :nth-child(1) {
|
|
11
|
-
margin-right: 16px;
|
|
12
|
-
color: #fff;
|
|
13
|
-
background-color: #29bd52;
|
|
14
|
-
border-color: #29bd52;
|
|
15
|
-
}
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
&-label-hasIcon {
|
|
19
|
-
.bsicon {
|
|
20
|
-
cursor: pointer;
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
.panel-form-interval {
|
|
26
|
-
.ant-form-item-explain-error {
|
|
27
|
-
margin-left: 24px;
|
|
28
|
-
}
|
|
29
|
-
&-item {
|
|
30
|
-
.ant-form-item-label {
|
|
31
|
-
padding-left: 24px !important;
|
|
32
|
-
font-weight: 500;
|
|
33
|
-
}
|
|
34
|
-
.ant-form-item-control-input-content {
|
|
35
|
-
height: 40px;
|
|
36
|
-
padding: 0 24px !important;
|
|
37
|
-
line-height: 40px !important;
|
|
38
|
-
.biz-select-handle {
|
|
39
|
-
display: inline-block;
|
|
40
|
-
width: 208px;
|
|
41
|
-
}
|
|
42
|
-
span.ant-radio + * {
|
|
43
|
-
padding-right: 40px;
|
|
44
|
-
padding-left: 12px;
|
|
45
|
-
}
|
|
46
|
-
&:hover {
|
|
47
|
-
background-color: #e7f3fe;
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
.interval-item {
|
|
52
|
-
margin-top: -2px;
|
|
53
|
-
.ant-space-vertical {
|
|
54
|
-
gap: 0px !important;
|
|
55
|
-
width: 100%;
|
|
56
|
-
.ant-space-item:nth-child(1) {
|
|
57
|
-
padding: 0 12px;
|
|
58
|
-
}
|
|
59
|
-
|
|
60
|
-
.ant-space-item:nth-child(2) {
|
|
61
|
-
display: flex;
|
|
62
|
-
align-items: center;
|
|
63
|
-
height: 42px;
|
|
64
|
-
margin-top: 4px;
|
|
65
|
-
padding: 0 12px;
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
.ant-space-item:nth-child(2):hover {
|
|
69
|
-
background-color: #e7f3fe;
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
|
|
74
|
-
.biz-user-group-header {
|
|
75
|
-
padding: 0;
|
|
76
|
-
background-color: #fff;
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
.space-item {
|
|
80
|
-
.ant-space-item {
|
|
81
|
-
.biz-user-group {
|
|
82
|
-
width: 100%;
|
|
83
|
-
min-width: 208px;
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
|
|
87
|
-
.ant-space-horizontal .ant-space-item:nth-child(2) .tianjia {
|
|
88
|
-
display: none;
|
|
89
|
-
}
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
.collapseRefs {
|
|
93
|
-
.ant-form-item {
|
|
94
|
-
margin-bottom: 16px;
|
|
95
|
-
}
|
|
96
|
-
|
|
97
|
-
.ant-form-item-control-input {
|
|
98
|
-
display: flex;
|
|
99
|
-
align-items: center;
|
|
100
|
-
}
|
|
101
|
-
|
|
102
|
-
.ant-form-item-label {
|
|
103
|
-
padding-left: 24px;
|
|
104
|
-
font-weight: 500;
|
|
105
|
-
}
|
|
106
|
-
|
|
107
|
-
.interval-box {
|
|
108
|
-
> div:nth-child(1) {
|
|
109
|
-
padding: 4px 24px;
|
|
110
|
-
}
|
|
111
|
-
|
|
112
|
-
> div:nth-child(1):hover {
|
|
113
|
-
background-color: #e7f3fe;
|
|
114
|
-
}
|
|
115
|
-
|
|
116
|
-
.biz-attr-condition-group-handle {
|
|
117
|
-
margin-right: 0;
|
|
118
|
-
margin-left: 32px;
|
|
119
|
-
}
|
|
120
|
-
|
|
121
|
-
.biz-attr-condition-group-container {
|
|
122
|
-
gap: 0px !important;
|
|
123
|
-
}
|
|
124
|
-
|
|
125
|
-
.biz-attr-condition-group-container-item {
|
|
126
|
-
max-width: calc(100% + 32px) !important;
|
|
127
|
-
margin-top: 4px;
|
|
128
|
-
padding: 4px 56px;
|
|
129
|
-
.ant-space-item {
|
|
130
|
-
width: auto;
|
|
131
|
-
max-width: auto;
|
|
132
|
-
margin-left: 0px;
|
|
133
|
-
padding: 0;
|
|
134
|
-
}
|
|
135
|
-
}
|
|
136
|
-
|
|
137
|
-
.ant-space-item:hover {
|
|
138
|
-
background-color: #e7f3fe;
|
|
139
|
-
}
|
|
140
|
-
}
|
|
141
|
-
|
|
142
|
-
.dimension-interval {
|
|
143
|
-
.ant-form-item-control-input {
|
|
144
|
-
padding: 4px 24px;
|
|
145
|
-
}
|
|
146
|
-
|
|
147
|
-
.ant-form-item-control-input:hover {
|
|
148
|
-
background-color: #e7f3fe;
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
|
-
}
|
|
152
|
-
|
|
153
|
-
.biz-event-select {
|
|
154
|
-
width: 208px;
|
|
155
|
-
}
|
|
156
|
-
|
|
157
|
-
> .ant-form-item {
|
|
158
|
-
margin-bottom: 16px;
|
|
159
|
-
.biz-user-group-val {
|
|
160
|
-
color: #021429;
|
|
161
|
-
}
|
|
162
|
-
}
|
|
163
|
-
|
|
164
|
-
.associated {
|
|
165
|
-
margin-top: -10px;
|
|
166
|
-
margin-bottom: 12px;
|
|
167
|
-
|
|
168
|
-
.qingchu {
|
|
169
|
-
color: #9aa1a9;
|
|
170
|
-
}
|
|
171
|
-
|
|
172
|
-
.qingchu:hover {
|
|
173
|
-
color: @error-color;
|
|
174
|
-
}
|
|
175
|
-
|
|
176
|
-
.ant-form-item-control-input {
|
|
177
|
-
padding: 4px 24px;
|
|
178
|
-
|
|
179
|
-
.ant-form-item-control-input {
|
|
180
|
-
padding: 0;
|
|
181
|
-
}
|
|
182
|
-
|
|
183
|
-
.ant-form-item {
|
|
184
|
-
margin-bottom: 0;
|
|
185
|
-
}
|
|
186
|
-
}
|
|
187
|
-
|
|
188
|
-
.ant-form-item-control-input:hover {
|
|
189
|
-
background-color: #e7f3fe;
|
|
190
|
-
}
|
|
191
|
-
|
|
192
|
-
.associated-link {
|
|
193
|
-
display: block;
|
|
194
|
-
line-height: 32px;
|
|
195
|
-
}
|
|
196
|
-
|
|
197
|
-
.ant-form-item-row {
|
|
198
|
-
flex-direction: inherit;
|
|
199
|
-
}
|
|
200
|
-
|
|
201
|
-
.ant-form-item-control-input-content {
|
|
202
|
-
display: flex;
|
|
203
|
-
gap: 12px;
|
|
204
|
-
}
|
|
205
|
-
|
|
206
|
-
.associated-label {
|
|
207
|
-
color: var(--3, #5f6085);
|
|
208
|
-
font-weight: 400;
|
|
209
|
-
font-size: 14px;
|
|
210
|
-
font-family: PingFang SC;
|
|
211
|
-
font-style: normal;
|
|
212
|
-
line-height: 32px;
|
|
213
|
-
text-align: right;
|
|
214
|
-
}
|
|
215
|
-
.ant-form-item-explain-error {
|
|
216
|
-
margin-left: 0 !important;
|
|
217
|
-
}
|
|
218
|
-
}
|
|
219
|
-
}
|
|
1
|
+
@import '~@zgfe/business-lib/es/assets/styles/inner.less';
|
|
2
|
+
|
|
3
|
+
.top-panel-interval {
|
|
4
|
+
&-form-botton-box {
|
|
5
|
+
display: flex;
|
|
6
|
+
justify-content: flex-end;
|
|
7
|
+
margin-top: 24px;
|
|
8
|
+
margin-right: 24px;
|
|
9
|
+
|
|
10
|
+
> :nth-child(1) {
|
|
11
|
+
margin-right: 16px;
|
|
12
|
+
color: #fff;
|
|
13
|
+
background-color: #29bd52;
|
|
14
|
+
border-color: #29bd52;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
&-label-hasIcon {
|
|
19
|
+
.bsicon {
|
|
20
|
+
cursor: pointer;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
.panel-form-interval {
|
|
26
|
+
.ant-form-item-explain-error {
|
|
27
|
+
margin-left: 24px;
|
|
28
|
+
}
|
|
29
|
+
&-item {
|
|
30
|
+
.ant-form-item-label {
|
|
31
|
+
padding-left: 24px !important;
|
|
32
|
+
font-weight: 500;
|
|
33
|
+
}
|
|
34
|
+
.ant-form-item-control-input-content {
|
|
35
|
+
height: 40px;
|
|
36
|
+
padding: 0 24px !important;
|
|
37
|
+
line-height: 40px !important;
|
|
38
|
+
.biz-select-handle {
|
|
39
|
+
display: inline-block;
|
|
40
|
+
width: 208px;
|
|
41
|
+
}
|
|
42
|
+
span.ant-radio + * {
|
|
43
|
+
padding-right: 40px;
|
|
44
|
+
padding-left: 12px;
|
|
45
|
+
}
|
|
46
|
+
&:hover {
|
|
47
|
+
background-color: #e7f3fe;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
.interval-item {
|
|
52
|
+
margin-top: -2px;
|
|
53
|
+
.ant-space-vertical {
|
|
54
|
+
gap: 0px !important;
|
|
55
|
+
width: 100%;
|
|
56
|
+
.ant-space-item:nth-child(1) {
|
|
57
|
+
padding: 0 12px;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
.ant-space-item:nth-child(2) {
|
|
61
|
+
display: flex;
|
|
62
|
+
align-items: center;
|
|
63
|
+
height: 42px;
|
|
64
|
+
margin-top: 4px;
|
|
65
|
+
padding: 0 12px;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
.ant-space-item:nth-child(2):hover {
|
|
69
|
+
background-color: #e7f3fe;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
.biz-user-group-header {
|
|
75
|
+
padding: 0;
|
|
76
|
+
background-color: #fff;
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
.space-item {
|
|
80
|
+
.ant-space-item {
|
|
81
|
+
.biz-user-group {
|
|
82
|
+
width: 100%;
|
|
83
|
+
min-width: 208px;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
.ant-space-horizontal .ant-space-item:nth-child(2) .tianjia {
|
|
88
|
+
display: none;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
.collapseRefs {
|
|
93
|
+
.ant-form-item {
|
|
94
|
+
margin-bottom: 16px;
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
.ant-form-item-control-input {
|
|
98
|
+
display: flex;
|
|
99
|
+
align-items: center;
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
.ant-form-item-label {
|
|
103
|
+
padding-left: 24px;
|
|
104
|
+
font-weight: 500;
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
.interval-box {
|
|
108
|
+
> div:nth-child(1) {
|
|
109
|
+
padding: 4px 24px;
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
> div:nth-child(1):hover {
|
|
113
|
+
background-color: #e7f3fe;
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
.biz-attr-condition-group-handle {
|
|
117
|
+
margin-right: 0;
|
|
118
|
+
margin-left: 32px;
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
.biz-attr-condition-group-container {
|
|
122
|
+
gap: 0px !important;
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
.biz-attr-condition-group-container-item {
|
|
126
|
+
max-width: calc(100% + 32px) !important;
|
|
127
|
+
margin-top: 4px;
|
|
128
|
+
padding: 4px 56px;
|
|
129
|
+
.ant-space-item {
|
|
130
|
+
width: auto;
|
|
131
|
+
max-width: auto;
|
|
132
|
+
margin-left: 0px;
|
|
133
|
+
padding: 0;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
.ant-space-item:hover {
|
|
138
|
+
background-color: #e7f3fe;
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
.dimension-interval {
|
|
143
|
+
.ant-form-item-control-input {
|
|
144
|
+
padding: 4px 24px;
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
.ant-form-item-control-input:hover {
|
|
148
|
+
background-color: #e7f3fe;
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
.biz-event-select {
|
|
154
|
+
width: 208px;
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
> .ant-form-item {
|
|
158
|
+
margin-bottom: 16px;
|
|
159
|
+
.biz-user-group-val {
|
|
160
|
+
color: #021429;
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
.associated {
|
|
165
|
+
margin-top: -10px;
|
|
166
|
+
margin-bottom: 12px;
|
|
167
|
+
|
|
168
|
+
.qingchu {
|
|
169
|
+
color: #9aa1a9;
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
.qingchu:hover {
|
|
173
|
+
color: @error-color;
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
.ant-form-item-control-input {
|
|
177
|
+
padding: 4px 24px;
|
|
178
|
+
|
|
179
|
+
.ant-form-item-control-input {
|
|
180
|
+
padding: 0;
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
.ant-form-item {
|
|
184
|
+
margin-bottom: 0;
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
.ant-form-item-control-input:hover {
|
|
189
|
+
background-color: #e7f3fe;
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
.associated-link {
|
|
193
|
+
display: block;
|
|
194
|
+
line-height: 32px;
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
.ant-form-item-row {
|
|
198
|
+
flex-direction: inherit;
|
|
199
|
+
}
|
|
200
|
+
|
|
201
|
+
.ant-form-item-control-input-content {
|
|
202
|
+
display: flex;
|
|
203
|
+
gap: 12px;
|
|
204
|
+
}
|
|
205
|
+
|
|
206
|
+
.associated-label {
|
|
207
|
+
color: var(--3, #5f6085);
|
|
208
|
+
font-weight: 400;
|
|
209
|
+
font-size: 14px;
|
|
210
|
+
font-family: PingFang SC;
|
|
211
|
+
font-style: normal;
|
|
212
|
+
line-height: 32px;
|
|
213
|
+
text-align: right;
|
|
214
|
+
}
|
|
215
|
+
.ant-form-item-explain-error {
|
|
216
|
+
margin-left: 0 !important;
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
}
|
|
@@ -77,7 +77,7 @@ type ChartData = {
|
|
|
77
77
|
xAxis?: string[];
|
|
78
78
|
};
|
|
79
79
|
};
|
|
80
|
-
export declare function convertDateArray(params: SearchValue | undefined, dateArray: string[]): string[] | undefined;
|
|
80
|
+
export declare function convertDateArray(params: SearchValue | undefined, dateArray: string[]): (string | undefined)[] | undefined;
|
|
81
81
|
/**
|
|
82
82
|
* 获取查询结果
|
|
83
83
|
* @param source 结果数据
|
|
@@ -28,10 +28,10 @@ function convertToHMS(seconds) {
|
|
|
28
28
|
var s = remainingSeconds ? remainingSeconds + '秒' : '0秒';
|
|
29
29
|
return h + m + s;
|
|
30
30
|
}
|
|
31
|
-
/**
|
|
32
|
-
* 获取table的columns
|
|
33
|
-
* @param columnData xAxis
|
|
34
|
-
* @returns column fields
|
|
31
|
+
/**
|
|
32
|
+
* 获取table的columns
|
|
33
|
+
* @param columnData xAxis
|
|
34
|
+
* @returns column fields
|
|
35
35
|
*/
|
|
36
36
|
export function getColumns(eventGroupList, userPropList, eventEnvList, columnData, dataSource, userGroup, searchData, showList, onUserDrill, currentApp
|
|
37
37
|
// onClickToDetailCallback: Function,
|
|
@@ -208,22 +208,22 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
|
|
|
208
208
|
return data;
|
|
209
209
|
}
|
|
210
210
|
|
|
211
|
-
/**
|
|
212
|
-
* 获取属性的label
|
|
213
|
-
* @param attrData 当前属性
|
|
214
|
-
* @param eventGroupList 事件属性列表
|
|
215
|
-
* @param userPropList 用户属性列表
|
|
216
|
-
* @param eventEnvList 环境属性列表
|
|
217
|
-
* @returns label
|
|
211
|
+
/**
|
|
212
|
+
* 获取属性的label
|
|
213
|
+
* @param attrData 当前属性
|
|
214
|
+
* @param eventGroupList 事件属性列表
|
|
215
|
+
* @param userPropList 用户属性列表
|
|
216
|
+
* @param eventEnvList 环境属性列表
|
|
217
|
+
* @returns label
|
|
218
218
|
*/
|
|
219
219
|
|
|
220
|
-
/**
|
|
221
|
-
* 格式化表格数据
|
|
222
|
-
* @param originalData 查询的数据
|
|
223
|
-
* @param hasUserGroup 是否有多个用户群
|
|
224
|
-
* @param attrNum 属性细分个数
|
|
225
|
-
* @param showList 要展示的内容，如果没传，则展示全部
|
|
226
|
-
* @returns
|
|
220
|
+
/**
|
|
221
|
+
* 格式化表格数据
|
|
222
|
+
* @param originalData 查询的数据
|
|
223
|
+
* @param hasUserGroup 是否有多个用户群
|
|
224
|
+
* @param attrNum 属性细分个数
|
|
225
|
+
* @param showList 要展示的内容，如果没传，则展示全部
|
|
226
|
+
* @returns
|
|
227
227
|
*/
|
|
228
228
|
export function formTableData(originalData) {
|
|
229
229
|
var result = createNewArray(originalData);
|
|
@@ -262,13 +262,15 @@ export function convertDateArray(params, dateArray) {
|
|
|
262
262
|
case 'week':
|
|
263
263
|
case 'month':
|
|
264
264
|
var convertedArray = dateArray === null || dateArray === void 0 ? void 0 : dateArray.map(function (dateRange) {
|
|
265
|
-
|
|
266
|
-
_dateRange$
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
265
|
+
if (dateRange.includes('|')) {
|
|
266
|
+
var _dateRange$split = dateRange.split('|'),
|
|
267
|
+
_dateRange$split2 = _slicedToArray(_dateRange$split, 2),
|
|
268
|
+
startDate = _dateRange$split2[0],
|
|
269
|
+
endDate = _dateRange$split2[1];
|
|
270
|
+
var formattedStartDate = startDate.split('-').slice(1).join('-');
|
|
271
|
+
var formattedEndDate = endDate.split('-').slice(1).join('-');
|
|
272
|
+
return "".concat(formattedStartDate, "\uFF5E").concat(formattedEndDate);
|
|
273
|
+
}
|
|
272
274
|
});
|
|
273
275
|
return convertedArray;
|
|
274
276
|
break;
|
|
@@ -310,10 +312,10 @@ function getChildrenData(data, index) {
|
|
|
310
312
|
}
|
|
311
313
|
return [];
|
|
312
314
|
}
|
|
313
|
-
/**
|
|
314
|
-
* 获取查询结果
|
|
315
|
-
* @param source 结果数据
|
|
316
|
-
* @returns 获取查询结果
|
|
315
|
+
/**
|
|
316
|
+
* 获取查询结果
|
|
317
|
+
* @param source 结果数据
|
|
318
|
+
* @returns 获取查询结果
|
|
317
319
|
*/
|
|
318
320
|
export function getDefaultShow(source, data) {
|
|
319
321
|
if (source.appData.series) {
|
|
@@ -335,11 +337,11 @@ export function getDefaultShow(source, data) {
|
|
|
335
337
|
}
|
|
336
338
|
return [];
|
|
337
339
|
}
|
|
338
|
-
/**
|
|
339
|
-
* 获取显示事件对应的颜色
|
|
340
|
-
* @param source 结果数据
|
|
341
|
-
* @param showList 展示列表
|
|
342
|
-
* @returns 展示列表对应的颜色
|
|
340
|
+
/**
|
|
341
|
+
* 获取显示事件对应的颜色
|
|
342
|
+
* @param source 结果数据
|
|
343
|
+
* @param showList 展示列表
|
|
344
|
+
* @returns 展示列表对应的颜色
|
|
343
345
|
*/
|
|
344
346
|
export function getShowColor(source, showList) {
|
|
345
347
|
var colors = [];
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zgfe/modules-interval",
|
|
3
|
-
"version": "1.0.23-zhongyuan.
|
|
3
|
+
"version": "1.0.23-zhongyuan.11",
|
|
4
4
|
"private": false,
|
|
5
5
|
"module": "dist/esm/index.js",
|
|
6
6
|
"typings": "dist/esm/index.d.ts",
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"publishConfig": {
|
|
60
60
|
"access": "public"
|
|
61
61
|
},
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "ac7fe4ed94413198bb0e2bb7ea068d1dd51f690d",
|
|
63
63
|
"gitHooks": {
|
|
64
64
|
"pre-commit": "lint-staged"
|
|
65
65
|
}
|