@zgfe/modules-event 0.1.5-event.30 → 0.1.5-event.32
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.
|
@@ -16,8 +16,7 @@ export var judgeFilterValue = function judgeFilterValue(data, count) {
|
|
|
16
16
|
}
|
|
17
17
|
data.conditions.map(function (item) {
|
|
18
18
|
var _item$values;
|
|
19
|
-
if (item.values && (((_item$values = item.values) === null || _item$values === void 0 ? void 0 : _item$values.length) <= 0 || item.values[0] === '')) flag = false;
|
|
20
|
-
if ((item === null || item === void 0 ? void 0 : item.operator) && /^is null$|^is not null$/.test(item === null || item === void 0 ? void 0 : item.operator)) flag = true;
|
|
19
|
+
if (item.values && (((_item$values = item.values) === null || _item$values === void 0 ? void 0 : _item$values.length) <= 0 || item.values[0] === '') && !((item === null || item === void 0 ? void 0 : item.operator) && /^is null$|^is not null$/.test(item === null || item === void 0 ? void 0 : item.operator))) flag = false;
|
|
21
20
|
});
|
|
22
21
|
}
|
|
23
22
|
return flag;
|
|
@@ -74,7 +74,6 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
74
74
|
ajaxFlag = true;
|
|
75
75
|
}
|
|
76
76
|
}
|
|
77
|
-
console.log('TopPanel查询条件变更前 _data ===', _data);
|
|
78
77
|
props.onChange(_data, ajaxFlag);
|
|
79
78
|
};
|
|
80
79
|
var resetting = function resetting() {
|
|
@@ -89,7 +88,8 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
89
88
|
name: undefined,
|
|
90
89
|
filters: undefined,
|
|
91
90
|
dimension: undefined,
|
|
92
|
-
analysisAttr: undefined
|
|
91
|
+
analysisAttr: undefined,
|
|
92
|
+
chartType: 'line'
|
|
93
93
|
}, true);
|
|
94
94
|
};
|
|
95
95
|
useEffect(function () {
|
|
@@ -147,6 +147,8 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
147
147
|
onChange: function onChange(val) {
|
|
148
148
|
props.onChangeSubjectType(val.value);
|
|
149
149
|
setAnalysisType(val.value);
|
|
150
|
+
setEnableSelectChart && setEnableSelectChart(false);
|
|
151
|
+
setIsCity && setIsCity(false);
|
|
150
152
|
resetting();
|
|
151
153
|
}
|
|
152
154
|
})), analysisType === 'user' ? /*#__PURE__*/React.createElement(Form.Item, {
|
|
@@ -7,12 +7,18 @@
|
|
|
7
7
|
}
|
|
8
8
|
&-select {
|
|
9
9
|
width: 208px;
|
|
10
|
-
margin-bottom: 24px;
|
|
11
10
|
margin-left: 24px;
|
|
12
11
|
.biz-select-handle-input {
|
|
13
12
|
padding-left: 12px;
|
|
14
13
|
}
|
|
15
14
|
}
|
|
15
|
+
.ant-form-item-row .ant-form-item-control {
|
|
16
|
+
margin-bottom: 24px;
|
|
17
|
+
padding: 4px 0;
|
|
18
|
+
&:hover {
|
|
19
|
+
background: #e8efff;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
16
22
|
}
|
|
17
23
|
&-form-botton-box {
|
|
18
24
|
display: flex;
|
package/es/utils/formData.js
CHANGED
|
@@ -36,7 +36,7 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
|
|
|
36
36
|
}));
|
|
37
37
|
}
|
|
38
38
|
}];
|
|
39
|
-
if (userGroup.length > 1 || userGroup[0] !== 0) {
|
|
39
|
+
if (!(searchData === null || searchData === void 0 ? void 0 : searchData.analysisSubject) && (userGroup.length > 1 || userGroup[0] !== 0)) {
|
|
40
40
|
data.push({
|
|
41
41
|
title: '用户群',
|
|
42
42
|
width: 150,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zgfe/modules-event",
|
|
3
|
-
"version": "0.1.5-event.
|
|
3
|
+
"version": "0.1.5-event.32",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"start": "dumi dev",
|
|
6
6
|
"docs:build": "dumi build",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"react": "^16.12.0 || ^17.0.0",
|
|
50
50
|
"yorkie": "^2.0.0"
|
|
51
51
|
},
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "27d2e5e54c7eb1b9f736e25e6d018ced272a7128",
|
|
53
53
|
"dependencies": {
|
|
54
54
|
"react-copy-to-clipboard": "^5.1.0",
|
|
55
55
|
"react-highlight": "^0.15.0"
|