@riil-frontend/component-topology 11.0.33 → 11.0.35

package/lib/core/hooks/usePolling.js

@@ -32,6 +32,8 @@ var _useHtDataPropertyChangeListener = _interopRequireDefault(require("./ht/useH
  * @param {*} props
  */
 var usePolling = function usePolling(props) {
+  var _fetchData, _refresh;
+
   var topo = props.topo;
   var store = topo.store;
   (0, _useCiAttributeChange["default"])({
@@ -50,166 +52,152 @@ var usePolling = function usePolling(props) {
    */
 
   function fetchData() {
-    return _fetchData.apply(this, arguments);
-  }
-  /**
-   * 
-   * @returns {{id, attributes: object[], metrics: object[]}[]} 属性和指标
-   */
-
-
-  function _fetchData() {
-    _fetchData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    return (_fetchData = _fetchData || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var _topo$store$getModelS, resIdsList, nodeIdsList, codes, param, _yield$Promise$all, ciMetricsResult, mergeData, transformLinkData, adapterIpv6;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              adapterIpv6 = function _adapterIpv(data) {
-                var ipv6 = data.attributeMap.ipv6_address;
-
-                if (!ipv6 && data.attributeMap.ipv6_address_list) {
-                  ipv6 = (data.attributeMap.ipv6_address_list || '').split(',')[0];
-                }
-
-                return (0, _extends2["default"])({}, data, {
-                  attributeMap: (0, _extends2["default"])({}, data.attributeMap, {
-                    ipv6_address: ipv6
-                  })
-                });
-              };
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            adapterIpv6 = function _adapterIpv(data) {
+              var ipv6 = data.attributeMap.ipv6_address;
 
-              transformLinkData = function _transformLinkData(data) {
-                var _topo$dataModel$getDa2 = topo.dataModel.getData(),
-                    links = _topo$dataModel$getDa2.links,
-                    linkGroups = _topo$dataModel$getDa2.linkGroups;
+              if (!ipv6 && data.attributeMap.ipv6_address_list) {
+                ipv6 = (data.attributeMap.ipv6_address_list || '').split(',')[0];
+              }
 
-                var link = [].concat(links, linkGroups).find(function (item) {
-                  return item.id === data.id;
-                });
+              return (0, _extends2["default"])({}, data, {
+                attributeMap: (0, _extends2["default"])({}, data.attributeMap, {
+                  ipv6_address: ipv6
+                })
+              });
+            };
 
-                if (!link) {
-                  return data;
-                }
+            transformLinkData = function _transformLinkData(data) {
+              var _topo$dataModel$getDa2 = topo.dataModel.getData(),
+                  links = _topo$dataModel$getDa2.links,
+                  linkGroups = _topo$dataModel$getDa2.linkGroups;
 
-                return (0, _extends2["default"])({}, data, {
-                  attributeMap: link.attributes || {}
-                });
-              };
-
-              mergeData = function _mergeData(ciMetricsResult) {
-                // 合并属性、指标
-                var _topo$dataModel$getDa = topo.dataModel.getData(),
-                    nodes = _topo$dataModel$getDa.nodes,
-                    links = _topo$dataModel$getDa.links;
-
-                return [].concat(nodes, links).filter(function (item) {
-                  return !!item.ciType;
-                }).map(function (ciData) {
-                  var resultData = (0, _extends2["default"])({}, ciData, {
-                    attributeMap: (0, _extends2["default"])({}, (ciData === null || ciData === void 0 ? void 0 : ciData.attributes) || {})
-                  });
-                  resultData = transformLinkData(resultData);
-                  resultData = adapterIpv6(resultData);
-                  return resultData;
-                }).map(function (ciData) {
-                  var ciMetricResult = ciMetricsResult.find(function (item) {
-                    return item.id === (ciData.ciId || ciData.id);
-                  });
-                  return (0, _extends2["default"])({}, ciData, {
-                    metrics: (ciMetricResult === null || ciMetricResult === void 0 ? void 0 : ciMetricResult.metrics) || {}
-                  });
-                });
-              };
+              var link = [].concat(links, linkGroups).find(function (item) {
+                return item.id === data.id;
+              });
 
-              _topo$store$getModelS = topo.store.getModelState('topoBizMod').resAndMetrics, resIdsList = _topo$store$getModelS.resIdsList, nodeIdsList = _topo$store$getModelS.nodeIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
-              // 无资源，不查询
-
-              if (resIdsList.length) {
-                _context.next = 6;
-                break;
+              if (!link) {
+                return data;
               }
 
-              return _context.abrupt("return", []);
-
-            case 6:
-              // 需要查询的指标列表
-              codes = topo.attributeMetricDisplay.getResourceMetricCodes();
-              param = {
-                ciId: nodeIdsList,
-                codes: codes,
-                // 过滤掉不需要查询的
-                relationId: topo.attributeMetricDisplay.getEdges().map(function (edge) {
-                  return {
-                    ciId: edge.id,
-                    operation: edge.operation
-                  };
-                })
-              };
-              _context.t0 = Promise;
-              _context.t1 = // 查询指标值
-              topo.serverApi.ciInfo.batchQueryCiInfo(param);
-              _context.next = 12;
-              return _DictCache["default"].init();
-
-            case 12:
-              _context.t2 = _context.sent;
-              _context.t3 = [_context.t1, _context.t2];
-              _context.next = 16;
-              return _context.t0.all.call(_context.t0, _context.t3);
-
-            case 16:
-              _yield$Promise$all = _context.sent;
-              ciMetricsResult = _yield$Promise$all[0];
-              return _context.abrupt("return", mergeData(ciMetricsResult));
-
-            case 19:
-            case "end":
-              return _context.stop();
-          }
+              return (0, _extends2["default"])({}, data, {
+                attributeMap: link.attributes || {}
+              });
+            };
+
+            mergeData = function _mergeData(ciMetricsResult) {
+              // 合并属性、指标
+              var _topo$dataModel$getDa = topo.dataModel.getData(),
+                  nodes = _topo$dataModel$getDa.nodes,
+                  links = _topo$dataModel$getDa.links;
+
+              return [].concat(nodes, links).filter(function (item) {
+                return !!item.ciType;
+              }).map(function (ciData) {
+                var resultData = (0, _extends2["default"])({}, ciData, {
+                  attributeMap: (0, _extends2["default"])({}, (ciData === null || ciData === void 0 ? void 0 : ciData.attributes) || {})
+                });
+                resultData = transformLinkData(resultData);
+                resultData = adapterIpv6(resultData);
+                return resultData;
+              }).map(function (ciData) {
+                var ciMetricResult = ciMetricsResult.find(function (item) {
+                  return item.id === (ciData.ciId || ciData.id);
+                });
+                return (0, _extends2["default"])({}, ciData, {
+                  metrics: (ciMetricResult === null || ciMetricResult === void 0 ? void 0 : ciMetricResult.metrics) || {}
+                });
+              });
+            };
+
+            _topo$store$getModelS = topo.store.getModelState('topoBizMod').resAndMetrics, resIdsList = _topo$store$getModelS.resIdsList, nodeIdsList = _topo$store$getModelS.nodeIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
+            // 无资源，不查询
+
+            if (resIdsList.length) {
+              _context.next = 6;
+              break;
+            }
+
+            return _context.abrupt("return", []);
+
+          case 6:
+            // 需要查询的指标列表
+            codes = topo.attributeMetricDisplay.getResourceMetricCodes();
+            param = {
+              ciId: nodeIdsList,
+              codes: codes,
+              // 过滤掉不需要查询的
+              relationId: topo.attributeMetricDisplay.getEdges().map(function (edge) {
+                return {
+                  ciId: edge.id,
+                  operation: edge.operation
+                };
+              })
+            };
+            _context.t0 = Promise;
+            _context.t1 = // 查询指标值
+            topo.serverApi.ciInfo.batchQueryCiInfo(param);
+            _context.next = 12;
+            return _DictCache["default"].init();
+
+          case 12:
+            _context.t2 = _context.sent;
+            _context.t3 = [_context.t1, _context.t2];
+            _context.next = 16;
+            return _context.t0.all.call(_context.t0, _context.t3);
+
+          case 16:
+            _yield$Promise$all = _context.sent;
+            ciMetricsResult = _yield$Promise$all[0];
+            return _context.abrupt("return", mergeData(ciMetricsResult));
+
+          case 19:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
-    }));
-    return _fetchData.apply(this, arguments);
+    }))).apply(this, arguments);
   }
-
-  function refresh() {
-    return _refresh.apply(this, arguments);
-  } // 轮询hooks
+  /**
+   * 
+   * @returns {{id, attributes: object[], metrics: object[]}[]} 属性和指标
+   */
 
 
-  function _refresh() {
-    _refresh = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+  function refresh() {
+    return (_refresh = _refresh || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
       var data;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              if (!(!pollingSwitch || !(resAndMetrics !== null && resAndMetrics !== void 0 && resAndMetrics.resIdsList.length))) {
-                _context2.next = 2;
-                break;
-              }
-
-              return _context2.abrupt("return");
-
-            case 2:
-              _context2.next = 4;
-              return fetchData();
-
-            case 4:
-              data = _context2.sent;
-              return _context2.abrupt("return", data);
-
-            case 6:
-            case "end":
-              return _context2.stop();
-          }
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (!(!pollingSwitch || !(resAndMetrics !== null && resAndMetrics !== void 0 && resAndMetrics.resIdsList.length))) {
+              _context2.next = 2;
+              break;
+            }
+
+            return _context2.abrupt("return");
+
+          case 2:
+            _context2.next = 4;
+            return fetchData();
+
+          case 4:
+            data = _context2.sent;
+            return _context2.abrupt("return", data);
+
+          case 6:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
-    }));
-    return _refresh.apply(this, arguments);
-  }
+    }))).apply(this, arguments);
+  } // 轮询hooks
+
 
   var _useRequest = (0, _ahooks.useRequest)(refresh, {
     pollingInterval: 60 * 1000,

package/lib/core/hooks/useResourceConfig.js

@@ -20,31 +20,27 @@ var _ResourceConfigUtil = _interopRequireDefault(require("../../utils/ResourceCo
 var _template = require("../../utils/template");
 
 function _default(props) {
+  var _ref, _ref2, _updateGroupResources, _addLayerStaticResources;
+
   var topo = props.topo;
   var store = topo.store;
   var editDispatchers = store.useModelDispatchers('topoConfig');
 
-  var loadConfig = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+  var loadConfig = function loadConfig() {
+    return (_ref = _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:
-              _context.next = 2;
-              return editDispatchers.getConditions();
-
-            case 2:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return editDispatchers.getConditions();
+
+          case 2:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
-    }));
-
-    return function loadConfig() {
-      return _ref.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
   /**
    * 获取拓扑资源配置
    * 
@@ -72,27 +68,21 @@ function _default(props) {
     return getConfig().groups;
   }
 
-  var updateConfig = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(config) {
+  var updateConfig = function updateConfig(_x) {
+    return (_ref2 = _ref2 || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(config) {
       return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return editDispatchers.update(config);
-
-            case 2:
-            case "end":
-              return _context2.stop();
-          }
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return editDispatchers.update(config);
+
+          case 2:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
-    }));
-
-    return function updateConfig(_x) {
-      return _ref2.apply(this, arguments);
-    };
-  }(); // 查找分组
+    }))).apply(this, arguments);
+  }; // 查找分组
 
 
   var getGroupById = function getGroupById(groupId) {
@@ -189,39 +179,32 @@ function _default(props) {
   function addGroupAt(group, index) {}
 
   function updateGroupResources(_x2, _x3) {
-    return _updateGroupResources.apply(this, arguments);
-  }
-
-  function _updateGroupResources() {
-    _updateGroupResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(groupData, resources) {
+    return (_updateGroupResources = _updateGroupResources || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(groupData, resources) {
       var config;
       return _regenerator["default"].wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              config = getConfig();
-              config.groups = config.groups.map(function (group) {
-                // 匹配到容器,
-                if (matchGroup(group, groupData)) {
-                  return (0, _extends2["default"])({}, group, {
-                    resources: resources
-                  });
-                } // 未匹配到容器
-
-
-                return group;
-              });
-              _context3.next = 4;
-              return updateConfig(config);
-
-            case 4:
-            case "end":
-              return _context3.stop();
-          }
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            config = getConfig();
+            config.groups = config.groups.map(function (group) {
+              // 匹配到容器,
+              if (matchGroup(group, groupData)) {
+                return (0, _extends2["default"])({}, group, {
+                  resources: resources
+                });
+              } // 未匹配到容器
+
+
+              return group;
+            });
+            _context3.next = 4;
+            return updateConfig(config);
+
+          case 4:
+          case "end":
+            return _context3.stop();
         }
       }, _callee3);
-    }));
-    return _updateGroupResources.apply(this, arguments);
+    }))).apply(this, arguments);
   }
 
   function matchGroup(group, data) {
@@ -229,7 +212,34 @@ function _default(props) {
   }
 
   function addLayerStaticResources(_x4, _x5) {
-    return _addLayerStaticResources.apply(this, arguments);
+    return (_addLayerStaticResources = _addLayerStaticResources || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(data, newResourceIds) {
+      var config;
+      return _regenerator["default"].wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            config = getConfig();
+            config.groups = config.groups.map(function (group) {
+              // 匹配到容器, 增加
+              if (matchGroup(group, data)) {
+                return (0, _extends2["default"])({}, group, {
+                  resources: (0, _extends2["default"])({}, group.resources, {
+                    "static": [].concat(group.resources["static"], newResourceIds)
+                  })
+                });
+              } // 未匹配到容器
+
+
+              return group;
+            });
+            _context4.next = 4;
+            return updateConfig(config);
+
+          case 4:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4);
+    }))).apply(this, arguments);
   }
   /**
    * 从拓扑图解析出拓扑资源配置
@@ -239,40 +249,6 @@ function _default(props) {
    */
 
 
-  function _addLayerStaticResources() {
-    _addLayerStaticResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(data, newResourceIds) {
-      var config;
-      return _regenerator["default"].wrap(function _callee4$(_context4) {
-        while (1) {
-          switch (_context4.prev = _context4.next) {
-            case 0:
-              config = getConfig();
-              config.groups = config.groups.map(function (group) {
-                // 匹配到容器, 增加
-                if (matchGroup(group, data)) {
-                  return (0, _extends2["default"])({}, group, {
-                    resources: (0, _extends2["default"])({}, group.resources, {
-                      "static": [].concat(group.resources["static"], newResourceIds)
-                    })
-                  });
-                } // 未匹配到容器
-
-
-                return group;
-              });
-              _context4.next = 4;
-              return updateConfig(config);
-
-            case 4:
-            case "end":
-              return _context4.stop();
-          }
-        }
-      }, _callee4);
-    }));
-    return _addLayerStaticResources.apply(this, arguments);
-  }
-
   function getConfigFromHt() {
     return _ResourceConfigUtil["default"].getResourceConfigFromHt(topo);
   }