@zgfe/modules-interval 1.0.0-interval.41 → 1.0.0-interval.43
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.
|
@@ -26,7 +26,6 @@ var CancelToken = Request.CancelToken;
|
|
|
26
26
|
var cancel;
|
|
27
27
|
var classPrefix = 'interval-content';
|
|
28
28
|
var EventContent = function EventContent(props) {
|
|
29
|
-
console.log('999999', props);
|
|
30
29
|
// 最后的查询数据（防止图表在还没查询时就改变了类型）
|
|
31
30
|
var _useState = useState(props.value),
|
|
32
31
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -119,12 +118,12 @@ var EventContent = function EventContent(props) {
|
|
|
119
118
|
setLoading(false);
|
|
120
119
|
return;
|
|
121
120
|
}
|
|
122
|
-
setLoading(true);
|
|
123
121
|
setEventData(undefined);
|
|
122
|
+
setLoading(true);
|
|
124
123
|
// 取消上次未完成的请求
|
|
125
|
-
if (typeof cancel === 'function') {
|
|
126
|
-
|
|
127
|
-
}
|
|
124
|
+
// if (typeof cancel === 'function') {
|
|
125
|
+
// cancel();
|
|
126
|
+
// }
|
|
128
127
|
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)) {
|
|
129
128
|
setLoading(false);
|
|
130
129
|
return message.error('您查询的属性不一致，暂不支持查询');
|
|
@@ -23,6 +23,7 @@ var TopPanel = function TopPanel(props) {
|
|
|
23
23
|
collapseRef = props.collapseRef,
|
|
24
24
|
finalSearchData = props.finalSearchData,
|
|
25
25
|
fetchRequest = props.fetchRequest;
|
|
26
|
+
console.log('99999999', props);
|
|
26
27
|
var _Form$useForm = Form.useForm(),
|
|
27
28
|
_Form$useForm2 = _slicedToArray(_Form$useForm, 1),
|
|
28
29
|
form = _Form$useForm2[0];
|
|
@@ -150,7 +151,7 @@ var TopPanel = function TopPanel(props) {
|
|
|
150
151
|
className: "panel-form-interval",
|
|
151
152
|
layout: "vertical",
|
|
152
153
|
initialValues: {
|
|
153
|
-
userGroup: userGroup ? userGroup : [0],
|
|
154
|
+
// userGroup: userGroup ? userGroup : [0],
|
|
154
155
|
start: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.start), {}, {
|
|
155
156
|
relevancy: defaultValue !== null && defaultValue !== void 0 && (_defaultValue$associa = defaultValue.associated_next_attr) !== null && _defaultValue$associa !== void 0 && _defaultValue$associa.event_id && defaultValue !== null && defaultValue !== void 0 && (_defaultValue$associa2 = defaultValue.associated_pre_attr) !== null && _defaultValue$associa2 !== void 0 && _defaultValue$associa2.event_id || finalSearchData !== null && finalSearchData !== void 0 && (_finalSearchData$asso = finalSearchData.associatedNextAttr) !== null && _finalSearchData$asso !== void 0 && _finalSearchData$asso.eventId && finalSearchData !== null && finalSearchData !== void 0 && (_finalSearchData$asso2 = finalSearchData.associatedPreAttr) !== null && _finalSearchData$asso2 !== void 0 && _finalSearchData$asso2.eventId ? true : false
|
|
156
157
|
}),
|