@zgfe/modules-dm 1.0.34-qirui.1 → 1.0.35

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 (42) hide show
  1. package/es/components/demo.js +2 -1
  2. package/es/constants/api.d.ts +10 -0
  3. package/es/constants/api.js +25 -12
  4. package/es/modules/dataCollection/collectionAttributeList.js +32 -20
  5. package/es/modules/dataCollection/collectionEventList.js +62 -87
  6. package/es/modules/dataCollection/components/createVirtualDrawer.d.ts +4 -0
  7. package/es/modules/dataCollection/components/createVirtualDrawer.js +279 -0
  8. package/es/modules/dataCollection/components/eventFilter/index.d.ts +5 -0
  9. package/es/modules/dataCollection/components/eventFilter/index.js +154 -0
  10. package/es/modules/dataCollection/components/eventFilter/styles/index.less +72 -0
  11. package/es/modules/dataCollection/components/eventFilter/types.d.ts +52 -0
  12. package/es/modules/dataCollection/components/eventFilter/types.js +1 -0
  13. package/es/modules/dataCollection/components/eventGroupingDrawer.d.ts +4 -0
  14. package/es/modules/dataCollection/components/eventGroupingDrawer.js +452 -0
  15. package/es/modules/dataCollection/components/eventItem.d.ts +3 -0
  16. package/es/modules/dataCollection/components/eventItem.js +53 -0
  17. package/es/modules/dataCollection/components/selectAttributes.d.ts +3 -0
  18. package/es/modules/dataCollection/components/selectAttributes.js +219 -0
  19. package/es/modules/dataCollection/{tablePlus.d.ts → components/tablePlus.d.ts} +2 -1
  20. package/es/modules/dataCollection/{tablePlus.js → components/tablePlus.js} +162 -143
  21. package/es/modules/dataCollection/components/virtualTablePlus.d.ts +5 -0
  22. package/es/modules/dataCollection/components/virtualTablePlus.js +400 -0
  23. package/es/modules/dataCollection/index.js +7 -6
  24. package/es/modules/dataCollection/styles/index.less +535 -20
  25. package/es/modules/dataCollection/types.d.ts +78 -0
  26. package/es/modules/dataCollection/types.js +1 -0
  27. package/es/modules/dataCollection/virtualEventList.d.ts +4 -0
  28. package/es/modules/dataCollection/virtualEventList.js +343 -0
  29. package/es/modules/dataManage/demo/index.js +16 -12
  30. package/es/modules/dataPlan/addEventOrUser.js +1 -2
  31. package/es/modules/dataPlan/addPlan.js +3 -12
  32. package/es/modules/dataPlan/eventList.js +0 -1
  33. package/es/modules/dataPlan/index.js +8 -9
  34. package/es/modules/dataPlan/tablePlus.js +0 -1
  35. package/es/modules/dataPlan/userAttributeList.js +0 -1
  36. package/es/utils/index.d.ts +49 -0
  37. package/es/utils/index.js +314 -0
  38. package/package.json +6 -4
  39. package/es/modules/dataCollection/demo/index.d.ts +0 -2
  40. package/es/modules/dataCollection/demo/index.js +0 -7
  41. package/es/modules/dataPlan/demo/index.d.ts +0 -2
  42. package/es/modules/dataPlan/demo/index.js +0 -6
package/es/utils/index.js CHANGED
@@ -1,3 +1,310 @@
1
+ /**
2
+ * 虚拟事件编辑 判断内容是否有改动;有改动返回true
3
+ */
4
+ export var getVirtualContentChange = function getVirtualContentChange(oldData, newData) {
5
+ var eventJson = function eventJson(_old, _new) {
6
+ var flag = 0;
7
+ if (_old.length !== _new.length) {
8
+ return true;
9
+ }
10
+ _old.map(function (item, index) {
11
+ var _new$index, _new$index2;
12
+ if (item.eventId !== _new[index].eventId) {
13
+ flag++;
14
+ return;
15
+ }
16
+ if ((item === null || item === void 0 ? void 0 : item.filters) === undefined && ((_new$index = _new[index]) === null || _new$index === void 0 ? void 0 : _new$index.filters) !== undefined || (item === null || item === void 0 ? void 0 : item.filters) !== undefined && ((_new$index2 = _new[index]) === null || _new$index2 === void 0 ? void 0 : _new$index2.filters) === undefined) {
17
+ flag++;
18
+ return;
19
+ }
20
+ if ((item === null || item === void 0 ? void 0 : item.filters) && (item === null || item === void 0 ? void 0 : item.filters.conditions)) {
21
+ var _new$index3;
22
+ if ((item === null || item === void 0 ? void 0 : item.filters.conditions.length) !== ((_new$index3 = _new[index]) === null || _new$index3 === void 0 ? void 0 : _new$index3.filters.conditions.length)) {
23
+ flag++;
24
+ return;
25
+ }
26
+ item === null || item === void 0 ? void 0 : item.filters.conditions.map(function (_item, _index) {
27
+ var _new$index4, _new$index5, _new$index6;
28
+ if (_item.attrId !== ((_new$index4 = _new[index]) === null || _new$index4 === void 0 ? void 0 : _new$index4.filters.conditions[_index].attrId) || JSON.stringify(_item.values) !== JSON.stringify((_new$index5 = _new[index]) === null || _new$index5 === void 0 ? void 0 : _new$index5.filters.conditions[_index].values) || _item.operator !== ((_new$index6 = _new[index]) === null || _new$index6 === void 0 ? void 0 : _new$index6.filters.conditions[_index].operator)) {
29
+ flag++;
30
+ }
31
+ });
32
+ }
33
+ });
34
+ return flag === 0 ? false : true;
35
+ };
36
+ if (oldData.aliasName != newData.aliasName) {
37
+ return true;
38
+ }
39
+ if (oldData.eventName != newData.eventName) {
40
+ return true;
41
+ }
42
+ if (oldData.groupId != newData.eventGroupId) {
43
+ return true;
44
+ }
45
+ if (nullToEmptyString(oldData.description) != nullToEmptyString(newData.desc)) {
46
+ return true;
47
+ }
48
+ if (eventJson(oldData.eventJson, newData.eventJson)) {
49
+ return true;
50
+ }
51
+ return false;
52
+ };
53
+ /**
54
+ * 虚拟事件属性超过100个,选择属性后的回调,处理提交数据
55
+ */
56
+ export var getSubmitHandleData = function getSubmitHandleData(selectAttributes, submitData, data) {
57
+ var eventAttr = {};
58
+ data[0].attrList.map(function (item) {
59
+ if (selectAttributes.indexOf(item.label) !== -1) {
60
+ item.ofEventId.map(function (eventId) {
61
+ if (eventAttr.hasOwnProperty(eventId)) {
62
+ eventAttr[eventId].push(item.label);
63
+ } else {
64
+ eventAttr[eventId] = [item.label];
65
+ }
66
+ });
67
+ }
68
+ });
69
+ submitData.eventJson.map(function (item) {
70
+ if (eventAttr.hasOwnProperty(item.eventId)) {
71
+ item.attrs = eventAttr[item.eventId];
72
+ } else {
73
+ item.attrs = [""];
74
+ }
75
+ });
76
+ return submitData;
77
+ };
78
+ /**
79
+ * 创建或编辑虚拟事件时,判断虚拟事件属性是否超过100
80
+ */
81
+ export var getDelectAttributesData = function getDelectAttributesData(data, eventGroupList) {
82
+ var eventList = [];
83
+ var attrList = [];
84
+ var filterAttrJson = {};
85
+ var filterAttrData = [];
86
+ eventGroupList.map(function (event) {
87
+ event.eventList.map(function (item) {
88
+ data.map(function (_item) {
89
+ if (item.id === _item.eventId) {
90
+ eventList.push(item);
91
+ attrList = attrList.concat(item.attrList);
92
+ }
93
+ });
94
+ });
95
+ });
96
+ attrList.map(function (item) {
97
+ if (filterAttrJson.hasOwnProperty(item.label)) {
98
+ filterAttrJson[item.label].ofEventId.push(item.eventId);
99
+ } else {
100
+ item.ofEventId = [item.eventId];
101
+ filterAttrJson[item.label] = item;
102
+ }
103
+ });
104
+ for (var key in filterAttrJson) {
105
+ filterAttrData.push(filterAttrJson[key]);
106
+ }
107
+ eventList.unshift({
108
+ name: '所有事件',
109
+ id: -999,
110
+ attrList: filterAttrData
111
+ });
112
+ return eventList;
113
+ };
114
+ /**
115
+ * 创建或编辑虚拟事件时,判断eventJson是否可以提交保存
116
+ */
117
+ export var eventJsonHandle = function eventJsonHandle(data) {
118
+ if (!data.eventName) {
119
+ return false;
120
+ }
121
+ if (!data.aliasName) {
122
+ return false;
123
+ }
124
+ if (data.eventJson.length > 0) {
125
+ var flag = true;
126
+ data.eventJson.map(function (item) {
127
+ if (item === undefined || Object.keys(item).length <= 0 || item.eventId === undefined) {
128
+ flag = false;
129
+ } else {
130
+ if (item.count > 0) {
131
+ if (item.filters && item.filters.conditions.length > 0) {
132
+ if (item.filters.conditions.length !== item.count) {
133
+ flag = false;
134
+ }
135
+ item.filters.conditions.map(function (_item) {
136
+ var _item$values;
137
+ 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;
138
+ });
139
+ } else {
140
+ flag = false;
141
+ }
142
+ }
143
+ }
144
+ });
145
+ return flag;
146
+ } else {
147
+ return false;
148
+ }
149
+ };
150
+ /**
151
+ * 指标分组管理:移动
152
+ */
153
+ export var eventMoveData = function eventMoveData(groupId, groupingData, setGroupingData) {
154
+ var ids = [];
155
+ var groupingOption = [];
156
+ groupingData.map(function (item, index) {
157
+ if (item.groupId === groupId) {
158
+ item.eventList.map(function (_item) {
159
+ if (_item.checked) {
160
+ ids.push(_item.event_id);
161
+ }
162
+ });
163
+ } else {
164
+ groupingOption.push({
165
+ value: item.groupId,
166
+ label: item.groupName ? item.groupName : '未分组'
167
+ });
168
+ }
169
+ });
170
+ var _groupingData = [];
171
+ groupingData.map(function (item) {
172
+ _groupingData.push(item);
173
+ });
174
+ setGroupingData(_groupingData);
175
+ return {
176
+ length: ids.length,
177
+ ids: ids.length > 0 ? ids.join(',') : '',
178
+ groupingOption: groupingOption
179
+ };
180
+ };
181
+ /**
182
+ * 指标分组管理:显示或隐藏
183
+ */
184
+ export var eventShowOrHiddenData = function eventShowOrHiddenData(type, groupId, groupingData, setGroupingData) {
185
+ var ids = [];
186
+ groupingData.map(function (item, index) {
187
+ if (item.groupId === groupId) {
188
+ item.checked = false;
189
+ item.eventList.map(function (_item) {
190
+ if (_item.checked) {
191
+ ids.push(_item.event_id);
192
+ _item.event_hidden = type;
193
+ _item.checked = false;
194
+ }
195
+ });
196
+ }
197
+ });
198
+ var _groupingData = [];
199
+ groupingData.map(function (item) {
200
+ _groupingData.push(item);
201
+ });
202
+ setGroupingData(_groupingData);
203
+ return ids.length > 0 ? ids.join(',') : '';
204
+ };
205
+ /**
206
+ * 指标分组管理:分组展开与关闭
207
+ */
208
+ export var openChangeData = function openChangeData(groupId, groupingData) {
209
+ groupingData.map(function (item) {
210
+ if (item.groupId === groupId) {
211
+ item.open = !item.open;
212
+ }
213
+ });
214
+ return groupingData;
215
+ };
216
+ /**
217
+ * 指标分组管理:事件全选处理
218
+ */
219
+ export var eventCheckedAll = function eventCheckedAll(groupId, groupingData) {
220
+ groupingData.map(function (item) {
221
+ if (item.groupId === groupId) {
222
+ item.checked = !item.checked;
223
+ } else {
224
+ item.checked = false;
225
+ }
226
+ item.eventList.map(function (_item) {
227
+ if (_item.searchShow === 1) _item.checked = item.checked;
228
+ });
229
+ });
230
+ return groupingData;
231
+ };
232
+ /**
233
+ * 指标分组管理:分组中事件列表初始化
234
+ */
235
+ export var eventListHandle = function eventListHandle(data) {
236
+ var _open = false;
237
+ data.map(function (item) {
238
+ item.checked = false;
239
+ item.open = false;
240
+ if (item.eventList.length > 0) {
241
+ item.eventList = item.eventList.filter(function (_item) {
242
+ _item.searchShow = 1;
243
+ return _item.is_delete === 0;
244
+ });
245
+ if (item.eventList.length > 0 && !_open) {
246
+ _open = true;
247
+ item.open = true;
248
+ }
249
+ }
250
+ item.count = item.eventList.length;
251
+ });
252
+ return data;
253
+ };
254
+ /**
255
+ * 指标分组管理:搜索事件名称或别名,判断是否展示
256
+ */
257
+ export var eventShow = function eventShow(data, searchData) {
258
+ data.map(function (item) {
259
+ var count = 0; // 搜索实时展示的指标数量
260
+ var len = 0; // 当前选中的指标数量
261
+ item.eventList.map(function (_item) {
262
+ if (searchData === '') {
263
+ _item.searchShow = 1;
264
+ count++;
265
+ } else {
266
+ if (_item.event_name.indexOf(searchData) !== -1 || (_item === null || _item === void 0 ? void 0 : _item.alias_name) && (_item === null || _item === void 0 ? void 0 : _item.alias_name.indexOf(searchData)) !== -1) {
267
+ _item.searchShow = 1;
268
+ count++;
269
+ } else {
270
+ _item.searchShow = 0;
271
+ _item.checked = false;
272
+ }
273
+ }
274
+ if (_item.checked) len++;
275
+ });
276
+ if (count == len) {
277
+ item.checked = true;
278
+ } else {
279
+ item.checked = false;
280
+ }
281
+ item.count = count;
282
+ });
283
+ return data;
284
+ };
285
+ /**
286
+ * 指标分组管理:单个事件选中处理
287
+ */
288
+ export var eventChecked = function eventChecked(groupId, eventId, groupingData) {
289
+ groupingData.map(function (item) {
290
+ if (item.groupId === groupId) {
291
+ var len = 0;
292
+ item.eventList.map(function (_item) {
293
+ if (_item.event_id === eventId) {
294
+ _item.checked = !_item.checked;
295
+ }
296
+ if (_item.checked) len++;
297
+ });
298
+ if (item.eventList.length == len) {
299
+ item.checked = true;
300
+ } else {
301
+ item.checked = false;
302
+ }
303
+ }
304
+ });
305
+ return groupingData;
306
+ };
307
+ // 获取appId,为了解决之前遇到切换应用但是currentApp里面的appId不更新的问题
1
308
  export var getAppID = function getAppID(currentApp) {
2
309
  var href = window.location.href;
3
310
  if (href.indexOf('/app/') != -1 && href.indexOf('localhost') == -1) {
@@ -6,6 +313,13 @@ export var getAppID = function getAppID(currentApp) {
6
313
  return currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId;
7
314
  }
8
315
  };
316
+ // null 或 undefined 转为 空字符串
317
+ export var nullToEmptyString = function nullToEmptyString(data) {
318
+ if (data === null || data === undefined) {
319
+ return '';
320
+ }
321
+ return data;
322
+ };
9
323
  /**
10
324
  * 获取第一个表格的可视化高度
11
325
  * @param {*} extraHeight 额外的高度(表格底部的内容高度 Number类型,默认为74)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-dm",
3
- "version": "1.0.34-qirui.1",
3
+ "version": "1.0.35",
4
4
  "license": "ISC",
5
5
  "module": "es/index.js",
6
6
  "typings": "es/index.d.ts",
@@ -28,7 +28,9 @@
28
28
  ]
29
29
  },
30
30
  "dependencies": {
31
- "react": "^16.12.0 || ^17.0.0"
31
+ "array-move": "^4.0.0",
32
+ "react": "^16.12.0 || ^17.0.0",
33
+ "react-sortable-hoc": "^2.0.0"
32
34
  },
33
35
  "devDependencies": {
34
36
  "@testing-library/jest-dom": "^5.15.1",
@@ -37,7 +39,7 @@
37
39
  "@types/lodash": "^4.14.182",
38
40
  "@umijs/fabric": "^2.8.1",
39
41
  "@umijs/test": "^3.0.5",
40
- "@zgfe/business-lib": "1.1.96-qirui.0",
42
+ "@zgfe/business-lib": "1.2.3-heyh.1",
41
43
  "antd": "4.24.10",
42
44
  "dumi": "^1.1.0",
43
45
  "father-build": "^1.17.2",
@@ -49,7 +51,7 @@
49
51
  "umi-request": "^1.4.0",
50
52
  "yorkie": "^2.0.0"
51
53
  },
52
- "gitHead": "4bb72f2f78a3b969c52e8ac1dc8a0fd96cebc5ed",
54
+ "gitHead": "8c0daba1c89e4ca8484e9485f58e5f7e94a2c509",
53
55
  "gitHooks": {
54
56
  "pre-commit": "lint-staged"
55
57
  }
@@ -1,2 +0,0 @@
1
- declare const _default: () => JSX.Element;
2
- export default _default;
@@ -1,7 +0,0 @@
1
- import React from 'react';
2
- import { DataCollection } from '@zgfe/modules-dm';
3
- import { DemoWrapper } from '@zgfe/business-lib';
4
- // import DemoWrapper from '../../../components/demo';
5
- export default (function () {
6
- return /*#__PURE__*/React.createElement(DemoWrapper, null, /*#__PURE__*/React.createElement(DataCollection, null));
7
- });
@@ -1,2 +0,0 @@
1
- declare const _default: () => JSX.Element;
2
- export default _default;
@@ -1,6 +0,0 @@
1
- import React from 'react';
2
- import { PlanList } from '@zgfe/modules-dm';
3
- import DemoWrapper from '../../../components/demo';
4
- export default (function () {
5
- return /*#__PURE__*/React.createElement(DemoWrapper, null, /*#__PURE__*/React.createElement(PlanList, null));
6
- });