@riil-frontend/component-topology 6.0.0-alpha.42 → 6.0.0-alpha.44

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 (124) 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/demo/CHANGELOG/CHANGELOG.md +5 -0
  6. package/es/components/VerticalIconTab/VerticalIconTab.js +11 -1
  7. package/es/components/VerticalIconTab/VerticalIconTab.module.scss +1 -0
  8. package/es/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js +8 -3
  9. package/es/core/components/TopoView/topoView.js +3 -3
  10. package/es/core/editor/components/Sidebar/panes.js +6 -1
  11. package/es/core/editor/components/Toolbar/widgets/AddResourceButton.js +1 -1
  12. package/es/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxBackgroundButton.js +1 -1
  13. package/es/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js +1 -1
  14. package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js +1 -1
  15. package/es/core/editor/components/Toolbar/widgets/FontColorButton.js +38 -12
  16. package/es/core/editor/components/Toolbar/widgets/FontColorButton.module.scss +4 -5
  17. package/es/core/editor/components/Toolbar/widgets/FontStyleButton.js +1 -1
  18. package/es/core/editor/components/Toolbar/widgets/Layout/index.js +2 -2
  19. package/es/core/editor/components/Toolbar/widgets/NodeAlignWidget.js +8 -1
  20. package/es/core/editor/components/Toolbar/widgets/NodeImageButton/NodeImageButton.js +1 -1
  21. package/es/core/editor/components/Toolbar/widgets/NodeSizeButton/NodeSizeButton.js +1 -1
  22. package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/ElementTextStyleSetting.js +1 -1
  23. package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/textStyleSettingRouter.js +1 -1
  24. package/es/core/editor/components/settings/CloseablePanel.module.scss +12 -0
  25. package/es/core/editor/components/settings/PropertyView.js +21 -18
  26. package/es/core/editor/components/settings/Settings.js +39 -77
  27. package/es/core/editor/components/settings/Settings.module.scss +2 -10
  28. package/es/core/editor/components/settings/core/PropertyViewManager.js +61 -0
  29. package/es/core/editor/components/settings/core/getPropertyViewType.js +34 -0
  30. package/es/core/editor/components/settings/core/updateElementProperty.js +21 -0
  31. package/es/core/editor/components/settings/propertyViews/box/BoxPropertyView.js +6 -13
  32. package/es/core/editor/components/settings/propertyViews/box/BoxPropertyViewV1.js +58 -0
  33. package/es/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js +5 -2
  34. package/es/core/editor/components/settings/propertyViews/edge/EdgeGroupPropertyView.js +7 -8
  35. package/es/core/editor/components/settings/propertyViews/edge/EdgePropertyView.js +9 -23
  36. package/es/core/editor/components/settings/propertyViews/edge/addEdgeProps.js +10 -0
  37. package/es/core/editor/components/settings/propertyViews/edge/edgeGroup/EdgeGroupSetting.js +1 -6
  38. package/es/core/editor/components/settings/propertyViews/group/GroupPropertyView.js +13 -21
  39. package/es/core/editor/components/settings/propertyViews/group/GroupPropertyView.module.scss +8 -1
  40. package/es/core/editor/components/settings/propertyViews/group/GroupPropertyViewV1.js +28 -0
  41. package/es/core/editor/components/settings/propertyViews/group/SettingTab/GroupBasicSetting.js +74 -0
  42. package/es/core/editor/components/settings/propertyViews/group/SettingTab/GroupExpandSetting.js +9 -7
  43. package/es/core/editor/components/settings/propertyViews/group/cluster/ClusterGroupRelateData.js +2 -1
  44. package/es/core/editor/components/settings/propertyViews/index.js +4 -2
  45. package/es/core/editor/components/settings/propertyViews/layer/BasicSetting.js +57 -0
  46. package/es/core/editor/components/settings/propertyViews/layer/LayerPropertyView.js +11 -17
  47. package/es/core/editor/components/settings/propertyViews/layer/LayerPropertyView.module.scss +10 -0
  48. package/es/core/editor/components/settings/propertyViews/layer/LayerPropertyViewV1.js +27 -0
  49. package/es/core/editor/components/settings/propertyViews/node/NodePropertyView.js +8 -32
  50. package/es/core/editor/components/settings/propertyViews/node/NodePropertyViewV1.js +53 -0
  51. package/es/core/editor/components/settings/propertyViews/node/Setting/BasicSetting.js +49 -0
  52. package/es/core/editor/components/settings/propertyViews/node/data/Data.js +2 -1
  53. package/es/core/editor/components/settings/propertyViews/node/data/NodeRelateResourceButton.js +1 -0
  54. package/es/core/editor/components/settings/propertyViews/text/TextPropertyView.js +4 -19
  55. package/es/core/models/HistoryManager.js +11 -14
  56. package/es/core/models/{SelectionManager.js → SelectionModel.js} +27 -18
  57. package/es/core/models/TopoApp.js +3 -3
  58. package/es/networkTopo/components/editor/propertyViews/edge/EdgePropertyView.js +39 -6
  59. package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js +10 -16
  60. package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyViewV1.js +37 -0
  61. package/es/networkTopo/components/editor/propertyViews/edge/link/LinkInfoPreview.module.scss +1 -1
  62. package/es/networkTopo/models/LinkDynamicStyleExecutor.js +2 -2
  63. package/es/style.js +1 -1
  64. package/lib/components/VerticalIconTab/VerticalIconTab.js +14 -1
  65. package/lib/components/VerticalIconTab/VerticalIconTab.module.scss +1 -0
  66. package/lib/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js +8 -3
  67. package/lib/core/components/TopoView/topoView.js +3 -3
  68. package/lib/core/editor/components/Sidebar/panes.js +6 -1
  69. package/lib/core/editor/components/Toolbar/widgets/AddResourceButton.js +1 -1
  70. package/lib/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxBackgroundButton.js +1 -1
  71. package/lib/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js +1 -1
  72. package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js +1 -1
  73. package/lib/core/editor/components/Toolbar/widgets/FontColorButton.js +38 -12
  74. package/lib/core/editor/components/Toolbar/widgets/FontColorButton.module.scss +4 -5
  75. package/lib/core/editor/components/Toolbar/widgets/FontStyleButton.js +1 -1
  76. package/lib/core/editor/components/Toolbar/widgets/Layout/index.js +2 -2
  77. package/lib/core/editor/components/Toolbar/widgets/NodeAlignWidget.js +8 -1
  78. package/lib/core/editor/components/Toolbar/widgets/NodeImageButton/NodeImageButton.js +1 -1
  79. package/lib/core/editor/components/Toolbar/widgets/NodeSizeButton/NodeSizeButton.js +1 -1
  80. package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/ElementTextStyleSetting.js +1 -1
  81. package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/textStyleSettingRouter.js +1 -1
  82. package/lib/core/editor/components/settings/CloseablePanel.module.scss +12 -0
  83. package/lib/core/editor/components/settings/PropertyView.js +26 -19
  84. package/lib/core/editor/components/settings/Settings.js +44 -79
  85. package/lib/core/editor/components/settings/Settings.module.scss +2 -10
  86. package/lib/core/editor/components/settings/core/PropertyViewManager.js +70 -0
  87. package/lib/core/editor/components/settings/core/getPropertyViewType.js +40 -0
  88. package/lib/core/editor/components/settings/core/updateElementProperty.js +27 -0
  89. package/lib/core/editor/components/settings/propertyViews/box/BoxPropertyView.js +6 -13
  90. package/lib/core/editor/components/settings/propertyViews/box/BoxPropertyViewV1.js +76 -0
  91. package/lib/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js +8 -2
  92. package/lib/core/editor/components/settings/propertyViews/edge/EdgeGroupPropertyView.js +9 -12
  93. package/lib/core/editor/components/settings/propertyViews/edge/EdgePropertyView.js +7 -23
  94. package/lib/core/editor/components/settings/propertyViews/edge/addEdgeProps.js +19 -0
  95. package/lib/core/editor/components/settings/propertyViews/edge/edgeGroup/EdgeGroupSetting.js +1 -6
  96. package/lib/core/editor/components/settings/propertyViews/group/GroupPropertyView.js +14 -25
  97. package/lib/core/editor/components/settings/propertyViews/group/GroupPropertyView.module.scss +8 -1
  98. package/lib/core/editor/components/settings/propertyViews/group/GroupPropertyViewV1.js +43 -0
  99. package/lib/core/editor/components/settings/propertyViews/group/SettingTab/GroupBasicSetting.js +97 -0
  100. package/lib/core/editor/components/settings/propertyViews/group/SettingTab/GroupExpandSetting.js +8 -6
  101. package/lib/core/editor/components/settings/propertyViews/group/cluster/ClusterGroupRelateData.js +2 -1
  102. package/lib/core/editor/components/settings/propertyViews/index.js +5 -2
  103. package/lib/core/editor/components/settings/propertyViews/layer/BasicSetting.js +76 -0
  104. package/lib/core/editor/components/settings/propertyViews/layer/LayerPropertyView.js +12 -20
  105. package/lib/core/editor/components/settings/propertyViews/layer/LayerPropertyView.module.scss +10 -0
  106. package/lib/core/editor/components/settings/propertyViews/layer/LayerPropertyViewV1.js +40 -0
  107. package/lib/core/editor/components/settings/propertyViews/node/NodePropertyView.js +8 -35
  108. package/lib/core/editor/components/settings/propertyViews/node/NodePropertyViewV1.js +68 -0
  109. package/lib/core/editor/components/settings/propertyViews/node/Setting/BasicSetting.js +64 -0
  110. package/lib/core/editor/components/settings/propertyViews/node/data/Data.js +2 -1
  111. package/lib/core/editor/components/settings/propertyViews/node/data/NodeRelateResourceButton.js +1 -0
  112. package/lib/core/editor/components/settings/propertyViews/text/TextPropertyView.js +4 -19
  113. package/lib/core/models/HistoryManager.js +11 -14
  114. package/lib/core/models/{SelectionManager.js → SelectionModel.js} +27 -18
  115. package/lib/core/models/TopoApp.js +3 -3
  116. package/lib/networkTopo/components/editor/propertyViews/edge/EdgePropertyView.js +45 -7
  117. package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js +10 -18
  118. package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyViewV1.js +50 -0
  119. package/lib/networkTopo/components/editor/propertyViews/edge/link/LinkInfoPreview.module.scss +1 -1
  120. package/lib/networkTopo/models/LinkDynamicStyleExecutor.js +2 -2
  121. package/lib/style.js +1 -1
  122. package/package.json +2 -2
  123. package/es/core/editor/components/settings/OpenPropertyPanelListener.js +0 -33
  124. package/lib/core/editor/components/settings/OpenPropertyPanelListener.js +0 -43
@@ -3,109 +3,74 @@
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
4
 
5
5
  exports.__esModule = true;
6
- exports["default"] = Settings;
6
+ exports["default"] = PropertyViewContainer;
7
7
 
8
8
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
9
9
 
10
- var _react = _interopRequireDefault(require("react"));
11
-
12
- var _htElementDataUtil = require("../../../../utils/htElementDataUtil");
13
-
14
- var _propertyViews = _interopRequireDefault(require("./propertyViews"));
10
+ var _react = _interopRequireWildcard(require("react"));
15
11
 
16
12
  var _useSettingRuntimeState = _interopRequireDefault(require("./useSettingRuntimeState"));
17
13
 
18
- var _SettingsModule = _interopRequireDefault(require("./Settings.module.scss"));
14
+ var _updateElementProperty = _interopRequireDefault(require("./core/updateElementProperty"));
19
15
 
20
- function getElementType(selection) {
21
- var selectionElement = selection[0];
22
- var selectionSize = selection.length;
23
- var elementType;
16
+ 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); }
24
17
 
25
- if (!selectionSize) {
26
- // 未选
27
- elementType = "view";
28
- } else if (selectionSize >= 2) {
29
- // 多选
30
- elementType = "multiple";
31
- } else if ((0, _htElementDataUtil.isGroup)(selectionElement)) {
32
- elementType = "group";
33
- } else if (selectionElement.attrObject.topLeftText) {
34
- // TODO 临时方式
35
- elementType = "box";
36
- } else if ((0, _htElementDataUtil.isNode)(selectionElement)) {
37
- elementType = "node";
38
- } else if ((0, _htElementDataUtil.isEdge)(selectionElement)) {
39
- elementType = "edge";
40
- } else if ((0, _htElementDataUtil.isLayer)(selectionElement)) {
41
- // 分层
42
- elementType = "layer";
43
- } else if ((0, _htElementDataUtil.isText)(selectionElement)) {
44
- elementType = "text";
45
- }
18
+ 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; }
46
19
 
47
- return elementType;
20
+ function buildElementValues(selection) {
21
+ var values = (0, _extends2["default"])({}, selection[0]);
22
+ var attrTypes = ['attrObject', 'position', 'styleMap'];
23
+ attrTypes.forEach(function (type) {
24
+ Object.keys(values[type] || {}).forEach(function (key) {
25
+ values[type + "." + key] = values[type][key];
26
+ });
27
+ });
28
+ return values;
48
29
  }
49
30
 
50
- function Settings(props) {
31
+ function PropertyViewContainer(props) {
51
32
  var topo = props.topo,
52
33
  topoShowType = props.topoShowType,
53
34
  topoEditApi = props.topoEditApi,
54
35
  selection = props.selection,
55
- editorProps = props.editorProps;
56
- var settingRuntimeState = (0, _useSettingRuntimeState["default"])(); // TODO 待优化
57
-
58
- var updateElementProperty = function updateElementProperty(name, value) {
59
- // const element = topo.getDataModel().getDataById(selection[0].id);
60
- var element = topo.getSelectionModel().getFirstData(); // console.info("updateElementProperty",topo.getSelectionModel().getSelection(), { selection, element, name, value });
61
-
62
- if (name.startsWith("attrObject.")) {
63
- element.setAttr(name.replace("attrObject.", ""), value);
64
- } else if (name.startsWith("position.")) {
65
- element.setPosition(name.replace("position.", ""), value);
66
- } else if (name.startsWith("styleMap.")) {
67
- element.setStyle(name.replace("styleMap.", ""), value);
68
- } else if (name === "name") {
69
- element.setName(value);
70
- } else if (name === "width") {
71
- element.setWidth(value);
72
- } else if (name === "height") {
73
- element.setHeight(value);
74
- } else if (name === "image") {
75
- element.setImage(value);
76
- } else if (name === "layout") {
77
- // console.info("element----layout", element, value);
78
- var layouType = value.id === "toward" ? "" + value.id + value.options.subId : value.id;
79
- topo.getHtTopo().layoutInContainer(layouType);
80
- }
81
- };
82
-
83
- var elementType = getElementType(selection);
84
- var PropertyView = _propertyViews["default"][elementType];
36
+ editorProps = props.editorProps,
37
+ propertyViewManager = props.propertyViewManager;
38
+ var settingRuntimeState = (0, _useSettingRuntimeState["default"])();
39
+ var selectionElements = (0, _react.useMemo)(function () {
40
+ return topo.selectionModel.getSelection();
41
+ }, [selection]);
42
+ var PropertyView = propertyViewManager.getPropertyView(selection); // 不建议使用,直接使用ht元素对象。待优化
43
+
44
+ var singleElementValues = (0, _react.useMemo)(function () {
45
+ return selection.length === 1 ? buildElementValues(selection) : undefined;
46
+ }, [selection]);
85
47
 
86
48
  if (!PropertyView) {
49
+ propertyViewManager.close();
87
50
  return null;
88
51
  }
89
52
 
90
- var attrTypes = ["attrObject", "position", "styleMap"];
91
- var values = (0, _extends2["default"])({}, selection[0]);
92
- attrTypes.forEach(function (type) {
93
- Object.keys(values[type] || {}).forEach(function (key) {
94
- values[type + "." + key] = values[type][key];
95
- });
96
- });
97
- return /*#__PURE__*/_react["default"].createElement("div", {
98
- className: _SettingsModule["default"].content
99
- }, /*#__PURE__*/_react["default"].createElement(PropertyView, {
100
- type: elementType,
53
+ var elementProps = {};
54
+
55
+ if (selection.length === 1) {
56
+ elementProps = {
57
+ selectionElement: selectionElements[0],
58
+ values: singleElementValues
59
+ };
60
+ }
61
+
62
+ return /*#__PURE__*/_react["default"].createElement(PropertyView, (0, _extends2["default"])({
101
63
  topo: topo,
64
+ selection: selection,
65
+ selectionElements: selectionElements,
102
66
  topoShowType: topoShowType,
103
67
  topoEdit: topoEditApi,
104
68
  topoEditApi: topoEditApi,
105
- selection: selection,
106
- values: values,
107
- onChange: updateElementProperty,
108
- editorProps: editorProps,
69
+ editorProps: editorProps
70
+ }, elementProps, {
71
+ onChange: function onChange(name, value) {
72
+ (0, _updateElementProperty["default"])(topo, name, value);
73
+ },
109
74
  settingRuntimeState: settingRuntimeState
110
75
  }));
111
76
  }
@@ -1,6 +1,6 @@
1
1
  @import '~@alifd/next/variables.scss';
2
2
 
3
- .settingsPanel {
3
+ .propertyPanel {
4
4
  width: 280px;
5
5
  height: 100%;
6
6
  position: absolute;
@@ -14,7 +14,7 @@
14
14
  overflow: hidden;
15
15
  transition: width .1s linear;
16
16
 
17
- &.settingsPanelHide {
17
+ &.hide {
18
18
  width: 0;
19
19
  border-left: none;
20
20
  }
@@ -74,11 +74,3 @@
74
74
  align-items: center;
75
75
  }
76
76
  }
77
-
78
- .content {
79
- flex: 1;
80
- background: #FFFFFF;
81
- overflow: auto;
82
- // padding-bottom: 12px;
83
-
84
- }
@@ -0,0 +1,70 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
5
+ exports.__esModule = true;
6
+ exports["default"] = void 0;
7
+
8
+ var _propertyViews = _interopRequireDefault(require("../propertyViews"));
9
+
10
+ var _getPropertyViewType = _interopRequireDefault(require("./getPropertyViewType"));
11
+
12
+ var PropertyViewManager = /*#__PURE__*/function () {
13
+ function PropertyViewManager(topo) {
14
+ this.viewMap = _propertyViews["default"];
15
+ this.topo = void 0;
16
+ this.getPropertyViewType = _getPropertyViewType["default"];
17
+ this.topo = topo;
18
+ this.open = this.open.bind(this);
19
+ }
20
+
21
+ var _proto = PropertyViewManager.prototype;
22
+
23
+ _proto.updateViews = function updateViews(viewMap) {
24
+ Object.assign(this.viewMap, viewMap);
25
+ };
26
+
27
+ _proto.init = function init() {
28
+ var notifier = this.topo.getHtTopo().getNotifier();
29
+ notifier.on('topo_element_double_click', this.open);
30
+ };
31
+
32
+ _proto.destroy = function destroy() {
33
+ var notifier = this.topo.getHtTopo().getNotifier();
34
+ notifier.off('topo_element_double_click', this.open);
35
+ };
36
+
37
+ _proto.open = function open() {
38
+ var view = this.getPropertyView();
39
+
40
+ if (!view) {
41
+ return;
42
+ }
43
+
44
+ var topoEditDispatchers = this.topo.store.getModelDispatchers('topoEdit');
45
+ topoEditDispatchers.update({
46
+ propertyPanelVisible: true
47
+ });
48
+ };
49
+
50
+ _proto.close = function close() {
51
+ var topoEditDispatchers = this.topo.store.getModelDispatchers('topoEdit');
52
+ topoEditDispatchers.update({
53
+ propertyPanelVisible: false
54
+ });
55
+ };
56
+
57
+ _proto.getPropertyView = function
58
+ /* selection */
59
+ getPropertyView() {
60
+ var selection = this.topo.selectionModel.getSelection();
61
+ var elementType = (0, _getPropertyViewType["default"])(selection);
62
+ var PropertyView = this.viewMap[elementType];
63
+ return PropertyView;
64
+ };
65
+
66
+ return PropertyViewManager;
67
+ }();
68
+
69
+ var _default = PropertyViewManager;
70
+ exports["default"] = _default;
@@ -0,0 +1,40 @@
1
+ "use strict";
2
+
3
+ exports.__esModule = true;
4
+ exports["default"] = void 0;
5
+
6
+ var _htElementUtils = require("../../../../../utils/htElementUtils");
7
+
8
+ function getPropertyViewType(selection) {
9
+ var selectionElement = selection[0];
10
+ var selectionSize = selection.length;
11
+ var viewType;
12
+
13
+ if (!selectionSize) {
14
+ // 未选
15
+ viewType = 'view';
16
+ } else if (selectionSize >= 2) {
17
+ // 多选
18
+ viewType = 'multiple';
19
+ } else if ((0, _htElementUtils.isText)(selectionElement)) {
20
+ viewType = 'text';
21
+ } else if ((0, _htElementUtils.isGroup)(selectionElement)) {
22
+ viewType = 'group';
23
+ } else if (selectionElement.a('type') === 'box') {
24
+ viewType = 'box';
25
+ } else if ((0, _htElementUtils.isNode)(selectionElement)) {
26
+ viewType = 'node';
27
+ } else if ((0, _htElementUtils.isEdgeGroupAgent)(selectionElement)) {
28
+ viewType = 'edgeGroup';
29
+ } else if ((0, _htElementUtils.isEdge)(selectionElement)) {
30
+ viewType = 'edge';
31
+ } else if ((0, _htElementUtils.isLayer)(selectionElement)) {
32
+ // 分层
33
+ viewType = 'layer';
34
+ }
35
+
36
+ return viewType;
37
+ }
38
+
39
+ var _default = getPropertyViewType;
40
+ exports["default"] = _default;
@@ -0,0 +1,27 @@
1
+ "use strict";
2
+
3
+ exports.__esModule = true;
4
+ exports["default"] = updateElementProperty;
5
+
6
+ function updateElementProperty(topo, name, value) {
7
+ // const element = topo.getDataModel().getDataById(selection[0].id);
8
+ var element = topo.getSelectionModel().getFirstData(); // console.info("updateElementProperty",topo.getSelectionModel().getSelection(), { selection, element, name, value });
9
+
10
+ if (name.startsWith('attrObject.')) {
11
+ element.setAttr(name.replace('attrObject.', ''), value);
12
+ } else if (name.startsWith('position.')) {
13
+ element.setPosition(name.replace('position.', ''), value);
14
+ } else if (name.startsWith('styleMap.')) {
15
+ element.setStyle(name.replace('styleMap.', ''), value);
16
+ } else if (name === 'name') {
17
+ element.setName(value);
18
+ } else if (name === 'width') {
19
+ element.setWidth(value);
20
+ } else if (name === 'height') {
21
+ element.setHeight(value);
22
+ } else if (name === 'image') {
23
+ element.setImage(value);
24
+ }
25
+ }
26
+
27
+ ;
@@ -32,11 +32,9 @@ function parseValues(values) {
32
32
  function BoxPropertyView(props) {
33
33
  var topo = props.topo,
34
34
  values = props.values,
35
- _onChange = props.onChange;
36
- var boxNode = (0, _useHtElement["default"])({
37
- topo: topo,
38
- id: values.id
39
- });
35
+ _onChange = props.onChange,
36
+ selectionElement = props.selectionElement;
37
+ var boxNode = selectionElement;
40
38
 
41
39
  var field = _field["default"].useField({
42
40
  autoUnmount: false,
@@ -58,19 +56,14 @@ function BoxPropertyView(props) {
58
56
  }, [values]);
59
57
  return /*#__PURE__*/_react["default"].createElement(_form["default"], {
60
58
  field: field,
61
- labelAlign: "top"
62
- }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
63
- defaultExpandedKeys: ['标题区'],
59
+ labelAlign: "top",
64
60
  style: {
65
- border: 'none'
61
+ margin: '12px 16px 0 32px'
66
62
  }
67
- }, /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
68
- key: "\u6807\u9898\u533A",
69
- title: "\u6807\u9898\u533A"
70
63
  }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
71
64
  label: "\u6807\u9898\u540D\u79F0"
72
65
  }, /*#__PURE__*/_react["default"].createElement(_NameInput["default"], {
73
66
  name: "attrObject.topLeftText",
74
67
  topo: topo
75
- }))))));
68
+ })));
76
69
  }
@@ -0,0 +1,76 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
5
+ exports.__esModule = true;
6
+ exports["default"] = BoxPropertyView;
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 _collapse = _interopRequireDefault(require("@alifd/next/lib/collapse"));
15
+
16
+ var _react = _interopRequireWildcard(require("react"));
17
+
18
+ var _useHtElement = _interopRequireDefault(require("../../../../../common/hooks/useHtElement"));
19
+
20
+ var _NameInput = _interopRequireDefault(require("./NameInput"));
21
+
22
+ 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); }
23
+
24
+ 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; }
25
+
26
+ var CollapsePanel = _collapse["default"].Panel;
27
+
28
+ function parseValues(values) {
29
+ return (0, _extends2["default"])({}, values);
30
+ }
31
+
32
+ function BoxPropertyView(props) {
33
+ var topo = props.topo,
34
+ values = props.values,
35
+ _onChange = props.onChange;
36
+ var boxNode = (0, _useHtElement["default"])({
37
+ topo: topo,
38
+ id: values.id
39
+ });
40
+
41
+ var field = _field["default"].useField({
42
+ autoUnmount: false,
43
+ values: parseValues(values),
44
+ onChange: function onChange(name, value) {
45
+ var newValues = field.getValues();
46
+
47
+ _onChange(name, value, newValues);
48
+
49
+ if (name === 'attrObject.topLeftText') {
50
+ // 修改框名称改变名称背景块大小
51
+ topo.getHtTopo().setRectangleText(boxNode);
52
+ }
53
+ }
54
+ });
55
+
56
+ (0, _react.useEffect)(function () {
57
+ field.setValues(parseValues(values));
58
+ }, [values]);
59
+ return /*#__PURE__*/_react["default"].createElement(_form["default"], {
60
+ field: field,
61
+ labelAlign: "top"
62
+ }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
63
+ defaultExpandedKeys: ['标题区'],
64
+ style: {
65
+ border: 'none'
66
+ }
67
+ }, /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
68
+ key: "\u6807\u9898\u533A",
69
+ title: "\u6807\u9898\u533A"
70
+ }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
71
+ label: "\u6807\u9898\u540D\u79F0"
72
+ }, /*#__PURE__*/_react["default"].createElement(_NameInput["default"], {
73
+ name: "attrObject.topLeftText",
74
+ topo: topo
75
+ }))))));
76
+ }
@@ -3,7 +3,7 @@
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
4
 
5
5
  exports.__esModule = true;
6
- exports["default"] = CommonEdgePropertyView;
6
+ exports["default"] = void 0;
7
7
 
8
8
  var _numberPicker = _interopRequireDefault(require("@alifd/next/lib/number-picker"));
9
9
 
@@ -23,6 +23,8 @@ var _ColorPicker = _interopRequireDefault(require("../../../../../../common/comp
23
23
 
24
24
  var _LineType = _interopRequireDefault(require("../../common/LineType"));
25
25
 
26
+ var _addEdgeProps = _interopRequireDefault(require("./addEdgeProps"));
27
+
26
28
  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); }
27
29
 
28
30
  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; }
@@ -148,4 +150,8 @@ function CommonEdgePropertyView(props) {
148
150
  }
149
151
  }
150
152
  })))), extraDisplaySetting))));
151
- }
153
+ }
154
+
155
+ var _default = (0, _addEdgeProps["default"])(CommonEdgePropertyView);
156
+
157
+ exports["default"] = _default;
@@ -3,21 +3,18 @@
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
4
 
5
5
  exports.__esModule = true;
6
- exports["default"] = EdgeGroupPropertyView;
6
+ exports["default"] = void 0;
7
7
 
8
- var _react = _interopRequireWildcard(require("react"));
8
+ var _react = _interopRequireDefault(require("react"));
9
9
 
10
- var _EdgeGroupSetting = _interopRequireDefault(require("./edgeGroup/EdgeGroupSetting"));
11
-
12
- 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); }
10
+ var _addEdgeProps = _interopRequireDefault(require("./addEdgeProps"));
13
11
 
14
- 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; }
12
+ var _EdgeGroupSetting = _interopRequireDefault(require("./edgeGroup/EdgeGroupSetting"));
15
13
 
16
14
  function EdgeGroupPropertyView(props) {
17
- var topo = props.topo,
18
- edge = props.edge,
19
- values = props.values,
20
- onChange = props.onChange,
21
- editorProps = props.editorProps;
22
15
  return /*#__PURE__*/_react["default"].createElement(_EdgeGroupSetting["default"], props);
23
- }
16
+ }
17
+
18
+ var _default = (0, _addEdgeProps["default"])(EdgeGroupPropertyView);
19
+
20
+ exports["default"] = _default;
@@ -11,8 +11,6 @@ var _react = _interopRequireWildcard(require("react"));
11
11
 
12
12
  var _useHtElement = _interopRequireDefault(require("../../../../../common/hooks/useHtElement"));
13
13
 
14
- var _CommonEdgePropertyView = _interopRequireDefault(require("./CommonEdgePropertyView"));
15
-
16
14
  var _EdgeGroupPropertyView = _interopRequireDefault(require("./EdgeGroupPropertyView"));
17
15
 
18
16
  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); }
@@ -20,7 +18,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
20
18
  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
19
 
22
20
  var commonViews = {
23
- edge: _CommonEdgePropertyView["default"],
24
21
  edgeGroup: _EdgeGroupPropertyView["default"]
25
22
  };
26
23
  /**
@@ -30,31 +27,18 @@ var commonViews = {
30
27
  function EdgePropertyViewRoute(props) {
31
28
  var topo = props.topo,
32
29
  values = props.values,
30
+ selectionElement = props.selectionElement,
33
31
  editorProps = props.editorProps;
34
- var edge = (0, _useHtElement["default"])({
35
- topo: topo,
36
- id: values.id
37
- });
32
+ var edge = selectionElement;
38
33
  var type;
39
34
 
40
- if (edge.isEdgeGroupAgent()) {
41
- if (editorProps.getEdgeGroupPropertyViewType) {
42
- type = editorProps.getEdgeGroupPropertyViewType((0, _extends2["default"])({}, props, {
43
- edge: edge
44
- }));
45
- }
46
-
47
- type = type || "edgeGroup";
48
- } else {
49
- if (editorProps.getEdgePropertyViewType) {
50
- type = editorProps.getEdgePropertyViewType((0, _extends2["default"])({}, props, {
51
- edge: edge
52
- }));
53
- }
54
-
55
- type = type || "edge";
35
+ if (editorProps.getEdgePropertyViewType) {
36
+ type = editorProps.getEdgePropertyViewType((0, _extends2["default"])({}, props, {
37
+ edge: edge
38
+ }));
56
39
  }
57
40
 
41
+ type = type || 'edge';
58
42
  var views = (0, _extends2["default"])({}, commonViews, editorProps.edgePropertyViews || {});
59
43
  var View = views[type];
60
44
 
@@ -0,0 +1,19 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
5
+ exports.__esModule = true;
6
+ exports["default"] = addEdgeProps;
7
+
8
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
9
+
10
+ var _react = _interopRequireDefault(require("react"));
11
+
12
+ function addEdgeProps(Component) {
13
+ return function AdapterEdgeProps(props) {
14
+ var selectionElement = props.selectionElement;
15
+ return /*#__PURE__*/_react["default"].createElement(Component, (0, _extends2["default"])({}, props, {
16
+ edge: selectionElement
17
+ }));
18
+ };
19
+ }
@@ -30,13 +30,12 @@ function parseValues(values) {
30
30
  function EdgeGroupSetting(props) {
31
31
  var topo = props.topo,
32
32
  edge = props.edge,
33
- values = props.values,
34
33
  _onChange = props.onChange,
35
34
  editorProps = props.editorProps;
36
35
 
37
36
  var field = _field["default"].useField({
38
37
  autoUnmount: false,
39
- values: parseValues(values),
38
+ values: {},
40
39
  onChange: function onChange(name, value) {
41
40
  var newValues = field.getValues();
42
41
 
@@ -44,10 +43,6 @@ function EdgeGroupSetting(props) {
44
43
  }
45
44
  });
46
45
 
47
- (0, _react.useEffect)(function () {
48
- field.setValues(parseValues(values));
49
- }, [values]);
50
-
51
46
  var setLineColor = function setLineColor(color) {
52
47
  var style = edge.a('styles') || {};
53
48
  edge.s('edge.color', color);