@riil-frontend/component-topology 7.0.9 → 8.0.0-a.10

package/es/networkTopo/services/topo/basic.js

@@ -401,6 +401,8 @@ export default _extends({
   */
   getTopoData: function getTopoData(id) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
+      var _result$links, result;
+
       return _regeneratorRuntime.wrap(function _callee12$(_context12) {
         while (1) {
           switch (_context12.prev = _context12.next) {
@@ -410,20 +412,27 @@ export default _extends({
               return request.get(API_ROOT + "/structure/both/" + id);
 
             case 3:
-              return _context12.abrupt("return", _context12.sent);
+              result = _context12.sent;
+              return _context12.abrupt("return", _extends({}, result, {
+                links: ((_result$links = result.links) !== null && _result$links !== void 0 ? _result$links : []).map(function (item) {
+                  return _extends({}, item, {
+                    ciType: 'network_link'
+                  });
+                })
+              }));
 
-            case 6:
-              _context12.prev = 6;
+            case 7:
+              _context12.prev = 7;
               _context12.t0 = _context12["catch"](0);
               rlog.debug('getTopoData-error', _context12.t0);
               return _context12.abrupt("return", null);
 
-            case 10:
+            case 11:
             case "end":
               return _context12.stop();
           }
         }
-      }, _callee12, null, [[0, 6]]);
+      }, _callee12, null, [[0, 7]]);
     }))();
   },
 
@@ -436,7 +445,9 @@ export default _extends({
   */
   getTopoDataByResource: function getTopoDataByResource(id, resources, groups, exportLinkIdList) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
-      var data, obj;
+      var _result$links2;
+
+      var data, obj, result;
       return _regeneratorRuntime.wrap(function _callee13$(_context13) {
         while (1) {
           switch (_context13.prev = _context13.next) {
@@ -458,9 +469,16 @@ export default _extends({
               }));
 
             case 5:
-              return _context13.abrupt("return", _context13.sent);
+              result = _context13.sent;
+              return _context13.abrupt("return", _extends({}, result, {
+                links: ((_result$links2 = result.links) !== null && _result$links2 !== void 0 ? _result$links2 : []).map(function (item) {
+                  return _extends({}, item, {
+                    ciType: 'network_link'
+                  });
+                })
+              }));
 
-            case 6:
+            case 7:
             case "end":
               return _context13.stop();
           }
@@ -514,7 +532,7 @@ export default _extends({
   /**
   * 保存拓扑绘制数据（第三方库内部结构，无需关心含义）
   * @param {Number} id Topo ID
-  * @param {String} data
+  * @param {String} data ht拓扑序列化数据
   * @returns
   */
   saveSerializeData: function saveSerializeData(id, data) {
@@ -524,7 +542,9 @@ export default _extends({
           switch (_context15.prev = _context15.next) {
             case 0:
               _context15.next = 2;
-              return request.post(API_ROOT + "/structure/" + id, data);
+              return request.post(API_ROOT + "/structure/" + id, {
+                data: data
+              });
 
             case 2:
               return _context15.abrupt("return", _context15.sent);

package/es/networkTopo/store/linkManager.js

@@ -6,7 +6,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  * 链路新增、编辑 Model
  */
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import topoService from '@riil-frontend/component-topology-common/es/services/topo';
 export default function (topoApp) {
   return {
     // 定义 model 的初始 state

package/es/networkTopo/store/topoCenter.js

@@ -8,7 +8,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  *
  */
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import topoService from '@riil-frontend/component-topology-common/es/services/topo';
 export default {
   // 定义 model 的初始 state
   state: {

package/es/networkTopo/store/topoLinkMod.js

@@ -6,7 +6,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  * 拓扑链路相关 Model
  */
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
-import topoService from "@riil-frontend/component-topology-common/es/services/topo";
 export default function (topoApp) {
   return {
     // 定义 model 的初始 state

package/es/networkTopo/utils/resourcePermissionUtil.js

@@ -88,7 +88,7 @@ export function addTopoDataResourcePermission(data) {
         permission: getNodePermission(node)
       });
     }),
-    links: addLinksPermission(links),
-    linkGroups: addLinksPermission(linkGroups)
+    links: addLinksPermission(links || []),
+    linkGroups: addLinksPermission(linkGroups || [])
   });
 }

package/es/utils/topoData.js

@@ -3,7 +3,6 @@ import _extends from "@babel/runtime/helpers/extends";
 var _excluded = ["extraConfig"];
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import _ from "lodash";
-import topoPermissionUtil from "./topoPermissionUtil";
 import buildViewerContextMenu from "../core/viewer/contextmenu/buildContextmenu";
 import buildEditorContextMenu from "../core/editor/contextmenu/buildContextmenu";
 import mergeContextmenu from "../core/common/contextmenu/mergeContextmenu";
@@ -68,7 +67,7 @@ function updateNodeInfo(topoEngine, topoData) {
     nodes: topoData.nodes.map(function (node) {
       var attributes = node.attributes;
       return _extends({}, node, {
-        ipAddress: node.ipAddress || (attributes === null || attributes === void 0 ? void 0 : attributes.ipAddress) || (attributes === null || attributes === void 0 ? void 0 : attributes.ipv4_address) || null,
+        ipAddress: node.ipAddress || (attributes === null || attributes === void 0 ? void 0 : attributes.ipv4_address) || null,
         isShowName: topoEngine.attributeMetricDisplay.getNodeNameVisible(node)
       });
     })
@@ -97,87 +96,6 @@ export function getCiTypes(topoData) {
   var allCi = [].concat(topoData.nodes, topoData.links, topoData.linkGroups);
   return getCiTypesFromCiElements(allCi);
 }
-/**
- * 过滤ci元数据中的属性和指标，用于属性和指标显示设置
- * @param {} ciTypeObj
- * @returns
- */
-
-var ciModfilter = function ciModfilter(ciTypeObj, globalSetting, type, code) {
-  var tips = globalSetting[type + "Tip"];
-  var tags = globalSetting[type + "Tag"];
-  var tipArr = [];
-  var tagArr = [];
-
-  if (tips !== null && tips !== void 0 && tips.isCustom) {
-    var _tips$data$code;
-
-    (_tips$data$code = tips.data[code]) === null || _tips$data$code === void 0 ? void 0 : _tips$data$code.map(function (item) {
-      tipArr.push(item.code + "-" + item.type);
-    });
-  }
-
-  if (tags !== null && tags !== void 0 && tags.isCustom) {
-    var _tags$data$code;
-
-    (_tags$data$code = tags.data[code]) === null || _tags$data$code === void 0 ? void 0 : _tags$data$code.map(function (item) {
-      tagArr.push(item.code + "-" + item.type);
-    });
-  } // rlog.debug(
-  //   "过滤ci元数据中的属性和指标，用于属性和指标显示设置",
-  //   globalSetting,
-  //   tipArr,
-  //   tagArr
-  // );
-
-
-  var custom = [];
-
-  if (type === "node") {
-    custom.push({
-      id: "name-graph",
-      code: "name",
-      name: "图片名称",
-      type: "custom",
-      tag: tagArr.indexOf("name-graph") >= 0,
-      tip: tipArr.indexOf("name-graph") >= 0
-    });
-    custom.push({
-      id: "display_name-ciType",
-      code: "ciType",
-      name: "资源类型",
-      type: "custom",
-      tag: tagArr.indexOf("display_name-ciType") >= 0,
-      tip: tipArr.indexOf("display_name-ciType") >= 0
-    });
-  }
-
-  var attributes = ciTypeObj.attributes.filter(function (attr) {
-    return !!attr.userVisible;
-  }).map(function (item) {
-    var aid = item.code + "-attribute";
-    return {
-      id: aid,
-      code: item.code,
-      name: item.name,
-      type: "attribute",
-      tag: tagArr.indexOf(aid) >= 0,
-      tip: tipArr.indexOf(aid) >= 0
-    };
-  });
-  var metrics = ciTypeObj.metrics.map(function (item) {
-    var mid = item.code + "-metric";
-    return {
-      id: mid,
-      code: item.code,
-      name: item.name,
-      type: "metric",
-      tag: tagArr.indexOf(mid) >= 0,
-      tip: tipArr.indexOf(mid) >= 0
-    };
-  });
-  return [].concat(custom, attributes, metrics);
-};
 /**
  * 格式化拓扑数据
  *
@@ -185,7 +103,6 @@ var ciModfilter = function ciModfilter(ciTypeObj, globalSetting, type, code) {
  * @returns
  */
 
-
 export function parseTopoData(result) {
   var _result$global;
 
@@ -211,7 +128,6 @@ function buildGlobal(_ref2) {
   var _result$config, _engine$viewProps, _result$global2, _result$customGlobal, _result$customGlobal2, _engine$options$viewe, _engine$options$edito, _engine$options$edito2;
 
   var result = _ref2.data,
-      permission = _ref2.permission,
       linkTo = _ref2.linkTo,
       globalConfig = _ref2.globalConfig,
       engine = _ref2.engine;
@@ -239,7 +155,7 @@ function buildGlobal(_ref2) {
     // 背景图
     backgroundImgUrl: (_engine$viewProps = engine.viewProps) !== null && _engine$viewProps !== void 0 && _engine$viewProps.hideBackground ? null : getBackgroundImageUrl(globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.background),
     control: _extends({
-      editable: topoPermissionUtil.isEditable(permission),
+      editable: true,
       // 是否可编辑----控制[编辑]按钮
       moveable: true,
       // 节点是否可移动
@@ -324,10 +240,8 @@ export var combTopoData = function combTopoData(_ref3) {
   var _result$groups;
 
   var data = _ref3.data,
-      permission = _ref3.permission,
       linkTo = _ref3.linkTo,
       globalConfig = _ref3.globalConfig,
-      ciTypeMap = _ref3.ciTypeMap,
       engine = _ref3.engine;
   var result = processCluster(updateNodeInfo(engine, data)); // rlog.debug("combTopoData-接收到数据", result, engine, globalConfig);
 
@@ -338,7 +252,6 @@ export var combTopoData = function combTopoData(_ref3) {
 
   var global = buildGlobal({
     data: result,
-    permission: permission,
     linkTo: linkTo,
     globalConfig: globalConfig,
     engine: engine
@@ -369,18 +282,11 @@ export var combTopoData = function combTopoData(_ref3) {
   }; // 所有资源
 
   var allCis = [].concat(data.nodes, data.links, data.linkGroups);
-
-  var resAndMetrics = _extends({
+  var resAndMetrics = {
     // topo所有ci的id集合
     resIdsList: allCis.map(function (item) {
       return item.id;
     }),
-    ciTypes: getCiTypes(data),
-    // ci类型集合
-    ciTypeMap: ciTypeMap,
-    // ci类型模型map
-    metrics: [],
-    // 所有指标
     nodeIdsList: data.nodes.map(function (item) {
       return {
         ciId: item.id,
@@ -393,84 +299,13 @@ export var combTopoData = function combTopoData(_ref3) {
         operation: linkObj.operation
       };
     })
-  }, getCiModSet({
-    engine: engine,
-    data: data,
-    allCis: allCis,
-    ciTypeMap: ciTypeMap,
-    globalConfig: globalConfig
-  })); // rlog.debug("combTopoData-格式化后数据", topoData, resAndMetrics);
-
+  }; // rlog.debug("combTopoData-格式化后数据", topoData, resAndMetrics);
 
   return {
     topoData: topoData,
     resAndMetrics: resAndMetrics
   };
 };
-export function getCiModSet(params) {
-  var data = params.data,
-      engine = params.engine,
-      allCis = params.allCis,
-      ciTypeMap = params.ciTypeMap,
-      globalConfig = params.globalConfig; // 当前拓扑资源字典
-
-  var ciDoc = {};
-  var ciTypesDoc = {};
-  var allCiModSet = getNodeModSet();
-
-  function getNodeModSet() {
-    var ciTypes = getCiTypesFromCiElements(data.nodes);
-    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)
-      };
-    }); // console.log("modSet--------------------", modSet);
-
-    return modSet;
-  }
-
-  if (allCis.length > 0) {
-    allCis.forEach(function (element, index) {
-      var ciType = element.ciType;
-      ciDoc[element.id] = {
-        code: element.ciType,
-        name: element.name,
-        tag: [],
-        tip: []
-      };
-      ciTypesDoc[ciType] = ciTypesDoc[ciType] || [];
-      ciTypesDoc[element.ciType].push({
-        ciId: element.id
-      });
-    });
-  }
-
-  return {
-    ciDoc: ciDoc,
-    // ci信息集合
-    ciTypesDoc: ciTypesDoc,
-    // 每种ci含有的ci
-    allCiModSet: allCiModSet // 资源类型含有属性和指标集合
-
-  };
-}
 /**
  * 获得两个节点间的连线列表
  * @param {*} links

package/lib/components/BatchAttrMetric/setting.js

@@ -53,10 +53,6 @@ var Setting = function Setting(_ref) {
       saveCb = props.saveCb,
       elementType = props.elementType;
 
-  _rlog["default"].debug("Setting-resAndMetrics-allCiSet-elementType", showType, props, elementType);
-
-  _rlog["default"].debug("Setting----allCiSet", allCiSet);
-
   var _useState = (0, _react.useState)(Object.keys(allCiSet)[0]),
       ciType = _useState[0],
       setCiType = _useState[1];

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

@@ -0,0 +1,62 @@
+"use strict";
+
+exports.__esModule = true;
+exports["default"] = void 0;
+var _default = [{
+  'id': 'system.防火墙2.5D',
+  'name': '防火墙',
+  'url': '/img/topo/basicIcon/防火墙2.5D.svg'
+}, {
+  'id': 'system.云2.5D',
+  'name': '云',
+  'url': '/img/topo/basicIcon/云2.5D.svg'
+}, {
+  'id': 'system.五角星2.5D',
+  'name': '五角星',
+  'url': '/img/topo/basicIcon/五角星2.5D.svg'
+}, {
+  'id': 'system.旗帜2.5D',
+  'name': '旗帜',
+  'url': '/img/topo/basicIcon/旗帜2.5D.svg'
+}, {
+  'id': 'system.人员',
+  'name': '人员',
+  'url': '/img/topo/basicIcon/人员平面.svg'
+}, {
+  'id': 'system.楼宇',
+  'name': '楼宇',
+  'url': '/img/topo/basicIcon/楼宇平面.svg'
+}, {
+  'id': 'system.黑客',
+  'name': '黑客',
+  'url': '/img/topo/basicIcon/黑客平面.svg'
+}, {
+  'id': 'system.摄像头',
+  'name': '摄像头',
+  'url': '/img/topo/basicIcon/摄像头平面.svg'
+}, {
+  'id': 'system.蓝色云端',
+  'name': '蓝色云端',
+  'url': '/img/topo/basicIcon/云平面.svg'
+}, {
+  'id': 'system.五角星平面',
+  'name': '五角星',
+  'url': '/img/topo/basicIcon/五角星平面.svg'
+}, {
+  'id': 'system.旗帜平面',
+  'name': '旗帜',
+  'url': '/img/topo/basicIcon/旗帜平面.svg'
+}, {
+  'id': 'system.防火墙平面',
+  'name': '防火墙',
+  'url': '/img/topo/basicIcon/防火墙平面.svg'
+}, {
+  'id': 'system.线路平面',
+  'name': '线路',
+  'url': '/img/topo/basicIcon/线路平面.svg'
+}, {
+  'id': 'system.打印机平面',
+  'name': '打印机',
+  'url': '/img/topo/basicIcon/打印机平面.svg'
+}];
+exports["default"] = _default;

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

@@ -23,6 +23,8 @@ var _manager = _interopRequireDefault(require("@riil-frontend/component-topology
 
 var _ResourceTypeLimit = require("../../../constants/ResourceTypeLimit");
 
+var _basicIcons = _interopRequireDefault(require("./basicIcons"));
+
 /**
  * 获取默认图标
  * @param {*} topo 
@@ -60,19 +62,15 @@ function getResourceIcons(topo) {
 
 
 function getBasicIcons(topo, containsGroupIcon) {
-  var icons = _manager["default"].iconLibManager.getIcons();
-
-  icons = icons.filter(function (icon) {
+  var nodeIcons = _manager["default"].iconLibManager.getNodeIcons().filter(function (icon) {
     return !icon.ciType;
   });
 
   if (containsGroupIcon === false) {
-    icons = icons.filter(function (icon) {
-      return icon.type !== 'group';
-    });
+    return [].concat(nodeIcons, _basicIcons["default"]);
   }
 
-  return icons;
+  return [_manager["default"].iconLibManager.getGroupIcon()].concat(nodeIcons, _basicIcons["default"]);
 }
 
 function getGroupDefaultIcons(topo) {

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

@@ -13,6 +13,8 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _BatchAttrMetric = _interopRequireDefault(require("../../../components/BatchAttrMetric"));
 
+var _nodeCiTypeAttrUtil = require("./nodeCiTypeAttrUtil");
+
 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; }
@@ -34,22 +36,15 @@ var ResourceDiplayInfoSetting = /*#__PURE__*/(0, _react.forwardRef)(function (pr
       markData = _useState[0],
       setMarkarkData = _useState[1];
 
-  var _topo$store$useModel = topo.store.useModel("topoBizMod"),
-      bizState = _topo$store$useModel[0],
-      bizDispatchers = _topo$store$useModel[1]; // rlog.debug('TopoView---income', topoId, viewState);
-
-
-  var resAndMetrics = bizState.resAndMetrics;
-  var allCiModSet = resAndMetrics.allCiModSet,
-      allLinkModSet = resAndMetrics.allLinkModSet;
-
   var openMarkSetting = function openMarkSetting(parm) {
-    _rlog["default"].debug("openMarkSetting", parm, elementType, showType, allCiModSet, allLinkModSet);
+    _rlog["default"].debug("openMarkSetting", parm, elementType, showType);
 
     if (queryData) {
       setMarkarkData(queryData());
     } else {
-      setMarkarkData(elementType === "node" ? allCiModSet : allLinkModSet);
+      setMarkarkData(elementType === "node" ? (0, _nodeCiTypeAttrUtil.getNodeCiModSet)({
+        topo: topo
+      }) : undefined);
     }
 
     batchAttrMetric.current.show({

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

@@ -0,0 +1,127 @@
+"use strict";
+
+exports.__esModule = true;
+exports.getNodeCiModSet = getNodeCiModSet;
+
+var _topoData = require("../../../utils/topoData");
+
+// 资源类型含有属性和指标集合
+function getNodeCiModSet(params) {
+  var topo = params.topo;
+  var data = topo.store.getModelState('topoMod').data;
+  var globalConfig = data.global.extraConfig;
+  var ciTypeMap = topo.ciTyeCache.ciTypes;
+
+  function getNodeModSet() {
+    var ciTypes = (0, _topoData.getCiTypesFromCiElements)(data.nodes);
+    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)
+      };
+    }); // console.log("modSet--------------------", modSet);
+
+    return modSet;
+  }
+  /**
+   * 过滤ci元数据中的属性和指标，用于属性和指标显示设置
+   * @param {} ciTypeObj
+   * @returns
+   */
+
+
+  function ciModfilter(ciTypeObj, globalSetting, type, code) {
+    var tips = globalSetting[type + "Tip"];
+    var tags = globalSetting[type + "Tag"];
+    var tipArr = [];
+    var tagArr = [];
+
+    if (tips !== null && tips !== void 0 && tips.isCustom) {
+      var _tips$data$code;
+
+      (_tips$data$code = tips.data[code]) === null || _tips$data$code === void 0 ? void 0 : _tips$data$code.map(function (item) {
+        tipArr.push(item.code + "-" + item.type);
+      });
+    }
+
+    if (tags !== null && tags !== void 0 && tags.isCustom) {
+      var _tags$data$code;
+
+      (_tags$data$code = tags.data[code]) === null || _tags$data$code === void 0 ? void 0 : _tags$data$code.map(function (item) {
+        tagArr.push(item.code + "-" + item.type);
+      });
+    } // rlog.debug(
+    //   "过滤ci元数据中的属性和指标，用于属性和指标显示设置",
+    //   globalSetting,
+    //   tipArr,
+    //   tagArr
+    // );
+
+
+    var custom = [];
+
+    if (type === 'node') {
+      custom.push({
+        id: 'name-graph',
+        code: 'name',
+        name: '图片名称',
+        type: 'custom',
+        tag: tagArr.indexOf('name-graph') >= 0,
+        tip: tipArr.indexOf('name-graph') >= 0
+      });
+      custom.push({
+        id: 'display_name-ciType',
+        code: 'ciType',
+        name: '资源类型',
+        type: 'custom',
+        tag: tagArr.indexOf('display_name-ciType') >= 0,
+        tip: tipArr.indexOf('display_name-ciType') >= 0
+      });
+    }
+
+    var attributes = ciTypeObj.attributes.filter(function (attr) {
+      return !!attr.userVisible;
+    }).map(function (item) {
+      var aid = item.code + "-attribute";
+      return {
+        id: aid,
+        code: item.code,
+        name: item.name,
+        type: 'attribute',
+        tag: tagArr.indexOf(aid) >= 0,
+        tip: tipArr.indexOf(aid) >= 0
+      };
+    });
+    var metrics = ciTypeObj.metrics.map(function (item) {
+      var mid = item.code + "-metric";
+      return {
+        id: mid,
+        code: item.code,
+        name: item.name,
+        type: 'metric',
+        tag: tagArr.indexOf(mid) >= 0,
+        tip: tipArr.indexOf(mid) >= 0
+      };
+    });
+    return [].concat(custom, attributes, metrics);
+  }
+
+  ;
+  return getNodeModSet();
+}

package/lib/core/components/TopoView/GraphViewPanel.js

@@ -47,7 +47,6 @@ function GraphViewPanel(props) {
     style: {
       background: canvasColor
     },
-    onFocus: onFocus,
-    on: true
+    onFocus: onFocus
   }, props.children);
 }