@riil-frontend/component-topology 12.0.0-dev.7 → 12.0.0-dev.9

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/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/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/components/ResourceOverview/EventsCard.js

@@ -20,32 +20,31 @@ function EventsCard(props) {
       onHandleAlarm = props.onHandleAlarm; // 告警table列配置
 
   var columns = [{
-    title: '描述',
-    dataIndex: 'title',
-    key: 'title',
+    title: "描述",
+    dataIndex: "title",
+    key: "title",
     cell: function cell(value, index, record) {
       return /*#__PURE__*/React.createElement("div", {
-        className: styles['alarm-title'],
+        className: styles["alarm-title"],
         title: value,
         onClick: closeDetailDrawer
       }, /*#__PURE__*/React.createElement(_Icon, {
         type: record.icon,
         size: "xs",
-        className: styles['alarm-color-icon'] + " " + record.className
-      }), /*#__PURE__*/React.createElement("a", {
-        className: styles.link,
-        href: formatUrl(record.link)
+        className: styles["alarm-color-icon"] + " " + record.className
+      }), /*#__PURE__*/React.createElement(Link, {
+        to: formatUrl(record.link)
       }, value));
     }
   }, {
-    title: '时间',
-    dataIndex: 'time',
-    key: 'time',
+    title: "时间",
+    dataIndex: "time",
+    key: "time",
     width: 144,
     cell: function cell(value, index, record) {
       return /*#__PURE__*/React.createElement("div", {
-        title: moment(value).format('YYYY-MM-DD HH:mm:ss')
-      }, moment(value).format('YYYY-MM-DD HH:mm:ss'));
+        title: moment(value).format("YYYY-MM-DD HH:mm:ss")
+      }, moment(value).format("YYYY-MM-DD HH:mm:ss"));
     }
   } // 临时屏蔽告警操作列，后续版本按权限显示 2023-3-6 20:23:45
   // {

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

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import React, { useEffect, useState } from 'react';
 import { useRequest } from 'ahooks';
 import { queryLinkInterfacesLatestMetrics, queryLinkLatestMetrics, queryRetansRatioNetDelayRatio } from "../services";
-import rlog from '@riil-frontend/component-topology-utils/es/rlog'; // 资源节点上方色块展示资源的发送速率发送带宽利用率、接收速率发送接收利用率、总错包数
+import { rlog } from '@riil-frontend/component-topology-utils'; // 资源节点上方色块展示资源的发送速率发送带宽利用率、接收速率发送接收利用率、总错包数
 
 export default function useMetricPolling(_ref) {
   var linkCi = _ref.linkCi,

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

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { request } 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 ciTypeCache from "../../../../../../../../../models/cache/CiTypeCache";
 import { INTERFACE_METRIC_CODES } from "../constants";
 import { formatMetric } from "../../../../../../../../../utils/metricUtil";

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

@@ -34,7 +34,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!isAppTopo) {
-              _context.next = 9;
+              _context.next = 10;
               break;
             }
 
@@ -49,27 +49,29 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
             alarmList = _yield$resourceOvervi2.alarms;
             alarmList = ((_alarmList = alarmList) === null || _alarmList === void 0 ? void 0 : _alarmList.map(function (item) {
               return {
-                type: 'alarm',
-                icon: 'gaojing-3',
+                alarmInfo: item,
+                type: "alarm",
+                icon: "gaojing-3",
                 className: "alarm-color-icon-lv" + item.alertLevel,
                 title: "[" + item.alertObject + "] " + item.alertTitle,
-                link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
+                link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + encodeURI(encodeURI(item.alertObject)) + "&ruleId=" + item.ruleId,
                 time: item.createTime,
                 status: item.status,
                 params: [{
                   alertId: item.alertId,
-                  status: 'dealing',
+                  status: "dealing",
                   userId: userId,
                   isBaseAlert: false
                 }]
               };
             })) || [];
+            console.log("setAlarmRiskList", alarmList);
             setAlarmRiskList(alarmList);
-            _context.next = 24;
+            _context.next = 25;
             break;
 
-          case 9:
-            _context.next = 11;
+          case 10:
+            _context.next = 12;
             return alarmService.getAlarmByIds([id].concat(childrenIds), {
               alertStatusList: ['toDeal', 'woDealing', 'dealing'],
               // toDeal: 待处理, dealing：处理中
@@ -79,7 +81,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
               sortOrder: 'asc'
             });
 
-          case 11:
+          case 12:
             _yield$alarmService$g2 = _context.sent;
             _alarmList2 = _yield$alarmService$g2.datas;
             // 2022-07-16 后端不支持多列排序，暂通过前端实现,按创建时间倒序
@@ -88,28 +90,28 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
             });
             _alarmList2 = _alarmList2.map(function (item) {
               return {
-                type: 'alarm',
-                icon: 'gaojing-3',
+                type: "alarm",
+                icon: "gaojing-3",
                 className: "alarm-color-icon-lv" + item.alertLevel,
                 title: "" + item.alertObject + item.alertTitle,
-                link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
+                link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + encodeURI(encodeURI(item.alertObject)) + "&ruleId=" + item.ruleId,
                 time: item.createTime,
                 status: item.status,
                 params: [{
                   alertId: item.alertId,
-                  status: 'dealing',
+                  status: "dealing",
                   userId: userId,
                   isBaseAlert: false
                 }]
               };
             }); // fix NEWITOM-33635【南昌大学】网络拓扑上双击设备拉开的抽屉中无法看到风险
 
-            _context.next = 17;
+            _context.next = 18;
             return service.queryAllComponentsByCiId(id);
 
-          case 17:
+          case 18:
             AllComponentsByCiId = _context.sent;
-            _context.next = 20;
+            _context.next = 21;
             return service.getRiskByIds({
               ciIdList: [id].concat(childrenIds, AllComponentsByCiId.map(function (item) {
                 return item.id;
@@ -119,7 +121,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
               pageSize: 10000
             });
 
-          case 20:
+          case 21:
             _yield$service$getRis2 = _context.sent;
             riskList = _yield$service$getRis2.content;
             riskList = riskList.map(function (item) {
@@ -135,7 +137,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
 
             setAlarmRiskList([].concat(_alarmList2, riskList));
 
-          case 24:
+          case 25:
           case "end":
             return _context.stop();
         }

package/es/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/hooks/useWebConsole.js

@@ -3,7 +3,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useRequest } from 'ahooks';
 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 { useEffect, useState } from 'react';
 
 function queryWebConsoleUrlById(_x) {

package/es/networkTopo/components/Link/index.js

@@ -4,7 +4,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useState } from 'react';
 import { useBoolean } from 'ahooks';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { TopoEvent } from '@riil-frontend/component-topology-graph';
 import styles from "./index.module.scss";
 import LinkSetting from "./setting";

package/es/networkTopo/hooks/viewer/useRelateTopo.js

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { TopoEvent } from '@riil-frontend/component-topology-graph';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { loopTreeFun } from "../../../utils/tree";
 /**
  * 关联拓扑

package/es/networkTopo/models/LinkDynamicStyleExecutor.js

@@ -1,4 +1,4 @@
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { isClusterHtElement } from "../../utils/clusterUtil";
 import { getEdgeGroupByNodeTags, getEdges, isNode } from "../../utils/htElementUtils";
 import { getLinksBetweenNodes } from "../utils/linkUtil"; // network_link.actual_bandwidth

package/es/networkTopo/models/LinkTagsTipsBuilder.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';
 import { getEdgeGroups } from "../../utils/htElementUtils";
 import AttributeFormatter from "../../core/models/attributeFormatter"; // 参与计算的链路指标
 

package/es/networkTopo/models/TopoCenter.js

@@ -3,7 +3,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 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 TopoApp from "../../core/models/TopoApp";
 import createMenuCommands from "../../contextmenu/createMenuCommands";
 import getTopoData from "../getTopoData";

package/es/networkTopo/services/model.js

@@ -3,7 +3,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { request } from '@riil-frontend/component-topology-utils';
 import { isNull } from '@riil-frontend/utils';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { DICT } from "../utils/storage";
 import { modelDictList } from "./mdc";
 /**

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

@@ -4,7 +4,7 @@ import _extends from "@babel/runtime/helpers/extends";
 var _excluded = ["groups", "resources", "exportLinkIdList"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { request } 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 blackList from "./blacklist";
 import { TOPO_API_ROOT } from "./constants";
 import { getBatchCi as _getBatchCi, getBatchCiMetric as _getBatchCiMetric } from "../model";

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

@@ -1,6 +1,6 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 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 { request } from '@riil-frontend/component-topology-utils';
 import { TOPO_API_ROOT } from "./constants";
 export default {

package/es/networkTopo/store/functionAuth.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 function (topo) {
   return {
     // 定义 model 的初始 state

package/es/networkTopo/store/topoCenter.js

@@ -7,7 +7,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';
 export default {
   // 定义 model 的初始 state
   state: {

package/es/networkTopo/store/topoTreeMod.js

@@ -2,7 +2,7 @@ import _Message from "@alifd/next/es/message";
 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 { formatTree, loopTree, loopTreeFun, findParentIdsById, treeNodeCount } from "../../utils/tree";
 
 var clone = function clone(data) {

package/es/networkTopo/utils/exportData.js

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { request } 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 { findClusters, isCluster } from "../../utils/clusterUtil";
 export default function (_x) {
   return _ref.apply(this, arguments);

package/es/style.js

@@ -1,7 +1,7 @@
 import '@riil-frontend/component-topology-graph/es/style';
 import '@alifd/next/es/box/style';
-import '@alifd/next/es/message/style';
 import '@riil-frontend/component-topology-utils/es/style';
+import '@alifd/next/es/message/style';
 import '@riil-frontend/component-riil-event-emitter/es/style';
 import '@riil-frontend/utils/es/style';
 import '@alifd/next/es/menu-button/style';

package/es/utils/ResourceConfigUtil.js

@@ -1,4 +1,4 @@
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import sortBy from 'lodash/sortBy';
 import { isExitLink } from "../core/models/utils/linkUtils";
 import { isClusterHtElement } from "./clusterUtil";

package/es/utils/ciRefAttributeTranslateUtil.d.ts

@@ -0,0 +1,12 @@
+/**
+ * 翻译ci列表引用属性名称
+ * @param ciDatas
+ * @returns
+ */
+export declare function translateCisRefAttributeName(ciDatas: Array<any>): Promise<Array<any>>;
+/**
+ * 翻译ci引用属性名称
+ * @param ciData
+ * @returns
+ */
+export declare function translateCiRefAttributeName(ciData: any): Promise<any>;

package/es/utils/ciRefAttributeTranslateUtil.js

@@ -0,0 +1,156 @@
+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';
+import ciTypeCache from "../core/models/cache/CiTypeCache";
+import ciCache from "../core/models/cache/CiCache";
+import { getCiTypesFromCiElements } from "./topoData";
+
+/**
+ * 获取ci列表的引用字段列表
+ */
+function getCiRefAttributesMap(ciDatas, ciTypeMap) {
+  // ci引用字段列表
+  var ciRefAttributeMap = {};
+  ciDatas.forEach(function (ciData) {
+    var id = ciData.id;
+    var attributeMap = ciData.attributeMap || ciData.attributes;
+    ciRefAttributeMap[id] = [];
+    var typeCode = ciData.typeCode || ciData.ciType;
+    var ciTypeMeta = ciTypeMap[typeCode];
+
+    if (ciTypeMeta) {
+      ciTypeMeta.attributes.filter(function (attributeMeta) {
+        return !!attributeMeta.refCi;
+      }).forEach(function (attributeMeta) {
+        var refId = attributeMap[attributeMeta.code];
+
+        if (refId) {
+          var ciRefAttributeData = {
+            attrCode: attributeMeta.code,
+            id: refId
+          };
+          ciRefAttributeMap[ciData.id].push(ciRefAttributeData);
+        }
+      });
+    } else {
+      rlog.warn("\u7FFB\u8BD1\u5F15\u7528\u5B57\u6BB5\u540D\u79F0\uFF1A\u672A\u67E5\u8BE2\u5230ciType " + typeCode, ciData);
+    }
+  });
+  return ciRefAttributeMap;
+}
+
+function getRefIds(ciRefAttributesMap) {
+  var refIds = [];
+  Object.keys(ciRefAttributesMap).forEach(function (ciId) {
+    var ciRefAttributeDatas = ciRefAttributesMap[ciId];
+    ciRefAttributeDatas.forEach(function (ciRefAttributeData) {
+      var refId = ciRefAttributeData.id;
+
+      if (!refIds.includes(refId)) {
+        refIds.push(refId);
+      }
+    });
+  });
+  return refIds;
+}
+
+function addRefCiNameToCiDatas(ciDatas, ciRefAttributesMap, refCiMap) {
+  return ciDatas.map(function (ciData) {
+    var id = ciData.id;
+
+    var attributeMap = _extends({}, ciData.attributeMap || ciData.attributes);
+
+    ciRefAttributesMap[id].forEach(function (refAttrs) {
+      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: displayName
+        };
+      }
+    });
+    return _extends({}, ciData, {
+      attributeMap: attributeMap
+    });
+  });
+}
+/**
+ * 翻译ci列表引用属性名称
+ * @param ciDatas 
+ * @returns 
+ */
+
+
+export function translateCisRefAttributeName(_x) {
+  return _translateCisRefAttributeName.apply(this, arguments);
+}
+/**
+ * 翻译ci引用属性名称
+ * @param ciData
+ * @returns 
+ */
+
+function _translateCisRefAttributeName() {
+  _translateCisRefAttributeName = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(ciDatas) {
+    var ciTypeMap, ciRefAttributesMap, refIds, refCiMap;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return ciTypeCache.load(getCiTypesFromCiElements(ciDatas));
+
+        case 2:
+          ciTypeMap = _context.sent;
+          // 2. 查找引用字段及值
+          ciRefAttributesMap = getCiRefAttributesMap(ciDatas, ciTypeMap); // 3. 引用id列表
+
+          refIds = getRefIds(ciRefAttributesMap);
+
+          if (refIds.length) {
+            _context.next = 7;
+            break;
+          }
+
+          return _context.abrupt("return", ciDatas);
+
+        case 7:
+          _context.next = 9;
+          return ciCache.load(refIds);
+
+        case 9:
+          refCiMap = _context.sent;
+          return _context.abrupt("return", addRefCiNameToCiDatas(ciDatas, ciRefAttributesMap, refCiMap));
+
+        case 11:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _translateCisRefAttributeName.apply(this, arguments);
+}
+
+export function translateCiRefAttributeName(_x2) {
+  return _translateCiRefAttributeName.apply(this, arguments);
+}
+
+function _translateCiRefAttributeName() {
+  _translateCiRefAttributeName = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(ciData) {
+    var result;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          result = translateCisRefAttributeName([]);
+          return _context2.abrupt("return", result[0]);
+
+        case 2:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _translateCiRefAttributeName.apply(this, arguments);
+}

package/es/utils/format.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 { isAvailableArray, isNull } from '@riil-frontend/utils';
 export function formatDataForTable(dataSource, total, currentPage, pageSize) {
   // 权限过滤 (无权限时：ip地址，类型，厂家为'未知')

package/es/utils/topoData.js

@@ -97,8 +97,10 @@ var tfLink = function tfLink(engine, link) {
 export function getCiTypesFromCiElements(allCi) {
   var ciTypes = [];
   allCi.forEach(function (element) {
-    if (element.ciType && ciTypes.indexOf(element.ciType) < 0) {
-      ciTypes.push(element.ciType);
+    var typeCode = element.typeCode || element.ciType;
+
+    if (typeCode && ciTypes.indexOf(typeCode) < 0) {
+      ciTypes.push(typeCode);
     }
   });
   return ciTypes;

package/lib/components/BatchAttrMetric/setting.js

@@ -21,7 +21,7 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _componentActionTree = _interopRequireDefault(require("@riil-frontend/component-action-tree"));
 
@@ -112,7 +112,7 @@ var Setting = function Setting(_ref) {
   var onTableSelect = function onTableSelect(selectedKeys) {
     var values = (0, _extends2["default"])({}, selected);
 
-    _rlog["default"].debug('Setting-allCiSet-onTableSelect', limit, selectedKeys, selected);
+    _componentTopologyUtils.rlog.debug('Setting-allCiSet-onTableSelect', limit, selectedKeys, selected);
 
     values[ciType] = selectedKeys;
     setSelected(values);

package/lib/components/ModelAttrSelectDrawer/components/MultipleTypeAttributeSelectDrawer.js

@@ -7,7 +7,7 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _ModelAttrSelectDrawer = _interopRequireDefault(require("./ModelAttrSelectDrawer"));
 
@@ -62,7 +62,7 @@ var MultipleTypeAttributeSelectDrawer = /*#__PURE__*/(0, _react.forwardRef)(func
   }); // 保存指标设置
 
   var save = function save(xx, parm) {
-    _rlog["default"].debug('saveMarkSetting', parm);
+    _componentTopologyUtils.rlog.debug('saveMarkSetting', parm);
 
     var newSelected = {};
     Object.keys(parm).forEach(function (ciType) {

package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js

@@ -13,7 +13,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/lib/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _Drawer = _interopRequireDefault(require("../Drawer"));
 
@@ -83,7 +83,7 @@ function ResourceSelectDrawer(props) {
             _context.t0 = _context["catch"](1);
             setLoading(false);
 
-            _rlog["default"].error('ResourceSelectDrawer.handleOk', _context.t0);
+            _componentTopologyUtils.rlog.error('ResourceSelectDrawer.handleOk', _context.t0);
 
           case 13:
           case "end":