@riil-frontend/component-topology 2.4.1 → 2.4.2

package/es/core/components/titlebar/TitleBar.module.scss

@@ -1,6 +1,6 @@
 .titlebar {
   display: flex;
-  padding: 12px 0;
+  padding: 12px 16px;
 
   .left {
     flex: 1;
@@ -11,6 +11,12 @@
 
   }
 
+  &.titlebarEditMode {
+    padding: 10px 16px;
+    box-shadow: 0px -1px 0px 0px #EBE8E8;
+    border-bottom: 1px solid #E6E7EB;
+  }
+
 }
 
 .title {

package/es/core/editor/components/settings/Settings.module.scss

@@ -5,7 +5,8 @@
   top: 0;
   right: 0;
   border-radius: 2px;
-  border: 1px solid #E6E7EB;
+  //border: 1px solid #E6E7EB;
+  //border-left: none;
 
   display: flex;
   flex-direction: column;

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

@@ -1,12 +1,13 @@
 import _Button from "@alifd/next/lib/button";
 import React, { useState, useEffect, useRef, useCallback } from 'react';
+import classnames from 'classnames';
 import TitleWidget from "../../../components/titlebar/widgets/TitleWidget";
 import styles from "../../../components/titlebar/TitleBar.module.scss";
 export default function TopoEditorTitleBar(props) {
   var topo = props.topo,
       topoEditApi = props.topoEditApi;
   return /*#__PURE__*/React.createElement("div", {
-    className: styles.titlebar
+    className: classnames(styles.titlebar, styles.titlebarEditMode)
   }, /*#__PURE__*/React.createElement("div", {
     className: styles.left
   }, /*#__PURE__*/React.createElement(TitleWidget, {

package/es/topoCenter/store/topoTreeMod.d.ts

@@ -55,7 +55,6 @@ export default function _default(topoApp: any): {
         fetchTopoTree(payload: any, rootState: any): Promise<void>;
         getSelectedTopoId(payload: any, rootState: any): any;
         refreshTree(payload: any, rootState: any): Promise<void>;
-        addNewTopo(params: {}, state: any): Promise<void>;
         editTopoOnTree(conditions: {}, state: any): Promise<void>;
         /**
          * 节指定的点和子节点是否包含指定的拓扑

package/es/topoCenter/store/topoTreeMod.js

@@ -128,102 +128,25 @@ export default function (topoApp) {
             }, _callee2);
           }))();
         },
-        addNewTopo: function addNewTopo(params, state) {
+        editTopoOnTree: function editTopoOnTree(conditions, state) {
           var _this3 = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-            var resTreeData, node, treeDataClone, updateData, newNode;
+            var resTreeData, treeData;
             return _regeneratorRuntime.wrap(function _callee3$(_context3) {
               while (1) {
                 switch (_context3.prev = _context3.next) {
-                  case 0:
-                    if (params === void 0) {
-                      params = {};
-                    }
-
-                    _context3.next = 3;
-                    return topoServer.addNewTopo(params);
-
-                  case 3:
-                    resTreeData = _context3.sent;
-
-                    if (resTreeData) {
-                      _context3.next = 6;
-                      break;
-                    }
-
-                    return _context3.abrupt("return");
-
-                  case 6:
-                    node = {
-                      id: "" + resTreeData,
-                      label: params.name,
-                      parentId: params.parentId,
-                      icon: iconImg[params.type],
-                      showDefault: false,
-                      type: params.type,
-                      permission: 'write'
-                    };
-                    treeDataClone = clone(state.topoTreeMod.treeData);
-
-                    if (params.parentId === -1) {
-                      treeDataClone.push(node);
-                    } else {
-                      loopTree(treeDataClone, params.parentId, function (parent, index, arr) {
-                        parent.children = [].concat(parent.children || [], [_extends({}, node)]);
-                      });
-                    }
-
-                    updateData = _extends({
-                      treeData: treeNodeCount(treeDataClone),
-                      selectedNode: ["" + resTreeData]
-                    }, params.type === 1 ? {
-                      expandedKeys: [].concat(state.topoTreeMod.expandedKeys || [], ["" + params.parentId])
-                    } : {});
-                    rlog.debug('addNewTopo', {
-                      updateData: updateData,
-                      state: state
-                    });
-
-                    _this3.update(updateData);
-
-                    if (params.type === 1) {
-                      newNode = {
-                        id: "" + resTreeData,
-                        name: params.name
-                      };
-                      dispatch.topoCenter.openCreateTopoPage(newNode);
-
-                      _this3.refreshTree();
-                    }
-
-                  case 13:
-                  case "end":
-                    return _context3.stop();
-                }
-              }
-            }, _callee3);
-          }))();
-        },
-        editTopoOnTree: function editTopoOnTree(conditions, state) {
-          var _this4 = this;
-
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-            var resTreeData, treeData;
-            return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-              while (1) {
-                switch (_context4.prev = _context4.next) {
                   case 0:
                     if (conditions === void 0) {
                       conditions = {};
                     }
 
                     rlog.debug('editTopoOnTree', conditions);
-                    _context4.next = 4;
+                    _context3.next = 4;
                     return topoServer.editTopoonTree(parseInt(conditions.id, 10), conditions.name, conditions.type);
 
                   case 4:
-                    resTreeData = _context4.sent;
+                    resTreeData = _context3.sent;
                     treeData = clone(state.topoTreeMod.treeData);
 
                     if (resTreeData) {
@@ -231,7 +154,7 @@ export default function (topoApp) {
                         arr[index].label = conditions.name;
                       });
 
-                      _this4.update({
+                      _this3.update({
                         treeData: treeData
                       });
 
@@ -245,10 +168,10 @@ export default function (topoApp) {
 
                   case 7:
                   case "end":
-                    return _context4.stop();
+                    return _context3.stop();
                 }
               }
-            }, _callee4);
+            }, _callee3);
           }))();
         },
 
@@ -280,34 +203,34 @@ export default function (topoApp) {
          * @param {*} state
          */
         deleteTopoOnTree: function deleteTopoOnTree(conditions, state) {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
             var currentTopoId, isDeleteCurrentP;
-            return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+            return _regeneratorRuntime.wrap(function _callee4$(_context4) {
               while (1) {
-                switch (_context5.prev = _context5.next) {
+                switch (_context4.prev = _context4.next) {
                   case 0:
                     rlog.debug('deleteTopoOnTree', conditions, state, dispatch.topoMod);
                     currentTopoId = state.topoMod.topoId;
 
                     if (!("" + conditions === "" + currentTopoId)) {
-                      _context5.next = 13;
+                      _context4.next = 13;
                       break;
                     }
 
                     rlog.debug('deleteTopo-currentTopo', conditions);
-                    _context5.next = 6;
+                    _context4.next = 6;
                     return dispatch.topoMod.updateDelId("" + conditions);
 
                   case 6:
-                    _context5.next = 8;
+                    _context4.next = 8;
                     return topoApp.alarm.close();
 
                   case 8:
-                    _context5.next = 10;
+                    _context4.next = 10;
                     return topoServer.deleteTopoonTree(parseInt(conditions, 10));
 
                   case 10:
-                    return _context5.abrupt("return", _context5.sent);
+                    return _context4.abrupt("return", _context4.sent);
 
                   case 13:
                     // 判断删除的拓扑或文件，是否包含当前拓扑，如果包含就先关闭告警
@@ -319,49 +242,49 @@ export default function (topoApp) {
                     });
 
                     if (!isDeleteCurrentP) {
-                      _context5.next = 18;
+                      _context4.next = 18;
                       break;
                     }
 
-                    _context5.next = 18;
+                    _context4.next = 18;
                     return topoApp.alarm.close();
 
                   case 18:
-                    _context5.next = 20;
+                    _context4.next = 20;
                     return topoServer.deleteTopoonTree(parseInt(conditions, 10));
 
                   case 20:
-                    return _context5.abrupt("return", _context5.sent);
+                    return _context4.abrupt("return", _context4.sent);
 
                   case 21:
                   case "end":
-                    return _context5.stop();
+                    return _context4.stop();
                 }
               }
-            }, _callee5);
+            }, _callee4);
           }))();
         },
         setDefTopoOnTree: function setDefTopoOnTree(conditions, state) {
-          var _this5 = this;
+          var _this4 = this;
 
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
             var resTreeData;
-            return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+            return _regeneratorRuntime.wrap(function _callee5$(_context5) {
               while (1) {
-                switch (_context6.prev = _context6.next) {
+                switch (_context5.prev = _context5.next) {
                   case 0:
                     if (conditions === void 0) {
                       conditions = {};
                     }
 
                     rlog.debug('setDefTopoOnTree', conditions);
-                    _context6.next = 4;
+                    _context5.next = 4;
                     return topoServer.setDefTopo(parseInt(conditions, 10));
 
                   case 4:
-                    resTreeData = _context6.sent;
+                    resTreeData = _context5.sent;
 
-                    _this5.refreshTree(); // let treeData = clone(state.topoTreeMod.treeData);
+                    _this4.refreshTree(); // let treeData = clone(state.topoTreeMod.treeData);
                     // loopTree(
                     //   treeData,
                     //   conditions,
@@ -380,10 +303,10 @@ export default function (topoApp) {
 
                   case 6:
                   case "end":
-                    return _context6.stop();
+                    return _context5.stop();
                 }
               }
-            }, _callee6);
+            }, _callee5);
           }))();
         },
         setDefaultTopoId: function setDefaultTopoId(defaultTopoId) {

package/lib/core/components/titlebar/TitleBar.module.scss

@@ -1,6 +1,6 @@
 .titlebar {
   display: flex;
-  padding: 12px 0;
+  padding: 12px 16px;
 
   .left {
     flex: 1;
@@ -11,6 +11,12 @@
 
   }
 
+  &.titlebarEditMode {
+    padding: 10px 16px;
+    box-shadow: 0px -1px 0px 0px #EBE8E8;
+    border-bottom: 1px solid #E6E7EB;
+  }
+
 }
 
 .title {

package/lib/core/editor/components/settings/Settings.module.scss

@@ -5,7 +5,8 @@
   top: 0;
   right: 0;
   border-radius: 2px;
-  border: 1px solid #E6E7EB;
+  //border: 1px solid #E6E7EB;
+  //border-left: none;
 
   display: flex;
   flex-direction: column;

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

@@ -11,6 +11,8 @@ var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _TitleWidget = _interopRequireDefault(require("../../../components/titlebar/widgets/TitleWidget"));
 
 var _TitleBarModule = _interopRequireDefault(require("../../../components/titlebar/TitleBar.module.scss"));
@@ -19,7 +21,7 @@ function TopoEditorTitleBar(props) {
   var topo = props.topo,
       topoEditApi = props.topoEditApi;
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: _TitleBarModule["default"].titlebar
+    className: (0, _classnames["default"])(_TitleBarModule["default"].titlebar, _TitleBarModule["default"].titlebarEditMode)
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: _TitleBarModule["default"].left
   }, /*#__PURE__*/_react["default"].createElement(_TitleWidget["default"], {

package/lib/topoCenter/store/topoTreeMod.d.ts

@@ -55,7 +55,6 @@ export default function _default(topoApp: any): {
         fetchTopoTree(payload: any, rootState: any): Promise<void>;
         getSelectedTopoId(payload: any, rootState: any): any;
         refreshTree(payload: any, rootState: any): Promise<void>;
-        addNewTopo(params: {}, state: any): Promise<void>;
         editTopoOnTree(conditions: {}, state: any): Promise<void>;
         /**
          * 节指定的点和子节点是否包含指定的拓扑

package/lib/topoCenter/store/topoTreeMod.js

@@ -141,92 +141,14 @@ function _default(topoApp) {
             }, _callee2);
           }))();
         },
-        addNewTopo: function addNewTopo(params, state) {
+        editTopoOnTree: function editTopoOnTree(conditions, state) {
           var _this3 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
-            var resTreeData, node, treeDataClone, updateData, newNode;
+            var resTreeData, treeData;
             return _regenerator["default"].wrap(function _callee3$(_context3) {
               while (1) {
                 switch (_context3.prev = _context3.next) {
-                  case 0:
-                    if (params === void 0) {
-                      params = {};
-                    }
-
-                    _context3.next = 3;
-                    return _topo["default"].addNewTopo(params);
-
-                  case 3:
-                    resTreeData = _context3.sent;
-
-                    if (resTreeData) {
-                      _context3.next = 6;
-                      break;
-                    }
-
-                    return _context3.abrupt("return");
-
-                  case 6:
-                    node = {
-                      id: "" + resTreeData,
-                      label: params.name,
-                      parentId: params.parentId,
-                      icon: _tree.iconImg[params.type],
-                      showDefault: false,
-                      type: params.type,
-                      permission: 'write'
-                    };
-                    treeDataClone = clone(state.topoTreeMod.treeData);
-
-                    if (params.parentId === -1) {
-                      treeDataClone.push(node);
-                    } else {
-                      (0, _tree.loopTree)(treeDataClone, params.parentId, function (parent, index, arr) {
-                        parent.children = [].concat(parent.children || [], [(0, _extends2["default"])({}, node)]);
-                      });
-                    }
-
-                    updateData = (0, _extends2["default"])({
-                      treeData: (0, _tree.treeNodeCount)(treeDataClone),
-                      selectedNode: ["" + resTreeData]
-                    }, params.type === 1 ? {
-                      expandedKeys: [].concat(state.topoTreeMod.expandedKeys || [], ["" + params.parentId])
-                    } : {});
-
-                    _rlog["default"].debug('addNewTopo', {
-                      updateData: updateData,
-                      state: state
-                    });
-
-                    _this3.update(updateData);
-
-                    if (params.type === 1) {
-                      newNode = {
-                        id: "" + resTreeData,
-                        name: params.name
-                      };
-                      dispatch.topoCenter.openCreateTopoPage(newNode);
-
-                      _this3.refreshTree();
-                    }
-
-                  case 13:
-                  case "end":
-                    return _context3.stop();
-                }
-              }
-            }, _callee3);
-          }))();
-        },
-        editTopoOnTree: function editTopoOnTree(conditions, state) {
-          var _this4 = this;
-
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-            var resTreeData, treeData;
-            return _regenerator["default"].wrap(function _callee4$(_context4) {
-              while (1) {
-                switch (_context4.prev = _context4.next) {
                   case 0:
                     if (conditions === void 0) {
                       conditions = {};
@@ -234,11 +156,11 @@ function _default(topoApp) {
 
                     _rlog["default"].debug('editTopoOnTree', conditions);
 
-                    _context4.next = 4;
+                    _context3.next = 4;
                     return _topo["default"].editTopoonTree(parseInt(conditions.id, 10), conditions.name, conditions.type);
 
                   case 4:
-                    resTreeData = _context4.sent;
+                    resTreeData = _context3.sent;
                     treeData = clone(state.topoTreeMod.treeData);
 
                     if (resTreeData) {
@@ -246,7 +168,7 @@ function _default(topoApp) {
                         arr[index].label = conditions.name;
                       });
 
-                      _this4.update({
+                      _this3.update({
                         treeData: treeData
                       });
 
@@ -260,10 +182,10 @@ function _default(topoApp) {
 
                   case 7:
                   case "end":
-                    return _context4.stop();
+                    return _context3.stop();
                 }
               }
-            }, _callee4);
+            }, _callee3);
           }))();
         },
 
@@ -295,36 +217,36 @@ function _default(topoApp) {
          * @param {*} state
          */
         deleteTopoOnTree: function deleteTopoOnTree(conditions, state) {
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
             var currentTopoId, isDeleteCurrentP;
-            return _regenerator["default"].wrap(function _callee5$(_context5) {
+            return _regenerator["default"].wrap(function _callee4$(_context4) {
               while (1) {
-                switch (_context5.prev = _context5.next) {
+                switch (_context4.prev = _context4.next) {
                   case 0:
                     _rlog["default"].debug('deleteTopoOnTree', conditions, state, dispatch.topoMod);
 
                     currentTopoId = state.topoMod.topoId;
 
                     if (!("" + conditions === "" + currentTopoId)) {
-                      _context5.next = 13;
+                      _context4.next = 13;
                       break;
                     }
 
                     _rlog["default"].debug('deleteTopo-currentTopo', conditions);
 
-                    _context5.next = 6;
+                    _context4.next = 6;
                     return dispatch.topoMod.updateDelId("" + conditions);
 
                   case 6:
-                    _context5.next = 8;
+                    _context4.next = 8;
                     return topoApp.alarm.close();
 
                   case 8:
-                    _context5.next = 10;
+                    _context4.next = 10;
                     return _topo["default"].deleteTopoonTree(parseInt(conditions, 10));
 
                   case 10:
-                    return _context5.abrupt("return", _context5.sent);
+                    return _context4.abrupt("return", _context4.sent);
 
                   case 13:
                     // 判断删除的拓扑或文件，是否包含当前拓扑，如果包含就先关闭告警
@@ -336,36 +258,36 @@ function _default(topoApp) {
                     });
 
                     if (!isDeleteCurrentP) {
-                      _context5.next = 18;
+                      _context4.next = 18;
                       break;
                     }
 
-                    _context5.next = 18;
+                    _context4.next = 18;
                     return topoApp.alarm.close();
 
                   case 18:
-                    _context5.next = 20;
+                    _context4.next = 20;
                     return _topo["default"].deleteTopoonTree(parseInt(conditions, 10));
 
                   case 20:
-                    return _context5.abrupt("return", _context5.sent);
+                    return _context4.abrupt("return", _context4.sent);
 
                   case 21:
                   case "end":
-                    return _context5.stop();
+                    return _context4.stop();
                 }
               }
-            }, _callee5);
+            }, _callee4);
           }))();
         },
         setDefTopoOnTree: function setDefTopoOnTree(conditions, state) {
-          var _this5 = this;
+          var _this4 = this;
 
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
             var resTreeData;
-            return _regenerator["default"].wrap(function _callee6$(_context6) {
+            return _regenerator["default"].wrap(function _callee5$(_context5) {
               while (1) {
-                switch (_context6.prev = _context6.next) {
+                switch (_context5.prev = _context5.next) {
                   case 0:
                     if (conditions === void 0) {
                       conditions = {};
@@ -373,13 +295,13 @@ function _default(topoApp) {
 
                     _rlog["default"].debug('setDefTopoOnTree', conditions);
 
-                    _context6.next = 4;
+                    _context5.next = 4;
                     return _topo["default"].setDefTopo(parseInt(conditions, 10));
 
                   case 4:
-                    resTreeData = _context6.sent;
+                    resTreeData = _context5.sent;
 
-                    _this5.refreshTree(); // let treeData = clone(state.topoTreeMod.treeData);
+                    _this4.refreshTree(); // let treeData = clone(state.topoTreeMod.treeData);
                     // loopTree(
                     //   treeData,
                     //   conditions,
@@ -398,10 +320,10 @@ function _default(topoApp) {
 
                   case 6:
                   case "end":
-                    return _context6.stop();
+                    return _context5.stop();
                 }
               }
-            }, _callee6);
+            }, _callee5);
           }))();
         },
         setDefaultTopoId: function setDefaultTopoId(defaultTopoId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "拓扑",
   "files": [
     "demo/",
@@ -99,6 +99,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.4.1/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.4.2/build/index.html",
   "gitHead": "4c30a81dfb48bf8ebfd910e644605ce85604fcb7"
 }