@riil-frontend/component-topology 6.0.0-alpha.8 → 6.0.1

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/services/index.js

@@ -86,6 +86,8 @@ function queryLinkLatestMetrics(_x3, _x4) {
 
 function _queryLinkLatestMetrics() {
   _queryLinkLatestMetrics = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(linkCi, linkMetricCodes) {
+    var _linkMetrics$;
+
     var linkMetrics, resultData;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) {
@@ -109,25 +111,32 @@ function _queryLinkLatestMetrics() {
 
           case 5:
             linkMetrics = _context3.sent;
+            _context3.next = 8;
+            return _CiTypeCache["default"].load([linkCi.ciType || linkCi.typeCode]);
+
+          case 8:
             // format
             resultData = linkMetricCodes.map(function (code) {
-              var _linkMetrics$find;
-
-              var value = (_linkMetrics$find = linkMetrics.find(function (m) {
+              var metric = linkMetrics.find(function (m) {
                 return m.metricCode === code;
-              })) === null || _linkMetrics$find === void 0 ? void 0 : _linkMetrics$find.metricValue;
+              });
+              var value = metric === null || metric === void 0 ? void 0 : metric.metricValue;
 
-              var metricDef = _CiTypeCache["default"].getMetric(linkCi.ciType, code);
+              var metricDef = _CiTypeCache["default"].getMetric(linkCi.ciType || linkCi.typeCode, code);
 
               return {
                 code: code,
                 name: metricDef.name,
-                value: (0, _attributeFormatter.formatMetric)(value, metricDef) || ''
+                value: (0, _attributeFormatter.formatMetric)(value, metricDef) || '',
+                ts: metric === null || metric === void 0 ? void 0 : metric.ts
               };
             });
-            return _context3.abrupt("return", resultData);
+            return _context3.abrupt("return", {
+              linkMetrics: resultData,
+              linkMetricsTs: (_linkMetrics$ = linkMetrics[0]) === null || _linkMetrics$ === void 0 ? void 0 : _linkMetrics$.ts
+            });
 
-          case 8:
+          case 10:
           case "end":
             return _context3.stop();
         }
@@ -143,16 +152,14 @@ function queryLinkInterfacesLatestMetrics(_x5) {
 
 function _queryLinkInterfacesLatestMetrics() {
   _queryLinkInterfacesLatestMetrics = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(linkCi) {
-    var _linkCi$attributes, sourceType, sourceId, destinationId, destinationType, typeCodes, queryInterfaceMetricsParam, interfaceMetrics, resultData, parseInterfaceMetrics;
+    var _linkCi$attributes, sourceType, sourceId, destinationId, destinationType, typeCodes, queryInterfaceMetricsParam, interfaceMetrics, resultData, findMetricsBySubCiId, parseInterfaceMetrics;
 
     return _regenerator["default"].wrap(function _callee4$(_context4) {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
             parseInterfaceMetrics = function _parseInterfaceMetric(subCiId) {
-              var metrics = interfaceMetrics.filter(function (metric) {
-                return metric.subCiId === subCiId;
-              });
+              var metrics = findMetricsBySubCiId(subCiId);
               return _constants.INTERFACE_METRIC_CODES.reduce(function (res, code) {
                 var _metrics$find;
 
@@ -160,7 +167,7 @@ function _queryLinkInterfacesLatestMetrics() {
                   return m.metricCode === code;
                 })) === null || _metrics$find === void 0 ? void 0 : _metrics$find.metricValue;
 
-                var metricDef = _CiTypeCache["default"].getMetric(linkCi.ciType, code);
+                var metricDef = _CiTypeCache["default"].getMetric(linkCi.ciType || linkCi.typeCode, code);
 
                 var formatValue = (0, _attributeFormatter.formatMetric)(value, metricDef);
                 res[code] = formatValue === 'undefined' ? '-' : formatValue;
@@ -168,6 +175,13 @@ function _queryLinkInterfacesLatestMetrics() {
               }, {});
             };
 
+            findMetricsBySubCiId = function _findMetricsBySubCiId(subCiId) {
+              var metrics = interfaceMetrics.filter(function (metric) {
+                return metric.subCiId === subCiId;
+              });
+              return metrics;
+            };
+
             _linkCi$attributes = linkCi.attributes, sourceType = _linkCi$attributes.source_type, sourceId = _linkCi$attributes.source_id, destinationId = _linkCi$attributes.destination_id, destinationType = _linkCi$attributes.destination_type;
 
             _rlog["default"].debug('查询链路接口指标', linkCi); // 查询指标模型
@@ -184,26 +198,31 @@ function _queryLinkInterfacesLatestMetrics() {
               typeCodes.push(destinationType);
             }
 
-            _context4.next = 8;
+            _context4.next = 9;
             return _CiTypeCache["default"].load(typeCodes);
 
-          case 8:
-            _context4.next = 10;
+          case 9:
+            _context4.next = 11;
             return queryLatestMetrics(queryInterfaceMetricsParam);
 
-          case 10:
+          case 11:
             interfaceMetrics = _context4.sent;
             // format
             resultData = {
               sourceMetrics: parseInterfaceMetrics(sourceId),
-              destinationMetrics: destinationId ? parseInterfaceMetrics(destinationId) : null
+              destinationMetrics: destinationId ? parseInterfaceMetrics(destinationId) : null,
+              // 源目的接口指标原始数据。支持关键链路详情过滤最近一小时指标
+              originMetricData: {
+                source: findMetricsBySubCiId(sourceId),
+                destination: destinationId ? findMetricsBySubCiId(destinationId) : []
+              }
             };
 
             _rlog["default"].debug('查询链路接口指标 结果', linkCi);
 
             return _context4.abrupt("return", resultData);
 
-          case 14:
+          case 15:
           case "end":
             return _context4.stop();
         }

package/lib/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/WebConsoleForm.js

@@ -37,46 +37,30 @@ function WebConsoleForm(props) {
       webConsoleUrl = _useWebConsole.webConsoleUrl,
       save = _useWebConsole.save;
 
-  var _useState = (0, _react.useState)(true),
+  var _useState = (0, _react.useState)(false),
       isEdit = _useState[0],
-      handleInput = _useState[1];
-
-  var _useState2 = (0, _react.useState)(false),
-      isSave = _useState2[0],
-      handleSaveBtn = _useState2[1];
-
-  var _useState3 = (0, _react.useState)(false),
-      isShow = _useState3[0],
-      handleEdit = _useState3[1];
+      setIsEdit = _useState[1];
 
   var field = _field["default"].useField({
     autoUnmount: true,
-    values: {},
-    onChange: function onChange(name, value) {
-      field.getValue('url').length > 0 ? handleSaveBtn(false) : handleSaveBtn(true);
-    }
+    values: {
+      url: webConsoleUrl || ''
+    },
+    onChange: function onChange(name, value) {}
   });
 
   (0, _react.useEffect)(function () {
-    field.setValue('url', webConsoleUrl);
+    field.setValue('url', webConsoleUrl || '');
+    field.validate();
   }, [webConsoleUrl]);
-  (0, _react.useEffect)(function () {
-    field.getError('url') == null ? handleSaveBtn(false) : handleSaveBtn(true);
-  }, [field.getError('url')]);
 
   function handleEditLink() {
-    handleInput(false);
-    handleEdit(true);
+    setIsEdit(true);
   }
 
   function saveData() {
     save(field.getValue('url'));
-    handleEdit(function (isShow) {
-      return !isShow;
-    });
-    handleInput(function (isEdit) {
-      return !isEdit;
-    });
+    setIsEdit(false);
   }
 
   return /*#__PURE__*/_react["default"].createElement(_loading["default"], {
@@ -104,10 +88,10 @@ function WebConsoleForm(props) {
     name: "url",
     placeholder: "\u8BF7\u8F93\u5165\u94FE\u63A5\u5730\u5740",
     trim: true,
-    disabled: isEdit
-  })), /*#__PURE__*/_react["default"].createElement(FormItem, null, isShow ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_button["default"], {
+    disabled: !isEdit
+  })), /*#__PURE__*/_react["default"].createElement(FormItem, null, isEdit ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_button["default"], {
     type: "primary",
-    disabled: isSave,
+    disabled: !!field.getError('url'),
     onClick: saveData,
     name: "baocun"
   }, "\u4FDD\u5B58")) : /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_button["default"], {

package/lib/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/hooks/useWebConsole.js

@@ -71,16 +71,17 @@ function useWebConsole(props) {
   var requestWebConsoleUrl = (0, _ahooks.useRequest)(queryWebConsoleUrlById, {
     manual: true,
     onSuccess: function onSuccess(result) {
-      if (ipv4Address != undefined) {
-        result = result === undefined ? "http://" + ipv4Address : result;
-      } else {
-        result = result === undefined ? null : result;
+      var url = result;
+
+      if (!url && ipv4Address) {
+        url = "http://" + ipv4Address;
       }
 
-      setWebConsoleUrl(result);
+      setWebConsoleUrl(url);
     }
   });
   (0, _react.useEffect)(function () {
+    setWebConsoleUrl(null);
     requestWebConsoleUrl.run(ciId);
   }, [ciId]); // 保存Web控制台url
 

package/lib/core/viewer/components/plugins/ViewerPlugin.js

@@ -9,17 +9,25 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _react = _interopRequireDefault(require("react"));
 
+var _useAlarm = _interopRequireDefault(require("../../../hooks/useAlarm"));
+
+var _useManageStatus = _interopRequireDefault(require("../../../hooks/useManageStatus"));
+
 var _MetricPollingPlugin = _interopRequireDefault(require("./MetricPollingPlugin"));
 
 var _ResourceDetail = _interopRequireDefault(require("./ResourceDetail"));
 
-// import ResourceWebControllUrlSettingDialog from './ResourceWebControllUrlSettingDialog';
 function ViewerPlugin(props) {
   var topo = props.topo,
       viewerProps = props.viewerProps;
   var store = topo.store;
-  var plugins = [_MetricPollingPlugin["default"], // ResourceWebControllUrlSettingDialog,
-  _ResourceDetail["default"]].concat((viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.plugins) || []);
+  (0, _useAlarm["default"])({
+    topo: topo
+  });
+  (0, _useManageStatus["default"])({
+    topo: topo
+  });
+  var plugins = [_MetricPollingPlugin["default"], _ResourceDetail["default"]].concat((viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.plugins) || []);
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, plugins.map(function (Plugin, index) {
     return /*#__PURE__*/_react["default"].createElement(Plugin, (0, _extends2["default"])({
       key: index,

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

@@ -25,7 +25,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function SettingButton(props) {
   var topo = props.topo,
       displaySettingProps = props.displaySettingProps,
-      style = props.style;
+      style = props.style,
+      isEditor = props.isEditor;
 
   var _useState = (0, _react.useState)(false),
       visible = _useState[0],
@@ -54,6 +55,7 @@ function SettingButton(props) {
   })), /*#__PURE__*/_react["default"].createElement(_DisplaySettingDrawer["default"], {
     visible: visible,
     topo: topo,
+    isEditor: isEditor,
     displaySettingProps: displaySettingProps,
     onClose: function onClose() {
       setVisible(false);

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

@@ -17,11 +17,13 @@ var _SettingButton = _interopRequireDefault(require("./SettingButton"));
 function SettingButtonWidget(props) {
   var topo = props.topo,
       viewerProps = props.viewerProps,
-      style = props.style;
+      style = props.style,
+      isEditor = props.isEditor;
   return /*#__PURE__*/_react["default"].createElement(_SettingButton["default"], {
     topo: topo,
     displaySettingProps: viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.displaySettingProps,
-    style: style
+    style: style,
+    isEditor: isEditor
   });
 }
 

package/lib/networkTopo/components/editor/propertyViews/edge/EdgeGroupPropertyView.js

@@ -19,6 +19,7 @@ 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; }
 
+// V1.2 废弃
 function EdgeGroupPropertyView(props) {
   var topo = props.topo,
       edge = props.edge,

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

@@ -5,18 +5,56 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = EdgePropertyView;
 
+var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
+
+var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
+
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _react = _interopRequireDefault(require("react"));
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _CommonEdgePropertyView = _interopRequireDefault(require("../../../../../core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _BindExitLinkSelect = _interopRequireDefault(require("./link/BindExitLinkSelect"));
 
-function EdgePropertyView(props) {
-  var extraDisplaySetting = /*#__PURE__*/_react["default"].createElement(_BindExitLinkSelect["default"], props);
+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); }
 
-  return /*#__PURE__*/_react["default"].createElement(_CommonEdgePropertyView["default"], (0, _extends2["default"])({}, props, {
-    extraDisplaySetting: extraDisplaySetting
-  }));
+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 parseValues(values, edge) {
+  return (0, _extends2["default"])({}, values);
+}
+
+function EdgePropertyView(props) {
+  var topo = props.topo,
+      edge = props.edge,
+      values = props.values,
+      _onChange = props.onChange,
+      editorProps = props.editorProps,
+      extraDisplaySetting = props.extraDisplaySetting;
+  var store = topo.store;
+
+  var field = _field["default"].useField({
+    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);
+    }
+  });
+
+  (0, _react.useEffect)(function () {
+    field.setValues(parseValues(values, edge));
+  }, [values]);
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      margin: '12px 0 0 32px'
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
+    field: field,
+    labelAlign: "top"
+  }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, /*#__PURE__*/_react["default"].createElement(_BindExitLinkSelect["default"], props))));
 }

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

@@ -5,46 +5,38 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 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 _componentNoDataPage = _interopRequireDefault(require("@riil-frontend/component-no-data-page"));
 
-var _TabView = _interopRequireDefault(require("../../../../../../core/editor/components/settings/common/tab/TabView"));
+var _react = _interopRequireDefault(require("react"));
 
 var _Data = _interopRequireDefault(require("./Data"));
 
-var _Setting = _interopRequireDefault(require("./Setting"));
-
 function LinkPropertyView(props) {
   var edge = props.edge,
       topo = props.topo; // 无权限不显示数据页签
 
-  var _topo$store$useModelS = topo.store.useModelState("topoMod").data,
+  var _topo$store$useModelS = topo.store.useModelState('topoMod').data,
       links = _topo$store$useModelS.links,
       linkGroups = _topo$store$useModelS.linkGroups;
   var link = [].concat(links, linkGroups).find(function (item) {
     return item.id === edge.getTag();
-  }); // console.log('LinkPropertyView',link)
+  });
 
   if (link) {
     var readable = link.permission.readable;
 
     if (!readable) {
-      return /*#__PURE__*/_react["default"].createElement(_Setting["default"], props);
+      return /*#__PURE__*/_react["default"].createElement(_componentNoDataPage["default"], {
+        statusCode: "\u6CA1\u6709\u67E5\u770B\u6743\u9650"
+      });
     }
   } else {
-    return /*#__PURE__*/_react["default"].createElement(_Setting["default"], props);
+    return null;
   }
 
-  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"], (0, _extends2["default"])({}, props, {
+  return /*#__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)));
+  }));
 }

package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyViewV1.js

@@ -0,0 +1,50 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+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"));
+
+var _Data = _interopRequireDefault(require("./Data"));
+
+var _Setting = _interopRequireDefault(require("./Setting"));
+
+function LinkPropertyView(props) {
+  var edge = props.edge,
+      topo = props.topo; // 无权限不显示数据页签
+
+  var _topo$store$useModelS = topo.store.useModelState('topoMod').data,
+      links = _topo$store$useModelS.links,
+      linkGroups = _topo$store$useModelS.linkGroups;
+  var link = [].concat(links, linkGroups).find(function (item) {
+    return item.id === edge.getTag();
+  }); // console.log('LinkPropertyView',link)
+
+  if (link) {
+    var readable = link.permission.readable;
+
+    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"], (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)));
+}

package/lib/networkTopo/components/editor/propertyViews/edge/link/LinkInfoPreview.module.scss

@@ -53,7 +53,7 @@
   height: 100%;
   display: flex;
   flex-direction: column;
-  padding-top: 8px;
+  padding-top: 12px;
   padding-left: 16px;
 
   :global {

package/lib/networkTopo/components/editor/useEditorProps.js

@@ -13,8 +13,6 @@ var _LayerConfigPlugin = _interopRequireDefault(require("./plugins/LayerConfigPl
 
 var _AddLinkDrawer = _interopRequireDefault(require("./propertyViews/edge/addLinkDrawer/AddLinkDrawer"));
 
-var _EdgeGroupPropertyView = _interopRequireDefault(require("./propertyViews/edge/EdgeGroupPropertyView"));
-
 var _EdgePropertyView = _interopRequireDefault(require("./propertyViews/edge/EdgePropertyView"));
 
 var _LinkPropertyView = _interopRequireDefault(require("./propertyViews/edge/LinkPropertyView"));
@@ -35,8 +33,7 @@ function useEditorProps(props) {
     // 连线属性面板
     edgePropertyViews: {
       edge: _EdgePropertyView["default"],
-      link: _LinkPropertyView["default"],
-      edgeGroup: _EdgeGroupPropertyView["default"]
+      link: _LinkPropertyView["default"]
     },
     getEdgePropertyViewType: function getEdgePropertyViewType(_ref) {
       var edge = _ref.edge;

package/lib/networkTopo/createTopo.js

@@ -10,8 +10,11 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _TopoCenter = _interopRequireDefault(require("./models/TopoCenter"));
 
+var _services = _interopRequireDefault(require("./services"));
+
 function createTopo(options) {
   var topoApp = new _TopoCenter["default"]((0, _extends2["default"])({}, options));
+  topoApp.serverApi = _services["default"];
   return topoApp;
 }
 

package/lib/networkTopo/models/LinkDynamicStyleExecutor.js

@@ -65,13 +65,13 @@ 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,
         linkGroups = _topo$dataModel$getDa.linkGroups;
 
-    var dataModel = this.topo.getDataModel(); // 1、如果连线可见，设置线宽
+    var dataModel = this.topo.getDataModel();
+    topo.historyManager && topo.historyManager.setDisabled(true, '链路动态样式'); // 1、如果连线可见，设置线宽
 
     links.forEach(function (link) {
       var edge = dataModel.getDataByTag(link.id);

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.destination_device_id && network_link.source_device_id ='" + stag + "'";
+              condition = "type('network_link') && !destination_id && network_link.source_device_id ='" + stag + "'";
 
               if (ttag) {
-                condition = "type('network_link') && !network_link.destination_device_id && network_link.source_device_id ='" + stag + "' && network_link.destination_device_id='" + ttag + "'";
+                condition = "type('network_link') && !destination_id && network_link.source_device_id ='" + stag + "' && network_link.destination_device_id='" + ttag + "'";
               }
 
               parm = {

package/lib/networkTopo/store/topoTreeMod.js

@@ -13,8 +13,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _services = _interopRequireDefault(require("../services"));
-
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
 var _tree = require("../../utils/tree");
@@ -101,7 +99,7 @@ function _default(topoApp) {
                     }
 
                     _context2.next = 4;
-                    return _services["default"].getTopoTree();
+                    return topoApp.serverApi.getTopoTree();
 
                   case 4:
                     resTreeData = _context2.sent;
@@ -110,7 +108,7 @@ function _default(topoApp) {
 
                   case 7:
                     _context2.next = 9;
-                    return _services["default"].getTopoTreeByLoginUser();
+                    return topoApp.serverApi.getTopoTreeByLoginUser();
 
                   case 9:
                     resTreeData = _context2.sent;
@@ -177,7 +175,7 @@ function _default(topoApp) {
                     _rlog["default"].debug('editTopoOnTree', conditions);
 
                     _context4.next = 4;
-                    return _services["default"].editTopoonTree(parseInt(conditions.id, 10), conditions.name, conditions.type);
+                    return topoApp.serverApi.editTopoonTree(parseInt(conditions.id, 10), conditions.name, conditions.type);
 
                   case 4:
                     resTreeData = _context4.sent;
@@ -263,7 +261,7 @@ function _default(topoApp) {
 
                   case 8:
                     _context5.next = 10;
-                    return _services["default"].deleteTopoonTree(parseInt(conditions, 10));
+                    return topoApp.serverApi.deleteTopoonTree(parseInt(conditions, 10));
 
                   case 10:
                     return _context5.abrupt("return", _context5.sent);
@@ -287,7 +285,7 @@ function _default(topoApp) {
 
                   case 18:
                     _context5.next = 20;
-                    return _services["default"].deleteTopoonTree(parseInt(conditions, 10));
+                    return topoApp.serverApi.deleteTopoonTree(parseInt(conditions, 10));
 
                   case 20:
                     return _context5.abrupt("return", _context5.sent);
@@ -316,7 +314,7 @@ function _default(topoApp) {
                     _rlog["default"].debug('setDefTopoOnTree', conditions);
 
                     _context6.next = 4;
-                    return _services["default"].setDefTopo(parseInt(conditions, 10));
+                    return topoApp.serverApi.setDefTopo(parseInt(conditions, 10));
 
                   case 4:
                     resTreeData = _context6.sent;