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

package/es/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js

@@ -7,10 +7,12 @@ import rlog from '@riil-frontend/component-topology-utils/lib/rlog';
 import Drawer from "../../../components/Drawer";
 import DisplaySetting from "./DisplaySetting";
 import useDisplaySetting from "./hooks/useDisplaySetting";
+import EditorDisplaySetting from "./EditorDisplaySetting";
 export default function DisplaySettingDrawer(props) {
   var visible = props.visible,
       topo = props.topo,
       displaySettingProps = props.displaySettingProps,
+      isEditor = props.isEditor,
       onClose = props.onClose;
   var settingRef = useRef();
 
@@ -19,7 +21,8 @@ export default function DisplaySettingDrawer(props) {
       setLoading = _useState[1];
 
   var displaySetting = useDisplaySetting(_extends({}, props, {
-    settingRef: settingRef
+    settingRef: settingRef,
+    isEditor: isEditor
   }));
 
   var handleOk = /*#__PURE__*/function () {
@@ -37,7 +40,9 @@ export default function DisplaySettingDrawer(props) {
               setLoading(false);
               onClose();
 
-              _Message.success('保存成功');
+              if (!isEditor) {
+                _Message.success('保存成功');
+              }
 
               _context.next = 14;
               break;
@@ -63,6 +68,7 @@ export default function DisplaySettingDrawer(props) {
     };
   }();
 
+  var DisplaySettingWidget = isEditor ? EditorDisplaySetting : DisplaySetting;
   return /*#__PURE__*/React.createElement(Drawer, {
     title: "\u663E\u793A\u8BBE\u7F6E",
     visible: visible,
@@ -74,7 +80,7 @@ export default function DisplaySettingDrawer(props) {
 
     },
     buttons: ['保存', '取消']
-  }, visible && /*#__PURE__*/React.createElement(DisplaySetting, {
+  }, visible && /*#__PURE__*/React.createElement(DisplaySettingWidget, {
     ref: settingRef,
     topo: topo,
     displaySettingProps: displaySettingProps

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

@@ -0,0 +1,122 @@
+import _Box from "@alifd/next/es/box";
+import _Form from "@alifd/next/es/form";
+import _extends from "@babel/runtime/helpers/extends";
+import _Field from "@alifd/next/es/field";
+import React, { useEffect, useImperativeHandle, useState } from 'react';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import NodeTag from "./NodeTag";
+import EdgeFlow from "./EdgeFlow";
+import NodeTip from "./NodeTip";
+import LineExpandAllRadioGroup from "./LineExpandAllRadioGroup";
+import EdgeFlowDirection from "./EdgeFlowDirection";
+import BooleanRadio from "../../../components/BooleanRadio";
+/**
+ * 显示设置
+ * 
+ * @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.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.debug('DisplaySetting-onChange', name, value); // 告警静默设置
+
+      if (name === 'alarmSwitch') {
+        field.setValue('alarmListDefaultOpen', !!value);
+      }
+    }
+  });
+
+  useImperativeHandle(ref, function () {
+    return field;
+  });
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Form, {
+    field: field,
+    labelAlign: "top"
+  }, /*#__PURE__*/React.createElement(_Form.Item, {
+    label: /*#__PURE__*/React.createElement(Label, {
+      label: "\u8D44\u6E90\u6807\u6CE8",
+      helpText: "\u6700\u591A\u652F\u6301\u52FE\u90093\u9879"
+    })
+  }, /*#__PURE__*/React.createElement(NodeTag, _extends({}, nodeTagProps, {
+    name: "nodeTag",
+    topo: topo
+  }))), linkTagConfig && /*#__PURE__*/React.createElement(_Form.Item, {
+    label: /*#__PURE__*/React.createElement(Label, {
+      label: "\u94FE\u8DEF\u6807\u6CE8",
+      helpText: "\u6700\u591A\u652F\u6301\u52FE\u90092\u9879"
+    }),
+    patternTrigger: "onChange"
+  }, linkTagConfig({
+    name: "linkTag",
+    topo: topo
+  })), /*#__PURE__*/React.createElement(_Form.Item, {
+    label: /*#__PURE__*/React.createElement(Label, {
+      label: "\u8D44\u6E90\u60AC\u6D6E\u6846",
+      helpText: "\u6700\u591A\u652F\u6301\u52FE\u90094\u9879"
+    }),
+    patternTrigger: "onChange"
+  }, /*#__PURE__*/React.createElement(NodeTip, _extends({}, nodeTipProps, {
+    name: "nodeTip",
+    topo: topo
+  }))), linkTipConfig && /*#__PURE__*/React.createElement(_Form.Item, {
+    label: /*#__PURE__*/React.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.createElement(_Form.Item, {
+    label: /*#__PURE__*/React.createElement(LineExpandAllRadioGroup.Label, null),
+    patternTrigger: "onChange"
+  }, /*#__PURE__*/React.createElement(LineExpandAllRadioGroup, {
+    name: "expandAllEdges",
+    isNetworkTopo: isNetworkTopo
+  }))));
+}
+
+;
+
+function Label(props) {
+  var label = props.label,
+      helpText = props.helpText;
+  return /*#__PURE__*/React.createElement(_Box, {
+    direction: "row",
+    spacing: 12
+  }, /*#__PURE__*/React.createElement("div", null, label), /*#__PURE__*/React.createElement("div", {
+    style: {
+      color: '#638DB7'
+    }
+  }, helpText));
+}
+
+export default /*#__PURE__*/React.forwardRef(EditorDisplaySetting);

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

@@ -22,8 +22,6 @@ var LineExpandAllRadioGroup = /*#__PURE__*/React.forwardRef(function LineExpandA
       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);
 
@@ -64,7 +62,6 @@ var LineExpandAllRadioGroup = /*#__PURE__*/React.forwardRef(function LineExpandA
       }
     }
 
-    console.log("creatTypeValue", v);
     return v;
   }; //  useEffect(() => {
   //    setPluralType(plurals[compatibleWith(value)] ?? []);

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

@@ -5,18 +5,44 @@ import topoService from '@riil-frontend/component-topology-common/es/services/to
 export default (function (props) {
   var topo = props.topo,
       displaySettingProps = props.displaySettingProps,
-      settingRef = props.settingRef;
+      settingRef = props.settingRef,
+      isEditor = props.isEditor;
 
-  var executeByConfig = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(config) {
+  var handleViewerSave = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var values, prevDisplayConfig, displayConfig, displayConfigDispatchers, extraOnOk;
       return _regeneratorRuntime.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 = _extends({}, prevDisplayConfig, values);
+              _context.next = 5;
+              return topoService.saveTopoSettings(topo.id, {
+                alarmSwitch: displayConfig.alarmSwitch,
+                alarmListDefaultOpen: displayConfig.alarmListDefaultOpen,
+                extraConfig: JSON.stringify(_extends({}, 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);
 
-            case 1:
+              if (extraOnOk) {
+                extraOnOk(displayConfig);
+              }
+
+            case 11:
             case "end":
               return _context.stop();
           }
@@ -24,42 +50,38 @@ export default (function (props) {
       }, _callee);
     }));
 
-    return function executeByConfig(_x) {
+    return function handleViewerSave() {
       return _ref.apply(this, arguments);
     };
   }();
 
-  var save = /*#__PURE__*/function () {
+  var handleEditorSave = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
       var values, prevDisplayConfig, displayConfig, displayConfigDispatchers, extraOnOk;
       return _regeneratorRuntime.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 = _extends({}, prevDisplayConfig, values);
-              _context2.next = 5;
-              return topoService.saveTopoSettings(topo.id, {
-                alarmSwitch: displayConfig.alarmSwitch,
-                alarmListDefaultOpen: displayConfig.alarmListDefaultOpen,
-                extraConfig: JSON.stringify(_extends({}, displayConfig))
-              });
+              displayConfig = _extends({}, 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);
               }
 
+              topo.historyManager.endTransaction();
+
             case 10:
             case "end":
               return _context2.stop();
@@ -68,11 +90,46 @@ export default (function (props) {
       }, _callee2);
     }));
 
-    return function save() {
+    return function handleEditorSave() {
       return _ref2.apply(this, arguments);
     };
   }();
 
+  var save = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+      return _regeneratorRuntime.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/es/core/components/TopoView/GraphViewPanel.js

@@ -0,0 +1,21 @@
+import React from 'react';
+import useCanvasTheme from "../../hooks/useCanvasTheme";
+import styles from "./TopoView.module.scss";
+export default function GraphViewPanel(props) {
+  var topo = props.topo;
+  var displayConfig = topo.store.useModelState('displayConfig');
+  var canvasTheme = displayConfig.canvasTheme || 'white';
+
+  var _useCanvasTheme = useCanvasTheme({
+    topo: topo,
+    canvasTheme: canvasTheme
+  }),
+      canvasColor = _useCanvasTheme.canvasColor;
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: styles.viewPanel,
+    style: {
+      background: canvasColor
+    }
+  }, props.children);
+}

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

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

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

@@ -12,7 +12,6 @@ import ViewerPlugin from "../../viewer/components/plugins/ViewerPlugin";
 import TitleBar from "../titlebar/TitleBar";
 import { TPL_TREE } from "../../../utils/template";
 import PropertyView from "../../editor/components/settings/PropertyView";
-import BackgroundView from "../../editor/components/BackgroundView";
 import { updateEdgeExpanded } from "../../utils/edgeUtil";
 import useManageStatus from "../../hooks/useManageStatus";
 import useAlarm from "../../hooks/useAlarm";
@@ -22,8 +21,10 @@ import { handleClusterNoPermission, upgradeV103GraphClusterNode } from "../../..
 import EditorToolbar from "../../editor/components/Toolbar/EditorToolbar";
 import Sidebar from "../../editor/components/Sidebar/Sidebar";
 import HistoryManager from "../../models/HistoryManager";
+import GraphViewPanel from "./GraphViewPanel";
 import styles from "./TopoView.module.scss";
 import editorStyles from "./editor.module.scss";
+import useKeyboardShortcut from "../../editor/hooks/useKeyboardShortcut";
 
 var Topology = function Topology(props) {
   var _classnames;
@@ -56,7 +57,6 @@ 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,
       topoData = topoState.topoData,
@@ -67,11 +67,16 @@ var Topology = function Topology(props) {
 
   var _useState = useState(buildLoadOptions ? buildLoadOptions(topoData) : topoData),
       tData = _useState[0],
-      setTData = _useState[1]; // TODO 临时放这里，当前监听内容较多
+      setTData = _useState[1];
 
-
-  var selectionManager = topo.selectionManager;
   useRouterAdapter(props);
+  useAlarm({
+    topo: topo
+  });
+  useManageStatus({
+    topo: topo
+  }); // 编辑模式----
+
   var topoEdit = useTopoEdit({
     topo: topo,
     topoId: topoId,
@@ -84,25 +89,16 @@ 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 = useRef();
-  useAlarm({
-    topo: topo
-  });
-  useManageStatus({
-    topo: topo
+  useKeyboardShortcut({
+    topo: topo,
+    topoEdit: topoEdit,
+    isEditMode: isEditMode
   });
   useEffect(function () {
     if (viewState === 'view' && topoId) {
       // TODO 移到模型中
       // rlog.debug('useEffect-viewState', topoId, viewState);
       setTData(null);
-      bizDispatchers.update({
-        setConfig: null
-      });
     }
   }, [topoId, viewState]);
   useEffect(function () {
@@ -112,7 +108,8 @@ var Topology = function Topology(props) {
   useEffect(function () {
     // 拓扑退出注销
     return function () {
-      selectionManager.destroy();
+      rlog.info('TopoView 退出');
+      topo.selectionManager.destroy();
       topoDispatchers.reset();
     };
   }, []);
@@ -140,7 +137,7 @@ var Topology = function Topology(props) {
       topo.historyManager = new HistoryManager(topo, htHistoryManager);
     }
 
-    selectionManager.init();
+    topo.selectionManager.init();
     topoDispatchers.update({
       graphLoaded2: true
     });
@@ -159,7 +156,7 @@ var Topology = function Topology(props) {
     fixLink(topo);
     handleClusterNoPermission(topo);
     updateEdgeExpanded(topo);
-    selectionManager.init();
+    topo.selectionManager.init();
     topoDispatchers.update({
       graphLoaded: true
     });
@@ -171,7 +168,7 @@ var Topology = function Topology(props) {
     if (onLoad) {
       onLoad();
     }
-  }, [topoData]); // TODO 之后把事件方法都转移出去
+  }, [topoData]);
 
   var rightEventHandle = function rightEventHandle(event) {
     rlog.debug('右键事件', event);
@@ -207,16 +204,16 @@ var Topology = function Topology(props) {
         break;
 
       case TopoEvent.EVENT_DATA_PICK:
-        onBindData(event.data);
+        topoEdit.onBindData(event.data);
         break;
 
       case TopoEvent.EVENT_DATA_DELETE:
-        onDeleteElement(event.data);
+        topoEdit.onDeleteElement(event.data);
         break;
       // FIXME 保存逻辑优化
 
       case TopoEvent.EVENT_SAVE_TOPO:
-        onSaveTopo(event.data);
+        topoEdit.onSaveTopo(event.data);
         break;
 
       case TopoEvent.EVENT_REFRESH:
@@ -224,7 +221,7 @@ var Topology = function Topology(props) {
         break;
 
       case TopoEvent.EVENT_EDIT_EXIT:
-        onExitEdit(event.data);
+        topoEdit.onExitEdit(event.data);
         break;
 
       case TopoEvent.EVENT_CONTEXT_TOOL:
@@ -236,36 +233,17 @@ var Topology = function Topology(props) {
     }
   };
 
-  var renderPropertyView = function renderPropertyView() {
-    return isEditMode && /*#__PURE__*/React.createElement(PropertyView, {
-      topo: topo,
-      editorProps: editorProps
-    });
-  };
-
-  var renderBackgroundView = function renderBackgroundView() {
-    return isEditMode && /*#__PURE__*/React.createElement(BackgroundView, {
-      topo: topo,
-      editorProps: editorProps
-    });
-  };
-
   var renderCanvas = function renderCanvas() {
     var _graphViewProps$creat;
 
-    return /*#__PURE__*/React.createElement("div", {
-      className: styles.viewPanel,
-      onKeyDown: function onKeyDown(e) {
-        topo.historyManager && topo.historyManager.handleKeyDown(e);
-      }
+    return /*#__PURE__*/React.createElement(GraphViewPanel, {
+      topo: topo
     }, /*#__PURE__*/React.createElement(TopoGraph, _extends({}, graphViewProps, {
       createHtTopoProps: _extends({}, graphViewProps.createHtTopoProps, {
         editor: _extends({}, ((_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,
@@ -307,14 +285,16 @@ var Topology = function Topology(props) {
       urlParams: urlParams
     },
     editorProps: editorProps
-  }), renderCanvas()), !isEditMode && /*#__PURE__*/React.createElement(ViewerPlugin, {
+  }), renderCanvas(), isEditMode && /*#__PURE__*/React.createElement(PropertyView, {
+    topo: topo,
+    editorProps: editorProps
+  })), !isEditMode && /*#__PURE__*/React.createElement(ViewerPlugin, {
     topo: topo,
     viewerProps: viewerProps,
     topoContext: topoContext
   }), isEditMode && /*#__PURE__*/React.createElement(EditorPlugin, {
     topo: topo,
     topoEdit: topoEdit,
-    titleBarRef: titleBarRef,
     topoContext: {
       urlParams: urlParams
     },

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

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

package/es/core/editor/components/EditorPlugin.js

@@ -4,13 +4,14 @@ import CustomIconPlugin from "./CustomIconPlugin";
 import SaveLoading from "./plugins/SaveLoading";
 import MultipleResourceSelectPlugin from "./plugins/MultipleResourceSelectPlugin";
 import GroupAddResourceDrawerPlugin from "./GroupAddResourceDrawerPlugin";
+import MetricPollingPlugin from "../../viewer/components/plugins/MetricPollingPlugin";
 export default function TopoEditorPlugin(props) {
   var topo = props.topo,
       topoContext = props.topoContext,
       topoEdit = props.topoEdit,
       editorProps = props.editorProps;
   var store = topo.store;
-  var plugins = [SaveLoading, GroupAddResourceDrawerPlugin, MultipleResourceSelectPlugin, CustomIconPlugin].concat((editorProps === null || editorProps === void 0 ? void 0 : editorProps.plugins) || []);
+  var plugins = [SaveLoading, GroupAddResourceDrawerPlugin, MultipleResourceSelectPlugin, CustomIconPlugin, MetricPollingPlugin].concat((editorProps === null || editorProps === void 0 ? void 0 : editorProps.plugins) || []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, plugins.map(function (Plugin, index) {
     return /*#__PURE__*/React.createElement(Plugin, _extends({
       key: index,