@riil-frontend/component-topology 2.12.2 → 2.12.5-alpha.2

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 (83) hide show
  1. package/build/1.js +2 -2
  2. package/build/2.js +1 -1
  3. package/build/index.css +1 -1
  4. package/build/index.js +21 -21
  5. package/es/components/Link/index.js +1 -1
  6. package/es/components/Link/index.module.scss +2 -2
  7. package/es/components/MultiResourceDrawer/index.js +3 -2
  8. package/es/components/ResourceSelectDrawer/ResourceSelectDrawer.js +1 -0
  9. package/es/components/ResourceSelectDrawer/ResourceSelectList.js +6 -1
  10. package/es/components/SingleResourceDrawer/SelectDrawer.js +54 -0
  11. package/es/components/SingleResourceDrawer/index.js +3 -3
  12. package/es/core/common/icons/defaultIcons.js +9 -2
  13. package/es/core/components/TopoView/topoView.js +3 -2
  14. package/es/core/editor/components/LinkDynamicStyleSettingDrawer/rule/ColorPicker.module.scss +1 -1
  15. package/es/core/editor/components/ResourceViewAttributeSetting/ResourceViewAttributeSettingPlugin.js +1 -1
  16. package/es/core/editor/components/ResourceViewAttributeSetting/Setting.js +1 -1
  17. package/es/core/editor/components/settings/Settings.js +5 -29
  18. package/es/core/editor/components/settings/{group → common}/GroupNodeList/ResourceList.js +0 -0
  19. package/es/core/editor/components/settings/{group → common}/GroupNodeList/ResourceList.module.scss +0 -0
  20. package/es/core/editor/components/settings/{group → common}/GroupNodeList/ResourceSelectButton.js +12 -14
  21. package/es/core/editor/components/settings/{group → common}/GroupNodeList/icon.js +0 -0
  22. package/es/core/editor/components/settings/common/text/FontStyleCheckbox.module.scss +1 -1
  23. package/es/core/editor/components/settings/group/DataTab/GroupNodeList.js +19 -0
  24. package/es/core/editor/components/settings/group/DataTab/RelateData.js +45 -0
  25. package/es/core/editor/components/settings/group/GroupPropertyView.js +44 -0
  26. package/es/core/editor/components/settings/group/GroupPropertyView.module.scss +3 -0
  27. package/es/core/editor/components/settings/group/SettingTab/GroupExpandSetting.js +27 -0
  28. package/es/core/editor/components/settings/group/SettingTab/NodeIconSelect.js +32 -0
  29. package/es/core/editor/components/settings/group/SettingTab/Setting.js +86 -0
  30. package/es/core/editor/components/settings/group/hooks/useGroup.js +9 -0
  31. package/es/core/editor/components/settings/group/hooks/useGroupExpand.js +20 -0
  32. package/es/core/editor/components/settings/layer/LayerSettingsForm.js +2 -2
  33. package/es/core/editor/components/settings/{group/GroupNodeList/GroupNodeList.js → layer/NodeList.js} +3 -3
  34. package/es/core/editor/components/settings/link/LinkPropertyView.js +3 -3
  35. package/es/core/editor/components/settings/node/NodeIconSelect.js +1 -1
  36. package/es/core/editor/components/settings/propertyViews.js +23 -0
  37. package/es/core/models/TopoApp.js +28 -16
  38. package/es/hooks/useContainerLinkTopo.js +1 -1
  39. package/es/hooks/usePolling.js +1 -1
  40. package/es/hooks/useTopoEdit.js +139 -103
  41. package/es/style.js +3 -4
  42. package/es/topoCenter/models/TopoCenter.js +40 -12
  43. package/es/utils/htElementUtils.js +36 -7
  44. package/lib/components/Link/index.js +6 -6
  45. package/lib/components/Link/index.module.scss +2 -2
  46. package/lib/components/MultiResourceDrawer/index.js +3 -2
  47. package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js +1 -0
  48. package/lib/components/ResourceSelectDrawer/ResourceSelectList.js +6 -1
  49. package/lib/components/SingleResourceDrawer/SelectDrawer.js +68 -0
  50. package/lib/components/SingleResourceDrawer/index.js +3 -3
  51. package/lib/core/common/icons/defaultIcons.js +11 -2
  52. package/lib/core/components/TopoView/topoView.js +15 -13
  53. package/lib/core/editor/components/LinkDynamicStyleSettingDrawer/rule/ColorPicker.module.scss +1 -1
  54. package/lib/core/editor/components/ResourceViewAttributeSetting/ResourceViewAttributeSettingPlugin.js +3 -3
  55. package/lib/core/editor/components/ResourceViewAttributeSetting/Setting.js +2 -2
  56. package/lib/core/editor/components/settings/Settings.js +5 -34
  57. package/lib/core/editor/components/settings/{group → common}/GroupNodeList/ResourceList.js +0 -0
  58. package/lib/core/editor/components/settings/{group → common}/GroupNodeList/ResourceList.module.scss +0 -0
  59. package/lib/core/editor/components/settings/{group → common}/GroupNodeList/ResourceSelectButton.js +13 -14
  60. package/lib/core/editor/components/settings/{group → common}/GroupNodeList/icon.js +0 -0
  61. package/lib/core/editor/components/settings/common/text/FontStyleCheckbox.module.scss +1 -1
  62. package/lib/core/editor/components/settings/group/DataTab/GroupNodeList.js +33 -0
  63. package/lib/core/editor/components/settings/group/DataTab/RelateData.js +57 -0
  64. package/lib/core/editor/components/settings/group/GroupPropertyView.js +58 -0
  65. package/lib/core/editor/components/settings/group/GroupPropertyView.module.scss +3 -0
  66. package/lib/core/editor/components/settings/group/SettingTab/GroupExpandSetting.js +37 -0
  67. package/lib/core/editor/components/settings/group/SettingTab/NodeIconSelect.js +45 -0
  68. package/lib/core/editor/components/settings/group/SettingTab/Setting.js +106 -0
  69. package/lib/core/editor/components/settings/group/hooks/useGroup.js +15 -0
  70. package/lib/core/editor/components/settings/group/hooks/useGroupExpand.js +26 -0
  71. package/lib/core/editor/components/settings/layer/LayerSettingsForm.js +3 -3
  72. package/lib/core/editor/components/settings/{group/GroupNodeList/GroupNodeList.js → layer/NodeList.js} +3 -3
  73. package/lib/core/editor/components/settings/link/LinkPropertyView.js +3 -3
  74. package/lib/core/editor/components/settings/node/NodeIconSelect.js +1 -1
  75. package/lib/core/editor/components/settings/propertyViews.js +38 -0
  76. package/lib/core/models/TopoApp.js +29 -17
  77. package/lib/hooks/useContainerLinkTopo.js +2 -2
  78. package/lib/hooks/usePolling.js +3 -3
  79. package/lib/hooks/useTopoEdit.js +149 -112
  80. package/lib/style.js +3 -4
  81. package/lib/topoCenter/models/TopoCenter.js +40 -12
  82. package/lib/utils/htElementUtils.js +44 -7
  83. package/package.json +10 -10
@@ -39,6 +39,11 @@ export function getGroups(dataModel) {
39
39
  return getGroupData(element);
40
40
  });
41
41
  }
42
+ export function getGroupElementByTag(dataModel, tag) {
43
+ return dataModel.getDataByTag(tag) || dataModel.getDatas().toArray().filter(function (item) {
44
+ return item.a('tag') === tag;
45
+ })[0];
46
+ }
42
47
  export function getGroupData(element) {
43
48
  if (!element) {
44
49
  return null;
@@ -58,13 +63,14 @@ export function getGroupData(element) {
58
63
  export function getNodes(dataModel) {
59
64
  return getElements(dataModel).filter(function (element) {
60
65
  return element.getClassName() === 'ht.Node';
61
- }).map(function (element) {
62
- var parentGroup = getGroupData(element.getParent());
63
- return _extends({}, element.getAttrObject(), {
64
- tag: element.getId(),
65
- image: element.getImage(),
66
- groupTag: parentGroup ? parentGroup.id : undefined
67
- });
66
+ }).map(getNodeData);
67
+ }
68
+ export function getNodeData(element) {
69
+ var parentGroup = getGroupData(element.getParent());
70
+ return _extends({}, element.getAttrObject(), {
71
+ tag: element.getId(),
72
+ image: element.getImage(),
73
+ groupTag: parentGroup ? parentGroup.id : undefined
68
74
  });
69
75
  }
70
76
  export function getEdges(dataModel) {
@@ -84,4 +90,27 @@ export function getGroupNodes(dataModel, groupIdOrTag) {
84
90
  return getNodes(dataModel).filter(function (element) {
85
91
  return element.groupId === groupIdOrTag || element.groupTag === groupIdOrTag;
86
92
  });
93
+ }
94
+ /**
95
+ * 获取容器里的节点列表
96
+ *
97
+ * @param group
98
+ * @return {*}
99
+ */
100
+
101
+ export function getGroupChildren(group) {
102
+ // HT为了支持区域内无节点可展开增加了站位节点,因此 节点的layer等于container_blank的过滤掉就可以了
103
+ return group.getChildren().getArray().filter(function (node) {
104
+ return node._layer !== 'container_blank';
105
+ });
106
+ }
107
+ /**
108
+ * 获取容器里的节点数据列表
109
+ *
110
+ * @param group
111
+ * @return {*}
112
+ */
113
+
114
+ export function getGroupChildrenData(group) {
115
+ return getGroupChildren(group).map(getNodeData);
87
116
  }
@@ -21,7 +21,7 @@ var _ahooks = require("ahooks");
21
21
 
22
22
  var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
23
23
 
24
- var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
24
+ var _event = _interopRequireDefault(require("@riil-frontend/component-topology-graph/es/event"));
25
25
 
26
26
  var _indexModule = _interopRequireDefault(require("./index.module.scss"));
27
27
 
@@ -79,15 +79,15 @@ var LinkDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
79
79
  var type = e.type,
80
80
  data = e.data;
81
81
 
82
- if (type === _componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_LINK) {
82
+ if (type === _event["default"].DATA_TYPE_RESOURCE_LINK) {
83
83
  api.show(data);
84
84
  }
85
85
  };
86
86
 
87
- notifier.on(_componentTopologyGraph.TopoEvent.EVENT_DATA_PICK, handleEvent);
87
+ notifier.on(_event["default"].EVENT_DATA_PICK, handleEvent);
88
88
  return function () {
89
89
  // 取消注册事件
90
- notifier.off(_componentTopologyGraph.TopoEvent.EVENT_DATA_PICK, handleEvent);
90
+ notifier.off(_event["default"].EVENT_DATA_PICK, handleEvent);
91
91
  };
92
92
  }, []); // 从url打开
93
93
 
@@ -113,8 +113,8 @@ var LinkDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
113
113
 
114
114
  case 3:
115
115
  data = _context.sent;
116
- topoApp.view.topoClient.emitEvent(_componentTopologyGraph.TopoEvent.EVENT_DATA_RESULT, {
117
- type: _componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_COMBO,
116
+ topoApp.view.topoClient.emitEvent(_event["default"].EVENT_DATA_RESULT, {
117
+ type: _event["default"].DATA_TYPE_RESOURCE_COMBO,
118
118
  data: data
119
119
  });
120
120
 
@@ -1,5 +1,5 @@
1
- @import '@riil-frontend/css/lib/index.scss';
2
- @import "@alifd/next/variables";
1
+ //@import '@riil-frontend/css/lib/index.scss';
2
+ @import "~@alifd/next/variables";
3
3
 
4
4
  .layout {
5
5
  height: 100%;
@@ -46,9 +46,10 @@ var MultiResourceDrawer = function MultiResourceDrawer(props) {
46
46
  };
47
47
  }
48
48
 
49
- onSave(result);
49
+ _context.next = 4;
50
+ return onSave(result);
50
51
 
51
- case 3:
52
+ case 4:
52
53
  case "end":
53
54
  return _context.stop();
54
55
  }
@@ -86,6 +86,7 @@ function ResourceSelectDrawer(props) {
86
86
  buttons: ['确定', '取消']
87
87
  }, visible && /*#__PURE__*/_react["default"].createElement(_ResourceSelectList["default"], {
88
88
  ref: resourceSelectRef,
89
+ selectionMode: selectionMode,
89
90
  excludeIds: excludeIds
90
91
  }));
91
92
  }
@@ -22,7 +22,12 @@ function ResourceSelectList(props, ref) {
22
22
  ref: ref,
23
23
  limitTypes: _ResourceTypeLimit.RESOURCE_LIMIT_TYPES,
24
24
  defaultCondition: excludeIds.length ? "!id('" + excludeIds.join("','") + "')" : undefined,
25
- request: (0, _componentTopologyCommon.getRequest)()
25
+ request: (0, _componentTopologyCommon.getRequest)(),
26
+ tableProps: selectionMode ? {
27
+ rowSelection: {
28
+ mode: selectionMode
29
+ }
30
+ } : undefined
26
31
  });
27
32
  }
28
33
 
@@ -0,0 +1,68 @@
1
+ "use strict";
2
+
3
+ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
4
+
5
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
6
+
7
+ exports.__esModule = true;
8
+ exports["default"] = void 0;
9
+
10
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
+
12
+ var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
13
+
14
+ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
15
+
16
+ var _react = _interopRequireWildcard(require("react"));
17
+
18
+ var _ResourceSelectDrawer = _interopRequireDefault(require("../ResourceSelectDrawer"));
19
+
20
+ var SingleSelectDrawer = function SingleSelectDrawer(props) {
21
+ var visible = props.visible,
22
+ totalSelection = props.totalSelection,
23
+ onSave = props.onSave,
24
+ onClose = props.onClose;
25
+
26
+ var onDrawerSave = /*#__PURE__*/function () {
27
+ var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(selected) {
28
+ return _regenerator["default"].wrap(function _callee$(_context) {
29
+ while (1) {
30
+ switch (_context.prev = _context.next) {
31
+ case 0:
32
+ if (selected.length) {
33
+ _context.next = 3;
34
+ break;
35
+ }
36
+
37
+ _message["default"].error('请选择一项资源。');
38
+
39
+ return _context.abrupt("return", false);
40
+
41
+ case 3:
42
+ _context.next = 5;
43
+ return onSave(selected[0]);
44
+
45
+ case 5:
46
+ case "end":
47
+ return _context.stop();
48
+ }
49
+ }
50
+ }, _callee);
51
+ }));
52
+
53
+ return function onDrawerSave(_x) {
54
+ return _ref.apply(this, arguments);
55
+ };
56
+ }();
57
+
58
+ return /*#__PURE__*/_react["default"].createElement(_ResourceSelectDrawer["default"], {
59
+ visible: visible,
60
+ excludeIds: totalSelection,
61
+ selectionMode: "single",
62
+ onOk: onDrawerSave,
63
+ onClose: onClose
64
+ });
65
+ };
66
+
67
+ var _default = SingleSelectDrawer;
68
+ exports["default"] = _default;
@@ -21,7 +21,7 @@ var SingleResourceDrawer = function SingleResourceDrawer(props) {
21
21
  var store = props.store,
22
22
  visible = props.visible,
23
23
  loading = props.loading,
24
- selectedKeys = props.selectedKeys,
24
+ selectedKey = props.selectedKey,
25
25
  totalSelection = props.totalSelection,
26
26
  onSave = props.onSave,
27
27
  onClose = props.onClose;
@@ -36,7 +36,7 @@ var SingleResourceDrawer = function SingleResourceDrawer(props) {
36
36
  return;
37
37
  }
38
38
 
39
- var intercept = onSave(data);
39
+ var intercept = onSave(data[0]);
40
40
 
41
41
  if (!intercept) {
42
42
  onClose();
@@ -44,7 +44,7 @@ var SingleResourceDrawer = function SingleResourceDrawer(props) {
44
44
  };
45
45
 
46
46
  var initialData = {
47
- selected: selectedKeys,
47
+ selected: [selectedKey],
48
48
  total: totalSelection
49
49
  };
50
50
  return /*#__PURE__*/_react["default"].createElement(_Drawer["default"], {
@@ -7,6 +7,13 @@ exports["default"] = exports.DEFAULT_NODE_ICONS = void 0;
7
7
 
8
8
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
9
9
 
10
+ var _ciTypeIcons = require("@riil-frontend/component-topology-graph/es/icons/ciTypeIcons");
11
+
12
+ /**
13
+ * 默认节点图标
14
+ *
15
+ * @type {(*|{url: *})[]}
16
+ */
10
17
  var DEFAULT_NODE_ICONS = [{
11
18
  id: 'ciType/network.switch',
12
19
  name: '交换机',
@@ -69,7 +76,8 @@ exports.DEFAULT_NODE_ICONS = DEFAULT_NODE_ICONS;
69
76
  DEFAULT_NODE_ICONS.forEach(function (icon) {
70
77
  ht.Default.setImage(icon.id, icon.jsonUrl || icon.url);
71
78
  });
72
- var _default = {
79
+
80
+ var _default = (0, _extends2["default"])({}, (0, _ciTypeIcons.getIconMap)(), {
73
81
  'editor.icon.cloud.small': {
74
82
  url: '/ht/image/topo/s/云_64.png',
75
83
  json: '/ht/image/topo/s/云_64.json'
@@ -136,5 +144,6 @@ var _default = {
136
144
  'editor.icon.library.small': '/ht/image/topo/s/库_48.json',
137
145
  'editor.icon.balanc.small': '/ht/image/topo/s/负载均衡_48.json',
138
146
  'editor.icon.calendar.small': '/ht/image/topo/s/日历_48.json'
139
- };
147
+ });
148
+
140
149
  exports["default"] = _default;
@@ -13,7 +13,9 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
13
13
 
14
14
  var _classnames2 = _interopRequireDefault(require("classnames"));
15
15
 
16
- var _componentTopologyGraph = _interopRequireWildcard(require("@riil-frontend/component-topology-graph"));
16
+ var _TopoGraph = _interopRequireDefault(require("@riil-frontend/component-topology-graph/es/components/TopoGraph"));
17
+
18
+ var _event = _interopRequireDefault(require("@riil-frontend/component-topology-graph/es/event"));
17
19
 
18
20
  var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
19
21
 
@@ -199,44 +201,44 @@ var TopoView = function TopoView(props) {
199
201
  containerLinkTopo.onEvent(event);
200
202
 
201
203
  switch (event.name) {
202
- case _componentTopologyGraph.TopoEvent.EVENT_SHOW_MESSAGE:
204
+ case _event["default"].EVENT_SHOW_MESSAGE:
203
205
  if (event.data && event.data.type) (0, _showMessage["default"])(event.data.type, event.data.message);
204
206
  break;
205
207
 
206
- case _componentTopologyGraph.TopoEvent.EVENT_RIGHT_CLICK:
208
+ case _event["default"].EVENT_RIGHT_CLICK:
207
209
  rightEventHandle(event);
208
210
  break;
209
211
 
210
- case _componentTopologyGraph.TopoEvent.EVENT_DATA_PICK:
212
+ case _event["default"].EVENT_DATA_PICK:
211
213
  onBindData(event.data);
212
214
  break;
213
215
 
214
- case _componentTopologyGraph.TopoEvent.EVENT_DATA_DELETE:
216
+ case _event["default"].EVENT_DATA_DELETE:
215
217
  onDeleteElement(event.data);
216
218
  break;
217
219
 
218
- case _componentTopologyGraph.TopoEvent.EVENT_SAVE_TOPO:
220
+ case _event["default"].EVENT_SAVE_TOPO:
219
221
  onSaveTopo(event.data);
220
222
  break;
221
223
 
222
- case _componentTopologyGraph.TopoEvent.EVENT_REFRESH:
224
+ case _event["default"].EVENT_REFRESH:
223
225
  onRefresh(event.data);
224
226
  break;
225
227
 
226
- case _componentTopologyGraph.TopoEvent.EVENT_EDIT_ENTER:
228
+ case _event["default"].EVENT_EDIT_ENTER:
227
229
  initSelection();
228
230
  break;
229
231
 
230
- case _componentTopologyGraph.TopoEvent.EVENT_EDIT_EXIT:
232
+ case _event["default"].EVENT_EDIT_EXIT:
231
233
  onExitEdit(event.data);
232
234
  break;
233
235
 
234
- case _componentTopologyGraph.TopoEvent.EVENT_CONTEXT_TOOL:
236
+ case _event["default"].EVENT_CONTEXT_TOOL:
235
237
  _rlog["default"].debug('自定义工具栏事件', event);
236
238
 
237
239
  break;
238
240
 
239
- case _componentTopologyGraph.TopoEvent.EVENT_TOPO_ON_RELATED_TOPO_IMAGE:
241
+ case _event["default"].EVENT_TOPO_ON_RELATED_TOPO_IMAGE:
240
242
  _rlog["default"].debug('预关联拓扑图事件', event);
241
243
 
242
244
  onTopoRelatedImage(event);
@@ -255,7 +257,7 @@ var TopoView = function TopoView(props) {
255
257
  onEnterEdit: onEnterEdit
256
258
  })), /*#__PURE__*/_react["default"].createElement("div", {
257
259
  className: (0, _classnames2["default"])(_TopoViewModule["default"].viewPanel, (_classnames = {}, _classnames[_TopoViewModule["default"].viewPanelEditMode] = isEditMode, _classnames))
258
- }, /*#__PURE__*/_react["default"].createElement(_componentTopologyGraph["default"], {
260
+ }, /*#__PURE__*/_react["default"].createElement(_TopoGraph["default"], {
259
261
  debugId: topoApp.debugId,
260
262
  data: tData,
261
263
  defaultEnterEditMode: defaultEnterEditMode,
@@ -279,7 +281,7 @@ var TopoView = function TopoView(props) {
279
281
  visible: showSingleResDrawer,
280
282
  loading: topoLoading,
281
283
  store: store,
282
- selectedKeys: initialSingleRes,
284
+ selectedKey: initialSingleRes,
283
285
  totalSelection: resSelections,
284
286
  onSave: onSaveSingleRes,
285
287
  onClose: onCloseSigleResDrawer
@@ -1,4 +1,4 @@
1
- @import "@alifd/theme-19926/variables";
1
+ @import "~@alifd/theme-19926/variables.scss";
2
2
 
3
3
  .swatch {
4
4
  background: #fff;
@@ -11,7 +11,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
11
11
 
12
12
  var _react = _interopRequireWildcard(require("react"));
13
13
 
14
- var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
14
+ var _event = _interopRequireDefault(require("@riil-frontend/component-topology-graph/es/event"));
15
15
 
16
16
  var _Setting = _interopRequireDefault(require("./Setting"));
17
17
 
@@ -59,9 +59,9 @@ function ResourceViewAttributeSettingPlugin(props) {
59
59
  };
60
60
  topology.view.contextMenu.registerCommands(contextMenuCommands);
61
61
  var notifier = topology.view.topoClient.notifier;
62
- notifier.on(_componentTopologyGraph.TopoEvent.OPEN_MARK_SETTING, openMarkSettingByType);
62
+ notifier.on(_event["default"].OPEN_MARK_SETTING, openMarkSettingByType);
63
63
  return function () {
64
- notifier.off(_componentTopologyGraph.TopoEvent.OPEN_MARK_SETTING, openMarkSettingByType);
64
+ notifier.off(_event["default"].OPEN_MARK_SETTING, openMarkSettingByType);
65
65
  };
66
66
  }, []);
67
67
  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_Setting["default"], (0, _extends2["default"])({
@@ -11,7 +11,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
11
11
 
12
12
  var _react = _interopRequireWildcard(require("react"));
13
13
 
14
- var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
14
+ var _event = _interopRequireDefault(require("@riil-frontend/component-topology-graph/es/event"));
15
15
 
16
16
  var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
17
17
 
@@ -99,7 +99,7 @@ var Setting = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
99
99
 
100
100
  _rlog["default"].debug('saveMarkSetting', parm, allCiSet, ciDoc, allCiset);
101
101
 
102
- topology.view.topoClient.emitEvent(_componentTopologyGraph.TopoEvent.SAVE_MARK_SETTING, {
102
+ topology.view.topoClient.emitEvent(_event["default"].SAVE_MARK_SETTING, {
103
103
  tagAndTipSet: ciDoc
104
104
  });
105
105
  bizDispatchers.update({
@@ -11,21 +11,11 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
11
11
 
12
12
  var _react = _interopRequireWildcard(require("react"));
13
13
 
14
- var _SettingsForm = _interopRequireDefault(require("./SettingsForm"));
15
-
16
- var _LayerSettingsForm = _interopRequireDefault(require("./layer/LayerSettingsForm"));
17
-
18
14
  var _SettingsModule = _interopRequireDefault(require("./Settings.module.scss"));
19
15
 
20
16
  var _htElementDataUtil = require("../../../../utils/htElementDataUtil");
21
17
 
22
- var _TextPropertyView = _interopRequireDefault(require("./text/TextPropertyView"));
23
-
24
- var _NodePropertyView = _interopRequireDefault(require("./node/NodePropertyView"));
25
-
26
- var _ViewPropertyView = _interopRequireDefault(require("./view/ViewPropertyView"));
27
-
28
- var _LinkPropertyView = _interopRequireDefault(require("./link/LinkPropertyView"));
18
+ var _propertyViews = _interopRequireDefault(require("./propertyViews"));
29
19
 
30
20
  var _useSettingRuntimeState = _interopRequireDefault(require("./useSettingRuntimeState"));
31
21
 
@@ -64,26 +54,7 @@ function Settings(props) {
64
54
  }).join(',');
65
55
  (0, _react.useEffect)(function () {// const selectionModel = topo.getSelectionModel();
66
56
  // console.info('selection change', selection)
67
- }, [selection]);
68
- var propertyPanelMap = {
69
- view: _SettingsForm["default"],
70
- node: _NodePropertyView["default"],
71
- layer: _LayerSettingsForm["default"],
72
- text: _TextPropertyView["default"]
73
- };
74
-
75
- if (localStorage.getItem('topo.debug') === 'true') {
76
- Object.assign(propertyPanelMap, {
77
- line: _LinkPropertyView["default"],
78
- view: _ViewPropertyView["default"]
79
- });
80
- } else {
81
- if (!selectionSize) {
82
- // 未选择元素
83
- return null;
84
- }
85
- } // TODO 待优化
86
-
57
+ }, [selection]); // TODO 待优化
87
58
 
88
59
  var updateElementProperty = function updateElementProperty(name, value) {
89
60
  // const element = topo.getDataModel().getDataById(selection[0].id);
@@ -107,9 +78,9 @@ function Settings(props) {
107
78
  };
108
79
 
109
80
  var elementType = getElementType(selection);
110
- var Component = propertyPanelMap[elementType];
81
+ var PropertyView = _propertyViews["default"][elementType];
111
82
 
112
- if (!Component) {
83
+ if (!PropertyView) {
113
84
  return null;
114
85
  }
115
86
 
@@ -124,7 +95,7 @@ function Settings(props) {
124
95
  className: _SettingsModule["default"].settingsPanel
125
96
  }, /*#__PURE__*/_react["default"].createElement("div", {
126
97
  className: _SettingsModule["default"].settings
127
- }, /*#__PURE__*/_react["default"].createElement(Component, {
98
+ }, /*#__PURE__*/_react["default"].createElement(PropertyView, {
128
99
  type: elementType,
129
100
  topo: topo,
130
101
  topoEditApi: topoEditApi,
@@ -13,19 +13,17 @@ var _react = _interopRequireWildcard(require("react"));
13
13
 
14
14
  var _ResourceSelectDrawer = _interopRequireDefault(require("../../../../../../components/ResourceSelect/ResourceSelectDrawer"));
15
15
 
16
+ var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
17
+
16
18
  function ResourceSelectButton(props) {
17
19
  var topo = props.topo,
18
- layer = props.layer,
19
- resourceSelectComponent = props.resourceSelectComponent,
20
- onAdd = props.onAdd;
20
+ group = props.group,
21
+ topoEditApi = props.topoEditApi;
21
22
 
22
23
  var _useState = (0, _react.useState)(false),
23
24
  isSelectResource = _useState[0],
24
25
  setIsSelectResource = _useState[1];
25
26
 
26
- var ResourceSelectComponent = resourceSelectComponent || _ResourceSelectDrawer["default"]; // const ResourceSelectComponent = ResourceSelectDrawer;
27
- // TODO
28
-
29
27
  return /*#__PURE__*/_react["default"].createElement("div", {
30
28
  onClick: function onClick(e) {
31
29
  return e.stopPropagation();
@@ -35,15 +33,16 @@ function ResourceSelectButton(props) {
35
33
  type: "primary",
36
34
  onClick: function onClick(e) {
37
35
  e.stopPropagation();
38
- setIsSelectResource(true);
36
+ topoEditApi.onBindData({
37
+ type: _componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_COMBO,
38
+ data: {
39
+ dtype: 'container',
40
+ id: group.tag,
41
+ tag: group.attr.tag
42
+ }
43
+ });
39
44
  }
40
- }, "\u9009\u62E9"), /*#__PURE__*/_react["default"].createElement(ResourceSelectComponent, {
41
- layer: layer,
42
- visible: isSelectResource,
43
- setVisible: setIsSelectResource,
44
- topo: topo,
45
- existedIds: []
46
- }));
45
+ }, "\u6DFB\u52A0\u8D44\u6E90"));
47
46
  }
48
47
 
49
48
  ;
@@ -1,4 +1,4 @@
1
- @import "@alifd/theme-19926/variables";
1
+ @import "~@alifd/theme-19926/variables.scss";
2
2
 
3
3
  .buttonGroup {
4
4
  display: flex;
@@ -0,0 +1,33 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
5
+ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
6
+
7
+ exports.__esModule = true;
8
+ exports["default"] = GroupNodeList;
9
+
10
+ var _react = _interopRequireWildcard(require("react"));
11
+
12
+ var _ResourceList = _interopRequireDefault(require("../../common/GroupNodeList/ResourceList"));
13
+
14
+ var _htElementUtils = require("../../../../../../utils/htElementUtils");
15
+
16
+ var _icon = require("../../common/GroupNodeList/icon");
17
+
18
+ function GroupNodeList(props) {
19
+ var topo = props.topo,
20
+ group = props.group;
21
+ var nodes = (0, _htElementUtils.getGroupChildrenData)(topo.getDataModel().getDataById(group.id));
22
+ var data = nodes.map(function (node) {
23
+ return {
24
+ title: node.name,
25
+ img: (0, _icon.getIconById)(node.image, topo)
26
+ };
27
+ });
28
+ return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_ResourceList["default"], {
29
+ data: data
30
+ }));
31
+ }
32
+
33
+ ;
@@ -0,0 +1,57 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
5
+ exports.__esModule = true;
6
+ exports["default"] = GroupRelateData;
7
+
8
+ var _collapse = _interopRequireDefault(require("@alifd/next/lib/collapse"));
9
+
10
+ var _react = _interopRequireDefault(require("react"));
11
+
12
+ var _ResourceSelectButton = _interopRequireDefault(require("../../common/GroupNodeList/ResourceSelectButton"));
13
+
14
+ var _GroupNodeList = _interopRequireDefault(require("./GroupNodeList"));
15
+
16
+ var CollapsePanel = _collapse["default"].Panel;
17
+
18
+ function GroupRelateData(props) {
19
+ var topo = props.topo,
20
+ topoEditApi = props.topoEditApi,
21
+ values = props.values,
22
+ editorProps = props.editorProps;
23
+
24
+ var createResourcePanel = function createResourcePanel() {
25
+ return /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
26
+ key: "\u5173\u8054\u8D44\u6E90",
27
+ title: /*#__PURE__*/_react["default"].createElement("div", {
28
+ style: {
29
+ display: 'flex',
30
+ paddingRight: 12
31
+ }
32
+ }, /*#__PURE__*/_react["default"].createElement("div", {
33
+ style: {
34
+ flex: 1
35
+ }
36
+ }, "\u5173\u8054\u8D44\u6E90"), /*#__PURE__*/_react["default"].createElement(_ResourceSelectButton["default"], {
37
+ topo: topo,
38
+ topoEditApi: topoEditApi,
39
+ group: values,
40
+ onAdd: function onAdd() {
41
+ /*TODO 刷新列表 refreshList*/
42
+ },
43
+ resourceSelectComponent: editorProps === null || editorProps === void 0 ? void 0 : editorProps.groupResourceSelectComponent
44
+ }))
45
+ }, /*#__PURE__*/_react["default"].createElement(_GroupNodeList["default"], {
46
+ topo: topo,
47
+ group: values
48
+ }));
49
+ };
50
+
51
+ return /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
52
+ defaultExpandedKeys: ['关联资源'],
53
+ style: {
54
+ border: 'none'
55
+ }
56
+ }, createResourcePanel());
57
+ }