@riil-frontend/component-topology 3.3.0 → 3.4.0

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

@@ -63,8 +63,8 @@ export default function EditLinkInfo(props) {
       setConnectEnable = _useState4[1];
 
   var fieldOnChange = function fieldOnChange(name, value) {
-    var newValues = field.getValues();
-    rlog.debug("Field-onChange", newValues, name, value);
+    var newValues = field.getValues(); // rlog.debug("Field-onChange", newValues, name, value);
+
     setValus(newValues);
   };
 
@@ -111,7 +111,6 @@ export default function EditLinkInfo(props) {
   };
 
   var connectHandleChange = function connectHandleChange(v) {
-    console.log("connectHandleChange", v);
     field.setValue("connect_type", v);
   };
 
@@ -129,9 +128,9 @@ export default function EditLinkInfo(props) {
       actualBandwidth = Math.min(sourceRb, targetRb);
     } else {
       actualBandwidth = sourceRb || targetRb;
-    }
+    } // rlog.debug("network_link.actual_bandwidth", actualBandwidth);
+
 
-    rlog.debug("network_link.actual_bandwidth", actualBandwidth);
     field.setValue("network_link.actual_bandwidth", actualBandwidth);
   };
 
@@ -140,14 +139,15 @@ export default function EditLinkInfo(props) {
       if (errors) {
         rlog.debug("saveHandleChange-error", errors, values);
       } else {
-        var _valus$destination_id, _sourceValue$portsDoc3, _sourceValue$portsDoc4, _targetValue$portsDoc3, _targetValue$portsDoc4, _sourceValue$ipAddres, _targetValue$ipAddres, _targetValue$id;
+        var _valus$destination_id, _sourceValue$portsDoc3, _sourceValue$portsDoc4, _targetValue$portsDoc3, _targetValue$portsDoc4, _targetValue$ipAddres, _sourceValue$ipAddres, _targetValue$id;
 
         rlog.debug("saveHandleChange", valus, source, target);
         var sourceId = valus["source_id"];
         var destinationId = (_valus$destination_id = valus["destination_id"]) !== null && _valus$destination_id !== void 0 ? _valus$destination_id : "";
         var sourceType = (_sourceValue$portsDoc3 = (_sourceValue$portsDoc4 = sourceValue.portsDoc[sourceId]) === null || _sourceValue$portsDoc4 === void 0 ? void 0 : _sourceValue$portsDoc4.type) !== null && _sourceValue$portsDoc3 !== void 0 ? _sourceValue$portsDoc3 : "";
         var destinationType = (_targetValue$portsDoc3 = (_targetValue$portsDoc4 = targetValue.portsDoc[destinationId]) === null || _targetValue$portsDoc4 === void 0 ? void 0 : _targetValue$portsDoc4.type) !== null && _targetValue$portsDoc3 !== void 0 ? _targetValue$portsDoc3 : "";
-        var typeJudge = linkTypeJudge(sourceType, destinationType, valus["connect_type"]);
+        var typeJudge = linkTypeJudge(sourceType, destinationType, valus["network_link.connect_type"]);
+        var destination_ipv4 = valus["network_link.connect_type"] !== "exit" ? (_targetValue$ipAddres = targetValue.ipAddress) !== null && _targetValue$ipAddres !== void 0 ? _targetValue$ipAddres : valus["network_link.destination_ipv4"] : valus["network_link.destination_ipv4"];
         var obj = {
           display_name: valus["display_name"],
           // 链路名称
@@ -155,7 +155,7 @@ export default function EditLinkInfo(props) {
           // 链路名称
           "network_link.source_ipv4": (_sourceValue$ipAddres = sourceValue.ipAddress) !== null && _sourceValue$ipAddres !== void 0 ? _sourceValue$ipAddres : valus["network_link.source_ipv4"],
           // 源IP
-          "network_link.destination_ipv4": (_targetValue$ipAddres = targetValue.ipAddress) !== null && _targetValue$ipAddres !== void 0 ? _targetValue$ipAddres : valus["network_link.destination_ipv4"],
+          "network_link.destination_ipv4": destination_ipv4,
           // 目的IP
           // source_id, // 源端口
           // destination_id, // 目的端口
@@ -224,6 +224,16 @@ export default function EditLinkInfo(props) {
     });
   };
 
+  var targetIpComp = function targetIpComp(targetValue) {
+    return targetValue.ipAddress && targetValue.ciType !== "customNode" ? /*#__PURE__*/React.createElement("div", {
+      className: styles.label
+    }, targetValue.ipAddress) : /*#__PURE__*/React.createElement(_Input, {
+      placeholder: "\u8BF7\u8F93\u5165",
+      name: "network_link.destination_ipv4",
+      maxLength: 128
+    });
+  };
+
   return /*#__PURE__*/React.createElement("div", {
     className: styles.editForm
   }, /*#__PURE__*/React.createElement(_Form, {
@@ -262,13 +272,7 @@ export default function EditLinkInfo(props) {
   }, /*#__PURE__*/React.createElement(FormItem, _extends({}, formItemLayout, {
     labelAlign: labelAlign,
     label: "\u76EE\u7684\u8282\u70B9IP"
-  }), targetValue.ipAddress ? /*#__PURE__*/React.createElement("div", {
-    className: styles.label
-  }, targetValue.ipAddress) : /*#__PURE__*/React.createElement(_Input, {
-    placeholder: "\u8BF7\u8F93\u5165",
-    name: "network_link.destination_ipv4",
-    maxLength: 128
-  })))), /*#__PURE__*/React.createElement(Row, {
+  }), targetIpComp(target)))), /*#__PURE__*/React.createElement(Row, {
     gutter: "16"
   }, /*#__PURE__*/React.createElement(Col, {
     span: "12"

package/es/topoCenter/services/link.js

@@ -146,41 +146,49 @@ export default {
    *
    * @param {array} ciIds
    */
-  queryAssociatedlinks: function queryAssociatedlinks(ids) {
+  queryAssociatedlinks: function queryAssociatedlinks(ids, type) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
-      var idtxt, parm, jsonParm, result;
+      var stag, ttag, condition, parm, jsonParm, result;
       return _regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) {
           switch (_context5.prev = _context5.next) {
             case 0:
-              idtxt = "'" + ids[0] + "','" + ids[1] + "'";
+              // 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 + "'";
+
+              if (ttag) {
+                condition = "type('network_link') && network_link.connect_type = 'exit' && network_link.source_device_id ='" + stag + "' && network_link.destination_device_id='" + ttag + "'";
+              }
+
               parm = {
-                condition: "type('network_link') && network_link.connect_type = 'exit' && network_link.source_device_id in [" + idtxt + "]",
+                condition: condition,
                 sort: "name asc",
                 currentPage: 1,
-                pageSize: 20
+                pageSize: 99
               };
               jsonParm = JSON.stringify(parm);
-              console.log("queryAssociatedlinks", ids, idtxt, parm, jsonParm);
-              _context5.prev = 4;
-              _context5.next = 7;
+              console.log("queryAssociatedlinks", ids, parm, jsonParm);
+              _context5.prev = 7;
+              _context5.next = 10;
               return getRequest().post("/mdc/v1/api/cmdb/commonQueryCiData", jsonParm);
 
-            case 7:
+            case 10:
               result = _context5.sent;
               return _context5.abrupt("return", result);
 
-            case 11:
-              _context5.prev = 11;
-              _context5.t0 = _context5["catch"](4);
+            case 14:
+              _context5.prev = 14;
+              _context5.t0 = _context5["catch"](7);
               rlog.error("查询可关联链路", _context5.t0);
 
-            case 14:
+            case 17:
             case "end":
               return _context5.stop();
           }
         }
-      }, _callee5, null, [[4, 11]]);
+      }, _callee5, null, [[7, 14]]);
     }))();
   }
 };

package/es/topoCenter/utils/linPermissionUtil.js

@@ -18,14 +18,13 @@ var isWriteable = function isWriteable(link, source, target, linkType) {
 
 export function getLinkPermission(edge, nodes, link) {
   var source = nodes.find(function (node) {
-    return node.id === edge.source;
+    return node.id === edge.getSource().getTag();
   });
   var target = nodes.find(function (node) {
-    return node.id === edge.target;
+    return node.id === edge.getTarget().getTag();
   }); // console.log("getLinkPermission", edge, source, target, link);
 
-  var linkType = link.attributes["network_link.connect_type"]; //TODO 这里的逻辑因为 出口链路 可能需要调整
-
+  var linkType = link ? link.attributes["network_link.connect_type"] : edge.a("network_link.connect_type");
   return {
     readable: (source === null || source === void 0 ? void 0 : source.operation) || (target === null || target === void 0 ? void 0 : target.operation),
     writeable: isWriteable(edge, source, target, linkType),

package/lib/components/MultiResourceDrawer/index.js

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _ResourceSelectDrawer = _interopRequireDefault(require("../ResourceSelectDrawer"));
+var _NetworkTopoResourceSelectDrawer = _interopRequireDefault(require("../NetworkTopoResourceSelectDrawer"));
 
 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); }
 
@@ -56,7 +56,7 @@ var MultiResourceDrawer = function MultiResourceDrawer(props) {
     };
   }();
 
-  return /*#__PURE__*/_react["default"].createElement(_ResourceSelectDrawer["default"], {
+  return /*#__PURE__*/_react["default"].createElement(_NetworkTopoResourceSelectDrawer["default"], {
     visible: visible,
     getExcludeIds: getExcludeIds,
     onOk: onDrawerSave,

package/lib/components/NetworkTopoResourceSelectDrawer/NetworkTopoResourceSelectDrawer.js

@@ -0,0 +1,20 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = NetworkTopoResourceSelectDrawer;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _ResourceTypeLimit = require("../../constants/ResourceTypeLimit");
+
+var _ResourceSelectDrawer = _interopRequireDefault(require("../ResourceSelectDrawer/ResourceSelectDrawer"));
+
+function NetworkTopoResourceSelectDrawer(props) {
+  return /*#__PURE__*/_react["default"].createElement(_ResourceSelectDrawer["default"], (0, _extends2["default"])({
+    commonResListProps: (0, _ResourceTypeLimit.getNetworkTopoCommonResListProps)()
+  }, props));
+}

package/lib/components/NetworkTopoResourceSelectDrawer/index.js

@@ -0,0 +1,11 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _NetworkTopoResourceSelectDrawer = _interopRequireDefault(require("./NetworkTopoResourceSelectDrawer"));
+
+var _default = _NetworkTopoResourceSelectDrawer["default"];
+exports["default"] = _default;

package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js

@@ -32,12 +32,14 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  */
 function ResourceSelectDrawer(props) {
   var visible = props.visible,
+      title = props.title,
       selectionMode = props.selectionMode,
       limitTypes = props.limitTypes,
       excludeIds = props.excludeIds,
       getExcludeIds = props.getExcludeIds,
       onOk = props.onOk,
-      onClose = props.onClose;
+      onClose = props.onClose,
+      commonResListProps = props.commonResListProps;
   var resourceSelectRef = (0, _react.useRef)();
 
   var _useState = (0, _react.useState)(false),
@@ -101,7 +103,7 @@ function ResourceSelectDrawer(props) {
   }
 
   return /*#__PURE__*/_react["default"].createElement(_Drawer["default"], {
-    title: "\u6DFB\u52A0\u8D44\u6E90",
+    title: title,
     visible: visible,
     loading: loading,
     onSave: handleOk,
@@ -115,12 +117,14 @@ function ResourceSelectDrawer(props) {
     ref: resourceSelectRef,
     selectionMode: selectionMode,
     limitTypes: limitTypes,
-    excludeIds: finalExcludeIds
+    excludeIds: finalExcludeIds,
+    commonResListProps: commonResListProps
   }));
 }
 
 ResourceSelectDrawer.propTypes = {
   visible: _propTypes["default"].bool,
+  title: _propTypes["default"].string,
   limitTypes: _propTypes["default"].array,
   excludeIds: _propTypes["default"].array,
   selectionMode: _propTypes["default"].any,
@@ -129,6 +133,7 @@ ResourceSelectDrawer.propTypes = {
 };
 ResourceSelectDrawer.defaultProps = {
   visible: true,
+  title: '添加资源',
   excludeIds: [],
   onOk: function onOk() {},
   onClose: function onClose() {}

package/lib/components/ResourceSelectDrawer/ResourceSelectList.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _componentTopologyCommon = require("@riil-frontend/component-topology-common");
@@ -17,6 +19,8 @@ var _componentNoDataPage = _interopRequireDefault(require("@riil-frontend/compon
 
 var _ResourceTypeLimit = require("../../constants/ResourceTypeLimit");
 
+var _excluded = ["selectionMode", "limitTypes", "excludeIds", "commonResListProps"];
+
 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; }
@@ -24,7 +28,9 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function ResourceSelectList(props, ref) {
   var selectionMode = props.selectionMode,
       limitTypes = props.limitTypes,
-      excludeIds = props.excludeIds;
+      excludeIds = props.excludeIds,
+      commonResListProps = props.commonResListProps,
+      otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
   var tableProps = (0, _extends2["default"])({}, selectionMode ? {
     rowSelection: {
       mode: selectionMode
@@ -32,17 +38,16 @@ function ResourceSelectList(props, ref) {
   } : {}, {
     emptyContent: /*#__PURE__*/_react["default"].createElement(_componentNoDataPage["default"], null)
   });
-  return /*#__PURE__*/_react["default"].createElement(_componentCommonResList["default"], {
+  return /*#__PURE__*/_react["default"].createElement(_componentCommonResList["default"], (0, _extends2["default"])({
     ref: ref,
-    innerTreeFilters: ['monitorable', 'discoverable'],
-    limitTypes: limitTypes || _ResourceTypeLimit.RESOURCE_LIMIT_TYPES,
+    limitTypes: limitTypes,
     defaultCondition: excludeIds.length ? "!id('" + excludeIds.join('\',\'') + "')" : undefined,
     request: (0, _componentTopologyCommon.getRequest)(),
     tableProps: tableProps,
     paginationProps: {
       type: 'simple'
     }
-  });
+  }, otherProps, commonResListProps || {}));
 }
 
 var _default = /*#__PURE__*/_react["default"].forwardRef(ResourceSelectList);

package/lib/components/SingleResourceDrawer/SelectDrawer.js

@@ -13,7 +13,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _ResourceSelectDrawer = _interopRequireDefault(require("../ResourceSelectDrawer"));
+var _NetworkTopoResourceSelectDrawer = _interopRequireDefault(require("../NetworkTopoResourceSelectDrawer"));
 
 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); }
 
@@ -57,7 +57,7 @@ var SingleSelectDrawer = function SingleSelectDrawer(props) {
     };
   }();
 
-  return /*#__PURE__*/_react["default"].createElement(_ResourceSelectDrawer["default"], {
+  return /*#__PURE__*/_react["default"].createElement(_NetworkTopoResourceSelectDrawer["default"], {
     visible: visible,
     excludeIds: totalSelection,
     selectionMode: "single",

package/lib/constants/ResourceTypeLimit.js

@@ -1,8 +1,25 @@
 "use strict";
 
 exports.__esModule = true;
-exports.RESOURCE_LIMIT_TYPES = void 0;
-// 拓扑中心资源类型限制
+exports.getNetworkTopoCommonResListProps = exports.filterCiTypes = exports.RESOURCE_LIMIT_TYPES = void 0;
+
+var filterCiTypes = function filterCiTypes(tree) {
+  return tree.filter(function (item) {
+    return item.value !== 'data_center';
+  });
+};
+
+exports.filterCiTypes = filterCiTypes;
+
+var getNetworkTopoCommonResListProps = function getNetworkTopoCommonResListProps() {
+  return {
+    innerTreeFilters: ['monitorable', 'discoverable'],
+    filterCiRes: filterCiTypes
+  };
+}; // 拓扑中心资源类型限制
+
+
+exports.getNetworkTopoCommonResListProps = getNetworkTopoCommonResListProps;
 var RESOURCE_LIMIT_TYPES = [// 网络设备
 'common_network', 'switch', 'switch_cluster', 'router', // 操作系统
 'linux', 'windows', // 数据库

package/lib/core/editor/components/GroupAddResourceDrawerPlugin/GroupAddResourceDrawer.js

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _ResourceSelectDrawer = _interopRequireDefault(require("../../../../components/ResourceSelectDrawer"));
+var _NetworkTopoResourceSelectDrawer = _interopRequireDefault(require("../../../../components/NetworkTopoResourceSelectDrawer"));
 
 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); }
 
@@ -45,7 +45,7 @@ var GroupAddResourceDrawer = function GroupAddResourceDrawer(props) {
     };
   }();
 
-  return /*#__PURE__*/_react["default"].createElement(_ResourceSelectDrawer["default"], {
+  return /*#__PURE__*/_react["default"].createElement(_NetworkTopoResourceSelectDrawer["default"], {
     visible: visible,
     getExcludeIds: topoEdit.getAllNodeResourceIds,
     onOk: onOk,

package/lib/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js

@@ -64,7 +64,7 @@ function CommonEdgePropertyView(props) {
 
   var getLinkByNodes = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id) {
-      var result;
+      var result, hasLinkIds, axlink;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -74,13 +74,21 @@ function CommonEdgePropertyView(props) {
 
             case 2:
               result = _context.sent;
+              hasLinkIds = topo.getLines().map(function (line) {
+                return line.id;
+              });
+              axlink = [];
+              result.data.map(function (exLink) {
+                if (hasLinkIds.indexOf(exLink.id) < 0) {
+                  axlink.push(exLink);
+                }
+              });
 
-              _rlog["default"].debug("出口链路列表", result.data); //const list = result[id];
+              _rlog["default"].debug("出口链路列表", result.data, axlink);
 
+              setAssociatedlinks(axlink);
 
-              setAssociatedlinks(result.data);
-
-            case 5:
+            case 8:
             case "end":
               return _context.stop();
           }
@@ -97,6 +105,8 @@ function CommonEdgePropertyView(props) {
     autoUnmount: false,
     values: parseValues(values, edge),
     onChange: function onChange(name, value) {
+      _rlog["default"].debug("CommonEdgePropertyView", name, value);
+
       var newValues = field.getValues();
 
       _onChange(name, value, newValues);
@@ -121,14 +131,18 @@ function CommonEdgePropertyView(props) {
   };
 
   var bindExitLink = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(data) {
-      var exitLink, aobj, config, exconfig, exportLinkIdList, _yield$editDispatcher, elements;
+    var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(value) {
+      var data, exitLink, aobj, config, exconfig, exportLinkIdList, _yield$editDispatcher, elements;
 
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              _rlog["default"].debug("bindExitLink--- v, edge", data, edge, edge.getSource(), edge.getTarget());
+              data = associatedlinks.find(function (link) {
+                return link.id === value;
+              });
+
+              _rlog["default"].debug("bindExitLink--- v, edge", data, edge);
 
               exitLink = {
                 attributes: [],
@@ -160,16 +174,16 @@ function CommonEdgePropertyView(props) {
               topo.resourceConfig.updateConfig((0, _extends2["default"])({}, config, {
                 exportLinkIdList: exportLinkIdList
               }));
-              _context2.next = 13;
+              _context2.next = 14;
               return editDispatchers.fetchDataByConfig();
 
-            case 13:
+            case 14:
               _yield$editDispatcher = _context2.sent;
               elements = _yield$editDispatcher.elements;
 
-              _rlog["default"].debug('fetchDataByConfig', elements);
+              _rlog["default"].debug("fetchDataByConfig", elements);
 
-            case 16:
+            case 17:
             case "end":
               return _context2.stop();
           }
@@ -242,13 +256,14 @@ function CommonEdgePropertyView(props) {
     style: {
       width: 232
     },
+    disabled: associatedlinks.length < 1,
     onChange: function onChange(v) {
       bindExitLink(v);
     }
-  }, associatedlinks.map(function (link, index) {
+  }, associatedlinks.map(function (item, index) {
     return /*#__PURE__*/_react["default"].createElement(_select["default"].Option, {
-      value: link,
+      value: item.id,
       key: index
-    }, link.attributes.display_name);
+    }, item.attributes.display_name);
   }))))))));
 }

package/lib/core/editor/components/settings/propertyViews/edge/EdgePropertyView.js

@@ -35,7 +35,6 @@ function EdgePropertyViewMatch(props) {
     topo: topo,
     id: values.id
   });
-  console.log("EdgePropertyViewMatch-edge,values, props", edge, values, props);
   var type;
 
   if (edge.isEdgeGroupAgent()) {

package/lib/core/editor/components/settings/propertyViews/index.js

@@ -29,11 +29,7 @@ var propertyPanelMap = {
   multiple: _MultipleElementPropertyView["default"]
 };
 
-if (localStorage.getItem('topo.debug') === 'true') {
-  Object.assign(propertyPanelMap, {
-    view: _ViewPropertyView["default"]
-  });
-}
+if (localStorage.getItem('topo.debug') === 'true') {}
 
 var _default = propertyPanelMap;
 exports["default"] = _default;

package/lib/core/editor/components/settings/propertyViews/layer/DataTab/LayerAddResourceDrawer.js

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _ResourceSelectDrawer = _interopRequireDefault(require("../../../../../../../components/ResourceSelectDrawer"));
+var _NetworkTopoResourceSelectDrawer = _interopRequireDefault(require("../../../../../../../components/NetworkTopoResourceSelectDrawer"));
 
 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); }
 
@@ -51,7 +51,7 @@ var LayerAddResourceDrawer = function LayerAddResourceDrawer(props) {
     };
   }();
 
-  return /*#__PURE__*/_react["default"].createElement(_ResourceSelectDrawer["default"], {
+  return /*#__PURE__*/_react["default"].createElement(_NetworkTopoResourceSelectDrawer["default"], {
     visible: visible,
     getExcludeIds: topoEdit.getAllNodeResourceIds,
     onOk: onOk,

package/lib/core/editor/components/settings/propertyViews/node/data/BindResourceDrawer.js

@@ -13,7 +13,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _ResourceSelectDrawer = _interopRequireDefault(require("../../../../../../../components/ResourceSelectDrawer"));
+var _NetworkTopoResourceSelectDrawer = _interopRequireDefault(require("../../../../../../../components/NetworkTopoResourceSelectDrawer"));
 
 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); }
 
@@ -73,8 +73,9 @@ var BindResourceDrawer = function BindResourceDrawer(props) {
     };
   }();
 
-  return /*#__PURE__*/_react["default"].createElement(_ResourceSelectDrawer["default"], {
+  return /*#__PURE__*/_react["default"].createElement(_NetworkTopoResourceSelectDrawer["default"], {
     visible: visible,
+    title: "\u5173\u8054\u8D44\u6E90",
     getExcludeIds: topoEditApi.getAllNodeResourceIds,
     selectionMode: "single",
     onOk: handleSave,

package/lib/core/models/TopoApp.js

@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "3.3.0" === 'string' ? "3.3.0" : null;
+var version = typeof "3.4.0" === 'string' ? "3.4.0" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -21,26 +21,25 @@ var _keyBy = _interopRequireDefault(require("lodash/keyBy"));
 var _services = require("../../services");
 
 var interfaceTypeMap = {
-  'network.interface': {
-    displayName: '网络接口'
+  "network.interface": {
+    displayName: "网络接口"
   },
-  'network.agg_interface': {
-    displayName: '聚合接口'
+  "network.agg_interface": {
+    displayName: "聚合接口"
   }
 };
 
 function isAggLink(link) {
-  return link.attributes['network_link.connect_type'] === 'agg';
+  return link.attributes["network_link.connect_type"] === "agg";
 }
 
 function mergeLinksData(links, linkCis, nodes, interfaceCis) {
-  var linkCiMap = (0, _keyBy["default"])(linkCis, 'id');
+  var linkCiMap = (0, _keyBy["default"])(linkCis, "id");
   return links.map(function (link) {
     var _nodes$find, _nodes$find2, _interfaceCis$find, _interfaceCis$find2;
 
     var linkCi = linkCiMap[link.id];
-    var attributes = (0, _extends2["default"])({}, linkCi === null || linkCi === void 0 ? void 0 : linkCi.attributes);
-    console.log('mergeLinksData', link, attributes); // 翻译
+    var attributes = (0, _extends2["default"])({}, linkCi === null || linkCi === void 0 ? void 0 : linkCi.attributes); // 翻译
 
     return (0, _extends2["default"])({}, link, {
       id: linkCi.id,
@@ -48,14 +47,14 @@ function mergeLinksData(links, linkCis, nodes, interfaceCis) {
       name: linkCi === null || linkCi === void 0 ? void 0 : linkCi.attributes.name,
       attributes: (0, _extends2["default"])({}, attributes, {
         // 源/目的设备
-        'network_link.source_device_id_object': {
+        "network_link.source_device_id_object": {
           displayName: (_nodes$find = nodes.find(function (node) {
-            return node.id === attributes['network_link.source_device_id'];
+            return node.id === attributes["network_link.source_device_id"];
           })) === null || _nodes$find === void 0 ? void 0 : _nodes$find.name
         },
-        'network_link.destination_device_id_object': {
+        "network_link.destination_device_id_object": {
           displayName: (_nodes$find2 = nodes.find(function (node) {
-            return node.id === attributes['network_link.destination_device_id'];
+            return node.id === attributes["network_link.destination_device_id"];
           })) === null || _nodes$find2 === void 0 ? void 0 : _nodes$find2.name
         },
         // 源/目的接口类型
@@ -65,12 +64,12 @@ function mergeLinksData(links, linkCis, nodes, interfaceCis) {
         source_id_object: {
           displayName: (_interfaceCis$find = interfaceCis.find(function (node) {
             return node.id === attributes.source_id;
-          })) === null || _interfaceCis$find === void 0 ? void 0 : _interfaceCis$find.attributes['display_name']
+          })) === null || _interfaceCis$find === void 0 ? void 0 : _interfaceCis$find.attributes["display_name"]
         },
         destination_id_object: {
           displayName: (_interfaceCis$find2 = interfaceCis.find(function (node) {
             return node.id === attributes.destination_id;
-          })) === null || _interfaceCis$find2 === void 0 ? void 0 : _interfaceCis$find2.attributes['display_name']
+          })) === null || _interfaceCis$find2 === void 0 ? void 0 : _interfaceCis$find2.attributes["display_name"]
         }
       })
     });