@zgfe/modules-event 0.1.5-event.46 → 0.1.5-event.48

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.
Files changed (6) hide show
  1. package/es/components/eventFilter/index.js +8 -0
  2. package/es/components/eventFilter/styles/index.less +7 -6
  3. package/es/modules/home/demo/index.js +1 -1
  4. package/es/modules/topPanel/index.js +5 -3
  5. package/es/modules/topPanel/styles/index.less +11 -7
  6. package/package.json +2 -2
package/es/components/eventFilter/index.js CHANGED
@@ -128,6 +128,14 @@ var EventFilter = function EventFilter(props) {
128
128
  setIsAdd(false);
129
129
  return;
130
130
  }
131
+ if (analysisType === 'eventProp' && val.length === 0) {
132
+ setEventList([]);
133
+ setEvent(undefined);
134
+ setShowDimension(false);
135
+ setFilter(undefined);
136
+ setIsAdd(false);
137
+ return;
138
+ }
131
139
  var event = _.isArray(val) ? {
132
140
  event: val[0]
133
141
  } : val;
package/es/components/eventFilter/styles/index.less CHANGED
@@ -1,7 +1,10 @@
1
1
  .eventfilter-box {
2
- > :nth-child(1) {
2
+ > div:nth-child(1) {
3
3
  display: flex;
4
- padding-left: 24px;
4
+ padding: 4px 0 4px 24px;
5
+ &:hover {
6
+ background: #e8efff;
7
+ }
5
8
  .biz-event-select,
6
9
  .biz-attr-select {
7
10
  width: 208px;
@@ -21,12 +24,10 @@
21
24
  cursor: not-allowed !important;
22
25
  }
23
26
  }
24
- > :nth-child(1):hover {
25
- background: #e8efff;
26
- }
27
27
  &-multiple {
28
28
  .biz-event-select {
29
- width: 100% !important;
29
+ width: auto !important;
30
+ min-width: 208px;
30
31
  }
31
32
  }
32
33
  }
package/es/modules/home/demo/index.js CHANGED
@@ -57,7 +57,7 @@ export default (function () {
57
57
  unit: 'day'
58
58
  },
59
59
  userGroup: [],
60
- eventIds: [18065, 18067, 18063, 18064],
60
+ eventIds: [18065],
61
61
  analysisSubject: {
62
62
  subjectId: 91,
63
63
  subjectName: 'url',
package/es/modules/topPanel/index.js CHANGED
@@ -99,6 +99,7 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
99
99
  component: "div",
100
100
  colon: false,
101
101
  layout: "vertical",
102
+ className: "".concat(classPrefix, "-form"),
102
103
  initialValues: {
103
104
  userGroup: userGroup ? userGroup : [0],
104
105
  filterConditions: (value === null || value === void 0 ? void 0 : value.eventIds) || {
@@ -114,7 +115,7 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
114
115
  onFinish: onSearch
115
116
  }, !subDisplay ? null : /*#__PURE__*/React.createElement(Form.Item, {
116
117
  label: "\u5206\u6790\u4E3B\u4F53",
117
- className: "".concat(classPrefix, "-form-event")
118
+ className: "".concat(classPrefix, "-form-event hoverable-form-item")
118
119
  }, /*#__PURE__*/React.createElement(BizSelect, {
119
120
  className: "".concat(classPrefix, "-form-event-select"),
120
121
  options: [{
@@ -138,14 +139,15 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
138
139
  }
139
140
  })), analysisType === 'user' ? /*#__PURE__*/React.createElement(Form.Item, {
140
141
  label: "",
141
- name: "userGroup"
142
+ name: "userGroup",
143
+ className: "hoverable-form-item"
142
144
  }, /*#__PURE__*/React.createElement(BizUserGroupHeader, {
143
145
  max: 3,
144
146
  enableTags: true
145
147
  })) : /*#__PURE__*/React.createElement(Form.Item, {
146
148
  label: "\u4E3B\u4F53\u540D\u79F0",
147
149
  name: "analysisSubject",
148
- className: "".concat(classPrefix, "-form-event"),
150
+ className: "".concat(classPrefix, "-form-event hoverable-form-item"),
149
151
  rules: [{
150
152
  validator: function validator(_rule, value) {
151
153
  if (value && (value.id || value.subjectId)) {
package/es/modules/topPanel/styles/index.less CHANGED
@@ -15,9 +15,6 @@
15
15
  .ant-form-item-row .ant-form-item-control {
16
16
  margin-bottom: 24px;
17
17
  padding: 4px 0;
18
- &:hover {
19
- background: #e8efff;
20
- }
21
18
  }
22
19
  .ant-form-item-explain-error {
23
20
  padding-left: 24px;
@@ -26,7 +23,6 @@
26
23
  &-form-botton-box {
27
24
  display: flex;
28
25
  justify-content: flex-end;
29
- margin-top: 12px;
30
26
  margin-right: 24px;
31
27
  > :nth-child(1) {
32
28
  margin-right: 16px;
@@ -35,8 +31,16 @@
35
31
  border-color: #29bd52;
36
32
  }
37
33
  }
38
-
39
- &-form-botton-box.margin-style {
40
- margin-top: 20px;
34
+ &-form {
35
+ .ant-form-item-has-error .biz-event-select {
36
+ border: 1px solid @error-color !important;
37
+ }
38
+ }
39
+ }
40
+ .hoverable-form-item {
41
+ .ant-form-item-control {
42
+ &:hover {
43
+ background: #e8efff !important;
44
+ }
41
45
  }
42
46
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-event",
3
- "version": "0.1.5-event.46",
3
+ "version": "0.1.5-event.48",
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": "e2e8f137fc4e9753affc88d4e0b75fdbe6a01622",
52
+ "gitHead": "ed3002b0e2f622886198c3b356566caf856974f6",
53
53
  "dependencies": {
54
54
  "react-copy-to-clipboard": "^5.1.0",
55
55
  "react-highlight": "^0.15.0"