@riil-frontend/component-topology 3.5.0-a.9 → 3.5.2

package/lib/hooks/useTopoEventListener.js

@@ -14,13 +14,20 @@ function useTopoEventListener(props) {
     return "topo_" + n++;
   }, []);
   (0, _react.useEffect)(function () {
-    window.EE.on('topo', eventListenerName, function (data) {
-      if (data.type === type) {
-        onMessage(data.data);
-      }
-    });
+    var EE = window.EE;
+
+    if (EE) {
+      window.EE.on('topo', eventListenerName, function (data) {
+        if (data.type === type) {
+          onMessage(data.data);
+        }
+      });
+    }
+
     return function () {
-      window.EE.removeListener('topo', eventListenerName);
+      if (EE) {
+        window.EE.removeListener('topo', eventListenerName);
+      }
     };
   }, [type, onMessage]);
 }

package/lib/index.js

@@ -7,6 +7,7 @@ var _exportNames = {
   iconFactory: true,
   Topology: true,
   BasicTagTipDisplayConfig: true,
+  AlarmListPanel: true,
   htElementUtils: true
 };
 exports.htElementUtils = void 0;
@@ -23,6 +24,10 @@ var _BasicConfig = _interopRequireDefault(require("./core/components/DisplaySett
 
 exports.BasicTagTipDisplayConfig = _BasicConfig["default"];
 
+var _AlarmListPanel = _interopRequireDefault(require("./core/components/AlarmListPanel"));
+
+exports.AlarmListPanel = _AlarmListPanel["default"];
+
 var htElementUtils = _interopRequireWildcard(require("./utils/htElementUtils"));
 
 exports.htElementUtils = htElementUtils;

package/lib/models/topoConfig.js

@@ -481,7 +481,6 @@ function _default(topoApp) {
             }, _callee7);
           }))();
         },
-        switchToEditMode: function switchToEditMode() {},
         switchToViewMode: function switchToViewMode() {
           this.reset();
           dispatch.topoMod.switchToViewMode();

package/lib/models/topoMod.js

@@ -610,30 +610,34 @@ function _default(topoApp) {
           var _this8 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11() {
-            var id, update, topoPermission, getTopoPermission;
+            var id, update, topoPermission;
             return _regenerator["default"].wrap(function _callee11$(_context11) {
               while (1) {
                 switch (_context11.prev = _context11.next) {
                   case 0:
                     id = playload.id, update = playload.update;
                     _context11.prev = 1;
-                    getTopoPermission = topoApp.options.getTopoPermission || _topo["default"].auth.getTopoPermission;
-                    _context11.next = 5;
-                    return getTopoPermission(id);
+                    _context11.next = 4;
+                    return _topo["default"].auth.getTopoPermission(id);
 
-                  case 5:
+                  case 4:
                     topoPermission = _context11.sent;
-                    _context11.next = 11;
+                    _context11.next = 10;
                     break;
 
-                  case 8:
-                    _context11.prev = 8;
+                  case 7:
+                    _context11.prev = 7;
                     _context11.t0 = _context11["catch"](1);
 
                     _rlog["default"].error("\u67E5\u8BE2\u62D3\u6251" + id + "\u7684\u6743\u9650\u5931\u8D25", _context11.t0); // 尚未区分拓扑图不存在还是接口请求报错
 
 
-                  case 11:
+                  case 10:
+                    if (!topoPermission) {
+                      _context11.next = 19;
+                      break;
+                    }
+
                     _context11.next = 13;
                     return dispatch.functionAuth.checkAuth('createTopo');
 
@@ -653,6 +657,7 @@ function _default(topoApp) {
                   case 18:
                     topoPermission = _context11.t1;
 
+                  case 19:
                     if (update !== false) {
                       _this8.update({
                         topoPermission: topoPermission
@@ -666,7 +671,7 @@ function _default(topoApp) {
                     return _context11.stop();
                 }
               }
-            }, _callee11, null, [[1, 8]]);
+            }, _callee11, null, [[1, 7]]);
           }))();
         }
       };

package/lib/topoCenter/components/Topo404.js

@@ -9,6 +9,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _index = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/components/NoDataPage/index"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _indexModule = _interopRequireDefault(require("../../components/index.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); }
@@ -16,9 +18,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 Topo404(props) {
+  var className = props.className;
   return /*#__PURE__*/_react["default"].createElement(_index["default"], {
     imgSize: "large",
-    className: _indexModule["default"].empty,
+    className: (0, _classnames["default"])(_indexModule["default"].empty, className),
     statusCode: "\u6B64\u62D3\u6251\u56FE\u65E0\u6CD5\u8BBF\u95EE\uFF0C\u53EF\u80FD\u5DF2\u88AB\u5220\u9664"
   });
 }

package/lib/topoCenter/components/TopoNoPermission.js

@@ -9,6 +9,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _index = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/components/NoDataPage/index"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _indexModule = _interopRequireDefault(require("../../components/index.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); }
@@ -16,11 +18,12 @@ 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 TopoNoPermission(props) {
+  var className = props.className;
   return /*#__PURE__*/_react["default"].createElement(_index["default"], {
     statusCode: "\u6CA1\u6709\u6743\u9650\u8BBF\u95EE\u6B64\u62D3\u6251\u56FE",
     imgSrc: "/img/topo/noPageAuthority.png",
     imgSize: "large",
-    className: _indexModule["default"].empty
+    className: (0, _classnames["default"])(_indexModule["default"].empty, className)
   });
 }
 

package/lib/topoCenter/components/TopoView.js

@@ -9,10 +9,10 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _loading = _interopRequireDefault(require("@alifd/next/lib/loading"));
 
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -39,7 +39,7 @@ var _LinkTip = _interopRequireDefault(require("../../core/components/DisplaySett
 
 var _ViewerTools = _interopRequireDefault(require("./viewer/titlebar/ViewerTools"));
 
-var _excluded = ["topo", "titleBar", "onEnterEdit"];
+var _excluded = ["topo", "titleBar", "onEnterEdit", "nodataPage", "notfoundPageProps", "noPermissionPageProps"];
 
 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); }
 
@@ -52,6 +52,9 @@ function NetworkTopologyCore(props) {
   var topo = props.topo,
       titleBar = props.titleBar,
       onEnterEdit = props.onEnterEdit,
+      nodataPage = props.nodataPage,
+      notfoundPageProps = props.notfoundPageProps,
+      noPermissionPageProps = props.noPermissionPageProps,
       otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
   var topoState = topo.store.useModelState("topoMod");
   var loading = topoState.loading,
@@ -66,12 +69,78 @@ function NetworkTopologyCore(props) {
   });
 
   var renderTopoView = function renderTopoView() {
+    var hancleDisplaySettingOk = /*#__PURE__*/function () {
+      var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(config) {
+        var edgeFlowConfig;
+        return _regenerator["default"].wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                // 单多链路切换
+                if (config.expandAllEdges) {
+                  topo.getHtTopo().expandAllEdgeGroups();
+                } else {
+                  topo.getHtTopo().collapseAllEdgeGroups();
+                } // 更新连线流动效果
+
+
+                edgeFlowConfig = config.edgeFlow ? {
+                  type: config.edgeFlow,
+                  // 必填，支持传送带drip、光点point、箭头arrow
+                  direction: config.edgeFlowDirection || 'from' // 流动方向，可为空，默认源到目的
+
+                } : null;
+                topo.getHtTopo().setGlobalEdgeFlow(edgeFlowConfig); // 更新链路动态样式
+
+                if (topo.linkDynamicStyleExecutor) {
+                  topo.linkDynamicStyleExecutor.execute();
+                }
+
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      return function hancleDisplaySettingOk(_x) {
+        return _ref.apply(this, arguments);
+      };
+    }();
+
     var viewerProps = (0, _extends2["default"])({}, props.viewerProps, {
       plugins: [],
       // 右侧工具栏按钮
       ViewerTitlebarRightTools: _ViewerTools["default"],
       displaySettingProps: {
-        showLinkConfig: true,
+        // 资源标注选项配置
+        nodeTagProps: {
+          commonOptions: [{
+            value: 'graph:name',
+            label: '图片名称'
+          }, {
+            value: 'attribute:display_name',
+            label: '显示名称'
+          }, {
+            value: 'attribute:ipv4_address',
+            label: 'IP地址'
+          }]
+        },
+        // 资源悬浮框选项配置
+        nodeTipProps: {
+          commonOptions: [{
+            value: 'attribute:ipv4_address',
+            label: 'IP地址'
+          }, {
+            value: 'attribute:display_name',
+            label: '显示名称'
+          }, {
+            value: 'ciType:display_name',
+            label: '资源类型'
+          }]
+        },
+        showLinkConfig: false,
         // 是否显示链路相关配置
         linkTagConfig: function linkTagConfig(params) {
           return /*#__PURE__*/_react["default"].createElement(_LinkTag["default"], params);
@@ -81,34 +150,10 @@ function NetworkTopologyCore(props) {
         },
         showEdgeExpandConfig: true,
         // 是否显示连线展开折叠配置
-        // 额外配置
+        // TODO 额外配置，单多链路切换、动态效果迁移到这里
         // extraConfig: () => <div>1111</div>,
         // 点击回调
-        onOk: function () {
-          var _onOk = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-            return _regenerator["default"].wrap(function _callee$(_context) {
-              while (1) {
-                switch (_context.prev = _context.next) {
-                  case 0:
-                    // 更新链路动态样式
-                    if (topo.linkDynamicStyleExecutor) {
-                      topo.linkDynamicStyleExecutor.execute();
-                    }
-
-                  case 1:
-                  case "end":
-                    return _context.stop();
-                }
-              }
-            }, _callee);
-          }));
-
-          function onOk() {
-            return _onOk.apply(this, arguments);
-          }
-
-          return onOk;
-        }()
+        onOk: hancleDisplaySettingOk
       }
     });
 
@@ -127,7 +172,7 @@ function NetworkTopologyCore(props) {
 
   var renderContent = function renderContent() {
     if (!loading && !topoId) {
-      return /*#__PURE__*/_react["default"].createElement(_index["default"], {
+      return nodataPage || /*#__PURE__*/_react["default"].createElement(_index["default"], {
         imgSize: "large",
         className: _indexModule["default"].empty
       });
@@ -141,11 +186,11 @@ function NetworkTopologyCore(props) {
     if (!loading) {
       // 加载完成后
       if (topoPermission && !_topoPermissionUtil["default"].isReadable(topoPermission)) {
-        return /*#__PURE__*/_react["default"].createElement(_TopoNoPermission["default"], null);
+        return /*#__PURE__*/_react["default"].createElement(_TopoNoPermission["default"], noPermissionPageProps);
       }
 
       if (!topoData) {
-        return /*#__PURE__*/_react["default"].createElement(_Topo["default"], null);
+        return /*#__PURE__*/_react["default"].createElement(_Topo["default"], notfoundPageProps);
       }
     }
 

package/lib/topoCenter/components/Topology.js

@@ -23,6 +23,8 @@ var _AddLinkDrawer = _interopRequireDefault(require("./editor/propertyViews/edge
 
 var _useTopoEdit = _interopRequireDefault(require("../hooks/useTopoEdit"));
 
+var _EdgePropertyView = _interopRequireDefault(require("./editor/propertyViews/edge/EdgePropertyView"));
+
 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; }
@@ -41,6 +43,7 @@ function NetworkTopologyFull(props) {
     },
     // 连线属性面板
     edgePropertyViews: {
+      edge: _EdgePropertyView["default"],
       link: _LinkPropertyView["default"],
       edgeGroup: _EdgeGroupPropertyView["default"]
     },

package/lib/topoCenter/components/editor/propertyViews/edge/EdgePropertyView.js

@@ -0,0 +1,22 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = EdgePropertyView;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _CommonEdgePropertyView = _interopRequireDefault(require("../../../../../core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView"));
+
+var _BindExitLinkSelect = _interopRequireDefault(require("./link/BindExitLinkSelect"));
+
+function EdgePropertyView(props) {
+  var extraDisplaySetting = /*#__PURE__*/_react["default"].createElement(_BindExitLinkSelect["default"], props);
+
+  return /*#__PURE__*/_react["default"].createElement(_CommonEdgePropertyView["default"], (0, _extends2["default"])({}, props, {
+    extraDisplaySetting: extraDisplaySetting
+  }));
+}

package/lib/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/Data/index.js

@@ -15,32 +15,16 @@ var _LinkInfoPreviewModule = _interopRequireDefault(require("../../link/LinkInfo
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _linPermissionUtil = require("../../../../../../utils/linPermissionUtil");
-
 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 LinkDataTab(props) {
-  var topo = props.topo,
-      edge = props.edge;
-  var nodes = topo.dataModel.getNodes();
-
-  var _useState = (0, _react.useState)(),
-      link = _useState[0],
-      setLink = _useState[1]; // 节点间只有连线组时，显示连线组的数据
+  var _link$permission;
 
-
-  var _topo$store$useModelS = topo.store.useModelState("topoMod").data,
-      links = _topo$store$useModelS.links,
-      linkGroups = _topo$store$useModelS.linkGroups;
-  var linkData = [].concat(links, linkGroups).find(function (item) {
-    return item.id === edge.getTag();
-  });
-  (0, _react.useEffect)(function () {
-    setLink(linkData);
-  }, [edge, linkData]);
-  var permission = (0, _linPermissionUtil.getLinkPermission)(edge, nodes, link);
+  var topo = props.topo,
+      edge = props.edge,
+      link = props.link;
 
   var _topo$store$useModel = topo.store.useModel("topoConfig"),
       editState = _topo$store$useModel[0],
@@ -64,7 +48,7 @@ function LinkDataTab(props) {
   }, /*#__PURE__*/_react["default"].createElement(_button["default"], {
     className: _LinkInfoPreviewModule["default"].button,
     type: "primary",
-    disabled: !permission.writeable,
+    disabled: !(link !== null && link !== void 0 && (_link$permission = link.permission) !== null && _link$permission !== void 0 && _link$permission.writeable),
     onClick: openEditLinkDrawer
   }, "\u7F16\u8F91")));
 }

package/lib/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js

@@ -7,6 +7,8 @@ exports["default"] = LinkPropertyView;
 
 var _tab = _interopRequireDefault(require("@alifd/next/lib/tab"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _TabView = _interopRequireDefault(require("../../../../../../core/editor/components/settings/common/tab/TabView"));
@@ -15,10 +17,6 @@ var _Data = _interopRequireDefault(require("./Data"));
 
 var _Setting = _interopRequireDefault(require("./Setting"));
 
-var _linPermissionUtil = require("../../../../../../topoCenter/utils/linPermissionUtil.js");
-
-var _htElementUtils = require("../../../../../../utils/htElementUtils.js");
-
 function LinkPropertyView(props) {
   var edge = props.edge,
       topo = props.topo; // 无权限不显示数据页签
@@ -28,18 +26,25 @@ function LinkPropertyView(props) {
       linkGroups = _topo$store$useModelS.linkGroups;
   var link = [].concat(links, linkGroups).find(function (item) {
     return item.id === edge.getTag();
-  }); // console.log("LinkPropertyView--getLinkPermission", links, link);
+  });
+  console.log('LinkPropertyView', link);
 
-  var operation = (0, _linPermissionUtil.getLinkPermission)(edge, topo.getNodes(topo.dataModel), link);
+  if (link) {
+    var readable = link.permission.readable;
 
-  if (!operation) {
+    if (!readable) {
+      return /*#__PURE__*/_react["default"].createElement(_Setting["default"], props);
+    }
+  } else {
     return /*#__PURE__*/_react["default"].createElement(_Setting["default"], props);
   }
 
   return /*#__PURE__*/_react["default"].createElement(_TabView["default"], null, /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
     title: "\u6570\u636E",
     key: "1"
-  }, /*#__PURE__*/_react["default"].createElement(_Data["default"], props)), /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
+  }, /*#__PURE__*/_react["default"].createElement(_Data["default"], (0, _extends2["default"])({}, props, {
+    link: link
+  }))), /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
     title: "\u8BBE\u7F6E",
     key: "2"
   }, /*#__PURE__*/_react["default"].createElement(_Setting["default"], props)));