@riil-frontend/component-topology 2.10.0-alpha-2 → 2.10.0-alpha-3
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.
|
@@ -54,6 +54,7 @@ var regionTplState = {
|
|
|
54
54
|
};
|
|
55
55
|
|
|
56
56
|
var initialState = _extends({
|
|
57
|
+
viewGroup: undefined,
|
|
57
58
|
topo: [],
|
|
58
59
|
// 拓扑结构（点线）
|
|
59
60
|
elements: {
|
|
@@ -268,7 +269,7 @@ export default function (topoApp) {
|
|
|
268
269
|
var _this = this;
|
|
269
270
|
|
|
270
271
|
return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
|
|
271
|
-
var data,
|
|
272
|
+
var data, isViewGroup, parseGroup, viewGroup, resources, groups;
|
|
272
273
|
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
|
273
274
|
while (1) {
|
|
274
275
|
switch (_context.prev = _context.next) {
|
|
@@ -287,15 +288,13 @@ export default function (topoApp) {
|
|
|
287
288
|
return _context.abrupt("return");
|
|
288
289
|
|
|
289
290
|
case 5:
|
|
290
|
-
|
|
291
|
-
groupTopo = data.findIndex(function (item) {
|
|
291
|
+
isViewGroup = function isViewGroup(item) {
|
|
292
292
|
var _item$topoGroup;
|
|
293
293
|
|
|
294
294
|
return ((_item$topoGroup = item.topoGroup) === null || _item$topoGroup === void 0 ? void 0 : _item$topoGroup.parentId) === TOPO_PARENT_ID;
|
|
295
|
-
}
|
|
296
|
-
resources = conditionToRes(groupTopo >= 0 ? data[groupTopo].condition : {}); // 容器
|
|
295
|
+
};
|
|
297
296
|
|
|
298
|
-
|
|
297
|
+
parseGroup = function parseGroup(item) {
|
|
299
298
|
var _item$topoGroup2 = item.topoGroup,
|
|
300
299
|
topoGroup = _item$topoGroup2 === void 0 ? {} : _item$topoGroup2,
|
|
301
300
|
condition = item.condition;
|
|
@@ -315,14 +314,23 @@ export default function (topoApp) {
|
|
|
315
314
|
expanded: groupStyles.expanded || false,
|
|
316
315
|
resources: conditionToRes(condition)
|
|
317
316
|
};
|
|
318
|
-
}
|
|
317
|
+
}; // 视图
|
|
318
|
+
|
|
319
|
+
|
|
320
|
+
viewGroup = data.filter(isViewGroup).map(parseGroup)[0];
|
|
321
|
+
resources = viewGroup ? viewGroup.resources : {}; // 容器
|
|
322
|
+
|
|
323
|
+
groups = data.filter(function (item) {
|
|
324
|
+
return !isViewGroup(item);
|
|
325
|
+
}).map(parseGroup);
|
|
319
326
|
|
|
320
327
|
_this.update({
|
|
328
|
+
viewGroup: viewGroup,
|
|
321
329
|
resources: resources,
|
|
322
330
|
groups: groups
|
|
323
331
|
});
|
|
324
332
|
|
|
325
|
-
case
|
|
333
|
+
case 11:
|
|
326
334
|
case "end":
|
|
327
335
|
return _context.stop();
|
|
328
336
|
}
|
|
@@ -437,7 +445,8 @@ export default function (topoApp) {
|
|
|
437
445
|
},
|
|
438
446
|
saveTopo: function saveTopo(data, state) {
|
|
439
447
|
return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
|
|
440
|
-
var topoId, template, layout, global, resources, groups, serialize, layoutId,
|
|
448
|
+
var topoId, template, layout, global, resources, groups, serialize, layoutId, _state$topoCreateMod$, groupInfo, viewGroupId, conditions;
|
|
449
|
+
|
|
441
450
|
return _regeneratorRuntime.wrap(function _callee4$(_context4) {
|
|
442
451
|
while (1) {
|
|
443
452
|
switch (_context4.prev = _context4.next) {
|
|
@@ -477,21 +486,38 @@ export default function (topoApp) {
|
|
|
477
486
|
|
|
478
487
|
case 11:
|
|
479
488
|
if (!(resources || groups)) {
|
|
480
|
-
_context4.next =
|
|
489
|
+
_context4.next = 19;
|
|
481
490
|
break;
|
|
482
491
|
}
|
|
483
492
|
|
|
493
|
+
groupInfo = [];
|
|
494
|
+
|
|
495
|
+
if (isAvailableArray(groups)) {
|
|
496
|
+
groupInfo = groups.map(function (group) {
|
|
497
|
+
return _extends({}, group, {
|
|
498
|
+
layout: getLayoutId(group.layout),
|
|
499
|
+
resources: resToConditions(group.resources, true)
|
|
500
|
+
});
|
|
501
|
+
});
|
|
502
|
+
} // 视图
|
|
503
|
+
|
|
504
|
+
|
|
505
|
+
viewGroupId = (_state$topoCreateMod$ = state.topoCreateMod.viewGroup) === null || _state$topoCreateMod$ === void 0 ? void 0 : _state$topoCreateMod$.id;
|
|
484
506
|
conditions = resToConditions(resources, true);
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
507
|
+
|
|
508
|
+
if (conditions) {
|
|
509
|
+
groupInfo.push({
|
|
510
|
+
id: viewGroupId,
|
|
511
|
+
parentId: TOPO_PARENT_ID,
|
|
512
|
+
order: 100,
|
|
513
|
+
resources: conditions
|
|
489
514
|
});
|
|
490
|
-
}
|
|
491
|
-
_context4.next = 16;
|
|
492
|
-
return topoService.bindResourceToTopo(topoId, conditions, groupInfo);
|
|
515
|
+
}
|
|
493
516
|
|
|
494
|
-
|
|
517
|
+
_context4.next = 19;
|
|
518
|
+
return topoService.bindResourceToTopo(topoId, null, groupInfo);
|
|
519
|
+
|
|
520
|
+
case 19:
|
|
495
521
|
case "end":
|
|
496
522
|
return _context4.stop();
|
|
497
523
|
}
|
|
@@ -70,6 +70,7 @@ var regionTplState = {
|
|
|
70
70
|
groups: initGroups(3)
|
|
71
71
|
};
|
|
72
72
|
var initialState = (0, _extends2["default"])({
|
|
73
|
+
viewGroup: undefined,
|
|
73
74
|
topo: [],
|
|
74
75
|
// 拓扑结构（点线）
|
|
75
76
|
elements: {
|
|
@@ -282,7 +283,7 @@ function _default(topoApp) {
|
|
|
282
283
|
var _this = this;
|
|
283
284
|
|
|
284
285
|
return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
|
|
285
|
-
var data,
|
|
286
|
+
var data, isViewGroup, parseGroup, viewGroup, resources, groups;
|
|
286
287
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
287
288
|
while (1) {
|
|
288
289
|
switch (_context.prev = _context.next) {
|
|
@@ -301,15 +302,13 @@ function _default(topoApp) {
|
|
|
301
302
|
return _context.abrupt("return");
|
|
302
303
|
|
|
303
304
|
case 5:
|
|
304
|
-
|
|
305
|
-
groupTopo = data.findIndex(function (item) {
|
|
305
|
+
isViewGroup = function isViewGroup(item) {
|
|
306
306
|
var _item$topoGroup;
|
|
307
307
|
|
|
308
308
|
return ((_item$topoGroup = item.topoGroup) === null || _item$topoGroup === void 0 ? void 0 : _item$topoGroup.parentId) === _topo.TOPO_PARENT_ID;
|
|
309
|
-
}
|
|
310
|
-
resources = conditionToRes(groupTopo >= 0 ? data[groupTopo].condition : {}); // 容器
|
|
309
|
+
};
|
|
311
310
|
|
|
312
|
-
|
|
311
|
+
parseGroup = function parseGroup(item) {
|
|
313
312
|
var _item$topoGroup2 = item.topoGroup,
|
|
314
313
|
topoGroup = _item$topoGroup2 === void 0 ? {} : _item$topoGroup2,
|
|
315
314
|
condition = item.condition;
|
|
@@ -329,14 +328,23 @@ function _default(topoApp) {
|
|
|
329
328
|
expanded: groupStyles.expanded || false,
|
|
330
329
|
resources: conditionToRes(condition)
|
|
331
330
|
};
|
|
332
|
-
}
|
|
331
|
+
}; // 视图
|
|
332
|
+
|
|
333
|
+
|
|
334
|
+
viewGroup = data.filter(isViewGroup).map(parseGroup)[0];
|
|
335
|
+
resources = viewGroup ? viewGroup.resources : {}; // 容器
|
|
336
|
+
|
|
337
|
+
groups = data.filter(function (item) {
|
|
338
|
+
return !isViewGroup(item);
|
|
339
|
+
}).map(parseGroup);
|
|
333
340
|
|
|
334
341
|
_this.update({
|
|
342
|
+
viewGroup: viewGroup,
|
|
335
343
|
resources: resources,
|
|
336
344
|
groups: groups
|
|
337
345
|
});
|
|
338
346
|
|
|
339
|
-
case
|
|
347
|
+
case 11:
|
|
340
348
|
case "end":
|
|
341
349
|
return _context.stop();
|
|
342
350
|
}
|
|
@@ -454,7 +462,8 @@ function _default(topoApp) {
|
|
|
454
462
|
},
|
|
455
463
|
saveTopo: function saveTopo(data, state) {
|
|
456
464
|
return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
|
|
457
|
-
var topoId, template, layout, global, resources, groups, serialize, layoutId,
|
|
465
|
+
var topoId, template, layout, global, resources, groups, serialize, layoutId, _state$topoCreateMod$, groupInfo, viewGroupId, conditions;
|
|
466
|
+
|
|
458
467
|
return _regenerator["default"].wrap(function _callee4$(_context4) {
|
|
459
468
|
while (1) {
|
|
460
469
|
switch (_context4.prev = _context4.next) {
|
|
@@ -494,21 +503,38 @@ function _default(topoApp) {
|
|
|
494
503
|
|
|
495
504
|
case 11:
|
|
496
505
|
if (!(resources || groups)) {
|
|
497
|
-
_context4.next =
|
|
506
|
+
_context4.next = 19;
|
|
498
507
|
break;
|
|
499
508
|
}
|
|
500
509
|
|
|
510
|
+
groupInfo = [];
|
|
511
|
+
|
|
512
|
+
if ((0, _utils.isAvailableArray)(groups)) {
|
|
513
|
+
groupInfo = groups.map(function (group) {
|
|
514
|
+
return (0, _extends2["default"])({}, group, {
|
|
515
|
+
layout: getLayoutId(group.layout),
|
|
516
|
+
resources: resToConditions(group.resources, true)
|
|
517
|
+
});
|
|
518
|
+
});
|
|
519
|
+
} // 视图
|
|
520
|
+
|
|
521
|
+
|
|
522
|
+
viewGroupId = (_state$topoCreateMod$ = state.topoCreateMod.viewGroup) === null || _state$topoCreateMod$ === void 0 ? void 0 : _state$topoCreateMod$.id;
|
|
501
523
|
conditions = resToConditions(resources, true);
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
524
|
+
|
|
525
|
+
if (conditions) {
|
|
526
|
+
groupInfo.push({
|
|
527
|
+
id: viewGroupId,
|
|
528
|
+
parentId: _topo.TOPO_PARENT_ID,
|
|
529
|
+
order: 100,
|
|
530
|
+
resources: conditions
|
|
506
531
|
});
|
|
507
|
-
}
|
|
508
|
-
_context4.next = 16;
|
|
509
|
-
return _topo["default"].bindResourceToTopo(topoId, conditions, groupInfo);
|
|
532
|
+
}
|
|
510
533
|
|
|
511
|
-
|
|
534
|
+
_context4.next = 19;
|
|
535
|
+
return _topo["default"].bindResourceToTopo(topoId, null, groupInfo);
|
|
536
|
+
|
|
537
|
+
case 19:
|
|
512
538
|
case "end":
|
|
513
539
|
return _context4.stop();
|
|
514
540
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@riil-frontend/component-topology",
|
|
3
|
-
"version": "2.10.0-alpha-
|
|
3
|
+
"version": "2.10.0-alpha-3",
|
|
4
4
|
"description": "拓扑",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"start": "build-scripts start",
|
|
@@ -103,6 +103,6 @@
|
|
|
103
103
|
"access": "public"
|
|
104
104
|
},
|
|
105
105
|
"license": "MIT",
|
|
106
|
-
"homepage": "https://unpkg.com/@riil-frontend/component-topology@2.10.0-alpha-
|
|
106
|
+
"homepage": "https://unpkg.com/@riil-frontend/component-topology@2.10.0-alpha-3/build/index.html",
|
|
107
107
|
"gitHead": "62eadeca07c85ed047f2e933676f62015eff98cc"
|
|
108
108
|
}
|