@riil-frontend/component-topology 6.0.0-alpha.41 → 6.0.0-alpha.43

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 (108) hide show
  1. package/build/index.css +1 -1
  2. package/build/index.js +20 -20
  3. package/demo/CHANGELOG/CHANGELOG.md +5 -0
  4. package/es/components/VerticalIconTab/VerticalIconTab.js +11 -1
  5. package/es/components/VerticalIconTab/VerticalIconTab.module.scss +1 -0
  6. package/es/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js +8 -3
  7. package/es/core/components/TopoView/topoView.js +3 -3
  8. package/es/core/editor/components/Sidebar/panes.js +6 -1
  9. package/es/core/editor/components/Toolbar/widgets/AddResourceButton.js +1 -1
  10. package/es/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxBackgroundButton.js +1 -1
  11. package/es/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js +1 -1
  12. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js +1 -1
  13. package/es/core/editor/components/Toolbar/widgets/FontColorButton.js +38 -12
  14. package/es/core/editor/components/Toolbar/widgets/FontColorButton.module.scss +4 -5
  15. package/es/core/editor/components/Toolbar/widgets/FontStyleButton.js +1 -1
  16. package/es/core/editor/components/Toolbar/widgets/Layout/index.js +2 -2
  17. package/es/core/editor/components/Toolbar/widgets/NodeAlignWidget.js +8 -1
  18. package/es/core/editor/components/Toolbar/widgets/NodeImageButton/NodeImageButton.js +1 -1
  19. package/es/core/editor/components/Toolbar/widgets/NodeSizeButton/NodeSizeButton.js +1 -1
  20. package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/ElementTextStyleSetting.js +1 -1
  21. package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/textStyleSettingRouter.js +1 -1
  22. package/es/core/editor/components/settings/CloseablePanel.module.scss +12 -0
  23. package/es/core/editor/components/settings/PropertyView.js +21 -18
  24. package/es/core/editor/components/settings/Settings.js +39 -77
  25. package/es/core/editor/components/settings/Settings.module.scss +2 -10
  26. package/es/core/editor/components/settings/core/PropertyViewManager.js +61 -0
  27. package/es/core/editor/components/settings/core/getPropertyViewType.js +34 -0
  28. package/es/core/editor/components/settings/core/updateElementProperty.js +21 -0
  29. package/es/core/editor/components/settings/propertyViews/box/BoxPropertyView.js +3 -8
  30. package/es/core/editor/components/settings/propertyViews/box/BoxPropertyViewV1.js +58 -0
  31. package/es/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js +5 -2
  32. package/es/core/editor/components/settings/propertyViews/edge/EdgeGroupPropertyView.js +7 -8
  33. package/es/core/editor/components/settings/propertyViews/edge/EdgePropertyView.js +9 -23
  34. package/es/core/editor/components/settings/propertyViews/edge/addEdgeProps.js +10 -0
  35. package/es/core/editor/components/settings/propertyViews/edge/edgeGroup/EdgeGroupSetting.js +1 -6
  36. package/es/core/editor/components/settings/propertyViews/group/GroupPropertyView.js +13 -21
  37. package/es/core/editor/components/settings/propertyViews/group/GroupPropertyView.module.scss +8 -1
  38. package/es/core/editor/components/settings/propertyViews/group/GroupPropertyViewV1.js +28 -0
  39. package/es/core/editor/components/settings/propertyViews/group/SettingTab/GroupBasicSetting.js +74 -0
  40. package/es/core/editor/components/settings/propertyViews/group/SettingTab/GroupExpandSetting.js +9 -7
  41. package/es/core/editor/components/settings/propertyViews/index.js +4 -2
  42. package/es/core/editor/components/settings/propertyViews/node/NodePropertyView.js +8 -32
  43. package/es/core/editor/components/settings/propertyViews/node/NodePropertyViewV1.js +53 -0
  44. package/es/core/editor/components/settings/propertyViews/node/Setting/BasicSetting.js +49 -0
  45. package/es/core/editor/components/settings/propertyViews/text/TextPropertyView.js +4 -19
  46. package/es/core/models/HistoryManager.js +11 -14
  47. package/es/core/models/{SelectionManager.js → SelectionModel.js} +27 -18
  48. package/es/core/models/TopoApp.js +3 -3
  49. package/es/networkTopo/components/editor/propertyViews/edge/EdgePropertyView.js +39 -6
  50. package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js +10 -16
  51. package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyViewV1.js +37 -0
  52. package/es/networkTopo/components/editor/propertyViews/edge/link/LinkInfoPreview.module.scss +1 -1
  53. package/es/networkTopo/models/LinkDynamicStyleExecutor.js +2 -2
  54. package/es/style.js +1 -1
  55. package/lib/components/VerticalIconTab/VerticalIconTab.js +14 -1
  56. package/lib/components/VerticalIconTab/VerticalIconTab.module.scss +1 -0
  57. package/lib/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js +8 -3
  58. package/lib/core/components/TopoView/topoView.js +3 -3
  59. package/lib/core/editor/components/Sidebar/panes.js +6 -1
  60. package/lib/core/editor/components/Toolbar/widgets/AddResourceButton.js +1 -1
  61. package/lib/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxBackgroundButton.js +1 -1
  62. package/lib/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js +1 -1
  63. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js +1 -1
  64. package/lib/core/editor/components/Toolbar/widgets/FontColorButton.js +38 -12
  65. package/lib/core/editor/components/Toolbar/widgets/FontColorButton.module.scss +4 -5
  66. package/lib/core/editor/components/Toolbar/widgets/FontStyleButton.js +1 -1
  67. package/lib/core/editor/components/Toolbar/widgets/Layout/index.js +2 -2
  68. package/lib/core/editor/components/Toolbar/widgets/NodeAlignWidget.js +8 -1
  69. package/lib/core/editor/components/Toolbar/widgets/NodeImageButton/NodeImageButton.js +1 -1
  70. package/lib/core/editor/components/Toolbar/widgets/NodeSizeButton/NodeSizeButton.js +1 -1
  71. package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/ElementTextStyleSetting.js +1 -1
  72. package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/textStyleSettingRouter.js +1 -1
  73. package/lib/core/editor/components/settings/CloseablePanel.module.scss +12 -0
  74. package/lib/core/editor/components/settings/PropertyView.js +26 -19
  75. package/lib/core/editor/components/settings/Settings.js +44 -79
  76. package/lib/core/editor/components/settings/Settings.module.scss +2 -10
  77. package/lib/core/editor/components/settings/core/PropertyViewManager.js +70 -0
  78. package/lib/core/editor/components/settings/core/getPropertyViewType.js +40 -0
  79. package/lib/core/editor/components/settings/core/updateElementProperty.js +27 -0
  80. package/lib/core/editor/components/settings/propertyViews/box/BoxPropertyView.js +3 -8
  81. package/lib/core/editor/components/settings/propertyViews/box/BoxPropertyViewV1.js +76 -0
  82. package/lib/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js +8 -2
  83. package/lib/core/editor/components/settings/propertyViews/edge/EdgeGroupPropertyView.js +9 -12
  84. package/lib/core/editor/components/settings/propertyViews/edge/EdgePropertyView.js +7 -23
  85. package/lib/core/editor/components/settings/propertyViews/edge/addEdgeProps.js +19 -0
  86. package/lib/core/editor/components/settings/propertyViews/edge/edgeGroup/EdgeGroupSetting.js +1 -6
  87. package/lib/core/editor/components/settings/propertyViews/group/GroupPropertyView.js +14 -25
  88. package/lib/core/editor/components/settings/propertyViews/group/GroupPropertyView.module.scss +8 -1
  89. package/lib/core/editor/components/settings/propertyViews/group/GroupPropertyViewV1.js +43 -0
  90. package/lib/core/editor/components/settings/propertyViews/group/SettingTab/GroupBasicSetting.js +97 -0
  91. package/lib/core/editor/components/settings/propertyViews/group/SettingTab/GroupExpandSetting.js +8 -6
  92. package/lib/core/editor/components/settings/propertyViews/index.js +5 -2
  93. package/lib/core/editor/components/settings/propertyViews/node/NodePropertyView.js +8 -35
  94. package/lib/core/editor/components/settings/propertyViews/node/NodePropertyViewV1.js +68 -0
  95. package/lib/core/editor/components/settings/propertyViews/node/Setting/BasicSetting.js +64 -0
  96. package/lib/core/editor/components/settings/propertyViews/text/TextPropertyView.js +4 -19
  97. package/lib/core/models/HistoryManager.js +11 -14
  98. package/lib/core/models/{SelectionManager.js → SelectionModel.js} +27 -18
  99. package/lib/core/models/TopoApp.js +3 -3
  100. package/lib/networkTopo/components/editor/propertyViews/edge/EdgePropertyView.js +45 -7
  101. package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js +10 -18
  102. package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyViewV1.js +50 -0
  103. package/lib/networkTopo/components/editor/propertyViews/edge/link/LinkInfoPreview.module.scss +1 -1
  104. package/lib/networkTopo/models/LinkDynamicStyleExecutor.js +2 -2
  105. package/lib/style.js +1 -1
  106. package/package.json +2 -2
  107. package/es/core/editor/components/settings/OpenPropertyPanelListener.js +0 -33
  108. package/lib/core/editor/components/settings/OpenPropertyPanelListener.js +0 -43
@@ -0,0 +1,68 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
5
+ exports.__esModule = true;
6
+ exports["default"] = NodePropertyView;
7
+
8
+ var _tab = _interopRequireDefault(require("@alifd/next/lib/tab"));
9
+
10
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
11
+
12
+ var _react = _interopRequireDefault(require("react"));
13
+
14
+ var _useHtElement = _interopRequireDefault(require("../../../../../common/hooks/useHtElement"));
15
+
16
+ var _TabView = _interopRequireDefault(require("../../common/tab/TabView"));
17
+
18
+ var _Data = _interopRequireDefault(require("./data/Data"));
19
+
20
+ var _NodePropertyViewModule = _interopRequireDefault(require("./NodePropertyView.module.scss"));
21
+
22
+ var _Setting = _interopRequireDefault(require("./Setting"));
23
+
24
+ function NodePropertyView(props) {
25
+ var _topo$options$editor;
26
+
27
+ var topo = props.topo,
28
+ topoEditApi = props.topoEditApi,
29
+ values = props.values,
30
+ onChange = props.onChange,
31
+ editorProps = props.editorProps,
32
+ settingRuntimeState = props.settingRuntimeState;
33
+ var node = (0, _useHtElement["default"])({
34
+ topo: topo,
35
+ id: values.id
36
+ });
37
+
38
+ var renderData = function renderData() {
39
+ return /*#__PURE__*/_react["default"].createElement(_Data["default"], (0, _extends2["default"])({}, props, {
40
+ node: node
41
+ }));
42
+ };
43
+
44
+ var renderSetting = function renderSetting() {
45
+ var nodeSettingViewProps = editorProps.nodeSettingViewProps;
46
+ return /*#__PURE__*/_react["default"].createElement(_Setting["default"], (0, _extends2["default"])({}, props, nodeSettingViewProps));
47
+ }; // 未绑定资源的节点,根据参数控制是否可关联资源
48
+
49
+
50
+ var showRelateResource = !!values.tag || !values.tag && ((_topo$options$editor = topo.options.editor) === null || _topo$options$editor === void 0 ? void 0 : _topo$options$editor.enableRelateResource) !== false;
51
+ var content;
52
+
53
+ if (showRelateResource) {
54
+ content = /*#__PURE__*/_react["default"].createElement(_TabView["default"], null, /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
55
+ title: "\u6570\u636E",
56
+ key: "1"
57
+ }, renderData()), /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
58
+ title: "\u8BBE\u7F6E",
59
+ key: "2"
60
+ }, renderSetting()));
61
+ } else {
62
+ content = renderSetting();
63
+ }
64
+
65
+ return /*#__PURE__*/_react["default"].createElement("div", {
66
+ className: _NodePropertyViewModule["default"].NodePropertyView
67
+ }, content);
68
+ }
@@ -0,0 +1,64 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
5
+ exports.__esModule = true;
6
+ exports["default"] = BasicSetting;
7
+
8
+ var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
9
+
10
+ var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
11
+
12
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
13
+
14
+ var _react = _interopRequireWildcard(require("react"));
15
+
16
+ var _NameInput = _interopRequireDefault(require("./NameInput"));
17
+
18
+ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
19
+
20
+ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
21
+
22
+ function parseValues(values) {
23
+ return (0, _extends2["default"])({}, values, {
24
+ 'attrObject.customName': values['attrObject.customName'] || values['attrObject.name'],
25
+ 'attrObject.bindTopo': values['attrObject.bindTopo'] || '' // 解决切换节点时关联拓扑选项未重置
26
+
27
+ });
28
+ }
29
+
30
+ function BasicSetting(props) {
31
+ var topo = props.topo,
32
+ values = props.values,
33
+ _onChange = props.onChange,
34
+ editorProps = props.editorProps,
35
+ settingRuntimeState = props.settingRuntimeState,
36
+ _props$showImageSetti = props.showImageSetting,
37
+ showImageSetting = _props$showImageSetti === void 0 ? true : _props$showImageSetti;
38
+
39
+ var field = _field["default"].useField({
40
+ autoUnmount: false,
41
+ values: parseValues(values),
42
+ onChange: function onChange(name, value) {
43
+ var newValues = field.getValues();
44
+
45
+ _onChange(name, value, newValues);
46
+ }
47
+ });
48
+
49
+ (0, _react.useEffect)(function () {
50
+ field.setValues(parseValues(values));
51
+ }, [values]);
52
+ return /*#__PURE__*/_react["default"].createElement(_form["default"], {
53
+ field: field,
54
+ labelAlign: "top",
55
+ style: {
56
+ margin: '12px 0 0 32px'
57
+ }
58
+ }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
59
+ label: "\u56FE\u7247\u540D\u79F0"
60
+ }, /*#__PURE__*/_react["default"].createElement(_NameInput["default"], {
61
+ name: "attrObject.customName",
62
+ topo: topo
63
+ })));
64
+ }
@@ -78,23 +78,11 @@ function TextPropertyView(props) {
78
78
  (0, _react.useEffect)(function () {
79
79
  field.setValues(parseValues(values));
80
80
  }, [values]);
81
- return /*#__PURE__*/_react["default"].createElement("div", {
82
- style: {
83
- paddingTop: 4
84
- }
85
- }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
81
+ return /*#__PURE__*/_react["default"].createElement(_form["default"], {
86
82
  field: field,
87
- labelAlign: "top"
88
- }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
89
- defaultExpandedKeys: ['显示设置'],
90
- style: {
91
- border: 'none'
92
- }
93
- }, /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
94
- key: "\u663E\u793A\u8BBE\u7F6E",
95
- title: "\u663E\u793A\u8BBE\u7F6E",
83
+ labelAlign: "top",
96
84
  style: {
97
- padding: 0
85
+ margin: '12px 0 0 32px'
98
86
  }
99
87
  }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
100
88
  label: "\u6587\u672C"
@@ -111,8 +99,5 @@ function TextPropertyView(props) {
111
99
  onBlur: function onBlur() {
112
100
  topo.historyManager.endTransaction();
113
101
  }
114
- })), /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, /*#__PURE__*/_react["default"].createElement(_TextStyle["default"], {
115
- name: "styleMap.textObj",
116
- topo: topo
117
- })))))));
102
+ })));
118
103
  }
@@ -77,6 +77,10 @@ var HistoryManager = /*#__PURE__*/function () {
77
77
  var _this = this;
78
78
 
79
79
  this.htHistoryManager.beginTransaction();
80
+ var displayConfigProperties = [// 单多链路
81
+ 'expandAllEdges', // 节点标注
82
+ 'nodeLabelStyle', // 画布主题
83
+ 'canvasTheme', 'linkTag', 'linkTip', 'nodeTag', 'nodeTip'];
80
84
  var items = [{
81
85
  modelName: 'topoMod',
82
86
  property: 'data'
@@ -84,23 +88,16 @@ var HistoryManager = /*#__PURE__*/function () {
84
88
  {
85
89
  modelName: 'topoMod',
86
90
  property: 'type'
87
- }, // 单多链路
88
- {
89
- modelName: 'displayConfig',
90
- property: 'expandAllEdges'
91
- }, // 节点标注
92
- {
93
- modelName: 'displayConfig',
94
- property: 'nodeLabelStyle'
95
- }, // 画布主题
96
- {
97
- modelName: 'displayConfig',
98
- property: 'canvasTheme'
99
- }, // 背景
91
+ }].concat(displayConfigProperties.map(function (property) {
92
+ return {
93
+ modelName: 'displayConfig',
94
+ property: property
95
+ };
96
+ }), [// 背景
100
97
  {
101
98
  modelName: 'background',
102
99
  property: 'current'
103
- }];
100
+ }]);
104
101
  this.storeHistory = items.map(function (item) {
105
102
  return (0, _extends2["default"])({}, item, {
106
103
  oldValue: _this.topo.store.getModelState(item.modelName)[item.property]
@@ -13,25 +13,13 @@ var _useHtElements = _interopRequireDefault(require("../common/hooks/useHtElemen
13
13
 
14
14
  var _ignoreList = _interopRequireDefault(require("./selection/ignoreList"));
15
15
 
16
- var SelectionManager = /*#__PURE__*/function () {
17
- function SelectionManager(topo) {
16
+ var SelectionModel = /*#__PURE__*/function () {
17
+ function SelectionModel(topo) {
18
18
  var _this = this;
19
19
 
20
20
  this.topo = null;
21
21
  this.inited = false;
22
22
 
23
- this.setSelection = function (selection) {
24
- var selectionDispatchers = _this.topo.store.getModelDispatchers('selection');
25
-
26
- _this.selectionIds = selection.map(function (item) {
27
- return item.id;
28
- });
29
- selectionDispatchers.update({
30
- selection: selection,
31
- selectionIds: _this.selectionIds
32
- });
33
- };
34
-
35
23
  this.updateSelection = function () {
36
24
  try {
37
25
  var selectionModel = _this.topo.getSelectionModel();
@@ -40,18 +28,30 @@ var SelectionManager = /*#__PURE__*/function () {
40
28
 
41
29
  var selectionArr = htSelection.map(getElementData); // rlog.info("updateSelection", selectionArr.map((element) => element.id));
42
30
 
43
- _this.setSelection(selectionArr);
31
+ _this.updateStoreSelection(selectionArr);
44
32
  } catch (e) {
45
33
  _rlog["default"].error('updateSelection error', e);
46
34
  }
47
35
  };
48
36
 
37
+ this.updateStoreSelection = function (selection) {
38
+ var selectionDispatchers = _this.topo.store.getModelDispatchers('selection');
39
+
40
+ _this.selectionIds = selection.map(function (item) {
41
+ return item.id;
42
+ });
43
+ selectionDispatchers.update({
44
+ selection: selection,
45
+ selectionIds: _this.selectionIds
46
+ });
47
+ };
48
+
49
49
  this.topo = topo;
50
50
  this.handleSelectionChange = this.handleSelectionChange.bind(this);
51
51
  this.handleDataPropertyChange = this.handleDataPropertyChange.bind(this);
52
52
  }
53
53
 
54
- var _proto = SelectionManager.prototype;
54
+ var _proto = SelectionModel.prototype;
55
55
 
56
56
  _proto.init = function init() {
57
57
  if (this.inited) {
@@ -85,6 +85,15 @@ var SelectionManager = /*#__PURE__*/function () {
85
85
  return elements;
86
86
  };
87
87
 
88
+ _proto.getSelection = function getSelection() {
89
+ var selectionModel = this.topo.getSelectionModel();
90
+ return selectionModel.getSelection().getArray();
91
+ }
92
+ /**
93
+ * 同步选中元素到store
94
+ */
95
+ ;
96
+
88
97
  _proto.handleSelectionChange = function handleSelectionChange(e) {
89
98
  _rlog["default"].info('Selection handleSelectionChange', e);
90
99
 
@@ -134,10 +143,10 @@ var SelectionManager = /*#__PURE__*/function () {
134
143
  dataModel.removeDataPropertyChangeListener(this.handleDataPropertyChange);
135
144
  };
136
145
 
137
- return SelectionManager;
146
+ return SelectionModel;
138
147
  }();
139
148
 
140
- exports["default"] = SelectionManager;
149
+ exports["default"] = SelectionModel;
141
150
  ; // 构造元素数据
142
151
 
143
152
  var map = {
@@ -49,10 +49,10 @@ var _topoFactory = _interopRequireDefault(require("./topoFactory"));
49
49
 
50
50
  var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTagTipConfig"));
51
51
 
52
- var _SelectionManager = _interopRequireDefault(require("./SelectionManager"));
52
+ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
53
53
 
54
54
  // eslint-disable-next-line no-undef
55
- var version = typeof "6.0.0-alpha.41" === 'string' ? "6.0.0-alpha.41" : null;
55
+ var version = typeof "6.0.0-alpha.43" === 'string' ? "6.0.0-alpha.43" : null;
56
56
  console.info("\u62D3\u6251\u7248\u672C: " + version);
57
57
  /**
58
58
  * 拓扑显示和编辑
@@ -108,7 +108,7 @@ var Topo = /*#__PURE__*/function () {
108
108
 
109
109
  this.test = new _Test["default"](this);
110
110
  this.uid = _topoFactory["default"].add(options.name, this);
111
- this.selectionManager = new _SelectionManager["default"](this);
111
+ this.selectionModel = new _SelectionModel["default"](this);
112
112
  };
113
113
 
114
114
  _proto.destroy = function destroy() {
@@ -5,18 +5,56 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  exports.__esModule = true;
6
6
  exports["default"] = EdgePropertyView;
7
7
 
8
+ var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
9
+
10
+ var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
11
+
8
12
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
9
13
 
10
- var _react = _interopRequireDefault(require("react"));
14
+ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
11
15
 
12
- var _CommonEdgePropertyView = _interopRequireDefault(require("../../../../../core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView"));
16
+ var _react = _interopRequireWildcard(require("react"));
13
17
 
14
18
  var _BindExitLinkSelect = _interopRequireDefault(require("./link/BindExitLinkSelect"));
15
19
 
16
- function EdgePropertyView(props) {
17
- var extraDisplaySetting = /*#__PURE__*/_react["default"].createElement(_BindExitLinkSelect["default"], props);
20
+ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
18
21
 
19
- return /*#__PURE__*/_react["default"].createElement(_CommonEdgePropertyView["default"], (0, _extends2["default"])({}, props, {
20
- extraDisplaySetting: extraDisplaySetting
21
- }));
22
+ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
23
+
24
+ function parseValues(values, edge) {
25
+ return (0, _extends2["default"])({}, values);
26
+ }
27
+
28
+ function EdgePropertyView(props) {
29
+ var topo = props.topo,
30
+ edge = props.edge,
31
+ values = props.values,
32
+ _onChange = props.onChange,
33
+ editorProps = props.editorProps,
34
+ extraDisplaySetting = props.extraDisplaySetting;
35
+ var store = topo.store;
36
+
37
+ var field = _field["default"].useField({
38
+ autoUnmount: false,
39
+ values: parseValues(values, edge),
40
+ onChange: function onChange(name, value) {
41
+ _rlog["default"].debug('CommonEdgePropertyView', name, value);
42
+
43
+ var newValues = field.getValues();
44
+
45
+ _onChange(name, value, newValues);
46
+ }
47
+ });
48
+
49
+ (0, _react.useEffect)(function () {
50
+ field.setValues(parseValues(values, edge));
51
+ }, [values]);
52
+ return /*#__PURE__*/_react["default"].createElement("div", {
53
+ style: {
54
+ margin: '12px 0 0 32px'
55
+ }
56
+ }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
57
+ field: field,
58
+ labelAlign: "top"
59
+ }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, /*#__PURE__*/_react["default"].createElement(_BindExitLinkSelect["default"], props))));
22
60
  }
@@ -5,46 +5,38 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  exports.__esModule = true;
6
6
  exports["default"] = LinkPropertyView;
7
7
 
8
- var _tab = _interopRequireDefault(require("@alifd/next/lib/tab"));
9
-
10
8
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
11
9
 
12
- var _react = _interopRequireDefault(require("react"));
10
+ var _componentNoDataPage = _interopRequireDefault(require("@riil-frontend/component-no-data-page"));
13
11
 
14
- var _TabView = _interopRequireDefault(require("../../../../../../core/editor/components/settings/common/tab/TabView"));
12
+ var _react = _interopRequireDefault(require("react"));
15
13
 
16
14
  var _Data = _interopRequireDefault(require("./Data"));
17
15
 
18
- var _Setting = _interopRequireDefault(require("./Setting"));
19
-
20
16
  function LinkPropertyView(props) {
21
17
  var edge = props.edge,
22
18
  topo = props.topo; // 无权限不显示数据页签
23
19
 
24
- var _topo$store$useModelS = topo.store.useModelState("topoMod").data,
20
+ var _topo$store$useModelS = topo.store.useModelState('topoMod').data,
25
21
  links = _topo$store$useModelS.links,
26
22
  linkGroups = _topo$store$useModelS.linkGroups;
27
23
  var link = [].concat(links, linkGroups).find(function (item) {
28
24
  return item.id === edge.getTag();
29
- }); // console.log('LinkPropertyView',link)
25
+ });
30
26
 
31
27
  if (link) {
32
28
  var readable = link.permission.readable;
33
29
 
34
30
  if (!readable) {
35
- return /*#__PURE__*/_react["default"].createElement(_Setting["default"], props);
31
+ return /*#__PURE__*/_react["default"].createElement(_componentNoDataPage["default"], {
32
+ statusCode: "\u6CA1\u6709\u67E5\u770B\u6743\u9650"
33
+ });
36
34
  }
37
35
  } else {
38
- return /*#__PURE__*/_react["default"].createElement(_Setting["default"], props);
36
+ return null;
39
37
  }
40
38
 
41
- return /*#__PURE__*/_react["default"].createElement(_TabView["default"], null, /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
42
- title: "\u6570\u636E",
43
- key: "1"
44
- }, /*#__PURE__*/_react["default"].createElement(_Data["default"], (0, _extends2["default"])({}, props, {
39
+ return /*#__PURE__*/_react["default"].createElement(_Data["default"], (0, _extends2["default"])({}, props, {
45
40
  link: link
46
- }))), /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
47
- title: "\u8BBE\u7F6E",
48
- key: "2"
49
- }, /*#__PURE__*/_react["default"].createElement(_Setting["default"], props)));
41
+ }));
50
42
  }
@@ -0,0 +1,50 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
5
+ exports.__esModule = true;
6
+ exports["default"] = LinkPropertyView;
7
+
8
+ var _tab = _interopRequireDefault(require("@alifd/next/lib/tab"));
9
+
10
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
11
+
12
+ var _react = _interopRequireDefault(require("react"));
13
+
14
+ var _TabView = _interopRequireDefault(require("../../../../../../core/editor/components/settings/common/tab/TabView"));
15
+
16
+ var _Data = _interopRequireDefault(require("./Data"));
17
+
18
+ var _Setting = _interopRequireDefault(require("./Setting"));
19
+
20
+ function LinkPropertyView(props) {
21
+ var edge = props.edge,
22
+ topo = props.topo; // 无权限不显示数据页签
23
+
24
+ var _topo$store$useModelS = topo.store.useModelState('topoMod').data,
25
+ links = _topo$store$useModelS.links,
26
+ linkGroups = _topo$store$useModelS.linkGroups;
27
+ var link = [].concat(links, linkGroups).find(function (item) {
28
+ return item.id === edge.getTag();
29
+ }); // console.log('LinkPropertyView',link)
30
+
31
+ if (link) {
32
+ var readable = link.permission.readable;
33
+
34
+ if (!readable) {
35
+ return /*#__PURE__*/_react["default"].createElement(_Setting["default"], props);
36
+ }
37
+ } else {
38
+ return /*#__PURE__*/_react["default"].createElement(_Setting["default"], props);
39
+ }
40
+
41
+ return /*#__PURE__*/_react["default"].createElement(_TabView["default"], null, /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
42
+ title: "\u6570\u636E",
43
+ key: "1"
44
+ }, /*#__PURE__*/_react["default"].createElement(_Data["default"], (0, _extends2["default"])({}, props, {
45
+ link: link
46
+ }))), /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
47
+ title: "\u8BBE\u7F6E",
48
+ key: "2"
49
+ }, /*#__PURE__*/_react["default"].createElement(_Setting["default"], props)));
50
+ }
@@ -53,7 +53,7 @@
53
53
  height: 100%;
54
54
  display: flex;
55
55
  flex-direction: column;
56
- padding-top: 8px;
56
+ padding-top: 12px;
57
57
  padding-left: 16px;
58
58
 
59
59
  :global {
@@ -65,13 +65,13 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
65
65
  var _this = this;
66
66
 
67
67
  var topo = this.topo;
68
- topo.historyManager && topo.historyManager.setDisabled(true, '链路动态样式');
69
68
 
70
69
  var _topo$dataModel$getDa = topo.dataModel.getData(),
71
70
  links = _topo$dataModel$getDa.links,
72
71
  linkGroups = _topo$dataModel$getDa.linkGroups;
73
72
 
74
- var dataModel = this.topo.getDataModel(); // 1、如果连线可见,设置线宽
73
+ var dataModel = this.topo.getDataModel();
74
+ topo.historyManager && topo.historyManager.setDisabled(true, '链路动态样式'); // 1、如果连线可见,设置线宽
75
75
 
76
76
  links.forEach(function (link) {
77
77
  var edge = dataModel.getDataByTag(link.id);
package/lib/style.js CHANGED
@@ -38,8 +38,8 @@ require('@alifd/next/lib/menu/style');
38
38
  require('@alifd/next/lib/collapse/style');
39
39
  require('@alifd/next/lib/select/style');
40
40
  require('@alifd/next/lib/number-picker/style');
41
-
42
41
  require('@alifd/next/lib/tag/style');
42
+
43
43
  require('@riil-frontend/component-riil-event-emitter/lib/style');
44
44
  require('@alifd/next/lib/range/style');
45
45
  require('./index.scss');
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@riil-frontend/component-topology",
3
- "version": "6.0.0-alpha.41",
3
+ "version": "6.0.0-alpha.43",
4
4
  "description": "拓扑",
5
5
  "scripts": {
6
6
  "start": "build-scripts start",
@@ -116,6 +116,6 @@
116
116
  "access": "public"
117
117
  },
118
118
  "license": "MIT",
119
- "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.41/build/index.html",
119
+ "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.43/build/index.html",
120
120
  "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
121
121
  }
@@ -1,33 +0,0 @@
1
- import React, { useEffect } from 'react';
2
- export default function OpenPropertyPanelListener(props) {
3
- var topo = props.topo;
4
- var topoEditDispatchers = topo.store.useModelDispatchers('topoEdit'); // 双击打开
5
-
6
- useEffect(function () {
7
- var notifier = topo.view.topoClient.notifier;
8
- notifier.on('topo_element_double_click', handleDblClick);
9
-
10
- function handleDblClick(element) {
11
- topoEditDispatchers.update({
12
- propertyPanelVisible: true
13
- });
14
- }
15
-
16
- return function () {
17
- notifier.off('topo_element_double_click', handleDblClick);
18
- topoEditDispatchers.update({
19
- propertyPanelVisible: false
20
- });
21
- };
22
- }, []); // 未选择元素关闭
23
-
24
- var selection = topo.selectionManager.useHtSelection();
25
- useEffect(function () {
26
- if (!selection.length) {
27
- topoEditDispatchers.update({
28
- propertyPanelVisible: false
29
- });
30
- }
31
- }, [selection]);
32
- return props.children;
33
- }
@@ -1,43 +0,0 @@
1
- "use strict";
2
-
3
- exports.__esModule = true;
4
- exports["default"] = OpenPropertyPanelListener;
5
-
6
- var _react = _interopRequireWildcard(require("react"));
7
-
8
- function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
9
-
10
- function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
11
-
12
- function OpenPropertyPanelListener(props) {
13
- var topo = props.topo;
14
- var topoEditDispatchers = topo.store.useModelDispatchers('topoEdit'); // 双击打开
15
-
16
- (0, _react.useEffect)(function () {
17
- var notifier = topo.view.topoClient.notifier;
18
- notifier.on('topo_element_double_click', handleDblClick);
19
-
20
- function handleDblClick(element) {
21
- topoEditDispatchers.update({
22
- propertyPanelVisible: true
23
- });
24
- }
25
-
26
- return function () {
27
- notifier.off('topo_element_double_click', handleDblClick);
28
- topoEditDispatchers.update({
29
- propertyPanelVisible: false
30
- });
31
- };
32
- }, []); // 未选择元素关闭
33
-
34
- var selection = topo.selectionManager.useHtSelection();
35
- (0, _react.useEffect)(function () {
36
- if (!selection.length) {
37
- topoEditDispatchers.update({
38
- propertyPanelVisible: false
39
- });
40
- }
41
- }, [selection]);
42
- return props.children;
43
- }