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

package/es/core/hooks/useTopoEdit.js

@@ -15,7 +15,7 @@ import useGroupAddResource from "./useGroupAddResource";
 import { findGroupChildren } from "../../utils/topoData";
 import { isResourceElement } from "../../utils/htElementDataUtil";
 import { isClusterHtElement, isClusterMemberHtElement } from "../../utils/clusterUtil";
-import { mergeExportLinkData } from "../models/utils/linkUtils";
+import { isExitLink, mergeExportLinkData } from "../models/utils/linkUtils";
 import { isUniqueIp, buildIpNode } from "../../networkTopo/utils/exitLinkUtil";
 
 var useTopoEdit = function useTopoEdit(params) {
@@ -349,33 +349,26 @@ var useTopoEdit = function useTopoEdit(params) {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(node) {
       var _node$getEdges$toArra, _node$getEdges;
 
-      var config, edges, exportLinkIdList;
+      var edges;
       return _regeneratorRuntime.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 && 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();
         }
@@ -554,7 +547,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _bindViewResources() {
     _bindViewResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12(data) {
-      var config, _yield$editDispatcher3, elements;
+      var config, result, _elements;
 
       return _regeneratorRuntime.wrap(function _callee12$(_context12) {
         while (1) switch (_context12.prev = _context12.next) {
@@ -570,15 +563,19 @@ var useTopoEdit = function useTopoEdit(params) {
             return editDispatchers.fetchDataByConfig();
 
           case 6:
-            _yield$editDispatcher3 = _context12.sent;
-            elements = _yield$editDispatcher3.elements;
-            saveBind(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(TopoEvent.DATA_TYPE_RESOURCE_COMBO, _elements); // 临时放这里，仅拓扑中心有
+
+              if (topo.linkDynamicStyleExecutor) {
+                topo.linkDynamicStyleExecutor.execute();
+              }
             }
 
-          case 10:
+          case 9:
           case "end":
             return _context12.stop();
         }
@@ -593,7 +590,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _addLayerResources() {
     _addLayerResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(group, newResourceIds) {
-      var _yield$editDispatcher4, elements, newElements;
+      var _yield$editDispatcher3, elements, newElements;
 
       return _regeneratorRuntime.wrap(function _callee13$(_context13) {
         while (1) switch (_context13.prev = _context13.next) {
@@ -608,8 +605,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);
             rlog.debug("添加分层资源", {
@@ -827,7 +824,9 @@ var useTopoEdit = function useTopoEdit(params) {
                 return _regeneratorRuntime.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;
@@ -888,22 +887,13 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
                       sm = htTopo.getGraphView().sm();
-                      sm.setSelection([newElement]); // 移除旧节点
-
-                      dm.remove(node); // saveBind(TopoEvent.DATA_TYPE_RESOURCE_SINGLE, newDatas);
-                      // node.a("customName", null);
-                      // 删除关联在节点上的出口链路
-
-                      _context8.next = 12;
-                      return deleteExLink(node);
+                      sm.setSelection([newElement]); // 临时放这里，仅拓扑中心有
 
-                    case 12:
-                      // 临时放这里，仅拓扑中心有
                       if (topo.linkDynamicStyleExecutor) {
                         topo.linkDynamicStyleExecutor.execute();
                       }
 
-                    case 13:
+                    case 11:
                     case "end":
                       return _context8.stop();
                   }
@@ -1001,7 +991,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _relateNodeIp() {
     _relateNodeIp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.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 _regeneratorRuntime.wrap(function _callee15$(_context15) {
         while (1) switch (_context15.prev = _context15.next) {
@@ -1023,16 +1013,16 @@ var useTopoEdit = function useTopoEdit(params) {
             isUnique = isUniqueIp(dm, txtValue, nodeElement); // 获取关联链路
 
             if (!isUnique) {
-              _context15.next = 23;
+              _context15.next = 24;
               break;
             }
 
-            ip = buildIpNode(txtValue);
+            ipNodeData = buildIpNode(txtValue);
             _context15.next = 8;
             return deleteExLink(nodeElement);
 
           case 8:
-            nodeElement.a(ip);
+            nodeElement.a(ipNodeData);
             nodeElement.setName(txtValue);
             nodeElement.setTag("ip:" + txtValue); // 获取配置
 
@@ -1047,8 +1037,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";
@@ -1063,15 +1053,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();
         }

package/es/core/models/Alarm.js

@@ -2,7 +2,7 @@ import _Dialog from "@alifd/next/es/dialog";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 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/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { isAvailableArray } from '@riil-frontend/utils';
 
 var Alarm = /*#__PURE__*/function () {

package/es/core/models/AttributeMetricDisplay.js

@@ -1,12 +1,13 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { DEFAULT_NODE_TAG_COMMON_CONFIG, DEFAULT_TIP_COMMON_CONFIG } from "../../constants/ResourceInfoDisplay";
 import { isMonitoring } from "../utils/manageStatusUtil";
 import AttributeFormatter from "./attributeFormatter";
 import DictCache from "./cache/DictCache";
 import { getNodesNameVisible as _getNodesNameVisible, updateNodesNameVisible as _updateNodesNameVisible } from "./utils/nodeNameVisibleUtil";
+import { translateCisRefAttributeName } from "../../utils/ciRefAttributeTranslateUtil";
 
 function isGraphField(item) {
   return item.type === 'graph';
@@ -331,7 +332,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
             }); // 翻译引用属性
 
             _context.next = 4;
-            return this.translateRefAttribute(ciDatas);
+            return translateCisRefAttributeName(ciDatas);
 
           case 4:
             ciDatas = _context.sent;
@@ -461,8 +462,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/es/core/models/HistoryManager.js

@@ -1,5 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 var ht = window.ht;
 
 var HistoryManager = /*#__PURE__*/function () {

package/es/core/models/SelectionModel.js

@@ -1,5 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import useHtElements from "../common/hooks/useHtElements";
 import ignoreList from "./selection/ignoreList";
 

package/es/core/models/TopoApp.js

@@ -2,7 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { setRequest } from '@riil-frontend/component-topology-utils';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { cloneDeep } from 'lodash';
 import topoService from "../services/topo";
 import CiTypeCache from "./cache/CiTypeCache";
@@ -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 "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);
 /**
  * 拓扑显示和编辑

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

@@ -13,11 +13,6 @@ export default 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/es/core/models/attributeFormatter/formatter/graphTransform.js

@@ -1,4 +1,4 @@
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 export default function graphTransform(options) {
   var item = options.item,
       ciData = options.ciData,

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

@@ -1,4 +1,4 @@
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import attributeTransform from "./formatter/attributeTransform";
 import metricTransform from "./formatter/metricTransform";
 import ciTypeAttrTransform from "./formatter/ciTypeAttrTransform";

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

@@ -3,7 +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 { rlog } from '@riil-frontend/component-topology-utils';
 import keyBy from 'lodash/keyBy';
 /**
  * Ci类型属性、指标缓存
@@ -106,6 +106,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/es/core/models/cache/DictCache.js

@@ -2,7 +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';
+import { rlog } from '@riil-frontend/component-topology-utils';
 /**
  * 数据字典缓存
  */

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

@@ -2,7 +2,7 @@ import _Message from "@alifd/next/es/message";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 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/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 export default function (topo) {
   var resourceUrlMap = {};
   var currentId = null;

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

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import keyBy from 'lodash/keyBy';
-import rlog from '@riil-frontend/component-topology-utils/lib/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { getLinkMtCodes, getMtCodeCiTypeMap, getNodeMtCodes } from "./utils";
 import { getMetricsByMonitorTemplateCodes } from "../../services/topo/tagtip";
 /**

package/es/core/models/topoData.js

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

package/es/core/services/alarm.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 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/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 export default {
   /**
    * 查询告警列表，包含主资源和子组件告警

package/es/core/services/index.js

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

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

@@ -104,7 +104,7 @@ export default {
   * @param {Array} groups
   * @returns
   */
-  getTopoDataByResource: function getTopoDataByResource(id, resources, groups, exportLinkIdList) {
+  getTopoDataByResource: function getTopoDataByResource(id, resources, groups) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var data, obj;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -123,7 +123,7 @@ export default {
             obj = prepareGroupParams(data);
             _context.next = 5;
             return request.post(API_ROOT + "/structure/byCondition/" + id, _extends({}, obj, {
-              exportLinkIdList: exportLinkIdList
+              exportLinkIdList: []
             }));
 
           case 5:

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

@@ -7,7 +7,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /**
  * 图标管理 Model
  */
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import topoService from '@riil-frontend/component-topology-common/es/services/topo';
 import { iconFactory } from '@riil-frontend/component-topology-graph';
 import { getCustomIconHtId, getCustomIconIdFromHtId, getEditorIcons, transformCustomIcon2HtIcon, transformCustomIcons2HtIcons } from "../../common/icons/icon";

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

@@ -6,7 +6,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  * 动态设置链路样式 Model
  */
 // import _ from 'lodash';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 export default function (topo) {
   return {
     // 定义 model 的初始 state

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

@@ -5,7 +5,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /**
  * 拓扑图 Model
  */
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 export default {
   // 定义 model 的初始 state
   state: {

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

@@ -5,7 +5,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /**
  * 拓扑图 基本信息-概览
  */
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import topoService from '@riil-frontend/component-topology-common/es/services/topo';
 export default {
   // 定义 model 的初始 state

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

@@ -2,7 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import topoServer from '@riil-frontend/component-topology-common/es/services/topo';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 export default function (engine) {
   return {
     state: {

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

@@ -35,7 +35,6 @@ var initialState = {
     "static": []
   },
   groups: [],
-  exportLinkIdList: [],
   // config: {
   //   view: null,
   //   groups: [],
@@ -243,18 +242,17 @@ export default function (topoApp) {
           var _this2 = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-            var editState, resources, _editState$groups, groups, _editState$ipNodes, ipNodes, 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, _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);
@@ -303,13 +301,13 @@ export default function (topoApp) {
           var _this4 = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.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 _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, exportLinkIdList = params.exportLinkIdList, ipNodes = params.ipNodes;
+                  topoId = params.id, resources = params.resources, groups = params.groups;
                   viewConditions = resToConditions(resources);
                   groupInfo = isAvailableArray(groups) && groups.map(function (group) {
                     return _extends({}, group, {
@@ -319,7 +317,7 @@ export default function (topoApp) {
                   });
                   rlog.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;
@@ -458,8 +456,7 @@ export default function (topoApp) {
             return _regeneratorRuntime.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 networkLinkServer.queryLinksByIp(ids, ip);
 

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

@@ -5,7 +5,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /**
  * 拓扑图 Model
  */
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import topoService from '@riil-frontend/component-topology-common/es/services/topo';
 export default {
   // 定义 model 的初始 state

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

@@ -3,7 +3,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import moment from 'moment';
 import topoService from '@riil-frontend/component-topology-common/es/services/topo';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { combTopoData, getCiTypes, parseTopoData } from "../../../utils/topoData";
 import { loopTreeByKey } from "../../../utils/tree";
 import topoPermissonUtil from "../../../utils/topoPermissionUtil";

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

@@ -3,7 +3,7 @@ import _extends from "@babel/runtime/helpers/extends";
 /**
  * 锁定
  */
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 export default {
   // 定义 model 的初始 state
   state: {

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

@@ -3,7 +3,7 @@ import _extends from "@babel/runtime/helpers/extends";
 /**
  * 资源概览
  */
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 export default {
   // 定义 model 的初始 state
   state: {

package/es/core/store/models/viewer/resourceWebControllUrlSetting.js

@@ -3,7 +3,7 @@ import _extends from "@babel/runtime/helpers/extends";
 /**
  * 资源web控制台url配置 Model
  */
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import topoService from '@riil-frontend/component-topology-common/es/services/topo';
 export default {
   // 定义 model 的初始 state

package/es/core/utils/edgeUtil.js

@@ -36,7 +36,8 @@ export var updateEdgeExpanded = function updateEdgeExpanded(topo) {
     htTopo.expandAllEdgeGroups();
     showLinkByConfig({
       topo: topo,
-      showType: isEditMode ? 4 : expandAllEdges
+      showType: expandAllEdges,
+      isEditMode: isEditMode
     });
     rlog.debug("updateEdgeExpanded 展开-isEditMode", isEditMode);
   }

package/es/core/utils/metricUtil.js

@@ -13,6 +13,13 @@ export function formatMetric(val, metricModel) {
   }
 
   if (metricModel) {
+    var _result$value;
+
+    // 分级字典特殊处理
+    if (metricModel.dict && !DictCache.getDictObject()[metricModel.code]) {
+      val = metricModel.dict[val];
+    }
+
     var result = metricValueFormat({
       value: val,
       dataType: metricModel.dataType,
@@ -21,7 +28,7 @@ export function formatMetric(val, metricModel) {
       unit: metricModel.unit,
       code: metricModel.code
     });
-    return result.value + " " + (result.value === '-' ? '' : result.unit);
+    return ((_result$value = result.value) !== null && _result$value !== void 0 ? _result$value : '') + " " + (result.value === '-' ? '' : result.unit);
   } else {
     return "" + val;
   }

package/es/core/utils/showMessage.js

@@ -1,5 +1,5 @@
 import _Message from "@alifd/next/es/message";
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 var MSG_TYPES = {
   info: 'notice',
   success: 'success',

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

@@ -46,6 +46,7 @@ export default function ResourceDetail(props) {
 
   if (tabBodys.length === 1) {
     return /*#__PURE__*/React.createElement(ResourceOverview, _extends({}, props, activeData, {
+      resourceDetailProps: viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.resourceDetailProps,
       userId: userId,
       style: {
         overflowY: 'auto',