@riil-frontend/component-topology 0.2.9 → 0.2.10

package/lib/hooks/useTopoEdit.js

@@ -498,27 +498,27 @@ var useTopoEdit = function useTopoEdit(params) {
   }
 
   function _checkSavePermission() {
-    _checkSavePermission = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(id) {
+    _checkSavePermission = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(id) {
       var permission;
-      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:
-              _context4.next = 2;
+              _context5.next = 2;
               return topoDispatchers.getTopoPermission({
                 id: id,
                 update: false
               });
 
             case 2:
-              permission = _context4.sent;
+              permission = _context5.sent;
 
               if (!_topoPermissonUtil["default"].isEditable(permission)) {
-                _context4.next = 5;
+                _context5.next = 5;
                 break;
               }
 
-              return _context4.abrupt("return", true);
+              return _context5.abrupt("return", true);
 
             case 5:
               _dialog["default"].alert({
@@ -530,64 +530,96 @@ var useTopoEdit = function useTopoEdit(params) {
                 onOk: function onOk() {}
               });
 
-              return _context4.abrupt("return", false);
+              return _context5.abrupt("return", false);
 
             case 7:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
         }
-      }, _callee4);
+      }, _callee5);
     }));
     return _checkSavePermission.apply(this, arguments);
   }
 
   var onSaveTopo = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(data) {
-      var id, config, global, serialize, valid, _config$layout, template, layout;
+    var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(data) {
+      var id, config, global, serialize, saveConfig, valid, _config$layout2, template, layout;
 
-      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:
               id = data.id, config = data.config, global = data.global, serialize = data.serialize;
 
               if (!onSave) {
-                _context3.next = 4;
+                _context4.next = 5;
                 break;
               }
 
+              saveConfig = /*#__PURE__*/function () {
+                var _ref5 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+                  var _config$layout, template, layout;
+
+                  return _regenerator["default"].wrap(function _callee3$(_context3) {
+                    while (1) {
+                      switch (_context3.prev = _context3.next) {
+                        case 0:
+                          _config$layout = config === null || config === void 0 ? void 0 : config.layout, template = _config$layout.type, layout = _config$layout.layout;
+                          _context3.next = 3;
+                          return editDispatchers.saveTopo({
+                            id: id,
+                            template: template,
+                            layout: layout,
+                            global: global,
+                            serialize: serialize
+                          });
+
+                        case 3:
+                        case "end":
+                          return _context3.stop();
+                      }
+                    }
+                  }, _callee3);
+                }));
+
+                return function saveConfig() {
+                  return _ref5.apply(this, arguments);
+                };
+              }();
+
               onSave({
-                data: data
+                data: data,
+                saveConfig: saveConfig
               });
-              return _context3.abrupt("return");
+              return _context4.abrupt("return");
 
-            case 4:
+            case 5:
               // TODO 以下逻辑移到拓扑中心
               topoEditDispatchers.update({
                 saving: true
               }); // 检查权限
 
-              _context3.next = 7;
+              _context4.next = 8;
               return checkSavePermission(id);
 
-            case 7:
-              valid = _context3.sent;
+            case 8:
+              valid = _context4.sent;
 
               if (valid) {
-                _context3.next = 11;
+                _context4.next = 12;
                 break;
               }
 
               topoEditDispatchers.update({
                 saving: false
               });
-              return _context3.abrupt("return");
+              return _context4.abrupt("return");
 
-            case 11:
+            case 12:
               // 保存
-              _config$layout = config === null || config === void 0 ? void 0 : config.layout, template = _config$layout.type, layout = _config$layout.layout;
-              _context3.next = 14;
+              _config$layout2 = config === null || config === void 0 ? void 0 : config.layout, template = _config$layout2.type, layout = _config$layout2.layout;
+              _context4.next = 15;
               return editDispatchers.saveTopo({
                 id: id,
                 template: template,
@@ -598,14 +630,14 @@ var useTopoEdit = function useTopoEdit(params) {
                 groups: editState.groups
               });
 
-            case 14:
-              _context3.next = 16;
+            case 15:
+              _context4.next = 17;
               return editDispatchers.addToBlockList({
                 id: topoId,
                 ciIdList: deletedNodes
               });
 
-            case 16:
+            case 17:
               clearDeletedNodes(); // 清空删除列表
 
               topoEditDispatchers.update({
@@ -614,12 +646,12 @@ var useTopoEdit = function useTopoEdit(params) {
 
               _message["default"].success('保存成功！');
 
-            case 19:
+            case 20:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
         }
-      }, _callee3);
+      }, _callee4);
     }));
 
     return function onSaveTopo(_x2) {

package/lib/models/topoCreateMod.js

@@ -321,7 +321,7 @@ function _default(topoApp) {
             }, _callee);
           }))();
         },
-        getConditions: function getConditions(topoId) {
+        getConditions: function getConditions() {
           var _this2 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
@@ -331,49 +331,55 @@ function _default(topoApp) {
                 switch (_context2.prev = _context2.next) {
                   case 0:
                     _context2.next = 2;
-                    return _topo["default"].getConditions(topoId);
+                    return _topo["default"].getConditions(topoApp.id);
 
                   case 2:
                     data = _context2.sent;
 
                     if ((0, _utils.isAvailableArray)(data)) {
-                      // 视图
-                      groupTopo = data.findIndex(function (item) {
-                        var _item$topoGroup;
+                      _context2.next = 5;
+                      break;
+                    }
 
-                        return ((_item$topoGroup = item.topoGroup) === null || _item$topoGroup === void 0 ? void 0 : _item$topoGroup.parentId) === _topo.TOPO_PARENT_ID;
-                      });
-                      resources = conditionToRes(groupTopo >= 0 ? data[groupTopo].condition : {}); // 容器
-
-                      groups = (0, _format.removeFromArray)(data, groupTopo).map(function (item) {
-                        var _item$topoGroup2 = item.topoGroup,
-                            topoGroup = _item$topoGroup2 === void 0 ? {} : _item$topoGroup2,
-                            condition = item.condition;
-                        var id = topoGroup.id,
-                            name = topoGroup.name,
-                            layout = topoGroup.layout,
-                            order = topoGroup.order,
-                            parentId = topoGroup.parentId,
-                            styles = topoGroup.styles;
-                        var groupStyles = styles && JSON.parse(styles) || {};
-                        return {
-                          id: id,
-                          name: name,
-                          layout: layout,
-                          order: order,
-                          parentId: parentId,
-                          expanded: groupStyles.expanded || false,
-                          resources: conditionToRes(condition)
-                        };
-                      });
+                    return _context2.abrupt("return");
 
-                      _this2.update({
-                        resources: resources,
-                        groups: groups
-                      });
-                    }
+                  case 5:
+                    // 视图
+                    groupTopo = data.findIndex(function (item) {
+                      var _item$topoGroup;
+
+                      return ((_item$topoGroup = item.topoGroup) === null || _item$topoGroup === void 0 ? void 0 : _item$topoGroup.parentId) === _topo.TOPO_PARENT_ID;
+                    });
+                    resources = conditionToRes(groupTopo >= 0 ? data[groupTopo].condition : {}); // 容器
+
+                    groups = (0, _format.removeFromArray)(data, groupTopo).map(function (item) {
+                      var _item$topoGroup2 = item.topoGroup,
+                          topoGroup = _item$topoGroup2 === void 0 ? {} : _item$topoGroup2,
+                          condition = item.condition;
+                      var id = topoGroup.id,
+                          name = topoGroup.name,
+                          layout = topoGroup.layout,
+                          order = topoGroup.order,
+                          parentId = topoGroup.parentId,
+                          styles = topoGroup.styles;
+                      var groupStyles = styles && JSON.parse(styles) || {};
+                      return {
+                        id: id,
+                        name: name,
+                        layout: layout,
+                        order: order,
+                        parentId: parentId,
+                        expanded: groupStyles.expanded || false,
+                        resources: conditionToRes(condition)
+                      };
+                    });
+
+                    _this2.update({
+                      resources: resources,
+                      groups: groups
+                    });
 
-                  case 4:
+                  case 9:
                   case "end":
                     return _context2.stop();
                 }
@@ -529,7 +535,11 @@ function _default(topoApp) {
                     return _topo["default"].saveSerializeData(topoId, serialize);
 
                   case 11:
-                    // 保存绑定的资源
+                    if (!(resources || groups)) {
+                      _context5.next = 16;
+                      break;
+                    }
+
                     conditions = resToConditions(resources, true);
                     groupInfo = (0, _utils.isAvailableArray)(groups) && groups.map(function (group) {
                       return (0, _extends2["default"])({}, group, {
@@ -537,10 +547,10 @@ function _default(topoApp) {
                         resources: resToConditions(group.resources, true)
                       });
                     });
-                    _context5.next = 15;
+                    _context5.next = 16;
                     return _topo["default"].bindResourceToTopo(topoId, conditions, groupInfo);
 
-                  case 15:
+                  case 16:
                   case "end":
                     return _context5.stop();
                 }
@@ -567,12 +577,7 @@ function _default(topoApp) {
             }, _callee6);
           }))();
         },
-        switchToEditMode: function switchToEditMode(topoId) {
-          dispatch.topoMod.update({
-            viewState: 'edit'
-          });
-          this.getConditions(topoId);
-        },
+        switchToEditMode: function switchToEditMode() {},
         switchToViewMode: function switchToViewMode() {
           this.reset();
           dispatch.topoMod.switchToViewMode();

package/lib/models/topoMod.js

@@ -41,9 +41,8 @@ function _default(topoApp) {
       topoPermission: undefined,
       viewState: 'view',
       // view, create, 2种模式
-      leftAsideOpen: true,
-      // 左侧树是否展开
-      lastRefresh: undefined,
+      // leftAsideOpen: true, // 左侧树是否展开
+      // lastRefresh: undefined,
       topoData: null,
       currentTopo: undefined,
       currentNode: {
@@ -143,26 +142,30 @@ function _default(topoApp) {
 
         /**
          *
-         * @param playload {{id: string, linkTo:?object}}
+         * @param playload {object}
+         * @param playload.id {string?}
+         * @param playload.data {object?}
+         * @param playload.mode {string?}
+         * @param playload.viewState {string?}
          */
         openTopoPage: function openTopoPage(playload, rootState) {
           var _this2 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-            var id, data, viewState, linkTo, topoId;
+            var id, data, linkTo, viewState, topoId;
             return _regenerator["default"].wrap(function _callee2$(_context2) {
               while (1) {
                 switch (_context2.prev = _context2.next) {
                   case 0:
-                    id = playload.id, data = playload.data, viewState = playload.viewState, linkTo = playload.linkTo;
+                    id = playload.id, data = playload.data, linkTo = playload.linkTo;
+                    viewState = playload.mode || playload.viewState || 'view';
                     topoId = id || data.config.id;
-                    console.error(111, playload);
                     _context2.next = 5;
                     return topoApp.open(topoId);
 
                   case 5:
                     _this2.update({
-                      viewState: viewState || 'view',
+                      viewState: viewState,
                       currentTopo: playload,
                       topoId: topoId,
                       topoPermission: undefined
@@ -192,15 +195,7 @@ function _default(topoApp) {
         switchToViewMode: function switchToViewMode(playload, rootState) {
           this.update({
             viewState: 'view'
-          }); // TODO 移到拓扑中心
-
-          dispatch.topoCenter.update({
-            leftAsideOpen: true
-          });
-          this.openTopoPage({
-            id: rootState.topoMod.topoId
           });
-          this.refreshTopoTree();
         },
         enterEditMode: function enterEditMode(playload, rootState) {
           topoApp.enterEditMode();

package/lib/topoCenter/components/Topology.js

@@ -0,0 +1,20 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = Topology;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _Topo = _interopRequireDefault(require("../../components/TopoView/Topo"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function Topology(props) {
+  return /*#__PURE__*/_react["default"].createElement(_Topo["default"], props);
+}
+
+;

package/lib/topoCenter/getTopoData.js

@@ -31,18 +31,16 @@ function _getTopoData() {
 
           case 2:
             data = _context.sent;
-            console.error(111, data);
-            _context.next = 6;
+            _context.next = 5;
             return (0, _linkUtils.getLinksDetail)(data.links);
 
-          case 6:
+          case 5:
             links = _context.sent;
-            console.error(111, data, links);
             return _context.abrupt("return", (0, _extends2["default"])({}, data, {
               links: links
             }));
 
-          case 9:
+          case 7:
           case "end":
             return _context.stop();
         }

package/lib/topoCenter/index.js

@@ -0,0 +1,13 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+
+var _TopoCenter = _interopRequireDefault(require("./models/TopoCenter"));
+
+exports.TopoCenter = _TopoCenter["default"];
+
+var _Topology = _interopRequireDefault(require("./components/Topology"));
+
+exports.Topology = _Topology["default"];

package/lib/topoCenter/models/TopoCenter.js

@@ -30,7 +30,26 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
     _this = _TopoApp.call(this, (0, _extends2["default"])({
       loadData: _getTopoData["default"]
     }, options, {
-      usePermission: true
+      usePermission: true,
+      onSwitchToEditMode: function onSwitchToEditMode() {
+        var editDispatchers = _this.store.getModelDispatchers('topoCreateMod');
+
+        editDispatchers.getConditions();
+      },
+      onSwitchToViewMode: function onSwitchToViewMode() {
+        var topoModDispatchers = _this.store.getModelDispatchers('topoMod');
+
+        topoModDispatchers.openTopoPage({
+          id: _this.id
+        });
+        topoModDispatchers.refreshTopoTree();
+
+        var topoCenterDispatchers = _this.store.getModelDispatchers('topoCenter');
+
+        topoCenterDispatchers.update({
+          leftAsideOpen: true
+        });
+      }
     })) || this;
     var menuCommands = (0, _createMenuCommands["default"])((0, _assertThisInitialized2["default"])(_this));
 
@@ -93,7 +112,7 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              topoDispatchers = this.store.getModelDispatchers('topoMod');
+              topoDispatchers = this.store.getModelDispatchers('topoCenter');
               _context2.next = 3;
               return topoDispatchers.exit();
 

package/lib/topoCenter/viewer/createTopoViewer.js

@@ -8,10 +8,6 @@ exports["default"] = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/services/topo"));
-
-var _core = require("../../core");
-
 var _createMenuCommands = _interopRequireDefault(require("../../contextmenu/createMenuCommands"));
 
 var _TopoCenter = _interopRequireDefault(require("../models/TopoCenter"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "拓扑",
   "files": [
     "demo/",
@@ -87,5 +87,5 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@0.2.9/build/index.html"
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@0.2.10/build/index.html"
 }

package/demo/2/346/213/223/346/211/221/344/270/255/345/277/203//345/256/214/346/225/264/346/250/241/345/274/2172.md

@@ -1,10 +0,0 @@
----
-title: 完整模式2
-order: 2
----
-
-
-
-```jsx
-<DemoCode src="./js/TopoCenterViewer.jsx" />
-```

package/es/createTopoView.js

@@ -1,42 +0,0 @@
-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-utils/es/services/topo';
-import { createTopoApp } from './core';
-import createMenuCommands from './contextmenu/createMenuCommands';
-export function createTopoView(options) {
-  var topoApp = createTopoApp(_extends({
-    loadData: function () {
-      var _loadData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(id) {
-        var data;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return topoService.getTopoData(id);
-
-              case 2:
-                data = _context.sent;
-                return _context.abrupt("return", data);
-
-              case 4:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }));
-
-      function loadData(_x) {
-        return _loadData.apply(this, arguments);
-      }
-
-      return loadData;
-    }()
-  }, options));
-  var menuCommands = createMenuCommands(topoApp);
-  topoApp.view.contextMenu.registerCommands(menuCommands);
-  return topoApp;
-}
-export default createTopoView;

package/lib/createTopoView.js

@@ -1,58 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports.createTopoView = createTopoView;
-exports["default"] = void 0;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/services/topo"));
-
-var _core = require("./core");
-
-var _createMenuCommands = _interopRequireDefault(require("./contextmenu/createMenuCommands"));
-
-function createTopoView(options) {
-  var topoApp = (0, _core.createTopoApp)((0, _extends2["default"])({
-    loadData: function () {
-      var _loadData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id) {
-        var data;
-        return _regenerator["default"].wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return _topo["default"].getTopoData(id);
-
-              case 2:
-                data = _context.sent;
-                return _context.abrupt("return", data);
-
-              case 4:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }));
-
-      function loadData(_x) {
-        return _loadData.apply(this, arguments);
-      }
-
-      return loadData;
-    }()
-  }, options));
-  var menuCommands = (0, _createMenuCommands["default"])(topoApp);
-  topoApp.view.contextMenu.registerCommands(menuCommands);
-  return topoApp;
-}
-
-var _default = createTopoView;
-exports["default"] = _default;