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

package/es/core/utils/showGraphManageStatusUtil.js

@@ -48,10 +48,16 @@ export function showManageStatus(options) {
 export function removeManageStatus(options) {
   var topo = options.topo,
       resources = options.resources;
+  var dm = topo.getDataModel();
+
+  if (!dm) {
+    return;
+  }
+
   resources.forEach(function (resource) {
     var type = resource.type,
         id = resource.id;
-    var element = topo.getDataModel().getDataByTag(id);
+    var element = dm.getDataByTag(id);
     if (!element) return;
 
     if (type === 'node') {

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/hooks/useMetricPolling.js

@@ -13,7 +13,8 @@ export default function useMetricPolling(_ref) {
     sourceMetrics: null,
     destinationMetrics: null,
     // 链路指标列表
-    linkMetrics: []
+    linkMetrics: [],
+    linkMetricsTs: null
   }),
       data = _useState[0],
       setData = _useState[1]; // 轮询hooks
@@ -25,9 +26,7 @@ export default function useMetricPolling(_ref) {
     debounceInterval: 200,
     manual: true,
     onSuccess: function onSuccess(result) {
-      setData(_extends({}, data, {
-        linkMetrics: result
-      }));
+      setData(_extends({}, data, result));
       rlog.info('链路拓扑指标轮询', result);
     }
   });
@@ -45,18 +44,24 @@ export default function useMetricPolling(_ref) {
     return item;
   }).sort().join(',');
   useEffect(function () {
-    rlog.info('链路拓扑指标轮询 切换', {
-      linkCi: linkCi,
-      linkMetricCodes: linkMetricCodes
-    });
-    queryLinkMetricsRequest.run(linkCi, linkMetricCodes);
+    if (linkId) {
+      rlog.info('链路拓扑指标轮询 切换', {
+        linkCi: linkCi,
+        linkMetricCodes: linkMetricCodes
+      });
+      queryLinkMetricsRequest.run(linkCi, linkMetricCodes);
+    }
+
     return function () {};
   }, [linkId, linkMetricCodesStr]);
   useEffect(function () {
-    rlog.info('链路拓扑指标轮询 queryInterfaceMetricsRequest 开始', {
-      linkCi: linkCi
-    });
-    queryInterfaceMetricsRequest.run(linkCi);
+    if (linkId) {
+      rlog.info('链路拓扑指标轮询 queryInterfaceMetricsRequest 开始', {
+        linkCi: linkCi
+      });
+      queryInterfaceMetricsRequest.run(linkCi);
+    }
+
     return function () {};
   }, [linkId]);
   return data;

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

@@ -68,6 +68,8 @@ export function queryLinkLatestMetrics(_x3, _x4) {
 
 function _queryLinkLatestMetrics() {
   _queryLinkLatestMetrics = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(linkCi, linkMetricCodes) {
+    var _linkMetrics$;
+
     var linkMetrics, resultData;
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) {
@@ -91,23 +93,30 @@ function _queryLinkLatestMetrics() {
 
           case 5:
             linkMetrics = _context3.sent;
+            _context3.next = 8;
+            return ciTypeCache.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 metricDef = ciTypeCache.getMetric(linkCi.ciType, code);
+              });
+              var value = metric === null || metric === void 0 ? void 0 : metric.metricValue;
+              var metricDef = ciTypeCache.getMetric(linkCi.ciType || linkCi.typeCode, code);
               return {
                 code: code,
                 name: metricDef.name,
-                value: formatMetric(value, metricDef) || ''
+                value: 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();
         }
@@ -123,29 +132,34 @@ export function queryLinkInterfacesLatestMetrics(_x5) {
 
 function _queryLinkInterfacesLatestMetrics() {
   _queryLinkInterfacesLatestMetrics = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.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 _regeneratorRuntime.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 INTERFACE_METRIC_CODES.reduce(function (res, code) {
                 var _metrics$find;
 
                 var value = (_metrics$find = metrics.find(function (m) {
                   return m.metricCode === code;
                 })) === null || _metrics$find === void 0 ? void 0 : _metrics$find.metricValue;
-                var metricDef = ciTypeCache.getMetric(linkCi.ciType, code);
+                var metricDef = ciTypeCache.getMetric(linkCi.ciType || linkCi.typeCode, code);
                 var formatValue = formatMetric(value, metricDef);
                 res[code] = formatValue === 'undefined' ? '-' : formatValue;
                 return res;
               }, {});
             };
 
+            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.debug('查询链路接口指标', linkCi); // 查询指标模型
 
@@ -160,24 +174,29 @@ function _queryLinkInterfacesLatestMetrics() {
               typeCodes.push(destinationType);
             }
 
-            _context4.next = 8;
+            _context4.next = 9;
             return ciTypeCache.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.debug('查询链路接口指标 结果', linkCi);
             return _context4.abrupt("return", resultData);
 
-          case 14:
+          case 15:
           case "end":
             return _context4.stop();
         }

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

@@ -18,46 +18,30 @@ export default function WebConsoleForm(props) {
       webConsoleUrl = _useWebConsole.webConsoleUrl,
       save = _useWebConsole.save;
 
-  var _useState = useState(true),
+  var _useState = useState(false),
       isEdit = _useState[0],
-      handleInput = _useState[1];
-
-  var _useState2 = useState(false),
-      isSave = _useState2[0],
-      handleSaveBtn = _useState2[1];
-
-  var _useState3 = useState(false),
-      isShow = _useState3[0],
-      handleEdit = _useState3[1];
+      setIsEdit = _useState[1];
 
   var field = _Field.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) {}
   });
 
   useEffect(function () {
-    field.setValue('url', webConsoleUrl);
+    field.setValue('url', webConsoleUrl || '');
+    field.validate();
   }, [webConsoleUrl]);
-  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.createElement(_Loading, {
@@ -85,10 +69,10 @@ export default function WebConsoleForm(props) {
     name: "url",
     placeholder: "\u8BF7\u8F93\u5165\u94FE\u63A5\u5730\u5740",
     trim: true,
-    disabled: isEdit
-  })), /*#__PURE__*/React.createElement(FormItem, null, isShow ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Button, {
+    disabled: !isEdit
+  })), /*#__PURE__*/React.createElement(FormItem, null, isEdit ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Button, {
     type: "primary",
-    disabled: isSave,
+    disabled: !!field.getError('url'),
     onClick: saveData,
     name: "baocun"
   }, "\u4FDD\u5B58")) : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Button, {

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

@@ -57,16 +57,17 @@ export default function useWebConsole(props) {
   var requestWebConsoleUrl = 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);
     }
   });
   useEffect(function () {
+    setWebConsoleUrl(null);
     requestWebConsoleUrl.run(ciId);
   }, [ciId]); // 保存Web控制台url
 

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

@@ -1,14 +1,20 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React from 'react'; // import ResourceWebControllUrlSettingDialog from './ResourceWebControllUrlSettingDialog';
-
+import React from 'react';
+import useAlarm from "../../../hooks/useAlarm";
+import useManageStatus from "../../../hooks/useManageStatus";
 import MetricPollingPlugin from "./MetricPollingPlugin";
 import ResourceDetail from "./ResourceDetail";
 export default function ViewerPlugin(props) {
   var topo = props.topo,
       viewerProps = props.viewerProps;
   var store = topo.store;
-  var plugins = [MetricPollingPlugin, // ResourceWebControllUrlSettingDialog,
-  ResourceDetail].concat((viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.plugins) || []);
+  useAlarm({
+    topo: topo
+  });
+  useManageStatus({
+    topo: topo
+  });
+  var plugins = [MetricPollingPlugin, ResourceDetail].concat((viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.plugins) || []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, plugins.map(function (Plugin, index) {
     return /*#__PURE__*/React.createElement(Plugin, _extends({
       key: index,

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

@@ -11,7 +11,8 @@ import DisplaySettingDrawer from "../../../../components/DisplaySettingDrawer";
 export default function SettingButton(props) {
   var topo = props.topo,
       displaySettingProps = props.displaySettingProps,
-      style = props.style;
+      style = props.style,
+      isEditor = props.isEditor;
 
   var _useState = useState(false),
       visible = _useState[0],
@@ -40,6 +41,7 @@ export default function SettingButton(props) {
   })), /*#__PURE__*/React.createElement(DisplaySettingDrawer, {
     visible: visible,
     topo: topo,
+    isEditor: isEditor,
     displaySettingProps: displaySettingProps,
     onClose: function onClose() {
       setVisible(false);

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

@@ -9,11 +9,13 @@ import SettingButton from "./SettingButton";
 export default function SettingButtonWidget(props) {
   var topo = props.topo,
       viewerProps = props.viewerProps,
-      style = props.style;
+      style = props.style,
+      isEditor = props.isEditor;
   return /*#__PURE__*/React.createElement(SettingButton, {
     topo: topo,
     displaySettingProps: viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.displaySettingProps,
-    style: style
+    style: style,
+    isEditor: isEditor
   });
 }
 ;

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

@@ -2,7 +2,8 @@ import _Tab from "@alifd/next/es/tab";
 import React, { useState, useEffect } from 'react';
 import TabView from "../../../../../core/editor/components/settings/common/tab/TabView";
 import EdgeGroupSetting from "../../../../../core/editor/components/settings/propertyViews/edge/edgeGroup/EdgeGroupSetting";
-import LindInfoPreview from "./link/LinkInfoPreview";
+import LindInfoPreview from "./link/LinkInfoPreview"; // V1.2 废弃
+
 export default function EdgeGroupPropertyView(props) {
   var topo = props.topo,
       edge = props.edge,

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

@@ -1,10 +1,43 @@
+import _Form from "@alifd/next/es/form";
+import _Field from "@alifd/next/es/field";
 import _extends from "@babel/runtime/helpers/extends";
-import React from 'react';
-import CommonEdgePropertyView from "../../../../../core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView";
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import React, { useEffect } from 'react';
 import BindExitLinkSelect from "./link/BindExitLinkSelect";
+
+function parseValues(values, edge) {
+  return _extends({}, values);
+}
+
 export default function EdgePropertyView(props) {
-  var extraDisplaySetting = /*#__PURE__*/React.createElement(BindExitLinkSelect, props);
-  return /*#__PURE__*/React.createElement(CommonEdgePropertyView, _extends({}, props, {
-    extraDisplaySetting: extraDisplaySetting
-  }));
+  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.useField({
+    autoUnmount: false,
+    values: parseValues(values, edge),
+    onChange: function onChange(name, value) {
+      rlog.debug('CommonEdgePropertyView', name, value);
+      var newValues = field.getValues();
+
+      _onChange(name, value, newValues);
+    }
+  });
+
+  useEffect(function () {
+    field.setValues(parseValues(values, edge));
+  }, [values]);
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      margin: '12px 0 0 32px'
+    }
+  }, /*#__PURE__*/React.createElement(_Form, {
+    field: field,
+    labelAlign: "top"
+  }, /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(BindExitLinkSelect, props))));
 }

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

@@ -1,37 +1,31 @@
-import _Tab from "@alifd/next/es/tab";
 import _extends from "@babel/runtime/helpers/extends";
-import React from "react";
-import TabView from "../../../../../../core/editor/components/settings/common/tab/TabView";
+import NoDataPage from '@riil-frontend/component-no-data-page';
+import React from 'react';
 import Data from "./Data";
-import Setting from "./Setting";
 export default 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.createElement(Setting, props);
+      return /*#__PURE__*/React.createElement(NoDataPage, {
+        statusCode: "\u6CA1\u6709\u67E5\u770B\u6743\u9650"
+      });
     }
   } else {
-    return /*#__PURE__*/React.createElement(Setting, props);
+    return null;
   }
 
-  return /*#__PURE__*/React.createElement(TabView, null, /*#__PURE__*/React.createElement(_Tab.Item, {
-    title: "\u6570\u636E",
-    key: "1"
-  }, /*#__PURE__*/React.createElement(Data, _extends({}, props, {
+  return /*#__PURE__*/React.createElement(Data, _extends({}, props, {
     link: link
-  }))), /*#__PURE__*/React.createElement(_Tab.Item, {
-    title: "\u8BBE\u7F6E",
-    key: "2"
-  }, /*#__PURE__*/React.createElement(Setting, props)));
+  }));
 }

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

@@ -0,0 +1,37 @@
+import _Tab from "@alifd/next/es/tab";
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import TabView from "../../../../../../core/editor/components/settings/common/tab/TabView";
+import Data from "./Data";
+import Setting from "./Setting";
+export default 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.createElement(Setting, props);
+    }
+  } else {
+    return /*#__PURE__*/React.createElement(Setting, props);
+  }
+
+  return /*#__PURE__*/React.createElement(TabView, null, /*#__PURE__*/React.createElement(_Tab.Item, {
+    title: "\u6570\u636E",
+    key: "1"
+  }, /*#__PURE__*/React.createElement(Data, _extends({}, props, {
+    link: link
+  }))), /*#__PURE__*/React.createElement(_Tab.Item, {
+    title: "\u8BBE\u7F6E",
+    key: "2"
+  }, /*#__PURE__*/React.createElement(Setting, props)));
+}

package/es/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/es/networkTopo/components/editor/useEditorProps.js

@@ -2,7 +2,6 @@ import _extends from "@babel/runtime/helpers/extends";
 import _useGroupSortResources from "../../hooks/editor/useGroupSortResources";
 import LayerConfigPlugin from "./plugins/LayerConfigPlugin";
 import AddLinkDrawer from "./propertyViews/edge/addLinkDrawer/AddLinkDrawer";
-import EdgeGroupPropertyView from "./propertyViews/edge/EdgeGroupPropertyView";
 import EdgePropertyView from "./propertyViews/edge/EdgePropertyView";
 import LinkPropertyView from "./propertyViews/edge/LinkPropertyView";
 import LayerRelatedResourceList from "./propertyViews/LayerRelatedResourceList";
@@ -20,8 +19,7 @@ export default function useEditorProps(props) {
     // 连线属性面板
     edgePropertyViews: {
       edge: EdgePropertyView,
-      link: LinkPropertyView,
-      edgeGroup: EdgeGroupPropertyView
+      link: LinkPropertyView
     },
     getEdgePropertyViewType: function getEdgePropertyViewType(_ref) {
       var edge = _ref.edge;

package/es/networkTopo/createTopo.js

@@ -1,7 +1,9 @@
 import _extends from "@babel/runtime/helpers/extends";
 import TopoCenter from "./models/TopoCenter";
+import services from "./services";
 export function createTopo(options) {
   var topoApp = new TopoCenter(_extends({}, options));
+  topoApp.serverApi = services;
   return topoApp;
 }
 export default createTopo;

package/es/networkTopo/models/LinkDynamicStyleExecutor.js

@@ -54,13 +54,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/es/networkTopo/services/link.js

@@ -156,10 +156,10 @@ export 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/es/networkTopo/store/topoTreeMod.js

@@ -2,7 +2,6 @@ import _Message from "@alifd/next/es/message";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService from "../services";
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import { formatTree, loopTree, loopTreeFun, findParentIdsById, treeNodeCount } from "../../utils/tree";
 
@@ -88,7 +87,7 @@ export default function (topoApp) {
                     }
 
                     _context2.next = 4;
-                    return topoService.getTopoTree();
+                    return topoApp.serverApi.getTopoTree();
 
                   case 4:
                     resTreeData = _context2.sent;
@@ -97,7 +96,7 @@ export default function (topoApp) {
 
                   case 7:
                     _context2.next = 9;
-                    return topoService.getTopoTreeByLoginUser();
+                    return topoApp.serverApi.getTopoTreeByLoginUser();
 
                   case 9:
                     resTreeData = _context2.sent;
@@ -163,7 +162,7 @@ export default function (topoApp) {
 
                     rlog.debug('editTopoOnTree', conditions);
                     _context4.next = 4;
-                    return topoService.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;
@@ -247,7 +246,7 @@ export default function (topoApp) {
 
                   case 8:
                     _context5.next = 10;
-                    return topoService.deleteTopoonTree(parseInt(conditions, 10));
+                    return topoApp.serverApi.deleteTopoonTree(parseInt(conditions, 10));
 
                   case 10:
                     return _context5.abrupt("return", _context5.sent);
@@ -271,7 +270,7 @@ export default function (topoApp) {
 
                   case 18:
                     _context5.next = 20;
-                    return topoService.deleteTopoonTree(parseInt(conditions, 10));
+                    return topoApp.serverApi.deleteTopoonTree(parseInt(conditions, 10));
 
                   case 20:
                     return _context5.abrupt("return", _context5.sent);
@@ -299,7 +298,7 @@ export default function (topoApp) {
 
                     rlog.debug('setDefTopoOnTree', conditions);
                     _context6.next = 4;
-                    return topoService.setDefTopo(parseInt(conditions, 10));
+                    return topoApp.serverApi.setDefTopo(parseInt(conditions, 10));
 
                   case 4:
                     resTreeData = _context6.sent;