@riil-frontend/component-topology 7.0.0-dev.4 → 7.0.0-dev.6

package/es/core/models/TopoApp.js

@@ -23,7 +23,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
 
-var version = typeof "7.0.0-dev.4" === 'string' ? "7.0.0-dev.4" : null;
+var version = typeof "7.0.0-dev.6" === 'string' ? "7.0.0-dev.6" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/store/models/topoConfig.js

@@ -177,7 +177,7 @@ export default function (topoApp) {
                 switch (_context.prev = _context.next) {
                   case 0:
                     _context.next = 2;
-                    return topoService.getConditions(topoApp.id);
+                    return topoApp.serverApi.getConditions(topoApp.id);
 
                   case 2:
                     data = _context.sent;
@@ -325,7 +325,7 @@ export default function (topoApp) {
                     }); // rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
 
                     _context4.next = 5;
-                    return topoService.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList);
+                    return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList);
 
                   case 5:
                     data = _context4.sent;
@@ -391,7 +391,7 @@ export default function (topoApp) {
                     };
                     rlog.debug('saveGlobalConfig', config);
                     _context5.next = 5;
-                    return topoService.saveTopoSettings(topoApp.id, config);
+                    return topoApp.serverApi.saveTopoSettings(topoApp.id, config);
 
                   case 5:
                   case "end":
@@ -442,7 +442,7 @@ export default function (topoApp) {
                   case 0:
                     topoId = data.id, ciIdList = data.ciIdList;
                     _context7.next = 3;
-                    return topoService.addToBlocklist(topoId, ciIdList);
+                    return topoApp.serverApi.addToBlocklist(topoId, ciIdList);
 
                   case 3:
                   case "end":

package/es/core/store/models/topoMod.js

@@ -400,7 +400,7 @@ export default function (topoApp) {
 
                   case 29:
                     _context6.next = 31;
-                    return topoApp.options.loadData(topoId);
+                    return topoApp.options.loadData(topoId, topoApp.serverApi);
 
                   case 31:
                     result = _context6.sent;

package/es/core/viewer/components/titlebar/BasicTools.js

@@ -3,34 +3,21 @@ import _extends from "@babel/runtime/helpers/extends";
 import React from "react";
 import EditButton from "./widgets/EditButton";
 import NodesDragSwitch from "./widgets/NodesDragSwitchWrapper";
-import AlarmListShowButton from "./widgets/AlarmListShowButton";
 import SettingButton from "./widgets/SettingButtonWidget";
-import useEventData from "../../../hooks/useEventData";
+import AlarmButton from "./widgets/AlarmButton";
 export default function BasicTools(props) {
   var topo = props.topo,
       _props$showEditButton = props.showEditButton,
       showEditButton = _props$showEditButton === void 0 ? true : _props$showEditButton,
       children = props.children;
-
-  var _topo$store$useModel = topo.store.useModel("topoAlarm"),
-      alarmState = _topo$store$useModel[0],
-      alarmDispatchers = _topo$store$useModel[1];
-
-  var alarmPanelIsOpen = alarmState.alarmPanelIsOpen;
-  var alarmData = useEventData({
-    topo: topo
-  });
   return /*#__PURE__*/React.createElement(_Box, {
     direction: "row",
     spacing: 8
   }, showEditButton && /*#__PURE__*/React.createElement(EditButton, _extends({
     topo: topo
-  }, props)), /*#__PURE__*/React.createElement(AlarmListShowButton, _extends({
+  }, props)), /*#__PURE__*/React.createElement(AlarmButton, _extends({
     topo: topo
-  }, props, {
-    alarmPanelIsOpen: alarmPanelIsOpen,
-    alarmData: alarmData
-  })), /*#__PURE__*/React.createElement(SettingButton, props), /*#__PURE__*/React.createElement(NodesDragSwitch, _extends({
+  }, props)), /*#__PURE__*/React.createElement(SettingButton, props), /*#__PURE__*/React.createElement(NodesDragSwitch, _extends({
     topo: topo
   }, props)), children);
 }

package/es/core/viewer/components/titlebar/widgets/AlarmButton.js

@@ -0,0 +1,25 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import AlarmListShowButton from "./AlarmListShowButton";
+import useEventData from "../../../../hooks/useEventData";
+
+function AlarmButton(props) {
+  var topo = props.topo;
+
+  var _topo$store$useModel = topo.store.useModel("topoAlarm"),
+      alarmState = _topo$store$useModel[0],
+      alarmDispatchers = _topo$store$useModel[1];
+
+  var alarmPanelIsOpen = alarmState.alarmPanelIsOpen;
+  var alarmData = useEventData({
+    topo: topo
+  });
+  return /*#__PURE__*/React.createElement(AlarmListShowButton, _extends({
+    topo: topo
+  }, props, {
+    alarmPanelIsOpen: alarmPanelIsOpen,
+    alarmData: alarmData
+  }));
+}
+
+export default AlarmButton;

package/es/networkTopo/getTopoData.js

@@ -1,7 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 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 { queryCisByIds } from "../core/services";
 import { addTopoDataResourcePermission } from "./utils/resourcePermissionUtil"; // import "./utils/__tests__/resourcePermissionUtil.test";
@@ -127,12 +126,12 @@ function _buildData() {
   return _buildData.apply(this, arguments);
 }
 
-export default function getTopoData(_x4) {
+export default function getTopoData(_x4, _x5) {
   return _getTopoData.apply(this, arguments);
 }
 
 function _getTopoData() {
-  _getTopoData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id) {
+  _getTopoData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id, topoService) {
     var data;
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) {

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "7.0.0-dev.4" === 'string' ? "7.0.0-dev.4" : null;
+var version = typeof "7.0.0-dev.6" === 'string' ? "7.0.0-dev.6" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/store/models/topoConfig.js

@@ -197,7 +197,7 @@ function _default(topoApp) {
                 switch (_context.prev = _context.next) {
                   case 0:
                     _context.next = 2;
-                    return _topo["default"].getConditions(topoApp.id);
+                    return topoApp.serverApi.getConditions(topoApp.id);
 
                   case 2:
                     data = _context.sent;
@@ -347,7 +347,7 @@ function _default(topoApp) {
                     }); // rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
 
                     _context4.next = 5;
-                    return _topo["default"].getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList);
+                    return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList);
 
                   case 5:
                     data = _context4.sent;
@@ -415,7 +415,7 @@ function _default(topoApp) {
                     _rlog["default"].debug('saveGlobalConfig', config);
 
                     _context5.next = 5;
-                    return _topo["default"].saveTopoSettings(topoApp.id, config);
+                    return topoApp.serverApi.saveTopoSettings(topoApp.id, config);
 
                   case 5:
                   case "end":
@@ -466,7 +466,7 @@ function _default(topoApp) {
                   case 0:
                     topoId = data.id, ciIdList = data.ciIdList;
                     _context7.next = 3;
-                    return _topo["default"].addToBlocklist(topoId, ciIdList);
+                    return topoApp.serverApi.addToBlocklist(topoId, ciIdList);
 
                   case 3:
                   case "end":

package/lib/core/store/models/topoMod.js

@@ -417,7 +417,7 @@ function _default(topoApp) {
 
                   case 29:
                     _context6.next = 31;
-                    return topoApp.options.loadData(topoId);
+                    return topoApp.options.loadData(topoId, topoApp.serverApi);
 
                   case 31:
                     result = _context6.sent;

package/lib/core/viewer/components/titlebar/BasicTools.js

@@ -15,37 +15,23 @@ var _EditButton = _interopRequireDefault(require("./widgets/EditButton"));
 
 var _NodesDragSwitchWrapper = _interopRequireDefault(require("./widgets/NodesDragSwitchWrapper"));
 
-var _AlarmListShowButton = _interopRequireDefault(require("./widgets/AlarmListShowButton"));
-
 var _SettingButtonWidget = _interopRequireDefault(require("./widgets/SettingButtonWidget"));
 
-var _useEventData = _interopRequireDefault(require("../../../hooks/useEventData"));
+var _AlarmButton = _interopRequireDefault(require("./widgets/AlarmButton"));
 
 function BasicTools(props) {
   var topo = props.topo,
       _props$showEditButton = props.showEditButton,
       showEditButton = _props$showEditButton === void 0 ? true : _props$showEditButton,
       children = props.children;
-
-  var _topo$store$useModel = topo.store.useModel("topoAlarm"),
-      alarmState = _topo$store$useModel[0],
-      alarmDispatchers = _topo$store$useModel[1];
-
-  var alarmPanelIsOpen = alarmState.alarmPanelIsOpen;
-  var alarmData = (0, _useEventData["default"])({
-    topo: topo
-  });
   return /*#__PURE__*/_react["default"].createElement(_box["default"], {
     direction: "row",
     spacing: 8
   }, showEditButton && /*#__PURE__*/_react["default"].createElement(_EditButton["default"], (0, _extends2["default"])({
     topo: topo
-  }, props)), /*#__PURE__*/_react["default"].createElement(_AlarmListShowButton["default"], (0, _extends2["default"])({
+  }, props)), /*#__PURE__*/_react["default"].createElement(_AlarmButton["default"], (0, _extends2["default"])({
     topo: topo
-  }, props, {
-    alarmPanelIsOpen: alarmPanelIsOpen,
-    alarmData: alarmData
-  })), /*#__PURE__*/_react["default"].createElement(_SettingButtonWidget["default"], props), /*#__PURE__*/_react["default"].createElement(_NodesDragSwitchWrapper["default"], (0, _extends2["default"])({
+  }, props)), /*#__PURE__*/_react["default"].createElement(_SettingButtonWidget["default"], props), /*#__PURE__*/_react["default"].createElement(_NodesDragSwitchWrapper["default"], (0, _extends2["default"])({
     topo: topo
   }, props)), children);
 }

package/lib/core/viewer/components/titlebar/widgets/AlarmButton.js

@@ -0,0 +1,36 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _AlarmListShowButton = _interopRequireDefault(require("./AlarmListShowButton"));
+
+var _useEventData = _interopRequireDefault(require("../../../../hooks/useEventData"));
+
+function AlarmButton(props) {
+  var topo = props.topo;
+
+  var _topo$store$useModel = topo.store.useModel("topoAlarm"),
+      alarmState = _topo$store$useModel[0],
+      alarmDispatchers = _topo$store$useModel[1];
+
+  var alarmPanelIsOpen = alarmState.alarmPanelIsOpen;
+  var alarmData = (0, _useEventData["default"])({
+    topo: topo
+  });
+  return /*#__PURE__*/_react["default"].createElement(_AlarmListShowButton["default"], (0, _extends2["default"])({
+    topo: topo
+  }, props, {
+    alarmPanelIsOpen: alarmPanelIsOpen,
+    alarmData: alarmData
+  }));
+}
+
+var _default = AlarmButton;
+exports["default"] = _default;

package/lib/networkTopo/getTopoData.js

@@ -13,8 +13,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
-
 var _linkUtils = require("../core/models/utils/linkUtils");
 
 var _services = require("../core/services");
@@ -144,19 +142,19 @@ function _buildData() {
   return _buildData.apply(this, arguments);
 }
 
-function getTopoData(_x4) {
+function getTopoData(_x4, _x5) {
   return _getTopoData.apply(this, arguments);
 }
 
 function _getTopoData() {
-  _getTopoData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id) {
+  _getTopoData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id, topoService) {
     var data;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
             _context3.next = 2;
-            return _topo["default"].getTopoData(id);
+            return topoService.getTopoData(id);
 
           case 2:
             data = _context3.sent;

package/package.json

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