@riil-frontend/component-topology 4.0.0-beta.9 → 4.0.2

package/lib/models/topoMod.js

@@ -13,8 +13,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 
-var _model = require("@riil-frontend/component-topology-common/es/services/model");
-
 var _moment = _interopRequireDefault(require("moment"));
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
@@ -33,6 +31,8 @@ function _default(topoApp) {
       viewState: "view",
       // view, create, 2种模式
       graphLoaded: false,
+      graphLoaded2: false,
+      // 支持编辑模式完全load完
       // 额外参数
       urlParams: {},
       topoLoadError: false,
@@ -98,6 +98,7 @@ function _default(topoApp) {
                       } : null,
                       topoId: id,
                       graphLoaded: false,
+                      graphLoaded2: false,
                       urlParams: urlParams
                     });
 
@@ -138,7 +139,8 @@ function _default(topoApp) {
         },
         reset: function reset() {
           this.update({
-            graphLoaded: false
+            graphLoaded: false,
+            graphLoaded2: false
           });
           topoApp.close();
         },
@@ -169,6 +171,7 @@ function _default(topoApp) {
                       currentTopo: playload,
                       topoId: topoId,
                       graphLoaded: false,
+                      graphLoaded2: false,
                       topoPermission: undefined
                     });
 
@@ -206,6 +209,7 @@ function _default(topoApp) {
         clearData: function clearData() {
           this.update({
             graphLoaded: false,
+            graphLoaded2: false,
             topoId: "",
             topoData: null,
             currentTopo: undefined,
@@ -317,7 +321,7 @@ function _default(topoApp) {
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
             var _result$config;
 
-            var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, topoConfig, _yield$Promise$all, ciTypeMap, customIcons, extraConfig, _combTopoData, topoData, resAndMetrics, endTime;
+            var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, topoConfig, _yield$Promise$all, ciTypeMap, customIcons, xxx, extraConfig, _combTopoData, topoData, resAndMetrics, endTime;
 
             return _regenerator["default"].wrap(function _callee6$(_context6) {
               while (1) {
@@ -334,6 +338,7 @@ function _default(topoApp) {
                     startState = {
                       loading: true,
                       graphLoaded: false,
+                      graphLoaded2: false,
                       topoLoadError: false,
                       linkTo: linkTo
                     };
@@ -444,20 +449,22 @@ function _default(topoApp) {
                     _rlog["default"].debug("topoMod.initTopoData 查询数据完成", topoId, linkTo, result);
 
                     _context6.next = 41;
-                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(result)), dispatch.customIcon.loadCustomIcons()]);
+                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(result)), dispatch.customIcon.loadCustomIcons() // topoApp.elementTagTipConfig.init(result), // 暂停新配置开发
+                    ]);
 
                   case 41:
                     _yield$Promise$all = _context6.sent;
                     ciTypeMap = _yield$Promise$all[0];
                     customIcons = _yield$Promise$all[1];
+                    xxx = _yield$Promise$all[2];
 
                     _rlog["default"].debug("topoMod.initTopoData Ci属性指标元数据", ciTypeMap);
 
                     extraConfig = result.global.extraConfig;
-                    _context6.next = 48;
+                    _context6.next = 49;
                     return dispatch.displayConfig.setConfig(extraConfig);
 
-                  case 48:
+                  case 49:
                     _combTopoData = (0, _topoData.combTopoData)({
                       engine: topoApp,
                       data: result,
@@ -488,7 +495,7 @@ function _default(topoApp) {
 
                     topoApp.options.onLoad();
 
-                  case 57:
+                  case 58:
                   case "end":
                     return _context6.stop();
                 }

package/lib/style.js

@@ -26,6 +26,7 @@ require('@alifd/next/lib/overlay/style');
 require('@alifd/next/lib/checkbox/style');
 require('@alifd/next/lib/box/style');
 require('@alifd/next/lib/list/style');
+require('@alifd/next/lib/card/style');
 require('@alifd/next/lib/radio/style');
 require('@alifd/next/lib/grid/style');
 require('@riil-frontend/component-action-tree/lib/style');

package/lib/topoCenter/components/TopoView.js

@@ -41,6 +41,10 @@ var _ViewerTools = _interopRequireDefault(require("./viewer/titlebar/ViewerTools
 
 var _useEdgeFlow = _interopRequireDefault(require("../hooks/viewer/useEdgeFlow"));
 
+var _LinkTagV = _interopRequireDefault(require("./viewer/displaySetting/LinkTagV2"));
+
+var _useEdgeExpand = _interopRequireDefault(require("../hooks/useEdgeExpand"));
+
 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); }
@@ -69,6 +73,9 @@ function NetworkTopologyCore(props) {
   (0, _useEdgeFlow["default"])({
     topo: topo
   });
+  (0, _useEdgeExpand["default"])({
+    topo: topo
+  });
   var relateTopo = (0, _useRelateTopo["default"])({
     topo: topo
   });
@@ -139,7 +146,7 @@ function NetworkTopologyCore(props) {
         showLinkConfig: true,
         // 是否显示链路流动效果配置
         linkTagConfig: function linkTagConfig(params) {
-          return /*#__PURE__*/_react["default"].createElement(_LinkTag["default"], params);
+          return /*#__PURE__*/_react["default"].createElement(_LinkTagV["default"], params);
         },
         linkTipConfig: function linkTipConfig(params) {
           return /*#__PURE__*/_react["default"].createElement(_LinkTip["default"], params);

package/lib/topoCenter/components/Topology.js

@@ -25,6 +25,8 @@ var _useTopoEdit = _interopRequireDefault(require("../hooks/useTopoEdit"));
 
 var _EdgePropertyView = _interopRequireDefault(require("./editor/propertyViews/edge/EdgePropertyView"));
 
+var _useGroupSortResources2 = _interopRequireDefault(require("../hooks/editor/useGroupSortResources"));
+
 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; }
@@ -37,6 +39,9 @@ function NetworkTopologyFull(props) {
     topo: topo
   });
   var editorProps = (0, _extends2["default"])({
+    useGroupSortResources: function useGroupSortResources(nodes) {
+      return (0, _useGroupSortResources2["default"])(topo.store, nodes);
+    },
     layerRelatedResourceList: _LayerRelatedResourceList["default"],
     multipleElementPropertyViewProps: {
       showElementAlign: true
@@ -63,7 +68,9 @@ function NetworkTopologyFull(props) {
         showTools: showTools,
         elementChangeLayerByDrag: true,
         editor: {
-          useNewElementsDeleteEvent: true
+          useNewElementsDeleteEvent: true,
+          // 通过数仓【添加资源】权限控制 是否启用新建链路功能，
+          enableRelateResource: topoEdit.canAddLink
         }
       }
     })

package/lib/topoCenter/components/editor/propertyViews/LayerRelatedResourceList.js

@@ -44,7 +44,7 @@ function getResourceNodes(store, htNodes) {
 function LayerResourceList(props) {
   var topo = props.topo,
       layer = props.layer;
-  var nodes = (0, _htElementUtils.getLayerChildrenNodes)(layer);
+  var nodes = (0, _htElementUtils.getLayerChildren)(layer);
   var resourceNodes = getResourceNodes(topo.store, nodes);
   var data = resourceNodes.map(function (_ref) {
     var node = _ref.node,

package/lib/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js

@@ -41,6 +41,8 @@ var _linkUtils = require("../../../../../../core/models/utils/linkUtils");
 
 var _htElementUtils = require("../../../../../../utils/htElementUtils");
 
+var _topoData = require("../../../../../../utils/topoData");
+
 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; }
@@ -180,7 +182,7 @@ function AddLinkDrawer(props) {
 
   var handleEvent = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(e) {
-      var sourcePorts, targetPorts, source, target, connect_type;
+      var sourcePorts, targetPorts, source, target, targetDisableCreatePhyAggLink, connect_type;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
@@ -206,11 +208,12 @@ function AddLinkDrawer(props) {
               setTargetIFDoc(targetPorts.portsDoc);
               source = translationNode(e.source, sourcePorts);
               target = translationNode(e.target, targetPorts);
+              targetDisableCreatePhyAggLink = !target.ciData || !(target.ciData.permission.writeable || target.ciData.permission.deleteable);
               editDispatchers.update({
                 addLinkIsOpen: true,
                 currentLink: null
               });
-              connect_type = target.ciType !== "customNode" && target.ipAddress && targetPorts.ports.length > 0 ? "phy" : "exit";
+              connect_type = target.ciType !== "customNode" && target.ipAddress && targetPorts.ports.length > 0 && !targetDisableCreatePhyAggLink ? "phy" : "exit";
               setLink({
                 source: source,
                 target: target,
@@ -229,21 +232,21 @@ function AddLinkDrawer(props) {
                   connect_type: connect_type
                 }
               });
-              _context2.next = 22;
+              _context2.next = 23;
               break;
 
-            case 19:
-              _context2.prev = 19;
+            case 20:
+              _context2.prev = 20;
               _context2.t0 = _context2["catch"](3);
 
               _rlog["default"].error("出现异常", _context2.t0);
 
-            case 22:
+            case 23:
             case "end":
               return _context2.stop();
           }
         }
-      }, _callee2, null, [[3, 19]]);
+      }, _callee2, null, [[3, 20]]);
     }));
 
     return function handleEvent(_x3) {
@@ -255,7 +258,9 @@ function AddLinkDrawer(props) {
     // rlog.debug("设置了起始节点", e);
     //const allData = topo.getData();
     var enableNodes = (0, _htElementUtils.getNodes)(topo.getDataModel());
-    topo.view.topoClient.emitEvent("topo_link_set_connectable_nodes", enableNodes);
+    topo.view.topoClient.emitEvent("topo_link_set_connectable_nodes", enableNodes.filter(function (ele) {
+      return !((0, _htElementUtils.isGroup)(ele) && !ele.a('ciType'));
+    }));
   };
 
   var initEditLineData = /*#__PURE__*/function () {
@@ -282,6 +287,7 @@ function AddLinkDrawer(props) {
               connect_type = currentLink.attributes["network_link.connect_type"] === "exit" ? "exit" : "phy";
               setLink({
                 source: {
+                  ciData: topo.dataModel.getDataById(currentLink.source),
                   id: currentLink.source,
                   name: currentLink.attributes["network_link.source_device_id_object"].displayName,
                   ciId: currentLink.attributes["network_link.source_device_id"],
@@ -293,6 +299,7 @@ function AddLinkDrawer(props) {
                   portsDoc: sourcePorts.portsDoc
                 },
                 target: {
+                  ciData: topo.dataModel.getDataById(currentLink.target),
                   id: currentLink.target,
                   name: currentLink.attributes["network_link.destination_device_id_object"].displayName,
                   ciId: currentLink.attributes["network_link.destination_device_id"],
@@ -329,25 +336,38 @@ function AddLinkDrawer(props) {
       initEditLineData();
     }
   }, [addLinkIsOpen]);
+  (0, _react.useEffect)(function () {
+    if (!addLinkIsOpen) {
+      setLink(null);
+    }
+  }, [addLinkIsOpen]);
 
   var getCiTypesConnectable = /*#__PURE__*/function () {
     var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-      var ciTypesConnectable, nodes, ciIds, ciNodes;
+      var ciTypes, ciTypesConnectable, nodes, ciIds, ciNodes, isWriteable;
       return _regenerator["default"].wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
-              _context4.next = 2;
-              return _topo["default"].networkLink.getCiTypesConnectable(_ResourceTypeLimit.RESOURCE_LIMIT_TYPES);
+              ciTypes = (0, _topoData.getCiTypes)(topo.dataModel.getData());
+              _context4.next = 3;
+              return _topo["default"].networkLink.getCiTypesConnectable(ciTypes);
 
-            case 2:
+            case 3:
               ciTypesConnectable = _context4.sent;
               nodes = (0, _htElementUtils.getNodes)(topo.getDataModel());
               ciIds = [];
               ciNodes = [];
+
+              isWriteable = function isWriteable(node) {
+                var _node$a;
+
+                return ["delete", "write"].indexOf(node.a("operation")) >= 0 || ((_node$a = node.a('permission')) === null || _node$a === void 0 ? void 0 : _node$a.writeable);
+              };
+
               nodes.map(function (node) {
                 // rlog.debug("过滤属性", node.a("operation"));
-                if (ciTypesConnectable[node.a("ciType")] && ["delete", "write"].indexOf(node.a("operation")) >= 0) {
+                if (ciTypesConnectable[node.a("ciType")] && isWriteable(node)) {
                   ciIds.push(node.id);
                   ciNodes.push(node);
                 }
@@ -358,7 +378,7 @@ function AddLinkDrawer(props) {
               setCiIdsConnectable(ciIds);
               return _context4.abrupt("return", ciNodes);
 
-            case 10:
+            case 12:
             case "end":
               return _context4.stop();
           }
@@ -399,6 +419,7 @@ function AddLinkDrawer(props) {
 
     var attrObject = node._attrObject;
     return {
+      ciData: topo.dataModel.getDataById(attrObject.id),
       id: attrObject.id,
       name: attrObject.name,
       ciId: attrObject.id,

package/lib/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js

@@ -49,6 +49,13 @@ var Row = _grid["default"].Row,
 function parseValues(values) {
   return (0, _extends2["default"])({}, values);
 }
+/**
+ * 两端都有编辑/删除权限才能创建物理和聚合链路。
+ * 目的没编辑/删除权限时，在添加链路抽屉中链接方式默认出口，物理/聚合置灰不可选
+ * @param {*} props 
+ * @returns 
+ */
+
 
 function EditLinkInfo(props) {
   var _sourceValue$ipAddres2, _sourceValue$portsDoc5, _sourceValue$portsDoc6, _targetValue$portsDoc5, _targetValue$portsDoc6;
@@ -285,8 +292,10 @@ function EditLinkInfo(props) {
       name: "network_link.destination_ipv4",
       maxLength: 128
     });
-  };
+  }; // 目的没编辑/删除权限时，在添加链路抽屉中链接方式默认出口，物理/聚合置灰不可选
+
 
+  var disableCreatePhyAggLink = target.ciType === "customNode" || !targetValue.ipAddress || targetValue.ports.length === 0 || !lineData.target || isAdd && !(lineData.target.ciData.permission.writeable || lineData.target.ciData.permission.deleteable);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].editForm
   }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
@@ -406,7 +415,7 @@ function EditLinkInfo(props) {
   }, /*#__PURE__*/_react["default"].createElement(_radio["default"], {
     id: "phy",
     value: "phy",
-    disabled: target.ciType === "customNode" || !targetValue.ipAddress || targetValue.ports.length === 0
+    disabled: disableCreatePhyAggLink
   }, "\u7269\u7406/\u805A\u5408"), /*#__PURE__*/_react["default"].createElement(_radio["default"], {
     id: "exit",
     value: "exit"

package/lib/topoCenter/components/viewer/displaySetting/LinkTagCommonRidioGroup.js

@@ -0,0 +1,35 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = LinkTagCommonRidioGroup;
+
+var _radio = _interopRequireDefault(require("@alifd/next/lib/radio"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _LinkTagCommonRidioGroupModule = _interopRequireDefault(require("./LinkTagCommonRidioGroup.module.scss"));
+
+function LinkTagCommonRidioGroup(props) {
+  var value = props.value,
+      dataSource = props.dataSource,
+      limit = props.limit,
+      onChange = props.onChange;
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: _LinkTagCommonRidioGroupModule["default"].contaienr
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: _LinkTagCommonRidioGroupModule["default"].checkboxGroupWrapper
+  }, /*#__PURE__*/_react["default"].createElement(_radio["default"].Group, {
+    value: typeof value === 'string' ? value : '0',
+    itemDirection: "ver",
+    onChange: onChange
+  }, dataSource.map(function (item) {
+    return /*#__PURE__*/_react["default"].createElement(_radio["default"], {
+      key: item.value,
+      value: item.value
+    }, item.label);
+  }))));
+}
+
+;

package/lib/topoCenter/components/viewer/displaySetting/LinkTagCommonRidioGroup.module.scss

@@ -0,0 +1,23 @@
+@import "@alifd/next/variables";
+
+.contaienr {
+  padding: 16px 12px;
+  background: #F2F7FD;
+  border-radius: 4px;
+
+  .checkboxGroupWrapper {
+    margin: -8px -8px -8px 0;
+
+    :global {
+      .#{$css-prefix}checkbox-group.next-checkbox-group-hoz {
+        display: flex;
+        flex-flow: row wrap;
+  
+        .#{$css-prefix}checkbox-wrapper {
+          margin-left: 8px;
+          margin-right: 8px;
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,102 @@
+"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 = _interopRequireDefault(require("react"));
+
+var _ResourceInfoDisplay = require("../../../../constants/ResourceInfoDisplay");
+
+var _BasicConfig = _interopRequireDefault(require("../../../../core/components/DisplaySettingDrawer/ResourceDisplay/BasicConfig"));
+
+var _Setting = _interopRequireDefault(require("../../../../core/components/ResourceViewAttributeSetting/Setting"));
+
+var _LinkTagCommonRidioGroup = _interopRequireDefault(require("./LinkTagCommonRidioGroup"));
+
+// 默认中可配置内容包括总速率、带宽利用率、发送速率、发送带宽利用率、接收速率、接收带宽利用率
+var CommonOptions = [{
+  value: '0',
+  label: '无'
+}, {
+  value: '1',
+  label: '总流速、带宽利用率',
+  options: {
+    data: ['metric:interface_totalbps', 'metric:bandwidth_utilization']
+  }
+}, {
+  value: '2',
+  label: '发送速率、发送带宽利用率',
+  options: {
+    data: ['metric:out_rate', 'metric:out_bandwidth_utilization']
+  }
+}, {
+  value: '3',
+  label: '接收速率、接收带宽利用率',
+  options: {
+    data: ['metric:in_rate', 'metric:in_bandwidth_utilization']
+  }
+}];
+
+var buildConfig = function buildConfig(item) {
+  return {
+    type: item.split(':')[0],
+    code: item.split(':')[1]
+  };
+};
+/**
+ * 资源标注配置
+ * @param {*} props 
+ * @returns 
+ */
+
+
+function LinkTagV2(props, ref) {
+  var value = props.value,
+      onChange = props.onChange;
+
+  var handleChange = function handleChange(newValue) {
+    // console.error(111, newValue)
+    if (!newValue.isCustom) {
+      var _CommonOptions$find;
+
+      var type = newValue.data;
+      var config = ((_CommonOptions$find = CommonOptions.find(function (item) {
+        return item.value === type;
+      })) === null || _CommonOptions$find === void 0 ? void 0 : _CommonOptions$find.options) || {
+        data: []
+      };
+      onChange((0, _extends2["default"])({}, newValue, config, {
+        data: config.data.map(buildConfig),
+        type: type
+      }));
+    } else {
+      onChange(newValue);
+    }
+  };
+
+  return /*#__PURE__*/_react["default"].createElement(_BasicConfig["default"], (0, _extends2["default"])({
+    ref: ref
+  }, props, {
+    value: value ? (0, _extends2["default"])({}, value, {
+      data: value.type
+    }) : value,
+    limit: 2,
+    elementType: "link",
+    showType: "tag",
+    commonOptions: CommonOptions,
+    defaultCommonConfig: _ResourceInfoDisplay.DEFAULT_LINK_TAG_COMMON_CONFIG,
+    commonSelectWidget: _LinkTagCommonRidioGroup["default"],
+    customSettingDrawer: function customSettingDrawer(params) {
+      return /*#__PURE__*/_react["default"].createElement(_Setting["default"], params);
+    },
+    onChange: handleChange
+  }));
+}
+
+var _default = /*#__PURE__*/_react["default"].forwardRef(LinkTagV2);
+
+exports["default"] = _default;

package/lib/topoCenter/getTopoData.js

@@ -23,7 +23,8 @@ var _resourcePermissionUtil = require("./utils/resourcePermissionUtil");
 
 function addLinkData(_x, _x2) {
   return _addLinkData.apply(this, arguments);
-}
+} // FIXME 业务拓扑不需要链路相关逻辑
+
 
 function _addLinkData() {
   _addLinkData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(oldLinks, nodes) {
@@ -32,10 +33,22 @@ function _addLinkData() {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 2;
-            return (0, _linkUtils.getLinksDetail)(oldLinks, nodes);
+            // 过滤掉无两端节点数据的链路
+            links = oldLinks.filter(function (link) {
+              var sourceNode = nodes.find(function (node) {
+                return node.id === link.source;
+              });
 
-          case 2:
+              if (link.source && !sourceNode) {
+                return false;
+              }
+
+              return true;
+            });
+            _context.next = 3;
+            return (0, _linkUtils.getLinksDetail)(links, nodes);
+
+          case 3:
             links = _context.sent;
             return _context.abrupt("return", {
               links: links.filter(function (link) {
@@ -46,7 +59,7 @@ function _addLinkData() {
               })
             });
 
-          case 4:
+          case 5:
           case "end":
             return _context.stop();
         }
@@ -82,7 +95,7 @@ function _buildData() {
             return Promise.all([// 查询节点属性
             (0, _services.queryCisByIds)(nodes.map(function (node) {
               return node.id;
-            })), addLinkData(data.links, nodes)]);
+            })), addLinkData(data.links || [], nodes)]);
 
           case 4:
             _yield$Promise$all = _context2.sent;

package/lib/topoCenter/hooks/editor/useGroupSortResources.js

@@ -0,0 +1,21 @@
+"use strict";
+
+exports.__esModule = true;
+exports["default"] = useGroupSortResources;
+
+function useGroupSortResources(store, nodes) {
+  var _store$useModelState = store.useModelState('topoMod'),
+      data = _store$useModelState.data;
+
+  var resources = [];
+  ((data === null || data === void 0 ? void 0 : data.nodes) || []).forEach(function (res) {
+    var node = nodes.find(function (item) {
+      return item.id === res.id;
+    });
+
+    if (node) {
+      resources.push(node);
+    }
+  });
+  return resources;
+}

package/lib/topoCenter/hooks/useEdgeExpand.js

@@ -0,0 +1,33 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = useEdgeExpand;
+
+var _useHtDataPropertyChangeListener = _interopRequireDefault(require("../../core/hooks/ht/useHtDataPropertyChangeListener"));
+
+var _edgeUtil = require("../../core/utils/edgeUtil");
+
+/**
+ * 默认情况下，拓扑图不存在链路的动态效果
+ * 未监控的链路，不展示动态效果
+ * @param {*} props 
+ */
+function useEdgeExpand(props) {
+  var topo = props.topo;
+  (0, _useHtDataPropertyChangeListener["default"])({
+    topo: topo,
+    onChange: function onChange(e) {
+      var property = e.property,
+          data = e.data;
+
+      if (data instanceof ht.Group && property === 'expanded') {
+        (0, _edgeUtil.updateEdgeExpanded)(topo);
+        setTimeout(function () {
+          (0, _edgeUtil.updateEdgeExpanded)(topo);
+        }, 100);
+      }
+    }
+  });
+}

package/lib/topoCenter/hooks/useLinkDynamicStyle.js

@@ -25,7 +25,7 @@ function _default(props) {
   var graphLoaded = topoModState.graphLoaded,
       topoData = topoModState.data;
   (0, _react.useEffect)(function () {
-    // 拓扑图记载完成时刷新
+    // 拓扑图加载完成时刷新
     if (graphLoaded && topoData) {
       topo.linkDynamicStyleExecutor.execute();
     }

package/lib/topoCenter/hooks/useTopoEdit.js

@@ -13,6 +13,8 @@ var _useDeleteEdges = _interopRequireDefault(require("./editor/useDeleteEdges"))
 
 var _default = function _default(props) {
   var topo = props.topo;
+  var functionAuthState = topo.store.useModelState('functionAuth');
+  var canAddLink = !!functionAuthState.permissions.addResource;
   var deleteEdges = (0, _useDeleteEdges["default"])({
     topo: topo
   });
@@ -30,6 +32,7 @@ var _default = function _default(props) {
   };
 
   return {
+    canAddLink: canAddLink,
     onElementsDelete: onElementsDelete
   };
 };