@riil-frontend/component-topology 11.0.30 → 11.0.31

package/lib/components/ResourceList/ResourceSelect.js

@@ -46,58 +46,60 @@ var getTableData = /*#__PURE__*/function () {
     var _params$current, current, _params$pageSize, pageSize, _params$sortBy, sortBy, _params$sortOrder, sortOrder, like, typeCode, condition, ciType, data, dataSource;
 
     return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _params$current = params.current, current = _params$current === void 0 ? 1 : _params$current, _params$pageSize = params.pageSize, pageSize = _params$pageSize === void 0 ? 20 : _params$pageSize, _params$sortBy = params.sortBy, sortBy = _params$sortBy === void 0 ? 'displayName' : _params$sortBy, _params$sortOrder = params.sortOrder, sortOrder = _params$sortOrder === void 0 ? 'asc' : _params$sortOrder, like = params.like, typeCode = params.typeCode;
-          condition = "type('" + _ResourceTypeLimit.RESOURCE_LIMIT_TYPES.join('\',\'') + "') && category('resource')";
-
-          if (like) {
-            condition = {
-              conditions: condition,
-              searchValue: like,
-              searchIndexArray: ['display_name', 'ipv4_address']
-            };
-          }
-
-          if (typeCode) {
-            ciType = typeCode.split(',');
-
-            if (typeof condition === 'string') {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _params$current = params.current, current = _params$current === void 0 ? 1 : _params$current, _params$pageSize = params.pageSize, pageSize = _params$pageSize === void 0 ? 20 : _params$pageSize, _params$sortBy = params.sortBy, sortBy = _params$sortBy === void 0 ? 'displayName' : _params$sortBy, _params$sortOrder = params.sortOrder, sortOrder = _params$sortOrder === void 0 ? 'asc' : _params$sortOrder, like = params.like, typeCode = params.typeCode;
+            condition = "type('" + _ResourceTypeLimit.RESOURCE_LIMIT_TYPES.join('\',\'') + "') && category('resource')";
+
+            if (like) {
               condition = {
                 conditions: condition,
-                ciType: ciType
+                searchValue: like,
+                searchIndexArray: ['display_name', 'ipv4_address']
               };
-            } else {
-              condition.ciType = ciType;
             }
-          }
-
-          _context.next = 6;
-          return (0, _cmdb.fetchCommonQuery)(condition, sortBy, sortOrder, current, pageSize, '', {
-            usingExtraConditions: false // 绕过权限过滤
-
-          });
-
-        case 6:
-          data = _context.sent;
-          dataSource = data.content && data.content.map(function (item) {
-            var _item$operation;
-
-            return {
-              id: item.id,
-              displayName: item.attributes.displayName || item.attributes.display_name,
-              ipAddress: item.attributes.ipAddress || item.attributes.ipv4_address,
-              company: item.attributes.company,
-              typeCode: item.typeCode,
-              operation: (_item$operation = item.operation) !== null && _item$operation !== void 0 ? _item$operation : null // 权限字段
-
-            };
-          });
-          return _context.abrupt("return", (0, _format.formatDataForTable)(dataSource, data.totalRecord, data.pageIndex, data.pageSize));
-
-        case 9:
-        case "end":
-          return _context.stop();
+
+            if (typeCode) {
+              ciType = typeCode.split(',');
+
+              if (typeof condition === 'string') {
+                condition = {
+                  conditions: condition,
+                  ciType: ciType
+                };
+              } else {
+                condition.ciType = ciType;
+              }
+            }
+
+            _context.next = 6;
+            return (0, _cmdb.fetchCommonQuery)(condition, sortBy, sortOrder, current, pageSize, '', {
+              usingExtraConditions: false // 绕过权限过滤
+
+            });
+
+          case 6:
+            data = _context.sent;
+            dataSource = data.content && data.content.map(function (item) {
+              var _item$operation;
+
+              return {
+                id: item.id,
+                displayName: item.attributes.displayName || item.attributes.display_name,
+                ipAddress: item.attributes.ipAddress || item.attributes.ipv4_address,
+                company: item.attributes.company,
+                typeCode: item.typeCode,
+                operation: (_item$operation = item.operation) !== null && _item$operation !== void 0 ? _item$operation : null // 权限字段
+
+              };
+            });
+            return _context.abrupt("return", (0, _format.formatDataForTable)(dataSource, data.totalRecord, data.pageIndex, data.pageSize));
+
+          case 9:
+          case "end":
+            return _context.stop();
+        }
       }
     }, _callee);
   }));

package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js

@@ -58,36 +58,38 @@ function ResourceSelectDrawer(props) {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var selected, shouldClose;
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            setLoading(true);
-            _context.prev = 1;
-            selected = resourceSelectRef.current.getSelectedRowKeys();
-            _context.next = 5;
-            return onOk(selectionMode === 'single' ? selected[0] : selected);
-
-          case 5:
-            shouldClose = _context.sent;
-
-            if (shouldClose !== false) {
-              onClose();
-            } else {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              setLoading(true);
+              _context.prev = 1;
+              selected = resourceSelectRef.current.getSelectedRowKeys();
+              _context.next = 5;
+              return onOk(selectionMode === 'single' ? selected[0] : selected);
+
+            case 5:
+              shouldClose = _context.sent;
+
+              if (shouldClose !== false) {
+                onClose();
+              } else {
+                setLoading(false);
+              }
+
+              _context.next = 13;
+              break;
+
+            case 9:
+              _context.prev = 9;
+              _context.t0 = _context["catch"](1);
               setLoading(false);
-            }
 
-            _context.next = 13;
-            break;
+              _rlog["default"].error('ResourceSelectDrawer.handleOk', _context.t0);
 
-          case 9:
-            _context.prev = 9;
-            _context.t0 = _context["catch"](1);
-            setLoading(false);
-
-            _rlog["default"].error('ResourceSelectDrawer.handleOk', _context.t0);
-
-          case 13:
-          case "end":
-            return _context.stop();
+            case 13:
+            case "end":
+              return _context.stop();
+          }
         }
       }, _callee, null, [[1, 9]]);
     }));

package/lib/components/SingleResourceDrawer/SelectDrawer.js

@@ -28,24 +28,26 @@ var SingleSelectDrawer = function SingleSelectDrawer(props) {
   var onDrawerSave = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(selected) {
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (selected.length) {
-              _context.next = 3;
-              break;
-            }
-
-            _message["default"].error('请选择一项资源。');
-
-            return _context.abrupt("return", false);
-
-          case 3:
-            _context.next = 5;
-            return onSave(selected[0]);
-
-          case 5:
-          case "end":
-            return _context.stop();
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (selected.length) {
+                _context.next = 3;
+                break;
+              }
+
+              _message["default"].error('请选择一项资源。');
+
+              return _context.abrupt("return", false);
+
+            case 3:
+              _context.next = 5;
+              return onSave(selected[0]);
+
+            case 5:
+            case "end":
+              return _context.stop();
+          }
         }
       }, _callee);
     }));

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

@@ -48,36 +48,38 @@ function DisplaySettingDrawer(props) {
   var handleOk = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            setLoading(true);
-            _context.prev = 1;
-            _context.next = 4;
-            return displaySetting.save();
-
-          case 4:
-            setLoading(false);
-            onClose();
-
-            if (!isEditor) {
-              _message["default"].success('保存成功');
-            }
-
-            _context.next = 14;
-            break;
-
-          case 9:
-            _context.prev = 9;
-            _context.t0 = _context["catch"](1);
-            setLoading(false);
-
-            _rlog["default"].error('DisplaySettingDrawer.handleOk', _context.t0);
-
-            _message["default"].warning('保存失败');
-
-          case 14:
-          case "end":
-            return _context.stop();
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              setLoading(true);
+              _context.prev = 1;
+              _context.next = 4;
+              return displaySetting.save();
+
+            case 4:
+              setLoading(false);
+              onClose();
+
+              if (!isEditor) {
+                _message["default"].success('保存成功');
+              }
+
+              _context.next = 14;
+              break;
+
+            case 9:
+              _context.prev = 9;
+              _context.t0 = _context["catch"](1);
+              setLoading(false);
+
+              _rlog["default"].error('DisplaySettingDrawer.handleOk', _context.t0);
+
+              _message["default"].warning('保存失败');
+
+            case 14:
+            case "end":
+              return _context.stop();
+          }
         }
       }, _callee, null, [[1, 9]]);
     }));

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

@@ -21,38 +21,40 @@ var _default = function _default(props) {
     var _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.serverApi.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.serverApi.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);
     }));
@@ -66,38 +68,40 @@ var _default = function _default(props) {
     var _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)
-            // 保存配置
+        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;
+              }
 
-            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;
-            }
+              return extraOnOk(displayConfig);
 
-            _context2.next = 12;
-            return extraOnOk(displayConfig);
+            case 12:
+              topo.historyManager.endTransaction();
 
-          case 12:
-            topo.historyManager.endTransaction();
-
-          case 13:
-          case "end":
-            return _context2.stop();
+            case 13:
+            case "end":
+              return _context2.stop();
+          }
         }
       }, _callee2);
     }));
@@ -110,27 +114,29 @@ var _default = function _default(props) {
   var save = /*#__PURE__*/function () {
     var _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;
+        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;
               break;
-            }
-
-            _context3.next = 3;
-            return handleViewerSave();
-
-          case 3:
-            _context3.next = 7;
-            break;
 
-          case 5:
-            _context3.next = 7;
-            return handleEditorSave();
+            case 5:
+              _context3.next = 7;
+              return handleEditorSave();
 
-          case 7:
-          case "end":
-            return _context3.stop();
+            case 7:
+            case "end":
+              return _context3.stop();
+          }
         }
       }, _callee3);
     }));

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

@@ -13,11 +13,9 @@ function TitleWidget(props) {
   var topo = props.topo;
   var store = topo.store;
   var topoState = store.useModelState('topoMod');
-
-  var _topoState$currentTop = topoState.currentTopo,
-      _topoState$currentTop2 = _topoState$currentTop === void 0 ? {} : _topoState$currentTop,
-      topoName = _topoState$currentTop2.name;
-
+  var _topoState$currentTop = topoState.currentTopo;
+  _topoState$currentTop = _topoState$currentTop === void 0 ? {} : _topoState$currentTop;
+  var topoName = _topoState$currentTop.name;
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _TitleBarModule["default"].title
   }, topoName);

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

@@ -161,26 +161,28 @@ 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);
     }));