@riil-frontend/component-topology 11.0.35 → 12.0.0-dev.1
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.
- package/build/1.js +2 -2
- package/build/2.js +1 -1
- package/build/index.js +45 -29
- package/es/components/BatchAttrMetric/setting.js +1 -1
- package/es/components/MultiResourceDrawer/index.js +8 -6
- package/es/components/ResourceList/ResourceSelect.js +8 -7
- package/es/components/ResourceSelectDrawer/ResourceSelectDrawer.js +8 -6
- package/es/components/SingleResourceDrawer/SelectDrawer.js +8 -6
- package/es/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js +8 -6
- package/es/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js +24 -14
- package/es/core/editor/components/BackgroundView/index.js +73 -54
- package/es/core/editor/components/CustomIconPlugin/RenameDialog.js +8 -6
- package/es/core/editor/components/CustomIconPlugin/utils/svgToShape.js +7 -5
- package/es/core/editor/components/GroupAddResourceDrawerPlugin/GroupAddResourceDrawer.js +8 -6
- package/es/core/editor/components/Sidebar/views/CanvasPanel/hooks/useCanvasThemeConfig.js +15 -8
- package/es/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxBackgroundSetting.js +16 -10
- package/es/core/editor/components/Toolbar/widgets/FontColorButton.js +16 -10
- package/es/core/editor/components/settings/propertyViews/layer/DataTab/DefaultLayerAddResourceDrawer.js +8 -6
- package/es/core/editor/components/settings/propertyViews/node/data/BindResourceDrawer.js +8 -6
- package/es/core/editor/components/settings/propertyViews/node/data/Data.js +8 -6
- package/es/core/editor/components/settings/propertyViews/view/BackgroundSize.js +8 -6
- package/es/core/editor/components/titlebar/TopoEditorTitleBar.js +28 -16
- package/es/core/editor/hooks/useKeyboardShortcut.js +36 -32
- package/es/core/editor/utils/copyElementUtil.js +171 -0
- package/es/core/hooks/usePolling.js +21 -13
- package/es/core/hooks/useResourceConfig.js +37 -21
- package/es/core/hooks/useTopoEdit.js +202 -139
- package/es/core/models/Alarm.js +104 -38
- package/es/core/models/AttributeMetricDisplay.js +36 -14
- package/es/core/models/TopoApp.js +197 -75
- package/es/core/models/TopoGraphView.js +20 -10
- package/es/core/models/cache/CiCache.js +12 -6
- package/es/core/models/cache/CiTypeCache.js +20 -10
- package/es/core/models/cache/DictCache.js +10 -6
- package/es/core/models/graph/Background.js +9 -6
- package/es/core/models/plugins/resourceWebControllUrl.js +21 -8
- package/es/core/models/tagstips/ElementTagTipConfig.js +20 -10
- package/es/core/models/topoData.js +7 -5
- package/es/core/models/utils/linkUtils.js +8 -5
- package/es/core/services/cmdb/metric.js +7 -5
- package/es/core/services/cmdb.js +9 -5
- package/es/core/services/index.js +23 -9
- package/es/core/services/topo/tagtip.js +7 -5
- package/es/core/store/models/customIcon.js +11 -6
- package/es/core/utils/imageUtil.js +7 -5
- package/es/core/utils/metricUtil.js +5 -0
- package/es/core/utils/saveSerialize.js +7 -5
- package/es/core/viewer/components/plugins/ResourceDetail/components/ClusterMemberTable.js +8 -6
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +8 -5
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +57 -25
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/Configurator/index.js +47 -34
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopoCard.js +9 -5
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/services/index.js +74 -34
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useAlarmAndRiskData.js +9 -6
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useMetricModels.js +9 -6
- package/es/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/hooks/useWebConsole.js +31 -26
- package/es/core/viewer/components/plugins/ResourceDetail/getCiDisplayMetricModels.js +15 -7
- package/es/core/viewer/components/plugins/ResourceDetail/hooks/useUserId.js +7 -4
- package/es/core/viewer/components/plugins/ResourceWebControllUrlSettingDialog.js +8 -6
- package/es/networkTopo/components/Link/hook.js +21 -14
- package/es/networkTopo/components/Link/index.js +32 -18
- package/es/networkTopo/components/Link/setting.js +8 -6
- package/es/networkTopo/getTopoData.js +23 -10
- package/es/networkTopo/hooks/viewer/useRelateTopo.js +7 -4
- package/es/networkTopo/models/TopoCenter.js +24 -10
- package/es/networkTopo/services/cmdb.js +333 -233
- package/es/networkTopo/services/mdc.js +24 -15
- package/es/networkTopo/services/metric.js +16 -11
- package/es/networkTopo/services/model.js +412 -283
- package/es/networkTopo/utils/exportData.js +7 -5
- package/lib/components/BatchAttrMetric/setting.js +1 -1
- package/lib/components/MultiResourceDrawer/index.js +8 -6
- package/lib/components/ResourceList/ResourceSelect.js +8 -6
- package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js +8 -6
- package/lib/components/SingleResourceDrawer/SelectDrawer.js +8 -6
- package/lib/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js +8 -6
- package/lib/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js +24 -14
- package/lib/core/editor/components/BackgroundView/index.js +74 -55
- package/lib/core/editor/components/CustomIconPlugin/RenameDialog.js +8 -6
- package/lib/core/editor/components/CustomIconPlugin/utils/svgToShape.js +7 -4
- package/lib/core/editor/components/GroupAddResourceDrawerPlugin/GroupAddResourceDrawer.js +8 -6
- package/lib/core/editor/components/Sidebar/views/CanvasPanel/hooks/useCanvasThemeConfig.js +15 -8
- package/lib/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxBackgroundSetting.js +16 -10
- package/lib/core/editor/components/Toolbar/widgets/FontColorButton.js +16 -10
- package/lib/core/editor/components/settings/propertyViews/layer/DataTab/DefaultLayerAddResourceDrawer.js +8 -6
- package/lib/core/editor/components/settings/propertyViews/node/data/BindResourceDrawer.js +8 -6
- package/lib/core/editor/components/settings/propertyViews/node/data/Data.js +8 -6
- package/lib/core/editor/components/settings/propertyViews/view/BackgroundSize.js +8 -6
- package/lib/core/editor/components/titlebar/TopoEditorTitleBar.js +28 -16
- package/lib/core/editor/hooks/useKeyboardShortcut.js +37 -34
- package/lib/core/editor/utils/copyElementUtil.js +182 -0
- package/lib/core/hooks/usePolling.js +21 -13
- package/lib/core/hooks/useResourceConfig.js +37 -21
- package/lib/core/hooks/useTopoEdit.js +202 -139
- package/lib/core/models/Alarm.js +104 -38
- package/lib/core/models/AttributeMetricDisplay.js +36 -14
- package/lib/core/models/TopoApp.js +197 -75
- package/lib/core/models/TopoGraphView.js +20 -10
- package/lib/core/models/cache/CiCache.js +12 -6
- package/lib/core/models/cache/CiTypeCache.js +20 -10
- package/lib/core/models/cache/DictCache.js +10 -6
- package/lib/core/models/graph/Background.js +9 -6
- package/lib/core/models/plugins/resourceWebControllUrl.js +21 -8
- package/lib/core/models/tagstips/ElementTagTipConfig.js +20 -10
- package/lib/core/models/topoData.js +7 -4
- package/lib/core/models/utils/linkUtils.js +8 -4
- package/lib/core/services/cmdb/metric.js +7 -4
- package/lib/core/services/cmdb.js +9 -4
- package/lib/core/services/index.js +21 -8
- package/lib/core/services/topo/tagtip.js +7 -4
- package/lib/core/store/models/customIcon.js +11 -6
- package/lib/core/utils/imageUtil.js +7 -4
- package/lib/core/utils/metricUtil.js +5 -0
- package/lib/core/utils/saveSerialize.js +7 -4
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ClusterMemberTable.js +8 -6
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +9 -6
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +57 -25
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/Configurator/index.js +49 -36
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopoCard.js +9 -5
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/services/index.js +73 -35
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useAlarmAndRiskData.js +9 -6
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useMetricModels.js +9 -6
- package/lib/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/hooks/useWebConsole.js +31 -25
- package/lib/core/viewer/components/plugins/ResourceDetail/getCiDisplayMetricModels.js +14 -6
- package/lib/core/viewer/components/plugins/ResourceDetail/hooks/useUserId.js +7 -4
- package/lib/core/viewer/components/plugins/ResourceWebControllUrlSettingDialog.js +8 -6
- package/lib/networkTopo/components/Link/hook.js +23 -15
- package/lib/networkTopo/components/Link/index.js +32 -18
- package/lib/networkTopo/components/Link/setting.js +8 -6
- package/lib/networkTopo/getTopoData.js +23 -10
- package/lib/networkTopo/hooks/viewer/useRelateTopo.js +7 -4
- package/lib/networkTopo/models/TopoCenter.js +24 -10
- package/lib/networkTopo/services/cmdb.js +336 -235
- package/lib/networkTopo/services/mdc.js +24 -14
- package/lib/networkTopo/services/metric.js +16 -10
- package/lib/networkTopo/services/model.js +414 -284
- package/lib/networkTopo/utils/exportData.js +7 -4
- package/lib/utils/htElementDataUtil.js +4 -2
- package/package.json +3 -2
@@ -20,8 +20,6 @@ var _themes = _interopRequireDefault(require("../../../../../config/themes"));
|
|
20
20
|
var _themeUtil = _interopRequireDefault(require("../../../../../utils/themeUtil"));
|
21
21
|
|
22
22
|
function useCanvasThemeConfig(props) {
|
23
|
-
var _ref, _setGlobalTagTheme;
|
24
|
-
|
25
23
|
var topo = props.topo;
|
26
24
|
|
27
25
|
var _topo$store$useModel = topo.store.useModel('displayConfig'),
|
@@ -30,8 +28,8 @@ function useCanvasThemeConfig(props) {
|
|
30
28
|
|
31
29
|
var canvasThemeName = displayConfig.canvasTheme || 'white';
|
32
30
|
|
33
|
-
var setCanvasTheme = function
|
34
|
-
|
31
|
+
var setCanvasTheme = /*#__PURE__*/function () {
|
32
|
+
var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(themeName) {
|
35
33
|
var themeConfig;
|
36
34
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
37
35
|
while (1) switch (_context.prev = _context.next) {
|
@@ -58,12 +56,20 @@ function useCanvasThemeConfig(props) {
|
|
58
56
|
return _context.stop();
|
59
57
|
}
|
60
58
|
}, _callee);
|
61
|
-
}))
|
62
|
-
|
59
|
+
}));
|
60
|
+
|
61
|
+
return function setCanvasTheme(_x) {
|
62
|
+
return _ref.apply(this, arguments);
|
63
|
+
};
|
64
|
+
}(); // 设置资源/链路标注样式
|
63
65
|
|
64
66
|
|
65
67
|
function setGlobalTagTheme(_x2) {
|
66
|
-
return
|
68
|
+
return _setGlobalTagTheme.apply(this, arguments);
|
69
|
+
}
|
70
|
+
|
71
|
+
function _setGlobalTagTheme() {
|
72
|
+
_setGlobalTagTheme = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(themeConfig) {
|
67
73
|
var _topo$store$getModelS, nodeLabelStyle, defaultEdgeLabelStyle;
|
68
74
|
|
69
75
|
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
@@ -84,7 +90,8 @@ function useCanvasThemeConfig(props) {
|
|
84
90
|
return _context2.stop();
|
85
91
|
}
|
86
92
|
}, _callee2);
|
87
|
-
}))
|
93
|
+
}));
|
94
|
+
return _setGlobalTagTheme.apply(this, arguments);
|
88
95
|
}
|
89
96
|
|
90
97
|
function setElementsTheme(themeConfig) {
|
package/lib/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxBackgroundSetting.js
CHANGED
@@ -24,8 +24,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
24
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
25
|
|
26
26
|
function BoxBackgroundSetting(props) {
|
27
|
-
var _ref, _ref2;
|
28
|
-
|
29
27
|
var topo = props.topo,
|
30
28
|
fieldProps = props.fieldProps,
|
31
29
|
setStyle = props.setStyle,
|
@@ -53,8 +51,8 @@ function BoxBackgroundSetting(props) {
|
|
53
51
|
topo.historyManager.endTransaction();
|
54
52
|
};
|
55
53
|
|
56
|
-
var backgroundChang = function
|
57
|
-
|
54
|
+
var backgroundChang = /*#__PURE__*/function () {
|
55
|
+
var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(value, type) {
|
58
56
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
59
57
|
while (1) switch (_context.prev = _context.next) {
|
60
58
|
case 0:
|
@@ -84,8 +82,12 @@ function BoxBackgroundSetting(props) {
|
|
84
82
|
return _context.stop();
|
85
83
|
}
|
86
84
|
}, _callee);
|
87
|
-
}))
|
88
|
-
|
85
|
+
}));
|
86
|
+
|
87
|
+
return function backgroundChang(_x, _x2) {
|
88
|
+
return _ref.apply(this, arguments);
|
89
|
+
};
|
90
|
+
}();
|
89
91
|
|
90
92
|
var borderOpacityChange = function borderOpacityChange(value) {
|
91
93
|
topo.historyManager.beginTransaction();
|
@@ -103,8 +105,8 @@ function BoxBackgroundSetting(props) {
|
|
103
105
|
topo.historyManager.endTransaction();
|
104
106
|
};
|
105
107
|
|
106
|
-
var borderColorChang = function
|
107
|
-
|
108
|
+
var borderColorChang = /*#__PURE__*/function () {
|
109
|
+
var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(value, type) {
|
108
110
|
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
109
111
|
while (1) switch (_context2.prev = _context2.next) {
|
110
112
|
case 0:
|
@@ -134,8 +136,12 @@ function BoxBackgroundSetting(props) {
|
|
134
136
|
return _context2.stop();
|
135
137
|
}
|
136
138
|
}, _callee2);
|
137
|
-
}))
|
138
|
-
|
139
|
+
}));
|
140
|
+
|
141
|
+
return function borderColorChang(_x3, _x4) {
|
142
|
+
return _ref2.apply(this, arguments);
|
143
|
+
};
|
144
|
+
}();
|
139
145
|
|
140
146
|
var leftInputChange = function leftInputChange(val) {
|
141
147
|
setLeftInputVal(val);
|
@@ -29,8 +29,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
29
29
|
|
30
30
|
/* eslint-disable jsx-a11y/alt-text */
|
31
31
|
function FontColorDropdown(props) {
|
32
|
-
var _ref, _ref2;
|
33
|
-
|
34
32
|
var color = props.color,
|
35
33
|
onChange = props.onChange,
|
36
34
|
topo = props.topo,
|
@@ -55,8 +53,8 @@ function FontColorDropdown(props) {
|
|
55
53
|
topo.historyManager.endTransaction();
|
56
54
|
};
|
57
55
|
|
58
|
-
var colorChang = function
|
59
|
-
|
56
|
+
var colorChang = /*#__PURE__*/function () {
|
57
|
+
var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(value, type) {
|
60
58
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
61
59
|
while (1) switch (_context.prev = _context.next) {
|
62
60
|
case 0:
|
@@ -86,11 +84,15 @@ function FontColorDropdown(props) {
|
|
86
84
|
return _context.stop();
|
87
85
|
}
|
88
86
|
}, _callee);
|
89
|
-
}))
|
90
|
-
|
87
|
+
}));
|
88
|
+
|
89
|
+
return function colorChang(_x, _x2) {
|
90
|
+
return _ref.apply(this, arguments);
|
91
|
+
};
|
92
|
+
}();
|
91
93
|
|
92
|
-
var backgroundChang = function
|
93
|
-
|
94
|
+
var backgroundChang = /*#__PURE__*/function () {
|
95
|
+
var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(value, type) {
|
94
96
|
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
95
97
|
while (1) switch (_context2.prev = _context2.next) {
|
96
98
|
case 0:
|
@@ -120,8 +122,12 @@ function FontColorDropdown(props) {
|
|
120
122
|
return _context2.stop();
|
121
123
|
}
|
122
124
|
}, _callee2);
|
123
|
-
}))
|
124
|
-
|
125
|
+
}));
|
126
|
+
|
127
|
+
return function backgroundChang(_x3, _x4) {
|
128
|
+
return _ref2.apply(this, arguments);
|
129
|
+
};
|
130
|
+
}();
|
125
131
|
|
126
132
|
var onFocus = function onFocus() {// topo.historyManager.beginTransaction();
|
127
133
|
};
|
@@ -18,16 +18,14 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
18
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; }
|
19
19
|
|
20
20
|
var LayerAddResourceDrawer = function LayerAddResourceDrawer(props) {
|
21
|
-
var _ref;
|
22
|
-
|
23
21
|
var visible = props.visible,
|
24
22
|
layer = props.layer,
|
25
23
|
topo = props.topo,
|
26
24
|
topoEdit = props.topoEdit,
|
27
25
|
onClose = props.onClose;
|
28
26
|
|
29
|
-
var onOk = function
|
30
|
-
|
27
|
+
var onOk = /*#__PURE__*/function () {
|
28
|
+
var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(selected) {
|
31
29
|
var layerData;
|
32
30
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
33
31
|
while (1) switch (_context.prev = _context.next) {
|
@@ -44,8 +42,12 @@ var LayerAddResourceDrawer = function LayerAddResourceDrawer(props) {
|
|
44
42
|
return _context.stop();
|
45
43
|
}
|
46
44
|
}, _callee);
|
47
|
-
}))
|
48
|
-
|
45
|
+
}));
|
46
|
+
|
47
|
+
return function onOk(_x) {
|
48
|
+
return _ref.apply(this, arguments);
|
49
|
+
};
|
50
|
+
}();
|
49
51
|
|
50
52
|
return /*#__PURE__*/_react["default"].createElement(_NetworkTopoResourceSelectDrawer["default"], {
|
51
53
|
visible: visible,
|
@@ -26,16 +26,14 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
26
26
|
* @constructor
|
27
27
|
*/
|
28
28
|
var BindResourceDrawer = function BindResourceDrawer(props) {
|
29
|
-
var _ref;
|
30
|
-
|
31
29
|
var visible = props.visible,
|
32
30
|
topoEditApi = props.topoEditApi,
|
33
31
|
node = props.node,
|
34
32
|
currentResId = props.currentResId,
|
35
33
|
onClose = props.onClose;
|
36
34
|
|
37
|
-
var handleSave = function
|
38
|
-
|
35
|
+
var handleSave = /*#__PURE__*/function () {
|
36
|
+
var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(selected) {
|
39
37
|
var result;
|
40
38
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
41
39
|
while (1) switch (_context.prev = _context.next) {
|
@@ -66,8 +64,12 @@ var BindResourceDrawer = function BindResourceDrawer(props) {
|
|
66
64
|
return _context.stop();
|
67
65
|
}
|
68
66
|
}, _callee);
|
69
|
-
}))
|
70
|
-
|
67
|
+
}));
|
68
|
+
|
69
|
+
return function handleSave(_x) {
|
70
|
+
return _ref.apply(this, arguments);
|
71
|
+
};
|
72
|
+
}();
|
71
73
|
|
72
74
|
return /*#__PURE__*/_react["default"].createElement(_NetworkTopoResourceSelectDrawer["default"], {
|
73
75
|
visible: visible,
|
@@ -56,8 +56,6 @@ function getBindType(values) {
|
|
56
56
|
}
|
57
57
|
|
58
58
|
function Data(props) {
|
59
|
-
var _ref;
|
60
|
-
|
61
59
|
var node = props.node,
|
62
60
|
topo = props.topo,
|
63
61
|
topoEditApi = props.topoEditApi,
|
@@ -96,8 +94,8 @@ function Data(props) {
|
|
96
94
|
}
|
97
95
|
};
|
98
96
|
|
99
|
-
var handleBindTopoChange = function
|
100
|
-
|
97
|
+
var handleBindTopoChange = /*#__PURE__*/function () {
|
98
|
+
var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(value, data) {
|
101
99
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
102
100
|
while (1) switch (_context.prev = _context.next) {
|
103
101
|
case 0:
|
@@ -116,8 +114,12 @@ function Data(props) {
|
|
116
114
|
return _context.stop();
|
117
115
|
}
|
118
116
|
}, _callee);
|
119
|
-
}))
|
120
|
-
|
117
|
+
}));
|
118
|
+
|
119
|
+
return function handleBindTopoChange(_x, _x2) {
|
120
|
+
return _ref.apply(this, arguments);
|
121
|
+
};
|
122
|
+
}();
|
121
123
|
|
122
124
|
var RelateTopoTree = editorProps === null || editorProps === void 0 ? void 0 : editorProps.relateTopoTree;
|
123
125
|
return /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
|
@@ -16,8 +16,6 @@ var _NodeSizeInput = _interopRequireDefault(require("../../common/NodeSizeInput/
|
|
16
16
|
var _useBackgroundSizeConfig = _interopRequireDefault(require("./hooks/useBackgroundSizeConfig"));
|
17
17
|
|
18
18
|
function BackgroundSize(props) {
|
19
|
-
var _ref;
|
20
|
-
|
21
19
|
var topo = props.topo,
|
22
20
|
backgroundConfig = props.backgroundConfig,
|
23
21
|
settingRuntimeState = props.settingRuntimeState;
|
@@ -26,8 +24,8 @@ function BackgroundSize(props) {
|
|
26
24
|
current: backgroundConfig.current
|
27
25
|
});
|
28
26
|
|
29
|
-
var setSize = function
|
30
|
-
|
27
|
+
var setSize = /*#__PURE__*/function () {
|
28
|
+
var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(size) {
|
31
29
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
32
30
|
while (1) switch (_context.prev = _context.next) {
|
33
31
|
case 0:
|
@@ -43,8 +41,12 @@ function BackgroundSize(props) {
|
|
43
41
|
return _context.stop();
|
44
42
|
}
|
45
43
|
}, _callee);
|
46
|
-
}))
|
47
|
-
|
44
|
+
}));
|
45
|
+
|
46
|
+
return function setSize(_x) {
|
47
|
+
return _ref.apply(this, arguments);
|
48
|
+
};
|
49
|
+
}();
|
48
50
|
|
49
51
|
return /*#__PURE__*/_react["default"].createElement(_NodeSizeInput["default"], {
|
50
52
|
nodeId: backgroundSizeConfig.nodeId,
|
@@ -34,8 +34,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
34
34
|
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; }
|
35
35
|
|
36
36
|
function TopoEditorTitleBar(props) {
|
37
|
-
var _ref;
|
38
|
-
|
39
37
|
var topo = props.topo,
|
40
38
|
topoEditApi = props.topoEditApi;
|
41
39
|
var store = topo.store;
|
@@ -50,8 +48,8 @@ function TopoEditorTitleBar(props) {
|
|
50
48
|
exitFlag = _useState[0],
|
51
49
|
setExitFlag = _useState[1];
|
52
50
|
|
53
|
-
var saveAndExit = function
|
54
|
-
|
51
|
+
var saveAndExit = /*#__PURE__*/function () {
|
52
|
+
var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
|
55
53
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
56
54
|
while (1) switch (_context.prev = _context.next) {
|
57
55
|
case 0:
|
@@ -66,8 +64,12 @@ function TopoEditorTitleBar(props) {
|
|
66
64
|
return _context.stop();
|
67
65
|
}
|
68
66
|
}, _callee);
|
69
|
-
}))
|
70
|
-
|
67
|
+
}));
|
68
|
+
|
69
|
+
return function saveAndExit() {
|
70
|
+
return _ref.apply(this, arguments);
|
71
|
+
};
|
72
|
+
}();
|
71
73
|
|
72
74
|
(0, _react.useEffect)(function () {
|
73
75
|
if (!saving && exitFlag) {
|
@@ -96,13 +98,11 @@ function TopoEditorTitleBar(props) {
|
|
96
98
|
}, "\u4FDD\u5B58"), /*#__PURE__*/_react["default"].createElement(_button["default"], {
|
97
99
|
className: _TitleBarModule["default"].button,
|
98
100
|
onClick: function onClick() {
|
99
|
-
var _onOk, _onCancel;
|
100
|
-
|
101
101
|
_dialog["default"].confirm({
|
102
102
|
title: '提示',
|
103
103
|
content: '若直接退出,图上修改的内容将不会保存!',
|
104
|
-
onOk: function
|
105
|
-
|
104
|
+
onOk: function () {
|
105
|
+
var _onOk = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
|
106
106
|
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
107
107
|
while (1) switch (_context2.prev = _context2.next) {
|
108
108
|
case 0:
|
@@ -113,10 +113,16 @@ function TopoEditorTitleBar(props) {
|
|
113
113
|
return _context2.stop();
|
114
114
|
}
|
115
115
|
}, _callee2);
|
116
|
-
}))
|
117
|
-
|
118
|
-
|
119
|
-
|
116
|
+
}));
|
117
|
+
|
118
|
+
function onOk() {
|
119
|
+
return _onOk.apply(this, arguments);
|
120
|
+
}
|
121
|
+
|
122
|
+
return onOk;
|
123
|
+
}(),
|
124
|
+
onCancel: function () {
|
125
|
+
var _onCancel = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
|
120
126
|
return _regenerator["default"].wrap(function _callee3$(_context3) {
|
121
127
|
while (1) switch (_context3.prev = _context3.next) {
|
122
128
|
case 0:
|
@@ -127,8 +133,14 @@ function TopoEditorTitleBar(props) {
|
|
127
133
|
return _context3.stop();
|
128
134
|
}
|
129
135
|
}, _callee3);
|
130
|
-
}))
|
131
|
-
|
136
|
+
}));
|
137
|
+
|
138
|
+
function onCancel() {
|
139
|
+
return _onCancel.apply(this, arguments);
|
140
|
+
}
|
141
|
+
|
142
|
+
return onCancel;
|
143
|
+
}(),
|
132
144
|
cancelProps: {
|
133
145
|
children: '退出'
|
134
146
|
},
|
@@ -1,49 +1,52 @@
|
|
1
1
|
"use strict";
|
2
2
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
4
|
+
|
3
5
|
exports.__esModule = true;
|
4
6
|
exports["default"] = useKeyboardShortcut;
|
5
7
|
|
6
|
-
var
|
8
|
+
var _hotkeysJs = _interopRequireDefault(require("hotkeys-js"));
|
9
|
+
|
10
|
+
var _react = require("react");
|
11
|
+
|
12
|
+
var _copyElementUtil = require("../utils/copyElementUtil");
|
13
|
+
|
14
|
+
function initKeyboardShortcuts(props) {
|
15
|
+
var topo = props.topo,
|
16
|
+
topoEdit = props.topoEdit; // 撤销
|
17
|
+
|
18
|
+
(0, _hotkeysJs["default"])('ctrl+z, command+z', function (event) {
|
19
|
+
topo.historyManager.undo();
|
20
|
+
}); // 重做
|
21
|
+
|
22
|
+
(0, _hotkeysJs["default"])('ctrl+y, command+y', function (event) {}); // 空格:切换选择/移动
|
7
23
|
|
8
|
-
|
24
|
+
(0, _hotkeysJs["default"])('space', function (event) {
|
25
|
+
var _topo$store$getModelS = topo.store.getModelState('topoEdit'),
|
26
|
+
viewMouseMode = _topo$store$getModelS.viewMouseMode;
|
9
27
|
|
10
|
-
|
28
|
+
topoEdit.setViewMouseMode(viewMouseMode === 'select' ? 'move' : 'select');
|
29
|
+
}); // 复制
|
30
|
+
|
31
|
+
(0, _hotkeysJs["default"])('ctrl+c, command+c', function (event) {
|
32
|
+
return (0, _copyElementUtil.handleCopyHotkey)(event, props);
|
33
|
+
}); // 粘贴
|
34
|
+
|
35
|
+
(0, _hotkeysJs["default"])('ctrl+v, command+v', function (event) {
|
36
|
+
return (0, _copyElementUtil.handlePasteHotkey)(event, props);
|
37
|
+
});
|
38
|
+
}
|
39
|
+
|
40
|
+
function unbindKeyboardShortcuts(props) {
|
41
|
+
_hotkeysJs["default"].unbind();
|
42
|
+
} // 快捷键
|
11
43
|
|
12
|
-
var ht = window.ht; // 快捷键
|
13
44
|
|
14
45
|
function useKeyboardShortcut(props) {
|
15
|
-
var topo = props.topo,
|
16
|
-
topoEdit = props.topoEdit;
|
17
46
|
(0, _react.useEffect)(function () {
|
18
|
-
|
19
|
-
if (e.target.tagName === 'INPUT') {
|
20
|
-
return;
|
21
|
-
}
|
22
|
-
|
23
|
-
var isCtrlDown = ht.Default.isCtrlDown;
|
24
|
-
|
25
|
-
if (isCtrlDown(e)) {
|
26
|
-
if (e.keyCode === 90) {
|
27
|
-
// ctrl+z 撤销
|
28
|
-
topo.historyManager.undo();
|
29
|
-
} // else if (e.keyCode == 89) {//ctrl+y 重做
|
30
|
-
// this.redo();
|
31
|
-
// }
|
32
|
-
|
33
|
-
}
|
34
|
-
|
35
|
-
if (e.keyCode === 32 && e.target.nodeName !== 'TEXTAREA') {
|
36
|
-
// 空格
|
37
|
-
var _topo$store$getModelS2 = topo.store.getModelState('topoEdit'),
|
38
|
-
viewMouseMode = _topo$store$getModelS2.viewMouseMode;
|
39
|
-
|
40
|
-
topoEdit.setViewMouseMode(viewMouseMode === 'select' ? 'move' : 'select');
|
41
|
-
}
|
42
|
-
};
|
43
|
-
|
44
|
-
window.addEventListener('keydown', handleKeyDown);
|
47
|
+
initKeyboardShortcuts(props);
|
45
48
|
return function () {
|
46
|
-
|
49
|
+
unbindKeyboardShortcuts(props);
|
47
50
|
};
|
48
51
|
}, []);
|
49
52
|
}
|
@@ -0,0 +1,182 @@
|
|
1
|
+
"use strict";
|
2
|
+
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
4
|
+
|
5
|
+
exports.__esModule = true;
|
6
|
+
exports.handleCopyHotkey = handleCopyHotkey;
|
7
|
+
exports.handlePasteHotkey = handlePasteHotkey;
|
8
|
+
|
9
|
+
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
10
|
+
|
11
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
12
|
+
|
13
|
+
function handleCopyHotkey(event, options) {
|
14
|
+
var target = event.target || event.srcElement;
|
15
|
+
var tagName = target.tagName;
|
16
|
+
|
17
|
+
if (tagName !== 'BODY') {
|
18
|
+
copy(options);
|
19
|
+
}
|
20
|
+
}
|
21
|
+
|
22
|
+
function handlePasteHotkey(event, options) {
|
23
|
+
var target = event.target || event.srcElement;
|
24
|
+
var tagName = target.tagName;
|
25
|
+
|
26
|
+
if (tagName !== 'BODY') {
|
27
|
+
paste(options);
|
28
|
+
}
|
29
|
+
}
|
30
|
+
|
31
|
+
function copy(options) {
|
32
|
+
var topo = options.topo;
|
33
|
+
var gv = topo.getHtTopo().getGraphView();
|
34
|
+
var dm = gv.dm();
|
35
|
+
var sm = dm.sm();
|
36
|
+
var serializer = new ht.JSONSerializer(dm);
|
37
|
+
|
38
|
+
serializer.isSerializable = function (data) {
|
39
|
+
//可在此设置要选中的数据或者在copy处
|
40
|
+
// if(sm.co(data)){
|
41
|
+
// if(data instanceof ht.Group){
|
42
|
+
// sm.as(data.getChildren());
|
43
|
+
// }
|
44
|
+
// }
|
45
|
+
return sm.co(data);
|
46
|
+
};
|
47
|
+
|
48
|
+
var copyData = {
|
49
|
+
copyTopoElements: true,
|
50
|
+
source: {
|
51
|
+
id: topo.id,
|
52
|
+
topoType: topo.viewProps.topoType
|
53
|
+
},
|
54
|
+
data: serializer.toJSON()
|
55
|
+
};
|
56
|
+
writeClipboard(JSON.stringify(copyData, null, 0));
|
57
|
+
}
|
58
|
+
|
59
|
+
function paste(_x) {
|
60
|
+
return _paste.apply(this, arguments);
|
61
|
+
}
|
62
|
+
|
63
|
+
function _paste() {
|
64
|
+
_paste = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(options) {
|
65
|
+
var topo, clipboardText, copyData;
|
66
|
+
return _regenerator["default"].wrap(function _callee$(_context) {
|
67
|
+
while (1) switch (_context.prev = _context.next) {
|
68
|
+
case 0:
|
69
|
+
topo = options.topo;
|
70
|
+
_context.next = 3;
|
71
|
+
return readClipboard();
|
72
|
+
|
73
|
+
case 3:
|
74
|
+
clipboardText = _context.sent;
|
75
|
+
copyData = parseCopyData(clipboardText, topo);
|
76
|
+
|
77
|
+
if (copyData) {
|
78
|
+
topo.historyManager.beginTransaction();
|
79
|
+
doPaste(topo, copyData.data);
|
80
|
+
topo.historyManager.endTransaction();
|
81
|
+
}
|
82
|
+
|
83
|
+
case 6:
|
84
|
+
case "end":
|
85
|
+
return _context.stop();
|
86
|
+
}
|
87
|
+
}, _callee);
|
88
|
+
}));
|
89
|
+
return _paste.apply(this, arguments);
|
90
|
+
}
|
91
|
+
|
92
|
+
function parseCopyData(clipboardText, topo) {
|
93
|
+
var copyData = null;
|
94
|
+
|
95
|
+
try {
|
96
|
+
copyData = JSON.parse(clipboardText); // 网络拓扑和业务拓扑之间不支持复制粘贴
|
97
|
+
|
98
|
+
if (!copyData.copyTopoElements || copyData.topoType !== topo.topoType) {
|
99
|
+
copyData = null;
|
100
|
+
}
|
101
|
+
} catch (error) {}
|
102
|
+
|
103
|
+
return copyData;
|
104
|
+
}
|
105
|
+
|
106
|
+
function validateTopoCopyText(clipboardText) {
|
107
|
+
// TODO
|
108
|
+
return true;
|
109
|
+
}
|
110
|
+
|
111
|
+
function doPaste(topo, clipboardText) {
|
112
|
+
// 解析剪切板内容
|
113
|
+
var parseDm = new ht.DataModel();
|
114
|
+
var parseSerializer = new ht.JSONSerializer(parseDm);
|
115
|
+
parseSerializer.deserialize(clipboardText);
|
116
|
+
var elements = parseDm.getDatas().toArray(); // 添加到拓扑图
|
117
|
+
|
118
|
+
var gv = topo.getHtTopo().getGraphView();
|
119
|
+
var dm = gv.dm();
|
120
|
+
elements.forEach(function (d) {
|
121
|
+
dm.add(d);
|
122
|
+
});
|
123
|
+
parseDm.clear(); // 粘贴之后进行处理
|
124
|
+
|
125
|
+
var sm = dm.sm();
|
126
|
+
sm.cs();
|
127
|
+
sm.as(elements); // 粘贴位置处理
|
128
|
+
|
129
|
+
if (isPasetToOriginTopo()) {
|
130
|
+
gv.moveSelection(60, 60);
|
131
|
+
} else {// 从拓扑图A复制到拓扑图B时,粘贴到拓扑图可视区域中心位置居中粘贴
|
132
|
+
// TODO
|
133
|
+
} // 若用户粘贴后的位置超出现有位置后,将视野拉到可视范围内
|
134
|
+
// TODO
|
135
|
+
// gv.translate(-60, -60)
|
136
|
+
|
137
|
+
}
|
138
|
+
|
139
|
+
function isPasetToOriginTopo() {
|
140
|
+
// TODO
|
141
|
+
return true;
|
142
|
+
}
|
143
|
+
|
144
|
+
function writeClipboard(_x2) {
|
145
|
+
return _writeClipboard.apply(this, arguments);
|
146
|
+
}
|
147
|
+
|
148
|
+
function _writeClipboard() {
|
149
|
+
_writeClipboard = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(text) {
|
150
|
+
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
151
|
+
while (1) switch (_context2.prev = _context2.next) {
|
152
|
+
case 0:
|
153
|
+
navigator.clipboard.writeText(text);
|
154
|
+
|
155
|
+
case 1:
|
156
|
+
case "end":
|
157
|
+
return _context2.stop();
|
158
|
+
}
|
159
|
+
}, _callee2);
|
160
|
+
}));
|
161
|
+
return _writeClipboard.apply(this, arguments);
|
162
|
+
}
|
163
|
+
|
164
|
+
function readClipboard() {
|
165
|
+
return _readClipboard.apply(this, arguments);
|
166
|
+
}
|
167
|
+
|
168
|
+
function _readClipboard() {
|
169
|
+
_readClipboard = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
|
170
|
+
return _regenerator["default"].wrap(function _callee3$(_context3) {
|
171
|
+
while (1) switch (_context3.prev = _context3.next) {
|
172
|
+
case 0:
|
173
|
+
return _context3.abrupt("return", navigator.clipboard.readText());
|
174
|
+
|
175
|
+
case 1:
|
176
|
+
case "end":
|
177
|
+
return _context3.stop();
|
178
|
+
}
|
179
|
+
}, _callee3);
|
180
|
+
}));
|
181
|
+
return _readClipboard.apply(this, arguments);
|
182
|
+
}
|