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

package/es/core/hooks/useManageStatus.js

@@ -29,15 +29,6 @@ function mergeManageStatus(cis, manageStatusDatas) {
 
 export default function useManageStatus(props) {
   var topo = props.topo;
-
-  var _topo$store$useModel = topo.store.useModel('topoMod'),
-      topoState = _topo$store$useModel[0],
-      topoDispatchers = _topo$store$useModel[1];
-
-  var graphLoaded = topoState.graphLoaded,
-      viewState = topoState.viewState;
-  var isEditMode = viewState === 'edit';
-  var resources = topo.dataModel.useCis();
   useTopoEventListener({
     type: 'manageStatus',
     onMessage: function onMessage(manageStatusDatas) {
@@ -50,6 +41,7 @@ export default function useManageStatus(props) {
           linkGroups: mergeManageStatus(topoData.linkGroups, manageStatusDatas)
         });
 
+        var topoDispatchers = topo.store.getModelDispatchers('topoMod');
         topoDispatchers.update({
           data: newData
         });

package/es/core/hooks/usePolling.js

@@ -61,11 +61,8 @@ var usePolling = function usePolling(props) {
 
 
   useEffect(function () {
-    var isViewer = topoState.viewState === 'view';
-
-    if (topo.options.enableDefaultMetricLoader && isViewer) {
+    if (topo.options.enableDefaultMetricLoader) {
       rlog.debug('usePolling.useEffect: 开始轮询', {
-        isViewer: isViewer,
         pollingSwitch: pollingSwitch,
         resIdsList: resIdsList,
         resourceOverviewState: resourceOverviewState,
@@ -80,7 +77,7 @@ var usePolling = function usePolling(props) {
         stopPoll();
       }
     };
-  }, [topoState.viewState, pollingSwitch, resIdsList, displayConfig, resourceOverviewState.id, resourceOverviewState.metricCodes]);
+  }, [pollingSwitch, resIdsList, displayConfig, resourceOverviewState.id, resourceOverviewState.metricCodes]);
   /**
    * 
    * @returns {{id, attributes: object[], metrics: object[]}[]} 属性和指标

package/es/core/hooks/useTopoEdit.js

@@ -73,6 +73,10 @@ var useTopoEdit = function useTopoEdit(params) {
   var onExitEdit = function onExitEdit() {// editDispatchers.switchToViewMode(topoId);
   };
 
+  var reset = function reset() {
+    topoEditDispatchers.reset();
+  };
+
   var onBindData = function onBindData(eventData) {};
   /**
    * 增加资源到视图
@@ -589,17 +593,17 @@ var useTopoEdit = function useTopoEdit(params) {
                 layer: group,
                 newElements: newElements
               });
-              topo.getHtTopo().addElements(newElements);
-              topo.fitContent(false, 0); // 临时放这里，仅拓扑中心有
+              topo.getHtTopo().addElements(newElements); // 临时放这里，仅拓扑中心有
 
               if (topo.linkDynamicStyleExecutor) {
                 topo.linkDynamicStyleExecutor.execute();
               }
 
-              topo.historyManager.endTransaction(); // 添加资源后隐藏资源面板
+              topo.historyManager.endTransaction();
+              topo.getHtTopo().fitContent(); // 添加资源后隐藏资源面板
 
               topoEditDispatchers.update({
-                resourceTabactiveKey: null
+                resourceTabActiveKey: null
               });
 
             case 14:
@@ -689,10 +693,10 @@ var useTopoEdit = function useTopoEdit(params) {
               return bindViewResources(data);
 
             case 9:
-              topo.fitContent(false, 0);
               topo.historyManager.endTransaction();
+              topo.getHtTopo().fitContent();
               topoEditDispatchers.update({
-                resourceTabactiveKey: null
+                resourceTabActiveKey: null
               });
 
             case 12:
@@ -1084,12 +1088,14 @@ var useTopoEdit = function useTopoEdit(params) {
    * 设置视图鼠标模式
    */
 
-  var setViewMouseMode = useCallback(function (mode) {
+  var setViewMouseMode = function setViewMouseMode(mode) {
+    rlog.debug('设置视图鼠标模式', mode);
     topo.getHtTopo().setViewMouseMode(mode);
     topoEditDispatchers.update({
       viewMouseMode: mode
     });
-  }, []);
+  };
+
   return {
     resourceConfig: resourceConfig,
 
@@ -1129,6 +1135,7 @@ var useTopoEdit = function useTopoEdit(params) {
      * 退出编辑模式回调
      */
     onExitEdit: onExitEdit,
+    reset: reset,
     addLayerResources: addLayerResources,
 
     /**

package/es/core/models/Alarm.js

@@ -416,7 +416,7 @@ var Alarm = /*#__PURE__*/function () {
 
             case 8:
               _context6.next = 10;
-              return topoService.openTopoAlarm(id);
+              return this.topo.serverApi.openTopoAlarm(id);
 
             case 10:
               this.secretKey = _context6.sent;
@@ -482,7 +482,7 @@ var Alarm = /*#__PURE__*/function () {
                 alarmPanelIsOpen: false
               });
               _context7.next = 9;
-              return topoService.closeTopoAlarm(id, this.secretKey);
+              return this.topo.serverApi.closeTopoAlarm(id, this.secretKey);
 
             case 9:
             case "end":

package/es/core/models/AttributeMetricDisplay.js

@@ -650,7 +650,11 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var htTopo = topo.getHtTopo();
 
     if (htTopo) {
+      var _topo$historyManager, _topo$historyManager2;
+
+      (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '加载标注');
       htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
+      (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '加载标注');
     }
   }
   /**

package/es/core/models/HistoryManager.js

@@ -9,6 +9,7 @@ var HistoryManager = /*#__PURE__*/function () {
     this.storeHistory = [];
     this.topo = topo;
     this.htHistoryManager = htHistoryManager;
+    htHistoryManager.clear();
     rlog.info('HistoryManager 初始化', htHistoryManager);
     this.updateStore = this.updateStore.bind(this);
     this.init();
@@ -64,6 +65,10 @@ var HistoryManager = /*#__PURE__*/function () {
     var _this = this;
 
     this.htHistoryManager.beginTransaction();
+    var displayConfigProperties = [// 单多链路
+    'expandAllEdges', // 节点标注
+    'nodeLabelStyle', // 画布主题
+    'canvasTheme', 'linkTag', 'linkTip', 'nodeTag', 'nodeTip'];
     var items = [{
       modelName: 'topoMod',
       property: 'data'
@@ -71,16 +76,16 @@ var HistoryManager = /*#__PURE__*/function () {
     {
       modelName: 'topoMod',
       property: 'type'
-    }, {
-      modelName: 'displayConfig',
-      property: 'expandAllEdges'
-    }, {
-      modelName: 'displayConfig',
-      property: 'nodeLabelStyle'
-    }, {
+    }].concat(displayConfigProperties.map(function (property) {
+      return {
+        modelName: 'displayConfig',
+        property: property
+      };
+    }), [// 背景
+    {
       modelName: 'background',
       property: 'current'
-    }];
+    }]);
     this.storeHistory = items.map(function (item) {
       return _extends({}, item, {
         oldValue: _this.topo.store.getModelState(item.modelName)[item.property]

package/es/core/models/{SelectionManager.js → SelectionModel.js}

@@ -1,21 +1,15 @@
 import _extends from "@babel/runtime/helpers/extends";
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import useHtElements from "../common/hooks/useHtElements";
+import ignoreList from "./selection/ignoreList";
 
-var SelectionManager = /*#__PURE__*/function () {
-  function SelectionManager(topo) {
+var SelectionModel = /*#__PURE__*/function () {
+  function SelectionModel(topo) {
     var _this = this;
 
     this.topo = null;
     this.inited = false;
 
-    this.setSelection = function (selection) {
-      var selectionDispatchers = _this.topo.store.getModelDispatchers('selection');
-
-      selectionDispatchers.update({
-        selection: selection
-      });
-    };
-
     this.updateSelection = function () {
       try {
         var selectionModel = _this.topo.getSelectionModel();
@@ -24,18 +18,30 @@ var SelectionManager = /*#__PURE__*/function () {
 
         var selectionArr = htSelection.map(getElementData); // rlog.info("updateSelection", selectionArr.map((element) => element.id));
 
-        _this.setSelection(selectionArr);
+        _this.updateStoreSelection(selectionArr);
       } catch (e) {
         rlog.error('updateSelection error', e);
       }
     };
 
+    this.updateStoreSelection = function (selection) {
+      var selectionDispatchers = _this.topo.store.getModelDispatchers('selection');
+
+      _this.selectionIds = selection.map(function (item) {
+        return item.id;
+      });
+      selectionDispatchers.update({
+        selection: selection,
+        selectionIds: _this.selectionIds
+      });
+    };
+
     this.topo = topo;
     this.handleSelectionChange = this.handleSelectionChange.bind(this);
     this.handleDataPropertyChange = this.handleDataPropertyChange.bind(this);
   }
 
-  var _proto = SelectionManager.prototype;
+  var _proto = SelectionModel.prototype;
 
   _proto.init = function init() {
     if (this.inited) {
@@ -48,6 +54,11 @@ var SelectionManager = /*#__PURE__*/function () {
   };
 
   _proto.destroy = function destroy() {
+    var selectionDispatchers = this.topo.store.getModelDispatchers('selection');
+    selectionDispatchers.update({
+      selection: [],
+      selectionIds: []
+    });
     this.removeListener();
   };
 
@@ -58,6 +69,26 @@ var SelectionManager = /*#__PURE__*/function () {
     return selection;
   };
 
+  _proto.useHtSelection = function useHtSelection() {
+    var _this$topo$store$useM2 = this.topo.store.useModelState('selection'),
+        selectionIds = _this$topo$store$useM2.selectionIds;
+
+    var elements = useHtElements({
+      topo: this.topo,
+      ids: selectionIds
+    });
+    return elements;
+  };
+
+  _proto.getSelection = function getSelection() {
+    var selectionModel = this.topo.getSelectionModel();
+    return selectionModel.getSelection().getArray();
+  }
+  /**
+   * 同步选中元素到store
+   */
+  ;
+
   _proto.handleSelectionChange = function handleSelectionChange(e) {
     rlog.info('Selection handleSelectionChange', e);
     this.updateSelection();
@@ -67,19 +98,21 @@ var SelectionManager = /*#__PURE__*/function () {
     var property = e.property,
         data = e.data;
 
-    if (['position', 'childChange', 'a:scale'].indexOf(property) !== -1) {
+    if (!this.selectionIds.includes(data.getId())) {
       return;
     }
 
-    var selectionModel = this.topo.getSelectionModel();
-    var selectionIds = selectionModel.getSelection().getArray().map(function (item) {
-      return item.getId();
-    });
+    if (ignoreList.indexOf(property) !== -1) {
+      return;
+    }
 
-    if (selectionIds.indexOf(data.getId()) > -1) {
-      // console.info('PropertyChangeListener', e);
-      this.updateSelection();
+    if (!window.aa) {
+      window.aa = [];
     }
+
+    window.aa.push(e); // console.info('PropertyChangeListener', e);
+
+    this.updateSelection();
   };
 
   _proto.initListener = function initListener() {
@@ -102,10 +135,10 @@ var SelectionManager = /*#__PURE__*/function () {
     dataModel.removeDataPropertyChangeListener(this.handleDataPropertyChange);
   };
 
-  return SelectionManager;
+  return SelectionModel;
 }();
 
-export { SelectionManager as default };
+export { SelectionModel as default };
 ; // 构造元素数据
 
 var map = {

package/es/core/models/TopoApp.js

@@ -4,6 +4,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import topoService from '@riil-frontend/component-topology-common/es/services/topo';
 import { setRequest } from '@riil-frontend/component-topology-utils';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { cloneDeep } from 'lodash';
 import CiTypeCache from "./cache/CiTypeCache";
 import Alarm from "./Alarm";
 import TopoGraphView from "./TopoGraphView";
@@ -20,9 +21,9 @@ import { updateEdgeExpanded } from "../utils/edgeUtil";
 import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
-import SelectionManager from "./SelectionManager"; // eslint-disable-next-line no-undef
+import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
 
-var version = typeof "6.0.0-alpha.8" === 'string' ? "6.0.0-alpha.8" : null;
+var version = typeof "6.0.1" === 'string' ? "6.0.1" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -78,7 +79,7 @@ var Topo = /*#__PURE__*/function () {
 
     this.test = new Test(this);
     this.uid = topoFactory.add(options.name, this);
-    this.selectionManager = new SelectionManager(this);
+    this.selectionModel = new SelectionModel(this);
   };
 
   _proto.destroy = function destroy() {
@@ -241,7 +242,7 @@ var Topo = /*#__PURE__*/function () {
           switch (_context4.prev = _context4.next) {
             case 0:
               _data$groups2 = data.groups, groups = _data$groups2 === void 0 ? [] : _data$groups2, _data$nodes2 = data.nodes, nodes = _data$nodes2 === void 0 ? [] : _data$nodes2, links = data.links, lines = data.lines;
-              this.view.topoClient.updateElements({
+              this.view.topoClient.updateElements(cloneDeep({
                 groups: formatGroups(groups),
                 nodes: nodes.map(function (node) {
                   return _extends({}, node, {
@@ -255,7 +256,7 @@ var Topo = /*#__PURE__*/function () {
                     dtype: 'link'
                   });
                 })
-              }); // TODO 更新store，触发属性、指标模型加载，更新指标
+              })); // TODO 更新store，触发属性、指标模型加载，更新指标
 
             case 2:
             case "end":

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

@@ -0,0 +1 @@
+export default ['position', 'childChange', 'a:scale', 'icons', 'a:dataSource', 'a:dataTipSource', 'agentChange', 'a:runtimeStyles', 'a:linkArrow', '*', 'a:link_ind_left_arrow', 'a:link_ind_right_arrow', 'a:link_ind_area', 'a:middle_area', 'a:areaRect', 'a:outAreaRect', 'a:link_ind_area_right'];

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

@@ -31,7 +31,7 @@ export function isCrucialLink(link) {
  */
 
 export function isExitLink(link) {
-  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['network_link.destination_device_id']);
+  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['destination_id']);
 }
 export function isAggLink(link) {
   return link.attributes["network_link.connect_type"] === "agg";
@@ -176,7 +176,7 @@ function _getLinksDetail() {
 
 export function buildTopoLinkData() {}
 export var compatibleWith = function compatibleWith(value) {
-  console.log("compatibleWith", value);
+  // console.log("compatibleWith",value);
   var pluralType = value !== null && value !== void 0 ? value : 2;
 
   if (value === false) {
@@ -200,8 +200,8 @@ export var showLinkByConfig = function showLinkByConfig(props) {
   var _plurals$compatibleWi;
 
   var topo = props.topo,
-      showType = props.showType;
-  console.log("showLinkByConfig-----------------------------", props, showType); //const displayConfig = topo.store.getModelState("displayConfig");
+      showType = props.showType; // console.log("showLinkByConfig-----------------------------", props, showType);
+  //const displayConfig = topo.store.getModelState("displayConfig");
 
   var types = (_plurals$compatibleWi = plurals[compatibleWith(showType)]) !== null && _plurals$compatibleWi !== void 0 ? _plurals$compatibleWi : []; // 查询所有连线
 
@@ -210,8 +210,7 @@ export var showLinkByConfig = function showLinkByConfig(props) {
   var edges = getEdges(dm); // console.log("edges", edges);
 
   var showPhy = types.indexOf("phy") >= 0;
-  var showAgg = types.indexOf("agg") >= 0;
-  console.log("edges----types", showType, types, showPhy, showAgg);
+  var showAgg = types.indexOf("agg") >= 0; // console.log("edges----types",showType, types,showPhy, showAgg);
 
   if (Array.isArray(edges) && edges.length > 0) {
     edges.map(function (edge) {

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

@@ -108,10 +108,8 @@ export default function (engine) {
 
                   case 2:
                     icons = _context2.sent;
-                    // 通知ht
-                    engine.view.topoClient.emitEvent('topo_shape_load', getEditorIcons(engine));
 
-                  case 4:
+                  case 3:
                   case "end":
                     return _context2.stop();
                 }

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