@riil-frontend/component-topology 13.0.0-dev.8 → 13.0.1

package/es/core/hooks/usePolling.js

@@ -1,15 +1,15 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { useEffect } from 'react';
-import { useRequest } from 'ahooks';
-import _ from 'lodash';
-import Logger from 'loglevel';
-import { useCbbEventListener } from '@riil-frontend/component-riil-event-emitter';
+import { useEffect } from "react";
+import { useRequest } from "ahooks";
+import _ from "lodash";
+import Logger from "loglevel";
+import { useCbbEventListener } from "@riil-frontend/component-riil-event-emitter";
 import DictCache from "../models/cache/DictCache";
 import useCiAttributeChange from "./useCiAttributeChange";
 import useHtDataPropertyChangeListener from "./ht/useHtDataPropertyChangeListener";
-var rlog = Logger.getLogger('topo');
+var rlog = Logger.getLogger("topo");
 /**
  * 轮询获取指标hooks
  * @param {*} props
@@ -21,15 +21,15 @@ var usePolling = function usePolling(props) {
   useCiAttributeChange({
     topo: topo
   });
-  var bizState = store.useModelState('topoBizMod');
+  var bizState = store.useModelState("topoBizMod");
   var resAndMetrics = bizState.resAndMetrics,
       pollingSwitch = bizState.pollingSwitch;
-  var displayConfig = topo.store.useModelState('displayConfig');
-  var resourceOverviewState = topo.store.useModelState('topoBaseInfoOverview');
+  var displayConfig = topo.store.useModelState("displayConfig");
+  var resourceOverviewState = topo.store.useModelState("topoBaseInfoOverview");
   var resIdsList = resAndMetrics === null || resAndMetrics === void 0 ? void 0 : resAndMetrics.resIdsList;
   /**
    * 查询拓扑图资源的属性指标
-   * 
+   *
    * @returns {array}
    */
 
@@ -37,7 +37,7 @@ var usePolling = function usePolling(props) {
     return _fetchData.apply(this, arguments);
   }
   /**
-   * 
+   *
    * @returns {{id, attributes: object[], metrics: object[]}[]} 属性和指标
    */
 
@@ -53,7 +53,7 @@ var usePolling = function usePolling(props) {
               var ipv6 = data.attributeMap.ipv6_address;
 
               if (!ipv6 && data.attributeMap.ipv6_address_list) {
-                ipv6 = (data.attributeMap.ipv6_address_list || '').split(',')[0];
+                ipv6 = (data.attributeMap.ipv6_address_list || "").split(",")[0];
               }
 
               return _extends({}, data, {
@@ -85,9 +85,62 @@ var usePolling = function usePolling(props) {
               // 合并属性、指标
               var _topo$dataModel$getDa = topo.dataModel.getData(),
                   nodes = _topo$dataModel$getDa.nodes,
-                  links = _topo$dataModel$getDa.links;
-
-              return [].concat(nodes, links).filter(function (item) {
+                  links = _topo$dataModel$getDa.links; // console.log('fetchData-mergeData',ciMetricsResult, nodes, links)
+              // 判断通断状态
+
+
+              var breakLinks = links.filter(function (item) {
+                return item.ciType === "network_link";
+              }).map(function (link) {
+                console.log("fetchData-mergeData", link);
+                var breakFlag = false;
+                ciMetricsResult.forEach(function (item) {
+                  if (item.id === link.id) {
+                    if (item.metrics.hasOwnProperty("run_status")) {
+                      if (item.metrics.run_status !== "1") {
+                        breakFlag = true;
+                      }
+                    }
+
+                    if (link.attributes["network_link.is_crucial"] && item.metrics.hasOwnProperty("remote_ping_status")) {
+                      if (item.metrics.remote_ping_status !== "1") {
+                        breakFlag = true;
+                      }
+                    }
+                  }
+                });
+                var element = topo.getDataModel().getDataByTag(link.id);
+
+                if (!element) {
+                  return;
+                }
+
+                if (breakFlag) {
+                  console.log("link.setNodeStyleIcon-breakFlag", element);
+                  topo.getHtTopo().setNodeStyleIcon(element, {
+                    styleIcon: "linkbreak",
+                    position: 17,
+                    icon: "resource.link.linkbreak"
+                  });
+                  topo.dataModel.updateData([_extends({}, link, {
+                    breakState: true
+                  })]);
+                  element === null || element === void 0 ? void 0 : element.s("edge.color", "#C9CED2");
+                  return link.id; //element.a('linkbreak',true);
+                } else {
+                  // 恢复状态
+                  element.removeStyleIcon("linkbreak");
+                  topo.dataModel.updateData([_extends({}, link, {
+                    breakState: false
+                  })]);
+                  element === null || element === void 0 ? void 0 : element.a('linkbreak', false);
+                  return undefined; // topo.getHtTopo().setNodeStyleIcon(element, { styleIcon: 'linkbreak',position: 17, icon: 'resource.link.linkbreak' });
+                }
+              });
+              console.log('link-break', breakLinks, links);
+              return [].concat(nodes, links.filter(function (link) {
+                return !breakLinks.includes(link.id);
+              })).filter(function (item) {
                 return !!item.ciType;
               }).map(function (ciData) {
                 var resultData = _extends({}, ciData, {
@@ -107,7 +160,7 @@ var usePolling = function usePolling(props) {
               });
             };
 
-            _topo$store$getModelS = topo.store.getModelState('topoBizMod').resAndMetrics, resIdsList = _topo$store$getModelS.resIdsList, nodeIdsList = _topo$store$getModelS.nodeIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
+            _topo$store$getModelS = topo.store.getModelState("topoBizMod").resAndMetrics, resIdsList = _topo$store$getModelS.resIdsList, nodeIdsList = _topo$store$getModelS.nodeIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
             // 无资源，不查询
 
             if (resIdsList.length) {
@@ -122,7 +175,8 @@ var usePolling = function usePolling(props) {
             codes = topo.attributeMetricDisplay.getResourceMetricCodes();
             param = {
               ciId: nodeIdsList,
-              codes: codes,
+              codes: [].concat(codes, ["run_status", "remote_ping_status"]),
+              // 判断链路通断状态
               // 过滤掉不需要查询的
               relationId: topo.attributeMetricDisplay.getEdges().map(function (edge) {
                 return {
@@ -212,7 +266,7 @@ var usePolling = function usePolling(props) {
 
   useEffect(function () {
     if (topo.options.enableDefaultMetricLoader) {
-      rlog.debug('usePolling.useEffect: 开始轮询', {
+      rlog.debug("usePolling.useEffect: 开始轮询", {
         pollingSwitch: pollingSwitch,
         resIdsList: resIdsList,
         resourceOverviewState: resourceOverviewState,
@@ -223,16 +277,16 @@ var usePolling = function usePolling(props) {
 
     return function () {
       if (loading) {
-        rlog.debug('usePolling.useEffect: 结束轮询', resAndMetrics);
+        rlog.debug("usePolling.useEffect: 结束轮询", resAndMetrics);
         stopPoll();
       }
     };
   }, [pollingSwitch, resIdsList, displayConfig, resourceOverviewState.id, resourceOverviewState.metricCodes]); // 属性变更监听更新
 
-  useCbbEventListener('topo', {
-    name: 'topo',
+  useCbbEventListener("topo", {
+    name: "topo",
     onMessage: function onMessage(message) {
-      if (message.type === 'attribute') {
+      if (message.type === "attribute") {
         var data = message.data;
       }
     }
@@ -243,8 +297,8 @@ var usePolling = function usePolling(props) {
     onChange: function onChange(e) {
       var property = e.property,
           data = e.data;
-      var isGroupExpandedChanged = data instanceof ht.Group && property === 'expanded';
-      var isEdgeExpandedChanged = data instanceof ht.Edge && property === 'edge.expanded';
+      var isGroupExpandedChanged = data instanceof ht.Group && property === "expanded";
+      var isEdgeExpandedChanged = data instanceof ht.Edge && property === "edge.expanded";
 
       if (isGroupExpandedChanged || isEdgeExpandedChanged) {
         topo.attributeMetricDisplay.updateTagsTips();

package/es/core/hooks/useResourceConfig.js

@@ -41,8 +41,7 @@ export default function (props) {
     var config = getConfigFromHt();
     return {
       resources: config.resources,
-      groups: config.groups,
-      relateTopoIdList: config.relateTopoIdList
+      groups: config.groups
     };
   };
 

package/es/core/hooks/useTopoEdit.js

@@ -1142,7 +1142,8 @@ var useTopoEdit = function useTopoEdit(params) {
      */
     onSaveTopo: onSaveTopo,
     getResourceConfigFromHt: resourceConfig.getConfigFromHt,
-    onLayerAdded: onLayerAdded
+    onLayerAdded: onLayerAdded,
+    findUNExistedLinkElements: findUNExistedLinkElements
   };
 };
 

package/es/core/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "13.0.0-dev.8" === 'string' ? "13.0.0-dev.8" : null;
+var version = typeof "13.0.1" === 'string' ? "13.0.1" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/models/topoData.js

@@ -41,11 +41,11 @@ export function saveTopo(_x) {
 
 function _saveTopo() {
   _saveTopo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(data) {
-    var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, relateTopoIdList, viewGroupId, groupInfo, viewResources;
+    var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, viewGroupId, groupInfo, viewResources;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          topoService = data.topoService, topoId = data.id, template = data.template, layout = data.layout, backgroundId = data.backgroundId, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups, relateTopoIdList = data.relateTopoIdList, viewGroupId = data.viewGroupId;
+          topoService = data.topoService, topoId = data.id, template = data.template, layout = data.layout, backgroundId = data.backgroundId, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups, viewGroupId = data.viewGroupId;
           rlog.debug("saveTopo", data); // 保存布局
 
           if (!(template && layout)) {
@@ -97,8 +97,7 @@ function _saveTopo() {
           rlog.debug("saveTopo-groupInfo", groupInfo);
           _context.next = 15;
           return topoService.bindResourceToTopo(topoId, {
-            groups: groupInfo,
-            relateTopoIdList: relateTopoIdList
+            groups: groupInfo
           });
 
         case 15:

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

@@ -46,40 +46,35 @@ export function isAggLink(link) {
 
   return (link === null || link === void 0 ? void 0 : (_link$attributes2 = link.attributes) === null || _link$attributes2 === void 0 ? void 0 : _link$attributes2.destination_type) === "network.agg_interface" && (link === null || link === void 0 ? void 0 : (_link$attributes3 = link.attributes) === null || _link$attributes3 === void 0 ? void 0 : _link$attributes3.source_type) === "network.agg_interface";
 }
-export function mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceDoc) {
+export function mergeLinksData(links, linkCis, nodes, ciMap, interfaceDoc) {
   var linkCiMap = keyBy(links, "id");
   return links.map(function (link) {
-    var _interfaceCiMap$attri, _interfaceCiMap$attri2;
+    var _ciMap$attributes$net, _ciMap$attributes$net2, _ciMap$attributes$sou, _ciMap$attributes$des;
 
     var linkCi = linkCiMap[link.id];
 
-    var attributes = _extends({}, linkCi === null || linkCi === void 0 ? void 0 : linkCi.attributes);
+    var attributes = _extends({}, linkCi === null || linkCi === void 0 ? void 0 : linkCi.attributes); // 翻译
 
-    var sourceNode = nodes.find(function (node) {
-      return node.id === attributes["network_link.source_device_id"];
-    });
-    var targetNode = nodes.find(function (node) {
-      return node.id === attributes["network_link.destination_device_id"];
-    }); // 翻译
 
     return _extends({}, link, {
+      breakState: false,
       attributes: _extends({}, attributes, {
         // 源/目的设备
         "network_link.source_device_id_object": {
-          displayName: sourceNode === null || sourceNode === void 0 ? void 0 : sourceNode.name
+          displayName: (_ciMap$attributes$net = ciMap[attributes["network_link.source_device_id"]]) === null || _ciMap$attributes$net === void 0 ? void 0 : _ciMap$attributes$net.attributes["display_name"]
         },
         "network_link.destination_device_id_object": {
-          displayName: targetNode === null || targetNode === void 0 ? void 0 : targetNode.name
+          displayName: (_ciMap$attributes$net2 = ciMap[attributes["network_link.destination_device_id"]]) === null || _ciMap$attributes$net2 === void 0 ? void 0 : _ciMap$attributes$net2.attributes["display_name"]
         },
         // 源/目的接口类型
         source_type_object: interfaceDoc[attributes.source_type],
         destination_type_object: interfaceDoc[attributes.destination_type],
         // 源/目的接口
         source_id_object: {
-          displayName: (_interfaceCiMap$attri = interfaceCiMap[attributes.source_id]) === null || _interfaceCiMap$attri === void 0 ? void 0 : _interfaceCiMap$attri.attributes["display_name"]
+          displayName: (_ciMap$attributes$sou = ciMap[attributes.source_id]) === null || _ciMap$attributes$sou === void 0 ? void 0 : _ciMap$attributes$sou.attributes["display_name"]
         },
         destination_id_object: {
-          displayName: (_interfaceCiMap$attri2 = interfaceCiMap[attributes.destination_id]) === null || _interfaceCiMap$attri2 === void 0 ? void 0 : _interfaceCiMap$attri2.attributes["display_name"]
+          displayName: (_ciMap$attributes$des = ciMap[attributes.destination_id]) === null || _ciMap$attributes$des === void 0 ? void 0 : _ciMap$attributes$des.attributes["display_name"]
         }
       })
     });
@@ -91,7 +86,7 @@ export function getLinksDetail(_x, _x2) {
 
 function _getLinksDetail() {
   _getLinksDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(links, nodes) {
-    var linkCis, interfaceIds, interfaceTypes, interfaceCiMap, interfaceDoc;
+    var linkCis, ciMap, ciIds, interfaceTypes, loadCiMap, interfaceDoc;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -104,11 +99,20 @@ function _getLinksDetail() {
 
         case 2:
           linkCis = links;
-          interfaceIds = [].concat(linkCis.map(function (item) {
+          ciMap = keyBy(nodes, "id");
+          ciIds = _.uniq([].concat(linkCis.map(function (item) {
+            return item.attributes['network_link.destination_device_id'];
+          }), linkCis.map(function (item) {
+            return item.attributes['network_link.source_device_id'];
+          }), linkCis.map(function (item) {
             return item.attributes.source_id;
           }), linkCis.map(function (item) {
             return item.attributes.destination_id;
-          }));
+          }))).filter(function (item) {
+            return !!item;
+          }).filter(function (item) {
+            return !ciMap[item];
+          });
           interfaceTypes = _.compact(_.uniq([].concat(linkCis.map(function (item) {
             return item.attributes.source_type;
           }), linkCis.map(function (item) {
@@ -116,19 +120,21 @@ function _getLinksDetail() {
           })))).filter(function (item) {
             return item !== "ip";
           });
-          _context.next = 7;
-          return CiCache.load(interfaceIds);
+          _context.next = 8;
+          return CiCache.load(ciIds);
 
-        case 7:
-          interfaceCiMap = _context.sent;
-          _context.next = 10;
+        case 8:
+          loadCiMap = _context.sent;
+          _context.next = 11;
           return CiTypeCache.load(interfaceTypes);
 
-        case 10:
+        case 11:
           interfaceDoc = _context.sent;
-          return _context.abrupt("return", mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceDoc));
+          Object.assign(ciMap, loadCiMap); // console.log('getLinksDetail-mergeLinksData', { relations, interfaceIds, interfaceCis, })
+
+          return _context.abrupt("return", mergeLinksData(links, linkCis, nodes, ciMap, interfaceDoc));
 
-        case 12:
+        case 14:
         case "end":
           return _context.stop();
       }

package/es/core/store/models/topoConfig.js

@@ -243,18 +243,17 @@ export default function (topoApp) {
           var _this2 = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-            var editState, resources, _editState$groups, groups, relateTopoIdList, query, data;
+            var editState, resources, _editState$groups, groups, query, data;
 
             return _regeneratorRuntime.wrap(function _callee2$(_context2) {
               while (1) switch (_context2.prev = _context2.next) {
                 case 0:
                   editState = rootState.topoConfig;
-                  resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, relateTopoIdList = editState.relateTopoIdList;
+                  resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups;
                   query = {
                     id: rootState.topoMod.topoId,
                     resources: resources,
-                    groups: groups,
-                    relateTopoIdList: relateTopoIdList
+                    groups: groups
                   };
                   _context2.next = 5;
                   return _this2.getTopoByConditions(query);
@@ -297,13 +296,13 @@ export default function (topoApp) {
           var _this4 = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-            var topoId, resources, groups, relateTopoIdList, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
+            var topoId, resources, groups, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
 
             return _regeneratorRuntime.wrap(function _callee4$(_context4) {
               while (1) switch (_context4.prev = _context4.next) {
                 case 0:
                   rlog.debug("getTopoByConditions--------", params);
-                  topoId = params.id, resources = params.resources, groups = params.groups, relateTopoIdList = params.relateTopoIdList;
+                  topoId = params.id, resources = params.resources, groups = params.groups;
                   viewConditions = resToConditions(resources);
                   groupInfo = isAvailableArray(groups) && groups.map(function (group) {
                     return _extends({}, group, {
@@ -313,7 +312,7 @@ export default function (topoApp) {
                   });
                   rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
                   _context4.next = 7;
-                  return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, relateTopoIdList);
+                  return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo);
 
                 case 7:
                   data = _context4.sent;

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

@@ -395,7 +395,8 @@ export default function (topoApp) {
                     globalConfig: extraConfig,
                     type: (_result$config = result.config) === null || _result$config === void 0 ? void 0 : _result$config.showType,
                     topoData: topoData,
-                    resAndMetrics: resAndMetrics
+                    resAndMetrics: resAndMetrics,
+                    loading: false
                   });
 
                 case 47:
@@ -425,11 +426,7 @@ export default function (topoApp) {
                   rlog.info('topoMod.initTopoData 初始化拓扑图数据完成. 耗时: ', endTime.diff(startTime, 'seconds', true));
                   topoApp.options.onLoad();
 
-                  _this3.update({
-                    loading: false
-                  });
-
-                case 62:
+                case 61:
                 case "end":
                   return _context4.stop();
               }

package/es/core/utils/graphLinkUtil.js

@@ -11,6 +11,7 @@ export function fixLink(topo) {
   edges.forEach(function (edge) {
     var source = edge.getSource();
     var target = edge.getTarget();
+    console.log('fixLink', edge, source, target);
     var linkData = linkDatas.find(function (data) {
       return data.id === edge.getTag();
     }); // TODO 判断两端互相切换

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js

@@ -883,7 +883,8 @@ export default function ResourceOverview(props) {
       return item.code;
     }),
     getOverviewConfig: resourceOverviewProps.getOverviewConfig,
-    saveOverviewConfig: resourceOverviewProps.saveOverviewConfig
+    saveOverviewConfig: resourceOverviewProps.saveOverviewConfig,
+    jumpto: topo.viewProps.jumpto
   }) : /*#__PURE__*/React.createElement(BlockBox, {
     headerTitle: "\u5173\u952E\u6307\u6807",
     headerExtra: /*#__PURE__*/React.createElement(Configurator, {

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopo.js

@@ -7,7 +7,8 @@ import styles from "./LinkTopo.module.scss";
 export default function LinkTopo(props) {
   var data = props.data,
       linkMetricCodes = props.linkMetricCodes,
-      openFlow = props.openFlow;
+      openFlow = props.openFlow,
+      jumpto = props.jumpto;
   var metricData = useMetricPolling({
     linkCi: data,
     linkMetricCodes: linkMetricCodes
@@ -33,7 +34,7 @@ export default function LinkTopo(props) {
     data: data // 链路ci数据
     ,
     isNarrow: true,
-    jumpto: getHistory().push
+    jumpto: jumpto || getHistory().push
   }, metricData, {
     openFlow: openFlow
   })));

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopoCard.js

@@ -13,7 +13,8 @@ export default function LinkTopoCard(props) {
       defaultCols = props.defaultCols,
       metricCol = props.metricCol,
       metricColChange = props.metricColChange,
-      metricCodes = props.metricCodes; // eslint-disable-next-line camelcase
+      metricCodes = props.metricCodes,
+      jumpto = props.jumpto; // eslint-disable-next-line camelcase
 
   var supportTemplates = (data === null || data === void 0 ? void 0 : (_data$attributes = data.attributes) === null || _data$attributes === void 0 ? void 0 : _data$attributes.support_templates) || ''; // 该资源监控模板
 
@@ -104,6 +105,7 @@ export default function LinkTopoCard(props) {
     linkMetricCodes: openFlow && openFlow.name == '查看流量构成' ? metricCodes : metricCodes.filter(function (i) {
       return i != 'netDelayRatio' && i != 'retansRatio';
     }),
-    openFlow: openFlow
+    openFlow: openFlow,
+    jumpto: jumpto
   }));
 }

package/es/networkTopo/services/topo/basic.js

@@ -1,7 +1,5 @@
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
-var _excluded = ["groups", "resources"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { request } from '@riil-frontend/component-topology-utils';
 import { rlog } from '@riil-frontend/component-topology-utils';
@@ -9,7 +7,7 @@ import blackList from "./blacklist";
 import { TOPO_API_ROOT } from "./constants";
 import { getBatchCi as _getBatchCi, getBatchCiMetric as _getBatchCiMetric } from "../model";
 import { processByConditionResult, processExitLink } from "../../utils/exitLinkUtil";
-import * as processBothTopoDataUtil from "../../utils/relateTopoDataUtil";
+import * as relateTopoDataUtil from "../../utils/relateTopoDataUtil";
 var API_ROOT = TOPO_API_ROOT;
 /**
  * 拓扑图（看做一个容器）的“父容器”ID
@@ -99,7 +97,8 @@ function prepareGroupParams(modifiedGroups) {
     };
   }).filter(Boolean);
   return {
-    groups: groups
+    groups: groups,
+    relateTopoIdList: relateTopoDataUtil.getRelateTopoIdListFromConfig(modifiedGroups)
   };
 }
 
@@ -399,7 +398,7 @@ export default _extends({
               }),
               serialize: result.serialize ? JSON.parse(result.serialize) : undefined
             });
-            result = processBothTopoDataUtil.processBothTopoData(result);
+            result = relateTopoDataUtil.processBothTopoData(result);
             result = processExitLink(result);
             return _context12.abrupt("return", result);
 
@@ -418,11 +417,11 @@ export default _extends({
   * @param {Array} groups
   * @returns
   */
-  getTopoDataByResource: function getTopoDataByResource(id, resources, groups, relateTopoIdList) {
+  getTopoDataByResource: function getTopoDataByResource(id, resources, groups) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
       var _result$nodes2, _result$links2;
 
-      var data, obj, result;
+      var data, params, result;
       return _regeneratorRuntime.wrap(function _callee13$(_context13) {
         while (1) switch (_context13.prev = _context13.next) {
           case 0:
@@ -436,11 +435,9 @@ export default _extends({
               });
             }
 
-            obj = prepareGroupParams(data);
+            params = prepareGroupParams(data);
             _context13.next = 5;
-            return request.post(API_ROOT + "/structure/byCondition/" + id, _extends({}, obj, {
-              relateTopoIdList: relateTopoIdList
-            }));
+            return request.post(API_ROOT + "/structure/byCondition/" + id, params);
 
           case 5:
             result = _context13.sent;
@@ -452,9 +449,14 @@ export default _extends({
                 });
               })
             });
-            return _context13.abrupt("return", processByConditionResult(result, obj.groups));
+            result = relateTopoDataUtil.processByConditionTopoData({
+              data: result,
+              config: data
+            });
+            result = processByConditionResult(result, params.groups);
+            return _context13.abrupt("return", result);
 
-          case 8:
+          case 10:
           case "end":
             return _context13.stop();
         }
@@ -471,11 +473,11 @@ export default _extends({
   */
   bindResourceToTopo: function bindResourceToTopo(id, config) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14() {
-      var groups, resources, otherConfig, newGroups, obj;
+      var groups, resources, newGroups, obj;
       return _regeneratorRuntime.wrap(function _callee14$(_context14) {
         while (1) switch (_context14.prev = _context14.next) {
           case 0:
-            groups = config.groups, resources = config.resources, otherConfig = _objectWithoutPropertiesLoose(config, _excluded);
+            groups = config.groups, resources = config.resources;
             newGroups = Array.isArray(groups) ? groups : [];
 
             if (resources) {
@@ -489,7 +491,7 @@ export default _extends({
 
             obj = prepareGroupParams(newGroups);
             _context14.next = 6;
-            return request.post(API_ROOT + "/resource/" + id, _extends({}, otherConfig, obj));
+            return request.post(API_ROOT + "/resource/" + id, obj);
 
           case 6:
             return _context14.abrupt("return", _context14.sent);