@riil-frontend/component-topology 7.0.0-dev.9 → 7.0.2

package/lib/core/components/DisplaySettingDrawer/LineExpandAllRadioGroup.js

@@ -30,8 +30,7 @@ var LineExpandAllRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function
 
   var value = props.value,
       onChange = props.onChange,
-      isEdit = props.isEdit,
-      isNetworkTopo = props.isNetworkTopo;
+      isEdit = props.isEdit;
 
   var _useState = (0, _react.useState)(value === 1 ? "0" : "1"),
       showType = _useState[0],

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

@@ -5,12 +5,16 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = GraphViewPanel;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _useCanvasTheme2 = _interopRequireDefault(require("../../hooks/useCanvasTheme"));
 
 var _TopoViewModule = _interopRequireDefault(require("./TopoView.module.scss"));
 
+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; }
+
 function GraphViewPanel(props) {
   var topo = props.topo,
       hideBackgroundColor = props.hideBackgroundColor;
@@ -24,10 +28,26 @@ function GraphViewPanel(props) {
   }),
       canvasColor = _useCanvasTheme.canvasColor;
 
+  (0, _react.useEffect)(function () {
+    // eslint-disable-next-line no-underscore-dangle
+    window._debugtopo = topo; // eslint-disable-next-line no-underscore-dangle
+
+    window._topo = topo;
+  }, []);
+
+  var onFocus = function onFocus() {
+    // eslint-disable-next-line no-underscore-dangle
+    window._debugtopo = topo; // eslint-disable-next-line no-underscore-dangle
+
+    window._topo = topo;
+  };
+
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _TopoViewModule["default"].viewPanel,
     style: {
       background: canvasColor
-    }
+    },
+    onFocus: onFocus,
+    on: true
   }, props.children);
 }

package/lib/core/editor/components/Toolbar/buttons.js

@@ -57,7 +57,7 @@ function getButtons(isNetworkTopo) {
   _Divider["default"], _NodeImageButton["default"], // 替换图片
   _NodeSizeButton["default"], // 图片尺寸
   _Divider["default"], _Layout["default"], // 布局方式
-  _NodeAlignWidget["default"] // 对齐方式
-  // SearchWidget, // 搜索
+  _NodeAlignWidget["default"], // 对齐方式
+  _SearchWidget["default"] // 搜索
   ]);
 }

package/lib/core/editor/components/Toolbar/widgets/FontColorButton.js

@@ -34,12 +34,17 @@ function FontColorDropdown(props) {
       topo = props.topo,
       opacity = props.opacity,
       background = props.background,
-      setStyle = props.setStyle;
+      setStyle = props.setStyle,
+      _props$fieldDisabled = props.fieldDisabled,
+      fieldDisabled = _props$fieldDisabled === void 0 ? {} : _props$fieldDisabled;
 
   var _useState = (0, _react.useState)(false),
       disabled = _useState[0],
       setDisabled = _useState[1];
 
+  var backgroundEnabled = fieldDisabled.background !== true;
+  var opacityEnabled = fieldDisabled.opacity !== true;
+
   var backOpacityChange = function backOpacityChange(value) {
     topo.historyManager.beginTransaction();
     onChange({
@@ -158,7 +163,7 @@ function FontColorDropdown(props) {
     onChange: colorChang,
     onPickerFocus: onFocus,
     onPickerBlur: onBlur
-  }))), /*#__PURE__*/_react["default"].createElement("div", {
+  }))), (backgroundEnabled || opacityEnabled) && /*#__PURE__*/_react["default"].createElement("div", {
     className: _FontColorButtonModule["default"].backgroundColor
   }, /*#__PURE__*/_react["default"].createElement("span", null, "\u80CC\u666F\u586B\u5145"), /*#__PURE__*/_react["default"].createElement("div", {
     className: _FontColorButtonModule["default"].backOpacity
@@ -191,7 +196,8 @@ function FontColorButton(props) {
   var showLabel = props.showLabel,
       topo = props.topo,
       style = props.style,
-      setStyle = props.setStyle;
+      setStyle = props.setStyle,
+      fieldDisabled = props.fieldDisabled;
   return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
     label: "\u6587\u5B57\u989C\u8272",
     tooltip: "\u6587\u5B57\u989C\u8272",
@@ -200,6 +206,7 @@ function FontColorButton(props) {
     color: style.color,
     background: style.background,
     opacity: style.opacity,
+    fieldDisabled: fieldDisabled,
     setStyle: setStyle,
     onChange: function onChange(val) {
       setStyle(val);

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js

@@ -13,20 +13,26 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _fontStyleUtil = _interopRequireDefault(require("../../../../../../settings/common/text/fontStyleUtil"));
-
 var _colorUtil = require("../colorUtil");
 
 var _excluded = ["color", "background", "opacity", "bold", "italic"];
 
 function getTextStyle(element) {
+  var opacity = element.a('edge.tag.opacity');
+
+  if (opacity === null || opacity === undefined) {
+    opacity = 1;
+  }
+
   return (0, _extends2["default"])({
     color: (0, _colorUtil.parseColor)(element.a('edge.tag.color')),
     fontFamily: element.a('edge.tag.fontFamily') || '微软雅黑',
     fontSize: element.a('edge.tag.fontSize'),
     bold: !!element.a('edge.tag.fontBold'),
     italic: !!element.a('edge.tag.fontItalic')
-  }, (0, _colorUtil.parseBackground)(element.a('edge.tag.background')));
+  }, (0, _colorUtil.parseBackground)(element.a('edge.tag.background')), {
+    opacity: opacity
+  });
 }
 
 function setTextStyle(element, style, topo) {

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/groupTitle.js

@@ -11,6 +11,8 @@ exports.setTextStyle = setTextStyle;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _clusterUtil = require("../../../../../../../../../utils/clusterUtil");
+
 var _fontStyleUtil = _interopRequireDefault(require("../../../../../../settings/common/text/fontStyleUtil"));
 
 var _colorUtil = require("../colorUtil");
@@ -63,7 +65,12 @@ function setTextStyle(element, style, topo) {
 
 function getEnabledFields(element) {
   if (!element.isExpanded()) {
-    return ['fontFamily', 'fontSize', 'color', 'background', 'opacity'];
+    return ['fontFamily', 'fontSize', 'bold', 'italic', 'underline', 'color', 'background', 'opacity'];
+  } // 集群禁用背景颜色设置
+
+
+  if ((0, _clusterUtil.isClusterHtElement)(element)) {
+    return ['fontFamily', 'fontSize', 'bold', 'italic', 'color'];
   }
 
   return ['fontFamily', 'fontSize', 'bold', 'italic', 'color', 'background', 'opacity'];

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/nodeTag.js

@@ -13,18 +13,27 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _fontStyleUtil = _interopRequireDefault(require("../../../../../../settings/common/text/fontStyleUtil"));
-
 var _colorUtil = require("../colorUtil");
 
-var _excluded = ["color", "background", "opacity", "bold", "italic"];
+var _excluded = ["color", "background", "opacity", "bold", "italic", "underline"];
 
 function getTextStyle(element) {
-  var underline = !!element.a('node.tag.fontUnderline');
+  var opacity = element.a('node.tag.opacity');
+
+  if (opacity === null || opacity === undefined) {
+    opacity = 1;
+  }
+
   return (0, _extends2["default"])({
-    color: (0, _colorUtil.parseColor)(element.a('ht.color')),
-    underline: underline
-  }, _fontStyleUtil["default"].toMap(element.a('ht.font')), (0, _colorUtil.parseBackground)(element.a('ht.background')));
+    color: (0, _colorUtil.parseColor)(element.a('node.tag.color')),
+    fontFamily: element.a('node.tag.fontFamily') || '微软雅黑',
+    fontSize: element.a('node.tag.fontSize'),
+    bold: !!element.a('node.tag.fontBold'),
+    italic: !!element.a('node.tag.fontItalic'),
+    underline: !!element.a('node.tag.fontUnderline')
+  }, (0, _colorUtil.parseBackground)(element.a('node.tag.background')), {
+    opacity: opacity
+  });
 }
 
 function setTextStyle(element, style, topo) {
@@ -33,6 +42,7 @@ function setTextStyle(element, style, topo) {
       opacity = style.opacity,
       bold = style.bold,
       italic = style.italic,
+      underline = style.underline,
       otherStyle = (0, _objectWithoutPropertiesLoose2["default"])(style, _excluded);
   var tagStyle = (0, _extends2["default"])({}, otherStyle);
 
@@ -48,6 +58,10 @@ function setTextStyle(element, style, topo) {
     tagStyle.fontItalic = italic;
   }
 
+  if ('underline' in style) {
+    tagStyle.fontUnderline = underline;
+  }
+
   if ('background' in style) {
     // 背景颜色
     var prevStyle = getTextStyle(element);

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/textStyleUtil.js

@@ -102,6 +102,11 @@ function getTextStyle(htSelection, styleNames) {
 
     var val = fieldValueList[0];
     var different = fieldValueList.filter(function (item) {
+      // 如果是颜色，特殊处理
+      if (item && val && item.rgb) {
+        return item.rgb.r + "," + item.rgb.g + "," + item.rgb.b + "," + item.rgb.a !== val.rgb.r + "," + val.rgb.g + "," + val.rgb.b + "," + val.rgb.a;
+      }
+
       return item !== val;
     });
 

package/lib/core/editor/components/settings/PropertyView.js

@@ -23,8 +23,10 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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; }
 
+function PropertyViewProvider(props) {}
+
 function PropertyPanel(props) {
-  var _classNames;
+  var _editorProps$property, _editorProps$property2, _classNames;
 
   var topo = props.topo,
       editorProps = props.editorProps;
@@ -36,21 +38,19 @@ function PropertyPanel(props) {
   var _store$useModelState = store.useModelState('selection'),
       selection = _store$useModelState.selection;
 
-  var _topo$store$useModel = topo.store.useModel('topoEdit'),
-      topoEditState = _topo$store$useModel[0],
-      topoEditDispatchers = _topo$store$useModel[1];
-
+  var topoEditState = topo.store.useModelState('topoEdit');
   var propertyPanelVisible = topoEditState.propertyPanelVisible;
   var propertyViewManager = (0, _react.useMemo)(function () {
     return new _PropertyViewManager["default"](topo);
-  }, []); // 临时适配连线属性面板类型，后期组件支持自定义适配
-
-  (0, _edgePropertyViewAdapter.addEdgePropertyViews)(propertyViewManager, editorProps);
+  }, []);
+  propertyViewManager.addViews((_editorProps$property = editorProps.propertyView) === null || _editorProps$property === void 0 ? void 0 : _editorProps$property.views);
 
-  propertyViewManager.customGetViewType = editorProps.getPropertyViewType || function (elements) {
+  propertyViewManager.customGetViewType = ((_editorProps$property2 = editorProps.propertyView) === null || _editorProps$property2 === void 0 ? void 0 : _editorProps$property2.getPropertyViewType) || function (elements) {
     return (0, _edgePropertyViewAdapter.adapterGetEdgePropertyViewType)(elements, editorProps);
-  };
+  }; // 临时适配连线属性面板类型，后期组件支持自定义适配
+
 
+  (0, _edgePropertyViewAdapter.addEdgePropertyViews)(propertyViewManager, editorProps);
   var PropertyView = propertyViewManager.getPropertyView();
   (0, _react.useEffect)(function () {
     if (graphLoaded) {

package/lib/core/editor/components/settings/Settings.js

@@ -13,6 +13,8 @@ var _useSettingRuntimeState = _interopRequireDefault(require("./useSettingRuntim
 
 var _updateElementProperty = _interopRequireDefault(require("./core/updateElementProperty"));
 
+var _htElementUtils = require("../../../../utils/htElementUtils");
+
 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; }
@@ -46,10 +48,16 @@ function PropertyViewContainer(props) {
   var elementProps = {};
 
   if (selection.length === 1) {
+    var element = selectionElements[0];
     elementProps = {
-      selectionElement: selectionElements[0],
+      element: element,
+      selectionElement: element,
       values: singleElementValues
     };
+
+    if ((0, _htElementUtils.isEdge)(element)) {
+      elementProps.edge = element;
+    }
   }
 
   return /*#__PURE__*/_react["default"].createElement(PropertyView, (0, _extends2["default"])({

package/lib/core/editor/components/settings/core/PropertyViewManager.js

@@ -13,17 +13,18 @@ var _getPropertyViewType2 = _interopRequireDefault(require("./getPropertyViewTyp
 
 var PropertyViewManager = /*#__PURE__*/function () {
   function PropertyViewManager(topo) {
-    this.viewMap = _propertyViews["default"];
+    this.viewMap = (0, _extends2["default"])({}, _propertyViews["default"]);
     this.topo = void 0;
     this.customGetViewType = void 0;
     this.topo = topo;
+    this.topo.propertyViewManager = this;
     this.open = this.open.bind(this);
   }
 
   var _proto = PropertyViewManager.prototype;
 
-  _proto.updateViews = function updateViews(viewMap) {
-    this.viewMap = (0, _extends2["default"])({}, _propertyViews["default"], viewMap);
+  _proto.addViews = function addViews(viewMap) {
+    Object.assign(this.viewMap, viewMap);
   };
 
   _proto.init = function init() {

package/lib/core/editor/components/settings/core/edgePropertyViewAdapter.js

@@ -1,15 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 exports.__esModule = true;
 exports.adapterGetEdgePropertyViewType = adapterGetEdgePropertyViewType;
 exports.addEdgePropertyViews = addEdgePropertyViews;
 
 var _htElementUtils = require("../../../../../utils/htElementUtils");
 
-var _addEdgeProps = _interopRequireDefault(require("../propertyViews/edge/addEdgeProps"));
-
 function adapterGetEdgePropertyViewType(selection, editorProps) {
   var fn = editorProps.getEdgePropertyViewType;
 
@@ -24,10 +20,5 @@ function adapterGetEdgePropertyViewType(selection, editorProps) {
 }
 
 function addEdgePropertyViews(propertyViewManager, editorProps) {
-  var oldMap = editorProps.edgePropertyViews || {};
-  var map = {};
-  Object.keys(oldMap).forEach(function (name) {
-    map[name] = (0, _addEdgeProps["default"])(oldMap[name]);
-  });
-  propertyViewManager.updateViews(map);
+  propertyViewManager.addViews(editorProps.edgePropertyViews || {});
 }

package/lib/core/editor/components/settings/propertyViews/node/data/Data.js

@@ -21,12 +21,12 @@ var _select = _interopRequireDefault(require("@alifd/next/lib/select"));
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _useHtElement = _interopRequireDefault(require("../../../../../../common/hooks/useHtElement"));
-
 var _textModule = _interopRequireDefault(require("../../../../../../common/text.module.scss"));
 
 var _NodeRelateResourceButton = _interopRequireDefault(require("./NodeRelateResourceButton"));
 
+var _PlatformDisplay = _interopRequireDefault(require("./PlatformDisplay"));
+
 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; }
@@ -172,5 +172,7 @@ function Data(props) {
     name: "attrObject.bindTopo",
     topo: topo,
     onChange: handleBindTopoChange
-  })))));
+  })), (editorProps === null || editorProps === void 0 ? void 0 : editorProps.topoType) === 'cmpTopo' && node.getTag() && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: "\u6240\u5C5E\u5E73\u53F0"
+  }, /*#__PURE__*/_react["default"].createElement(_PlatformDisplay["default"], props)))));
 }

package/lib/core/editor/components/settings/propertyViews/node/data/PlatformDisplay.js

@@ -0,0 +1,23 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+function PlatformDisplay(props) {
+  var topo = props.topo,
+      node = props.node;
+  var data = topo.dataModel.useDataById(node.getTag());
+
+  if (!data) {
+    return '';
+  }
+
+  return data.isSubResource ? data.attributes.platform : '本级平台';
+}
+
+var _default = PlatformDisplay;
+exports["default"] = _default;

package/lib/core/hooks/usePolling.js

@@ -26,12 +26,7 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 var usePolling = function usePolling(props) {
   var topo = props.topo;
   var store = topo.store;
-  var topoState = store.useModelState('topoMod');
-
-  var _store$useModel = store.useModel('topoBizMod'),
-      bizState = _store$useModel[0],
-      bizDispatchers = _store$useModel[1];
-
+  var bizState = store.useModelState('topoBizMod');
   var resAndMetrics = bizState.resAndMetrics,
       pollingSwitch = bizState.pollingSwitch;
   var displayConfig = topo.store.useModelState('displayConfig');

package/lib/core/hooks/useTopoEdit.js

@@ -75,8 +75,10 @@ var useTopoEdit = function useTopoEdit(params) {
       setComboResData = _useState2[1];
 
   var reset = function reset() {
+    var _topo$historyManager;
+
     topoEditDispatchers.reset();
-    topo.historyManager.destroy();
+    (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.destroy();
   };
   /**
    * 增加资源到视图

package/lib/core/models/Alarm.js

@@ -237,23 +237,11 @@ var Alarm = /*#__PURE__*/function () {
 
   _proto.hmGetTopoAlarm = /*#__PURE__*/function () {
     var _hmGetTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id) {
-      var _this$topo$store$getS, data, resAndMetrics, topoData, _this$getState2, alarmIsOpened, alarmOpening, nodeIdsList, linkIdsList, resIdsList, mainCiIdList, endTime, startTime, parms, result;
-
+      var mainCiIdList, endTime, startTime, parms, result;
       return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
-              _this$topo$store$getS = this.topo.store.getState().topoMod, data = _this$topo$store$getS.data, resAndMetrics = _this$topo$store$getS.resAndMetrics, topoData = _this$topo$store$getS.topoData;
-              _this$getState2 = this.getState(), alarmIsOpened = _this$getState2.alarmIsOpened, alarmOpening = _this$getState2.alarmOpening; // const { nodes, links } = data;
-
-              nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList, resIdsList = resAndMetrics.resIdsList; // rlog.debug(
-              //   "获取告警列表--resAndMetrics,topoData,data",
-              //   this.topo,
-              //   resAndMetrics,
-              //   topoData,
-              //   data
-              // );
-
               mainCiIdList = this.topo.dataModel.getDatas().filter(function (ci) {
                 return !!ci.operation;
               }) // 过滤掉权限
@@ -262,7 +250,7 @@ var Alarm = /*#__PURE__*/function () {
               });
 
               if (!(mainCiIdList.length === 0)) {
-                _context3.next = 7;
+                _context3.next = 4;
                 break;
               }
 
@@ -272,7 +260,7 @@ var Alarm = /*#__PURE__*/function () {
               });
               return _context3.abrupt("return");
 
-            case 7:
+            case 4:
               //rlog.debug("获取告警列表", mainCiIdList);
               endTime = null; // new Date().valueOf();
 
@@ -297,10 +285,10 @@ var Alarm = /*#__PURE__*/function () {
                   endTime: endTime
                 }
               };
-              _context3.next = 12;
+              _context3.next = 9;
               return _topo["default"].getAlarmByIds(parms);
 
-            case 12:
+            case 9:
               result = _context3.sent;
 
               _rlog["default"].debug("getAlarmById-result", result); // if (alarmIsOpened) {
@@ -313,7 +301,7 @@ var Alarm = /*#__PURE__*/function () {
               // });
 
 
-            case 14:
+            case 11:
             case "end":
               return _context3.stop();
           }
@@ -408,14 +396,14 @@ var Alarm = /*#__PURE__*/function () {
     var _openTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(id) {
       var _this2 = this;
 
-      var _this$getState3, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
+      var _this$getState2, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
 
       return _regenerator["default"].wrap(function _callee6$(_context6) {
         while (1) {
           switch (_context6.prev = _context6.next) {
             case 0:
               // 如果当前拓扑图开启中或已开启则退出
-              _this$getState3 = this.getState(), alarmOpening = _this$getState3.alarmOpening, topoAlarmIsOpen = _this$getState3.topoAlarmIsOpen;
+              _this$getState2 = this.getState(), alarmOpening = _this$getState2.alarmOpening, topoAlarmIsOpen = _this$getState2.topoAlarmIsOpen;
 
               if (!(this.currentTopoId === id && (topoAlarmIsOpen || alarmOpening))) {
                 _context6.next = 3;
@@ -477,14 +465,14 @@ var Alarm = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _closeTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(id) {
-      var _this$getState4, alarmIsOpened, alarmOpening;
+      var _this$getState3, alarmIsOpened, alarmOpening;
 
       return _regenerator["default"].wrap(function _callee7$(_context7) {
         while (1) {
           switch (_context7.prev = _context7.next) {
             case 0:
               // 如果未开启则退出
-              _this$getState4 = this.getState(), alarmIsOpened = _this$getState4.alarmIsOpened, alarmOpening = _this$getState4.alarmOpening;
+              _this$getState3 = this.getState(), alarmIsOpened = _this$getState3.alarmIsOpened, alarmOpening = _this$getState3.alarmOpening;
 
               if (!(!alarmIsOpened && !alarmOpening)) {
                 _context7.next = 3;
@@ -574,13 +562,13 @@ var Alarm = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _handleAlarmEvent = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(alertData) {
-      var _this$getState5, alarmIsOpened, resAndMetrics, resIdsList, nodeIdsList, linkIdsList, alarmDispatchers, sendAl, idsList, operations, _yield$alarmDispatche, eqFlag, alarmlist, _this$topo$viewProps, _this$topo$viewProps2;
+      var _this$getState4, alarmIsOpened, resAndMetrics, resIdsList, nodeIdsList, linkIdsList, alarmDispatchers, sendAl, idsList, operations, _yield$alarmDispatche, eqFlag, alarmlist, _this$topo$viewProps, _this$topo$viewProps2;
 
       return _regenerator["default"].wrap(function _callee9$(_context9) {
         while (1) {
           switch (_context9.prev = _context9.next) {
             case 0:
-              _this$getState5 = this.getState(), alarmIsOpened = _this$getState5.alarmIsOpened;
+              _this$getState4 = this.getState(), alarmIsOpened = _this$getState4.alarmIsOpened;
               resAndMetrics = this.topo.store.getState().topoMod.resAndMetrics;
               resIdsList = resAndMetrics.resIdsList, nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList;
               alarmDispatchers = this.topo.store.getModelDispatchers("topoAlarm"); // 添加事件

package/lib/core/models/AttributeMetricDisplay.js

@@ -23,6 +23,8 @@ var _topoData = require("../../utils/topoData");
 
 var _services = require("../services");
 
+var _manageStatusUtil = require("../utils/manageStatusUtil");
+
 var _attributeFormatter = _interopRequireDefault(require("./attributeFormatter"));
 
 var _DictCache = _interopRequireDefault(require("./cache/DictCache"));
@@ -39,12 +41,7 @@ function filterUnExistedFields(fields, ciTypeMeta) {
   return fields.filter(function (item) {
     return isFieldExisted(item, ciTypeMeta);
   });
-} // 无权限不显示标注、悬浮框
-
-
-var filterByPermission = function filterByPermission(resource, items) {
-  return resource.operation ? items : [];
-};
+}
 /**
  * 资源标注、悬浮框数据
  */
@@ -151,13 +148,31 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         type: 'node',
         id: node.id,
         ciType: ciType,
-        tags: filterByPermission(node, ciTypeConfig.tags),
-        tips: filterByPermission(node, ciTypeConfig.tips)
+        tags: _this.filterCiFiledConfigItems(node, ciTypeConfig.tags),
+        tips: _this.filterCiFiledConfigItems(node, ciTypeConfig.tips)
       };
     });
   } // eslint-disable-next-line class-methods-use-this
   ;
 
+  _proto.filterCiFiledConfigItems = function filterCiFiledConfigItems(data, ciTypeItemConfigs) {
+    // 无权限不显示标注、悬浮框
+    var filterByPermission = function filterByPermission(resource, items) {
+      return resource.operation ? items : [];
+    };
+
+    var list = filterByPermission(data, ciTypeItemConfigs); // 未监控不显示指标
+
+    if (!(0, _manageStatusUtil.isMonitoring)(data)) {
+      list = list.filter(function (item) {
+        return item.type !== 'metric';
+      });
+    }
+
+    return list;
+  } // eslint-disable-next-line class-methods-use-this
+  ;
+
   _proto.getModelType = function getModelType(ci) {
     if (ci.ciType === 'network_link') {
       return ci.attributes.support_templates;
@@ -220,8 +235,8 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         id: link.id,
         ciType: ciType
       }, tagTipConfig, {
-        tags: filterByPermission(link, tagTipConfig.tags),
-        tips: filterByPermission(link, tagTipConfig.tips)
+        tags: _this2.filterCiFiledConfigItems(link, tagTipConfig.tags),
+        tips: _this2.filterCiFiledConfigItems(link, tagTipConfig.tips)
       });
     });
   }

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "7.0.0-dev.9" === 'string' ? "7.0.0-dev.9" : null;
+var version = typeof "7.0.2" === 'string' ? "7.0.2" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -597,11 +597,13 @@ var Topo = /*#__PURE__*/function () {
               return this.options.onSwitchToEditMode(this);
 
             case 12:
-              // 加载自定义上传的图标
+              // 更新节点名称显示隐藏
+              this.attributeMetricDisplay.updateNodesNameVisible(); // 加载自定义上传的图标
+
               iconManageDispatchers = this.store.getModelDispatchers('customIcon');
               iconManageDispatchers.loadEditorIcons();
 
-            case 14:
+            case 15:
             case "end":
               return _context12.stop();
           }