@zgfe/modules-interval 1.0.0-interval.2 → 1.0.0-interval.20

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 +1 -1
  9. package/dist/esm/components/common/styles/index.less +11 -7
  10. package/dist/esm/components/eventFilter/index.js +21 -18
  11. package/dist/esm/components/eventFilter/styles/index.less +1 -4
  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 +9 -4
  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 +1 -1
  19. package/dist/esm/components/topBar/index.js +42 -24
  20. package/dist/esm/components/topBar/styles/index.less +2 -1
  21. package/dist/esm/components/topBar/types.d.ts +4 -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/demo/data.d.ts +34 -71
  28. package/dist/esm/modules/chart/demo/data.js +36 -488
  29. package/dist/esm/modules/chart/demo/index.js +8 -37
  30. package/dist/esm/modules/chart/index.d.ts +2 -2
  31. package/dist/esm/modules/chart/index.js +18 -14
  32. package/dist/esm/modules/chart/intervalChart.js +2 -2
  33. package/dist/esm/modules/chart/types.d.ts +1 -1
  34. package/dist/esm/modules/content/index.js +34 -20
  35. package/dist/esm/modules/content/styles/index.less +1 -1
  36. package/dist/esm/modules/content/types.d.ts +2 -1
  37. package/dist/esm/modules/content/utils.d.ts +16 -18
  38. package/dist/esm/modules/content/utils.js +31 -20
  39. package/dist/esm/modules/home/demo/create.js +0 -3
  40. package/dist/esm/modules/home/demo/edit.js +0 -3
  41. package/dist/esm/modules/home/demo/index.js +1 -4
  42. package/dist/esm/modules/home/demo/scene.js +0 -3
  43. package/dist/esm/modules/home/index.js +2 -1
  44. package/dist/esm/modules/home/styles/index.less +7 -3
  45. package/dist/esm/modules/topPanel/index.js +109 -80
  46. package/dist/esm/modules/topPanel/styles/index.less +126 -15
  47. package/dist/esm/modules/topPanel/types.d.ts +3 -1
  48. package/dist/esm/style/image/empty.png +0 -0
  49. package/dist/esm/style/index.less +8 -1
  50. package/dist/esm/types.d.ts +20 -4
  51. package/dist/esm/utils/formData.d.ts +27 -6
  52. package/dist/esm/utils/formData.js +63 -28
  53. package/package.json +2 -2
  54. package/dist/esm/modules/chart/demo/panel.d.ts +0 -3
  55. package/dist/esm/modules/chart/demo/panel.js +0 -30
  56. package/dist/esm/modules/topPanel/index.d.ts +0 -5
  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,23 @@ 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;
21
+ console.log(777777, props);
14
22
  var defaultValue = props.defaultValue,
15
- ajaxFlag = props.ajaxFlag,
23
+ loading = props.loading,
24
+ collapseRef = props.collapseRef,
16
25
  finalSearchData = props.finalSearchData,
17
26
  fetchRequest = props.fetchRequest;
18
27
  var _Form$useForm = Form.useForm(),
19
28
  _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
20
29
  form = _Form$useForm2[0];
21
- var _useState = useState(-100),
30
+ var _useState = useState(null),
22
31
  _useState2 = _slicedToArray(_useState, 2),
23
32
  startId = _useState2[0],
24
33
  setStartId = _useState2[1];
25
- var _useState3 = useState(-100),
34
+ var _useState3 = useState(null),
26
35
  _useState4 = _slicedToArray(_useState3, 2),
27
36
  endId = _useState4[0],
28
37
  setEndId = _useState4[1];
@@ -31,67 +40,43 @@ var TopPanel = function TopPanel(props) {
31
40
  _useState6 = _slicedToArray(_useState5, 2),
32
41
  relevancy = _useState6[0],
33
42
  setRelevancy = _useState6[1];
34
- // 筛选条件值
43
+ var _useState7 = useState(true),
44
+ _useState8 = _slicedToArray(_useState7, 2),
45
+ relevancyFl = _useState8[0],
46
+ setRelevancyFl = _useState8[1];
35
47
  var _ref = defaultValue,
36
- id = _ref.id,
37
- name = _ref.name,
38
- dimension = _ref.dimension,
39
- filters = _ref.filters,
40
48
  userGroup = _ref.userGroup;
41
49
  // 细分属性初始值
42
- var _useState7 = useState(),
43
- _useState8 = _slicedToArray(_useState7, 2),
44
- bizAttributeSelectorValue = _useState8[0],
45
- setBizAttributeSelectorValue = _useState8[1];
50
+ var _useState9 = useState(),
51
+ _useState10 = _slicedToArray(_useState9, 2),
52
+ bizAttributeSelectorValue = _useState10[0],
53
+ setBizAttributeSelectorValue = _useState10[1];
46
54
  // 用户组和事件变更
47
55
  var onValuesChange = function onValuesChange(data, allData) {
48
56
  var _data = {};
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);
60
63
  }
61
64
  }
62
65
  if (allData.end) {
63
- if (allData.end.id !== -100) {
66
+ if (allData.end.id !== null) {
64
67
  _data = allData.end;
65
68
  setEndId(allData.end.id);
66
69
  }
67
70
  }
71
+ if (startId && endId) {
72
+ setRelevancyFl(false);
73
+ }
68
74
  if (allData.userGroup) {
69
- _data.userGroup = [];
70
- allData.userGroup.map(function (item) {
71
- _data.userGroup && _data.userGroup.push(item);
72
- });
75
+ _data.userGroup = allData.userGroup;
73
76
  if (_data.userGroup.length <= 0) _data.userGroup = [0];
74
77
  }
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);
78
+ props.onChange(allData, (finalSearchData === null || finalSearchData === void 0 ? void 0 : finalSearchData.chartType) === 'boxplot' ? true : false);
92
79
  };
93
-
94
- // 重置
95
80
  var resetting = function resetting() {
96
81
  form.resetFields();
97
82
  form.setFieldsValue({
@@ -111,9 +96,35 @@ var TopPanel = function TopPanel(props) {
111
96
  }, true);
112
97
  };
113
98
  // 细分属性
114
- var onChangeAttr = function onChangeAttr(attr) {
99
+ var onChangeAttr = function onChangeAttr(attr, type) {
115
100
  if (attr === undefined) {
116
101
  // 删除细分属性
102
+ switch (type) {
103
+ case 'associatedPreAttr':
104
+ form.setFieldsValue({
105
+ associatedPreAttr: undefined
106
+ });
107
+ props.onChange({
108
+ associatedPreAttr: undefined
109
+ }, true);
110
+ break;
111
+ case 'associatedNextAttr':
112
+ form.setFieldsValue({
113
+ associatedNextAttr: undefined
114
+ });
115
+ props.onChange({
116
+ associatedNextAttr: undefined
117
+ }, true);
118
+ break;
119
+ case 'dimension':
120
+ form.setFieldsValue({
121
+ dimension: undefined
122
+ });
123
+ props.onChange({
124
+ dimension: undefined
125
+ }, true);
126
+ break;
127
+ }
117
128
  setBizAttributeSelectorValue(undefined);
118
129
  } else {
119
130
  var _value = attr.propCategory === 'eventProp' ? attr.id : attr.name;
@@ -129,49 +140,53 @@ var TopPanel = function TopPanel(props) {
129
140
  form: form,
130
141
  component: "div",
131
142
  colon: false,
132
- className: "panel-form",
143
+ className: "panel-form-interval",
133
144
  layout: "vertical",
134
145
  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
- }
146
+ userGroup: userGroup ? userGroup : [0],
147
+ start: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.start,
148
+ end: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.end,
149
+ associatedNextAttr: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.associated_next_attr), {}, {
150
+ 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,
151
+ 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,
152
+ 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,
153
+ 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
154
+ }),
155
+ associatedPreAttr: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.associated_pre_attr), {}, {
156
+ 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,
157
+ 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,
158
+ 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,
159
+ 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
160
+ }),
161
+ dimension: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.dimension), {}, {
162
+ dimensionSub: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi = defaultValue.dimension) === null || _defaultValue$dimensi === void 0 ? void 0 : _defaultValue$dimensi.dimension_sub,
163
+ isHidden: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi2 = defaultValue.dimension) === null || _defaultValue$dimensi2 === void 0 ? void 0 : _defaultValue$dimensi2.is_hidden,
164
+ propCategory: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi3 = defaultValue.dimension) === null || _defaultValue$dimensi3 === void 0 ? void 0 : _defaultValue$dimensi3.prop_category,
165
+ eventId: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi4 = defaultValue.dimension) === null || _defaultValue$dimensi4 === void 0 ? void 0 : _defaultValue$dimensi4.event_id
166
+ })
154
167
  },
155
168
  scrollToFirstError: true,
156
169
  onValuesChange: onValuesChange
157
170
  }, /*#__PURE__*/React.createElement(Form.Item, {
158
171
  label: "",
159
172
  name: "userGroup",
160
- className: "space-item",
173
+ className: "space-item interval-item",
161
174
  style: {
162
175
  paddingLeft: 0
163
176
  }
164
177
  }, /*#__PURE__*/React.createElement(BizUserGroupHeader, {
178
+ enableTags: true,
165
179
  max: 1
166
- })), /*#__PURE__*/React.createElement(Form.Item, {
180
+ })), /*#__PURE__*/React.createElement("div", {
181
+ ref: collapseRef,
182
+ className: "collapseRefs"
183
+ }, /*#__PURE__*/React.createElement(Form.Item, {
167
184
  label: "\u5F00\u59CB\u4E8B\u4EF6",
168
185
  name: "start"
169
186
  }, /*#__PURE__*/React.createElement(EventFilter, {
187
+ relevancyFl: relevancyFl,
170
188
  relevancy: true
171
189
  })), relevancy ? /*#__PURE__*/React.createElement(Form.Item, {
172
- style: {
173
- marginBottom: 0
174
- },
175
190
  className: "associated"
176
191
  }, /*#__PURE__*/React.createElement("span", {
177
192
  className: "associated-link"
@@ -197,7 +212,7 @@ var TopPanel = function TopPanel(props) {
197
212
  enableDelete: true,
198
213
  onChange: onChangeAttr,
199
214
  onDelete: function onDelete() {
200
- onChangeAttr(undefined);
215
+ onChangeAttr(undefined, 'associatedPreAttr');
201
216
  }
202
217
  })), /*#__PURE__*/React.createElement("span", {
203
218
  className: "associated-label"
@@ -215,14 +230,28 @@ var TopPanel = function TopPanel(props) {
215
230
  enableDelete: true,
216
231
  onChange: onChangeAttr,
217
232
  onDelete: function onDelete() {
218
- onChangeAttr(undefined);
233
+ onChangeAttr(undefined, 'associatedNextAttr');
219
234
  }
220
- }))) : '', /*#__PURE__*/React.createElement(Form.Item, {
235
+ })), /*#__PURE__*/React.createElement("i", {
236
+ style: {
237
+ lineHeight: '32px',
238
+ color: '#9AA1A9',
239
+ marginLeft: '28px',
240
+ cursor: 'pointer'
241
+ },
242
+ onClick: function onClick() {
243
+ onChangeAttr(undefined, 'associatedPreAttr');
244
+ onChangeAttr(undefined, 'associatedNextAttr');
245
+ setRelevancy(false);
246
+ },
247
+ className: "bsicon qingchu"
248
+ })) : '', /*#__PURE__*/React.createElement(Form.Item, {
221
249
  label: "\u7ED3\u675F\u4E8B\u4EF6",
222
250
  name: "end"
223
251
  }, /*#__PURE__*/React.createElement(EventFilter, null)), /*#__PURE__*/React.createElement(Form.Item, {
224
252
  label: "\u6309\u5C5E\u6027\u7EC6\u5206",
225
- name: "dimension"
253
+ name: "dimension",
254
+ className: "dimension-interval"
226
255
  }, /*#__PURE__*/React.createElement(BizAttributeSelector, {
227
256
  enableEventProp: true,
228
257
  enableUserProp: true,
@@ -232,19 +261,19 @@ var TopPanel = function TopPanel(props) {
232
261
  enableDelete: true,
233
262
  onChange: onChangeAttr,
234
263
  onDelete: function onDelete() {
235
- onChangeAttr(undefined);
264
+ onChangeAttr(undefined, 'dimension');
236
265
  }
237
266
  })), /*#__PURE__*/React.createElement("div", {
238
267
  className: "".concat(classPrefix, "-form-botton-box")
239
268
  }, /*#__PURE__*/React.createElement(Button, {
240
269
  onClick: resetting
241
- }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button
242
- // disabled={ajaxFlag}
243
- , {
270
+ }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
271
+ loading: loading,
272
+ disabled: loading || !startId || !endId || relevancy && !(defaultValue !== null && defaultValue !== void 0 && defaultValue.associatedNextAttr) && !(defaultValue !== null && defaultValue !== void 0 && defaultValue.associatedNextAttr),
244
273
  type: "primary",
245
274
  onClick: function onClick() {
246
275
  fetchRequest(true);
247
276
  }
248
- }, "\u67E5\u8BE2")));
277
+ }, "\u67E5\u8BE2"))));
249
278
  };
250
279
  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,140 @@
17
17
  }
18
18
  }
19
19
 
20
- .panel-form {
20
+ .panel-form-interval {
21
+ .interval-item {
22
+ .ant-space-vertical {
23
+ gap: 0px !important;
24
+ width: 100%;
25
+
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
+ .biz-attr-condition-group-container {
64
+ margin-top: 12px;
65
+ }
66
+
67
+ .ant-form-item {
68
+ margin-bottom: 12px;
69
+ }
70
+
71
+ .ant-form-item-control-input {
72
+ display: flex;
73
+ align-items: center;
74
+ }
75
+
76
+ .ant-form-item-label {
77
+ padding-left: 24px;
78
+ }
79
+
80
+ .interval-box {
81
+ > div:nth-child(1) {
82
+ padding: 4px 24px;
83
+ }
84
+
85
+ > div:nth-child(1):hover {
86
+ background-color: #e8efff;
87
+ }
88
+
89
+ .biz-attr-condition-group-handle {
90
+ margin-right: 0;
91
+ margin-left: 24px;
92
+ }
93
+
94
+ .biz-attr-condition-group-container {
95
+ gap: 4px !important;
96
+ }
97
+
98
+ .ant-space-item {
99
+ max-width: calc(100% + 24px) !important;
100
+ margin-left: -24px;
101
+ padding: 4px 48px;
102
+
103
+ .ant-space-item {
104
+ width: auto;
105
+ max-width: auto;
106
+ margin-left: 0px;
107
+ padding: 0;
108
+ }
109
+ }
110
+
111
+ .ant-space-item:hover {
112
+ background-color: #e8efff;
113
+ }
114
+ }
115
+
116
+ .dimension-interval {
117
+ .ant-form-item-control-input {
118
+ padding: 4px 24px;
119
+ }
120
+
121
+ .ant-form-item-control-input:hover {
122
+ background-color: #e8efff;
123
+ }
124
+ }
125
+ }
126
+
21
127
  .biz-event-select {
22
128
  width: 208px;
23
129
  }
24
130
 
25
131
  > .ant-form-item {
26
132
  margin-bottom: 12px;
27
- padding-left: 24px;
28
133
  }
29
134
 
30
135
  .associated {
136
+ margin-bottom: 12px;
137
+
138
+ .ant-form-item-control-input {
139
+ padding: 4px 20px;
140
+
141
+ .ant-form-item-control-input {
142
+ padding: 0;
143
+ }
144
+
145
+ .ant-form-item {
146
+ margin-bottom: 0;
147
+ }
148
+ }
149
+
150
+ .ant-form-item-control-input:hover {
151
+ background-color: #e8efff;
152
+ }
153
+
31
154
  .associated-link {
32
155
  display: block;
33
156
  line-height: 32px;
@@ -53,15 +176,3 @@
53
176
  }
54
177
  }
55
178
  }
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
- }
@@ -10,7 +10,7 @@ export interface FormDataProps {
10
10
  /**
11
11
  * 用户群
12
12
  */
13
- userGroup?: number[];
13
+ userGroup?: any[];
14
14
  /**
15
15
  * 事件、属性、属性细分
16
16
  */
@@ -35,6 +35,7 @@ export interface TopPanelProps {
35
35
  * 默认值
36
36
  */
37
37
  defaultValue?: SearchValue;
38
+ loading?: boolean;
38
39
  /**
39
40
  * 数据更新
40
41
  */
@@ -51,4 +52,5 @@ export interface TopPanelProps {
51
52
  * 请求数据方法
52
53
  */
53
54
  fetchRequest: (flag?: boolean) => void;
55
+ collapseRef?: any;
54
56
  }
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,17 @@
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
+ is_hidden?: string;
13
+ real_time?: string;
14
+ event_id?: string;
10
15
  category?: string;
11
16
  value?: number | string;
12
17
  key?: number | string;
@@ -56,6 +61,7 @@ export interface SearchValue {
56
61
  * @description 用户群id
57
62
  */
58
63
  userGroup?: number[];
64
+ user_group?: number[];
59
65
  /**
60
66
  * 事件、属性、属性细分
61
67
  */
@@ -89,10 +95,20 @@ export interface SearchValue {
89
95
  *
90
96
  */
91
97
  associatedPreAttr?: bizAttributeSelectorValueProp;
98
+ associated_pre_attr?: bizAttributeSelectorValueProp;
92
99
  /**
93
100
  * @description 关联属性-结束
94
101
  */
102
+ associated_next_attr?: bizAttributeSelectorValueProp;
95
103
  associatedNextAttr?: bizAttributeSelectorValueProp;
104
+ /**
105
+ * @description 开始事件
106
+ */
107
+ start?: start;
108
+ /**
109
+ * @description 结束事件
110
+ */
111
+ end?: start;
96
112
  }
97
113
  export interface UserDrillParamsProp {
98
114
  /**
@@ -124,7 +140,7 @@ export interface UserDrillParamsProp {
124
140
  */
125
141
  module?: string;
126
142
  }
127
- export type EventChartTypes = 'line' | 'bar' | 'pie' | 'map';
143
+ export type EventChartTypes = 'line' | 'bar' | 'pie' | 'map' | 'boxplot';
128
144
  /**
129
145
  * 图表选择类型
130
146
  */
@@ -135,7 +151,7 @@ export interface ChartItemProp {
135
151
  disabled?: boolean;
136
152
  }
137
153
  export interface ChartData {
138
- app_data: {
154
+ appData: {
139
155
  series?: {
140
156
  names: string[];
141
157
  values: number[][];
@@ -145,7 +161,7 @@ export interface ChartData {
145
161
  };
146
162
  }
147
163
  export interface ResponseDataProps {
148
- app_data: any;
164
+ appData: any;
149
165
  xAxis?: string[];
150
166
  x_axis?: string[];
151
167
  series: SeriesProps[];
@@ -9,7 +9,7 @@ import { DisplaySetup } from '../components/searchPanel/types';
9
9
  * @param columnData xAxis
10
10
  * @returns column fields
11
11
  */
12
- export declare function getColumns(eventGroupList: EventGroup[] | undefined, userPropList: UserProp[] | undefined, eventEnvList: EnvProp[] | undefined, columnData: string[], userGroup: number[], searchData: SearchValue, showList: string[]): ColumnsType<EventProps.ColumnsDataType>;
12
+ export declare function getColumns(eventGroupList: EventGroup[] | undefined, userPropList: UserProp[] | undefined, eventEnvList: EnvProp[] | undefined, columnData: string[], dataSource: ResponseDataProps, userGroup: number[], searchData: SearchValue, showList: string[]): ColumnsType<EventProps.ColumnsDataType>;
13
13
  /**
14
14
  * 获取属性的label
15
15
  * @param attrData 当前属性
@@ -27,6 +27,16 @@ export declare function getColumns(eventGroupList: EventGroup[] | undefined, use
27
27
  * @returns
28
28
  */
29
29
  export declare function formTableData(originalData: ChartData): {
30
+ key: string;
31
+ time: string;
32
+ max: number;
33
+ Q1: number;
34
+ median: number;
35
+ Q3: number;
36
+ min: number;
37
+ perValue: number;
38
+ peopleNum: number;
39
+ }[] | {
30
40
  key: number;
31
41
  time: string;
32
42
  max: number;
@@ -36,25 +46,36 @@ export declare function formTableData(originalData: ChartData): {
36
46
  min: number;
37
47
  perValue: number;
38
48
  peopleNum: number;
49
+ children: {
50
+ key: string;
51
+ time: string;
52
+ max: number;
53
+ Q1: number;
54
+ median: number;
55
+ Q3: number;
56
+ min: number;
57
+ perValue: number;
58
+ peopleNum: number;
59
+ }[];
39
60
  }[] | undefined;
40
61
  type ChartData = {
41
- app_data: {
62
+ appData: {
42
63
  series?: {
43
64
  names: string[];
44
65
  values: number[][];
45
66
  total: number[];
46
67
  }[];
47
- x_axis?: string[];
68
+ xAxis?: string[];
48
69
  };
49
70
  };
50
71
  export declare function convertDateArray(params: SearchValue | undefined, dateArray: string[]): string[] | undefined;
51
72
  /**
52
- * 获取查询结果的前10条
73
+ * 获取查询结果
53
74
  * @param source 结果数据
54
- * @returns 获取查询结果的前10条
75
+ * @returns 获取查询结果
55
76
  */
56
77
  export declare function getDefaultShow(source: ResponseDataProps, data: DisplaySetup[]): never[] | {
57
- app_data: any;
78
+ appData: any;
58
79
  xAxis?: string[] | undefined;
59
80
  x_axis?: string[] | undefined;
60
81
  series: SeriesProps[];