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

package/es/core/editor/hooks/useKeyboardShortcut.js

@@ -0,0 +1,39 @@
+import React, { useEffect } from 'react';
+var ht = window.ht; // 快捷键
+
+export default function useKeyboardShortcut(props) {
+  var topo = props.topo,
+      topoEdit = props.topoEdit;
+  useEffect(function () {
+    var handleKeyDown = function handleKeyDown(e) {
+      if (e.target.tagName === 'INPUT') {
+        return;
+      }
+
+      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) {
+        // 空格
+        var _topo$store$getModelS = topo.store.getModelState('topoEdit'),
+            viewMouseMode = _topo$store$getModelS.viewMouseMode;
+
+        topoEdit.setViewMouseMode(viewMouseMode === 'select' ? 'move' : 'select');
+      }
+    };
+
+    window.addEventListener('keydown', handleKeyDown);
+    return function () {
+      window.removeEventListener('keydown', handleKeyDown);
+    };
+  }, []);
+}

package/es/core/editor/hooks/useNewElementTheme.js

@@ -0,0 +1,44 @@
+import { useEffect } from 'react';
+import THEMES from "../config/themes";
+import ThemeUtil from "../utils/themeUtil";
+
+function useNewElementTheme(props) {
+  var topo = props.topo;
+  var topoModState = topo.store.useModelState('topoMod');
+  var graphLoaded2 = topoModState.graphLoaded2;
+  useEffect(function () {
+    var dm = topo.getHtTopo().getGraphView().dm();
+
+    if (graphLoaded2) {
+      dm.addDataModelChangeListener(handleDataModelChangeListener);
+    }
+
+    function handleDataModelChangeListener(e) {
+      var kind = e.kind,
+          data = e.data;
+
+      if (kind === 'add') {
+        var displayConfig = topo.store.getModelState('displayConfig');
+        var theme = displayConfig.canvasTheme || 'white';
+        var themeConfig = THEMES.find(function (item) {
+          return item.name === theme;
+        });
+
+        var _ThemeUtil = ThemeUtil({
+          topo: topo
+        }),
+            setElementTheme = _ThemeUtil.setElementTheme;
+
+        setElementTheme(data, themeConfig);
+      }
+    }
+
+    return function () {
+      if (graphLoaded2) {
+        dm.removeDataModelChangeListener(handleDataModelChangeListener);
+      }
+    };
+  }, [graphLoaded2]);
+}
+
+export default useNewElementTheme;

package/es/core/editor/store/topoEdit.js

@@ -6,41 +6,48 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  * 拓扑编辑 Model
  */
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import topoService from '@riil-frontend/component-topology-common/es/services/topo';
-export default {
-  // 定义 model 的初始 state
-  state: {
-    // 是否就绪
-    ready: false,
-    // 保存状态
-    saving: false,
-    // 选择/拖动模式模式。默认选择模式 select|move
-    viewMouseMode: 'select',
-    // 资源面板展开项
-    resourceTabactiveKey: null
-  },
-  // 定义改变该模型状态的纯函数
-  reducers: {
-    update: function update(prevState, payload) {
-      return _extends({}, prevState, payload);
-    }
-  },
-  // 定义处理该模型副作用的函数
-  effects: function effects(dispatch) {
-    return {
-      init: function init(payload, rootState) {
-        return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-          return _regeneratorRuntime.wrap(function _callee$(_context) {
-            while (1) {
-              switch (_context.prev = _context.next) {
-                case 0:
-                case "end":
-                  return _context.stop();
-              }
-            }
-          }, _callee);
-        }))();
+var initState = {
+  // 是否就绪
+  ready: false,
+  // 保存状态
+  saving: false,
+  // 选择/拖动模式模式。默认选择模式 select|move
+  viewMouseMode: 'select',
+  // 资源面板展开项
+  resourceTabActiveKey: null,
+  // 属性面板是否显示
+  propertyPanelVisible: false
+};
+export default function (topo) {
+  return {
+    // 定义 model 的初始 state
+    state: initState,
+    // 定义改变该模型状态的纯函数
+    reducers: {
+      update: function update(prevState, payload) {
+        return _extends({}, prevState, payload);
+      },
+      reset: function reset(prevState, payload) {
+        return _extends({}, initState);
       }
-    };
-  }
-};
+    },
+    // 定义处理该模型副作用的函数
+    effects: function effects(dispatch) {
+      return {
+        init: function init(payload, rootState) {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+            return _regeneratorRuntime.wrap(function _callee$(_context) {
+              while (1) {
+                switch (_context.prev = _context.next) {
+                  case 0:
+                  case "end":
+                    return _context.stop();
+                }
+              }
+            }, _callee);
+          }))();
+        }
+      };
+    }
+  };
+}

package/es/core/editor/utils/edgeTypeStyleUtil.js

@@ -44,30 +44,53 @@ export function getEdgesBySelection(topo) {
   return getSelectedEdges(topo);
 }
 /**
- * 批量设置连线线形
- * 
- * @param {*} edges 
- * @param {*} type 
+ * 遍历连线及子连线
  * @param {*} topo 
+ * @param {*} edges 
+ * @param {*} operateEdgeFn 
  */
 
-export function setEdgesType(edges, type, topo) {
+export function loopEdgesAndChildren(topo, edges, operateEdgeFn) {
   var htTopo = topo.getHtTopo();
   edges.forEach(function (edge) {
-    htTopo.setGraphLinear(edge, {
-      type: type
-    });
+    operateEdgeFn(edge);
 
     if (edge.isEdgeGroupAgent()) {
       // 连线组折叠时同时设置子连线
       var edgeChildren = edge.getEdgeGroup().getEdges().toArray();
       htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), true);
       edgeChildren.forEach(function (edgeChild) {
-        htTopo.setGraphLinear(edgeChild, {
-          type: type
-        });
+        operateEdgeFn(edgeChild);
       });
       htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), false);
     }
   });
+}
+/**
+ * 设置连线及子连线。带回退事务控制
+ * @param {*} topo 
+ * @param {*} edges 
+ * @param {*} operateEdgeFn 
+ */
+
+export function setEdgesAndChildren(topo, edges, operateEdgeFn) {
+  topo.historyManager.beginTransaction();
+  loopEdgesAndChildren(topo, edges, operateEdgeFn);
+  topo.historyManager.endTransaction();
+}
+/**
+ * 批量设置连线线形
+ * 
+ * @param {*} edges 
+ * @param {*} type 
+ * @param {*} topo 
+ */
+
+export function setEdgesType(edges, type, topo) {
+  var htTopo = topo.getHtTopo();
+  setEdgesAndChildren(topo, edges, function (edge) {
+    htTopo.setGraphLinear(edge, {
+      type: type
+    });
+  });
 }

package/es/core/editor/utils/themeUtil.js

@@ -0,0 +1,32 @@
+import { isClusterHtElement } from "../../../utils/clusterUtil";
+import { getElements, isEdge, isGroup, isText } from "../../../utils/htElementUtils";
+export default function ThemeUtil(props) {
+  var topo = props.topo;
+
+  function setElementsTheme(themeConfig) {
+    var dm = topo.getHtTopo().getGraphView().dm();
+    var elements = getElements(dm);
+    elements.forEach(function (element) {
+      setElementTheme(element, themeConfig);
+    });
+  }
+
+  function setElementTheme(element, themeConfig) {
+    if (isText(element)) {
+      element.s('text.color', themeConfig.text.color);
+    } else if (isGroup(element)) {
+      if (isClusterHtElement(element)) {
+        // 集群
+        element.s(themeConfig.cluster.style);
+      } else {
+        // 区域（非集群）
+        element.s(themeConfig.group.style);
+      }
+    } else if (isEdge(element)) {}
+  }
+
+  return {
+    setElementsTheme: setElementsTheme,
+    setElementTheme: setElementTheme
+  };
+}

package/es/core/hooks/useCanvasTheme.js

@@ -0,0 +1,61 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React, { useEffect } from 'react';
+var themeMap = [{
+  name: 'white',
+  label: '白色',
+  color: null,
+  toolsTheme: 'lightgrayblue'
+}, {
+  name: 'lightblue',
+  label: '蓝色',
+  color: '#F9FBFF',
+  toolsTheme: 'white'
+}, {
+  name: 'yellow',
+  label: '黄色',
+  color: '#FFFDE6'
+}, {
+  name: 'green',
+  label: '绿色',
+  color: '#EAFFE8'
+}, {
+  name: 'dark',
+  label: '深色',
+  color: '#031425',
+  toolsTheme: 'black'
+}].reduce(function (map, item) {
+  var _extends2;
+
+  return _extends({}, map, (_extends2 = {}, _extends2[item.name] = item, _extends2));
+}, {});
+export default function useCanvasTheme(props) {
+  var topo = props.topo,
+      canvasTheme = props.canvasTheme; // 拓扑图是否加载
+
+  var _topo$store$useModelS = topo.store.useModelState('topoMod'),
+      graphLoaded = _topo$store$useModelS.graphLoaded;
+
+  useEffect(function () {
+    // 设置
+    var themeConfig = themeMap[canvasTheme || 'white'];
+
+    if (graphLoaded && themeConfig) {
+      var _topo$historyManager2;
+
+      try {
+        var _topo$historyManager;
+
+        (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '切换主题');
+        topo.getHtTopo().setToolsTheme(themeConfig.toolsTheme);
+        topo.getHtTopo().setTheme(canvasTheme);
+      } catch (error) {
+        console.error('切换主题失败', error);
+      }
+
+      (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '切换主题');
+    }
+  }, [canvasTheme, graphLoaded]);
+  return {
+    canvasColor: themeMap[canvasTheme].color
+  };
+}

package/es/core/hooks/useManageStatus.js

@@ -29,15 +29,6 @@ function mergeManageStatus(cis, manageStatusDatas) {
 
 export default function useManageStatus(props) {
   var topo = props.topo;
-
-  var _topo$store$useModel = topo.store.useModel('topoMod'),
-      topoState = _topo$store$useModel[0],
-      topoDispatchers = _topo$store$useModel[1];
-
-  var graphLoaded = topoState.graphLoaded,
-      viewState = topoState.viewState;
-  var isEditMode = viewState === 'edit';
-  var resources = topo.dataModel.useCis();
   useTopoEventListener({
     type: 'manageStatus',
     onMessage: function onMessage(manageStatusDatas) {
@@ -50,6 +41,7 @@ export default function useManageStatus(props) {
           linkGroups: mergeManageStatus(topoData.linkGroups, manageStatusDatas)
         });
 
+        var topoDispatchers = topo.store.getModelDispatchers('topoMod');
         topoDispatchers.update({
           data: newData
         });

package/es/core/hooks/usePolling.js

@@ -61,11 +61,8 @@ var usePolling = function usePolling(props) {
 
 
   useEffect(function () {
-    var isViewer = topoState.viewState === 'view';
-
-    if (topo.options.enableDefaultMetricLoader && isViewer) {
+    if (topo.options.enableDefaultMetricLoader) {
       rlog.debug('usePolling.useEffect: 开始轮询', {
-        isViewer: isViewer,
         pollingSwitch: pollingSwitch,
         resIdsList: resIdsList,
         resourceOverviewState: resourceOverviewState,
@@ -80,7 +77,7 @@ var usePolling = function usePolling(props) {
         stopPoll();
       }
     };
-  }, [topoState.viewState, pollingSwitch, resIdsList, displayConfig, resourceOverviewState.id, resourceOverviewState.metricCodes]);
+  }, [pollingSwitch, resIdsList, displayConfig, resourceOverviewState.id, resourceOverviewState.metricCodes]);
   /**
    * 
    * @returns {{id, attributes: object[], metrics: object[]}[]} 属性和指标

package/es/core/hooks/useTopoEdit.js

@@ -73,6 +73,10 @@ var useTopoEdit = function useTopoEdit(params) {
   var onExitEdit = function onExitEdit() {// editDispatchers.switchToViewMode(topoId);
   };
 
+  var reset = function reset() {
+    topoEditDispatchers.reset();
+  };
+
   var onBindData = function onBindData(eventData) {};
   /**
    * 增加资源到视图
@@ -439,14 +443,15 @@ var useTopoEdit = function useTopoEdit(params) {
             case 0:
               id = group.id, tag = group.tag;
               rlog.debug("bindGroupResources--id, tag", id, tag);
-              _context12.next = 4;
+              topo.historyManager.beginTransaction();
+              _context12.next = 5;
               return resourceConfig.updateGroupResources(group, resources);
 
-            case 4:
-              _context12.next = 6;
+            case 5:
+              _context12.next = 7;
               return editDispatchers.fetchDataByConfig();
 
-            case 6:
+            case 7:
               _yield$editDispatcher2 = _context12.sent;
               elements = _yield$editDispatcher2.elements;
               // 区域里的子区域及子区域的节点、新增的链路
@@ -462,7 +467,9 @@ var useTopoEdit = function useTopoEdit(params) {
                 }
               }
 
-            case 12:
+              topo.historyManager.endTransaction();
+
+            case 14:
             case "end":
               return _context12.stop();
           }
@@ -592,13 +599,14 @@ var useTopoEdit = function useTopoEdit(params) {
                 topo.linkDynamicStyleExecutor.execute();
               }
 
-              topo.historyManager.endTransaction(); // 添加资源后隐藏资源面板
+              topo.historyManager.endTransaction();
+              topo.getHtTopo().fitContent(); // 添加资源后隐藏资源面板
 
               topoEditDispatchers.update({
-                resourceTabactiveKey: null
+                resourceTabActiveKey: null
               });
 
-            case 13:
+            case 14:
             case "end":
               return _context15.stop();
           }
@@ -652,6 +660,12 @@ var useTopoEdit = function useTopoEdit(params) {
   function getAddResourceDrawerMode() {
     return getAddResourceType() === "addToFirstLayer" ? "new" : "all";
   }
+  /**
+   * 未选中元素添加资源
+   * 
+   * @param {*} data 
+   */
+
 
   var onSaveComboRes = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(data) {
@@ -680,11 +694,12 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 9:
               topo.historyManager.endTransaction();
+              topo.getHtTopo().fitContent();
               topoEditDispatchers.update({
-                resourceTabactiveKey: null
+                resourceTabActiveKey: null
               });
 
-            case 11:
+            case 12:
             case "end":
               return _context7.stop();
           }
@@ -1073,12 +1088,14 @@ var useTopoEdit = function useTopoEdit(params) {
    * 设置视图鼠标模式
    */
 
-  var setViewMouseMode = useCallback(function (mode) {
+  var setViewMouseMode = function setViewMouseMode(mode) {
+    rlog.debug('设置视图鼠标模式', mode);
     topo.getHtTopo().setViewMouseMode(mode);
     topoEditDispatchers.update({
       viewMouseMode: mode
     });
-  }, []);
+  };
+
   return {
     resourceConfig: resourceConfig,
 
@@ -1118,6 +1135,7 @@ var useTopoEdit = function useTopoEdit(params) {
      * 退出编辑模式回调
      */
     onExitEdit: onExitEdit,
+    reset: reset,
     addLayerResources: addLayerResources,
 
     /**

package/es/core/models/Alarm.js

@@ -416,7 +416,7 @@ var Alarm = /*#__PURE__*/function () {
 
             case 8:
               _context6.next = 10;
-              return topoService.openTopoAlarm(id);
+              return this.topo.serverApi.openTopoAlarm(id);
 
             case 10:
               this.secretKey = _context6.sent;
@@ -482,7 +482,7 @@ var Alarm = /*#__PURE__*/function () {
                 alarmPanelIsOpen: false
               });
               _context7.next = 9;
-              return topoService.closeTopoAlarm(id, this.secretKey);
+              return this.topo.serverApi.closeTopoAlarm(id, this.secretKey);
 
             case 9:
             case "end":

package/es/core/models/AttributeMetricDisplay.js

@@ -650,7 +650,11 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var htTopo = topo.getHtTopo();
 
     if (htTopo) {
+      var _topo$historyManager, _topo$historyManager2;
+
+      (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '加载标注');
       htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
+      (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '加载标注');
     }
   }
   /**

package/es/core/models/HistoryManager.js

@@ -9,6 +9,7 @@ var HistoryManager = /*#__PURE__*/function () {
     this.storeHistory = [];
     this.topo = topo;
     this.htHistoryManager = htHistoryManager;
+    htHistoryManager.clear();
     rlog.info('HistoryManager 初始化', htHistoryManager);
     this.updateStore = this.updateStore.bind(this);
     this.init();
@@ -64,6 +65,10 @@ var HistoryManager = /*#__PURE__*/function () {
     var _this = this;
 
     this.htHistoryManager.beginTransaction();
+    var displayConfigProperties = [// 单多链路
+    'expandAllEdges', // 节点标注
+    'nodeLabelStyle', // 画布主题
+    'canvasTheme', 'linkTag', 'linkTip', 'nodeTag', 'nodeTip'];
     var items = [{
       modelName: 'topoMod',
       property: 'data'
@@ -71,16 +76,16 @@ var HistoryManager = /*#__PURE__*/function () {
     {
       modelName: 'topoMod',
       property: 'type'
-    }, {
-      modelName: 'displayConfig',
-      property: 'expandAllEdges'
-    }, {
-      modelName: 'displayConfig',
-      property: 'nodeLabelStyle'
-    }, {
+    }].concat(displayConfigProperties.map(function (property) {
+      return {
+        modelName: 'displayConfig',
+        property: property
+      };
+    }), [// 背景
+    {
       modelName: 'background',
       property: 'current'
-    }];
+    }]);
     this.storeHistory = items.map(function (item) {
       return _extends({}, item, {
         oldValue: _this.topo.store.getModelState(item.modelName)[item.property]