@zgfe/modules-interval 1.0.0-interval.42 → 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.
|
@@ -118,12 +118,12 @@ var EventContent = function EventContent(props) {
|
|
|
118
118
|
setLoading(false);
|
|
119
119
|
return;
|
|
120
120
|
}
|
|
121
|
-
setLoading(true);
|
|
122
121
|
setEventData(undefined);
|
|
122
|
+
setLoading(true);
|
|
123
123
|
// 取消上次未完成的请求
|
|
124
|
-
if (typeof cancel === 'function') {
|
|
125
|
-
|
|
126
|
-
}
|
|
124
|
+
// if (typeof cancel === 'function') {
|
|
125
|
+
// cancel();
|
|
126
|
+
// }
|
|
127
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)) {
|
|
128
128
|
setLoading(false);
|
|
129
129
|
return message.error('您查询的属性不一致，暂不支持查询');
|
|
@@ -151,7 +151,7 @@ var TopPanel = function TopPanel(props) {
|
|
|
151
151
|
className: "panel-form-interval",
|
|
152
152
|
layout: "vertical",
|
|
153
153
|
initialValues: {
|
|
154
|
-
userGroup: userGroup ? userGroup : [0],
|
|
154
|
+
// userGroup: userGroup ? userGroup : [0],
|
|
155
155
|
start: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.start), {}, {
|
|
156
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
|
|
157
157
|
}),
|