@riil-frontend/component-topology 5.0.0-alpha.9 → 5.0.2

package/es/core/models/AttributeMetricDisplay.js

@@ -138,6 +138,15 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         tips: filterByPermission(node, ciTypeConfig.tips)
       };
     });
+  } // eslint-disable-next-line class-methods-use-this
+  ;
+
+  _proto.getModelType = function getModelType(ci) {
+    if (ci.ciType === 'network_link') {
+      return ci.attributes.support_templates;
+    }
+
+    return ci.ciType;
   }
   /**
    * 按链路类型获取对应的属性、指标配置
@@ -151,75 +160,8 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         linkTag = _this$getConfig2.linkTag,
         linkTip = _this$getConfig2.linkTip;
 
-    var ciTypeMeta;
-    var isNetworkLink = link.ciType === 'network_link';
-
-    if (isNetworkLink) {
-      var linkConnectType = link.attributes['network_link.connect_type'];
-      ciTypeMeta = this.topo.ciTyeCache.getNetworkLinkCiType(linkConnectType);
-    } else {
-      ciTypeMeta = this.topo.ciTyeCache.getCiType(link.ciType);
-    }
-
-    var dataType = isNetworkLink ? link.attributes['network_link.connect_type'] : link.ciType;
-
-    function getNetworkFieldItems(configItems) {
-      var getMetricCode = function getMetricCode(code) {
-        var _connectTypeMap$linkC;
-
-        var linkConnectType = link.attributes['network_link.connect_type'];
-        var connectTypeMap = {
-          phy: {
-            id: 'phy',
-            metricPrefix: 'physical_link.'
-          },
-          agg: {
-            id: 'agg',
-            metricPrefix: 'agg_link.'
-          },
-          exit: {
-            id: 'exit',
-            metricPrefix: 'export_link.'
-          }
-        };
-        var metricPrefix = (_connectTypeMap$linkC = connectTypeMap[linkConnectType]) === null || _connectTypeMap$linkC === void 0 ? void 0 : _connectTypeMap$linkC.metricPrefix;
-
-        if (!metricPrefix) {
-          return null;
-        }
-
-        var finalCode = null;
-
-        if (ciTypeMeta.metricMap[code]) {
-          finalCode = code;
-        } else if (ciTypeMeta.metricMap["" + metricPrefix + code]) {
-          finalCode = "" + metricPrefix + code;
-        }
-
-        return finalCode;
-      };
-
-      var formatItems = function formatItems(items) {
-        var newItems = [];
-        items.forEach(function (item) {
-          if (item.type === 'metric') {
-            var code = item.code;
-            var finalCode = getMetricCode(code);
-
-            if (finalCode) {
-              newItems.push(_extends({}, item, {
-                code: finalCode
-              }));
-            }
-          } else {
-            newItems.push(item);
-          }
-        });
-        return newItems;
-      };
-
-      return formatItems(configItems);
-    }
+    var ciTypeMeta = this.topo.ciTyeCache.getCiTypeByCi(link);
+    var modelType = this.getModelType(link);
 
     function getItems(cfg) {
       if (!ciTypeMeta || !cfg) {
@@ -228,8 +170,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
       var isCustom = cfg.isCustom,
           data = cfg.data;
-      var configItems = (isCustom ? data[dataType] : data) || [];
-      var items = isNetworkLink ? getNetworkFieldItems(configItems) : configItems; // 过滤不存在的
+      var items = (isCustom ? data[modelType] : data) || []; // 过滤不存在的
 
       return filterUnExistedFields(items, ciTypeMeta);
     }
@@ -679,14 +620,31 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       return;
     }
 
-    var elementTagsAndTips = this.buildTagsTips().map(function (item) {
-      // 开锁状态下禁用悬停展示悬浮框
+    var elementTagsAndTips = this.buildTagsTips() // 开锁状态下禁用悬停展示悬浮框
+    .map(function (item) {
       var _topo$store$getModelS = topo.store.getModelState('lock'),
           lock = _topo$store$getModelS.lock;
 
       return lock ? item : _extends({}, item, {
         tips: []
       });
+    }) // 链路指标都没值时不显示
+    .map(function (item) {
+      var tags = item.tags;
+
+      if (item.type === 'edge') {
+        var allNoValue = tags.data.filter(function (tItem) {
+          return tItem.value === '- ';
+        }).length === tags.data.length;
+
+        if (allNoValue) {
+          tags.data = [];
+        }
+      }
+
+      return _extends({}, item, {
+        tags: tags
+      });
     });
     rlog.debug("AttributeMetricDisplay.updateTagsTips " + new Date().toLocaleString(), elementTagsAndTips);
     var htTopo = topo.getHtTopo();

package/es/core/models/HistoryManager.js

@@ -1,74 +1,78 @@
 import _extends from "@babel/runtime/helpers/extends";
-import rlog from "@riil-frontend/component-topology-utils/es/rlog";
-import { property } from "lodash";
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 var ht = window.ht;
 export var HistoryManager = /*#__PURE__*/function () {
-  function HistoryManager(topo) {
-    var _this = this;
-
+  function HistoryManager(topo, htHistoryManager) {
     this.topo = null;
     this.htHistoryManager = void 0;
     this.storeHistory = [];
     this.topo = topo;
-    var dm = topo.getDataModel();
-    this.htHistoryManager = new ht.HistoryManager(dm);
-    this.htHistoryManager.isPropertyUndoable = this.isPropertyUndoable;
-    window.addEventListener('keydown', function (e) {
-      //增加快捷键支持
-      if (e.ctrlKey) {
-        if (e.keyCode == 90) {
-          //ctrl+z 撤销
-          _this.undo();
-        } else if (e.keyCode == 89) {
-          //ctrl+y 重做
-          _this.redo();
-        }
-      }
-    });
-  }
+    this.htHistoryManager = htHistoryManager;
+    rlog.info('HistoryManager 初始化', htHistoryManager);
+  } // 增加快捷键支持
+
 
   var _proto = HistoryManager.prototype;
 
-  _proto.xxx = function xxx() {// 记录自定义历史数据到htHistoryManager最后一个历史
-  } // eslint-disable-next-line class-methods-use-this
-  ;
+  _proto.handleKeyDown = function handleKeyDown(e) {
+    // 事务中禁用回退
+    // eslint-disable-next-line no-underscore-dangle
+    if (this.htHistoryManager._betweenTransaction) {
+      return;
+    }
 
-  _proto.isPropertyUndoable = function isPropertyUndoable(property) {
-    var ignore = ['s:edge.color', 'a:arrow.color', 'icons', 'a:runtimeStyles'];
+    var isCtrlDown = ht.Default.isCtrlDown;
+
+    if (isCtrlDown(e)) {
+      if (e.keyCode === 90) {
+        // ctrl+z 撤销
+        this.undo();
+      } //  else if (e.keyCode == 89) {//ctrl+y 重做
+      //   this.redo();
+      // }
 
-    if (ignore.includes(property)) {
-      return false;
     }
+  };
 
-    return true;
+  _proto.setDisabled = function setDisabled(disabled, message) {
+    this.htHistoryManager.setDisabled(disabled);
+    rlog.debug("HistoryManager.setDisabled " + (disabled ? '禁用' : '启用') + (message ? "(" + message + ")" : '') + ": " + this.toString(), this.getHistories());
   };
 
   _proto.beginTransaction = function beginTransaction() {
-    var _this2 = this;
+    var _this = this;
 
     this.htHistoryManager.beginTransaction();
     var items = [{
       modelName: 'topoMod',
       property: 'data'
+    }, // 拓扑类型
+    {
+      modelName: 'topoMod',
+      property: 'type'
     }, {
       modelName: 'displayConfig',
       property: 'expandAllEdges'
+    }, {
+      modelName: 'displayConfig',
+      property: 'nodeLabelStyle'
+    }, {
+      modelName: 'background',
+      property: 'current'
     }];
     this.storeHistory = items.map(function (item) {
       return _extends({}, item, {
-        oldValue: _this2.topo.store.getModelState(item.modelName)[item.property]
+        oldValue: _this.topo.store.getModelState(item.modelName)[item.property]
       });
     });
+    rlog.debug("HistoryManager.beginTransaction: " + this.toString(), this.getHistories());
   };
 
-  _proto.endTransaction = function endTransaction() {
-    var _this3 = this;
+  _proto.addStoreHistory = function addStoreHistory() {
+    var _this2 = this;
 
-    // eslint-disable-next-line no-underscore-dangle
-    var betweenTransaction = this.htHistoryManager._betweenTransaction;
-    this.htHistoryManager.endTransaction();
     var storeChanged = this.storeHistory.map(function (item) {
-      var newValue = _this3.topo.store.getModelState(item.modelName)[item.property];
+      var newValue = _this2.topo.store.getModelState(item.modelName)[item.property];
 
       if (item.oldValue === newValue) {
         return false;
@@ -80,18 +84,24 @@ export var HistoryManager = /*#__PURE__*/function () {
     }).filter(function (item) {
       return !!item;
     });
-    rlog.debug('endTransaction', storeChanged, betweenTransaction);
 
-    if (betweenTransaction === 1 && storeChanged.length) {
-      var histories = this.getHistories();
-      var item = histories[histories.length - 1][0];
-      item.storeData = storeChanged;
-      rlog.debug('endTransaction', item);
+    if (storeChanged.length) {
+      this.htHistoryManager.addHistory({
+        type: 'store',
+        data: storeChanged
+      });
+      rlog.debug('HistoryManager.addStoreHistory', storeChanged);
     }
 
     this.storeHistory = [];
   };
 
+  _proto.endTransaction = function endTransaction() {
+    this.addStoreHistory();
+    this.htHistoryManager.endTransaction();
+    rlog.debug("HistoryManager.endTransaction: " + this.toString(), this.getHistories());
+  };
+
   _proto.clear = function clear() {
     this.htHistoryManager.clear();
   };
@@ -100,19 +110,41 @@ export var HistoryManager = /*#__PURE__*/function () {
     return this.htHistoryManager.getHistories();
   };
 
-  _proto.undo = function undo() {
-    var _histories$,
-        _this4 = this;
+  _proto.getHistoryIndex = function getHistoryIndex() {
+    return this.htHistoryManager.getHistoryIndex();
+  };
 
-    // 从htHistoryManager获取最后一个历史获取 自定义历史数据
+  _proto.getCurrentStoreHistory = function getCurrentStoreHistory(isUndo) {
+    var historyIndex = this.getHistoryIndex();
     var histories = this.getHistories();
-    var storeHistory = (_histories$ = histories[histories.length - 1][0]) === null || _histories$ === void 0 ? void 0 : _histories$.storeData;
+    var history = histories[isUndo ? historyIndex : historyIndex + 1];
+
+    if (!history) {
+      return null;
+    }
+
+    var storeHistory = history.filter(function (item) {
+      return item.type === 'store';
+    });
+
+    if (storeHistory.length) {
+      return storeHistory[0].data;
+    }
+
+    return null;
+  };
+
+  _proto.undo = function undo() {
+    var _this3 = this;
+
+    rlog.debug('HistoryManager.undo', this.getHistories(), this.getHistoryIndex());
+    var storeHistory = this.getCurrentStoreHistory(true);
 
     if (storeHistory) {
       storeHistory.forEach(function (item) {
-        var _this4$topo$store$get;
+        var _this3$topo$store$get;
 
-        _this4.topo.store.getModelDispatchers(item.modelName).update((_this4$topo$store$get = {}, _this4$topo$store$get[item.property] = item.oldValue, _this4$topo$store$get));
+        _this3.topo.store.getModelDispatchers(item.modelName).update((_this3$topo$store$get = {}, _this3$topo$store$get[item.property] = item.oldValue, _this3$topo$store$get));
       });
     } // 回退绘图区
 
@@ -121,8 +153,26 @@ export var HistoryManager = /*#__PURE__*/function () {
   };
 
   _proto.redo = function redo() {
+    var _this4 = this;
+
+    rlog.debug('HistoryManager.redo', this.getHistories(), this.getHistoryIndex());
+    var storeHistory = this.getCurrentStoreHistory(false);
+
+    if (storeHistory) {
+      storeHistory.forEach(function (item) {
+        var _this4$topo$store$get;
+
+        _this4.topo.store.getModelDispatchers(item.modelName).update((_this4$topo$store$get = {}, _this4$topo$store$get[item.property] = item.newValue, _this4$topo$store$get));
+      });
+    } // 回退绘图区
+
+
     this.htHistoryManager.redo();
   };
 
+  _proto.toString = function toString() {
+    return "{Histories: " + this.getHistories().length + ", Index: " + this.getHistoryIndex() + "}";
+  };
+
   return HistoryManager;
 }();

package/es/core/models/TopoApp.js

@@ -21,7 +21,7 @@ import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig"; // eslint-disable-next-line no-undef
 
-var version = typeof "5.0.0-alpha.9" === 'string' ? "5.0.0-alpha.9" : null;
+var version = typeof "5.0.2" === 'string' ? "5.0.2" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/models/cache/CiTypeCache.js

@@ -3,6 +3,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import topoService from '@riil-frontend/component-topology-common/es/services/topo';
+import rlog from '@riil-frontend/component-topology-utils/lib/rlog';
 import keyBy from 'lodash/keyBy';
 /**
  * Ci类型属性、指标缓存
@@ -10,7 +11,6 @@ import keyBy from 'lodash/keyBy';
 
 var CiTyeCache = /*#__PURE__*/function () {
   function CiTyeCache() {
-    this.cache = void 0;
     this.cache = {};
   }
 
@@ -33,7 +33,7 @@ var CiTyeCache = /*#__PURE__*/function () {
             case 5:
               _context.prev = 5;
               _context.t0 = _context["catch"](0);
-              console.error('查询Ci模型异常', _context.t0);
+              rlog.error('查询Ci模型异常', _context.t0);
 
             case 8:
               return _context.abrupt("return", this.cache);
@@ -118,6 +118,14 @@ var CiTyeCache = /*#__PURE__*/function () {
     return this.cache[typeCode];
   };
 
+  _proto.getCiTypeByCi = function getCiTypeByCi(ci) {
+    // if (ci.ciType === 'network_link') {
+    //   const supportTemplates = link.attributes.support_templates;
+    // } else {
+    // }
+    return this.getCiType(ci.ciType);
+  };
+
   _proto.getAttribute = function getAttribute(typeCode, attrCode) {
     var ciType = this.getCiType(typeCode);
     return ciType === null || ciType === void 0 ? void 0 : ciType.attributeMap[attrCode];
@@ -128,48 +136,6 @@ var CiTyeCache = /*#__PURE__*/function () {
     return ciType === null || ciType === void 0 ? void 0 : ciType.metricMap[metricCode];
   };
 
-  _proto.getNetworkLinkCiType = function getNetworkLinkCiType(connectType) {
-    var ciType = this.getCiType('network_link');
-    var types = [{
-      id: 'phy',
-      metricPprefix: 'physical_link.'
-    }, {
-      id: 'agg',
-      metricPprefix: 'agg_link.'
-    }, {
-      id: 'exit',
-      metricPprefix: 'export_link.'
-    }];
-    var excludeMetricPprefixs = types.filter(function (t) {
-      return t.id !== connectType;
-    }).map(function (t) {
-      return t.metricPprefix;
-    });
-    var model = null;
-    types.forEach(function (type) {
-      if (type.id === connectType) {
-        var metrics = ciType.metrics // 仅出口链路有：ping状态、专线连通状态
-        .filter(function (metric) {
-          if (connectType === 'exit') {
-            return true;
-          }
-
-          return ['icmp_discards_rate', 'ping_status'].indexOf(metric.code) === -1;
-        }) // 按链路类型过滤对应指标
-        .filter(function (metric) {
-          return !excludeMetricPprefixs.filter(function (excludeMetricPprefix) {
-            return metric.code.indexOf(excludeMetricPprefix) !== -1;
-          }).length;
-        });
-        model = _extends({}, ciType, {
-          metrics: metrics,
-          metricMap: keyBy(metrics || [], 'code')
-        });
-      }
-    });
-    return model;
-  };
-
   _createClass(CiTyeCache, [{
     key: "ciTypes",
     get: function get() {

package/es/core/models/cache/DictCache.js

@@ -2,6 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { dictFormat } from '@riil-frontend/utils';
 import * as modelService from '@riil-frontend/component-topology-common/es/services/model';
+import rlog from '@riil-frontend/component-topology-utils/lib/rlog';
 /**
  * 数据字典缓存
  */
@@ -43,7 +44,7 @@ var DictCache = /*#__PURE__*/function () {
             case 7:
               _context.next = 9;
               return modelService.queryDicts()["catch"](function (e) {
-                console.error('初始化数据字典异常', e);
+                rlog.error('初始化数据字典异常', e);
                 return [];
               });
 

package/es/core/models/graph/Background.js

@@ -1,3 +1,6 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+
 /**
  * 拓扑背景图
  */
@@ -5,22 +8,36 @@ var Background = /*#__PURE__*/function () {
   function Background(view) {
     var _this = this;
 
-    this.setSize = function (_ref) {
-      var width = _ref.width,
-          height = _ref.height;
-
-      var backgroundNode = _this.getBackgroundNode();
+    this.setSize = /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref) {
+        var width, height, backgroundNode, backgroundDispatchers;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                width = _ref.width, height = _ref.height;
+                backgroundNode = _this.getBackgroundNode();
+                backgroundNode.setWidth(width);
+                backgroundNode.setHeight(height);
+                backgroundDispatchers = _this.view.store.getModelDispatchers('background');
+                _context.next = 7;
+                return backgroundDispatchers.setSize({
+                  width: width,
+                  height: height
+                });
 
-      backgroundNode.setWidth(width);
-      backgroundNode.setHeight(height);
+              case 7:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
 
-      var backgroundDispatchers = _this.view.store.getModelDispatchers('background');
-
-      backgroundDispatchers.setSize({
-        width: width,
-        height: height
-      });
-    };
+      return function (_x) {
+        return _ref2.apply(this, arguments);
+      };
+    }();
 
     this.view = view;
   }

package/es/core/models/tagstips/ElementTagTipConfig.js

@@ -1,7 +1,9 @@
+import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { getLinkMtCodes, getMonitorTemplateCodesFromTopoData, getMtCodeCiTypeMap, getNodeMtCodes } from "./utils";
 import { getMetricsByMonitorTemplateCodes } from "../../services/topo";
+import rlog from '@riil-frontend/component-topology-utils/lib/rlog';
 
 var ElementTagTipConfig = /*#__PURE__*/function () {
   function ElementTagTipConfig(topo) {
@@ -22,19 +24,29 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
             case 0:
               this.topoData = topoData;
               this.mtCodes = getMonitorTemplateCodesFromTopoData(topoData);
-              _context.next = 4;
+              _context.prev = 2;
+              _context.next = 5;
               return getMetricsByMonitorTemplateCodes(this.mtCodes);
 
-            case 4:
+            case 5:
               this.mtMetricsMap = _context.sent;
+              _context.next = 11;
+              break;
+
+            case 8:
+              _context.prev = 8;
+              _context.t0 = _context["catch"](2);
+              rlog.error('查询监控模板指标失败', _context.t0);
+
+            case 11:
               this.mtCiTypeMap = getMtCodeCiTypeMap(topoData);
 
-            case 6:
+            case 12:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, this);
+      }, _callee, this, [[2, 8]]);
     }));
 
     function init(_x) {
@@ -62,6 +74,26 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
     return this.getFiedldMapByType(mtCodes, 'link');
   };
 
+  _proto.getLinkConfigItems = function getLinkConfigItems() {
+    var mtCodes = getLinkMtCodes(this.topoData);
+    var linkFidldMap = this.getLinkFidldMap();
+    return [{
+      id: 'm.critical_link',
+      label: '关键链路'
+    }, {
+      id: 'm.ethernet_link',
+      label: '网络链路'
+    }] // 只拓扑图上已有资源的监控模板
+    .filter(function (item) {
+      return mtCodes.includes(item.id);
+    }).map(function (t) {
+      return _extends({}, t, {
+        icon: '/img/model/networkLink.svg',
+        list: linkFidldMap[t.id] || []
+      });
+    });
+  };
+
   _proto.getFiedldMapByType = function getFiedldMapByType(mtCodes, type) {
     var _this = this;
 
@@ -77,24 +109,26 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
 
       var extItems = type === 'node' ? [{
         lavel: '图片名称',
-        value: 'graph:name'
+        value: 'graph:name',
+        typeName: null
       }, {
         lavel: '资源类型',
-        value: 'ciType:name'
+        value: 'ciType:name',
+        typeName: null
       }] : [];
       map[mtCode] = [].concat(extItems, attributes.map(function (item) {
         return {
           type: 'attribute',
-          label: item.name,
-          value: "attribute:" + item.code,
-          data: item
+          typeName: '属性',
+          name: item.name,
+          code: "attribute:" + item.code
         };
       }), metrics.map(function (item) {
         return {
           type: 'metric',
-          label: item.name,
-          value: "metric:" + item.code,
-          data: item
+          typeName: '指标',
+          name: item.name,
+          code: "metric:" + item.code
         };
       }));
     });

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

@@ -29,7 +29,7 @@ export function getLinkMtCodes(data) {
   return getMtCodes(links);
 }
 export function getMonitorTemplateCodesFromTopoData(data) {
-  return [].concat(getNodeMtCodes(data), getLinkMtCodes(data));
+  return [].concat(getLinkMtCodes(data)); // return [...getNodeMtCodes(data), ...getLinkMtCodes(data)]
 }
 export function getMtCodeCiTypeMap(data) {
   var nodes = data.nodes,

package/es/core/models/topoData.js

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