@riil-frontend/component-topology 10.0.58 → 10.0.59

package/lib/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js

@@ -14,139 +14,123 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 
 var _default = function _default(props) {
+  var _ref, _ref2, _ref3;
+
   var topo = props.topo,
       displaySettingProps = props.displaySettingProps,
       settingRef = props.settingRef,
       isEditor = props.isEditor;
 
-  var handleViewerSave = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+  var handleViewerSave = function handleViewerSave() {
+    return (_ref = _ref || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var values, prevDisplayConfig, displayConfig, displayConfigDispatchers, extraOnOk;
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              values = settingRef.current.getValues(); // console.info('保存显示配置', values)
-              // 保存配置
-
-              prevDisplayConfig = topo.store.getModelState('displayConfig');
-              displayConfig = (0, _extends2["default"])({}, prevDisplayConfig, values);
-              _context.next = 5;
-              return _topo["default"].saveTopoSettings(topo.id, {
-                alarmSwitch: displayConfig.alarmSwitch,
-                alarmListDefaultOpen: displayConfig.alarmListDefaultOpen,
-                extraConfig: JSON.stringify((0, _extends2["default"])({}, displayConfig))
-              });
-
-            case 5:
-              // 刷新指标配置
-              displayConfigDispatchers = topo.store.getModelDispatchers('displayConfig');
-              _context.next = 8;
-              return displayConfigDispatchers.update(displayConfig);
-
-            case 8:
-              // 更新节点名称显示隐藏
-              topo.attributeMetricDisplay.updateNodesNameVisible();
-              extraOnOk = (displaySettingProps === null || displaySettingProps === void 0 ? void 0 : displaySettingProps.onOk) || (displaySettingProps === null || displaySettingProps === void 0 ? void 0 : displaySettingProps.onDisplaySettingDrawerOk);
-
-              if (extraOnOk) {
-                extraOnOk(displayConfig);
-              }
-
-            case 11:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            values = settingRef.current.getValues(); // console.info('保存显示配置', values)
+            // 保存配置
+
+            prevDisplayConfig = topo.store.getModelState('displayConfig');
+            displayConfig = (0, _extends2["default"])({}, prevDisplayConfig, values);
+            _context.next = 5;
+            return _topo["default"].saveTopoSettings(topo.id, {
+              alarmSwitch: displayConfig.alarmSwitch,
+              alarmListDefaultOpen: displayConfig.alarmListDefaultOpen,
+              extraConfig: JSON.stringify((0, _extends2["default"])({}, displayConfig))
+            });
+
+          case 5:
+            // 刷新指标配置
+            displayConfigDispatchers = topo.store.getModelDispatchers('displayConfig');
+            _context.next = 8;
+            return displayConfigDispatchers.update(displayConfig);
+
+          case 8:
+            // 更新节点名称显示隐藏
+            topo.attributeMetricDisplay.updateNodesNameVisible();
+            extraOnOk = (displaySettingProps === null || displaySettingProps === void 0 ? void 0 : displaySettingProps.onOk) || (displaySettingProps === null || displaySettingProps === void 0 ? void 0 : displaySettingProps.onDisplaySettingDrawerOk);
+
+            if (extraOnOk) {
+              extraOnOk(displayConfig);
+            }
+
+          case 11:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
-    }));
-
-    return function handleViewerSave() {
-      return _ref.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
-  var handleEditorSave = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+  var handleEditorSave = function handleEditorSave() {
+    return (_ref2 = _ref2 || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
       var values, prevDisplayConfig, displayConfig, displayConfigDispatchers, extraOnOk;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              topo.historyManager.beginTransaction();
-              values = settingRef.current.getValues(); // console.info('保存显示配置', values)
-              // 保存配置
-
-              prevDisplayConfig = topo.store.getModelState('displayConfig');
-              displayConfig = (0, _extends2["default"])({}, prevDisplayConfig, values); // 刷新指标配置
-
-              displayConfigDispatchers = topo.store.getModelDispatchers('displayConfig');
-              _context2.next = 7;
-              return displayConfigDispatchers.update(displayConfig);
-
-            case 7:
-              // 更新节点名称显示隐藏
-              topo.attributeMetricDisplay.updateNodesNameVisible();
-              extraOnOk = displaySettingProps === null || displaySettingProps === void 0 ? void 0 : displaySettingProps.onOk;
-
-              if (!extraOnOk) {
-                _context2.next = 12;
-                break;
-              }
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            topo.historyManager.beginTransaction();
+            values = settingRef.current.getValues(); // console.info('保存显示配置', values)
+            // 保存配置
+
+            prevDisplayConfig = topo.store.getModelState('displayConfig');
+            displayConfig = (0, _extends2["default"])({}, prevDisplayConfig, values); // 刷新指标配置
 
+            displayConfigDispatchers = topo.store.getModelDispatchers('displayConfig');
+            _context2.next = 7;
+            return displayConfigDispatchers.update(displayConfig);
+
+          case 7:
+            // 更新节点名称显示隐藏
+            topo.attributeMetricDisplay.updateNodesNameVisible();
+            extraOnOk = displaySettingProps === null || displaySettingProps === void 0 ? void 0 : displaySettingProps.onOk;
+
+            if (!extraOnOk) {
               _context2.next = 12;
-              return extraOnOk(displayConfig);
+              break;
+            }
 
-            case 12:
-              topo.historyManager.endTransaction();
+            _context2.next = 12;
+            return extraOnOk(displayConfig);
 
-            case 13:
-            case "end":
-              return _context2.stop();
-          }
+          case 12:
+            topo.historyManager.endTransaction();
+
+          case 13:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
-    }));
-
-    return function handleEditorSave() {
-      return _ref2.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
-  var save = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+  var save = function save() {
+    return (_ref3 = _ref3 || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
       return _regenerator["default"].wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              if (isEditor) {
-                _context3.next = 5;
-                break;
-              }
-
-              _context3.next = 3;
-              return handleViewerSave();
-
-            case 3:
-              _context3.next = 7;
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            if (isEditor) {
+              _context3.next = 5;
               break;
+            }
+
+            _context3.next = 3;
+            return handleViewerSave();
 
-            case 5:
-              _context3.next = 7;
-              return handleEditorSave();
+          case 3:
+            _context3.next = 7;
+            break;
 
-            case 7:
-            case "end":
-              return _context3.stop();
-          }
+          case 5:
+            _context3.next = 7;
+            return handleEditorSave();
+
+          case 7:
+          case "end":
+            return _context3.stop();
         }
       }, _callee3);
-    }));
-
-    return function save() {
-      return _ref3.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
   return {
     save: save

package/lib/core/components/titlebar/widgets/TitleWidget.js

@@ -21,10 +21,11 @@ function TitleWidget(props) {
       topoState = _store$useModel[0],
       topoDispatchers = _store$useModel[1];
 
-  var _topoState$currentTop = topoState.currentTopo;
-  _topoState$currentTop = _topoState$currentTop === void 0 ? {} : _topoState$currentTop;
-  var topoId = _topoState$currentTop.id,
-      topoName = _topoState$currentTop.name;
+  var _topoState$currentTop = topoState.currentTopo,
+      _topoState$currentTop2 = _topoState$currentTop === void 0 ? {} : _topoState$currentTop,
+      topoId = _topoState$currentTop2.id,
+      topoName = _topoState$currentTop2.name;
+
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _TitleBarModule["default"].title
   }, topoName);

package/lib/core/editor/components/BackgroundView/UploadDialog/index.js

@@ -27,6 +27,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
+var _utils = require("@riil-frontend/utils");
+
 var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
 var config = _configProvider["default"].config;
@@ -161,28 +163,26 @@ var UploadIconDialog = /*#__PURE__*/function (_React$Component) {
     _this.handleSuccess = /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var onSuccess;
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              onSuccess = _this.props.onSuccess;
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            onSuccess = _this.props.onSuccess;
 
-              _message["default"].show({
-                type: 'success',
-                title: '背景图上传成功'
-              });
+            _message["default"].show({
+              type: 'success',
+              title: '背景图上传成功'
+            });
 
-              _this.setState({
-                uploading: false
-              });
+            _this.setState({
+              uploading: false
+            });
 
-              _this.resetState();
+            _this.resetState();
 
-              onSuccess();
+            onSuccess();
 
-            case 5:
-            case "end":
-              return _context.stop();
-          }
+          case 5:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));
@@ -238,7 +238,7 @@ var UploadIconDialog = /*#__PURE__*/function (_React$Component) {
       value: files,
       action: "/topo/v1/api/background/upload/" + this.props.type,
       headers: {
-        Authorization: localStorage.getItem('token')
+        Authorization: (0, _utils.getToken)()
       },
       accept: ".png",
       autoUpload: false,