@riil-frontend/component-topology 5.0.0-alpha.9 → 5.0.2

package/lib/networkTopo/components/editor/propertyViews/edge/link/BindExitLinkSelect.js

@@ -11,6 +11,8 @@ var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
 
 var _select = _interopRequireDefault(require("@alifd/next/lib/select"));
 
+var _loading = _interopRequireDefault(require("@alifd/next/lib/loading"));
+
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -40,7 +42,11 @@ function BindExitLinkSelect(props) {
 
   var _useState = (0, _react.useState)([]),
       associatedlinks = _useState[0],
-      setAssociatedlinks = _useState[1]; // const [isLine, setIsLine] = useState(false);
+      setAssociatedlinks = _useState[1];
+
+  var _useState2 = (0, _react.useState)(false),
+      loading = _useState2[0],
+      setLoading = _useState2[1]; // const [isLine, setIsLine] = useState(false);
 
 
   var getLinkByNodes = /*#__PURE__*/function () {
@@ -96,6 +102,8 @@ function BindExitLinkSelect(props) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
+              topo.historyManager.beginTransaction();
+              setLoading(true);
               data = associatedlinks.find(function (link) {
                 return link.id === value;
               });
@@ -111,10 +119,8 @@ function BindExitLinkSelect(props) {
                 interfaceTarget: data.attributes["network_link.destination_device_id"],
                 metrics: [],
                 name: data.attributes.name,
-                "network_link.connect_type": "exit",
                 "network_link.destination_ipv4": data.attributes["network_link.destination_ipv4"],
                 operation: "delete",
-                connect_type: "exit",
                 source: data.attributes.source_id,
                 target: data.attributes.destination_id,
                 type: "link"
@@ -129,10 +135,10 @@ function BindExitLinkSelect(props) {
               topo.resourceConfig.updateConfig((0, _extends2["default"])({}, config, {
                 exportLinkIdList: exportLinkIdList
               }));
-              _context2.next = 11;
+              _context2.next = 13;
               return editDispatchers.fetchDataByConfig();
 
-            case 11:
+            case 13:
               _yield$editDispatcher = _context2.sent;
               elements = _yield$editDispatcher.elements;
               target = edge.getTarget();
@@ -148,7 +154,10 @@ function BindExitLinkSelect(props) {
 
               _rlog["default"].debug("fetchDataByConfig", elements);
 
-            case 20:
+              setLoading(false);
+              topo.historyManager.endTransaction();
+
+            case 24:
             case "end":
               return _context2.stop();
           }
@@ -166,7 +175,10 @@ function BindExitLinkSelect(props) {
     style: {
       marginBottom: 0
     }
-  }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_loading["default"], {
+    visible: loading,
+    fullScreen: true
+  }), /*#__PURE__*/_react["default"].createElement(_select["default"], {
     style: {
       width: 232
     },

package/lib/networkTopo/components/editor/propertyViews/edge/link/LinkInfoPreview.js

@@ -34,25 +34,28 @@ function LindInfoPreview(props) {
     name: "network_link.source_device_id"
   }, {
     label: "源节点IP",
-    name: "network_link.source_ipv4"
+    name: "network_link.source_device_ipv4"
   }, {
     label: "源端口",
     name: "source_id"
+  }, {
+    label: "源端IP",
+    name: "network_link.source_ipv4"
   }, {
     label: "目的节点名称",
     name: "network_link.destination_device_id"
   }, {
     label: "目的节点IP",
-    name: "network_link.destination_ipv4"
+    name: "network_link.destination_device_ipv4"
   }, {
     label: "目的端口",
     name: "destination_id"
+  }, {
+    label: "目的端IP",
+    name: "network_link.destination_ipv4"
   }, {
     label: "取值端口",
     name: "network_link.value_port"
-  }, {
-    label: "链接方式",
-    name: "network_link.connect_type"
   }, {
     label: "实际带宽",
     name: "network_link.actual_bandwidth"
@@ -77,10 +80,6 @@ function LindInfoPreview(props) {
       if (name === "network_link.value_port") {
         value = "源端口";
       }
-
-      if (name === "network_link.connect_type") {
-        value = data.attributes[name] === "exit" ? "出口" : "物理/聚合";
-      }
     } else {
       value = "-";
     }

package/lib/networkTopo/components/viewer/displaySetting/LinkAttrCustomSettingDrawer.js

@@ -0,0 +1,76 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _Setting = _interopRequireDefault(require("../../../../core/components/ResourceViewAttributeSetting/Setting"));
+
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/lib/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 LinkAttrCustomSettingDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  var topo = props.topo,
+      showType = props.showType,
+      value = props.value;
+
+  var _useState = (0, _react.useState)({}),
+      data = _useState[0],
+      setData = _useState[1];
+
+  var queryData = function queryData() {
+    _rlog["default"].info('链路属性配置：加载数据');
+
+    var valueData = value.data || {};
+    var result = {};
+    topo.elementTagTipConfig.getLinkConfigItems().forEach(function (item) {
+      var valueAttrs = valueData[item.id] || [];
+      result[item.id] = {
+        code: item.id,
+        name: item.label,
+        icon: 'networkLink',
+        list: item.list.map(function (listItem) {
+          var code = listItem.code.split(':')[1];
+          return {
+            id: listItem.code.split(':')[1] + "-" + listItem.type,
+            code: code,
+            name: listItem.name,
+            type: listItem.type,
+            tag: !!valueAttrs.find(function (a) {
+              return a.code === code && a.type === listItem.type;
+            }),
+            tip: !!valueAttrs.find(function (a) {
+              return a.code === code && a.type === listItem.type;
+            })
+          };
+        })
+      };
+    });
+    setData(result);
+    return result;
+  };
+
+  return /*#__PURE__*/_react["default"].createElement(_Setting["default"], (0, _extends2["default"])({
+    ref: ref
+  }, props, {
+    data: data,
+    queryData: queryData
+  }));
+});
+LinkAttrCustomSettingDrawer.displayName = 'LinkAttrCustomSettingDrawer';
+LinkAttrCustomSettingDrawer.propTypes = {};
+var _default = LinkAttrCustomSettingDrawer;
+exports["default"] = _default;

package/lib/networkTopo/components/viewer/displaySetting/LinkTagV2.js

@@ -13,7 +13,7 @@ var _ResourceInfoDisplay = require("../../../../constants/ResourceInfoDisplay");
 
 var _BasicConfig = _interopRequireDefault(require("../../../../core/components/DisplaySettingDrawer/ResourceDisplay/BasicConfig"));
 
-var _Setting = _interopRequireDefault(require("../../../../core/components/ResourceViewAttributeSetting/Setting"));
+var _LinkAttrCustomSettingDrawer = _interopRequireDefault(require("./LinkAttrCustomSettingDrawer"));
 
 var _LinkTagCommonRidioGroup = _interopRequireDefault(require("./LinkTagCommonRidioGroup"));
 
@@ -78,20 +78,26 @@ function LinkTagV2(props, ref) {
     }
   };
 
+  var LinkTagCommonRidioGroupWrapper = function LinkTagCommonRidioGroupWrapper(aaProps) {
+    return /*#__PURE__*/_react["default"].createElement(_LinkTagCommonRidioGroup["default"], (0, _extends2["default"])({}, aaProps, {
+      value: value ? value.type : undefined
+    }));
+  };
+
   return /*#__PURE__*/_react["default"].createElement(_BasicConfig["default"], (0, _extends2["default"])({
     ref: ref
   }, props, {
     value: value ? (0, _extends2["default"])({}, value, {
-      data: value.type
+      data: value.data
     }) : value,
     limit: 2,
     elementType: "link",
     showType: "tag",
     commonOptions: CommonOptions,
     defaultCommonConfig: _ResourceInfoDisplay.DEFAULT_LINK_TAG_COMMON_CONFIG,
-    commonSelectWidget: _LinkTagCommonRidioGroup["default"],
+    commonSelectWidget: LinkTagCommonRidioGroupWrapper,
     customSettingDrawer: function customSettingDrawer(params) {
-      return /*#__PURE__*/_react["default"].createElement(_Setting["default"], params);
+      return /*#__PURE__*/_react["default"].createElement(_LinkAttrCustomSettingDrawer["default"], params);
     },
     onChange: handleChange
   }));

package/lib/networkTopo/getTopoData.js

@@ -21,6 +21,7 @@ var _services = require("../core/services");
 
 var _resourcePermissionUtil = require("./utils/resourcePermissionUtil");
 
+// import "./utils/__tests__/resourcePermissionUtil.test";
 function addLinkData(_x, _x2) {
   return _addLinkData.apply(this, arguments);
 }
@@ -56,12 +57,8 @@ function _addLinkData() {
           case 3:
             links = _context.sent;
             return _context.abrupt("return", {
-              links: links.filter(function (link) {
-                return link.attributes['network_link.connect_type'] !== 'agg';
-              }),
-              linkGroups: links.filter(function (link) {
-                return link.attributes['network_link.connect_type'] === 'agg';
-              })
+              links: links,
+              linkGroups: []
             });
 
           case 5:
@@ -100,7 +97,6 @@ function _buildData() {
         switch (_context2.prev = _context2.next) {
           case 0:
             newData = (0, _extends2["default"])({}, data);
-            newData = fixAlarmConfig(newData);
             nodes = (data.nodes || [] // 修正容器找不到时groupId设为空
             ).map(function (node) {
               var groupExisted = !!(data.groups || []).filter(function (g) {
@@ -110,13 +106,13 @@ function _buildData() {
                 groupId: groupExisted ? node.groupId : null
               });
             });
-            _context2.next = 5;
+            _context2.next = 4;
             return Promise.all([// 查询节点属性
             (0, _services.queryCisByIds)(nodes.map(function (node) {
               return node.id;
             })), addLinkData(data.links || [], nodes)]);
 
-          case 5:
+          case 4:
             _yield$Promise$all = _context2.sent;
             nodeCis = _yield$Promise$all[0];
             linkData = _yield$Promise$all[1];
@@ -138,7 +134,7 @@ function _buildData() {
             newData = (0, _resourcePermissionUtil.addTopoDataResourcePermission)(newData);
             return _context2.abrupt("return", newData);
 
-          case 12:
+          case 11:
           case "end":
             return _context2.stop();
         }
@@ -173,14 +169,15 @@ function _getTopoData() {
             return _context3.abrupt("return", data);
 
           case 5:
-            _context3.next = 7;
+            data = fixAlarmConfig(data);
+            _context3.next = 8;
             return buildData(data);
 
-          case 7:
+          case 8:
             data = _context3.sent;
             return _context3.abrupt("return", data);
 
-          case 9:
+          case 10:
           case "end":
             return _context3.stop();
         }

package/lib/networkTopo/hooks/editor/useDeleteEdges.js

@@ -57,14 +57,15 @@ var _default = function _default(_ref) {
 
   var doDeleteLink = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(link, edge) {
-      var id, isAgg, success, htTopo, edgesInNodes, edgeGroupData, edgeData, _topo$store$getModel, topoState, topoDispatchers, _topoState$data, links, linkGroups;
+      var id, isGroup, success, htTopo, edgesInNodes, edgeGroupData, edgeData, _topo$store$getModel, topoState, topoDispatchers, _topoState$data, links, linkGroups;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               id = link.id;
-              isAgg = (0, _linkUtils.isAggLink)(link);
+              isGroup = false; // isAggLink(link);
+
               _context.next = 4;
               return _link["default"].deleteLink(id);
 
@@ -83,12 +84,13 @@ var _default = function _default(_ref) {
             case 8:
               _message["default"].success('删除成功');
 
+              topo.historyManager.setDisabled(true, '删除链路');
               htTopo = topo.getHtTopo(); // 获取两个节点间的连线数据列表 
 
               edgesInNodes = htTopo.getEdgeDatasInNodes(edge.getSource(), edge.getTarget());
 
               if (edgesInNodes.length >= 2) {
-                if (isAgg) {
+                if (isGroup) {
                   htTopo.setEdgeGroupData(edge.getSource(), edge.getTarget(), null);
                 } else {
                   htTopo.deleteEdge(edge);
@@ -98,10 +100,10 @@ var _default = function _default(_ref) {
                 edgeGroupData = htTopo.getEdgeGroupData(edge.getSource(), edge.getTarget());
                 edgeData = htTopo.getEdgeData(edge);
 
-                if (isAgg && edgeData) {
+                if (isGroup && edgeData) {
                   // 当前是连线组代理 且 有连线数据，清空组数据
                   htTopo.setEdgeGroupData(edge.getSource(), edge.getTarget(), null);
-                } else if (!isAgg && edgeGroupData) {
+                } else if (!isGroup && edgeGroupData) {
                   htTopo.setEdgeData(edge, null);
                 } else {
                   htTopo.deleteEdge(edge);
@@ -111,7 +113,7 @@ var _default = function _default(_ref) {
 
               _topo$store$getModel = topo.store.getModel('topoMod'), topoState = _topo$store$getModel[0], topoDispatchers = _topo$store$getModel[1];
               _topoState$data = topoState.data, links = _topoState$data.links, linkGroups = _topoState$data.linkGroups;
-              _context.next = 16;
+              _context.next = 17;
               return topoDispatchers.update({
                 data: (0, _extends2["default"])({}, topoState.data, {
                   links: links.filter(function (item) {
@@ -123,11 +125,12 @@ var _default = function _default(_ref) {
                 })
               });
 
-            case 16:
+            case 17:
               // 刷新链路动态线宽
               topo.linkDynamicStyleExecutor.execute();
+              topo.historyManager.setDisabled(false, '删除链路');
 
-            case 17:
+            case 19:
             case "end":
               return _context.stop();
           }

package/lib/networkTopo/hooks/viewer/useRelateTopo.js

@@ -83,7 +83,8 @@ function useRelateTopo(params) {
                 break;
               }
 
-              console.error('关联拓扑图不存在：', topoId);
+              _rlog["default"].error('关联拓扑图不存在：', topoId);
+
               return _context.abrupt("return");
 
             case 4:

package/lib/networkTopo/models/LinkDynamicStyleExecutor.js

@@ -65,6 +65,7 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
     var _this = this;
 
     var topo = this.topo;
+    topo.historyManager && topo.historyManager.setDisabled(true, '链路动态样式');
 
     var _topo$dataModel$getDa = topo.dataModel.getData(),
         links = _topo$dataModel$getDa.links,
@@ -134,6 +135,7 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
         _rlog["default"].error('连线组未关联链路并可见，设置线宽：异常', edge, error);
       }
     });
+    topo.historyManager && topo.historyManager.setDisabled(false, '链路动态样式');
   }
   /**
    * 处理单个连线组切换。有链路时设置

package/lib/networkTopo/models/TopoCenter.js

@@ -15,14 +15,14 @@ var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/hel
 
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
 var _TopoApp2 = _interopRequireDefault(require("../../core/models/TopoApp"));
 
 var _createMenuCommands = _interopRequireDefault(require("../../contextmenu/createMenuCommands"));
 
 var _getTopoData = _interopRequireDefault(require("../getTopoData"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
-
 var _store = _interopRequireDefault(require("../store"));
 
 var _ResourceInfoDisplay = require("../../constants/ResourceInfoDisplay");

package/lib/networkTopo/services/index.js

@@ -18,16 +18,18 @@ var _componentTopologyUtils = require("@riil-frontend/component-topology-utils")
 var _default = (0, _extends2["default"])({}, _topo["default"], {
   // 获取有权限的拓扑树
   getTopoTreeByLoginUser: function getTopoTreeByLoginUser(params) {
-    var _this = this;
-
     return (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:
-              return _context.abrupt("return", _this.getTopoTree(params));
+              _context.next = 2;
+              return _componentTopologyUtils.request.get('/topo/v1/api/menuByLoginUser');
+
+            case 2:
+              return _context.abrupt("return", _context.sent);
 
-            case 1:
+            case 3:
             case "end":
               return _context.stop();
           }

package/lib/networkTopo/services/link.js

@@ -173,10 +173,10 @@ var _default = {
               // const idtxt = `'${ids[0]}','${ids[1]}'`;
               stag = ids[0];
               ttag = ids[1];
-              condition = "type('network_link') && network_link.connect_type = 'exit' && network_link.source_device_id ='" + stag + "'";
+              condition = "type('network_link') && !network_link.destination_device_id && network_link.source_device_id ='" + stag + "'";
 
               if (ttag) {
-                condition = "type('network_link') && network_link.connect_type = 'exit' && network_link.source_device_id ='" + stag + "' && network_link.destination_device_id='" + ttag + "'";
+                condition = "type('network_link') && !network_link.destination_device_id && network_link.source_device_id ='" + stag + "' && network_link.destination_device_id='" + ttag + "'";
               }
 
               parm = {

package/lib/networkTopo/store/topoCenter.js

@@ -94,13 +94,16 @@ var _default = {
                   return _this.refreshTopoTree();
 
                 case 18:
+                  if (id) {
+                    // 左侧树切换选中
+                    dispatch.topoTreeMod.selectNode(id);
+                  }
+
                   if (!(viewType === 'create')) {
                     _context.next = 24;
                     break;
                   }
 
-                  // 左侧树切换选中
-                  dispatch.topoTreeMod.selectNode(id);
                   _context.next = 22;
                   return _this.openCreateTopoPage({
                     id: id