@riil-frontend/component-topology 5.0.0-alpha.11 → 5.0.0-alpha.13

package/lib/networkTopo/store/topoTreeMod.js

@@ -51,37 +51,18 @@ function _default(topoApp) {
           var _this = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-            var id, showAllTree, resTreeData, _formatTree, treeData, defId, selectedTopoId;
+            var id, resTreeData, _formatTree, treeData, defId, selectedTopoId;
 
             return _regenerator["default"].wrap(function _callee$(_context) {
               while (1) {
                 switch (_context.prev = _context.next) {
                   case 0:
-                    id = payload.id; // 拓扑中心 如果有管理导航树权限，展示完整拓扑树
+                    id = payload.id;
+                    _context.next = 3;
+                    return _this.getTopoTree();
 
-                    showAllTree = topoApp.options.full && rootState.functionAuth.permissions.manageNavTree;
-
-                    if (!showAllTree) {
-                      _context.next = 8;
-                      break;
-                    }
-
-                    _context.next = 5;
-                    return _services["default"].getTopoTree();
-
-                  case 5:
+                  case 3:
                     resTreeData = _context.sent;
-                    _context.next = 11;
-                    break;
-
-                  case 8:
-                    _context.next = 10;
-                    return _services["default"].getTopoTreeByLoginUser();
-
-                  case 10:
-                    resTreeData = _context.sent;
-
-                  case 11:
                     // 格式化tree数据
                     _formatTree = (0, _tree.formatTree)(resTreeData, rootState.functionAuth.permissions), treeData = _formatTree[0], defId = _formatTree[1]; // 选中上次选择或指定的，如无则选中默认
 
@@ -96,7 +77,7 @@ function _default(topoApp) {
                     }); // console.log('resTreeData', resTreeData, rootState.topoMod.topoId);
 
 
-                  case 14:
+                  case 7:
                   case "end":
                     return _context.stop();
                 }
@@ -104,24 +85,65 @@ function _default(topoApp) {
             }, _callee);
           }))();
         },
+        getTopoTree: function getTopoTree(payload, rootState) {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+            var showAllTree, resTreeData;
+            return _regenerator["default"].wrap(function _callee2$(_context2) {
+              while (1) {
+                switch (_context2.prev = _context2.next) {
+                  case 0:
+                    // 拓扑中心 如果有管理导航树权限，展示完整拓扑树
+                    showAllTree = topoApp.options.full && rootState.functionAuth.permissions.manageNavTree;
+
+                    if (!showAllTree) {
+                      _context2.next = 7;
+                      break;
+                    }
+
+                    _context2.next = 4;
+                    return _services["default"].getTopoTree();
+
+                  case 4:
+                    resTreeData = _context2.sent;
+                    _context2.next = 10;
+                    break;
+
+                  case 7:
+                    _context2.next = 9;
+                    return _services["default"].getTopoTreeByLoginUser();
+
+                  case 9:
+                    resTreeData = _context2.sent;
+
+                  case 10:
+                    return _context2.abrupt("return", resTreeData);
+
+                  case 11:
+                  case "end":
+                    return _context2.stop();
+                }
+              }
+            }, _callee2);
+          }))();
+        },
         getSelectedTopoId: function getSelectedTopoId(payload, rootState) {
           return rootState.topoTreeMod.selectedNode[0];
         },
         refreshTree: function refreshTree(payload, rootState) {
           var _this2 = this;
 
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
             var resTreeData, _formatTree2, treeData, defId;
 
-            return _regenerator["default"].wrap(function _callee2$(_context2) {
+            return _regenerator["default"].wrap(function _callee3$(_context3) {
               while (1) {
-                switch (_context2.prev = _context2.next) {
+                switch (_context3.prev = _context3.next) {
                   case 0:
-                    _context2.next = 2;
-                    return topoServer.getTopoTree();
+                    _context3.next = 2;
+                    return _this2.getTopoTree();
 
                   case 2:
-                    resTreeData = _context2.sent;
+                    resTreeData = _context3.sent;
                     // 格式化tree数据
                     _formatTree2 = (0, _tree.formatTree)(resTreeData, rootState.functionAuth.permissions), treeData = _formatTree2[0], defId = _formatTree2[1];
 
@@ -133,20 +155,20 @@ function _default(topoApp) {
 
                   case 5:
                   case "end":
-                    return _context2.stop();
+                    return _context3.stop();
                 }
               }
-            }, _callee2);
+            }, _callee3);
           }))();
         },
         editTopoOnTree: function editTopoOnTree(conditions, state) {
           var _this3 = this;
 
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
             var resTreeData, treeData;
-            return _regenerator["default"].wrap(function _callee3$(_context3) {
+            return _regenerator["default"].wrap(function _callee4$(_context4) {
               while (1) {
-                switch (_context3.prev = _context3.next) {
+                switch (_context4.prev = _context4.next) {
                   case 0:
                     if (conditions === void 0) {
                       conditions = {};
@@ -154,11 +176,11 @@ function _default(topoApp) {
 
                     _rlog["default"].debug('editTopoOnTree', conditions);
 
-                    _context3.next = 4;
-                    return topoServer.editTopoonTree(parseInt(conditions.id, 10), conditions.name, conditions.type);
+                    _context4.next = 4;
+                    return _services["default"].editTopoonTree(parseInt(conditions.id, 10), conditions.name, conditions.type);
 
                   case 4:
-                    resTreeData = _context3.sent;
+                    resTreeData = _context4.sent;
                     treeData = clone(state.topoTreeMod.treeData);
 
                     if (resTreeData) {
@@ -180,10 +202,10 @@ function _default(topoApp) {
 
                   case 7:
                   case "end":
-                    return _context3.stop();
+                    return _context4.stop();
                 }
               }
-            }, _callee3);
+            }, _callee4);
           }))();
         },
 
@@ -215,36 +237,36 @@ function _default(topoApp) {
          * @param {*} state
          */
         deleteTopoOnTree: function deleteTopoOnTree(conditions, state) {
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
             var currentTopoId, isDeleteCurrentP;
-            return _regenerator["default"].wrap(function _callee4$(_context4) {
+            return _regenerator["default"].wrap(function _callee5$(_context5) {
               while (1) {
-                switch (_context4.prev = _context4.next) {
+                switch (_context5.prev = _context5.next) {
                   case 0:
                     _rlog["default"].debug('deleteTopoOnTree', conditions, state, dispatch.topoMod);
 
                     currentTopoId = state.topoMod.topoId;
 
                     if (!("" + conditions === "" + currentTopoId)) {
-                      _context4.next = 13;
+                      _context5.next = 13;
                       break;
                     }
 
                     _rlog["default"].debug('deleteTopo-currentTopo', conditions);
 
-                    _context4.next = 6;
+                    _context5.next = 6;
                     return dispatch.topoMod.updateDelId("" + conditions);
 
                   case 6:
-                    _context4.next = 8;
+                    _context5.next = 8;
                     return topoApp.alarm.close();
 
                   case 8:
-                    _context4.next = 10;
-                    return topoServer.deleteTopoonTree(parseInt(conditions, 10));
+                    _context5.next = 10;
+                    return _services["default"].deleteTopoonTree(parseInt(conditions, 10));
 
                   case 10:
-                    return _context4.abrupt("return", _context4.sent);
+                    return _context5.abrupt("return", _context5.sent);
 
                   case 13:
                     // 判断删除的拓扑或文件，是否包含当前拓扑，如果包含就先关闭告警
@@ -256,36 +278,36 @@ function _default(topoApp) {
                     });
 
                     if (!isDeleteCurrentP) {
-                      _context4.next = 18;
+                      _context5.next = 18;
                       break;
                     }
 
-                    _context4.next = 18;
+                    _context5.next = 18;
                     return topoApp.alarm.close();
 
                   case 18:
-                    _context4.next = 20;
-                    return topoServer.deleteTopoonTree(parseInt(conditions, 10));
+                    _context5.next = 20;
+                    return _services["default"].deleteTopoonTree(parseInt(conditions, 10));
 
                   case 20:
-                    return _context4.abrupt("return", _context4.sent);
+                    return _context5.abrupt("return", _context5.sent);
 
                   case 21:
                   case "end":
-                    return _context4.stop();
+                    return _context5.stop();
                 }
               }
-            }, _callee4);
+            }, _callee5);
           }))();
         },
         setDefTopoOnTree: function setDefTopoOnTree(conditions, state) {
           var _this4 = this;
 
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
             var resTreeData;
-            return _regenerator["default"].wrap(function _callee5$(_context5) {
+            return _regenerator["default"].wrap(function _callee6$(_context6) {
               while (1) {
-                switch (_context5.prev = _context5.next) {
+                switch (_context6.prev = _context6.next) {
                   case 0:
                     if (conditions === void 0) {
                       conditions = {};
@@ -293,12 +315,12 @@ function _default(topoApp) {
 
                     _rlog["default"].debug('setDefTopoOnTree', conditions);
 
-                    _context5.next = 4;
-                    return topoServer.setDefTopo(parseInt(conditions, 10));
+                    _context6.next = 4;
+                    return _services["default"].setDefTopo(parseInt(conditions, 10));
 
                   case 4:
-                    resTreeData = _context5.sent;
-                    _context5.next = 7;
+                    resTreeData = _context6.sent;
+                    _context6.next = 7;
                     return _this4.refreshTree();
 
                   case 7:
@@ -306,10 +328,10 @@ function _default(topoApp) {
 
                   case 8:
                   case "end":
-                    return _context5.stop();
+                    return _context6.stop();
                 }
               }
-            }, _callee5);
+            }, _callee6);
           }))();
         },
         setDefaultTopoId: function setDefaultTopoId(defaultTopoId) {

package/lib/utils/tree.js

@@ -53,9 +53,7 @@ function formatTree(json, funcPermissions) {
         type: type,
         name: name,
         showDefault: showDefault,
-        // permission: node.operation,
-        // FIXME 拓扑数据权限临时方案，待移除
-        permission: funcPermissions.createTopo ? 'delete' : 'read',
+        permission: node.operation,
         children: node !== null && node !== void 0 && node.children ? loop(node.children) : []
       };
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "5.0.0-alpha.11",
+  "version": "5.0.0-alpha.13",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -115,6 +115,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@5.0.0-alpha.11/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@5.0.0-alpha.13/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }