@riil-frontend/component-topology 6.0.0-alpha.2 → 6.0.0-alpha.21

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);
+
+              if (extraOnOk) {
+                extraOnOk(displayConfig);
+              }
 
-            case 1:
+            case 11:
             case "end":
               return _context.stop();
           }
@@ -24,12 +50,12 @@ 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) {
@@ -40,27 +66,20 @@ export default (function (props) {
               // 保存配置
 
               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 = 6;
+              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 6:
+              extraOnOk = displaySettingProps === null || displaySettingProps === void 0 ? void 0 : displaySettingProps.onOk;
 
               if (extraOnOk) {
                 extraOnOk(displayConfig);
               }
 
-            case 10:
+            case 8:
             case "end":
               return _context2.stop();
           }
@@ -68,11 +87,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/TopoGraphViewPanel.js

@@ -0,0 +1,20 @@
+import React from 'react';
+import useCanvasTheme from "../../hooks/useCanvasTheme";
+import styles from "./TopoView.module.scss";
+export default function TopoGraphViewPanel(props) {
+  var topo = props.topo;
+  var displayConfig = topo.store.useModelState('displayConfig');
+  var canvasTheme = displayConfig.canvasTheme || 'white';
+
+  var _useCanvasTheme = useCanvasTheme({
+    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 TopoGraphViewPanel from "./TopoGraphViewPanel";
 import styles from "./TopoView.module.scss";
 import editorStyles from "./editor.module.scss";
+var ht = window.ht;
 
 var Topology = function Topology(props) {
   var _classnames;
@@ -57,6 +58,10 @@ var Topology = function Topology(props) {
       topoDispatchers = _store$useModel[1];
 
   var bizDispatchers = store.useModelDispatchers('topoBizMod');
+
+  var _store$useModelState = store.useModelState('topoEdit'),
+      viewMouseMode = _store$useModelState.viewMouseMode;
+
   var topoId = topoState.topoId,
       viewState = topoState.viewState,
       topoData = topoState.topoData,
@@ -236,15 +241,34 @@ var Topology = function Topology(props) {
     }
   };
 
-  var renderPropertyView = function renderPropertyView() {
-    return isEditMode && /*#__PURE__*/React.createElement(PropertyView, {
-      topo: topo,
-      editorProps: editorProps
-    });
+  var handleKeyDown = function handleKeyDown(e) {
+    if (isEditMode) {
+      var isCtrlDown = ht.Default.isCtrlDown;
+
+      if (isCtrlDown(e)) {
+        if (e.keyCode === 90) {
+          // ctrl+z 撤销
+          topo.historyManager.undo();
+        } //  else if (e.keyCode == 89) {//ctrl+y 重做
+        //   this.redo();
+        // }
+
+      }
+
+      if (e.keyCode === 32) {
+        console.log('e.keyCode-viewMouseMode', e.keyCode, viewMouseMode);
+
+        if (viewMouseMode === 'select') {
+          topoEdit.setViewMouseMode('move');
+        } else {
+          topoEdit.setViewMouseMode('select');
+        }
+      }
+    }
   };
 
-  var renderBackgroundView = function renderBackgroundView() {
-    return isEditMode && /*#__PURE__*/React.createElement(BackgroundView, {
+  var renderPropertyView = function renderPropertyView() {
+    return isEditMode && /*#__PURE__*/React.createElement(PropertyView, {
       topo: topo,
       editorProps: editorProps
     });
@@ -253,19 +277,14 @@ var Topology = function Topology(props) {
   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(TopoGraphViewPanel, {
+      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,
@@ -283,7 +302,8 @@ var Topology = function Topology(props) {
 
   return /*#__PURE__*/React.createElement("div", {
     className: styles.topoView,
-    "data-version": topo.version
+    "data-version": topo.version,
+    onKeyDown: handleKeyDown
   }, titleBar !== false && (titleBar || /*#__PURE__*/React.createElement(TitleBar, {
     topo: topo,
     viewerProps: viewerProps,
@@ -295,7 +315,8 @@ var Topology = function Topology(props) {
     topoContext: {
       urlParams: urlParams
     },
-    editorProps: editorProps
+    editorProps: editorProps,
+    onKeyDown: handleKeyDown
   }), /*#__PURE__*/React.createElement(_Box, {
     direction: "row",
     flex: 1,
@@ -307,7 +328,7 @@ var Topology = function Topology(props) {
       urlParams: urlParams
     },
     editorProps: editorProps
-  }), renderCanvas()), !isEditMode && /*#__PURE__*/React.createElement(ViewerPlugin, {
+  }), renderCanvas(), renderPropertyView()), !isEditMode && /*#__PURE__*/React.createElement(ViewerPlugin, {
     topo: topo,
     viewerProps: viewerProps,
     topoContext: topoContext

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

@@ -1,60 +1,32 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React, { useState } from 'react';
-import VerticalIconTab from "../../../../components/VerticalIconTab";
-import LinkPanel from "./views/LinkPanel";
-import ComponentPanel from "./views/ComponentPanel";
-import ImagePanel from "./views/ImagePanel";
-import BackgroundPanel from "./views/BackgroundPanel";
-import CanvasPanel from "./views/CanvasPanel";
+import React, { useEffect, useState } from 'react';
+import classNames from 'classnames';
+import Tab from "../../../../components/VerticalIconTab";
+import panes from "./panes";
 import styles from "./Sidebar.module.scss";
 
 function Sidebar(props) {
+  var _classNames;
+
   var topo = props.topo;
 
-  var _useState = useState(null),
-      activeKey = _useState[0],
-      setActivekey = _useState[1];
+  var _topo$store$useModel = topo.store.useModel('topoEdit'),
+      topoEditState = _topo$store$useModel[0],
+      topoEditDispatchers = _topo$store$useModel[1];
 
-  var panes = [{
-    title: '链路',
-    key: '1',
-    icon: '/img/topo/editor/sidebar/icon/链路.svg',
-    content: LinkPanel
-  }, {
-    title: '组件',
-    key: '2',
-    icon: '/img/topo/editor/sidebar/icon/组件.svg',
-    content: ComponentPanel
-  }, {
-    title: '图片',
-    key: '3',
-    icon: '/img/topo/editor/sidebar/icon/图片.svg',
-    content: ImagePanel
-  }, {
-    title: '背景',
-    key: '4',
-    icon: '/img/topo/editor/sidebar/icon/背景.svg',
-    content: BackgroundPanel
-  }, {
-    title: '画布',
-    key: '5',
-    icon: '/img/topo/editor/sidebar/icon/画布.svg',
-    content: CanvasPanel
-  }].map(function (item) {
-    var View = item.content;
-    return _extends({}, item, {
-      content: function content() {
-        return /*#__PURE__*/React.createElement(View, _extends({}, props, {
-          topo: topo,
-          active: activeKey === item.key
-        }));
-      }
-    });
-  });
+  var activeKey = topoEditState.resourceTabactiveKey;
+  useEffect(function () {
+    return function () {
+      // 退出编辑模式，关闭资源面板状态
+      topoEditDispatchers.update({
+        resourceTabactiveKey: null
+      });
+    };
+  }, []);
 
   var renderTabItem = function renderTabItem(pane) {
     var View = pane.content;
-    return /*#__PURE__*/React.createElement(VerticalIconTab.Item, _extends({
+    return /*#__PURE__*/React.createElement(Tab.Item, _extends({
       key: pane.key
     }, pane), /*#__PURE__*/React.createElement(View, {
       topo: topo,
@@ -65,10 +37,14 @@ function Sidebar(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: styles.sidebar
   }, /*#__PURE__*/React.createElement("div", {
-    className: styles.tabsContainer
-  }, /*#__PURE__*/React.createElement(VerticalIconTab, {
+    className: classNames(styles.tabsContainer, (_classNames = {}, _classNames[styles.expanded] = !!activeKey, _classNames))
+  }, /*#__PURE__*/React.createElement(Tab, {
     activeKey: activeKey,
-    onChange: setActivekey
+    onChange: function onChange(key) {
+      return topoEditDispatchers.update({
+        resourceTabactiveKey: key
+      });
+    }
   }, panes.map(renderTabItem))));
 }
 

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

@@ -5,11 +5,15 @@
 
   .tabsContainer {
     position: absolute;
+    width: 60px;
     height: 100%;
     left: 0;
     top: 0;
     z-index: 1;
-    width: 320px;
     background: #FFF;
+
+    &.expanded {
+      width: 320px;
+    }
   }
 }

package/es/core/editor/components/Sidebar/panes.js

@@ -0,0 +1,32 @@
+import BackgroundPanel from "./views/BackgroundPanel";
+import CanvasPanel from "./views/CanvasPanel";
+import ComponentPanel from "./views/ComponentPanel";
+import ImagePanel from "./views/ImagePanel";
+import LinkPanel from "./views/LinkPanel";
+var panes = [{
+  title: '链路',
+  key: '1',
+  icon: '/img/topo/editor/sidebar/icon/链路.svg',
+  content: LinkPanel
+}, {
+  title: '组件',
+  key: '2',
+  icon: '/img/topo/editor/sidebar/icon/组件.svg',
+  content: ComponentPanel
+}, {
+  title: '图片',
+  key: '3',
+  icon: '/img/topo/editor/sidebar/icon/图片.svg',
+  content: ImagePanel
+}, {
+  title: '背景',
+  key: '4',
+  icon: '/img/topo/editor/sidebar/icon/背景.svg',
+  content: BackgroundPanel
+}, {
+  title: '画布',
+  key: '5',
+  icon: '/img/topo/editor/sidebar/icon/画布.svg',
+  content: CanvasPanel
+}];
+export default panes;

package/es/core/editor/components/Sidebar/views/BackgroundPanel/BackgroundPanel.js

@@ -4,7 +4,6 @@ export default function BackgroundPanel(props) {
   var topo = props.topo,
       editorProps = props.editorProps;
   return /*#__PURE__*/React.createElement(BackgroundView, {
-    topo: topo,
-    editorProps: editorProps
+    topo: topo
   });
 }

package/es/core/editor/components/Sidebar/views/CanvasPanel/CanvasPanel.js

@@ -0,0 +1,96 @@
+import _Tag from "@alifd/next/es/tag";
+import _extends from "@babel/runtime/helpers/extends";
+import React, { useState } from 'react';
+import styles from "./CanvasPanel.module.scss";
+var CANVAS_TOGGLE = [{
+  value: 'white',
+  label: '白色',
+  color: '#FFFFFF',
+  globalNodeLabelColor: '#4d6277',
+  globalEdgeTagColor: '#4d6277'
+}, {
+  value: 'lightblue',
+  label: '蓝色',
+  color: '#F9FBFF',
+  globalNodeLabelColor: '#4d6277',
+  globalEdgeTagColor: '#4d6277'
+}, // {
+//   value: 'yellow',
+//   label: '黄色',
+//   color: '#FFFDE6',
+// },
+// {
+//   value: 'green',
+//   label: '绿色',
+//   color: '#EAFFE8',
+// },
+{
+  value: 'dark',
+  label: '深色',
+  color: '#031425',
+  globalNodeLabelColor: '#ffffff',
+  globalEdgeTagColor: '#ffffff'
+}];
+export default function CanvasPanel(props) {
+  var topo = props.topo;
+
+  var _topo$store$useModel = topo.store.useModel('displayConfig'),
+      canvasTheme = _topo$store$useModel[0].canvasTheme,
+      displayConfigDispatchers = _topo$store$useModel[1];
+
+  var value = canvasTheme || 'white';
+
+  var setCanvasTheme = function setCanvasTheme(themeItem) {
+    var theme = themeItem.value;
+    topo.historyManager.beginTransaction();
+    displayConfigDispatchers.update({
+      canvasTheme: theme
+    }); // 设置资源标注
+
+    var _topo$store$getModelS = topo.store.getModelState('displayConfig'),
+        nodeLabelStyle = _topo$store$getModelS.nodeLabelStyle,
+        defaultEdgeLabelStyle = _topo$store$getModelS.defaultEdgeLabelStyle;
+
+    var globalNodeLabelStyle = _extends({}, nodeLabelStyle, {
+      color: themeItem.globalNodeLabelColor
+    });
+
+    topo.getHtTopo().setGlobalNodeLabelStyle(globalNodeLabelStyle);
+
+    var globalEdgeTagStyle = _extends({}, defaultEdgeLabelStyle, {
+      color: themeItem.globalEdgeTagColor
+    });
+
+    topo.getHtTopo().setGlobalEdgeTagStyle(globalEdgeTagStyle);
+    displayConfigDispatchers.update({
+      nodeLabelStyle: globalNodeLabelStyle,
+      defaultEdgeLabelStyle: globalEdgeTagStyle
+    }); // 设置链路标注
+
+    topo.historyManager.endTransaction();
+  };
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: styles.canvasToggle
+  }, CANVAS_TOGGLE.map(function (item, index) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: styles.canvas,
+      key: index
+    }, /*#__PURE__*/React.createElement(_Tag.Selectable, {
+      className: styles.tag,
+      style: {
+        background: item.color
+      },
+      checked: value === item.value,
+      onChange: function onChange(checked) {
+        setCanvasTheme(item);
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      className: styles.box
+    }, /*#__PURE__*/React.createElement("div", {
+      className: styles.bgColor
+    }))), /*#__PURE__*/React.createElement("div", {
+      className: styles.canvasText
+    }, item.label));
+  }));
+}

package/es/core/editor/components/Sidebar/views/CanvasPanel/CanvasPanel.module.scss

@@ -0,0 +1,74 @@
+@import "~@alifd/next/variables.scss";
+
+  .canvasToggle {
+    display: flex;
+    flex-wrap: wrap;
+    .canvas {
+      .tag {
+        border: 1px solid #E4E9EE;
+        width: 110px;
+        height: 62px;
+        border-radius: 2px;
+        margin: 16px 0 0 16px;
+      :global {
+        .#{$css-prefix}tag-body {
+          width: 100%;
+          padding: 0;
+          cursor: pointer;
+        }
+      }
+      .box {
+        position: relative;
+        height: 100%;
+        user-select: none;
+        .bgColor {
+          max-width: 100%;
+          max-height: 100%;
+          display: block;
+          margin: auto;
+          position: absolute;
+          left: 0;
+          top: 0;
+          bottom: 0;
+          right: 0;
+        }
+      }
+      &::before,
+      &::after {
+        z-index: 1;
+      }
+      &:hover {
+        .operation {
+          display: block;
+        }
+      }
+      .operation {
+        display: none;
+        // z-index: -1;
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        height: 22px;
+        text-align: center;
+        background: rgba(0, 0, 0, 0.4);
+        button {
+          height: 100%;
+          color: #fff;
+          vertical-align: text-bottom;
+        }
+      }
+     }
+      .canvasText{
+        width: 49px;
+        height: 12px;
+        margin: 8px 0 0 46px;
+        text-align: center;
+      }
+    }
+    .canvas:nth-child(2n){
+      margin-left: -7px;
+    }
+  }
+
+

package/es/core/editor/components/Sidebar/views/CanvasPanel/index.js

@@ -1,2 +1,2 @@
-import Panel from "./ImagePanel";
+import Panel from "./CanvasPanel";
 export default Panel;

package/es/core/editor/components/Sidebar/views/ImagePanel/CiTypeImagePanel.js

@@ -1,6 +1,6 @@
 import React, { useEffect, useMemo, useRef } from 'react';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import ImagePalette from "./ImagePalette";
+import ImagePalette from "./HtImagePalette";
 import { getNodeDefaultIcons } from "../../../../../common/icons/icon";
 /**
  * 组件面板