@riil-frontend/component-topology 2.15.1 → 2.15.4

package/es/components/collapse/Panel.module.scss

@@ -5,5 +5,8 @@
     .#{$css-prefix}collapse-panel-title:hover {
       color: var(--collapse-title-font-color);
     }
+    .#{$css-prefix}collapse-panel-title:hover .#{$css-prefix}collapse-panel-icon {
+      color: var(--collapse-title-font-color);
+    }
   }
 }

package/es/constants/ResourceTypeLimit.js

@@ -4,4 +4,5 @@ export var RESOURCE_LIMIT_TYPES = [// 网络设备
 'linux', 'windows', // 数据库
 'oracle', 'asm_disk_group', 'oracle_rac', // 中间件
 'tomcat', // 业务
-'app', 'service'];
+'app', 'service', // 虚拟化
+'virtual_mgmt_node', 'virtual_data_center', 'virtual_cluster', 'virtual_storage', 'virtual_vm', 'virtual_host', 'virtual_switch'];

package/es/core/common/icons/networkTopoCiTypeIcons.js

@@ -3,6 +3,7 @@ import os from '@riil-frontend/component-topology-graph/es/icons/ciTypeIcons/os'
 import db from '@riil-frontend/component-topology-graph/es/icons/ciTypeIcons/db';
 import appMiddleware from '@riil-frontend/component-topology-graph/es/icons/ciTypeIcons/app_middleware';
 import businessSystem from '@riil-frontend/component-topology-graph/es/icons/ciTypeIcons/business_system';
+import virtual from '@riil-frontend/component-topology-graph/es/icons/ciTypeIcons/virtual';
 export default function getNetworkTopoCiTypeIcons() {
-  return [].concat(network(), os(), db(), appMiddleware(), businessSystem());
+  return [].concat(network(), os(), db(), appMiddleware(), businessSystem(), virtual());
 }

package/es/core/models/AttributeMetricDisplay.js

@@ -3,10 +3,12 @@ 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 { keyBy } from 'lodash';
 import groupBy from 'lodash/groupBy';
 import { DEFAULT_LINK_TAG_COMMON_CONFIG, DEFAULT_NODE_TAG_COMMON_CONFIG, DEFAULT_TAG_COMMON_CONFIG, DEFAULT_TIP_COMMON_CONFIG } from "../../constants/ResourceInfoDisplay";
 import { getEdgeGroupByNodeTags } from "../../utils/htElementUtils";
 import { findItem } from "../../utils/topoData";
+import { queryCisByIds } from "../services";
 import AttributeFormatter from "./attributeFormatter";
 import DictCache from "./cache/DictCache";
 
@@ -292,23 +294,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);
@@ -431,25 +437,37 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _loadAttributeAndMetric = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(data) {
-      var topo, bizDispatchers;
+      var topo, ciDatas, bizDispatchers;
       return _regeneratorRuntime.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 _extends({
+                  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.init();
 
-            case 6:
+            case 10:
               this.updateTagsTips();
 
-            case 7:
+            case 11:
             case "end":
               return _context2.stop();
           }
@@ -463,6 +481,95 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
     return loadAttributeAndMetric;
   }()
+  /**
+   * 临时由前端翻译引用属性名称
+   * @param {*} ciDatas 
+   * @returns 
+   */
+  ;
+
+  _proto.translateRefAttribute =
+  /*#__PURE__*/
+  function () {
+    var _translateRefAttribute = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(ciDatas) {
+      var _this5 = this;
+
+      var refIdMap, ciRefAttributeMap, refIds, refCis, refCiMap;
+      return _regeneratorRuntime.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 queryCisByIds(refIds);
+
+            case 6:
+              refCis = _context3.sent;
+              refCiMap = keyBy(refCis, 'id');
+              rlog.debug('translateRefAttribute', {
+                ciRefAttributeMap: ciRefAttributeMap,
+                refIds: refIds,
+                refCiMap: refCiMap
+              }); // 引用对象设置到数据
+
+              return _context3.abrupt("return", ciDatas.map(function (ciData) {
+                var id = ciData.id;
+
+                var attributeMap = _extends({}, ciData);
+
+                ciRefAttributeMap[id].forEach(function (refAttrs) {
+                  var refCi = refCiMap[refAttrs.id];
+
+                  if (refCi) {
+                    attributeMap[refAttrs.attrCode + "_object"] = {
+                      displayName: refCi.attributes.display_name
+                    };
+                  }
+                });
+                return _extends({}, ciData, {
+                  attributeMap: attributeMap
+                });
+              }));
+
+            case 10:
+            case "end":
+              return _context3.stop();
+          }
+        }
+      }, _callee3);
+    }));
+
+    function translateRefAttribute(_x2) {
+      return _translateRefAttribute.apply(this, arguments);
+    }
+
+    return translateRefAttribute;
+  }()
   /**
    * 推送标注、悬浮框数据 => ht
    * @returns 
@@ -538,7 +645,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,
@@ -605,7 +712,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var edgeGroupsTagsTips = Object.keys(groupMap) // 过滤非连线组
     .filter(function (groupId) {
       var linkChildren = groupMap[groupId];
-      var edgeGroup = getEdgeGroupByNodeTags(_this5.topo.getDataModel(), linkChildren[0].source, linkChildren[0].target);
+      var edgeGroup = getEdgeGroupByNodeTags(_this6.topo.getDataModel(), linkChildren[0].source, linkChildren[0].target);
       return !!edgeGroup;
     }).map(function (groupId) {
       var linkChildren = groupMap[groupId]; // 查询配置，过滤不在范围内的属性
@@ -650,7 +757,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       }); // console.error(groupId, {config, linkChildrenData, mergeData})
       // 构造标注、悬浮框数据
 
-      var formatter = new AttributeFormatter(_this5.topo);
+      var formatter = new AttributeFormatter(_this6.topo);
       return {
         type: 'edgeGroup',
         edgeGroupId: groupId,

package/es/core/models/TopoApp.js

@@ -18,7 +18,7 @@ import DataModel from "./DataModel";
 import GraphDataModel from "./GraphDataModel";
 import { updateEdgeExpanded } from "../utils/edgeUtil"; // eslint-disable-next-line no-undef
 
-var version = typeof "2.15.1" === 'string' ? "2.15.1" : null;
+var version = typeof "2.15.4" === 'string' ? "2.15.4" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 var topoDebug = {};
 window.topoDebug = topoDebug;

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

@@ -57,7 +57,7 @@ var CiTyeCache = /*#__PURE__*/function () {
     var _load = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(ciTypeIds) {
       var _this = this;
 
-      var unLoadCiTypeIds, ciTypes, cache;
+      var unLoadCiTypeIds, ciTypeMetas, cache;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
@@ -69,12 +69,16 @@ var CiTyeCache = /*#__PURE__*/function () {
               return topoService.ciInfo.batchQueryCiTypeInfo(unLoadCiTypeIds);
 
             case 3:
-              ciTypes = _context2.sent;
+              ciTypeMetas = _context2.sent;
               cache = _extends({}, this.cache);
-              ciTypes.forEach(function (ciTypeMeta) {
+              ciTypeMetas.forEach(function (ciTypeMeta) {
+                var attributes = ciTypeMeta.attributes || [];
+                var metrics = ciTypeMeta.metrics || [];
                 cache[ciTypeMeta.code] = _extends({}, ciTypeMeta, {
-                  attributeMap: keyBy(ciTypeMeta.attributes || [], 'code'),
-                  metricMap: keyBy(ciTypeMeta.metrics || [], 'code')
+                  attributes: attributes,
+                  metrics: metrics,
+                  attributeMap: keyBy(attributes, 'code'),
+                  metricMap: keyBy(metrics, 'code')
                 });
               });
               this.cache = cache;

package/es/core/viewer/components/titlebar/widgets/EditButton.js

@@ -10,13 +10,12 @@ export default function EditButton(props) {
   var topo = props.topo,
       onEnterEdit = props.onEnterEdit,
       style = props.style;
-  var store = topo.store;
+  var store = topo.store; // const [topoState] = store.useModel('topoMod');
+  // const { topoPermission, } = topoState;
 
-  var _store$useModel = store.useModel('topoMod'),
-      topoState = _store$useModel[0];
+  var functionAuthState = store.useModelState('functionAuth'); // let show = topo.options.usePermission ? topoPermissonUtil.isEditable(topoPermission) : true;
 
-  var topoPermission = topoState.topoPermission;
-  var show = topo.options.usePermission ? topoPermissonUtil.isEditable(topoPermission) : true;
+  var show = topo.options.usePermission ? functionAuthState.permissions.createTopo : true;
 
   if (!show) {
     return null;

package/es/models/topoMod.js

@@ -427,6 +427,10 @@ export default function (topoApp) {
                     customIcons = _yield$Promise$all[1];
                     rlog.debug("topoMod.initTopoData Ci属性指标元数据", ciTypeMap);
                     globalConfig = result.global.extraConfig;
+                    _context6.next = 47;
+                    return dispatch.displayConfig.setConfig(globalConfig);
+
+                  case 47:
                     _combTopoData = combTopoData({
                       engine: topoApp,
                       data: result,
@@ -445,7 +449,6 @@ export default function (topoApp) {
                     });
 
                     dispatch.topoBizMod.combBatchCiInfo(resAndMetrics);
-                    dispatch.displayConfig.setConfig(globalConfig);
                     dispatch.background.init(globalConfig); // TODO 优化打开拓扑图显示告警速度：打开拓扑图立即请求告警
 
                     if (getAlarmSwitch(topoData)) {
@@ -457,7 +460,7 @@ export default function (topoApp) {
                     rlog.info("topoMod.initTopoData 初始化拓扑图数据完成. 耗时: ", endTime.diff(startTime, "seconds", true));
                     topoApp.options.onLoad();
 
-                  case 55:
+                  case 56:
                   case "end":
                     return _context6.stop();
                 }

package/es/utils/topoData.js

@@ -273,13 +273,8 @@ export var combTopoData = function combTopoData(_ref2) {
       globalConfig = _ref2.globalConfig,
       ciTypeMap = _ref2.ciTypeMap,
       engine = _ref2.engine;
-  // rlog.debug("combTopoData-接收到数据", result, engine, globalConfig);
-  // 当前拓扑资源字典
-  var ciDoc = {};
-  var ciTypesDoc = {}; //
-
-  var bindingCiSet = {};
 
+  // rlog.debug("combTopoData-接收到数据", result, engine, globalConfig);
   var config = _extends({
     type: "auto"
   }, result.config); // global
@@ -337,12 +332,74 @@ export 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 = _extends({
+    // 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
+  };
+};
+export 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",
@@ -401,62 +458,19 @@ export 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

package/lib/components/collapse/Panel.module.scss

@@ -5,5 +5,8 @@
     .#{$css-prefix}collapse-panel-title:hover {
       color: var(--collapse-title-font-color);
     }
+    .#{$css-prefix}collapse-panel-title:hover .#{$css-prefix}collapse-panel-icon {
+      color: var(--collapse-title-font-color);
+    }
   }
 }

package/lib/constants/ResourceTypeLimit.js

@@ -8,5 +8,6 @@ var RESOURCE_LIMIT_TYPES = [// 网络设备
 'linux', 'windows', // 数据库
 'oracle', 'asm_disk_group', 'oracle_rac', // 中间件
 'tomcat', // 业务
-'app', 'service'];
+'app', 'service', // 虚拟化
+'virtual_mgmt_node', 'virtual_data_center', 'virtual_cluster', 'virtual_storage', 'virtual_vm', 'virtual_host', 'virtual_switch'];
 exports.RESOURCE_LIMIT_TYPES = RESOURCE_LIMIT_TYPES;

package/lib/core/common/icons/networkTopoCiTypeIcons.js

@@ -15,6 +15,8 @@ var _app_middleware = _interopRequireDefault(require("@riil-frontend/component-t
 
 var _business_system = _interopRequireDefault(require("@riil-frontend/component-topology-graph/es/icons/ciTypeIcons/business_system"));
 
+var _virtual = _interopRequireDefault(require("@riil-frontend/component-topology-graph/es/icons/ciTypeIcons/virtual"));
+
 function getNetworkTopoCiTypeIcons() {
-  return [].concat((0, _network["default"])(), (0, _os["default"])(), (0, _db["default"])(), (0, _app_middleware["default"])(), (0, _business_system["default"])());
+  return [].concat((0, _network["default"])(), (0, _os["default"])(), (0, _db["default"])(), (0, _app_middleware["default"])(), (0, _business_system["default"])(), (0, _virtual["default"])());
 }