@zgfe/modules-interval 1.0.0-interval.8 → 1.0.0-interval.9
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.
|
@@ -42,6 +42,7 @@ var SearchPanel = function SearchPanel(props) {
|
|
|
42
42
|
_useState10 = _slicedToArray(_useState9, 2),
|
|
43
43
|
displaySetupSliceList = _useState10[0],
|
|
44
44
|
setDisplaySetupSliceList = _useState10[1];
|
|
45
|
+
// const [includeToday, setIncludeToday] = useState(false);
|
|
45
46
|
// 查询维度
|
|
46
47
|
var _useState11 = useState({
|
|
47
48
|
analysisIndex: 'number'
|
|
@@ -107,6 +108,7 @@ var SearchPanel = function SearchPanel(props) {
|
|
|
107
108
|
}, /*#__PURE__*/React.createElement(BizDatePicker, {
|
|
108
109
|
dateTypeList: ['day', 'week', 'month'],
|
|
109
110
|
value: time,
|
|
111
|
+
includeToday: true,
|
|
110
112
|
onChange: onChangeTime,
|
|
111
113
|
selectRange: 365
|
|
112
114
|
}), /*#__PURE__*/React.createElement(BizSelect, {
|
|
@@ -93,7 +93,7 @@ var EventContent = function EventContent(props) {
|
|
|
93
93
|
var flag = true;
|
|
94
94
|
timer = setTimeout(function () {
|
|
95
95
|
if (flag) {
|
|
96
|
-
fetchRequest();
|
|
96
|
+
fetchRequest(false);
|
|
97
97
|
}
|
|
98
98
|
}, 500);
|
|
99
99
|
return function () {
|
|
@@ -115,6 +115,11 @@ var EventContent = function EventContent(props) {
|
|
|
115
115
|
var _searchData$associate, _searchData$associate2, _searchData$associate3;
|
|
116
116
|
if (flag !== undefined) setAjaxFlag(flag);
|
|
117
117
|
if (!ajaxFlag) return;
|
|
118
|
+
if (!searchData.start.id) {
|
|
119
|
+
setLoading(false);
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
122
|
+
;
|
|
118
123
|
setLoading(true);
|
|
119
124
|
setEventData(undefined);
|
|
120
125
|
// 取消上次未完成的请求
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
1
2
|
/**
|
|
2
3
|
* 判断当前细分属性是否为”城市“
|
|
3
4
|
* @param name 属性名称
|
|
@@ -75,6 +76,7 @@ export function searchCondition(params) {
|
|
|
75
76
|
}
|
|
76
77
|
export function searchDataParams(params) {
|
|
77
78
|
var _params$time, _params$time2, _params$time3, _params$dimension, _params$dimension2, _params$dimension3, _params$dimension4, _params$dimension5, _params$dimension6, _params$dimension7, _params$dimension8, _params$dimension9, _params$dimension10, _params$dimension11, _params$dimension12, _params$associatedPre, _params$associatedNex;
|
|
79
|
+
console.log(777777, params.userGroup, _typeof(params.userGroup[0]));
|
|
78
80
|
return {
|
|
79
81
|
time: {
|
|
80
82
|
dimensionDate: params === null || params === void 0 ? void 0 : (_params$time = params.time) === null || _params$time === void 0 ? void 0 : _params$time.unit,
|
|
@@ -82,7 +84,7 @@ export function searchDataParams(params) {
|
|
|
82
84
|
endDate: params === null || params === void 0 ? void 0 : (_params$time3 = params.time) === null || _params$time3 === void 0 ? void 0 : _params$time3.end
|
|
83
85
|
},
|
|
84
86
|
platform: (params === null || params === void 0 ? void 0 : params.platform) || 0,
|
|
85
|
-
userGroup: params.userGroup,
|
|
87
|
+
userGroup: _typeof(params.userGroup[0]) === 'object' ? params.userGroup : params.userGroup[0],
|
|
86
88
|
start: searchCondition(params === null || params === void 0 ? void 0 : params.start),
|
|
87
89
|
end: searchCondition(params === null || params === void 0 ? void 0 : params.end),
|
|
88
90
|
dimension: params !== null && params !== void 0 && (_params$dimension = params.dimension) !== null && _params$dimension !== void 0 && _params$dimension.propCategory ? {
|