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

package/es/core/components/DisplaySettingDrawer/DisplaySetting.js

@@ -1,6 +1,6 @@
 import _Box from "@alifd/next/es/box";
-import _extends from "@babel/runtime/helpers/extends";
 import _Form from "@alifd/next/es/form";
+import _extends from "@babel/runtime/helpers/extends";
 import _Field from "@alifd/next/es/field";
 import React, { useEffect, useImperativeHandle, useState } from 'react';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
@@ -61,22 +61,7 @@ function DisplaySetting(props, ref) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Form, {
     field: field,
     labelAlign: "top"
-  }, isNetworkTopo && /*#__PURE__*/React.createElement(_Form.Item, {
-    label: "\u663E\u793A\u544A\u8B66\u4FE1\u606F",
-    patternTrigger: "onChange"
-  }, /*#__PURE__*/React.createElement(BooleanRadio, {
-    name: "alarmSwitch",
-    trueText: "\u663E\u793A\u544A\u8B66\u4FE1\u606F",
-    falseText: "\u544A\u8B66\u9759\u9ED8"
-  })), isNetworkTopo && /*#__PURE__*/React.createElement(_Form.Item, {
-    label: "\u544A\u8B66\u5217\u8868",
-    patternTrigger: "onChange"
-  }, /*#__PURE__*/React.createElement(BooleanRadio, {
-    name: "alarmListDefaultOpen",
-    trueText: "\u9ED8\u8BA4\u5C55\u5F00",
-    falseText: "\u9ED8\u8BA4\u6536\u8D77",
-    trueOptionDisabled: !field.getValue("alarmSwitch")
-  })), /*#__PURE__*/React.createElement(_Form.Item, {
+  }, /*#__PURE__*/React.createElement(_Form.Item, {
     label: /*#__PURE__*/React.createElement(Label, {
       label: "\u8D44\u6E90\u6807\u6CE8",
       helpText: "\u6700\u591A\u652F\u6301\u52FE\u90093\u9879"
@@ -111,12 +96,6 @@ function DisplaySetting(props, ref) {
   }, linkTipConfig({
     name: "linkTip",
     topo: topo
-  })), showEdgeExpandConfig && /*#__PURE__*/React.createElement(_Form.Item, {
-    label: /*#__PURE__*/React.createElement(LineExpandAllRadioGroup.Label, null),
-    patternTrigger: "onChange"
-  }, /*#__PURE__*/React.createElement(LineExpandAllRadioGroup, {
-    name: "expandAllEdges",
-    isNetworkTopo: isNetworkTopo
   })), showLinkConfig && /*#__PURE__*/React.createElement(_Form.Item, {
     label: "\u94FE\u8DEF\u52A8\u6001\u6548\u679C",
     patternTrigger: "onChange"

package/es/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js

@@ -7,11 +7,11 @@ import rlog from '@riil-frontend/component-topology-utils/lib/rlog';
 import Drawer from "../../../components/Drawer";
 import DisplaySetting from "./DisplaySetting";
 import useDisplaySetting from "./hooks/useDisplaySetting";
-import EditorDisplaySetting from "./EditorDisplaySetting";
 export default function DisplaySettingDrawer(props) {
   var visible = props.visible,
       topo = props.topo,
       displaySettingProps = props.displaySettingProps,
+      displaySettingRender = props.displaySettingRender,
       isEditor = props.isEditor,
       onClose = props.onClose;
   var settingRef = useRef();
@@ -68,7 +68,7 @@ export default function DisplaySettingDrawer(props) {
     };
   }();
 
-  var DisplaySettingWidget = isEditor ? EditorDisplaySetting : DisplaySetting;
+  var DisplaySettingWidget = displaySettingRender || DisplaySetting;
   return /*#__PURE__*/React.createElement(Drawer, {
     title: "\u663E\u793A\u8BBE\u7F6E",
     visible: visible,
@@ -83,6 +83,7 @@ export default function DisplaySettingDrawer(props) {
   }, visible && /*#__PURE__*/React.createElement(DisplaySettingWidget, {
     ref: settingRef,
     topo: topo,
+    isEditor: isEditor,
     displaySettingProps: displaySettingProps
   }));
 }

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

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

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import useCanvasTheme from "../../hooks/useCanvasTheme";
 import styles from "./TopoView.module.scss";
 export default function GraphViewPanel(props) {
@@ -14,10 +14,26 @@ export default function GraphViewPanel(props) {
   }),
       canvasColor = _useCanvasTheme.canvasColor;
 
+  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.createElement("div", {
     className: styles.viewPanel,
     style: {
       background: canvasColor
-    }
+    },
+    onFocus: onFocus,
+    on: true
   }, props.children);
 }

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

@@ -32,7 +32,7 @@ export default function getButtons(isNetworkTopo) {
   Divider, NodeImageButton, // 替换图片
   NodeSizeButton, // 图片尺寸
   Divider, Layout, // 布局方式
-  NodeAlignWidget // 对齐方式
-  // SearchWidget, // 搜索
+  NodeAlignWidget, // 对齐方式
+  SearchWidget // 搜索
   ]);
 }

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

@@ -16,12 +16,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 = 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({
@@ -140,7 +145,7 @@ function FontColorDropdown(props) {
     onChange: colorChang,
     onPickerFocus: onFocus,
     onPickerBlur: onBlur
-  }))), /*#__PURE__*/React.createElement("div", {
+  }))), (backgroundEnabled || opacityEnabled) && /*#__PURE__*/React.createElement("div", {
     className: styles.backgroundColor
   }, /*#__PURE__*/React.createElement("span", null, "\u80CC\u666F\u586B\u5145"), /*#__PURE__*/React.createElement("div", {
     className: styles.backOpacity
@@ -173,7 +178,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.createElement(WidgetBox, {
     label: "\u6587\u5B57\u989C\u8272",
     tooltip: "\u6587\u5B57\u989C\u8272",
@@ -182,6 +188,7 @@ function FontColorButton(props) {
     color: style.color,
     background: style.background,
     opacity: style.opacity,
+    fieldDisabled: fieldDisabled,
     setStyle: setStyle,
     onChange: function onChange(val) {
       setStyle(val);

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

@@ -1,16 +1,23 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/extends";
 var _excluded = ["color", "background", "opacity", "bold", "italic"];
-import fontStyleUtil from "../../../../../../settings/common/text/fontStyleUtil";
 import { formatBackgroundRgbaColor, parseBackground, parseColor } from "../colorUtil";
 export function getTextStyle(element) {
+  var opacity = element.a('edge.tag.opacity');
+
+  if (opacity === null || opacity === undefined) {
+    opacity = 1;
+  }
+
   return _extends({
     color: 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')
-  }, parseBackground(element.a('edge.tag.background')));
+  }, parseBackground(element.a('edge.tag.background')), {
+    opacity: opacity
+  });
 }
 export function setTextStyle(element, style, topo) {
   var color = style.color,

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

@@ -1,4 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
+import { isClusterHtElement } from "../../../../../../../../../utils/clusterUtil";
 import fontStyleUtil from "../../../../../../settings/common/text/fontStyleUtil";
 import { formatBackgroundRgbaColor, parseBackground, parseColor } from "../colorUtil";
 import nodeTag from "./nodeTag";
@@ -43,7 +44,12 @@ export function setTextStyle(element, style, topo) {
 }
 export function getEnabledFields(element) {
   if (!element.isExpanded()) {
-    return ['fontFamily', 'fontSize', 'color', 'background', 'opacity'];
+    return ['fontFamily', 'fontSize', 'bold', 'italic', 'underline', 'color', 'background', 'opacity'];
+  } // 集群禁用背景颜色设置
+
+
+  if (isClusterHtElement(element)) {
+    return ['fontFamily', 'fontSize', 'bold', 'italic', 'color'];
   }
 
   return ['fontFamily', 'fontSize', 'bold', 'italic', 'color', 'background', 'opacity'];

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

@@ -1,14 +1,24 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/extends";
-var _excluded = ["color", "background", "opacity", "bold", "italic"];
-import fontStyleUtil from "../../../../../../settings/common/text/fontStyleUtil";
+var _excluded = ["color", "background", "opacity", "bold", "italic", "underline"];
 import { formatBackgroundRgbaColor, parseBackground, parseColor } from "../colorUtil";
 export 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 _extends({
-    color: parseColor(element.a('ht.color')),
-    underline: underline
-  }, fontStyleUtil.toMap(element.a('ht.font')), parseBackground(element.a('ht.background')));
+    color: 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')
+  }, parseBackground(element.a('node.tag.background')), {
+    opacity: opacity
+  });
 }
 export function setTextStyle(element, style, topo) {
   var color = style.color,
@@ -16,6 +26,7 @@ export function setTextStyle(element, style, topo) {
       opacity = style.opacity,
       bold = style.bold,
       italic = style.italic,
+      underline = style.underline,
       otherStyle = _objectWithoutPropertiesLoose(style, _excluded);
 
   var tagStyle = _extends({}, otherStyle);
@@ -32,6 +43,10 @@ export function setTextStyle(element, style, topo) {
     tagStyle.fontItalic = italic;
   }
 
+  if ('underline' in style) {
+    tagStyle.fontUnderline = underline;
+  }
+
   if ('background' in style) {
     // 背景颜色
     var prevStyle = getTextStyle(element);

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

@@ -86,6 +86,11 @@ export 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/es/core/editor/components/settings/PropertyView.js

@@ -5,8 +5,11 @@ import { adapterGetEdgePropertyViewType, addEdgePropertyViews } from "./core/edg
 import PropertyViewManager from "./core/PropertyViewManager";
 import Settings from "./Settings";
 import styles from "./Settings.module.scss";
+
+function PropertyViewProvider(props) {}
+
 export default function PropertyPanel(props) {
-  var _classNames;
+  var _editorProps$property, _editorProps$property2, _classNames;
 
   var topo = props.topo,
       editorProps = props.editorProps;
@@ -18,21 +21,19 @@ export default 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 = useMemo(function () {
     return new PropertyViewManager(topo);
-  }, []); // 临时适配连线属性面板类型，后期组件支持自定义适配
-
-  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 adapterGetEdgePropertyViewType(elements, editorProps);
-  };
+  }; // 临时适配连线属性面板类型，后期组件支持自定义适配
 
+
+  addEdgePropertyViews(propertyViewManager, editorProps);
   var PropertyView = propertyViewManager.getPropertyView();
   useEffect(function () {
     if (graphLoaded) {

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

@@ -2,6 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import React, { useEffect, useMemo, useState } from 'react';
 import useSettingRuntimeState from "./useSettingRuntimeState";
 import updateElementProperty from "./core/updateElementProperty";
+import { isEdge } from "../../../../utils/htElementUtils";
 
 function buildElementValues(selection) {
   var values = _extends({}, selection[0]);
@@ -33,10 +34,16 @@ export default function PropertyViewContainer(props) {
   var elementProps = {};
 
   if (selection.length === 1) {
+    var element = selectionElements[0];
     elementProps = {
-      selectionElement: selectionElements[0],
+      element: element,
+      selectionElement: element,
       values: singleElementValues
     };
+
+    if (isEdge(element)) {
+      elementProps.edge = element;
+    }
   }
 
   return /*#__PURE__*/React.createElement(PropertyView, _extends({

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

@@ -4,17 +4,18 @@ import _getPropertyViewType from "./getPropertyViewType";
 
 var PropertyViewManager = /*#__PURE__*/function () {
   function PropertyViewManager(topo) {
-    this.viewMap = propertyViews;
+    this.viewMap = _extends({}, propertyViews);
     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 = _extends({}, propertyViews, viewMap);
+  _proto.addViews = function addViews(viewMap) {
+    Object.assign(this.viewMap, viewMap);
   };
 
   _proto.init = function init() {

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

@@ -1,5 +1,4 @@
 import { isEdge } from "../../../../../utils/htElementUtils";
-import addEdgeProps from "../propertyViews/edge/addEdgeProps";
 export function adapterGetEdgePropertyViewType(selection, editorProps) {
   var fn = editorProps.getEdgePropertyViewType;
 
@@ -13,10 +12,5 @@ export function adapterGetEdgePropertyViewType(selection, editorProps) {
   return null;
 }
 export function addEdgePropertyViews(propertyViewManager, editorProps) {
-  var oldMap = editorProps.edgePropertyViews || {};
-  var map = {};
-  Object.keys(oldMap).forEach(function (name) {
-    map[name] = addEdgeProps(oldMap[name]);
-  });
-  propertyViewManager.updateViews(map);
+  propertyViewManager.addViews(editorProps.edgePropertyViews || {});
 }

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

@@ -6,9 +6,9 @@ import _Collapse from "@alifd/next/es/collapse";
 import _Select from "@alifd/next/es/select";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useEffect } from "react";
-import useHtElement from "../../../../../../common/hooks/useHtElement";
 import textStyles from "../../../../../../common/text.module.scss";
 import NodeRelateResourceButton from "./NodeRelateResourceButton";
+import PlatformDisplay from "./PlatformDisplay";
 var Option = _Select.Option;
 var CollapsePanel = _Collapse.Panel;
 
@@ -150,5 +150,7 @@ export default function Data(props) {
     name: "attrObject.bindTopo",
     topo: topo,
     onChange: handleBindTopoChange
-  })))));
+  })), (editorProps === null || editorProps === void 0 ? void 0 : editorProps.topoType) === 'cmpTopo' && node.getTag() && /*#__PURE__*/React.createElement(_Form.Item, {
+    label: "\u6240\u5C5E\u5E73\u53F0"
+  }, /*#__PURE__*/React.createElement(PlatformDisplay, props)))));
 }

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

@@ -0,0 +1,15 @@
+import React from '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 : '本级平台';
+}
+
+export default PlatformDisplay;

package/es/core/hooks/usePolling.js

@@ -13,12 +13,7 @@ import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 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/es/core/hooks/useTopoEdit.js

@@ -53,8 +53,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/es/core/models/Alarm.js

@@ -220,23 +220,11 @@ var Alarm = /*#__PURE__*/function () {
 
   _proto.hmGetTopoAlarm = /*#__PURE__*/function () {
     var _hmGetTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.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 _regeneratorRuntime.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;
               }) // 过滤掉权限
@@ -245,7 +233,7 @@ var Alarm = /*#__PURE__*/function () {
               });
 
               if (!(mainCiIdList.length === 0)) {
-                _context3.next = 7;
+                _context3.next = 4;
                 break;
               }
 
@@ -255,7 +243,7 @@ var Alarm = /*#__PURE__*/function () {
               });
               return _context3.abrupt("return");
 
-            case 7:
+            case 4:
               //rlog.debug("获取告警列表", mainCiIdList);
               endTime = null; // new Date().valueOf();
 
@@ -280,10 +268,10 @@ var Alarm = /*#__PURE__*/function () {
                   endTime: endTime
                 }
               };
-              _context3.next = 12;
+              _context3.next = 9;
               return topoService.getAlarmByIds(parms);
 
-            case 12:
+            case 9:
               result = _context3.sent;
               rlog.debug("getAlarmById-result", result); // if (alarmIsOpened) {
               //   //this.topo.loadAlarm(result.datas);
@@ -294,7 +282,7 @@ var Alarm = /*#__PURE__*/function () {
               //   alarmPanelIsOpen: result.datas.length > 0,
               // });
 
-            case 14:
+            case 11:
             case "end":
               return _context3.stop();
           }
@@ -389,14 +377,14 @@ var Alarm = /*#__PURE__*/function () {
     var _openTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(id) {
       var _this2 = this;
 
-      var _this$getState3, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
+      var _this$getState2, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
 
       return _regeneratorRuntime.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;
@@ -456,14 +444,14 @@ var Alarm = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _closeTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(id) {
-      var _this$getState4, alarmIsOpened, alarmOpening;
+      var _this$getState3, alarmIsOpened, alarmOpening;
 
       return _regeneratorRuntime.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;
@@ -550,13 +538,13 @@ var Alarm = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _handleAlarmEvent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.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 _regeneratorRuntime.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/es/core/models/TopoApp.js

@@ -23,7 +23,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./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.1" === 'string' ? "7.0.1" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -566,11 +566,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();
           }

package/es/core/models/utils/linkUtils.js

@@ -33,9 +33,6 @@ export function isCrucialLink(link) {
 export function isExitLink(link) {
   return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['destination_id']);
 }
-export function isAggLink(link) {
-  return link.attributes["network_link.connect_type"] === "agg";
-}
 export var getInterfaceObject = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(codes) {
     var query, promises, result, ifDoc;

package/es/core/store/models/topoMod.js

@@ -606,15 +606,16 @@ export default function (topoApp) {
 
                   case 4:
                     topoPermission = _context11.sent;
-                    _context11.next = 10;
+                    rlog.debug('查询拓扑权限', topoPermission);
+                    _context11.next = 11;
                     break;
 
-                  case 7:
-                    _context11.prev = 7;
+                  case 8:
+                    _context11.prev = 8;
                     _context11.t0 = _context11["catch"](1);
                     rlog.error("\u67E5\u8BE2\u62D3\u6251" + id + "\u7684\u6743\u9650\u5931\u8D25", _context11.t0); // 尚未区分拓扑图不存在还是接口请求报错
 
-                  case 10:
+                  case 11:
                     if (update !== false) {
                       _this8.update({
                         topoPermission: topoPermission
@@ -623,12 +624,12 @@ export default function (topoApp) {
 
                     return _context11.abrupt("return", topoPermission);
 
-                  case 12:
+                  case 13:
                   case "end":
                     return _context11.stop();
                 }
               }
-            }, _callee11, null, [[1, 7]]);
+            }, _callee11, null, [[1, 8]]);
           }))();
         }
       };