@riil-frontend/component-topology 6.0.0-alpha.5 → 6.0.0-alpha.50

package/es/core/store/models/selection.js

@@ -9,7 +9,8 @@ import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 export default {
   // 定义 model 的初始 state
   state: {
-    selection: []
+    selection: [],
+    selectionIds: []
   },
   // 定义改变该模型状态的纯函数
   reducers: {

package/es/core/store/models/topoBizMod.js

@@ -13,9 +13,6 @@ export default function (engine) {
       allCiSet: {},
       ciSetDoc: {},
       pollingSwitch: false,
-      // alarmDoc: {},
-      // alarmRecord: [],
-      setConfig: null,
 
       /**
       * 资源和链路的属性、指标，格式见：https://shimo.im/docs/VKt3HCKHYgJ9kvGP#anchor-PFq4

package/es/core/store/models/topoConfig.js

@@ -314,7 +314,7 @@ export default function (topoApp) {
               while (1) {
                 switch (_context4.prev = _context4.next) {
                   case 0:
-                    rlog.debug("getTopoByConditions--------", params);
+                    // rlog.debug("getTopoByConditions--------", params);
                     topoId = params.id, resources = params.resources, groups = params.groups, exportLinkIdList = params.exportLinkIdList;
                     viewConditions = resToConditions(resources);
                     groupInfo = isAvailableArray(groups) && groups.map(function (group) {
@@ -322,24 +322,22 @@ export default function (topoApp) {
                         layout: getLayoutId(group.layout),
                         resources: resToConditions(group.resources)
                       });
-                    });
-                    rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
-                    _context4.next = 7;
+                    }); // rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
+
+                    _context4.next = 5;
                     return topoService.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList);
 
-                  case 7:
+                  case 5:
                     data = _context4.sent;
-                    rlog.debug("getTopoByConditions--------data", data);
-                    _context4.next = 11;
+                    _context4.next = 8;
                     return buildTopoData(data);
 
-                  case 11:
+                  case 8:
                     data = _context4.sent;
-                    rlog.debug("getTopoByConditions--------", data, groupInfo);
-                    _context4.next = 15;
+                    _context4.next = 11;
                     return Promise.all([topoApp.ciTyeCache.getCiTypeMap(getCiTypes(data)), dispatch.customIcon.loadCustomIcons()]);
 
-                  case 15:
+                  case 11:
                     _yield$Promise$all = _context4.sent;
                     ciTypeMap = _yield$Promise$all[0];
                     _combTopoData = combTopoData({
@@ -367,7 +365,7 @@ export default function (topoApp) {
                       topoDataTrans: topoDataTrans
                     });
 
-                  case 23:
+                  case 19:
                   case "end":
                     return _context4.stop();
                 }

package/es/core/store/models/topoMod.js

@@ -1,8 +1,8 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService from "@riil-frontend/component-topology-common/es/services/topo";
 import moment from "moment";
+import topoService from "@riil-frontend/component-topology-common/es/services/topo";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import { combTopoData, getCiTypes, parseTopoData } from "../../../utils/topoData";
 import { loopTreeByKey } from "../../../utils/tree";
@@ -302,7 +302,7 @@ export default function (topoApp) {
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
             var _result$config;
 
-            var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, topoConfig, _yield$Promise$all, ciTypeMap, customIcons, xxx, extraConfig, _combTopoData, topoData, resAndMetrics, endTime;
+            var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, graphConfig, topoConfig, _yield$Promise$all, ciTypeMap, customIcons, xxx, extraConfig, _combTopoData, topoData, resAndMetrics, endTime;
 
             return _regeneratorRuntime.wrap(function _callee6$(_context6) {
               while (1) {
@@ -370,46 +370,44 @@ export default function (topoApp) {
 
                   case 18:
                     if (!data) {
-                      _context6.next = 30;
+                      _context6.next = 29;
                       break;
                     }
 
+                    graphConfig = {};
+
                     if (!topoId) {
-                      _context6.next = 27;
+                      _context6.next = 26;
                       break;
                     }
 
-                    _context6.next = 22;
-                    return topoApp.options.loadData(topoId);
+                    _context6.next = 23;
+                    return topoService.getTopoData(topoId);
 
-                  case 22:
+                  case 23:
                     topoConfig = _context6.sent;
                     if (!topoConfig) rlog.error("\u672A\u67E5\u8BE2\u5230\u62D3\u6251id " + topoId + " \u7684\u6570\u636E\uFF0C\u8BF7\u68C0\u67E5");
-                    result = _extends({}, data, {
+                    graphConfig = {
                       global: topoConfig === null || topoConfig === void 0 ? void 0 : topoConfig.global,
                       customGlobal: data.global,
                       serialize: topoConfig === null || topoConfig === void 0 ? void 0 : topoConfig.serialize
-                    });
-                    _context6.next = 28;
-                    break;
-
-                  case 27:
-                    result = _extends({}, data);
+                    };
 
-                  case 28:
-                    _context6.next = 33;
+                  case 26:
+                    result = _extends({}, data, graphConfig);
+                    _context6.next = 32;
                     break;
 
-                  case 30:
-                    _context6.next = 32;
+                  case 29:
+                    _context6.next = 31;
                     return topoApp.options.loadData(topoId);
 
-                  case 32:
+                  case 31:
                     result = _context6.sent;
 
-                  case 33:
+                  case 32:
                     if (result) {
-                      _context6.next = 37;
+                      _context6.next = 36;
                       break;
                     }
 
@@ -424,27 +422,27 @@ export default function (topoApp) {
                     topoApp.options.onLoad();
                     return _context6.abrupt("return");
 
-                  case 37:
+                  case 36:
                     result = parseTopoData(result);
                     rlog.debug("topoMod.initTopoData 查询数据完成", topoId, linkTo, result);
-                    _context6.next = 41;
+                    _context6.next = 40;
                     return Promise.all([topoApp.ciTyeCache.getCiTypeMap(getCiTypes(result)), dispatch.customIcon.loadCustomIcons(), topoApp.elementTagTipConfig.init(result) // 暂停新配置开发
                     ]);
 
-                  case 41:
+                  case 40:
                     _yield$Promise$all = _context6.sent;
                     ciTypeMap = _yield$Promise$all[0];
                     customIcons = _yield$Promise$all[1];
                     xxx = _yield$Promise$all[2];
                     rlog.debug("topoMod.initTopoData Ci属性指标元数据", ciTypeMap);
                     extraConfig = result.global.extraConfig;
-                    _context6.next = 49;
+                    _context6.next = 48;
                     return dispatch.displayConfig.setConfig(_extends({}, extraConfig, {
                       alarmSwitch: result.global.alarmSwitch,
                       alarmListDefaultOpen: result.global.alarmListDefaultOpen
                     }));
 
-                  case 49:
+                  case 48:
                     _combTopoData = combTopoData({
                       engine: topoApp,
                       data: result,
@@ -473,7 +471,7 @@ export default function (topoApp) {
                     rlog.info("topoMod.initTopoData 初始化拓扑图数据完成. 耗时: ", endTime.diff(startTime, "seconds", true));
                     topoApp.options.onLoad();
 
-                  case 58:
+                  case 57:
                   case "end":
                     return _context6.stop();
                 }
@@ -604,7 +602,7 @@ export default function (topoApp) {
                     id = playload.id, update = playload.update;
                     _context11.prev = 1;
                     _context11.next = 4;
-                    return topoService.auth.getTopoPermission(id);
+                    return topoApp.serverApi.auth.getTopoPermission(id);
 
                   case 4:
                     topoPermission = _context11.sent;

package/es/core/utils/edgeUtil.js

@@ -7,6 +7,8 @@ import { showLinkByConfig } from "../models/utils/linkUtils";
  */
 
 export var updateEdgeExpanded = function updateEdgeExpanded(topo) {
+  var _topo$historyManager, _topo$historyManager2;
+
   var _topo$store$getModelS = topo.store.getModelState("topoMod"),
       viewState = _topo$store$getModelS.viewState;
 
@@ -21,6 +23,8 @@ export var updateEdgeExpanded = function updateEdgeExpanded(topo) {
       expandAllEdges = _topo$store$getModelS2.expandAllEdges; // console.log("expandAllEdges----------", expandAllEdges);
 
 
+  (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '连线展开控制');
+
   if (expandAllEdges === 1) {
     showLinkByConfig({
       topo: topo,
@@ -37,6 +41,8 @@ export var updateEdgeExpanded = function updateEdgeExpanded(topo) {
     rlog.debug("updateEdgeExpanded 展开-isEditMode", isEditMode);
   }
 
+  (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '连线展开控制');
+
   if (topo.linkDynamicStyleExecutor) {
     topo.linkDynamicStyleExecutor.execute();
   }

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);
     }
   });

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,6 +93,10 @@ 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;
@@ -98,16 +104,19 @@ function _queryLinkLatestMetrics() {
               var value = (_linkMetrics$find = 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 metricDef = ciTypeCache.getMetric(linkCi.ciType || linkCi.typeCode, code);
               return {
                 code: code,
                 name: metricDef.name,
                 value: formatMetric(value, metricDef) || ''
               };
             });
-            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();
         }
@@ -130,6 +139,8 @@ function _queryLinkInterfacesLatestMetrics() {
         switch (_context4.prev = _context4.next) {
           case 0:
             parseInterfaceMetrics = function _parseInterfaceMetric(subCiId) {
+              var _metrics$;
+
               var metrics = interfaceMetrics.filter(function (metric) {
                 return metric.subCiId === subCiId;
               });
@@ -139,11 +150,14 @@ function _queryLinkInterfacesLatestMetrics() {
                 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;
-              }, {});
+              }, {
+                _ts: (_metrics$ = metrics[0]) === null || _metrics$ === void 0 ? void 0 : _metrics$.ts // 指标时间
+
+              });
             };
 
             _linkCi$attributes = linkCi.attributes, sourceType = _linkCi$attributes.source_type, sourceId = _linkCi$attributes.source_id, destinationId = _linkCi$attributes.destination_id, destinationType = _linkCi$attributes.destination_type;

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/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/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/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 = {