@riil-frontend/component-topology 11.0.34 → 12.0.0-dev.1

package/lib/core/utils/imageUtil.js

@@ -20,30 +20,28 @@ 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/metricUtil.js

@@ -16,10 +16,15 @@ var _DictCache = _interopRequireDefault(require("../models/cache/DictCache"));
  * @returns
  */
 function formatMetric(val, metricModel) {
+  if (val === undefined) {
+    return '-';
+  }
+
   if (metricModel) {
     var result = (0, _utils.metricValueFormat)({
       value: val,
       dataType: metricModel.dataType,
+      changeValue: metricModel.changeValue,
       dict: _DictCache["default"].getDictObject(),
       unit: metricModel.unit,
       code: metricModel.code

package/lib/core/utils/saveSerialize.js

@@ -22,18 +22,16 @@ 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,66 +118,64 @@ 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;
+        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
               }
-
-              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,
+            });
+
+          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
-              }), (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();
-          }
+              }
+            });
+
+          case 12:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));

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

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