@riil-frontend/component-topology 2.15.2 → 2.15.5

package/lib/core/models/AttributeMetricDisplay.js

@@ -15,6 +15,8 @@ var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-co
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
+var _lodash = require("lodash");
+
 var _groupBy = _interopRequireDefault(require("lodash/groupBy"));
 
 var _ResourceInfoDisplay = require("../../constants/ResourceInfoDisplay");
@@ -23,6 +25,8 @@ var _htElementUtils = require("../../utils/htElementUtils");
 
 var _topoData = require("../../utils/topoData");
 
+var _services = require("../services");
+
 var _attributeFormatter = _interopRequireDefault(require("./attributeFormatter"));
 
 var _DictCache = _interopRequireDefault(require("./cache/DictCache"));
@@ -309,23 +313,27 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     }
 
     return visible;
-  }
-  /**
-   * 根据配置执行节点名称显示隐藏
-   */
-  ;
+  };
 
-  _proto.updateNodesNameVisible = function updateNodesNameVisible() {
+  _proto.getNodesNameVisible = function getNodesNameVisible() {
     var _this3 = this;
 
-    var dm = this.topo.getDataModel();
     var nodes = this.topo.store.getModelState('topoMod').data.nodes;
-    nodes.map(function (node) {
+    return nodes.map(function (node) {
       return {
         id: node.id,
         visible: _this3.getNodeNameVisible(node)
       };
-    }).forEach(function (_ref3) {
+    });
+  }
+  /**
+   * 根据配置执行节点名称显示隐藏
+   */
+  ;
+
+  _proto.updateNodesNameVisible = function updateNodesNameVisible() {
+    var dm = this.topo.getDataModel();
+    this.getNodesNameVisible().forEach(function (_ref3) {
       var id = _ref3.id,
           visible = _ref3.visible;
       dm.getDataByTag(id).a('isShowName', visible);
@@ -448,25 +456,37 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _loadAttributeAndMetric = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(data) {
-      var topo, bizDispatchers;
+      var topo, ciDatas, bizDispatchers;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
               // rlog.debug('AttributeMetricDisplay.loadAttributeAndMetric', data);
-              topo = this.topo;
-              bizDispatchers = topo.store.getModelDispatchers('topoBizMod');
+              topo = this.topo; // 设置ciType
+
+              ciDatas = data.map(function (item) {
+                return (0, _extends2["default"])({
+                  ciType: topo.dataModel.getDataById(item.id).ciType
+                }, item);
+              }); // 翻译引用属性
+
               _context2.next = 4;
-              return bizDispatchers.setAttrsAndMetrics(data);
+              return this.translateRefAttribute(ciDatas);
 
             case 4:
-              _context2.next = 6;
+              ciDatas = _context2.sent;
+              bizDispatchers = topo.store.getModelDispatchers('topoBizMod');
+              _context2.next = 8;
+              return bizDispatchers.setAttrsAndMetrics(ciDatas);
+
+            case 8:
+              _context2.next = 10;
               return _DictCache["default"].init();
 
-            case 6:
+            case 10:
               this.updateTagsTips();
 
-            case 7:
+            case 11:
             case "end":
               return _context2.stop();
           }
@@ -480,6 +500,95 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
     return loadAttributeAndMetric;
   }()
+  /**
+   * 临时由前端翻译引用属性名称
+   * @param {*} ciDatas 
+   * @returns 
+   */
+  ;
+
+  _proto.translateRefAttribute =
+  /*#__PURE__*/
+  function () {
+    var _translateRefAttribute = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(ciDatas) {
+      var _this5 = this;
+
+      var refIdMap, ciRefAttributeMap, refIds, refCis, refCiMap;
+      return _regenerator["default"].wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              // 查找引用字段及值
+              refIdMap = {};
+              ciRefAttributeMap = {};
+              ciDatas.forEach(function (ciData) {
+                var id = ciData.id,
+                    ciType = ciData.ciType,
+                    attributeMap = ciData.attributeMap;
+                ciRefAttributeMap[id] = [];
+
+                _this5.topo.ciTyeCache.getCiType(ciType).attributes.filter(function (attributeMeta) {
+                  return !!attributeMeta.refCi;
+                }).forEach(function (attributeMeta) {
+                  var refId = attributeMap[attributeMeta.code];
+
+                  if (refId && !refIdMap[refId]) {
+                    refIdMap[refId] = true;
+                  }
+
+                  ciRefAttributeMap[id].push({
+                    attrCode: attributeMeta.code,
+                    id: refId
+                  });
+                });
+              });
+              refIds = Object.keys(refIdMap); // 查询引用对象
+
+              _context3.next = 6;
+              return (0, _services.queryCisByIds)(refIds);
+
+            case 6:
+              refCis = _context3.sent;
+              refCiMap = (0, _lodash.keyBy)(refCis, 'id');
+
+              _rlog["default"].debug('translateRefAttribute', {
+                ciRefAttributeMap: ciRefAttributeMap,
+                refIds: refIds,
+                refCiMap: refCiMap
+              }); // 引用对象设置到数据
+
+
+              return _context3.abrupt("return", ciDatas.map(function (ciData) {
+                var id = ciData.id;
+                var attributeMap = (0, _extends2["default"])({}, ciData);
+                ciRefAttributeMap[id].forEach(function (refAttrs) {
+                  var refCi = refCiMap[refAttrs.id];
+
+                  if (refCi) {
+                    attributeMap[refAttrs.attrCode + "_object"] = {
+                      displayName: refCi.attributes.display_name
+                    };
+                  }
+                });
+                return (0, _extends2["default"])({}, ciData, {
+                  attributeMap: attributeMap
+                });
+              }));
+
+            case 10:
+            case "end":
+              return _context3.stop();
+          }
+        }
+      }, _callee3);
+    }));
+
+    function translateRefAttribute(_x2) {
+      return _translateRefAttribute.apply(this, arguments);
+    }
+
+    return translateRefAttribute;
+  }()
   /**
    * 推送标注、悬浮框数据 => ht
    * @returns 
@@ -556,7 +665,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   ;
 
   _proto.getEdgeGroupTagsAndTips = function getEdgeGroupTagsAndTips(data, ciConfigs) {
-    var _this5 = this;
+    var _this6 = this;
 
     // 查询没有关联链路的连线组及对应子链路列表
     var _this$topo$store$getM2 = this.topo.store.getModelState('topoMod').data,
@@ -623,7 +732,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var edgeGroupsTagsTips = Object.keys(groupMap) // 过滤非连线组
     .filter(function (groupId) {
       var linkChildren = groupMap[groupId];
-      var edgeGroup = (0, _htElementUtils.getEdgeGroupByNodeTags)(_this5.topo.getDataModel(), linkChildren[0].source, linkChildren[0].target);
+      var edgeGroup = (0, _htElementUtils.getEdgeGroupByNodeTags)(_this6.topo.getDataModel(), linkChildren[0].source, linkChildren[0].target);
       return !!edgeGroup;
     }).map(function (groupId) {
       var linkChildren = groupMap[groupId]; // 查询配置，过滤不在范围内的属性
@@ -668,7 +777,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       }); // console.error(groupId, {config, linkChildrenData, mergeData})
       // 构造标注、悬浮框数据
 
-      var formatter = new _attributeFormatter["default"](_this5.topo);
+      var formatter = new _attributeFormatter["default"](_this6.topo);
       return {
         type: 'edgeGroup',
         edgeGroupId: groupId,

package/lib/core/models/TopoApp.js

@@ -44,7 +44,7 @@ var _GraphDataModel = _interopRequireDefault(require("./GraphDataModel"));
 var _edgeUtil = require("../utils/edgeUtil");
 
 // eslint-disable-next-line no-undef
-var version = typeof "2.15.2" === 'string' ? "2.15.2" : null;
+var version = typeof "2.15.5" === 'string' ? "2.15.5" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 var topoDebug = {};
 window.topoDebug = topoDebug;

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

@@ -69,7 +69,7 @@ var CiTyeCache = /*#__PURE__*/function () {
     var _load = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(ciTypeIds) {
       var _this = this;
 
-      var unLoadCiTypeIds, ciTypes, cache;
+      var unLoadCiTypeIds, ciTypeMetas, cache;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
@@ -81,12 +81,16 @@ var CiTyeCache = /*#__PURE__*/function () {
               return _topo["default"].ciInfo.batchQueryCiTypeInfo(unLoadCiTypeIds);
 
             case 3:
-              ciTypes = _context2.sent;
+              ciTypeMetas = _context2.sent;
               cache = (0, _extends2["default"])({}, this.cache);
-              ciTypes.forEach(function (ciTypeMeta) {
+              ciTypeMetas.forEach(function (ciTypeMeta) {
+                var attributes = ciTypeMeta.attributes || [];
+                var metrics = ciTypeMeta.metrics || [];
                 cache[ciTypeMeta.code] = (0, _extends2["default"])({}, ciTypeMeta, {
-                  attributeMap: (0, _keyBy["default"])(ciTypeMeta.attributes || [], 'code'),
-                  metricMap: (0, _keyBy["default"])(ciTypeMeta.metrics || [], 'code')
+                  attributes: attributes,
+                  metrics: metrics,
+                  attributeMap: (0, _keyBy["default"])(attributes, 'code'),
+                  metricMap: (0, _keyBy["default"])(metrics, 'code')
                 });
               });
               this.cache = cache;

package/lib/models/topoMod.js

@@ -450,6 +450,10 @@ function _default(topoApp) {
                     _rlog["default"].debug("topoMod.initTopoData Ci属性指标元数据", ciTypeMap);
 
                     globalConfig = result.global.extraConfig;
+                    _context6.next = 47;
+                    return dispatch.displayConfig.setConfig(globalConfig);
+
+                  case 47:
                     _combTopoData = (0, _topoData.combTopoData)({
                       engine: topoApp,
                       data: result,
@@ -468,7 +472,6 @@ function _default(topoApp) {
                     });
 
                     dispatch.topoBizMod.combBatchCiInfo(resAndMetrics);
-                    dispatch.displayConfig.setConfig(globalConfig);
                     dispatch.background.init(globalConfig); // TODO 优化打开拓扑图显示告警速度：打开拓扑图立即请求告警
 
                     if ((0, _topoData.getAlarmSwitch)(topoData)) {
@@ -482,7 +485,7 @@ function _default(topoApp) {
 
                     topoApp.options.onLoad();
 
-                  case 55:
+                  case 56:
                   case "end":
                     return _context6.stop();
                 }

package/lib/topoCenter/components/editor/propertyViews/edge/link/LindInfoPreview.js

@@ -77,7 +77,7 @@ function LindInfoPreview(props) {
     }, /*#__PURE__*/_react["default"].createElement(_box["default"], {
       className: _LindInfoPreviewModule["default"].label
     }, field.label), /*#__PURE__*/_react["default"].createElement(_box["default"], {
-      className: _LindInfoPreviewModule["default"].labelValue,
+      className: field.name === "use" ? _LindInfoPreviewModule["default"].uselabelValue : _LindInfoPreviewModule["default"].labelValue,
       flex: 1
     }, getValue(field.name)));
   }); // <Collapse

package/lib/topoCenter/components/editor/propertyViews/edge/link/LindInfoPreview.module.scss

@@ -13,8 +13,18 @@
 
 .labelValue {
   max-width: 160px;
-  overflow-y: scroll;
   max-height: 200px;
+  overflow-x: hidden;
+  overflow-wrap: break-word;
+}
+
+.uselabelValue {
+  max-width: 160px;
+  max-height: 200px;
+  overflow-y: scroll;
+  overflow-x: hidden;
+  overflow-wrap: break-word;
+
 }
 
 

package/lib/utils/topoData.js

@@ -8,6 +8,7 @@ exports.findItemIndex = exports.findItem = exports.combTopoData = exports.combSa
 exports.formatGroup = formatGroup;
 exports.formatGroups = formatGroups;
 exports.getAlarmSwitch = getAlarmSwitch;
+exports.getCiModSet = getCiModSet;
 exports.getCiTypes = getCiTypes;
 exports.getLinksBetweenTwoNodes = getLinksBetweenTwoNodes;
 exports.parseTopoData = parseTopoData;
@@ -315,11 +316,6 @@ var combTopoData = function combTopoData(_ref2) {
       ciTypeMap = _ref2.ciTypeMap,
       engine = _ref2.engine;
   // rlog.debug("combTopoData-接收到数据", result, engine, globalConfig);
-  // 当前拓扑资源字典
-  var ciDoc = {};
-  var ciTypesDoc = {}; //
-
-  var bindingCiSet = {};
   var config = (0, _extends2["default"])({
     type: "auto"
   }, result.config); // global
@@ -375,12 +371,75 @@ var combTopoData = function combTopoData(_ref2) {
   var linkGroups = result.linkGroups.map(function (link) {
     var linkObj = tfLink(engine, link, result.nodes);
     return linkObj;
-  }); // 所有资源
+  });
+  var topoData = {
+    config: config,
+    global: global,
+    groups: groups,
+    nodes: nodes,
+    linkGroups: linkGroups,
+    links: links,
+    serialize: result.serialize
+  }; // 所有资源
 
   var allCis = [].concat(nodes, links, linkGroups);
+  var resAndMetrics = (0, _extends2["default"])({
+    // topo所有ci的id集合
+    resIdsList: allCis.map(function (item) {
+      return item.id;
+    }),
+    ciTypes: getCiTypes(result),
+    // ci类型集合
+    ciTypeMap: ciTypeMap,
+    // ci类型模型map
+    metrics: [],
+    // 所有指标
+    metricsDoc: {},
+    //
+    attrsDoc: {},
+    allMetrics: Object.values(ciTypeMap),
+    allAttrs: Object.values(ciTypeMap),
+    globalConfig: globalConfig,
+    nodeIdsList: result.nodes.map(function (item) {
+      return {
+        ciId: item.id,
+        operation: item.operation
+      };
+    }),
+    linkIdsList: [].concat(result.links, result.linkGroups).map(function (linkObj) {
+      return {
+        ciId: linkObj.id,
+        operation: linkObj.operation
+      };
+    })
+  }, getCiModSet({
+    engine: engine,
+    allCis: allCis,
+    ciTypeMap: ciTypeMap,
+    globalConfig: globalConfig
+  })); // rlog.debug("combTopoData-格式化后数据", topoData, resAndMetrics);
+
+  return {
+    topoData: topoData,
+    resAndMetrics: resAndMetrics
+  };
+};
+
+exports.combTopoData = combTopoData;
+
+function getCiModSet(params) {
+  var engine = params.engine,
+      allCis = params.allCis,
+      ciTypeMap = params.ciTypeMap,
+      globalConfig = params.globalConfig; // 当前拓扑资源字典
+
+  var ciDoc = {};
+  var ciTypesDoc = {}; //
+
+  var bindingCiSet = {};
   var allCiModSet = {};
   var allLinkModSet = {};
-  Object.keys(ciTypeMap).map(function (key) {
+  Object.keys(ciTypeMap).forEach(function (key) {
     var ciTypeObj = {};
     var linkKeyArr = [{
       code: "phy",
@@ -439,62 +498,19 @@ var combTopoData = function combTopoData(_ref2) {
     });
   }
 
-  var resAndMetrics = {
-    // topo所有ci的id集合
-    resIdsList: [].concat(result.nodes, result.links, result.linkGroups).map(function (item) {
-      return item.id;
-    }),
-    nodeIdsList: result.nodes.map(function (item) {
-      return {
-        ciId: item.id,
-        operation: item.operation
-      };
-    }),
-    linkIdsList: [].concat(result.links, result.linkGroups).map(function (linkObj) {
-      return {
-        ciId: linkObj.id,
-        operation: linkObj.operation
-      };
-    }),
-    // alarmCiDoc, // 用于告警ciId的集合，因为链路的ciId不同于关系id（r开头） 弃用
+  return {
     ciDoc: ciDoc,
     // ci信息集合
-    ciTypes: getCiTypes(result),
-    // ci类型集合
     ciTypesDoc: ciTypesDoc,
     // 每种ci含有的ci
-    ciTypeMap: ciTypeMap,
-    // ci类型模型map
-    allCiModSet: allCiModSet,
-    // 资源类型含有属性和指标集合
-    allLinkModSet: allLinkModSet,
-    // 链路类型含有属性和指标集合
-    metrics: [],
-    // 所有指标
-    metricsDoc: {},
-    //
-    attrsDoc: {},
     bindingCiSet: bindingCiSet,
     // 可能没用了
-    allMetrics: Object.values(ciTypeMap),
-    allAttrs: Object.values(ciTypeMap),
-    globalConfig: globalConfig
-  };
-  var topoData = {
-    config: config,
-    global: global,
-    groups: groups,
-    nodes: nodes,
-    linkGroups: linkGroups,
-    links: links,
-    serialize: result.serialize
-  }; // rlog.debug("combTopoData-格式化后数据", topoData, resAndMetrics);
+    allCiModSet: allCiModSet,
+    // 资源类型含有属性和指标集合
+    allLinkModSet: allLinkModSet // 链路类型含有属性和指标集合
 
-  return {
-    topoData: topoData,
-    resAndMetrics: resAndMetrics
   };
-};
+}
 /**
  * 获得两个节点间的连线列表
  * @param {*} links
@@ -504,8 +520,6 @@ var combTopoData = function combTopoData(_ref2) {
  */
 
 
-exports.combTopoData = combTopoData;
-
 function getLinksBetweenTwoNodes(links, id1, id2) {
   return links.filter(function (link) {
     return link.source === id1 && link.target === id2 || link.target === id1 && link.source === id2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.15.2",
+  "version": "2.15.5",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -69,7 +69,7 @@
     "@riil-frontend/component-table-filter-tags": "latest",
     "@riil-frontend/component-table-layout": "^2.0.2",
     "@riil-frontend/component-topology-common": "^1.0.9",
-    "@riil-frontend/component-topology-graph": "^2.5.0",
+    "@riil-frontend/component-topology-graph": "^2.5.1",
     "@riil-frontend/css": "^2.0.2",
     "@riil-frontend/hooks": "latest",
     "@riil-frontend/next-collapse": "^1.0.1-a.0",
@@ -111,6 +111,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.2/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.5/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }