@riil-frontend/component-topology 11.0.36 → 11.0.39

package/lib/core/utils/imageUtil.js

@@ -20,28 +20,30 @@ function getImageSize(_x) {
 function _getImageSize() {
   _getImageSize = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(url) {
     return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          return _context.abrupt("return", new Promise(function (resolve, reject) {
-            var img = new Image();
-
-            img.onload = function () {
-              resolve({
-                width: img.width,
-                height: img.height
-              });
-            };
-
-            img.onerror = function (e) {
-              reject(e);
-            };
-
-            img.src = url;
-          }));
-
-        case 1:
-        case "end":
-          return _context.stop();
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            return _context.abrupt("return", new Promise(function (resolve, reject) {
+              var img = new Image();
+
+              img.onload = function () {
+                resolve({
+                  width: img.width,
+                  height: img.height
+                });
+              };
+
+              img.onerror = function (e) {
+                reject(e);
+              };
+
+              img.src = url;
+            }));
+
+          case 1:
+          case "end":
+            return _context.stop();
+        }
       }
     }, _callee);
   }));

package/lib/core/utils/saveSerialize.js

@@ -22,16 +22,18 @@ function _saveSerialize() {
   _saveSerialize = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(topo) {
     var topoId, serialize;
     return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          topoId = topo.getId();
-          serialize = topo.getHtTopo().serialize();
-          _context.next = 4;
-          return topo.serverApi.saveSerializeData(topoId, serialize);
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            topoId = topo.getId();
+            serialize = topo.getHtTopo().serialize();
+            _context.next = 4;
+            return topo.serverApi.saveSerializeData(topoId, serialize);
 
-        case 4:
-        case "end":
-          return _context.stop();
+          case 4:
+          case "end":
+            return _context.stop();
+        }
       }
     }, _callee);
   }));

package/lib/core/viewer/components/plugins/ResourceDetail/components/ClusterMemberTable.js

@@ -118,64 +118,66 @@ function ClusterMemberTableContainer(props) {
       var _params$current, current, _params$pageSize, pageSize, _params$sortBy, sortBy, _params$sortOrder, sortOrder, _yield$Promise$all, ciDataResult, memberRoleMetrics, ciTypeMap;
 
       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; // 无成员时直接返回
-
-            if (childrenIds.length) {
-              _context.next = 3;
-              break;
-            }
-
-            return _context.abrupt("return", {
-              success: true,
-              data: {
-                dataSource: [],
-                total: 0,
-                current: 1,
-                pageSize: pageSize
-              }
-            });
-
-          case 3:
-            _context.next = 5;
-            return Promise.all([(0, _cmdb.commonQueryCiDataByIds)(childrenIds, {
-              pageIndex: current,
-              pageSize: pageSize
-            }), (0, _metric.queryLatestMetrics)(childrenIds, ['member_role'])]);
-
-          case 5:
-            _yield$Promise$all = _context.sent;
-            ciDataResult = _yield$Promise$all[0];
-            memberRoleMetrics = _yield$Promise$all[1];
-            _context.next = 10;
-            return topo.ciTyeCache.load(ciDataResult.data.map(function (item) {
-              return item.typeCode;
-            }));
-
-          case 10:
-            ciTypeMap = _context.sent;
-            return _context.abrupt("return", {
-              success: true,
-              data: {
-                dataSource: ciDataResult.data.map(function (ci) {
-                  var memberRoleMetric = memberRoleMetrics.find(function (item) {
-                    return item.mainCiId === ci.id;
-                  });
-                  return (0, _extends2["default"])({}, ci, {
-                    typeObject: ciTypeMap[ci.typeCode],
-                    memberRole: topo.dictCache.dictObject.member_role[memberRoleMetric === null || memberRoleMetric === void 0 ? void 0 : memberRoleMetric.metricValue]
-                  });
-                }),
-                total: ciDataResult.totalRecord,
-                current: ciDataResult.pageIndex,
-                pageSize: pageSize
+        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; // 无成员时直接返回
+
+              if (childrenIds.length) {
+                _context.next = 3;
+                break;
               }
-            });
 
-          case 12:
-          case "end":
-            return _context.stop();
+              return _context.abrupt("return", {
+                success: true,
+                data: {
+                  dataSource: [],
+                  total: 0,
+                  current: 1,
+                  pageSize: pageSize
+                }
+              });
+
+            case 3:
+              _context.next = 5;
+              return Promise.all([(0, _cmdb.commonQueryCiDataByIds)(childrenIds, {
+                pageIndex: current,
+                pageSize: pageSize
+              }), (0, _metric.queryLatestMetrics)(childrenIds, ['member_role'])]);
+
+            case 5:
+              _yield$Promise$all = _context.sent;
+              ciDataResult = _yield$Promise$all[0];
+              memberRoleMetrics = _yield$Promise$all[1];
+              _context.next = 10;
+              return topo.ciTyeCache.load(ciDataResult.data.map(function (item) {
+                return item.typeCode;
+              }));
+
+            case 10:
+              ciTypeMap = _context.sent;
+              return _context.abrupt("return", {
+                success: true,
+                data: {
+                  dataSource: ciDataResult.data.map(function (ci) {
+                    var memberRoleMetric = memberRoleMetrics.find(function (item) {
+                      return item.mainCiId === ci.id;
+                    });
+                    return (0, _extends2["default"])({}, ci, {
+                      typeObject: ciTypeMap[ci.typeCode],
+                      memberRole: topo.dictCache.dictObject.member_role[memberRoleMetric === null || memberRoleMetric === void 0 ? void 0 : memberRoleMetric.metricValue]
+                    });
+                  }),
+                  total: ciDataResult.totalRecord,
+                  current: ciDataResult.pageIndex,
+                  pageSize: pageSize
+                }
+              });
+
+            case 12:
+            case "end":
+              return _context.stop();
+          }
         }
       }, _callee);
     }));

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js

@@ -37,32 +37,31 @@ function EventsCard(props) {
       onHandleAlarm = props.onHandleAlarm; // 告警table列配置
 
   var columns = [{
-    title: '描述',
-    dataIndex: 'title',
-    key: 'title',
+    title: "描述",
+    dataIndex: "title",
+    key: "title",
     cell: function cell(value, index, record) {
       return /*#__PURE__*/_react["default"].createElement("div", {
-        className: _indexModule["default"]['alarm-title'],
+        className: _indexModule["default"]["alarm-title"],
         title: value,
         onClick: closeDetailDrawer
       }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
         type: record.icon,
         size: "xs",
-        className: _indexModule["default"]['alarm-color-icon'] + " " + record.className
-      }), /*#__PURE__*/_react["default"].createElement("a", {
-        className: _indexModule["default"].link,
-        href: formatUrl(record.link)
+        className: _indexModule["default"]["alarm-color-icon"] + " " + record.className
+      }), /*#__PURE__*/_react["default"].createElement(_Link["default"], {
+        to: formatUrl(record.link)
       }, value));
     }
   }, {
-    title: '时间',
-    dataIndex: 'time',
-    key: 'time',
+    title: "时间",
+    dataIndex: "time",
+    key: "time",
     width: 144,
     cell: function cell(value, index, record) {
       return /*#__PURE__*/_react["default"].createElement("div", {
-        title: (0, _moment["default"])(value).format('YYYY-MM-DD HH:mm:ss')
-      }, (0, _moment["default"])(value).format('YYYY-MM-DD HH:mm:ss'));
+        title: (0, _moment["default"])(value).format("YYYY-MM-DD HH:mm:ss")
+      }, (0, _moment["default"])(value).format("YYYY-MM-DD HH:mm:ss"));
     }
   } // 临时屏蔽告警操作列，后续版本按权限显示 2023-3-6 20:23:45
   // {
@@ -101,26 +100,28 @@ function EventsCard(props) {
     _alarmRiskOperation = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(type, params) {
       var res;
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (!(type === 'alarm')) {
-              _context.next = 6;
-              break;
-            }
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!(type === 'alarm')) {
+                _context.next = 6;
+                break;
+              }
 
-            _context.next = 3;
-            return _overview["default"].handleAlarm(params);
+              _context.next = 3;
+              return _overview["default"].handleAlarm(params);
 
-          case 3:
-            res = _context.sent;
+            case 3:
+              res = _context.sent;
 
-            _message["default"].success('受理成功');
+              _message["default"].success('受理成功');
 
-            onHandleAlarm();
+              onHandleAlarm();
 
-          case 6:
-          case "end":
-            return _context.stop();
+            case 6:
+            case "end":
+              return _context.stop();
+          }
         }
       }, _callee);
     }));