@riil-frontend/component-topology 12.0.0-dev.4 → 12.0.0-dev.41

package/lib/core/hooks/usePolling.js

@@ -17,7 +17,7 @@ var _ahooks = require("ahooks");
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _componentRiilEventEmitter = require("@riil-frontend/component-riil-event-emitter");
 
@@ -227,7 +227,7 @@ var usePolling = function usePolling(props) {
 
   (0, _react.useEffect)(function () {
     if (topo.options.enableDefaultMetricLoader) {
-      _rlog["default"].debug('usePolling.useEffect: 开始轮询', {
+      _componentTopologyUtils.rlog.debug('usePolling.useEffect: 开始轮询', {
         pollingSwitch: pollingSwitch,
         resIdsList: resIdsList,
         resourceOverviewState: resourceOverviewState,
@@ -239,7 +239,7 @@ var usePolling = function usePolling(props) {
 
     return function () {
       if (loading) {
-        _rlog["default"].debug('usePolling.useEffect: 结束轮询', resAndMetrics);
+        _componentTopologyUtils.rlog.debug('usePolling.useEffect: 结束轮询', resAndMetrics);
 
         stopPoll();
       }

package/lib/core/hooks/useResourceConfig.js

@@ -56,9 +56,7 @@ function _default(props) {
     return {
       resources: config.resources,
       groups: config.groups,
-      exportLinkIdList: config.exportLinkIdList,
-      relateTopoIdList: config.relateTopoIdList //linkIps: config.linkIps,
-
+      relateTopoIdList: config.relateTopoIdList
     };
   };
 

package/lib/core/hooks/useTopoEdit.js

@@ -383,33 +383,26 @@ var useTopoEdit = function useTopoEdit(params) {
     var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(node) {
       var _node$getEdges$toArra, _node$getEdges;
 
-      var config, edges, exportLinkIdList;
+      var edges;
       return _regenerator["default"].wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            config = resourceConfig.getConfig(); // console.log("删除关联在节点上的出口链路- node, config", node, config);
+            // console.log("删除关联在节点上的出口链路- node, config", node, config);
+            edges = (_node$getEdges$toArra = (_node$getEdges = node.getEdges()) === null || _node$getEdges === void 0 ? void 0 : _node$getEdges.toArray()) !== null && _node$getEdges$toArra !== void 0 ? _node$getEdges$toArra : [];
 
-            edges = (_node$getEdges$toArra = (_node$getEdges = node.getEdges()) === null || _node$getEdges === void 0 ? void 0 : _node$getEdges.toArray()) !== null && _node$getEdges$toArra !== void 0 ? _node$getEdges$toArra : []; // const exLink = [];
+            if (edges.length > 0) {
+              edges.map(function (edge) {
+                if (edge.getTag()) {
+                  var link = topo.dataModel.getDataById(edge.getTag());
 
-            if (!(edges.length > 0)) {
-              _context4.next = 8;
-              break;
+                  if (link && (0, _linkUtils.isExitLink)(link)) {
+                    topo.getGraphView().dm().remove(edge);
+                  }
+                }
+              });
             }
 
-            exportLinkIdList = [].concat(config.exportLinkIdList); //console.log("删除关联在节点上的出口链路- edges", edges,exportLinkIdList);
-
-            edges.map(function (edge) {
-              if (edge.a("dtype") === "link" && exportLinkIdList.indexOf(edge.getTag()) >= 0) {
-                // exLink.push(edge);
-                topo.getGraphView().dm().remove(edge);
-                exportLinkIdList.splice(config.exportLinkIdList.indexOf(edge.getTag()), 1);
-              }
-            });
-            config.exportLinkIdList = exportLinkIdList;
-            _context4.next = 8;
-            return resourceConfig.updateConfig(config);
-
-          case 8:
+          case 2:
           case "end":
             return _context4.stop();
         }
@@ -591,7 +584,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _bindViewResources() {
     _bindViewResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12(data) {
-      var config, _yield$editDispatcher3, elements;
+      var config, result, _elements;
 
       return _regenerator["default"].wrap(function _callee12$(_context12) {
         while (1) switch (_context12.prev = _context12.next) {
@@ -607,15 +600,19 @@ var useTopoEdit = function useTopoEdit(params) {
             return editDispatchers.fetchDataByConfig();
 
           case 6:
-            _yield$editDispatcher3 = _context12.sent;
-            elements = _yield$editDispatcher3.elements;
-            saveBind(_componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_COMBO, elements); // 临时放这里，仅拓扑中心有
+            result = _context12.sent;
+            console.log("fetchDataByConfig", result);
 
-            if (topo.linkDynamicStyleExecutor) {
-              topo.linkDynamicStyleExecutor.execute();
+            if (result) {
+              _elements = result.elements;
+              saveBind(_componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_COMBO, _elements); // 临时放这里，仅拓扑中心有
+
+              if (topo.linkDynamicStyleExecutor) {
+                topo.linkDynamicStyleExecutor.execute();
+              }
             }
 
-          case 10:
+          case 9:
           case "end":
             return _context12.stop();
         }
@@ -630,7 +627,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _addLayerResources() {
     _addLayerResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13(group, newResourceIds) {
-      var _yield$editDispatcher4, elements, newElements;
+      var _yield$editDispatcher3, elements, newElements;
 
       return _regenerator["default"].wrap(function _callee13$(_context13) {
         while (1) switch (_context13.prev = _context13.next) {
@@ -645,8 +642,8 @@ var useTopoEdit = function useTopoEdit(params) {
             return editDispatchers.fetchDataByConfig();
 
           case 5:
-            _yield$editDispatcher4 = _context13.sent;
-            elements = _yield$editDispatcher4.elements;
+            _yield$editDispatcher3 = _context13.sent;
+            elements = _yield$editDispatcher3.elements;
             // 2022-11-10 修复 添加资源后分层重新布局问题，仅布局新增资源。替换api topo.updateElements(data)
             newElements = findUNExistedElements(elements);
 
@@ -869,7 +866,9 @@ var useTopoEdit = function useTopoEdit(params) {
                 return _regenerator["default"].wrap(function _callee8$(_context8) {
                   while (1) switch (_context8.prev = _context8.next) {
                     case 0:
-                      dm = htTopo.getGraphView().dm(); // 创建
+                      dm = htTopo.getGraphView().dm(); // 移除旧节点。先删除后创建，解决ip节点替换ping资源后链路丢失问题
+
+                      dm.remove(node); // 创建
 
                       newLinkElements = findUNExistedLinkElements(elements);
                       createElementsData = null;
@@ -931,22 +930,13 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
                       sm = htTopo.getGraphView().sm();
-                      sm.setSelection([newElement]); // 移除旧节点
+                      sm.setSelection([newElement]); // 临时放这里，仅拓扑中心有
 
-                      dm.remove(node); // saveBind(TopoEvent.DATA_TYPE_RESOURCE_SINGLE, newDatas);
-                      // node.a("customName", null);
-                      // 删除关联在节点上的出口链路
-
-                      _context8.next = 12;
-                      return deleteExLink(node);
-
-                    case 12:
-                      // 临时放这里，仅拓扑中心有
                       if (topo.linkDynamicStyleExecutor) {
                         topo.linkDynamicStyleExecutor.execute();
                       }
 
-                    case 13:
+                    case 11:
                     case "end":
                       return _context8.stop();
                   }
@@ -1011,11 +1001,12 @@ var useTopoEdit = function useTopoEdit(params) {
               break;
             }
 
+            topo.historyManager.endTransaction();
+
             _message["default"].error("关联资源失败");
 
-            _rlog["default"].warn("关联资源失败");
+            _rlog["default"].error("关联资源失败");
 
-            topo.historyManager.endTransaction();
             return _context9.abrupt("return", false);
 
           case 23:
@@ -1047,7 +1038,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _relateNodeIp() {
     _relateNodeIp = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee15(txtValue, nodeElement) {
-      var dm, isUnique, ip, configObj, configData, _elements, newLinkElements, newLink, newLinkGroup, createElementsData, _htTopo;
+      var dm, isUnique, ipNodeData, configObj, configData, _elements2, newLinkElements, newLink, newLinkGroup, createElementsData, _htTopo;
 
       return _regenerator["default"].wrap(function _callee15$(_context15) {
         while (1) switch (_context15.prev = _context15.next) {
@@ -1069,16 +1060,16 @@ var useTopoEdit = function useTopoEdit(params) {
             isUnique = (0, _exitLinkUtil.isUniqueIp)(dm, txtValue, nodeElement); // 获取关联链路
 
             if (!isUnique) {
-              _context15.next = 23;
+              _context15.next = 24;
               break;
             }
 
-            ip = (0, _exitLinkUtil.buildIpNode)(txtValue);
+            ipNodeData = (0, _exitLinkUtil.buildIpNode)(txtValue);
             _context15.next = 8;
             return deleteExLink(nodeElement);
 
           case 8:
-            nodeElement.a(ip);
+            nodeElement.a(ipNodeData);
             nodeElement.setName(txtValue);
             nodeElement.setTag("ip:" + txtValue); // 获取配置
 
@@ -1093,8 +1084,8 @@ var useTopoEdit = function useTopoEdit(params) {
           case 16:
             configData = _context15.sent;
             // console.log("configData",configObj, configData);
-            _elements = configData.elements;
-            newLinkElements = findUNExistedLinkElements(_elements); // console.log("configData", configData, newLinkElements);
+            _elements2 = configData.elements;
+            newLinkElements = findUNExistedLinkElements(_elements2); // console.log("configData", configData, newLinkElements);
 
             newLink = newLinkElements.filter(function (item) {
               return item.type === "link";
@@ -1109,15 +1100,21 @@ var useTopoEdit = function useTopoEdit(params) {
               nodes: [],
               links: newLink,
               linkGroups: newLinkGroup
-            }; // console.log("createElementsData", createElementsData);
+            };
+            console.log("createElementsData", createElementsData);
 
             if ([].concat(newLink, newLinkGroup).length > 0) {
               _htTopo = topo.getHtTopo();
 
-              _htTopo.createElements(createElementsData);
+              _htTopo.createElements(createElementsData); // 临时放这里，仅拓扑中心有
+
+
+              if (topo.linkDynamicStyleExecutor) {
+                topo.linkDynamicStyleExecutor.execute();
+              }
             }
 
-          case 23:
+          case 24:
           case "end":
             return _context15.stop();
         }