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

package/es/core/hooks/useTopoEdit.js

@@ -554,7 +554,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 +570,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 +597,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 +612,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("添加分层资源", {
@@ -1001,7 +1005,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, ip, configObj, configData, _elements2, newLinkElements, newLink, newLinkGroup, createElementsData, _htTopo;
 
       return _regeneratorRuntime.wrap(function _callee15$(_context15) {
         while (1) switch (_context15.prev = _context15.next) {
@@ -1023,7 +1027,7 @@ var useTopoEdit = function useTopoEdit(params) {
             isUnique = isUniqueIp(dm, txtValue, nodeElement); // 获取关联链路
 
             if (!isUnique) {
-              _context15.next = 23;
+              _context15.next = 24;
               break;
             }
 
@@ -1047,8 +1051,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,7 +1067,8 @@ 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();
@@ -1071,7 +1076,7 @@ var useTopoEdit = function useTopoEdit(params) {
               _htTopo.createElements(createElementsData);
             }
 
-          case 23:
+          case 24:
           case "end":
             return _context15.stop();
         }

package/es/core/models/AttributeMetricDisplay.js

@@ -7,6 +7,7 @@ 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/TopoApp.js

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

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

@@ -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/services/index.js

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

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/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/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/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/core/hooks/useTopoEdit.js

@@ -591,7 +591,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _bindViewResources() {
     _bindViewResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12(data) {
-      var config, _yield$editDispatcher3, elements;
+      var config, result, _elements;
 
       return _regenerator["default"].wrap(function _callee12$(_context12) {
         while (1) switch (_context12.prev = _context12.next) {
@@ -607,15 +607,19 @@ var useTopoEdit = function useTopoEdit(params) {
             return editDispatchers.fetchDataByConfig();
 
           case 6:
-            _yield$editDispatcher3 = _context12.sent;
-            elements = _yield$editDispatcher3.elements;
-            saveBind(_componentTopologyGraph.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(_componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_COMBO, _elements); // 临时放这里，仅拓扑中心有
+
+              if (topo.linkDynamicStyleExecutor) {
+                topo.linkDynamicStyleExecutor.execute();
+              }
             }
 
-          case 10:
+          case 9:
           case "end":
             return _context12.stop();
         }
@@ -630,7 +634,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _addLayerResources() {
     _addLayerResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13(group, newResourceIds) {
-      var _yield$editDispatcher4, elements, newElements;
+      var _yield$editDispatcher3, elements, newElements;
 
       return _regenerator["default"].wrap(function _callee13$(_context13) {
         while (1) switch (_context13.prev = _context13.next) {
@@ -645,8 +649,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);
 
@@ -1047,7 +1051,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _relateNodeIp() {
     _relateNodeIp = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee15(txtValue, nodeElement) {
-      var dm, isUnique, ip, configObj, configData, _elements, newLinkElements, newLink, newLinkGroup, createElementsData, _htTopo;
+      var dm, isUnique, ip, configObj, configData, _elements2, newLinkElements, newLink, newLinkGroup, createElementsData, _htTopo;
 
       return _regenerator["default"].wrap(function _callee15$(_context15) {
         while (1) switch (_context15.prev = _context15.next) {
@@ -1069,7 +1073,7 @@ var useTopoEdit = function useTopoEdit(params) {
             isUnique = (0, _exitLinkUtil.isUniqueIp)(dm, txtValue, nodeElement); // 获取关联链路
 
             if (!isUnique) {
-              _context15.next = 23;
+              _context15.next = 24;
               break;
             }
 
@@ -1093,8 +1097,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";
@@ -1109,7 +1113,8 @@ 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();
@@ -1117,7 +1122,7 @@ var useTopoEdit = function useTopoEdit(params) {
               _htTopo.createElements(createElementsData);
             }
 
-          case 23:
+          case 24:
           case "end":
             return _context15.stop();
         }

package/lib/core/models/AttributeMetricDisplay.js

@@ -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;
@@ -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/TopoApp.js

@@ -54,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.8" === 'string' ? "12.0.0-dev.8" : null;
+var version = typeof "12.0.0-dev.9" === 'string' ? "12.0.0-dev.9" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -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/services/index.js

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