@riil-frontend/component-topology 3.4.0 → 3.5.0-a.2

package/es/constants/ResourceTypeLimit.js

@@ -1,6 +1,32 @@
+import _extends from "@babel/runtime/helpers/extends";
+var excludeTypes = ['data_center', 'manage_assets', 'network_link', 'access_link']; // 过滤模型树
+
+export function filterModelTree(modelTree) {
+  return modelTree.filter(function (node) {
+    return !excludeTypes.includes(node.code);
+  }).map(function (node) {
+    return _extends({}, node, {
+      childs: filterModelTree(node.childs || []).filter(function (child) {
+        return child.monitorable;
+      })
+    });
+  });
+}
+export function getCiModels(modelTree) {
+  var list = [];
+  filterModelTree(modelTree).forEach(function (domainModel) {
+    list.push.apply(list, domainModel.childs);
+  });
+  return list;
+} // 资源选择组件过滤类型
+
 export var filterCiTypes = function filterCiTypes(tree) {
-  return tree.filter(function (item) {
-    return item.value !== 'data_center';
+  return tree.filter(function (node) {
+    return !excludeTypes.includes(node.value);
+  }).map(function (node) {
+    return _extends({}, node, {
+      children: filterCiTypes(node.children || [])
+    });
   });
 };
 export var getNetworkTopoCommonResListProps = function getNetworkTopoCommonResListProps() {

package/es/core/components/AlarmListPanel/components/AlarmListItem.js

@@ -5,6 +5,11 @@ import { Link } from "react-router-dom";
 import styles from "./index.module.scss";
 import { PAGE_TYPE } from "../constants/uicbb";
 
+var alarmLink = function alarmLink(alarmInfo) {
+  console.log("alarmLink", alarmInfo);
+  return "/default/pagecenter/" + PAGE_TYPE.ALERT_DETAIL + "/view/" + alarmInfo.alertId + "?alertId=" + alarmInfo.alertId + "&resId=" + alarmInfo.ciId + "&title=" + alarmInfo.alertObject + "&ruleId=" + alarmInfo.ruleId + "&ciCode=" + alarmInfo.ciTypeCode + "&ciType=" + alarmInfo.ciType;
+};
+
 function AlarmListItem(props) {
   // 传入参数
   var topo = props.topo,
@@ -17,7 +22,7 @@ function AlarmListItem(props) {
       className: styles["alarm-color-icon"] + " alarm-color-icon-lv" + alarmInfo.alertLevel
     })
   }, /*#__PURE__*/React.createElement(Link, {
-    to: "/default/pagecenter/" + PAGE_TYPE.ALERT_DETAIL + "/view/" + alarmInfo.alertId + "?alertId=" + alarmInfo.alertId + "&resId=" + alarmInfo.ciId + "&title=" + alarmInfo.alertObject
+    to: alarmLink(alarmInfo)
   }, "" + alarmInfo.alertObject + alarmInfo.alertTitle));
 }
 

package/es/core/components/TopoView/topoView.js

@@ -4,7 +4,7 @@ import PropTypes from "prop-types";
 import classnames from "classnames";
 import TopoGraph, { TopoEvent } from "@riil-frontend/component-topology-graph";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
-import { useEventListener, useCbbEventListener } from "@riil-frontend/component-riil-event-emitter";
+import { useCbbEventListener } from "@riil-frontend/component-riil-event-emitter";
 import useTopoEdit from "../../../hooks/useTopoEdit";
 import useSelection from "../../../hooks/useSelection";
 import showMessage from "../../utils/showMessage";
@@ -16,6 +16,7 @@ import PropertyView from "../../editor/components/settings/PropertyView";
 import BackgroundView from "../../editor/components/BackgroundView";
 import { updateEdgeExpanded } from "../../utils/edgeUtil";
 import styles from "./TopoView.module.scss";
+import useManageStatus from "../../../hooks/useManageStatus";
 
 var Topology = function Topology(props) {
   var _classnames, _graphViewProps$creat;
@@ -65,7 +66,6 @@ var Topology = function Topology(props) {
       tData = _useState[0],
       setTData = _useState[1];
 
-  var titleBarRef = useRef();
   var topoEdit = useTopoEdit({
     topo: topo,
     topoId: topoId,
@@ -81,10 +81,14 @@ var Topology = function Topology(props) {
   var onExitEdit = topoEdit.onExitEdit,
       onBindData = topoEdit.onBindData,
       onDeleteElement = topoEdit.onDeleteElement,
-      onSaveTopo = topoEdit.onSaveTopo; // useAlarm({
+      onSaveTopo = topoEdit.onSaveTopo;
+  var titleBarRef = useRef(); // useAlarm({
   //   topo,
   // });
 
+  useManageStatus({
+    topo: topo
+  });
   useCbbEventListener("topo", {
     name: "topo",
     onMessage: function onMessage(data) {

package/es/core/editor/components/titlebar/TopoEditorTitleBar.js

@@ -1,5 +1,8 @@
 import _Box from "@alifd/next/es/box";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _Dialog from "@alifd/next/es/dialog";
 import _Button from "@alifd/next/es/button";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from "react";
 import classnames from "classnames";
 import TitleWidget from "../../../components/titlebar/widgets/TitleWidget";
@@ -32,7 +35,32 @@ export default function TopoEditorTitleBar(props) {
   }, "\u4FDD\u5B58"), /*#__PURE__*/React.createElement(_Button, {
     className: styles.button,
     onClick: function onClick() {
-      topo.exitEditMode();
+      _Dialog.confirm({
+        title: "提示",
+        content: "若现在退出，图上修改的内容将不会保存！",
+        onOk: function () {
+          var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+            return _regeneratorRuntime.wrap(function _callee$(_context) {
+              while (1) {
+                switch (_context.prev = _context.next) {
+                  case 0:
+                    topo.exitEditMode();
+
+                  case 1:
+                  case "end":
+                    return _context.stop();
+                }
+              }
+            }, _callee);
+          }));
+
+          function onOk() {
+            return _onOk.apply(this, arguments);
+          }
+
+          return onOk;
+        }()
+      });
     }
   }, "\u9000\u51FA"))));
 }

package/es/core/models/Alarm.js

@@ -501,10 +501,7 @@ var Alarm = /*#__PURE__*/function () {
     return handleAlarmEvent;
   }();
 
-  _proto.setAlarms = function setAlarms(alarmList) {
-    // rlog.debug("alart----------------alarmList", alarmList);
-    this.topo.topoClient.loadAlarm(alarmList);
-  };
+  _proto.updateGraphAlarm = function updateGraphAlarm() {};
 
   _proto.getState = function getState() {
     return this.topo.store.getModelState("topoAlarm");

package/es/core/models/DataModel.js

@@ -19,6 +19,26 @@ var DataModel = /*#__PURE__*/function () {
     return [].concat(this.getGroups(), this.getNodes(), this.getEdges(), this.getEdgeGroups());
   };
 
+  _proto.useDatas = function useDatas() {
+    var topo = this.topo;
+
+    var _topo$store$useModelS = topo.store.useModelState('topoMod'),
+        data = _topo$store$useModelS.data;
+
+    if (data) {
+      return this.getDatas();
+    }
+
+    return [];
+  };
+
+  _proto.useResources = function useResources() {
+    var datas = this.useDatas();
+    return datas.filter(function (item) {
+      return item.type !== 'group';
+    });
+  };
+
   _proto.getDataById = function getDataById(id) {
     return this.getDatas().find(function (item) {
       return item.id === id;

package/es/core/models/TopoApp.js

@@ -20,7 +20,7 @@ import { updateEdgeExpanded } from "../utils/edgeUtil";
 import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory"; // eslint-disable-next-line no-undef
 
-var version = typeof "3.4.0" === 'string' ? "3.4.0" : null;
+var version = typeof "3.5.0-a.2" === 'string' ? "3.5.0-a.2" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/hooks/useManageStatus.js

@@ -0,0 +1,43 @@
+import { useEffect } from 'react';
+import { setElementRuntimeStyle } from "../utils/htElementUtils";
+import { useEventListener, useCbbEventListener } from '@riil-frontend/component-riil-event-emitter';
+/**
+ * 监听监控状态推送
+ * 节点、连线监控状态置灰
+ * 
+ * @param {*} props 
+ */
+
+export default function useManageStatus(props) {
+  var topo = props.topo;
+  var topoModState = topo.store.useModelState('topoMod');
+  var graphLoaded = topoModState.graphLoaded;
+  var resources = topo.dataModel.useResources();
+  useEffect(function () {
+    // 启动监听
+    return function () {// 注销监听
+    };
+  }, []);
+  useEffect(function () {
+    // 首次加载和监控状态变化后，更新节点和连线置灰状态
+    if (graphLoaded) {
+      resources.forEach(function (resource) {
+        var type = resource.type,
+            id = resource.id,
+            manageStatus = resource.manageStatus,
+            permission = resource.permission;
+        var isMonite = manageStatus === 3;
+        var readable = !!(permission !== null && permission !== void 0 && permission.readable);
+        var showNotMoniteStatus = !isMonite && readable;
+        var element = topo.getDataModel().getDataByTag(id);
+        if (!element) return;
+
+        if (type === 'node') {
+          setElementRuntimeStyle(element, 'opacity', showNotMoniteStatus ? 0.3 : undefined);
+        } else {
+          setElementRuntimeStyle(element, 'color', showNotMoniteStatus ? '#C9CED2' : undefined);
+        }
+      });
+    }
+  }, [graphLoaded, resources]);
+}

package/es/hooks/useTopoEdit.js

@@ -335,11 +335,6 @@ var useTopoEdit = function useTopoEdit(params) {
       case 'link':
         if (onLineDelete) {
           onLineDelete(data);
-        } // 临时放这里，仅拓扑中心有
-
-
-        if (topo.linkDynamicStyleExecutor) {
-          topo.linkDynamicStyleExecutor.execute();
         }
 
         break;

package/es/models/topoAlarm.js

@@ -5,12 +5,9 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /**
  * 告警
  */
-import topoServer from "@riil-frontend/component-topology-common/es/services/topo";
-import { getLatestMetrics } from "@riil-frontend/component-topology-common/es/services/metric";
-import { getCiMeta } from "@riil-frontend/component-topology-common/es/services/model";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import _ from "lodash";
-import { findItem, findItemIndex, sortList } from "../utils/topoData";
+import { sortList } from "../utils/topoData";
 var showAlarmStatus = ["toDeal", "dealing", "change"];
 export default {
   // 定义 model 的初始 state

package/es/models/topoConfig.js

@@ -13,7 +13,7 @@ import { removeFromArray } from "../utils/format";
 import { DEFAULT_GROUP } from "../utils/template";
 import { combTopoData, getCiTypes } from "../utils/topoData";
 import { saveTopo as _saveTopo, resToConditions, getLayoutId } from "../core/models/topoData";
-import { addLinkData } from "../topoCenter/getTopoData";
+import { buildData as buildTopoData } from "../topoCenter/getTopoData";
 
 var newGroupWithUUID = function newGroupWithUUID(group) {
   if (group === void 0) {
@@ -331,7 +331,7 @@ export default function (topoApp) {
                     data = _context4.sent;
                     rlog.debug("getTopoByConditions--------data", data);
                     _context4.next = 11;
-                    return addLinkData(data);
+                    return buildTopoData(data);
 
                   case 11:
                     data = _context4.sent;

package/es/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/Data/index.js

@@ -20,10 +20,8 @@ export default function LinkDataTab(props) {
       linkGroups = _topo$store$useModelS.linkGroups;
   var linkData = [].concat(links, linkGroups).find(function (item) {
     return item.id === edge.getTag();
-  }); // rlog.debug("LinkDataTab-------linkData", linkData);
-
+  });
   useEffect(function () {
-    rlog.debug("LinkDataTab--edge-linkData", edge, linkData);
     setLink(linkData);
   }, [edge, linkData]);
   var permission = getLinkPermission(edge, nodes, link);

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

@@ -7,9 +7,7 @@ import { getLinkPermission } from "../../../../../../topoCenter/utils/linPermiss
 import { getNodes } from "../../../../../../utils/htElementUtils.js";
 export default function LinkPropertyView(props) {
   var edge = props.edge,
-      topo = props.topo;
-  console.log("LinkPropertyView-----", edge, edge.getSource()); // 无权限不显示数据页签
-  // const operation = props.edge.a('operation');
+      topo = props.topo; // 无权限不显示数据页签
 
   var _topo$store$useModelS = topo.store.useModelState("topoMod").data,
       links = _topo$store$useModelS.links,

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

@@ -23,6 +23,10 @@ function AddLinkDrawer(props) {
       lineData = props.lineData;
   var store = topo.store;
 
+  var _topo$store$useModel = topo.store.useModel("topoMod"),
+      topoState = _topo$store$useModel[0],
+      topoDispatchers = _topo$store$useModel[1];
+
   var _store$useModel = store.useModel("topoConfig"),
       editState = _store$useModel[0],
       editDispatchers = _store$useModel[1];
@@ -33,8 +37,6 @@ function AddLinkDrawer(props) {
 
   var addLinkIsOpen = editState.addLinkIsOpen,
       currentLink = editState.currentLink;
-  var ciConnectable = linkState.ciConnectable; // // rlog.debug("addLinkDrawer--init-addLinkIsOpen", addLinkIsOpen, currentLink);
-  // const [visible, { setTrue, setFalse }] = useBoolean();
 
   var _useState = useState(),
       link = _useState[0],
@@ -46,12 +48,16 @@ function AddLinkDrawer(props) {
 
   var _useState3 = useState(false),
       loading = _useState3[0],
-      setLoading = _useState3[1]; // 保存后更新拓扑图状态
+      setLoading = _useState3[1];
+
+  var _useState4 = useState(),
+      sourceIFDoc = _useState4[0],
+      setSourceIFDoc = _useState4[1]; // 保存后更新拓扑图状态
 
 
-  var _useState4 = useState([]),
-      ciIdsConnectable = _useState4[0],
-      setCiIdsConnectable = _useState4[1];
+  var _useState5 = useState([]),
+      ciIdsConnectable = _useState5[0],
+      setCiIdsConnectable = _useState5[1];
 
   var linkNodesRef = useRef();
 
@@ -193,6 +199,7 @@ function AddLinkDrawer(props) {
 
             case 6:
               targetPorts = _context3.sent;
+              setSourceIFDoc(sourcePorts.portsDoc);
               connect_type = currentLink.attributes["network_link.connect_type"] === "exit" ? "exit" : "phy";
               setLink({
                 source: {
@@ -220,7 +227,7 @@ function AddLinkDrawer(props) {
                 })
               });
 
-            case 9:
+            case 10:
             case "end":
               return _context3.stop();
           }
@@ -243,23 +250,17 @@ function AddLinkDrawer(props) {
 
   var getCiTypesConnectable = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-      var notifier, ciTypesConnectable, nodes, ciIds, ciNodes;
+      var ciTypesConnectable, nodes, ciIds, ciNodes;
       return _regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
-              notifier = topo.view.topoClient.notifier; // rlog.debug("加载哪些ci类型可创建链路-getCiTypesConnectable");
-              // 加载哪些ci类型可创建链路
-
-              _context4.next = 3;
+              _context4.next = 2;
               return topoService.networkLink.getCiTypesConnectable(RESOURCE_LIMIT_TYPES);
 
-            case 3:
+            case 2:
               ciTypesConnectable = _context4.sent;
-              nodes = getNodes(topo.getDataModel()); // rlog.debug("getCiTypesConnectable", nodes);
-              // const tags = topo.getTag();
-              // rlog.debug("加载哪些ci类型可创建链路", ciTypesConnectable, topo, nodes);
-
+              nodes = getNodes(topo.getDataModel());
               ciIds = [];
               ciNodes = [];
               nodes.map(function (node) {
@@ -275,7 +276,7 @@ function AddLinkDrawer(props) {
               setCiIdsConnectable(ciIds);
               return _context4.abrupt("return", ciNodes);
 
-            case 11:
+            case 10:
             case "end":
               return _context4.stop();
           }
@@ -375,9 +376,36 @@ function AddLinkDrawer(props) {
     }
   };
 
+  var mergeExitLinkData = function mergeExitLinkData(data, attributes) {
+    return {
+      id: data.id,
+      name: data.name,
+      source: data["network_link.source_device_id"],
+      target: data["network_link.destination_device_id"],
+      operation: data.operation,
+      interfaceSource: data["source_id"],
+      interfaceTarget: data["destination_id"],
+      ciType: data.ciType,
+      attributes: _extends({}, attributes, {
+        display_name: data.display_name,
+        name: data.name,
+        "network_link.actual_bandwidth": data["network_link.actual_bandwidth"],
+        "network_link.connect_type": data["network_link.connect_type"],
+        "network_link.destination_ipv4": data["network_link.destination_ipv4"],
+        "network_link.source_device_id": data["network_link.source_device_id"],
+        source_id: data.source_id,
+        support_templates: data.support_templates,
+        use: data.use,
+        source_id_object: {
+          displayName: sourceIFDoc[data.source_id].label
+        }
+      })
+    };
+  };
+
   var onSave = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(data) {
-      var parm, result, linkType, config, exportLinkIdList, _yield$editDispatcher, elements, linkData, edge, aobj, target;
+      var parm, result, linkType, config, exportLinkIdList, _yield$editDispatcher, elements, linkData, edge, aobj, target, links, linkAttrKey, newLinkData, newLinks, newData;
 
       return _regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) {
@@ -413,10 +441,7 @@ function AddLinkDrawer(props) {
               result = _context5.sent;
 
             case 13:
-              setLoading(false); // if (result) {
-              //   Message.success("保存成功");
-              // }
-
+              setLoading(false);
               linkType = data["network_link.connect_type"];
               _context5.prev = 15;
 
@@ -425,9 +450,7 @@ function AddLinkDrawer(props) {
                 break;
               }
 
-              config = topo.resourceConfig.getConfigFromHt(); // rlog.debug("getConfigFromHt", config, topo.resourceConfig);
-              // console.log("save success", data, result);
-              // 新建后显示到图上
+              config = topo.resourceConfig.getConfigFromHt(); // 新建后显示到图上
 
               if (!isAddMode) {
                 _context5.next = 31;
@@ -465,12 +488,7 @@ function AddLinkDrawer(props) {
               break;
 
             case 31:
-              // console.log(
-              //   "保存编辑信息",
-              //   data,
-              //   linkType,
-              //   topo.getGraphView().dm().sm().ld()
-              // );
+              // console.log("保存编辑信息", data, linkType);
               if (linkType === "exit") {
                 edge = topo.getGraphView().dm().sm().ld();
                 aobj = edge.getAttrObject();
@@ -480,6 +498,20 @@ function AddLinkDrawer(props) {
                 if (target.getTag() === undefined) {
                   target.a("name", data["network_link.destination_ipv4"]);
                 }
+
+                links = topoState.data.links;
+                linkAttrKey = links.findIndex(function (item) {
+                  return item.id === aobj.id;
+                });
+                newLinkData = mergeExitLinkData(edge.getAttrObject(), links[linkAttrKey]);
+                newLinks = clone(links);
+                newLinks.splice(linkAttrKey, 1, newLinkData);
+                newData = _extends({}, topoState.data, {
+                  links: newLinks
+                });
+                topoDispatchers.update({
+                  data: newData
+                });
               }
 
               _Message.success("保存成功");

package/es/topoCenter/getTopoData.js

@@ -3,6 +3,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import topoService from "@riil-frontend/component-topology-common/es/services/topo";
 import { getLinksDetail } from "../core/models/utils/linkUtils";
+import { addTopoDataResourcePermission } from "./utils/resourcePermissionUtil";
 export function addLinkData(_x) {
   return _addLinkData.apply(this, arguments);
 }
@@ -49,30 +50,73 @@ function _addLinkData() {
   return _addLinkData.apply(this, arguments);
 }
 
-export default function getTopoData(_x2) {
-  return _getTopoData.apply(this, arguments);
+export function buildData(_x2) {
+  return _buildData.apply(this, arguments);
 }
 
-function _getTopoData() {
-  _getTopoData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(id) {
-    var data;
+function _buildData() {
+  _buildData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(data) {
+    var newData;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
             _context2.next = 2;
-            return topoService.getTopoData(id);
+            return addLinkData(data);
 
           case 2:
-            data = _context2.sent;
-            return _context2.abrupt("return", data ? addLinkData(data) : data);
+            newData = _context2.sent;
+            newData = addTopoDataResourcePermission(newData);
+            return _context2.abrupt("return", newData);
 
-          case 4:
+          case 5:
           case "end":
             return _context2.stop();
         }
       }
     }, _callee2);
   }));
+  return _buildData.apply(this, arguments);
+}
+
+export default function getTopoData(_x3) {
+  return _getTopoData.apply(this, arguments);
+}
+
+function _getTopoData() {
+  _getTopoData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id) {
+    var data;
+    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return topoService.getTopoData(id);
+
+          case 2:
+            data = _context3.sent;
+
+            if (data) {
+              _context3.next = 5;
+              break;
+            }
+
+            return _context3.abrupt("return", data);
+
+          case 5:
+            _context3.next = 7;
+            return buildData(data);
+
+          case 7:
+            data = _context3.sent;
+            return _context3.abrupt("return", data);
+
+          case 9:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  }));
   return _getTopoData.apply(this, arguments);
 }

package/es/topoCenter/hooks/editor/useDeleteEdges.js

@@ -166,6 +166,8 @@ export default (function (_ref) {
     } else {
       htTopo.deleteEdge(edge);
     }
+
+    topo.linkDynamicStyleExecutor.execute();
   };
 
   var deleteEdges = function deleteEdges(edges) {

package/es/topoCenter/store/topoTreeMod.js

@@ -1,9 +1,9 @@
+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 topoServer from '@riil-frontend/component-topology-common/es/services/topo';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import { treeMockData, topoInteData } from "../../utils/topoMocks";
 import { formatTree, loopTree, loopTreeFun, findParentIdsById, treeNodeCount } from "../../utils/tree";
 
 var clone = function clone(data) {
@@ -20,7 +20,6 @@ export default function (topoApp) {
       treeData: [],
       // 是否加载数据
       loaded: false,
-      topoInteData: topoInteData,
       selectedNode: [],
       defId: '',
       drawVisible: false,
@@ -263,25 +262,13 @@ export default function (topoApp) {
 
                   case 4:
                     resTreeData = _context5.sent;
+                    _context5.next = 7;
+                    return _this4.refreshTree();
 
-                    _this4.refreshTree(); // let treeData = clone(state.topoTreeMod.treeData);
-                    // loopTree(
-                    //   treeData,
-                    //   conditions,
-                    //   (parent, index, arr) => {
-                    //     arr[index].showDefault = true;
-                    //   }
-                    // );
-                    //
-                    // treeData = formatTree(treeData, state.functionAuth.permissions);
-                    //
-                    // this.update({
-                    //   treeData,
-                    //   defId: conditions,
-                    // });
-
+                  case 7:
+                    _Message.success('设置成功');
 
-                  case 6:
+                  case 8:
                   case "end":
                     return _context5.stop();
                 }