@riil-frontend/component-topology 12.0.0-dev.2 → 12.0.0-dev.21

package/lib/networkTopo/utils/exportData.js

@@ -11,8 +11,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
-
 var _clusterUtil = require("../../utils/clusterUtil");
 
 function _default(_x) {
@@ -57,7 +55,7 @@ function _ref() {
             })
           };
 
-          _rlog["default"].error('导出数据', params);
+          _componentTopologyUtils.rlog.error('导出数据', params);
 
           _context.next = 6;
           return _componentTopologyUtils.request.post('/topo/v1/api/structure/excel', params, {

package/lib/style.js

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

package/lib/utils/ResourceConfigUtil.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 _sortBy = _interopRequireDefault(require("lodash/sortBy"));
 
@@ -53,12 +53,6 @@ function getResourceConfigFromHt(topo) {
     layers: (0, _sortBy["default"])(layers, 'order'),
     groups: groups,
     resources: resources,
-    exportLinkIdList: getExportLinkIdList({
-      topo: topo,
-      htTopo: htTopo,
-      dataModel: dataModel
-    }),
-    // 出口链路id列表
     relateTopoIdList: getRelateTopoIdList(dataModel)
   };
 } // 查询关联拓扑id列表
@@ -75,35 +69,6 @@ function getRelateTopoIdList(dataModel) {
 
     return topoIds;
   }, []);
-} // 查询出口链路列表
-
-
-function getExportLinkIdList(_ref) {
-  var topo = _ref.topo,
-      htTopo = _ref.htTopo,
-      dataModel = _ref.dataModel;
-  var exportLinkIdList = [];
-  var edges = (0, _htElementUtils.getEdges)(dataModel);
-
-  _rlog["default"].debug(' 查询出口链路列表-edges', edges, dataModel);
-
-  edges.forEach(function (edge) {
-    var edgeData = htTopo.getEdgeData(edge); // 有组无子连线返回null
-
-    if (edgeData) {
-      // eslint-disable-next-line no-underscore-dangle
-      var id = edgeData._attrObject.id;
-
-      if (id) {
-        var linkData = topo.dataModel.getDataById(id);
-
-        if ((0, _linkUtils.isExitLink)(linkData) && !exportLinkIdList.includes(id)) {
-          exportLinkIdList.push(id);
-        }
-      }
-    }
-  });
-  return exportLinkIdList;
 }
 
 function getLayerDatas(dataModel) {
@@ -127,9 +92,9 @@ function getLayerDatas(dataModel) {
   return layers;
 }
 
-function getGroupDatas(_ref2) {
-  var groupElements = _ref2.groupElements,
-      layers = _ref2.layers;
+function getGroupDatas(_ref) {
+  var groupElements = _ref.groupElements,
+      layers = _ref.layers;
   // 获得视图上的区域配置
   var groups = groupElements.filter(function (node) {
     return !node.getParent();

package/lib/utils/ciRefAttributeTranslateUtil.d.ts

@@ -0,0 +1,19 @@
+interface Options {
+    /**
+     * 是否属性缓存重新请求数据
+     */
+    refreshCiCache: boolean;
+}
+/**
+ * 翻译ci列表引用属性名称
+ * @param ciDatas
+ * @returns
+ */
+export declare function translateCisRefAttributeName(ciDatas: Array<any>, options?: Options): Promise<Array<any>>;
+/**
+ * 翻译ci引用属性名称
+ * @param ciData
+ * @returns
+ */
+export declare function translateCiRefAttributeName(ciData: any, options?: Options): Promise<any>;
+export {};

package/lib/utils/ciRefAttributeTranslateUtil.js

@@ -0,0 +1,168 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.translateCiRefAttributeName = translateCiRefAttributeName;
+exports.translateCisRefAttributeName = translateCisRefAttributeName;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
+
+var _CiTypeCache = _interopRequireDefault(require("../core/models/cache/CiTypeCache"));
+
+var _CiCache = _interopRequireDefault(require("../core/models/cache/CiCache"));
+
+var _topoData = require("./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 {
+      _componentTopologyUtils.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 = (0, _extends2["default"])({}, 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 (0, _extends2["default"])({}, ciData, {
+      attributeMap: attributeMap
+    });
+  });
+}
+
+/**
+ * 翻译ci列表引用属性名称
+ * @param ciDatas 
+ * @returns 
+ */
+function translateCisRefAttributeName(_x, _x2) {
+  return _translateCisRefAttributeName.apply(this, arguments);
+}
+/**
+ * 翻译ci引用属性名称
+ * @param ciData
+ * @returns 
+ */
+
+
+function _translateCisRefAttributeName() {
+  _translateCisRefAttributeName = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(ciDatas, options) {
+    var ciTypeMap, ciRefAttributesMap, refIds, refCiMap;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return _CiTypeCache["default"].load((0, _topoData.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["default"].load(refIds, options === null || options === void 0 ? void 0 : options.refreshCiCache);
+
+        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);
+}
+
+function translateCiRefAttributeName(_x3, _x4) {
+  return _translateCiRefAttributeName.apply(this, arguments);
+}
+
+function _translateCiRefAttributeName() {
+  _translateCiRefAttributeName = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(ciData, options) {
+    var result;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          result = translateCisRefAttributeName([ciData], options);
+          return _context2.abrupt("return", result[0]);
+
+        case 2:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _translateCiRefAttributeName.apply(this, arguments);
+}

package/lib/utils/format.js

@@ -15,7 +15,7 @@ exports.sortData = sortData;
 
 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 _utils = require("@riil-frontend/utils");
 

package/lib/utils/topoData.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "12.0.0-dev.2",
+  "version": "12.0.0-dev.21",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -64,7 +64,7 @@
     "@riil-frontend/component-action-tree": "^1.0.13",
     "@riil-frontend/component-common-res-list": "^1.0.26",
     "@riil-frontend/component-condition-res-list": "^1.0.18",
-    "@riil-frontend/component-crucial-link-topo": "0.1.0",
+    "@riil-frontend/component-crucial-link-topo": "*",
     "@riil-frontend/component-extra-title": "^1.0.3",
     "@riil-frontend/component-more-buttons-menu": "^2.0.1",
     "@riil-frontend/component-no-data-page": "^3.0.4",
@@ -80,7 +80,7 @@
     "@riil-frontend/css": "^2.0.2",
     "@riil-frontend/hooks": "latest",
     "@riil-frontend/next-collapse": "^1.0.1-a.0",
-    "@riil-frontend/utils": "^1.0.44",
+    "@riil-frontend/utils": "^1.0.45",
     "@types/jest": "^29.5.4",
     "axios": "^0.21.1",
     "build-plugin-component": "^1.12.1",
@@ -123,6 +123,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@12.0.0-dev.2/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@12.0.0-dev.21/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }