@riil-frontend/component-topology 6.0.0-alpha.6 → 6.0.0-alpha.61

package/lib/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js

@@ -23,6 +23,8 @@ var _DisplaySetting = _interopRequireDefault(require("./DisplaySetting"));
 
 var _useDisplaySetting = _interopRequireDefault(require("./hooks/useDisplaySetting"));
 
+var _EditorDisplaySetting = _interopRequireDefault(require("./EditorDisplaySetting"));
+
 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); }
 
 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; }
@@ -31,6 +33,7 @@ function DisplaySettingDrawer(props) {
   var visible = props.visible,
       topo = props.topo,
       displaySettingProps = props.displaySettingProps,
+      isEditor = props.isEditor,
       onClose = props.onClose;
   var settingRef = (0, _react.useRef)();
 
@@ -39,7 +42,8 @@ function DisplaySettingDrawer(props) {
       setLoading = _useState[1];
 
   var displaySetting = (0, _useDisplaySetting["default"])((0, _extends2["default"])({}, props, {
-    settingRef: settingRef
+    settingRef: settingRef,
+    isEditor: isEditor
   }));
 
   var handleOk = /*#__PURE__*/function () {
@@ -57,7 +61,9 @@ function DisplaySettingDrawer(props) {
               setLoading(false);
               onClose();
 
-              _message["default"].success('保存成功');
+              if (!isEditor) {
+                _message["default"].success('保存成功');
+              }
 
               _context.next = 14;
               break;
@@ -84,6 +90,7 @@ function DisplaySettingDrawer(props) {
     };
   }();
 
+  var DisplaySettingWidget = isEditor ? _EditorDisplaySetting["default"] : _DisplaySetting["default"];
   return /*#__PURE__*/_react["default"].createElement(_Drawer["default"], {
     title: "\u663E\u793A\u8BBE\u7F6E",
     visible: visible,
@@ -95,7 +102,7 @@ function DisplaySettingDrawer(props) {
 
     },
     buttons: ['保存', '取消']
-  }, visible && /*#__PURE__*/_react["default"].createElement(_DisplaySetting["default"], {
+  }, visible && /*#__PURE__*/_react["default"].createElement(DisplaySettingWidget, {
     ref: settingRef,
     topo: topo,
     displaySettingProps: displaySettingProps

package/lib/core/components/DisplaySettingDrawer/EditorDisplaySetting.js

@@ -0,0 +1,147 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _box = _interopRequireDefault(require("@alifd/next/lib/box"));
+
+var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
+var _NodeTag = _interopRequireDefault(require("./NodeTag"));
+
+var _EdgeFlow = _interopRequireDefault(require("./EdgeFlow"));
+
+var _NodeTip = _interopRequireDefault(require("./NodeTip"));
+
+var _LineExpandAllRadioGroup = _interopRequireDefault(require("./LineExpandAllRadioGroup"));
+
+var _EdgeFlowDirection = _interopRequireDefault(require("./EdgeFlowDirection"));
+
+var _BooleanRadio = _interopRequireDefault(require("../../../components/BooleanRadio"));
+
+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); }
+
+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; }
+
+/**
+ * 显示设置
+ * 
+ * @param {*} props 
+ * @returns 
+ */
+function EditorDisplaySetting(props, ref) {
+  var topo = props.topo,
+      displaySettingProps = props.displaySettingProps;
+  var displayConfig = topo.store.getModelState('displayConfig');
+
+  var _ref = displaySettingProps || {},
+      linkTagConfig = _ref.linkTagConfig,
+      linkTipConfig = _ref.linkTipConfig,
+      showEdgeExpandConfig = _ref.showEdgeExpandConfig,
+      extraConfig = _ref.extraConfig,
+      showLinkConfig = _ref.showLinkConfig,
+      nodeTagProps = _ref.nodeTagProps,
+      nodeTipProps = _ref.nodeTipProps,
+      isNetworkTopo = _ref.isNetworkTopo;
+
+  var field = _field["default"].useField({
+    autoUnmount: false,
+    values: {
+      alarmSwitch: displayConfig.alarmSwitch,
+      alarmListDefaultOpen: displayConfig.alarmListDefaultOpen,
+      nodeTag: displayConfig.nodeTag,
+      nodeTip: displayConfig.nodeTip,
+      linkTag: displayConfig.linkTag,
+      linkTip: displayConfig.linkTip,
+      expandAllEdges: displayConfig.expandAllEdges,
+      edgeFlow: displayConfig.edgeFlow,
+      edgeFlowDirection: displayConfig.edgeFlowDirection
+    },
+    onChange: function onChange(name, value) {
+      _rlog["default"].debug('DisplaySetting-onChange', name, value); // 告警静默设置
+
+
+      if (name === 'alarmSwitch') {
+        field.setValue('alarmListDefaultOpen', !!value);
+      }
+    }
+  });
+
+  (0, _react.useImperativeHandle)(ref, function () {
+    return field;
+  });
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_form["default"], {
+    field: field,
+    labelAlign: "top"
+  }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: /*#__PURE__*/_react["default"].createElement(Label, {
+      label: "\u8D44\u6E90\u6807\u6CE8",
+      helpText: "\u6700\u591A\u652F\u6301\u52FE\u90093\u9879"
+    })
+  }, /*#__PURE__*/_react["default"].createElement(_NodeTag["default"], (0, _extends2["default"])({}, nodeTagProps, {
+    name: "nodeTag",
+    topo: topo
+  }))), linkTagConfig && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: /*#__PURE__*/_react["default"].createElement(Label, {
+      label: "\u94FE\u8DEF\u6807\u6CE8",
+      helpText: "\u6700\u591A\u652F\u6301\u52FE\u90092\u9879"
+    }),
+    patternTrigger: "onChange"
+  }, linkTagConfig({
+    name: "linkTag",
+    topo: topo
+  })), /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: /*#__PURE__*/_react["default"].createElement(Label, {
+      label: "\u8D44\u6E90\u60AC\u6D6E\u6846",
+      helpText: "\u6700\u591A\u652F\u6301\u52FE\u90094\u9879"
+    }),
+    patternTrigger: "onChange"
+  }, /*#__PURE__*/_react["default"].createElement(_NodeTip["default"], (0, _extends2["default"])({}, nodeTipProps, {
+    name: "nodeTip",
+    topo: topo
+  }))), linkTipConfig && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: /*#__PURE__*/_react["default"].createElement(Label, {
+      label: "\u94FE\u8DEF\u60AC\u6D6E\u6846",
+      helpText: "\u6700\u591A\u652F\u6301\u52FE\u90094\u9879"
+    }),
+    patternTrigger: "onChange"
+  }, linkTipConfig({
+    name: "linkTip",
+    topo: topo
+  })), showEdgeExpandConfig && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: /*#__PURE__*/_react["default"].createElement(_LineExpandAllRadioGroup["default"].Label, null),
+    patternTrigger: "onChange"
+  }, /*#__PURE__*/_react["default"].createElement(_LineExpandAllRadioGroup["default"], {
+    name: "expandAllEdges",
+    isNetworkTopo: isNetworkTopo
+  }))));
+}
+
+;
+
+function Label(props) {
+  var label = props.label,
+      helpText = props.helpText;
+  return /*#__PURE__*/_react["default"].createElement(_box["default"], {
+    direction: "row",
+    spacing: 12
+  }, /*#__PURE__*/_react["default"].createElement("div", null, label), /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      color: '#638DB7'
+    }
+  }, helpText));
+}
+
+var _default = /*#__PURE__*/_react["default"].forwardRef(EditorDisplaySetting);
+
+exports["default"] = _default;

package/lib/core/components/DisplaySettingDrawer/LineExpandAllRadioGroup.js

@@ -41,8 +41,6 @@ var LineExpandAllRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function
       pluralType = _useState2[0],
       setPluralType = _useState2[1];
 
-  console.log("LineExpandAllRadioGroup-value", value, pluralType);
-
   var handleTypeChange = function handleTypeChange(newValue) {
     setShowType(newValue); // console.log("handleTypeChange---newValue", newValue, pluralType);
 
@@ -83,7 +81,6 @@ var LineExpandAllRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function
       }
     }
 
-    console.log("creatTypeValue", v);
     return v;
   }; //  useEffect(() => {
   //    setPluralType(plurals[compatibleWith(value)] ?? []);

package/lib/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js

@@ -16,18 +16,44 @@ var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-co
 var _default = function _default(props) {
   var topo = props.topo,
       displaySettingProps = props.displaySettingProps,
-      settingRef = props.settingRef;
+      settingRef = props.settingRef,
+      isEditor = props.isEditor;
 
-  var executeByConfig = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(config) {
+  var handleViewerSave = /*#__PURE__*/function () {
+    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var values, prevDisplayConfig, displayConfig, displayConfigDispatchers, extraOnOk;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
+              values = settingRef.current.getValues(); // console.info('保存显示配置', values)
+              // 保存配置
+
+              prevDisplayConfig = topo.store.getModelState('displayConfig');
+              displayConfig = (0, _extends2["default"])({}, prevDisplayConfig, values);
+              _context.next = 5;
+              return _topo["default"].saveTopoSettings(topo.id, {
+                alarmSwitch: displayConfig.alarmSwitch,
+                alarmListDefaultOpen: displayConfig.alarmListDefaultOpen,
+                extraConfig: JSON.stringify((0, _extends2["default"])({}, displayConfig))
+              });
+
+            case 5:
+              // 刷新指标配置
+              displayConfigDispatchers = topo.store.getModelDispatchers('displayConfig');
+              _context.next = 8;
+              return displayConfigDispatchers.update(displayConfig);
+
+            case 8:
               // 更新节点名称显示隐藏
               topo.attributeMetricDisplay.updateNodesNameVisible();
+              extraOnOk = (displaySettingProps === null || displaySettingProps === void 0 ? void 0 : displaySettingProps.onOk) || (displaySettingProps === null || displaySettingProps === void 0 ? void 0 : displaySettingProps.onDisplaySettingDrawerOk);
+
+              if (extraOnOk) {
+                extraOnOk(displayConfig);
+              }
 
-            case 1:
+            case 11:
             case "end":
               return _context.stop();
           }
@@ -35,43 +61,44 @@ var _default = function _default(props) {
       }, _callee);
     }));
 
-    return function executeByConfig(_x) {
+    return function handleViewerSave() {
       return _ref.apply(this, arguments);
     };
   }();
 
-  var save = /*#__PURE__*/function () {
+  var handleEditorSave = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
       var values, prevDisplayConfig, displayConfig, displayConfigDispatchers, extraOnOk;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
+              topo.historyManager.beginTransaction();
               values = settingRef.current.getValues(); // console.info('保存显示配置', values)
               // 保存配置
 
               prevDisplayConfig = topo.store.getModelState('displayConfig');
-              displayConfig = (0, _extends2["default"])({}, prevDisplayConfig, values);
-              _context2.next = 5;
-              return _topo["default"].saveTopoSettings(topo.id, {
-                alarmSwitch: displayConfig.alarmSwitch,
-                alarmListDefaultOpen: displayConfig.alarmListDefaultOpen,
-                extraConfig: JSON.stringify((0, _extends2["default"])({}, displayConfig))
-              });
+              displayConfig = (0, _extends2["default"])({}, prevDisplayConfig, values); // 刷新指标配置
 
-            case 5:
-              // 刷新指标配置
               displayConfigDispatchers = topo.store.getModelDispatchers('displayConfig');
-              displayConfigDispatchers.update(displayConfig); // 按配置执行
+              _context2.next = 7;
+              return displayConfigDispatchers.update(displayConfig);
 
-              executeByConfig(displayConfig);
-              extraOnOk = (displaySettingProps === null || displaySettingProps === void 0 ? void 0 : displaySettingProps.onOk) || (displaySettingProps === null || displaySettingProps === void 0 ? void 0 : displaySettingProps.onDisplaySettingDrawerOk);
+            case 7:
+              extraOnOk = displaySettingProps === null || displaySettingProps === void 0 ? void 0 : displaySettingProps.onOk;
 
-              if (extraOnOk) {
-                extraOnOk(displayConfig);
+              if (!extraOnOk) {
+                _context2.next = 11;
+                break;
               }
 
-            case 10:
+              _context2.next = 11;
+              return extraOnOk(displayConfig);
+
+            case 11:
+              topo.historyManager.endTransaction();
+
+            case 12:
             case "end":
               return _context2.stop();
           }
@@ -79,11 +106,46 @@ var _default = function _default(props) {
       }, _callee2);
     }));
 
-    return function save() {
+    return function handleEditorSave() {
       return _ref2.apply(this, arguments);
     };
   }();
 
+  var save = /*#__PURE__*/function () {
+    var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+      return _regenerator["default"].wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              if (isEditor) {
+                _context3.next = 5;
+                break;
+              }
+
+              _context3.next = 3;
+              return handleViewerSave();
+
+            case 3:
+              _context3.next = 7;
+              break;
+
+            case 5:
+              _context3.next = 7;
+              return handleEditorSave();
+
+            case 7:
+            case "end":
+              return _context3.stop();
+          }
+        }
+      }, _callee3);
+    }));
+
+    return function save() {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+
   return {
     save: save
   };

package/lib/core/components/TopoView/GraphViewPanel.js

@@ -0,0 +1,32 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = GraphViewPanel;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _useCanvasTheme2 = _interopRequireDefault(require("../../hooks/useCanvasTheme"));
+
+var _TopoViewModule = _interopRequireDefault(require("./TopoView.module.scss"));
+
+function GraphViewPanel(props) {
+  var topo = props.topo,
+      hideBackgroundColor = props.hideBackgroundColor;
+  var displayConfig = topo.store.useModelState('displayConfig');
+  var themeName = displayConfig.canvasTheme || 'white';
+
+  var _useCanvasTheme = (0, _useCanvasTheme2["default"])({
+    topo: topo,
+    themeName: themeName
+  }),
+      canvasColor = _useCanvasTheme.canvasColor;
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: _TopoViewModule["default"].viewPanel,
+    style: {
+      background: hideBackgroundColor ? null : canvasColor
+    }
+  }, props.children);
+}

package/lib/core/components/TopoView/editor.module.scss

@@ -1,3 +1,4 @@
 .borderLine {
+  position: relative;
   border-top: 1px solid #E6E7EB;
 }

package/lib/core/components/TopoView/topoView.js

@@ -19,41 +19,37 @@ var _componentTopologyGraph = _interopRequireWildcard(require("@riil-frontend/co
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _useTopoEdit = _interopRequireDefault(require("../../hooks/useTopoEdit"));
-
 var _showMessage = _interopRequireDefault(require("../../utils/showMessage"));
 
-var _EditorPlugin = _interopRequireDefault(require("../../editor/components/EditorPlugin"));
-
-var _ViewerPlugin = _interopRequireDefault(require("../../viewer/components/plugins/ViewerPlugin"));
-
 var _TitleBar = _interopRequireDefault(require("../titlebar/TitleBar"));
 
 var _template = require("../../../utils/template");
 
-var _PropertyView = _interopRequireDefault(require("../../editor/components/settings/PropertyView"));
-
-var _BackgroundView = _interopRequireDefault(require("../../editor/components/BackgroundView"));
-
 var _edgeUtil = require("../../utils/edgeUtil");
 
-var _useManageStatus = _interopRequireDefault(require("../../hooks/useManageStatus"));
-
-var _useAlarm = _interopRequireDefault(require("../../hooks/useAlarm"));
-
 var _useRouterAdapter = _interopRequireDefault(require("../../hooks/useRouterAdapter"));
 
 var _graphLinkUtil = require("../../utils/graphLinkUtil");
 
 var _clusterUtil = require("../../../utils/clusterUtil");
 
+var _GraphViewPanel = _interopRequireDefault(require("./GraphViewPanel"));
+
+var _TopoViewModule = _interopRequireDefault(require("./TopoView.module.scss"));
+
+var _ViewerPlugin = _interopRequireDefault(require("../../viewer/components/plugins/ViewerPlugin"));
+
+var _useTopoEdit = _interopRequireDefault(require("../../hooks/useTopoEdit"));
+
+var _EditorPlugin = _interopRequireDefault(require("../../editor/components/EditorPlugin"));
+
 var _EditorToolbar = _interopRequireDefault(require("../../editor/components/Toolbar/EditorToolbar"));
 
 var _Sidebar = _interopRequireDefault(require("../../editor/components/Sidebar/Sidebar"));
 
-var _HistoryManager = _interopRequireDefault(require("../../models/HistoryManager"));
+var _PropertyView = _interopRequireDefault(require("../../editor/components/settings/PropertyView"));
 
-var _TopoViewModule = _interopRequireDefault(require("./TopoView.module.scss"));
+var _HistoryManager = _interopRequireDefault(require("../../models/HistoryManager"));
 
 var _editorModule = _interopRequireDefault(require("./editor.module.scss"));
 
@@ -61,6 +57,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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; }
 
+// 通用
+// 显示模式
+// 编辑模式
 var Topology = function Topology(props) {
   var _classnames;
 
@@ -92,9 +91,9 @@ var Topology = function Topology(props) {
       topoState = _store$useModel[0],
       topoDispatchers = _store$useModel[1];
 
-  var bizDispatchers = store.useModelDispatchers('topoBizMod');
   var topoId = topoState.topoId,
       viewState = topoState.viewState,
+      graphLoaded = topoState.graphLoaded,
       topoData = topoState.topoData,
       urlParams = topoState.urlParams;
   var isEditMode = viewState === 'edit';
@@ -103,11 +102,10 @@ var Topology = function Topology(props) {
 
   var _useState = (0, _react.useState)(buildLoadOptions ? buildLoadOptions(topoData) : topoData),
       tData = _useState[0],
-      setTData = _useState[1]; // TODO 临时放这里，当前监听内容较多
+      setTData = _useState[1];
 
+  (0, _useRouterAdapter["default"])(props); // 编辑模式----
 
-  var selectionManager = topo.selectionManager;
-  (0, _useRouterAdapter["default"])(props);
   var topoEdit = (0, _useTopoEdit["default"])({
     topo: topo,
     topoId: topoId,
@@ -120,25 +118,11 @@ var Topology = function Topology(props) {
     isLayerTopo: isLayerTopo
   });
   topo.topoEdit = topoEdit;
-  var onExitEdit = topoEdit.onExitEdit,
-      onBindData = topoEdit.onBindData,
-      onDeleteElement = topoEdit.onDeleteElement,
-      onSaveTopo = topoEdit.onSaveTopo;
-  var titleBarRef = (0, _react.useRef)();
-  (0, _useAlarm["default"])({
-    topo: topo
-  });
-  (0, _useManageStatus["default"])({
-    topo: topo
-  });
   (0, _react.useEffect)(function () {
     if (viewState === 'view' && topoId) {
       // TODO 移到模型中
       // rlog.debug('useEffect-viewState', topoId, viewState);
       setTData(null);
-      bizDispatchers.update({
-        setConfig: null
-      });
     }
   }, [topoId, viewState]);
   (0, _react.useEffect)(function () {
@@ -148,7 +132,9 @@ var Topology = function Topology(props) {
   (0, _react.useEffect)(function () {
     // 拓扑退出注销
     return function () {
-      selectionManager.destroy();
+      _rlog["default"].info('TopoView 退出');
+
+      topo.selectionModel.destroy();
       topoDispatchers.reset();
     };
   }, []);
@@ -178,7 +164,7 @@ var Topology = function Topology(props) {
       topo.historyManager = new _HistoryManager["default"](topo, htHistoryManager);
     }
 
-    selectionManager.init();
+    topo.selectionModel.init();
     topoDispatchers.update({
       graphLoaded2: true
     });
@@ -198,7 +184,7 @@ var Topology = function Topology(props) {
     (0, _graphLinkUtil.fixLink)(topo);
     (0, _clusterUtil.handleClusterNoPermission)(topo);
     (0, _edgeUtil.updateEdgeExpanded)(topo);
-    selectionManager.init();
+    topo.selectionModel.init();
     topoDispatchers.update({
       graphLoaded: true
     });
@@ -210,7 +196,7 @@ var Topology = function Topology(props) {
     if (onLoad) {
       onLoad();
     }
-  }, [topoData]); // TODO 之后把事件方法都转移出去
+  }, [topoData]);
 
   var rightEventHandle = function rightEventHandle(event) {
     _rlog["default"].debug('右键事件', event);
@@ -249,16 +235,16 @@ var Topology = function Topology(props) {
         break;
 
       case _componentTopologyGraph.TopoEvent.EVENT_DATA_PICK:
-        onBindData(event.data);
+        topoEdit.onBindData(event.data);
         break;
 
       case _componentTopologyGraph.TopoEvent.EVENT_DATA_DELETE:
-        onDeleteElement(event.data);
+        topoEdit.onDeleteElement(event.data);
         break;
       // FIXME 保存逻辑优化
 
       case _componentTopologyGraph.TopoEvent.EVENT_SAVE_TOPO:
-        onSaveTopo(event.data);
+        topoEdit.onSaveTopo(event.data);
         break;
 
       case _componentTopologyGraph.TopoEvent.EVENT_REFRESH:
@@ -266,7 +252,7 @@ var Topology = function Topology(props) {
         break;
 
       case _componentTopologyGraph.TopoEvent.EVENT_EDIT_EXIT:
-        onExitEdit(event.data);
+        topoEdit.onExitEdit(event.data);
         break;
 
       case _componentTopologyGraph.TopoEvent.EVENT_CONTEXT_TOOL:
@@ -279,36 +265,17 @@ var Topology = function Topology(props) {
     }
   };
 
-  var renderPropertyView = function renderPropertyView() {
-    return isEditMode && /*#__PURE__*/_react["default"].createElement(_PropertyView["default"], {
-      topo: topo,
-      editorProps: editorProps
-    });
-  };
-
-  var renderBackgroundView = function renderBackgroundView() {
-    return isEditMode && /*#__PURE__*/_react["default"].createElement(_BackgroundView["default"], {
-      topo: topo,
-      editorProps: editorProps
-    });
-  };
-
   var renderCanvas = function renderCanvas() {
     var _graphViewProps$creat;
 
-    return /*#__PURE__*/_react["default"].createElement("div", {
-      className: _TopoViewModule["default"].viewPanel,
-      onKeyDown: function onKeyDown(e) {
-        topo.historyManager && topo.historyManager.handleKeyDown(e);
-      }
-    }, /*#__PURE__*/_react["default"].createElement(_componentTopologyGraph["default"], (0, _extends2["default"])({}, graphViewProps, {
+    return /*#__PURE__*/_react["default"].createElement(_GraphViewPanel["default"], (0, _extends2["default"])({
+      topo: topo
+    }, props), /*#__PURE__*/_react["default"].createElement(_componentTopologyGraph["default"], (0, _extends2["default"])({}, graphViewProps, {
       createHtTopoProps: (0, _extends2["default"])({}, graphViewProps.createHtTopoProps, {
         editor: (0, _extends2["default"])({}, ((_graphViewProps$creat = graphViewProps.createHtTopoProps) === null || _graphViewProps$creat === void 0 ? void 0 : _graphViewProps$creat.editor) || {})
       }),
       data: tData,
       defaultEnterEditMode: defaultEnterEditMode,
-      renderPropertyView: renderPropertyView,
-      renderBackgroundView: renderBackgroundView,
       onCreate: onGraphCreated,
       onLoaded: handleGraphLoaded,
       onDataLoaded: handleGraphDataLoaded,
@@ -350,14 +317,16 @@ var Topology = function Topology(props) {
       urlParams: urlParams
     },
     editorProps: editorProps
-  }), renderCanvas()), !isEditMode && /*#__PURE__*/_react["default"].createElement(_ViewerPlugin["default"], {
+  }), renderCanvas(), isEditMode && graphLoaded && /*#__PURE__*/_react["default"].createElement(_PropertyView["default"], {
+    topo: topo,
+    editorProps: editorProps
+  })), !isEditMode && /*#__PURE__*/_react["default"].createElement(_ViewerPlugin["default"], {
     topo: topo,
     viewerProps: viewerProps,
     topoContext: topoContext
   }), isEditMode && /*#__PURE__*/_react["default"].createElement(_EditorPlugin["default"], {
     topo: topo,
     topoEdit: topoEdit,
-    titleBarRef: titleBarRef,
     topoContext: {
       urlParams: urlParams
     },

package/lib/core/components/titlebar/TitleBar.module.scss

@@ -12,7 +12,7 @@
   }
 
   &.titlebarViewMode {
-    padding: 16px 16px 0 16px;
+    padding: 16px;
   }
 
   &.titlebarEditMode {