@riil-frontend/component-topology 12.0.0-dev.1 → 12.0.0-dev.10

package/lib/core/models/AttributeMetricDisplay.js

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _ResourceInfoDisplay = require("../../constants/ResourceInfoDisplay");
 
@@ -23,6 +23,8 @@ var _DictCache = _interopRequireDefault(require("./cache/DictCache"));
 
 var _nodeNameVisibleUtil = require("./utils/nodeNameVisibleUtil");
 
+var _ciRefAttributeTranslateUtil = require("../../utils/ciRefAttributeTranslateUtil");
+
 function isGraphField(item) {
   return item.type === 'graph';
 }
@@ -346,7 +348,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
             }); // 翻译引用属性
 
             _context.next = 4;
-            return this.translateRefAttribute(ciDatas);
+            return (0, _ciRefAttributeTranslateUtil.translateCisRefAttributeName)(ciDatas);
 
           case 4:
             ciDatas = _context.sent;
@@ -449,7 +451,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                   });
                 });
               } else {
-                _rlog["default"].warn("\u63A8\u9001\u5C5E\u6027\u6307\u6807\u6570\u636E\uFF1A\u672A\u67E5\u8BE2\u5230ciType " + ciType, ciData);
+                _componentTopologyUtils.rlog.warn("\u63A8\u9001\u5C5E\u6027\u6307\u6807\u6570\u636E\uFF1A\u672A\u67E5\u8BE2\u5230ciType " + ciType, ciData);
               }
             });
             refIds = Object.keys(refIdMap);
@@ -474,8 +476,10 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                 var refCi = refCiMap[refAttrs.id];
 
                 if (refCi) {
+                  // 引用ci名称获取规则：如果ci是树形结构（例如区域），取 tree_name_path；非树形，取display_name
+                  var displayName = refCi.attributes.tree_name_path || refCi.attributes.display_name;
                   attributeMap[refAttrs.attrCode + "_object"] = {
-                    displayName: refCi.attributes.display_name
+                    displayName: displayName
                   };
                 }
               });

package/lib/core/models/HistoryManager.js

@@ -7,7 +7,7 @@ exports["default"] = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var ht = window.ht;
 
@@ -20,7 +20,7 @@ var HistoryManager = /*#__PURE__*/function () {
     this.htHistoryManager = htHistoryManager;
     htHistoryManager.clear();
 
-    _rlog["default"].info('HistoryManager 初始化', htHistoryManager);
+    _componentTopologyUtils.rlog.info('HistoryManager 初始化', htHistoryManager);
 
     this.updateStore = this.updateStore.bind(this);
     this.init();
@@ -70,7 +70,7 @@ var HistoryManager = /*#__PURE__*/function () {
   _proto.setDisabled = function setDisabled(disabled, message) {
     this.htHistoryManager.setDisabled(disabled);
 
-    _rlog["default"].debug("HistoryManager.setDisabled " + (disabled ? '禁用' : '启用') + (message ? "(" + message + ")" : '') + ": " + this.toString(), this.getHistories());
+    _componentTopologyUtils.rlog.debug("HistoryManager.setDisabled " + (disabled ? '禁用' : '启用') + (message ? "(" + message + ")" : '') + ": " + this.toString(), this.getHistories());
   };
 
   _proto.beginTransaction = function beginTransaction() {
@@ -105,7 +105,7 @@ var HistoryManager = /*#__PURE__*/function () {
       });
     });
 
-    _rlog["default"].debug("HistoryManager.beginTransaction: " + this.toString(), this.getHistories());
+    _componentTopologyUtils.rlog.debug("HistoryManager.beginTransaction: " + this.toString(), this.getHistories());
   };
 
   _proto.addStoreHistory = function addStoreHistory() {
@@ -131,7 +131,7 @@ var HistoryManager = /*#__PURE__*/function () {
         data: storeChanged
       });
 
-      _rlog["default"].debug('HistoryManager.addStoreHistory', storeChanged);
+      _componentTopologyUtils.rlog.debug('HistoryManager.addStoreHistory', storeChanged);
     }
 
     this.storeHistory = [];
@@ -141,7 +141,7 @@ var HistoryManager = /*#__PURE__*/function () {
     this.addStoreHistory();
     this.htHistoryManager.endTransaction();
 
-    _rlog["default"].debug("HistoryManager.endTransaction: " + this.toString(), this.getHistories());
+    _componentTopologyUtils.rlog.debug("HistoryManager.endTransaction: " + this.toString(), this.getHistories());
   };
 
   _proto.clear = function clear() {
@@ -185,7 +185,7 @@ var HistoryManager = /*#__PURE__*/function () {
       return;
     }
 
-    _rlog["default"].debug('HistoryManager.undo', this.getHistories(), this.getHistoryIndex());
+    _componentTopologyUtils.rlog.debug('HistoryManager.undo', this.getHistories(), this.getHistoryIndex());
 
     var storeHistory = this.getCurrentStoreHistory(true);
 
@@ -204,7 +204,7 @@ var HistoryManager = /*#__PURE__*/function () {
   _proto.redo = function redo() {
     var _this4 = this;
 
-    _rlog["default"].debug('HistoryManager.redo', this.getHistories(), this.getHistoryIndex());
+    _componentTopologyUtils.rlog.debug('HistoryManager.redo', this.getHistories(), this.getHistoryIndex());
 
     var storeHistory = this.getCurrentStoreHistory(false);
 

package/lib/core/models/SelectionModel.js

@@ -7,7 +7,7 @@ exports["default"] = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _useHtElements = _interopRequireDefault(require("../common/hooks/useHtElements"));
 
@@ -33,7 +33,7 @@ var SelectionModel = /*#__PURE__*/function () {
 
         _this.updateStoreSelection(selectionArr);
       } catch (e) {
-        _rlog["default"].error('updateSelection error', e);
+        _componentTopologyUtils.rlog.error('updateSelection error', e);
       }
     };
 
@@ -103,7 +103,7 @@ var SelectionModel = /*#__PURE__*/function () {
   };
 
   _proto.handleSelectionChange = function handleSelectionChange(e) {
-    _rlog["default"].info('Selection handleSelectionChange', e);
+    _componentTopologyUtils.rlog.info('Selection handleSelectionChange', e);
 
     this.updateSelection();
   };
@@ -130,7 +130,7 @@ var SelectionModel = /*#__PURE__*/function () {
   };
 
   _proto.initListener = function initListener() {
-    _rlog["default"].info('Selection initListener');
+    _componentTopologyUtils.rlog.info('Selection initListener');
 
     var dataModel = this.topo.getDataModel();
     var selectionModel = this.topo.getSelectionModel();
@@ -143,7 +143,7 @@ var SelectionModel = /*#__PURE__*/function () {
       return;
     }
 
-    _rlog["default"].info('Selection removeListener');
+    _componentTopologyUtils.rlog.info('Selection removeListener');
 
     var dataModel = this.topo.getDataModel();
     var selectionModel = this.topo.getSelectionModel();

package/lib/core/models/TopoApp.js

@@ -13,8 +13,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
-
 var _lodash = require("lodash");
 
 var _topo = _interopRequireDefault(require("../services/topo"));
@@ -56,7 +54,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "12.0.0-dev.1" === 'string' ? "12.0.0-dev.1" : null;
+var version = typeof "12.0.0-dev.10" === 'string' ? "12.0.0-dev.10" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -384,7 +382,7 @@ var Topo = /*#__PURE__*/function () {
       return _regenerator["default"].wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            _rlog["default"].info('TopoApp.open 打开拓扑图', id); // 如果是切换拓扑图，注销原拓扑图
+            _componentTopologyUtils.rlog.info('TopoApp.open 打开拓扑图', id); // 如果是切换拓扑图，注销原拓扑图
 
 
             lastId = this.id;
@@ -414,7 +412,7 @@ var Topo = /*#__PURE__*/function () {
       return _regenerator["default"].wrap(function _callee8$(_context8) {
         while (1) switch (_context8.prev = _context8.next) {
           case 0:
-            _rlog["default"].info('关闭拓扑图', this.id);
+            _componentTopologyUtils.rlog.info('关闭拓扑图', this.id);
 
             if (this.id) {
               _context8.next = 3;
@@ -547,7 +545,7 @@ var Topo = /*#__PURE__*/function () {
       return _regenerator["default"].wrap(function _callee12$(_context12) {
         while (1) switch (_context12.prev = _context12.next) {
           case 0:
-            _rlog["default"].info('TopoApp.enterEditMode');
+            _componentTopologyUtils.rlog.info('TopoApp.enterEditMode');
 
             if (!this.options.onSwitchToEditModeBegin) {
               _context12.next = 4;

package/lib/core/models/attributeFormatter/formatter/commonTransform.js

@@ -19,11 +19,6 @@ function commonTransform(options) {
     if (ciData[attrType + "Map"][fieldCode + "_object"]) {
       fieldValue = ciData[attrType + "Map"][fieldCode + "_object"].displayName;
     }
-  } // 分级字典特殊处理
-
-
-  if (fieldMeta.dict) {
-    fieldValue = fieldMeta.dict[fieldValue];
   }
 
   return {

package/lib/core/models/attributeFormatter/formatter/graphTransform.js

@@ -1,11 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 exports.__esModule = true;
 exports["default"] = graphTransform;
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 function graphTransform(options) {
   var item = options.item,
@@ -17,7 +15,7 @@ function graphTransform(options) {
     var node = topo.getDataModel().getDataByTag(ciData.id);
     value = (node === null || node === void 0 ? void 0 : node.a('customName')) || (node === null || node === void 0 ? void 0 : node.a('name')) || '-';
   } catch (error) {
-    _rlog["default"].error(error);
+    _componentTopologyUtils.rlog.error(error);
   }
 
   return {

package/lib/core/models/attributeFormatter/index.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _attributeTransform = _interopRequireDefault(require("./formatter/attributeTransform"));
 

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

@@ -15,7 +15,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/lib/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _keyBy = _interopRequireDefault(require("lodash/keyBy"));
 
@@ -46,7 +46,7 @@ var CiTypeCache = /*#__PURE__*/function () {
             _context.prev = 5;
             _context.t0 = _context["catch"](0);
 
-            _rlog["default"].error('查询Ci模型异常', _context.t0);
+            _componentTopologyUtils.rlog.error('查询Ci模型异常', _context.t0);
 
           case 8:
             return _context.abrupt("return", this.ciTypeMap);
@@ -119,6 +119,10 @@ var CiTypeCache = /*#__PURE__*/function () {
     this.ciTypeMap = cache;
   };
 
+  _proto.getCiTypeMap = function getCiTypeMap() {
+    return this.ciTypeMap;
+  };
+
   _proto.getCiType = function getCiType(typeCode) {
     return this.ciTypeMap[typeCode];
   };

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

@@ -13,7 +13,7 @@ var _utils = require("@riil-frontend/utils");
 
 var modelService = _interopRequireWildcard(require("@riil-frontend/component-topology-common/es/services/model"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/lib/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 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); }
 
@@ -58,7 +58,7 @@ var DictCache = /*#__PURE__*/function () {
           case 7:
             _context.next = 9;
             return modelService.queryDicts()["catch"](function (e) {
-              _rlog["default"].error('初始化数据字典异常', e);
+              _componentTopologyUtils.rlog.error('初始化数据字典异常', e);
 
               return [];
             });

package/lib/core/models/plugins/resourceWebControllUrl.js

@@ -13,7 +13,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 function _default(topo) {
   var resourceUrlMap = {};
@@ -90,7 +90,7 @@ function _default(topo) {
             _context2.prev = 10;
             _context2.t0 = _context2["catch"](3);
 
-            _rlog["default"].error('资源web控制台.加载数据异常', _context2.t0);
+            _componentTopologyUtils.rlog.error('资源web控制台.加载数据异常', _context2.t0);
 
           case 13:
           case "end":

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

@@ -13,7 +13,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _keyBy = _interopRequireDefault(require("lodash/keyBy"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/lib/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _utils = require("./utils");
 
@@ -88,7 +88,7 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
             _context2.prev = 8;
             _context2.t0 = _context2["catch"](0);
 
-            _rlog["default"].error('查询监控模板指标失败', _context2.t0);
+            _componentTopologyUtils.rlog.error('查询监控模板指标失败', _context2.t0);
 
           case 11:
           case "end":

package/lib/core/models/topoData.js

@@ -124,7 +124,6 @@ function _saveTopo() {
           return topoService.bindResourceToTopo(topoId, {
             groups: groupInfo,
             linkIps: linkIps,
-            // exportLinkIdList,
             relateTopoIdList: relateTopoIdList
           });
 

package/lib/core/services/alarm.js

@@ -13,7 +13,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _default = {
   /**
@@ -36,7 +36,7 @@ var _default = {
           case 3:
             result = _context.sent;
 
-            _rlog["default"].debug('查询告警列表', ciIds, result);
+            _componentTopologyUtils.rlog.debug('查询告警列表', ciIds, result);
 
             return _context.abrupt("return", result);
 

package/lib/core/services/index.js

@@ -29,7 +29,7 @@ function _queryCisByIds() {
           return (0, _cmdb.commonQueryCiDataByIds)(ids, {
             orders: [],
             pageIndex: 1,
-            pageSize: 100000
+            pageSize: 10000
           });
 
         case 2:

package/lib/core/services/topo/basic.js

@@ -118,7 +118,7 @@ var _default = {
   * @param {Array} groups
   * @returns
   */
-  getTopoDataByResource: function getTopoDataByResource(id, resources, groups, exportLinkIdList) {
+  getTopoDataByResource: function getTopoDataByResource(id, resources, groups) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var data, obj;
       return _regenerator["default"].wrap(function _callee$(_context) {
@@ -137,7 +137,7 @@ var _default = {
             obj = prepareGroupParams(data);
             _context.next = 5;
             return _componentTopologyUtils.request.post(API_ROOT + "/structure/byCondition/" + id, (0, _extends2["default"])({}, obj, {
-              exportLinkIdList: exportLinkIdList
+              exportLinkIdList: []
             }));
 
           case 5:

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

@@ -15,7 +15,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 
@@ -202,7 +202,7 @@ function _default(engine) {
 
           var id = (0, _icon.getCustomIconIdFromHtId)(htIconId);
 
-          _rlog["default"].debug("\u5220\u9664\u56FE\u6807: " + id);
+          _componentTopologyUtils.rlog.debug("\u5220\u9664\u56FE\u6807: " + id);
 
           _dialog["default"].confirm({
             title: '删除',
@@ -246,7 +246,7 @@ function _default(engine) {
                       _context5.prev = 9;
                       _context5.t0 = _context5["catch"](0);
 
-                      _rlog["default"].warn('删除图标失败', _context5.t0);
+                      _componentTopologyUtils.rlog.warn('删除图标失败', _context5.t0);
 
                     case 12:
                     case "end":

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

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 /**
  * 动态设置链路样式 Model

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

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 /**
  * 拓扑图 Model

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

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 

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

@@ -13,7 +13,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 function _default(engine) {
   return {

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

@@ -53,7 +53,6 @@ var initialState = {
     "static": []
   },
   groups: [],
-  exportLinkIdList: [],
   // config: {
   //   view: null,
   //   groups: [],
@@ -260,18 +259,17 @@ function _default(topoApp) {
           var _this2 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-            var editState, resources, _editState$groups, groups, _editState$ipNodes, ipNodes, query, data;
+            var editState, resources, _editState$groups, groups, query, data;
 
             return _regenerator["default"].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, _editState$ipNodes = editState.ipNodes, ipNodes = _editState$ipNodes === void 0 ? [] : _editState$ipNodes;
+                  resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups;
                   query = {
                     id: rootState.topoMod.topoId,
                     resources: resources,
-                    groups: groups,
-                    ipNodes: ipNodes
+                    groups: groups
                   };
                   _context2.next = 5;
                   return _this2.getTopoByConditions(query);
@@ -322,14 +320,14 @@ function _default(topoApp) {
           var _this4 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-            var topoId, resources, groups, exportLinkIdList, ipNodes, 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 _regenerator["default"].wrap(function _callee4$(_context4) {
               while (1) switch (_context4.prev = _context4.next) {
                 case 0:
                   _rlog["default"].debug("getTopoByConditions--------", params);
 
-                  topoId = params.id, resources = params.resources, groups = params.groups, exportLinkIdList = params.exportLinkIdList, ipNodes = params.ipNodes;
+                  topoId = params.id, resources = params.resources, groups = params.groups;
                   viewConditions = (0, _topoData2.resToConditions)(resources);
                   groupInfo = (0, _utils.isAvailableArray)(groups) && groups.map(function (group) {
                     return (0, _extends2["default"])({}, group, {
@@ -341,7 +339,7 @@ function _default(topoApp) {
                   _rlog["default"].debug("getTopoByConditions--------", viewConditions, groupInfo);
 
                   _context4.next = 7;
-                  return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList, ipNodes);
+                  return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo);
 
                 case 7:
                   data = _context4.sent;
@@ -484,8 +482,7 @@ function _default(topoApp) {
             return _regenerator["default"].wrap(function _callee8$(_context8) {
               while (1) switch (_context8.prev = _context8.next) {
                 case 0:
-                  ids = data.ids, ip = data.ip; // console.log("queryAllLinkByIp", ids, ip);
-
+                  ids = data.ids, ip = data.ip;
                   _context8.next = 3;
                   return _networkLink["default"].queryLinksByIp(ids, ip);
 

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

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 

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

@@ -15,7 +15,7 @@ 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 _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _topoData = require("../../../utils/topoData");
 
@@ -85,7 +85,7 @@ function _default(topoApp) {
                   type = params.type || 'view';
                   id = params.id || topoModState.topoId || '';
 
-                  _rlog["default"].debug("topoMod.init \u521D\u59CB\u5316(" + id + ")...", {
+                  _componentTopologyUtils.rlog.debug("topoMod.init \u521D\u59CB\u5316(" + id + ")...", {
                     params: params,
                     rootState: rootState
                   });
@@ -117,7 +117,7 @@ function _default(topoApp) {
                     loading: false
                   });
 
-                  _rlog["default"].debug('topoMod.initTopoCenter 初始化完成', {
+                  _componentTopologyUtils.rlog.debug('topoMod.initTopoCenter 初始化完成', {
                     rootState: rootState
                   });
 
@@ -401,7 +401,7 @@ function _default(topoApp) {
 
                 case 24:
                   topoConfig = _context6.sent;
-                  if (!topoConfig) _rlog["default"].error("\u672A\u67E5\u8BE2\u5230\u62D3\u6251id " + topoId + " \u7684\u6570\u636E\uFF0C\u8BF7\u68C0\u67E5");
+                  if (!topoConfig) _componentTopologyUtils.rlog.error("\u672A\u67E5\u8BE2\u5230\u62D3\u6251id " + topoId + " \u7684\u6570\u636E\uFF0C\u8BF7\u68C0\u67E5");
                   graphConfig = {
                     global: topoConfig === null || topoConfig === void 0 ? void 0 : topoConfig.global,
                     customGlobal: data.global,
@@ -440,7 +440,7 @@ function _default(topoApp) {
                 case 37:
                   result = (0, _topoData.parseTopoData)(result);
 
-                  _rlog["default"].debug('topoMod.initTopoData 查询数据完成', topoId, linkTo, result);
+                  _componentTopologyUtils.rlog.debug('topoMod.initTopoData 查询数据完成', topoId, linkTo, result);
 
                   _context6.next = 41;
                   return dispatch.customIcon.loadCustomIcons();
@@ -496,7 +496,7 @@ function _default(topoApp) {
                   topoApp.onTopoDataLoaded(topoData);
                   endTime = (0, _moment["default"])();
 
-                  _rlog["default"].info('topoMod.initTopoData 初始化拓扑图数据完成. 耗时: ', endTime.diff(startTime, 'seconds', true));
+                  _componentTopologyUtils.rlog.info('topoMod.initTopoData 初始化拓扑图数据完成. 耗时: ', endTime.diff(startTime, 'seconds', true));
 
                   topoApp.options.onLoad();
 
@@ -605,7 +605,7 @@ function _default(topoApp) {
                     conditions = '';
                   }
 
-                  _rlog["default"].debug('updateDelId', conditions);
+                  _componentTopologyUtils.rlog.debug('updateDelId', conditions);
 
                 case 2:
                 case "end":
@@ -630,7 +630,7 @@ function _default(topoApp) {
                 case 4:
                   topoPermission = _context11.sent;
 
-                  _rlog["default"].debug('查询拓扑权限', topoPermission);
+                  _componentTopologyUtils.rlog.debug('查询拓扑权限', topoPermission);
 
                   _context11.next = 11;
                   break;
@@ -639,7 +639,7 @@ function _default(topoApp) {
                   _context11.prev = 8;
                   _context11.t0 = _context11["catch"](1);
 
-                  _rlog["default"].error("\u67E5\u8BE2\u62D3\u6251" + id + "\u7684\u6743\u9650\u5931\u8D25", _context11.t0); // 尚未区分拓扑图不存在还是接口请求报错
+                  _componentTopologyUtils.rlog.error("\u67E5\u8BE2\u62D3\u6251" + id + "\u7684\u6743\u9650\u5931\u8D25", _context11.t0); // 尚未区分拓扑图不存在还是接口请求报错
 
 
                 case 11:

package/lib/core/store/models/viewer/lock.js

@@ -7,7 +7,7 @@ exports["default"] = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 /**
  * 锁定

package/lib/core/store/models/viewer/resourceDetail.js

@@ -7,7 +7,7 @@ exports["default"] = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 /**
  * 资源概览