@zgfe/modules-event 0.1.5-event.4 → 0.1.5-event.42
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.
- package/es/components/eventFilter/index.js +72 -48
- package/es/components/eventFilter/styles/index.less +1 -2
- package/es/components/eventFilter/types.d.ts +3 -4
- package/es/components/renderContent/index.js +1 -1
- package/es/components/searchPanel/index.js +21 -23
- package/es/components/searchPanel/types.d.ts +12 -0
- package/es/components/table/index.js +5 -7
- package/es/components/topBar/index.js +4 -4
- package/es/modules/chart/demo/index.js +1 -1
- package/es/modules/chart/index.js +4 -4
- package/es/modules/content/index.js +28 -37
- package/es/modules/content/utils.js +4 -4
- package/es/modules/home/demo/create.js +1 -1
- package/es/modules/home/demo/edit.js +37 -23
- package/es/modules/home/demo/index.js +3 -3
- package/es/modules/home/demo/scene.js +1 -1
- package/es/modules/home/index.js +4 -4
- package/es/modules/topPanel/index.js +110 -78
- package/es/modules/topPanel/styles/index.less +11 -2
- package/es/modules/topPanel/types.d.ts +5 -2
- package/es/types.d.ts +2 -0
- package/es/utils/formData.js +1 -1
- package/package.json +3 -3
|
@@ -1,18 +1,27 @@
|
|
|
1
1
|
.top-panel {
|
|
2
2
|
&-form-event {
|
|
3
3
|
margin-bottom: 0;
|
|
4
|
-
.ant-form-item-label {
|
|
4
|
+
& .ant-form-item-label {
|
|
5
5
|
padding-left: 24px;
|
|
6
6
|
font-weight: 500;
|
|
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
|
+
}
|
|
22
|
+
.ant-form-item-explain-error {
|
|
23
|
+
padding-left: 24px;
|
|
24
|
+
}
|
|
16
25
|
}
|
|
17
26
|
&-form-botton-box {
|
|
18
27
|
display: flex;
|
|
@@ -8,14 +8,16 @@ interface filterConditions {
|
|
|
8
8
|
dimension?: bizAttributeSelectorValueProp;
|
|
9
9
|
}
|
|
10
10
|
interface analysisSubject {
|
|
11
|
+
id?: number;
|
|
11
12
|
subjectId?: number;
|
|
12
13
|
name?: string;
|
|
13
14
|
unit?: string;
|
|
14
15
|
subjectAlias?: string;
|
|
15
16
|
subjectName?: string;
|
|
17
|
+
analysisSubjectType?: string;
|
|
16
18
|
}
|
|
17
19
|
interface analysisSubjectType {
|
|
18
|
-
value?:
|
|
20
|
+
value?: string;
|
|
19
21
|
user?: string;
|
|
20
22
|
}
|
|
21
23
|
export interface FormDataProps {
|
|
@@ -29,17 +31,18 @@ export interface FormHandelDataProps extends filterConditions {
|
|
|
29
31
|
userGroup?: any[];
|
|
30
32
|
chartType?: EventChartTypes | undefined;
|
|
31
33
|
analysisSubject?: analysisSubject;
|
|
34
|
+
eventIds?: number[];
|
|
32
35
|
}
|
|
33
36
|
export interface TopPanelProps {
|
|
34
37
|
value?: SearchValue;
|
|
35
38
|
onChange: (data: SearchValue, flag: boolean) => void;
|
|
39
|
+
loading?: boolean;
|
|
36
40
|
ajaxFlag: boolean;
|
|
37
41
|
subDisplay?: boolean;
|
|
38
42
|
finalSearchData?: SearchValue;
|
|
39
43
|
fetchRequest: (flag?: boolean) => void;
|
|
40
44
|
setIsCity?: Function;
|
|
41
45
|
setEnableSelectChart?: Function;
|
|
42
|
-
allSubjectList?: any[];
|
|
43
46
|
analysisSubjectType?: analysisSubjectType;
|
|
44
47
|
onChangeSubjectType: (type: string) => void;
|
|
45
48
|
}
|
package/es/types.d.ts
CHANGED
|
@@ -15,6 +15,7 @@ export interface AnalysisSubject {
|
|
|
15
15
|
unit?: string;
|
|
16
16
|
subjectAlias?: string;
|
|
17
17
|
subjectName?: string;
|
|
18
|
+
analysisSubjectType?: string;
|
|
18
19
|
}
|
|
19
20
|
export interface eventProps {
|
|
20
21
|
id?: number;
|
|
@@ -25,6 +26,7 @@ export interface eventProps {
|
|
|
25
26
|
}
|
|
26
27
|
export interface SearchValue {
|
|
27
28
|
id?: number;
|
|
29
|
+
eventIds?: number[];
|
|
28
30
|
eventGroupId?: number;
|
|
29
31
|
name?: string;
|
|
30
32
|
platform?: number;
|
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.42",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"start": "dumi dev",
|
|
6
6
|
"docs:build": "dumi build",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"@types/lodash": "^4.14.191",
|
|
37
37
|
"@umijs/fabric": "^2.8.1",
|
|
38
38
|
"@umijs/test": "^3.0.5",
|
|
39
|
-
"@zgfe/business-lib": "1.1.89-qirui.
|
|
39
|
+
"@zgfe/business-lib": "1.1.89-qirui.19",
|
|
40
40
|
"antd": "^4.22.6",
|
|
41
41
|
"dumi": "^1.1.0",
|
|
42
42
|
"echarts": "^5.3.2",
|
|
@@ -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": "6fcb3776c66d83311800d297be43bda991679374",
|
|
53
53
|
"dependencies": {
|
|
54
54
|
"react-copy-to-clipboard": "^5.1.0",
|
|
55
55
|
"react-highlight": "^0.15.0"
|