@riil-frontend/component-topology 6.0.0-alpha.3 → 6.0.0-alpha.30

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

@@ -0,0 +1,109 @@
+"use strict";
+
+exports.__esModule = true;
+exports.getEdgesBySelection = getEdgesBySelection;
+exports.loopEdgesAndChildren = loopEdgesAndChildren;
+exports.setEdgesAndChildren = setEdgesAndChildren;
+exports.setEdgesType = setEdgesType;
+
+var _htElementUtils = require("../../../utils/htElementUtils");
+
+var ht = window.ht;
+
+function getEdgesBySelection(topo) {
+  var getChildrenNodeIds = function getChildrenNodeIds(nodes) {
+    var nodeIds = nodes.map(function (node) {
+      return node.getId();
+    });
+    nodes.forEach(function (node) {
+      if (node instanceof ht.Group) {
+        var children = node.getChildren().toArray();
+        nodeIds.push.apply(nodeIds, getChildrenNodeIds(children));
+      }
+    });
+    return nodeIds;
+  };
+
+  var getSelectedEdges = function getSelectedEdges(topo) {
+    var gv = topo.getGraphView();
+    var selection = gv.getSelectionModel().getSelection().toArray(); // 选中的连线
+
+    var edges = selection.filter(function (element) {
+      return element instanceof ht.Edge;
+    }); // 查询选中节点间的连线
+
+    var nodes = selection.filter(function (element) {
+      return element instanceof ht.Node;
+    });
+    var nodeIds = getChildrenNodeIds(nodes);
+    var dm = gv.getDataModel();
+    (0, _htElementUtils.getEdges)(dm).forEach(function (edge) {
+      if (nodeIds.find(function (nodeId) {
+        return nodeId === edge.getSource().getId();
+      }) && nodeIds.find(function (nodeId) {
+        return nodeId === edge.getTarget().getId();
+      }) && !edges.find(function (item) {
+        return item === edge;
+      })) {
+        edges.push(edge);
+      }
+    });
+    return edges;
+  };
+
+  return getSelectedEdges(topo);
+}
+/**
+ * 遍历连线及子连线
+ * @param {*} topo 
+ * @param {*} edges 
+ * @param {*} operateEdgeFn 
+ */
+
+
+function loopEdgesAndChildren(topo, edges, operateEdgeFn) {
+  var htTopo = topo.getHtTopo();
+  edges.forEach(function (edge) {
+    operateEdgeFn(edge);
+
+    if (edge.isEdgeGroupAgent()) {
+      // 连线组折叠时同时设置子连线
+      var edgeChildren = edge.getEdgeGroup().getEdges().toArray();
+      htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), true);
+      edgeChildren.forEach(function (edgeChild) {
+        operateEdgeFn(edgeChild);
+      });
+      htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), false);
+    }
+  });
+}
+/**
+ * 设置连线及子连线。带回退事务控制
+ * @param {*} topo 
+ * @param {*} edges 
+ * @param {*} operateEdgeFn 
+ */
+
+
+function setEdgesAndChildren(topo, edges, operateEdgeFn) {
+  topo.historyManager.beginTransaction();
+  loopEdgesAndChildren(topo, edges, operateEdgeFn);
+  topo.historyManager.endTransaction();
+}
+/**
+ * 批量设置连线线形
+ * 
+ * @param {*} edges 
+ * @param {*} type 
+ * @param {*} topo 
+ */
+
+
+function setEdgesType(edges, type, topo) {
+  var htTopo = topo.getHtTopo();
+  setEdgesAndChildren(topo, edges, function (edge) {
+    htTopo.setGraphLinear(edge, {
+      type: type
+    });
+  });
+}

package/lib/core/hooks/useCanvasTheme.js

@@ -0,0 +1,49 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = useCanvasTheme;
+
+var _extends3 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+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; }
+
+var themeMap = [{
+  value: 'white',
+  label: '白色',
+  color: '#FFFFFF'
+}, {
+  value: 'lightblue',
+  label: '蓝色',
+  color: '#F9FBFF'
+}, {
+  value: 'yellow',
+  label: '黄色',
+  color: '#FFFDE6'
+}, {
+  value: 'green',
+  label: '绿色',
+  color: '#EAFFE8'
+}, {
+  value: 'dark',
+  label: '深色',
+  color: '#031425'
+}].reduce(function (map, item) {
+  var _extends2;
+
+  return (0, _extends3["default"])({}, map, (_extends2 = {}, _extends2[item.value] = item, _extends2));
+}, {});
+
+function useCanvasTheme(props) {
+  var canvasTheme = props.canvasTheme;
+  (0, _react.useEffect)(function () {// 设置
+  }, [canvasTheme]);
+  return {
+    canvasColor: themeMap[canvasTheme].color
+  };
+}

package/lib/core/hooks/useTopoEdit.js

@@ -65,8 +65,6 @@ var useTopoEdit = function useTopoEdit(params) {
       editDispatchers = _store$useModel[1];
 
   var topoDispatchers = store.useModelDispatchers("topoMod");
-  var _editState$groups = editState.groups,
-      groups = _editState$groups === void 0 ? [] : _editState$groups;
 
   var _useState = (0, _react.useState)(false),
       showComboResDrawer = _useState[0],
@@ -315,57 +313,6 @@ var useTopoEdit = function useTopoEdit(params) {
   var deleteNode = function deleteNode(node) {
     emitEvent(_componentTopologyGraph.TopoEvent.EVENT_TRIGGER_DELETE, node);
   };
-  /**
-   * 删除视图内的资源
-   */
-
-
-  var deleteViewNode = function deleteViewNode(node) {
-    var nodeId = node.id;
-    var viewResources = resourceConfig.getViewResources();
-    var index = viewResources["static"].indexOf(nodeId);
-
-    if (index > -1) {
-      editDispatchers.updateResources({
-        "static": viewResources["static"].filter(function (item) {
-          return item !== nodeId;
-        })
-      });
-    }
-  };
-  /**
-   * 删除容器内的单个资源
-   *
-   * @param allGroups
-   * @param node 资源
-   */
-
-
-  var deleteGroupNode = function deleteGroupNode(allGroups, node) {
-    var nodeId = node.id; // 更新容器内的资源
-
-    var newGroups = allGroups.map(function (g) {
-      var newGroup = g;
-
-      if (resourceConfig.isGroupContainsNode(g, node)) {
-        newGroup = (0, _extends2["default"])({}, g, {
-          resources: resourceConfig.removeStaticResource(g.resources, nodeId)
-        });
-      }
-
-      return newGroup;
-    });
-
-    _rlog["default"].info("删除容器内的单个资源", {
-      groups: groups,
-      node: node,
-      newGroups: newGroups
-    });
-
-    editDispatchers.update({
-      groups: newGroups
-    });
-  };
 
   var handleDeleteNode = function handleDeleteNode(element) {
     var _topo$options$editor;
@@ -522,14 +469,15 @@ var useTopoEdit = function useTopoEdit(params) {
 
               _rlog["default"].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;
               // 区域里的子区域及子区域的节点、新增的链路
@@ -545,7 +493,9 @@ var useTopoEdit = function useTopoEdit(params) {
                 }
               }
 
-            case 12:
+              topo.historyManager.endTransaction();
+
+            case 14:
             case "end":
               return _context12.stop();
           }
@@ -678,8 +628,13 @@ var useTopoEdit = function useTopoEdit(params) {
               }
 
               topo.historyManager.endTransaction();
+              topo.getHtTopo().fitContent(); // 添加资源后隐藏资源面板
 
-            case 12:
+              topoEditDispatchers.update({
+                resourceTabActiveKey: null
+              });
+
+            case 14:
             case "end":
               return _context15.stop();
           }
@@ -733,6 +688,12 @@ var useTopoEdit = function useTopoEdit(params) {
   function getAddResourceDrawerMode() {
     return getAddResourceType() === "addToFirstLayer" ? "new" : "all";
   }
+  /**
+   * 未选中元素添加资源
+   * 
+   * @param {*} data 
+   */
+
 
   var onSaveComboRes = /*#__PURE__*/function () {
     var _ref6 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(data) {
@@ -762,8 +723,12 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 9:
               topo.historyManager.endTransaction();
+              topo.getHtTopo().fitContent();
+              topoEditDispatchers.update({
+                resourceTabActiveKey: null
+              });
 
-            case 10:
+            case 12:
             case "end":
               return _context7.stop();
           }
@@ -1156,6 +1121,19 @@ var useTopoEdit = function useTopoEdit(params) {
 
   var effectsState = store.useModelEffectsState("topoConfig");
   var topoLoading = effectsState.getTopoByConditions.isLoading;
+  /**
+   * 设置视图鼠标模式
+   */
+
+  var setViewMouseMode = function setViewMouseMode(mode) {
+    _rlog["default"].debug('设置视图鼠标模式', mode);
+
+    topo.getHtTopo().setViewMouseMode(mode);
+    topoEditDispatchers.update({
+      viewMouseMode: mode
+    });
+  };
+
   return {
     resourceConfig: resourceConfig,
 
@@ -1163,6 +1141,7 @@ var useTopoEdit = function useTopoEdit(params) {
      * 拓扑结构加载中状态
      */
     topoLoading: topoLoading,
+    setViewMouseMode: setViewMouseMode,
 
     /**
      * 资源绑定（多选）抽屉显示状态

package/lib/core/models/Alarm.js

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

package/lib/core/models/HistoryManager.js

@@ -83,13 +83,20 @@ var HistoryManager = /*#__PURE__*/function () {
     {
       modelName: 'topoMod',
       property: 'type'
-    }, {
+    }, // 单多链路
+    {
       modelName: 'displayConfig',
       property: 'expandAllEdges'
-    }, {
+    }, // 节点标注
+    {
       modelName: 'displayConfig',
       property: 'nodeLabelStyle'
-    }, {
+    }, // 画布主题
+    {
+      modelName: 'displayConfig',
+      property: 'canvasTheme'
+    }, // 背景
+    {
       modelName: 'background',
       property: 'current'
     }];

package/lib/core/models/SelectionManager.js

@@ -9,6 +9,8 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
+var _useHtElements = _interopRequireDefault(require("../common/hooks/useHtElements"));
+
 var SelectionManager = /*#__PURE__*/function () {
   function SelectionManager(topo) {
     var _this = this;
@@ -20,7 +22,10 @@ var SelectionManager = /*#__PURE__*/function () {
       var selectionDispatchers = _this.topo.store.getModelDispatchers('selection');
 
       selectionDispatchers.update({
-        selection: selection
+        selection: selection,
+        selectionIds: selection.map(function (item) {
+          return item.id;
+        })
       });
     };
 
@@ -66,6 +71,17 @@ var SelectionManager = /*#__PURE__*/function () {
     return selection;
   };
 
+  _proto.useHtSelection = function useHtSelection() {
+    var _this$topo$store$useM2 = this.topo.store.useModelState('selection'),
+        selectionIds = _this$topo$store$useM2.selectionIds;
+
+    var elements = (0, _useHtElements["default"])({
+      topo: this.topo,
+      ids: selectionIds
+    });
+    return elements;
+  };
+
   _proto.handleSelectionChange = function handleSelectionChange(e) {
     _rlog["default"].info('Selection handleSelectionChange', e);
 

package/lib/core/models/TopoApp.js

@@ -52,7 +52,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionManager = _interopRequireDefault(require("./SelectionManager"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "6.0.0-alpha.3" === 'string' ? "6.0.0-alpha.3" : null;
+var version = typeof "6.0.0-alpha.30" === 'string' ? "6.0.0-alpha.30" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/models/TopoGraphView.js

@@ -36,10 +36,16 @@ var TopoGraphView = /*#__PURE__*/function () {
     this.contextMenu = new _ContextMenu["default"]();
   };
 
-  _proto.getHtDataModel = function getHtDataModel() {
+  _proto.getHtGraphView = function getHtGraphView() {
     var _this$topoClient;
 
-    return (_this$topoClient = this.topoClient) === null || _this$topoClient === void 0 ? void 0 : _this$topoClient.getDataModel();
+    return (_this$topoClient = this.topoClient) === null || _this$topoClient === void 0 ? void 0 : _this$topoClient.getGraphView();
+  };
+
+  _proto.getHtDataModel = function getHtDataModel() {
+    var _this$topoClient2;
+
+    return (_this$topoClient2 = this.topoClient) === null || _this$topoClient2 === void 0 ? void 0 : _this$topoClient2.getDataModel();
   }
   /**
    * 缩放平移整个拓扑以展示所有的图元

package/lib/core/models/utils/linkUtils.js

@@ -54,7 +54,7 @@ function isCrucialLink(link) {
 
 
 function isExitLink(link) {
-  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['network_link.destination_device_id']);
+  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['destination_id']);
 }
 
 function isAggLink(link) {

package/lib/core/store/coreModels.js

@@ -15,15 +15,13 @@ var _topoBizMod = _interopRequireDefault(require("./models/topoBizMod"));
 
 var _topoConfig = _interopRequireDefault(require("./models/topoConfig"));
 
-var _topoEdit = _interopRequireDefault(require("./models/topoEdit"));
+var _topoEdit = _interopRequireDefault(require("../editor/store/topoEdit"));
 
-var _background = _interopRequireDefault(require("./models/background"));
+var _background = _interopRequireDefault(require("../editor/store/background"));
 
-var _selection = _interopRequireDefault(require("./models/selection"));
-
-var _historyManager = _interopRequireDefault(require("./models/historyManager"));
+var _historyManager = _interopRequireDefault(require("../editor/store/historyManager"));
 
-var _topoGraphView = _interopRequireDefault(require("./models/topoGraphView"));
+var _selection = _interopRequireDefault(require("./models/selection"));
 
 var _topoAlarm = _interopRequireDefault(require("./models/topoAlarm"));
 
@@ -33,6 +31,7 @@ var _topoBaseInfoOverview = _interopRequireDefault(require("./models/topoBaseInf
 
 var _lock = _interopRequireDefault(require("./models/viewer/lock"));
 
+// 编辑模式
 // 显示模式
 var _default = {
   topoMod: _topoMod["default"],
@@ -42,7 +41,6 @@ var _default = {
   topoConfig: _topoConfig["default"],
   historyManager: _historyManager["default"],
   background: _background["default"],
-  topoGraphView: _topoGraphView["default"],
   ciModel: _ciModel["default"],
   topoEdit: _topoEdit["default"],
   // 显示模式

package/lib/core/store/models/selection.js

@@ -19,7 +19,8 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 var _default = {
   // 定义 model 的初始 state
   state: {
-    selection: []
+    selection: [],
+    selectionIds: []
   },
   // 定义改变该模型状态的纯函数
   reducers: {

package/lib/core/store/models/topoBizMod.js

@@ -25,9 +25,6 @@ function _default(engine) {
       allCiSet: {},
       ciSetDoc: {},
       pollingSwitch: false,
-      // alarmDoc: {},
-      // alarmRecord: [],
-      setConfig: null,
 
       /**
       * 资源和链路的属性、指标，格式见：https://shimo.im/docs/VKt3HCKHYgJ9kvGP#anchor-PFq4

package/lib/core/store/models/topoMod.js

@@ -11,10 +11,10 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
-
 var _moment = _interopRequireDefault(require("moment"));
 
+var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
+
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
 var _topoData = require("../../../utils/topoData");
@@ -319,7 +319,7 @@ function _default(topoApp) {
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
             var _result$config;
 
-            var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, topoConfig, _yield$Promise$all, ciTypeMap, customIcons, xxx, extraConfig, _combTopoData, topoData, resAndMetrics, endTime;
+            var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, graphConfig, topoConfig, _yield$Promise$all, ciTypeMap, customIcons, xxx, extraConfig, _combTopoData, topoData, resAndMetrics, endTime;
 
             return _regenerator["default"].wrap(function _callee6$(_context6) {
               while (1) {
@@ -387,46 +387,44 @@ function _default(topoApp) {
 
                   case 18:
                     if (!data) {
-                      _context6.next = 30;
+                      _context6.next = 29;
                       break;
                     }
 
+                    graphConfig = {};
+
                     if (!topoId) {
-                      _context6.next = 27;
+                      _context6.next = 26;
                       break;
                     }
 
-                    _context6.next = 22;
-                    return topoApp.options.loadData(topoId);
+                    _context6.next = 23;
+                    return _topo["default"].getTopoData(topoId);
 
-                  case 22:
+                  case 23:
                     topoConfig = _context6.sent;
                     if (!topoConfig) _rlog["default"].error("\u672A\u67E5\u8BE2\u5230\u62D3\u6251id " + topoId + " \u7684\u6570\u636E\uFF0C\u8BF7\u68C0\u67E5");
-                    result = (0, _extends2["default"])({}, data, {
+                    graphConfig = {
                       global: topoConfig === null || topoConfig === void 0 ? void 0 : topoConfig.global,
                       customGlobal: data.global,
                       serialize: topoConfig === null || topoConfig === void 0 ? void 0 : topoConfig.serialize
-                    });
-                    _context6.next = 28;
-                    break;
-
-                  case 27:
-                    result = (0, _extends2["default"])({}, data);
+                    };
 
-                  case 28:
-                    _context6.next = 33;
+                  case 26:
+                    result = (0, _extends2["default"])({}, data, graphConfig);
+                    _context6.next = 32;
                     break;
 
-                  case 30:
-                    _context6.next = 32;
+                  case 29:
+                    _context6.next = 31;
                     return topoApp.options.loadData(topoId);
 
-                  case 32:
+                  case 31:
                     result = _context6.sent;
 
-                  case 33:
+                  case 32:
                     if (result) {
-                      _context6.next = 37;
+                      _context6.next = 36;
                       break;
                     }
 
@@ -441,16 +439,16 @@ function _default(topoApp) {
                     topoApp.options.onLoad();
                     return _context6.abrupt("return");
 
-                  case 37:
+                  case 36:
                     result = (0, _topoData.parseTopoData)(result);
 
                     _rlog["default"].debug("topoMod.initTopoData 查询数据完成", topoId, linkTo, result);
 
-                    _context6.next = 41;
+                    _context6.next = 40;
                     return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(result)), dispatch.customIcon.loadCustomIcons(), topoApp.elementTagTipConfig.init(result) // 暂停新配置开发
                     ]);
 
-                  case 41:
+                  case 40:
                     _yield$Promise$all = _context6.sent;
                     ciTypeMap = _yield$Promise$all[0];
                     customIcons = _yield$Promise$all[1];
@@ -459,13 +457,13 @@ function _default(topoApp) {
                     _rlog["default"].debug("topoMod.initTopoData Ci属性指标元数据", ciTypeMap);
 
                     extraConfig = result.global.extraConfig;
-                    _context6.next = 49;
+                    _context6.next = 48;
                     return dispatch.displayConfig.setConfig((0, _extends2["default"])({}, extraConfig, {
                       alarmSwitch: result.global.alarmSwitch,
                       alarmListDefaultOpen: result.global.alarmListDefaultOpen
                     }));
 
-                  case 49:
+                  case 48:
                     _combTopoData = (0, _topoData.combTopoData)({
                       engine: topoApp,
                       data: result,
@@ -496,7 +494,7 @@ function _default(topoApp) {
 
                     topoApp.options.onLoad();
 
-                  case 58:
+                  case 57:
                   case "end":
                     return _context6.stop();
                 }
@@ -627,7 +625,7 @@ function _default(topoApp) {
                     id = playload.id, update = playload.update;
                     _context11.prev = 1;
                     _context11.next = 4;
-                    return _topo["default"].auth.getTopoPermission(id);
+                    return topoApp.serverApi.auth.getTopoPermission(id);
 
                   case 4:
                     topoPermission = _context11.sent;