@riil-frontend/component-topology 2.15.22 → 2.15.23

package/lib/core/viewer/components/titlebar/widgets/AlarmListShowButton.js

@@ -9,56 +9,61 @@ var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
 
 var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
 
+var _overlay = _interopRequireDefault(require("@alifd/next/lib/overlay"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
 
+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; }
 
+var Popup = _overlay["default"].Popup;
 /**
  * 元素拖拽开关
  *
  * @return {any}
  */
+
 function AlarmListShowButton(props) {
   var topo = props.topo,
-      style = props.style;
+      style = props.style,
+      viewerProps = props.viewerProps;
+  var AlarmListPanel = viewerProps.AlarmListPanel;
   var store = topo.store;
 
   var _store$useModel = store.useModel("topoAlarm"),
       topoState = _store$useModel[0];
 
-  var alarmPanelIsOpen = topoState.alarmPanelIsOpen; // const [visiable, setVisiable] = useState(false);
-  // useEffect(() => {
-  //   if (movable) {
-  //     setVisiable(false);
-  //   }
-  // }, []);
-  // 初始化时注册打开设置事件
-  //   useEffect(() => {
-  //     const handleRefresh = (e) => {
-  //       setMovable(false);
-  //     };
-  //     notifier && notifier.on(TopoEvent.EVENT_REFRESH, handleRefresh);
-  //     return () => {
-  //       notifier && notifier.off(TopoEvent.EVENT_REFRESH, handleRefresh);
-  //     };
-  //   }, [notifier]);
+  var alarmPanelIsOpen = topoState.alarmPanelIsOpen;
+  var alarmBtn = (0, _react.useRef)();
 
   var showAlarmList = function showAlarmList() {
-    // const flag = !visiable;
-    //setVisiable(flag);
-    topo.alarm.switchAlarmPopPanel(true); // topo.getGraphView().setMovableFunc((data) => {
-    //   return flag; // self._graphView.dm().sm().getSelection().size()===1 && !(data instanceof ht.Grid);
-    // });
+    topo.alarm.switchAlarmPopPanel(true);
+  };
+
+  var onVisibleChange = function onVisibleChange(visible) {
+    topo.alarm.switchAlarmPopPanel(visible);
   };
 
-  return /*#__PURE__*/_react["default"].createElement(_button["default"], {
-    style: style,
-    onClick: showAlarmList
-  }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
-    type: "warning"
-  }));
+  return /*#__PURE__*/_react["default"].createElement(Popup, {
+    trigger: /*#__PURE__*/_react["default"].createElement(_button["default"], {
+      style: style,
+      ref: alarmBtn
+    }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
+      type: "warning"
+    })),
+    cache: true,
+    defaultVisible: true,
+    visible: alarmPanelIsOpen,
+    onVisibleChange: onVisibleChange,
+    offset: [112, 5],
+    triggerType: "click",
+    safeNode: function safeNode() {
+      return alarmBtn;
+    }
+  }, /*#__PURE__*/_react["default"].createElement(AlarmListPanel, props));
 }

package/lib/style.js

@@ -23,6 +23,7 @@ require('@alifd/next/lib/divider/style');
 require('@alifd/next/lib/box/style');
 require('@alifd/next/lib/dropdown/style');
 require('@alifd/next/lib/menu/style');
+require('@alifd/next/lib/overlay/style');
 require('@alifd/next/lib/radio/style');
 require('@alifd/next/lib/checkbox/style');
 require('@alifd/next/lib/grid/style');

package/lib/topoCenter/components/TopoView.js

@@ -41,7 +41,7 @@ function NetworkTopology(props) {
       titleBar = props.titleBar,
       onEnterEdit = props.onEnterEdit,
       otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
-  var topoState = topo.store.useModelState('topoMod');
+  var topoState = topo.store.useModelState("topoMod");
   var loading = topoState.loading,
       topoId = topoState.topoId,
       topoData = topoState.topoData,
@@ -51,7 +51,8 @@ function NetworkTopology(props) {
     var viewerProps = (0, _extends2["default"])({}, props.viewerProps, {
       showLinkConfig: true,
       // 是否显示链路相关配置
-      plugins: [_AlarmListPanel["default"]]
+      AlarmListPanel: _AlarmListPanel["default"],
+      plugins: []
     });
     return /*#__PURE__*/_react["default"].createElement(_TopoView["default"], (0, _extends2["default"])({}, otherProps, {
       topo: topo,
@@ -89,9 +90,9 @@ function NetworkTopology(props) {
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: _indexModule["default"]['topo-center-view']
+    className: _indexModule["default"]["topo-center-view"]
   }, /*#__PURE__*/_react["default"].createElement(_loading["default"], {
-    className: _indexModule["default"]['topo-center-mask-loading'],
+    className: _indexModule["default"]["topo-center-mask-loading"],
     visible: loading
   }, renderContent()));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.15.22",
+  "version": "2.15.23",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -41,7 +41,7 @@
     "@ahooksjs/use-tree-plugin": "^0.2.1",
     "@alifd/biz-anchor": "^1.1.7",
     "@ice/store": "^1.4.2",
-    "@riil-frontend/component-topo-icon-select": "^1.0.9",
+    "@riil-frontend/component-topo-icon-select": "^1.0.10",
     "@riil-frontend/component-topology-utils": "^2.0.20-alpha.0",
     "classnames": "^2.2.3",
     "prop-types": "^15.5.8",
@@ -68,7 +68,7 @@
     "@riil-frontend/component-table-filter-tags": "latest",
     "@riil-frontend/component-table-layout": "^2.0.2",
     "@riil-frontend/component-topology-common": "^1.0.9",
-    "@riil-frontend/component-topology-graph": "^2.5.5",
+    "@riil-frontend/component-topology-graph": "^2.5.6",
     "@riil-frontend/css": "^2.0.2",
     "@riil-frontend/hooks": "latest",
     "@riil-frontend/next-collapse": "^1.0.1-a.0",
@@ -110,6 +110,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.22/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.23/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }