@zgfe/modules-interval 1.0.0-interval.28 → 1.0.0-interval.29
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.
|
@@ -55,11 +55,11 @@
|
|
|
55
55
|
border: 1px solid #f2f3f4;
|
|
56
56
|
border-radius: 4px;
|
|
57
57
|
cursor: pointer;
|
|
58
|
-
|
|
58
|
+
display: flex;
|
|
59
|
+
align-items: center;
|
|
59
60
|
.xiazai1 {
|
|
60
61
|
margin-right: 4px;
|
|
61
|
-
font-size:
|
|
62
|
-
vertical-align: -2px;
|
|
62
|
+
font-size: 16px !important;
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
65
|
div:hover {
|
|
@@ -84,6 +84,7 @@ var IntervalChart = function IntervalChart(props) {
|
|
|
84
84
|
type: 'inside',
|
|
85
85
|
start: 0,
|
|
86
86
|
end: 20,
|
|
87
|
+
right: 3,
|
|
87
88
|
height: 20 // 设置内置的dataZoom的高度
|
|
88
89
|
}, {
|
|
89
90
|
show: (params === null || params === void 0 ? void 0 : params.module) === 'interval' ? false : true,
|
|
@@ -92,6 +93,7 @@ var IntervalChart = function IntervalChart(props) {
|
|
|
92
93
|
xAxisIndex: [0],
|
|
93
94
|
start: 0,
|
|
94
95
|
end: 20,
|
|
96
|
+
right: 3,
|
|
95
97
|
height: 20 // 设置滑动条的高度
|
|
96
98
|
}],
|
|
97
99
|
|
|
@@ -112,7 +112,7 @@ var EventContent = function EventContent(props) {
|
|
|
112
112
|
}, [ajaxFlag]);
|
|
113
113
|
// 查询
|
|
114
114
|
var fetchRequest = function fetchRequest(flag) {
|
|
115
|
-
var _finalSearchData$star, _finalSearchData$end, _searchData$associate, _searchData$associate2, _searchData$associate3;
|
|
115
|
+
var _finalSearchData$star, _finalSearchData$end, _searchData$associate, _searchData$associate2, _searchData$associate3, _finalSearchData$star2;
|
|
116
116
|
if (flag !== undefined) setAjaxFlag(flag);
|
|
117
117
|
if (!ajaxFlag) return;
|
|
118
118
|
if ((finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$star = finalSearchData.start) === null || _finalSearchData$star === void 0 ? void 0 : _finalSearchData$star.eventId) === null || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$end = finalSearchData.end) === null || _finalSearchData$end === void 0 ? void 0 : _finalSearchData$end.eventId) === null) {
|
|
@@ -131,7 +131,7 @@ var EventContent = function EventContent(props) {
|
|
|
131
131
|
if (searchData !== null && searchData !== void 0 && (_searchData$associate = searchData.associatedNextAttr) !== null && _searchData$associate !== void 0 && _searchData$associate.type && (searchData === null || searchData === void 0 ? void 0 : (_searchData$associate2 = searchData.associatedPreAttr) === null || _searchData$associate2 === void 0 ? void 0 : _searchData$associate2.type) !== (searchData === null || searchData === void 0 ? void 0 : (_searchData$associate3 = searchData.associatedNextAttr) === null || _searchData$associate3 === void 0 ? void 0 : _searchData$associate3.type)) {
|
|
132
132
|
return message.error('您查询的属性不一致，暂不支持查询');
|
|
133
133
|
}
|
|
134
|
-
var params = searchDataParams(searchData);
|
|
134
|
+
var params = finalSearchData !== null && finalSearchData !== void 0 && (_finalSearchData$star2 = finalSearchData.start) !== null && _finalSearchData$star2 !== void 0 && _finalSearchData$star2.eventId ? finalSearchData : searchDataParams(searchData);
|
|
135
135
|
props.onChange && props.onChange(searchData);
|
|
136
136
|
// console.log(77771111, searchData, params);
|
|
137
137
|
ajax(Apis.dataList, {
|
|
@@ -18,7 +18,6 @@ import "./styles/index.less";
|
|
|
18
18
|
var classPrefix = 'top-panel-interval';
|
|
19
19
|
var TopPanel = function TopPanel(props) {
|
|
20
20
|
var _defaultValue$associa, _defaultValue$associa2, _defaultValue$associa3, _defaultValue$associa4, _defaultValue$associa5, _defaultValue$associa6, _defaultValue$associa7, _defaultValue$associa8, _defaultValue$dimensi, _defaultValue$dimensi2, _defaultValue$dimensi3, _defaultValue$dimensi4;
|
|
21
|
-
console.log(666661111, props);
|
|
22
21
|
var defaultValue = props.defaultValue,
|
|
23
22
|
loading = props.loading,
|
|
24
23
|
collapseRef = props.collapseRef,
|
|
@@ -54,23 +53,25 @@ var TopPanel = function TopPanel(props) {
|
|
|
54
53
|
// 用户组和事件变更
|
|
55
54
|
var onValuesChange = function onValuesChange(data, allData) {
|
|
56
55
|
var _data = {};
|
|
56
|
+
setRelevancyFl(false);
|
|
57
57
|
if (allData.start) {
|
|
58
58
|
if (allData.start.id !== null) {
|
|
59
59
|
var _allData$start;
|
|
60
60
|
_data = allData.start;
|
|
61
61
|
setStartId(allData.start.id);
|
|
62
62
|
setRelevancy(allData === null || allData === void 0 ? void 0 : (_allData$start = allData.start) === null || _allData$start === void 0 ? void 0 : _allData$start.relevancy);
|
|
63
|
+
} else {
|
|
64
|
+
setRelevancyFl(true);
|
|
63
65
|
}
|
|
64
66
|
}
|
|
65
67
|
if (allData.end) {
|
|
66
68
|
if (allData.end.id !== null) {
|
|
67
69
|
_data = allData.end;
|
|
68
70
|
setEndId(allData.end.id);
|
|
71
|
+
} else {
|
|
72
|
+
setRelevancyFl(true);
|
|
69
73
|
}
|
|
70
74
|
}
|
|
71
|
-
if (startId && endId) {
|
|
72
|
-
setRelevancyFl(false);
|
|
73
|
-
}
|
|
74
75
|
if (allData.userGroup) {
|
|
75
76
|
_data.userGroup = allData.userGroup;
|
|
76
77
|
if (_data.userGroup.length <= 0) _data.userGroup = [0];
|