@riil-frontend/component-topology 11.0.11 → 11.0.13

package/lib/components/BatchAttrMetric2/setting.js

@@ -54,15 +54,21 @@ var Setting = function Setting(_ref) {
   var allCiSet = (0, _react.useMemo)(function () {
     var map = {};
     (0, _treeUtil.loopTreeNode)(dataSource, function (item) {
-      map[item.id] = item;
+      if (item.type !== 'folder') {
+        map[item.id] = item;
+      }
     });
     return map;
   }, [dataSource]);
 
-  var _useState = (0, _react.useState)(Object.keys(allCiSet)[0]),
+  var _useState = (0, _react.useState)(utils.getDefaultSelectedCiType(dataSource)),
       ciType = _useState[0],
       setCiType = _useState[1];
 
+  (0, _react.useEffect)(function () {
+    setCiType(utils.getDefaultSelectedCiType(dataSource));
+  }, [dataSource]);
+
   var _useState2 = (0, _react.useState)(''),
       search = _useState2[0],
       setSearch = _useState2[1];
@@ -98,7 +104,7 @@ var Setting = function Setting(_ref) {
   var onTreeSelect = function onTreeSelect(_ref2) {
     var selectedKey = _ref2[0];
 
-    if (selectedKey && allCiSet[selectedKey].type !== 'folder') {
+    if (selectedKey && allCiSet[selectedKey] && allCiSet[selectedKey].type !== 'folder') {
       setCiType(selectedKey);
     }
   };
@@ -153,12 +159,23 @@ var Setting = function Setting(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_grid["default"].Col, {
     span: 8,
     className: _indexModule["default"]['tree-wrap']
-  }, /*#__PURE__*/_react["default"].createElement(_componentActionTree["default"], {
+  }, dataSource.length && /*#__PURE__*/_react["default"].createElement(_componentActionTree["default"], {
     dataSource: dataSource,
     onSelect: onTreeSelect,
     draggable: false,
     treeProps: {
-      selectedKeys: [ciType]
+      selectedKeys: [ciType],
+      defaultExpandedKeys: dataSource.filter(function (item) {
+        return item.type === 'folder';
+      }).map(function (item) {
+        return item.id;
+      }),
+      expandedKeys: dataSource.filter(function (item) {
+        return item.type === 'folder';
+      }).map(function (item) {
+        return item.id;
+      }),
+      defaultExpandAll: true
     }
   })), /*#__PURE__*/_react["default"].createElement(_grid["default"].Col, {
     className: _indexModule["default"]['table-wrap']

package/lib/components/BatchAttrMetric2/utils.js

@@ -3,7 +3,9 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports.typeCell = exports.treeDs = exports.defaultSelected = void 0;
+exports.defaultSelected = void 0;
+exports.getDefaultSelectedCiType = getDefaultSelectedCiType;
+exports.typeCell = exports.treeDs = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -11,6 +13,8 @@ var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
+var _treeUtil = require("../../utils/treeUtil");
+
 /**
  * 获取树结构数据源
  * @param {*} allCiSet 数据源
@@ -93,5 +97,23 @@ var typeCell = function typeCell(text) {
 
   return "-";
 };
+/**
+ * 获得默认选中第一个模型
+ * @param {*} tree 
+ * @returns 
+ */
 
-exports.typeCell = typeCell;
+
+exports.typeCell = typeCell;
+
+function getDefaultSelectedCiType(tree) {
+  var ciType = null;
+  (0, _treeUtil.loopTreeNode)(tree, function (item) {
+    if (item.type !== 'folder') {
+      if (!ciType) {
+        ciType = item.id;
+      }
+    }
+  });
+  return ciType;
+}

package/lib/core/components/ResourceViewAttributeSetting/nodeCiTypeAttrUtil.js

@@ -12,11 +12,10 @@ var _topoData = require("../../../utils/topoData");
  * @returns 
  */
 function getNodeModels(topo) {
-  var data = topo.store.getModelState('topoMod').data;
-  var ciTypeMap = topo.ciTyeCache.ciTypes;
   return getNodeModSet();
 
   function getNodeModSet() {
+    var data = topo.store.getModelState('topoMod').data;
     var ciTypes = (0, _topoData.getCiTypesFromCiElements)(data.nodes);
     return getMods(ciTypes);
   }
@@ -28,6 +27,7 @@ function getNodeModels(topo) {
 
 
   function getMods(ciTypeCodes) {
+    var ciTypeMap = topo.ciTyeCache.ciTypes;
     return Object.keys(ciTypeMap).filter(function (item) {
       return ciTypeCodes.includes(item);
     }).map(function (key) {
@@ -35,11 +35,21 @@ function getNodeModels(topo) {
       return {
         id: ciTypeObj.code,
         label: ciTypeObj.displayName,
-        icon: ciTypeObj.icon,
-        list: ciModfilter(ciTypeObj, 'node')
+        typeCode: ciTypeObj.typeCode,
+        icon: "/img/model/" + ciTypeObj.icon + ".svg",
+        list: buildModelFields(ciTypeObj, 'node')
       };
     });
   }
+
+  function buildModels(ciTypeObj) {
+    return {
+      id: ciTypeObj.code,
+      label: ciTypeObj.displayName,
+      icon: "/img/model/" + ciTypeObj.icon + ".svg",
+      list: buildModelFields(ciTypeObj, 'node')
+    };
+  }
   /**
    * 过滤ci元数据中的属性和指标，用于属性和指标显示设置
    * @param {} ciTypeObj
@@ -47,7 +57,7 @@ function getNodeModels(topo) {
    */
 
 
-  function ciModfilter(ciTypeObj, type) {
+  function buildModelFields(ciTypeObj, type) {
     var custom = [];
 
     if (type === 'node') {
@@ -62,6 +72,15 @@ function getNodeModels(topo) {
         name: '资源类型',
         type: 'custom'
       }]);
+
+      if (topo.isCMPTopo) {
+        custom.push.apply(custom, [{
+          id: 'p:source',
+          code: 'name',
+          name: '所属平台',
+          type: 'custom'
+        }]);
+      }
     }
 
     var attributes = ciTypeObj.attributes.filter(function (attr) {

package/lib/core/editor/components/BottomFloatTool/HelpIcon.js

@@ -63,11 +63,7 @@ function HelpIcon(props) {
       }
     }, /*#__PURE__*/_react["default"].createElement("img", {
       src: "/img/topo/editor/bottomFloatTool/default.svg",
-      alt: "",
-      style: {
-        width: '15px',
-        height: '15px'
-      }
+      alt: ""
     })),
     closable: true,
     visible: helpBoxIsShow,
@@ -104,7 +100,7 @@ function HelpIcon(props) {
     span: "8"
   }, "ctrl/\u2318+b")), /*#__PURE__*/_react["default"].createElement(Row, null, /*#__PURE__*/_react["default"].createElement(Col, {
     span: "16"
-  }, "\u9009\u62E9-\u62D6\u5230"), /*#__PURE__*/_react["default"].createElement(Col, {
+  }, "\u9009\u62E9-\u62D6\u52A8"), /*#__PURE__*/_react["default"].createElement(Col, {
     span: "8"
   }, "\u7A7A\u683C")), /*#__PURE__*/_react["default"].createElement(Row, null, /*#__PURE__*/_react["default"].createElement(Col, {
     span: "16"

package/lib/core/editor/components/BottomFloatTool/HelpIcon.module.scss

@@ -4,6 +4,9 @@
     margin: 0;
     padding: 0;
     border: 0;
+    cursor: pointer;
+    margin-top: -1px;
+    margin-left: -1px;
 }
 :global{
     #white.next-overlay-inner{

package/lib/core/models/AttributeMetricDisplay.js

@@ -173,11 +173,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   ;
 
   _proto.getModelType = function getModelType(ci) {
-    if (ci.ciType === 'network_link') {
-      return ci.attributes.support_templates;
-    }
-
-    return ci.ciType;
+    return this.topo.elementTagTipConfig.getModelType(ci);
   }
   /**
    * 按链路类型获取对应的属性、指标配置

package/lib/core/models/TopoApp.js

@@ -56,7 +56,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "11.0.11" === 'string' ? "11.0.11" : null;
+var version = typeof "11.0.13" === 'string' ? "11.0.13" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -22,12 +22,12 @@ var _keyBy = _interopRequireDefault(require("lodash/keyBy"));
 /**
  * Ci类型属性、指标缓存
  */
-var CiTyeCache = /*#__PURE__*/function () {
-  function CiTyeCache() {
+var CiTypeCache = /*#__PURE__*/function () {
+  function CiTypeCache() {
     this.cache = {};
   }
 
-  var _proto = CiTyeCache.prototype;
+  var _proto = CiTypeCache.prototype;
 
   _proto.getCiTypeMap = /*#__PURE__*/function () {
     var _getCiTypeMap = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(ciTypeIds) {
@@ -71,7 +71,7 @@ var CiTyeCache = /*#__PURE__*/function () {
     var _load = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(ciTypeIds) {
       var _this = this;
 
-      var unLoadCiTypeIds, ciTypeMetas, cache;
+      var unLoadCiTypeIds, ciTypeMetas;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
@@ -84,36 +84,10 @@ var CiTyeCache = /*#__PURE__*/function () {
 
             case 3:
               ciTypeMetas = _context2.sent;
-              cache = (0, _extends2["default"])({}, this.cache);
-              ciTypeMetas.forEach(function (ciTypeMeta) {
-                var attributes = (ciTypeMeta.attributes || []).map(function (attr) {
-                  if (ciTypeMeta.code !== 'network_link') {
-                    return attr;
-                  } // 链路属性名称转化，临时方案
-
-
-                  var name = {
-                    source_id: '源端口',
-                    destination_id: '目的端口'
-                  }[attr.code] || attr.name;
-                  var userVisible = ['source_id', 'destination_id'].indexOf(attr.code) !== -1 ? true : attr.userVisible;
-                  return (0, _extends2["default"])({}, attr, {
-                    name: name,
-                    userVisible: userVisible
-                  });
-                });
-                var metrics = ciTypeMeta.metrics || [];
-                cache[ciTypeMeta.code] = (0, _extends2["default"])({}, ciTypeMeta, {
-                  attributes: attributes,
-                  attributeMap: (0, _keyBy["default"])(attributes, 'code'),
-                  metrics: metrics,
-                  metricMap: (0, _keyBy["default"])(metrics, 'code')
-                });
-              });
-              this.cache = cache;
+              this.addCiTypes(ciTypeMetas);
               return _context2.abrupt("return", this.cache);
 
-            case 8:
+            case 6:
             case "end":
               return _context2.stop();
           }
@@ -128,15 +102,32 @@ var CiTyeCache = /*#__PURE__*/function () {
     return load;
   }();
 
+  _proto.addCiTypes = function addCiTypes(ciTypeMetas) {
+    var _this2 = this;
+
+    ciTypeMetas.forEach(function (ciTypeMeta) {
+      _this2.addCiType(ciTypeMeta);
+    });
+  };
+
+  _proto.addCiType = function addCiType(ciTypeMeta) {
+    var cache = (0, _extends2["default"])({}, this.cache);
+    var attributes = adapterNetworkLinkAttributes(ciTypeMeta, ciTypeMeta.attributes || []);
+    var metrics = ciTypeMeta.metrics || [];
+    cache[ciTypeMeta.code] = (0, _extends2["default"])({}, ciTypeMeta, {
+      attributes: attributes,
+      attributeMap: (0, _keyBy["default"])(attributes, 'code'),
+      metrics: metrics,
+      metricMap: (0, _keyBy["default"])(metrics, 'code')
+    });
+    this.cache = cache;
+  };
+
   _proto.getCiType = function getCiType(typeCode) {
     return this.cache[typeCode];
   };
 
   _proto.getCiTypeByCi = function getCiTypeByCi(ci) {
-    // if (ci.ciType === 'network_link') {
-    //   const supportTemplates = link.attributes.support_templates;
-    // } else {
-    // }
     return this.getCiType(ci.ciType);
   };
 
@@ -150,15 +141,34 @@ var CiTyeCache = /*#__PURE__*/function () {
     return ciType === null || ciType === void 0 ? void 0 : ciType.metricMap[metricCode];
   };
 
-  (0, _createClass2["default"])(CiTyeCache, [{
+  (0, _createClass2["default"])(CiTypeCache, [{
     key: "ciTypes",
     get: function get() {
       return this.cache;
     }
   }]);
-  return CiTyeCache;
+  return CiTypeCache;
 }();
 
-var _default = new CiTyeCache();
+function adapterNetworkLinkAttributes(ciTypeMeta, attributes) {
+  return attributes.map(function (attr) {
+    if (ciTypeMeta.code !== 'network_link') {
+      return attr;
+    } // 链路属性名称转化，临时方案
+
+
+    var name = {
+      source_id: '源端口',
+      destination_id: '目的端口'
+    }[attr.code] || attr.name;
+    var userVisible = ['source_id', 'destination_id'].indexOf(attr.code) !== -1 ? true : attr.userVisible;
+    return (0, _extends2["default"])({}, attr, {
+      name: name,
+      userVisible: userVisible
+    });
+  });
+}
+
+var _default = new CiTypeCache();
 
 exports["default"] = _default;