@zgfe/modules-interval 1.0.0-interval.3 → 1.0.0-interval.30

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 (58) hide show
  1. package/dist/esm/assets/business/demo_index.html +164 -26
  2. package/dist/esm/assets/business/iconfont.css +31 -7
  3. package/dist/esm/assets/business/iconfont.js +10 -10
  4. package/dist/esm/assets/business/iconfont.json +49 -7
  5. package/dist/esm/assets/business/iconfont.ttf +0 -0
  6. package/dist/esm/assets/business/iconfont.woff +0 -0
  7. package/dist/esm/assets/business/iconfont.woff2 +0 -0
  8. package/dist/esm/components/common/index.js +9 -9
  9. package/dist/esm/components/common/styles/index.less +21 -8
  10. package/dist/esm/components/eventFilter/index.js +21 -18
  11. package/dist/esm/components/eventFilter/styles/index.less +2 -5
  12. package/dist/esm/components/eventFilter/types.d.ts +2 -0
  13. package/dist/esm/components/renderContent/index.js +10 -11
  14. package/dist/esm/components/renderContent/styles/index.less +13 -2
  15. package/dist/esm/components/searchPanel/index.js +8 -3
  16. package/dist/esm/components/searchPanel/styles/index.less +34 -28
  17. package/dist/esm/components/table/index.js +13 -87
  18. package/dist/esm/components/table/styles/index.less +21 -6
  19. package/dist/esm/components/topBar/index.js +42 -21
  20. package/dist/esm/components/topBar/styles/index.less +2 -1
  21. package/dist/esm/components/topBar/types.d.ts +3 -1
  22. package/dist/esm/constants/apis.js +1 -1
  23. package/dist/esm/constants/fields.d.ts +6 -78
  24. package/dist/esm/constants/fields.js +7 -47
  25. package/dist/esm/index.d.ts +2 -2
  26. package/dist/esm/index.js +2 -2
  27. package/dist/esm/modules/chart/customTooltip.js +6 -2
  28. package/dist/esm/modules/chart/demo/data.d.ts +34 -71
  29. package/dist/esm/modules/chart/demo/data.js +36 -488
  30. package/dist/esm/modules/chart/demo/index.js +8 -37
  31. package/dist/esm/modules/chart/index.d.ts +2 -2
  32. package/dist/esm/modules/chart/index.js +37 -30
  33. package/dist/esm/modules/chart/index.less +26 -16
  34. package/dist/esm/modules/chart/intervalChart.js +12 -5
  35. package/dist/esm/modules/chart/types.d.ts +1 -1
  36. package/dist/esm/modules/content/index.js +36 -20
  37. package/dist/esm/modules/content/styles/index.less +1 -1
  38. package/dist/esm/modules/content/utils.d.ts +16 -18
  39. package/dist/esm/modules/content/utils.js +32 -21
  40. package/dist/esm/modules/home/demo/create.js +0 -3
  41. package/dist/esm/modules/home/demo/edit.js +0 -3
  42. package/dist/esm/modules/home/demo/index.js +1 -4
  43. package/dist/esm/modules/home/demo/scene.js +0 -3
  44. package/dist/esm/modules/home/index.js +1 -1
  45. package/dist/esm/modules/home/styles/index.less +10 -3
  46. package/dist/esm/modules/topPanel/index.js +119 -84
  47. package/dist/esm/modules/topPanel/styles/index.less +135 -16
  48. package/dist/esm/modules/topPanel/types.d.ts +4 -1
  49. package/dist/esm/style/image/empty.png +0 -0
  50. package/dist/esm/style/index.less +8 -1
  51. package/dist/esm/types.d.ts +25 -4
  52. package/dist/esm/utils/formData.d.ts +27 -6
  53. package/dist/esm/utils/formData.js +65 -29
  54. package/package.json +2 -2
  55. package/dist/esm/modules/chart/demo/panel.d.ts +0 -3
  56. package/dist/esm/modules/chart/demo/panel.js +0 -30
  57. package/dist/esm/utils/base64.d.ts +0 -29
  58. package/dist/esm/utils/base64.js +0 -132
@@ -1,3 +1,9 @@
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); }
2
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
3
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
4
+ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
5
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
6
+ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
1
7
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
2
8
  function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
3
9
  function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -9,20 +15,22 @@ import { Form, Button } from 'antd';
9
15
  import { BizAttributeSelector, BizUserGroupHeader } from '@zgfe/business-lib';
10
16
  import EventFilter from "../../components/eventFilter";
11
17
  import "./styles/index.less";
12
- var classPrefix = 'top-panel';
18
+ var classPrefix = 'top-panel-interval';
13
19
  var TopPanel = function TopPanel(props) {
20
+ var _defaultValue$associa, _defaultValue$associa2, _defaultValue$associa3, _defaultValue$associa4, _defaultValue$associa5, _defaultValue$associa6, _defaultValue$associa7, _defaultValue$associa8, _defaultValue$dimensi, _defaultValue$dimensi2, _defaultValue$dimensi3, _defaultValue$dimensi4;
14
21
  var defaultValue = props.defaultValue,
15
- ajaxFlag = props.ajaxFlag,
22
+ loading = props.loading,
23
+ collapseRef = props.collapseRef,
16
24
  finalSearchData = props.finalSearchData,
17
25
  fetchRequest = props.fetchRequest;
18
26
  var _Form$useForm = Form.useForm(),
19
27
  _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
20
28
  form = _Form$useForm2[0];
21
- var _useState = useState(-100),
29
+ var _useState = useState(null),
22
30
  _useState2 = _slicedToArray(_useState, 2),
23
31
  startId = _useState2[0],
24
32
  setStartId = _useState2[1];
25
- var _useState3 = useState(-100),
33
+ var _useState3 = useState(null),
26
34
  _useState4 = _slicedToArray(_useState3, 2),
27
35
  endId = _useState4[0],
28
36
  setEndId = _useState4[1];
@@ -31,89 +39,99 @@ var TopPanel = function TopPanel(props) {
31
39
  _useState6 = _slicedToArray(_useState5, 2),
32
40
  relevancy = _useState6[0],
33
41
  setRelevancy = _useState6[1];
34
- // 筛选条件值
42
+ var _useState7 = useState(true),
43
+ _useState8 = _slicedToArray(_useState7, 2),
44
+ relevancyFl = _useState8[0],
45
+ setRelevancyFl = _useState8[1];
35
46
  var _ref = defaultValue,
36
- id = _ref.id,
37
- name = _ref.name,
38
- dimension = _ref.dimension,
39
- filters = _ref.filters,
40
47
  userGroup = _ref.userGroup;
41
48
  // 细分属性初始值
42
- var _useState7 = useState(),
43
- _useState8 = _slicedToArray(_useState7, 2),
44
- bizAttributeSelectorValue = _useState8[0],
45
- setBizAttributeSelectorValue = _useState8[1];
49
+ var _useState9 = useState(),
50
+ _useState10 = _slicedToArray(_useState9, 2),
51
+ bizAttributeSelectorValue = _useState10[0],
52
+ setBizAttributeSelectorValue = _useState10[1];
46
53
  // 用户组和事件变更
47
54
  var onValuesChange = function onValuesChange(data, allData) {
48
55
  var _data = {};
56
+ setRelevancyFl(false);
49
57
  if (allData.start) {
50
- if (allData.start.id !== -100) {
58
+ if (allData.start.id !== null) {
59
+ var _allData$start;
51
60
  _data = allData.start;
52
61
  setStartId(allData.start.id);
53
- if (allData.start.relevancy !== undefined) {
54
- // form.setFieldsValue({
55
- // associatedPreAttr: undefined,
56
- // associatedNextAttr: undefined,
57
- // });
58
- }
59
- setRelevancy(allData.start.relevancy);
62
+ setRelevancy(allData === null || allData === void 0 ? void 0 : (_allData$start = allData.start) === null || _allData$start === void 0 ? void 0 : _allData$start.relevancy);
63
+ } else {
64
+ setRelevancyFl(true);
60
65
  }
61
66
  }
62
67
  if (allData.end) {
63
- if (allData.end.id !== -100) {
68
+ if (allData.end.id !== null) {
64
69
  _data = allData.end;
65
70
  setEndId(allData.end.id);
71
+ } else {
72
+ setRelevancyFl(true);
66
73
  }
67
74
  }
68
75
  if (allData.userGroup) {
69
- _data.userGroup = [];
70
- allData.userGroup.map(function (item) {
71
- _data.userGroup && _data.userGroup.push(item);
72
- });
76
+ _data.userGroup = allData.userGroup;
73
77
  if (_data.userGroup.length <= 0) _data.userGroup = [0];
74
78
  }
75
- if (data.start) {
76
- // 事件id不变,不自动请求
77
- if (finalSearchData && finalSearchData.id && data.start.id === finalSearchData.id) {
78
- ajaxFlag = false;
79
- } else {
80
- ajaxFlag = true;
81
- }
82
- }
83
- if (data.end) {
84
- // 事件id不变,不自动请求
85
- if (finalSearchData && finalSearchData.id && data.end.id === finalSearchData.id) {
86
- ajaxFlag = false;
87
- } else {
88
- ajaxFlag = true;
89
- }
90
- }
91
- props.onChange(allData, ajaxFlag);
79
+ props.onChange(allData, (finalSearchData === null || finalSearchData === void 0 ? void 0 : finalSearchData.chartType) === 'boxplot' ? true : false);
92
80
  };
93
-
94
- // 重置
95
81
  var resetting = function resetting() {
96
82
  form.resetFields();
97
83
  form.setFieldsValue({
98
84
  userGroup: [0],
99
- start: {},
100
- end: {},
85
+ start: undefined,
86
+ end: undefined,
101
87
  dimension: undefined,
88
+ filters: undefined,
102
89
  associatedPreAttr: undefined,
103
90
  associatedNextAttr: undefined
104
91
  });
92
+ setRelevancy(false);
105
93
  props.onChange({
106
94
  userGroup: [0],
95
+ start: undefined,
96
+ end: undefined,
107
97
  id: undefined,
108
- name: undefined,
109
98
  filters: undefined,
110
- dimension: undefined
99
+ name: undefined,
100
+ dimension: undefined,
101
+ associatedPreAttr: undefined,
102
+ associatedNextAttr: undefined
111
103
  }, true);
112
104
  };
113
105
  // 细分属性
114
- var onChangeAttr = function onChangeAttr(attr) {
106
+ var onChangeAttr = function onChangeAttr(attr, type) {
115
107
  if (attr === undefined) {
116
108
  // 删除细分属性
109
+ switch (type) {
110
+ case 'associatedPreAttr':
111
+ form.setFieldsValue({
112
+ associatedPreAttr: undefined
113
+ });
114
+ props.onChange({
115
+ associatedPreAttr: undefined
116
+ }, true);
117
+ break;
118
+ case 'associatedNextAttr':
119
+ form.setFieldsValue({
120
+ associatedNextAttr: undefined
121
+ });
122
+ props.onChange({
123
+ associatedNextAttr: undefined
124
+ }, true);
125
+ break;
126
+ case 'dimension':
127
+ form.setFieldsValue({
128
+ dimension: undefined
129
+ });
130
+ props.onChange({
131
+ dimension: undefined
132
+ }, true);
133
+ break;
134
+ }
117
135
  setBizAttributeSelectorValue(undefined);
118
136
  } else {
119
137
  var _value = attr.propCategory === 'eventProp' ? attr.id : attr.name;
@@ -129,49 +147,53 @@ var TopPanel = function TopPanel(props) {
129
147
  form: form,
130
148
  component: "div",
131
149
  colon: false,
132
- className: "panel-form",
150
+ className: "panel-form-interval",
133
151
  layout: "vertical",
134
152
  initialValues: {
135
- userGroup: userGroup ? userGroup.map(function (item) {
136
- return {
137
- id: item
138
- };
139
- }) : [{
140
- id: 0
141
- }],
142
- start: {
143
- id: id,
144
- name: name,
145
- dimension: dimension,
146
- filters: filters
147
- },
148
- end: {
149
- id: id,
150
- name: name,
151
- dimension: dimension,
152
- filters: filters
153
- }
153
+ userGroup: userGroup ? userGroup : [0],
154
+ start: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.start,
155
+ end: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.end,
156
+ associatedNextAttr: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.associated_next_attr), {}, {
157
+ dimensionSub: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa = defaultValue.associated_next_attr) === null || _defaultValue$associa === void 0 ? void 0 : _defaultValue$associa.dimension_sub,
158
+ isHidden: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa2 = defaultValue.associated_next_attr) === null || _defaultValue$associa2 === void 0 ? void 0 : _defaultValue$associa2.is_hidden,
159
+ propCategory: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa3 = defaultValue.associated_next_attr) === null || _defaultValue$associa3 === void 0 ? void 0 : _defaultValue$associa3.prop_category,
160
+ eventId: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa4 = defaultValue.associated_next_attr) === null || _defaultValue$associa4 === void 0 ? void 0 : _defaultValue$associa4.event_id
161
+ }),
162
+ associatedPreAttr: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.associated_pre_attr), {}, {
163
+ dimensionSub: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa5 = defaultValue.associated_pre_attr) === null || _defaultValue$associa5 === void 0 ? void 0 : _defaultValue$associa5.dimension_sub,
164
+ isHidden: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa6 = defaultValue.associated_pre_attr) === null || _defaultValue$associa6 === void 0 ? void 0 : _defaultValue$associa6.is_hidden,
165
+ propCategory: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa7 = defaultValue.associated_pre_attr) === null || _defaultValue$associa7 === void 0 ? void 0 : _defaultValue$associa7.prop_category,
166
+ eventId: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa8 = defaultValue.associated_pre_attr) === null || _defaultValue$associa8 === void 0 ? void 0 : _defaultValue$associa8.event_id
167
+ }),
168
+ dimension: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.dimension), {}, {
169
+ dimensionSub: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi = defaultValue.dimension) === null || _defaultValue$dimensi === void 0 ? void 0 : _defaultValue$dimensi.dimension_sub,
170
+ isHidden: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi2 = defaultValue.dimension) === null || _defaultValue$dimensi2 === void 0 ? void 0 : _defaultValue$dimensi2.is_hidden,
171
+ propCategory: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi3 = defaultValue.dimension) === null || _defaultValue$dimensi3 === void 0 ? void 0 : _defaultValue$dimensi3.prop_category,
172
+ eventId: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi4 = defaultValue.dimension) === null || _defaultValue$dimensi4 === void 0 ? void 0 : _defaultValue$dimensi4.event_id
173
+ })
154
174
  },
155
175
  scrollToFirstError: true,
156
176
  onValuesChange: onValuesChange
157
177
  }, /*#__PURE__*/React.createElement(Form.Item, {
158
178
  label: "",
159
179
  name: "userGroup",
160
- className: "space-item",
180
+ className: "space-item interval-item",
161
181
  style: {
162
182
  paddingLeft: 0
163
183
  }
164
184
  }, /*#__PURE__*/React.createElement(BizUserGroupHeader, {
185
+ enableTags: true,
165
186
  max: 1
166
- })), /*#__PURE__*/React.createElement(Form.Item, {
187
+ })), /*#__PURE__*/React.createElement("div", {
188
+ ref: collapseRef,
189
+ className: "collapseRefs"
190
+ }, /*#__PURE__*/React.createElement(Form.Item, {
167
191
  label: "\u5F00\u59CB\u4E8B\u4EF6",
168
192
  name: "start"
169
193
  }, /*#__PURE__*/React.createElement(EventFilter, {
194
+ relevancyFl: relevancyFl,
170
195
  relevancy: true
171
196
  })), relevancy ? /*#__PURE__*/React.createElement(Form.Item, {
172
- style: {
173
- marginBottom: 0
174
- },
175
197
  className: "associated"
176
198
  }, /*#__PURE__*/React.createElement("span", {
177
199
  className: "associated-link"
@@ -197,7 +219,7 @@ var TopPanel = function TopPanel(props) {
197
219
  enableDelete: true,
198
220
  onChange: onChangeAttr,
199
221
  onDelete: function onDelete() {
200
- onChangeAttr(undefined);
222
+ onChangeAttr(undefined, 'associatedPreAttr');
201
223
  }
202
224
  })), /*#__PURE__*/React.createElement("span", {
203
225
  className: "associated-label"
@@ -215,14 +237,27 @@ var TopPanel = function TopPanel(props) {
215
237
  enableDelete: true,
216
238
  onChange: onChangeAttr,
217
239
  onDelete: function onDelete() {
218
- onChangeAttr(undefined);
240
+ onChangeAttr(undefined, 'associatedNextAttr');
219
241
  }
220
- }))) : '', /*#__PURE__*/React.createElement(Form.Item, {
242
+ })), /*#__PURE__*/React.createElement("i", {
243
+ style: {
244
+ lineHeight: '32px',
245
+ marginLeft: '28px',
246
+ cursor: 'pointer'
247
+ },
248
+ onClick: function onClick() {
249
+ onChangeAttr(undefined, 'associatedPreAttr');
250
+ onChangeAttr(undefined, 'associatedNextAttr');
251
+ setRelevancy(false);
252
+ },
253
+ className: "bsicon qingchu"
254
+ })) : '', /*#__PURE__*/React.createElement(Form.Item, {
221
255
  label: "\u7ED3\u675F\u4E8B\u4EF6",
222
256
  name: "end"
223
257
  }, /*#__PURE__*/React.createElement(EventFilter, null)), /*#__PURE__*/React.createElement(Form.Item, {
224
258
  label: "\u6309\u5C5E\u6027\u7EC6\u5206",
225
- name: "dimension"
259
+ name: "dimension",
260
+ className: "dimension-interval"
226
261
  }, /*#__PURE__*/React.createElement(BizAttributeSelector, {
227
262
  enableEventProp: true,
228
263
  enableUserProp: true,
@@ -232,19 +267,19 @@ var TopPanel = function TopPanel(props) {
232
267
  enableDelete: true,
233
268
  onChange: onChangeAttr,
234
269
  onDelete: function onDelete() {
235
- onChangeAttr(undefined);
270
+ onChangeAttr(undefined, 'dimension');
236
271
  }
237
272
  })), /*#__PURE__*/React.createElement("div", {
238
273
  className: "".concat(classPrefix, "-form-botton-box")
239
274
  }, /*#__PURE__*/React.createElement(Button, {
240
275
  onClick: resetting
241
- }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button
242
- // disabled={ajaxFlag}
243
- , {
276
+ }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
277
+ loading: loading,
278
+ disabled: loading || !startId || !endId || relevancy && !(defaultValue !== null && defaultValue !== void 0 && defaultValue.associatedNextAttr) && !(defaultValue !== null && defaultValue !== void 0 && defaultValue.associatedNextAttr),
244
279
  type: "primary",
245
280
  onClick: function onClick() {
246
281
  fetchRequest(true);
247
282
  }
248
- }, "\u67E5\u8BE2")));
283
+ }, "\u67E5\u8BE2"))));
249
284
  };
250
285
  export default TopPanel;
@@ -1,7 +1,7 @@
1
1
  @import '../../../assets/icons/iconfont.css';
2
2
  @import '../../../assets/business/iconfont.css';
3
3
 
4
- .top-panel {
4
+ .top-panel-interval {
5
5
  &-form-botton-box {
6
6
  display: flex;
7
7
  justify-content: flex-end;
@@ -17,17 +17,148 @@
17
17
  }
18
18
  }
19
19
 
20
- .panel-form {
20
+ .panel-form-interval {
21
+ .interval-item {
22
+ margin-top: -2px;
23
+ .ant-space-vertical {
24
+ gap: 0px !important;
25
+ width: 100%;
26
+ .ant-space-item:nth-child(1) {
27
+ padding: 0 12px;
28
+ }
29
+
30
+ .ant-space-item:nth-child(2) {
31
+ display: flex;
32
+ align-items: center;
33
+ height: 42px;
34
+ margin-top: 4px;
35
+ padding: 0 12px;
36
+ }
37
+
38
+ .ant-space-item:nth-child(2):hover {
39
+ background-color: #e8efff;
40
+ }
41
+ }
42
+ }
43
+
44
+ .biz-user-group-header {
45
+ padding: 0;
46
+ background-color: #fff;
47
+ }
48
+
49
+ .space-item {
50
+ .ant-space-item {
51
+ .biz-user-group {
52
+ width: 100%;
53
+ min-width: 208px;
54
+ }
55
+ }
56
+
57
+ .ant-space-horizontal .ant-space-item:nth-child(2) .tianjia {
58
+ display: none;
59
+ }
60
+ }
61
+
62
+ .collapseRefs {
63
+ .ant-form-item {
64
+ margin-bottom: 16px;
65
+ }
66
+
67
+ .ant-form-item-control-input {
68
+ display: flex;
69
+ align-items: center;
70
+ }
71
+
72
+ .ant-form-item-label {
73
+ padding-left: 24px;
74
+ font-weight: 500;
75
+ }
76
+
77
+ .interval-box {
78
+ > div:nth-child(1) {
79
+ padding: 4px 24px;
80
+ }
81
+
82
+ > div:nth-child(1):hover {
83
+ background-color: #e8efff;
84
+ }
85
+
86
+ .biz-attr-condition-group-handle {
87
+ margin-right: 0;
88
+ margin-left: 32px;
89
+ }
90
+
91
+ .biz-attr-condition-group-container {
92
+ gap: 4px !important;
93
+ }
94
+
95
+ .biz-attr-condition-group-container-item {
96
+ max-width: calc(100% + 32px) !important;
97
+ margin-top: 4px;
98
+ padding: 4px 56px;
99
+ .ant-space-item {
100
+ width: auto;
101
+ max-width: auto;
102
+ margin-left: 0px;
103
+ padding: 0;
104
+ }
105
+ }
106
+
107
+ .ant-space-item:hover {
108
+ background-color: #e8efff;
109
+ }
110
+ }
111
+
112
+ .dimension-interval {
113
+ .ant-form-item-control-input {
114
+ padding: 4px 24px;
115
+ }
116
+
117
+ .ant-form-item-control-input:hover {
118
+ background-color: #e8efff;
119
+ }
120
+ }
121
+ }
122
+
21
123
  .biz-event-select {
22
124
  width: 208px;
23
125
  }
24
126
 
25
127
  > .ant-form-item {
26
- margin-bottom: 12px;
27
- padding-left: 24px;
128
+ margin-bottom: 16px;
129
+ .biz-user-group-val {
130
+ color: #021429;
131
+ }
28
132
  }
29
133
 
30
134
  .associated {
135
+ margin-top: -10px;
136
+ margin-bottom: 12px;
137
+
138
+ .qingchu {
139
+ color: #9aa1a9;
140
+ }
141
+
142
+ .qingchu:hover {
143
+ color: @error-color;
144
+ }
145
+
146
+ .ant-form-item-control-input {
147
+ padding: 4px 24px;
148
+
149
+ .ant-form-item-control-input {
150
+ padding: 0;
151
+ }
152
+
153
+ .ant-form-item {
154
+ margin-bottom: 0;
155
+ }
156
+ }
157
+
158
+ .ant-form-item-control-input:hover {
159
+ background-color: #e8efff;
160
+ }
161
+
31
162
  .associated-link {
32
163
  display: block;
33
164
  line-height: 32px;
@@ -53,15 +184,3 @@
53
184
  }
54
185
  }
55
186
  }
56
-
57
- .space-item {
58
- .ant-space-item {
59
- .biz-user-group {
60
- max-width: 208px;
61
- }
62
- }
63
-
64
- .ant-space-horizontal .ant-space-item:nth-child(2) .tianjia {
65
- display: none;
66
- }
67
- }
@@ -1,6 +1,7 @@
1
1
  import { AttrConditionTypes } from '@zgfe/business-lib';
2
2
  import { bizAttributeSelectorValueProp, SearchValue } from '../../types';
3
3
  export interface start {
4
+ eventId?: number;
4
5
  id?: number;
5
6
  name?: string;
6
7
  relevancy?: boolean;
@@ -10,7 +11,7 @@ export interface FormDataProps {
10
11
  /**
11
12
  * 用户群
12
13
  */
13
- userGroup?: number[];
14
+ userGroup?: any[];
14
15
  /**
15
16
  * 事件、属性、属性细分
16
17
  */
@@ -35,6 +36,7 @@ export interface TopPanelProps {
35
36
  * 默认值
36
37
  */
37
38
  defaultValue?: SearchValue;
39
+ loading?: boolean;
38
40
  /**
39
41
  * 数据更新
40
42
  */
@@ -51,4 +53,5 @@ export interface TopPanelProps {
51
53
  * 请求数据方法
52
54
  */
53
55
  fetchRequest: (flag?: boolean) => void;
56
+ collapseRef?: any;
54
57
  }
Binary file
@@ -1,7 +1,11 @@
1
- .event-form-data {
1
+ .interval-form-data {
2
2
  &-table-td {
3
3
  padding: 0 !important;
4
4
 
5
+ .ant-table-column-sorters {
6
+ justify-content: end !important;
7
+ }
8
+
5
9
  &-show {
6
10
  display: flex;
7
11
  align-items: center;
@@ -9,6 +13,7 @@
9
13
  min-width: 60px;
10
14
  height: 48px;
11
15
  cursor: pointer;
16
+
12
17
  span {
13
18
  width: 10px;
14
19
  height: 10px;
@@ -20,6 +25,7 @@
20
25
  &-name {
21
26
  display: flex;
22
27
  align-items: center;
28
+
23
29
  .bsicon {
24
30
  margin-right: 4px;
25
31
  color: #fd9f41;
@@ -37,6 +43,7 @@
37
43
 
38
44
  &-link {
39
45
  cursor: pointer;
46
+
40
47
  &:hover {
41
48
  color: #165dff;
42
49
  text-decoration: underline;
@@ -1,12 +1,18 @@
1
1
  import { AttrConditionTypes } from '@zgfe/business-lib';
2
2
  import { DatePickerTypes } from '@zgfe/business-lib/es/datePicker/types';
3
3
  import { ReactNode } from 'react';
4
- import { FormDataProps } from './modules/topPanel/types';
4
+ import { FormDataProps, start } from './modules/topPanel/types';
5
5
  /**
6
6
  * 属性选择器 默认值
7
7
  */
8
8
  export interface bizAttributeSelectorValueProp {
9
9
  propCategory?: string;
10
+ prop_category?: string;
11
+ dimension_sub?: string;
12
+ label?: string;
13
+ is_hidden?: string;
14
+ real_time?: string;
15
+ event_id?: string;
10
16
  category?: string;
11
17
  value?: number | string;
12
18
  key?: number | string;
@@ -56,6 +62,7 @@ export interface SearchValue {
56
62
  * @description 用户群id
57
63
  */
58
64
  userGroup?: number[];
65
+ user_group?: number[];
59
66
  /**
60
67
  * 事件、属性、属性细分
61
68
  */
@@ -89,10 +96,24 @@ export interface SearchValue {
89
96
  *
90
97
  */
91
98
  associatedPreAttr?: bizAttributeSelectorValueProp;
99
+ associated_pre_attr?: bizAttributeSelectorValueProp;
92
100
  /**
93
101
  * @description 关联属性-结束
94
102
  */
103
+ associated_next_attr?: bizAttributeSelectorValueProp;
95
104
  associatedNextAttr?: bizAttributeSelectorValueProp;
105
+ /**
106
+ * @description 开始事件
107
+ */
108
+ start?: start;
109
+ /**
110
+ * @description 结束事件
111
+ */
112
+ end?: start;
113
+ /**
114
+ * @description 分类
115
+ */
116
+ module?: string;
96
117
  }
97
118
  export interface UserDrillParamsProp {
98
119
  /**
@@ -124,7 +145,7 @@ export interface UserDrillParamsProp {
124
145
  */
125
146
  module?: string;
126
147
  }
127
- export type EventChartTypes = 'line' | 'bar' | 'pie' | 'map';
148
+ export type EventChartTypes = 'line' | 'bar' | 'pie' | 'map' | 'boxplot';
128
149
  /**
129
150
  * 图表选择类型
130
151
  */
@@ -135,7 +156,7 @@ export interface ChartItemProp {
135
156
  disabled?: boolean;
136
157
  }
137
158
  export interface ChartData {
138
- app_data: {
159
+ appData: {
139
160
  series?: {
140
161
  names: string[];
141
162
  values: number[][];
@@ -145,7 +166,7 @@ export interface ChartData {
145
166
  };
146
167
  }
147
168
  export interface ResponseDataProps {
148
- app_data: any;
169
+ appData: any;
149
170
  xAxis?: string[];
150
171
  x_axis?: string[];
151
172
  series: SeriesProps[];