@riil-frontend/component-topology 0.2.2 → 0.2.3

package/lib/topoCenter/getTopoData.js

@@ -0,0 +1,53 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = getTopoData;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/services/topo"));
+
+var _linkUtils = require("../core/models/utils/linkUtils");
+
+function getTopoData(_x) {
+  return _getTopoData.apply(this, arguments);
+}
+
+function _getTopoData() {
+  _getTopoData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id) {
+    var data, links;
+    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;
+            console.error(111, data);
+            _context.next = 6;
+            return (0, _linkUtils.getLinksDetail)(data.links);
+
+          case 6:
+            links = _context.sent;
+            console.error(111, data, links);
+            return _context.abrupt("return", (0, _extends2["default"])({}, data, {
+              links: links
+            }));
+
+          case 9:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _getTopoData.apply(this, arguments);
+}

package/lib/topoCenter/models/Topo.js

@@ -0,0 +1 @@
+"use strict";

package/lib/topoCenter/models/TopoCenter.js

@@ -0,0 +1,118 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+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 _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+
+var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
+
+var _TopoApp2 = _interopRequireDefault(require("../../core/models/TopoApp"));
+
+var _createMenuCommands = _interopRequireDefault(require("../../contextmenu/createMenuCommands"));
+
+var _getTopoData = _interopRequireDefault(require("../getTopoData"));
+
+var TopoCenter = /*#__PURE__*/function (_TopoApp) {
+  (0, _inheritsLoose2["default"])(TopoCenter, _TopoApp);
+
+  function TopoCenter(options) {
+    var _this;
+
+    _this = _TopoApp.call(this, (0, _extends2["default"])({
+      loadData: _getTopoData["default"]
+    }, options, {
+      usePermission: true
+    })) || this;
+    var menuCommands = (0, _createMenuCommands["default"])((0, _assertThisInitialized2["default"])(_this));
+
+    _this.view.contextMenu.registerCommands(menuCommands);
+
+    return _this;
+  }
+  /**
+   * TODO 移除
+   * @param params
+   * @return {Promise<void>}
+   */
+
+
+  var _proto = TopoCenter.prototype;
+
+  _proto.initData =
+  /*#__PURE__*/
+  function () {
+    var _initData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(params) {
+      var topoDispatchers;
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              topoDispatchers = this.store.getModelDispatchers('topoCenter');
+              _context.next = 3;
+              return topoDispatchers.initData(params);
+
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, this);
+    }));
+
+    function initData(_x) {
+      return _initData.apply(this, arguments);
+    }
+
+    return initData;
+  }();
+
+  _proto.openTopo = function openTopo(params) {
+    var topoDispatchers = this.store.getModelDispatchers('topoCenter');
+    topoDispatchers.openTopoPage(params);
+  }
+  /**
+   * TODO 移除
+   */
+  ;
+
+  _proto.exit =
+  /*#__PURE__*/
+  function () {
+    var _exit = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+      var topoDispatchers;
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              topoDispatchers = this.store.getModelDispatchers('topoMod');
+              _context2.next = 3;
+              return topoDispatchers.exit();
+
+            case 3:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2, this);
+    }));
+
+    function exit() {
+      return _exit.apply(this, arguments);
+    }
+
+    return exit;
+  }();
+
+  return TopoCenter;
+}(_TopoApp2["default"]);
+
+exports["default"] = TopoCenter;

package/lib/topoCenter/viewer/TitleBar.js

@@ -0,0 +1,21 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = TitleBar;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _TopoViewerTitleBar = _interopRequireDefault(require("../../components/TopoView/toolbar/TopoViewerTitleBar"));
+
+function TitleBar(props) {
+  return /*#__PURE__*/_react["default"].createElement(_TopoViewerTitleBar["default"], (0, _extends2["default"])({
+    showEditButton: false,
+    disableEditMode: true
+  }, props));
+}
+
+;

package/lib/topoCenter/viewer/components/TopologyViewer.js

@@ -0,0 +1,43 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = TopologyViewer;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _Topo = _interopRequireDefault(require("../../../components/TopoView/Topo"));
+
+var _createTopoViewer = require("../createTopoViewer");
+
+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 TopologyViewer(props) {
+  var request = props.request,
+      titleBar = props.titleBar;
+  var topo = (0, _react.useMemo)(function () {
+    return (0, _createTopoViewer.createTopoViewer)({
+      request: request
+    });
+  }, []); // 初始化
+
+  (0, _react.useEffect)(function () {
+    topo.initData({});
+    return function () {
+      topo.exit();
+    };
+  }, []);
+  var Provider = topo.Provider;
+  return /*#__PURE__*/_react["default"].createElement(Provider, null, titleBar && titleBar(topo), /*#__PURE__*/_react["default"].createElement(_Topo["default"], (0, _extends2["default"])({
+    engine: topo
+  }, props, {
+    titleBar: false
+  })));
+}
+
+;

package/lib/topoCenter/viewer/createTopoViewer.js

@@ -6,10 +6,6 @@ exports.__esModule = true;
 exports.createTopoViewer = createTopoViewer;
 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"));
@@ -18,39 +14,10 @@ var _core = require("../../core");
 
 var _createMenuCommands = _interopRequireDefault(require("../../contextmenu/createMenuCommands"));
 
+var _TopoCenter = _interopRequireDefault(require("../models/TopoCenter"));
+
 function createTopoViewer(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);
+  var topoApp = new _TopoCenter["default"]((0, _extends2["default"])({}, options));
   return topoApp;
 }
 

package/lib/topoCenter/viewer/index.js

@@ -9,13 +9,13 @@ var _exportNames = {
   TitleWidget: true
 };
 
-var _Topo = _interopRequireDefault(require("../../components/TopoView/Topo"));
+var _TopologyViewer = _interopRequireDefault(require("./components/TopologyViewer"));
 
-exports.TopologyViewer = _Topo["default"];
+exports.TopologyViewer = _TopologyViewer["default"];
 
-var _TopoViewerTitleBar = _interopRequireDefault(require("../../components/TopoView/toolbar/TopoViewerTitleBar"));
+var _TitleBar = _interopRequireDefault(require("./TitleBar"));
 
-exports.TitleBar = _TopoViewerTitleBar["default"];
+exports.TitleBar = _TitleBar["default"];
 
 var _TitleWidget = _interopRequireDefault(require("../../components/TopoView/toolbar/widgets/TitleWidget"));
 

package/lib/utils/topoData.js

@@ -109,7 +109,7 @@ var tfGroup = function tfGroup(group) {
 var tfNode = function tfNode(node, setDataList, attrObj, metricObj) {
   var _findItem, _findItem2;
 
-  var result = node;
+  var result = (0, _extends2["default"])({}, node);
   result.ipAddress = ((_findItem = findItem(node.attributes, 'code', 'ipAddress')) === null || _findItem === void 0 ? void 0 : _findItem.value) || null;
   result.macAddress = ((_findItem2 = findItem(node.attributes, 'code', 'macAddress')) === null || _findItem2 === void 0 ? void 0 : _findItem2.value) || null;
   result.metrics = [];
@@ -197,6 +197,8 @@ var tfNode = function tfNode(node, setDataList, attrObj, metricObj) {
 
 
 var tfLink = function tfLink(link, nodes, interfaceNodes, setDataList, attrObj, metricObj) {
+  var _link$detail, _link$detail2, _link$detail3, _link$detail4;
+
   var source = link.source,
       target = link.target,
       interfaceSource = link.interfaceSource,
@@ -304,15 +306,15 @@ var tfLink = function tfLink(link, nodes, interfaceNodes, setDataList, attrObj,
     metrics: metrics,
     attributes: attributes,
     interfaceSourceObj: {
-      id: link.detail.attributes.srcUnique,
+      id: (_link$detail = link.detail) === null || _link$detail === void 0 ? void 0 : _link$detail.attributes.srcUnique,
       attributes: {
-        displayName: operation ? link.detail.attributes.srcName : '未知'
+        displayName: operation ? (_link$detail2 = link.detail) === null || _link$detail2 === void 0 ? void 0 : _link$detail2.attributes.srcName : '未知'
       }
     },
     interfaceTargetObj: {
-      id: link.detail.attributes.dstUnique,
+      id: (_link$detail3 = link.detail) === null || _link$detail3 === void 0 ? void 0 : _link$detail3.attributes.dstUnique,
       attributes: {
-        displayName: operation ? link.detail.attributes.dstName : '未知'
+        displayName: operation ? (_link$detail4 = link.detail) === null || _link$detail4 === void 0 ? void 0 : _link$detail4.attributes.dstName : '未知'
       }
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "拓扑",
   "files": [
     "demo/",
@@ -58,6 +58,7 @@
     "styled-components": "^4.4.1"
   },
   "devDependencies": {
+    "axios": "^0.21.1",
     "@alifd/theme-15686": "^0.37.0",
     "build-plugin-component": "^1.0.0",
     "build-plugin-fusion": "^0.1.0",
@@ -69,12 +70,13 @@
     "enzyme-adapter-react-16": "^1.14.0",
     "@iceworks/spec": "^1.0.0",
     "eslint": "^7.0.0",
-    "stylelint": "^13.7.2"
+    "stylelint": "^13.7.2",
+    "@alifd/next": "1.x"
   },
   "peerDependencies": {
     "react": "^16 || ^17",
-    "@ice/store": "^1.4.2",
-    "@riil-frontend/css": "^1.0.10"
+    "@riil-frontend/css": "^1.0.10",
+    "@alifd/next": "1.x"
   },
   "componentConfig": {
     "name": "Topology",
@@ -85,5 +87,5 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@0.2.2/build/index.html"
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@0.2.3/build/index.html"
 }