@riil-frontend/component-topology 3.1.9 → 3.1.12

package/es/utils/topoData.js

@@ -129,8 +129,7 @@ var tfLink = function tfLink(engine, link, nodes) {
   });
 };
 
-export function getCiTypes(topoData) {
-  var allCi = [].concat(topoData.nodes, topoData.links, topoData.linkGroups);
+export function getCiTypesFromCiElements(allCi) {
   var ciTypes = [];
   allCi.forEach(function (element) {
     if (element.ciType && ciTypes.indexOf(element.ciType) < 0) {
@@ -139,6 +138,10 @@ export function getCiTypes(topoData) {
   });
   return ciTypes;
 }
+export function getCiTypes(topoData) {
+  var allCi = [].concat(topoData.nodes, topoData.links, topoData.linkGroups);
+  return getCiTypesFromCiElements(allCi);
+}
 export function getAlarmSwitch(topoData) {
   var _topoData$global;
 
@@ -411,6 +414,7 @@ export var combTopoData = function combTopoData(_ref3) {
     })
   }, getCiModSet({
     engine: engine,
+    data: result,
     allCis: allCis,
     ciTypeMap: ciTypeMap,
     globalConfig: globalConfig
@@ -423,7 +427,8 @@ export var combTopoData = function combTopoData(_ref3) {
   };
 };
 export function getCiModSet(params) {
-  var engine = params.engine,
+  var data = params.data,
+      engine = params.engine,
       allCis = params.allCis,
       ciTypeMap = params.ciTypeMap,
       globalConfig = params.globalConfig; // 当前拓扑资源字典
@@ -432,49 +437,70 @@ export function getCiModSet(params) {
   var ciTypesDoc = {}; //
 
   var bindingCiSet = {};
-  var allCiModSet = {};
-  var allLinkModSet = {};
-  Object.keys(ciTypeMap).forEach(function (key) {
-    var ciTypeObj = {};
-    var linkKeyArr = [{
-      code: "phy",
-      key: "phy",
-      name: "物理链路"
-    }, {
-      code: "agg",
-      key: "agg",
-      name: "聚合链路"
-    }, {
-      code: "export_link",
-      key: "exp",
-      name: "出口链路"
-    }];
-
-    if (key === "network_link") {
-      linkKeyArr.map(function (link, index) {
-        ciTypeObj = engine.ciTyeCache.getNetworkLinkCiType(link.key);
-
-        if (ciTypeObj) {
-          allLinkModSet[link.code] = {
-            name: link.name,
-            code: link.code,
-            icon: ciTypeObj.icon,
-            list: ciModfilter(ciTypeObj, globalConfig, "link", link.code)
-          };
-        }
+  var allCiModSet = getNodeModSet();
+  var allLinkModSet = getLinkModSet();
 
-        return link.code;
-      });
-    } else {
-      ciTypeObj = ciTypeMap[key];
-      allCiModSet[key] = {
+  function getNodeModSet() {
+    var ciTypes = getCiTypesFromCiElements(data.nodes);
+    return getModSet(ciTypes);
+  }
+
+  function getLinkModSet() {
+    var ciTypes = getCiTypesFromCiElements([].concat(data.links, data.linkGroups));
+    return getModSet(ciTypes);
+  }
+  /**
+   * 
+   * @param {array} ciTypeCodes 
+   * @returns 
+   */
+
+
+  function getModSet(ciTypeCodes) {
+    var modSet = {};
+    Object.keys(ciTypeMap).filter(function (item) {
+      return ciTypeCodes.includes(item);
+    }).forEach(function (key) {
+      var ciTypeObj = ciTypeMap[key];
+      modSet[key] = {
         name: ciTypeObj.displayName,
         code: ciTypeObj.code,
         icon: ciTypeObj.icon,
         list: ciModfilter(ciTypeObj, globalConfig, "node", ciTypeObj.code)
       };
-    }
-  });
+
+      if (key === "network_link") {
+        var linkKeyArr = [{
+          code: "phy",
+          key: "phy",
+          name: "物理链路"
+        }, {
+          code: "agg",
+          key: "agg",
+          name: "聚合链路"
+        }, {
+          code: "exit",
+          key: "exit",
+          name: "出口链路"
+        }];
+        linkKeyArr.map(function (link, index) {
+          ciTypeObj = engine.ciTyeCache.getNetworkLinkCiType(link.key);
+
+          if (ciTypeObj) {
+            modSet[link.code] = {
+              name: link.name,
+              code: link.code,
+              icon: ciTypeObj.icon,
+              list: ciModfilter(ciTypeObj, globalConfig, "link", link.code)
+            };
+          }
+
+          return link.code;
+        });
+      }
+    });
+    return modSet;
+  }
 
   if (allCis.length > 0) {
     allCis.forEach(function (element, index) {

package/lib/components/BatchAttrMetric/index.js

@@ -93,6 +93,7 @@ var BatchAttrMetricDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
     }
   })));
 });
+BatchAttrMetricDrawer.displayName = 'BatchAttrMetricDrawer';
 BatchAttrMetricDrawer.propTypes = {
   // 数据项
   allCiSet: _propTypes["default"].any.isRequired,

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

@@ -8,8 +8,10 @@ exports.getCustomIconIdFromHtId = getCustomIconIdFromHtId;
 exports.getEditorIcons = getEditorIcons;
 exports.getGroupDefaultIcons = getGroupDefaultIcons;
 exports.getGroupIconGroups = getGroupIconGroups;
+exports.getIconLibs = getIconLibs;
 exports.getNodeDefaultIcons = getNodeDefaultIcons;
 exports.getNodeIconGroups = getNodeIconGroups;
+exports.getSystemIcons = getSystemIcons;
 exports.getUserCustomIcons = getUserCustomIcons;
 exports.transformCustomIcon2HtIcon = transformCustomIcon2HtIcon;
 exports.transformCustomIcons2HtIcons = transformCustomIcons2HtIcons;
@@ -25,19 +27,36 @@ var groupDefaultIcons = [{
   name: '区域',
   url: '/img/topo/citype-icons/区域_平面.svg'
 }];
+
+function getSystemIcons() {
+  var networkTopoCiTypeIcons = (0, _networkTopoCiTypeIcons["default"])().filter(function (icon) {
+    return !_defaultIcons.DEFAULT_NODE_ICONS.filter(function (defaultIcon) {
+      return defaultIcon.id === icon.id;
+    }).length;
+  });
+  return [].concat(_defaultIcons.DEFAULT_NODE_ICONS, networkTopoCiTypeIcons);
+}
+
+function getIconLibs() {
+  return [{
+    id: '1',
+    name: '默认图标库1',
+    icons: getSystemIcons()
+  }, {
+    id: '2',
+    name: '默认图标库2',
+    icons: getSystemIcons()
+  }];
+}
 /**
  * 获取默认图标
  * @param {*} topo 
  * @returns 
  */
 
+
 function getNodeDefaultIcons(topo) {
-  var networkTopoCiTypeIcons = (0, _networkTopoCiTypeIcons["default"])().filter(function (icon) {
-    return !_defaultIcons.DEFAULT_NODE_ICONS.filter(function (defaultIcon) {
-      return defaultIcon.id === icon.id;
-    }).length;
-  });
-  return [].concat(_defaultIcons.DEFAULT_NODE_ICONS, networkTopoCiTypeIcons, topo.options.icons || []);
+  return [].concat(getSystemIcons(), topo.options.icons || []);
 }
 
 function getGroupDefaultIcons(topo) {

package/lib/core/components/DisplaySettingDrawer/ResourceDisplay/CommonCheckboxGroup.module.scss

@@ -1,4 +1,4 @@
-
+@import "@alifd/next/variables";
 
 .contaienr {
   padding: 16px 12px;
@@ -9,11 +9,11 @@
     margin: -8px;
 
     :global {
-      .next-checkbox-group.next-checkbox-group-hoz {
+      .#{$css-prefix}checkbox-group.next-checkbox-group-hoz {
         display: flex;
         flex-flow: row wrap;
   
-        .next-checkbox-wrapper {
+        .#{$css-prefix}checkbox-wrapper {
           margin-left: 8px;
           margin-right: 8px;
         }

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

@@ -135,5 +135,6 @@ var ResourceDiplayInfoSetting = /*#__PURE__*/(0, _react.forwardRef)(function (pr
     saveCb: saveMarkSetting
   }));
 });
+ResourceDiplayInfoSetting.displayName = 'ResourceDiplayInfoSetting';
 var _default = ResourceDiplayInfoSetting;
 exports["default"] = _default;

package/lib/core/models/TopoApp.js

@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "3.1.9" === 'string' ? "3.1.9" : null;
+var version = typeof "3.1.12" === 'string' ? "3.1.12" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/viewer/components/plugins/ResourceDetail/ResourceDetail.js

@@ -33,6 +33,8 @@ var _ResourceOverview = _interopRequireDefault(require("./components/ResourceOve
 
 var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

package/lib/core/viewer/components/plugins/ResourceDetail/ResourceDetailPlugin.js

@@ -14,6 +14,12 @@ var _ResourceDetail = _interopRequireDefault(require("./ResourceDetail"));
 function ResourceDetailPlugin(props) {
   var viewerProps = props.viewerProps;
   var resourceDetailProps = viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.resourceDetailProps;
+  var hideResourceDetailDrawer = (viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.hideResourceDetailDrawer) === true;
+
+  if (hideResourceDetailDrawer) {
+    return null;
+  }
+
   return /*#__PURE__*/_react["default"].createElement(_ResourceDetail["default"], (0, _extends2["default"])({}, props, resourceDetailProps));
 }