@riil-frontend/component-topology 2.15.3 → 2.15.6

package/es/core/models/AttributeMetricDisplay.js

@@ -540,7 +540,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
               return _context3.abrupt("return", ciDatas.map(function (ciData) {
                 var id = ciData.id;
 
-                var attributeMap = _extends({}, ciData);
+                var attributeMap = _extends({}, ciData.attributeMap);
 
                 ciRefAttributeMap[id].forEach(function (refAttrs) {
                   var refCi = refCiMap[refAttrs.id];

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.3" === 'string' ? "2.15.3" : null;
+var version = typeof "2.15.6" === 'string' ? "2.15.6" : 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/topoCenter/components/editor/propertyViews/edge/link/LindInfoPreview.js

@@ -60,7 +60,7 @@ export default function LindInfoPreview(props) {
     }, /*#__PURE__*/React.createElement(_Box, {
       className: styles.label
     }, field.label), /*#__PURE__*/React.createElement(_Box, {
-      className: styles.labelValue,
+      className: field.name === "use" ? styles.uselabelValue : styles.labelValue,
       flex: 1
     }, getValue(field.name)));
   }); // <Collapse

package/es/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/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/core/models/AttributeMetricDisplay.js

@@ -560,7 +560,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
               return _context3.abrupt("return", ciDatas.map(function (ciData) {
                 var id = ciData.id;
-                var attributeMap = (0, _extends2["default"])({}, ciData);
+                var attributeMap = (0, _extends2["default"])({}, ciData.attributeMap);
                 ciRefAttributeMap[id].forEach(function (refAttrs) {
                   var refCi = refCiMap[refAttrs.id];
 

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.3" === 'string' ? "2.15.3" : null;
+var version = typeof "2.15.6" === 'string' ? "2.15.6" : 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/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.3",
+  "version": "2.15.6",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -111,6 +111,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.3/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.6/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }