@riil-frontend/component-topology 9.0.0-a.2 → 9.0.0-a.4

package/es/core/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "9.0.0-a.2" === 'string' ? "9.0.0-a.2" : null;
+var version = typeof "9.0.0-a.4" === 'string' ? "9.0.0-a.4" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/store/models/viewer/resourceDetail.js

@@ -21,6 +21,13 @@ export default {
         visible: false,
         id: null // 资源id
 
+      };
+    },
+    close: function close() {
+      return {
+        visible: false,
+        id: null // 资源id
+
       };
     }
   },

package/es/core/viewer/components/plugins/ResourceDetail/ResourceDetailDrawer.js

@@ -76,9 +76,7 @@ function ResourceDetailDrawer(props) {
   }, []); // 解决切换拓扑图隐藏概览
 
   useEffect(function () {
-    resourceDetailDispatchers.update({
-      visible: false
-    }); // TODO 其他数据重置
+    close(); // TODO 其他数据重置
   }, [topoId]);
 
   function getUser() {
@@ -154,6 +152,12 @@ function ResourceDetailDrawer(props) {
     }
   }
 
+  function close() {
+    resourceDetailDispatchers.update({
+      visible: false
+    });
+  }
+
   function init(data, targetType) {
     // console.log('初始化基本信息', data, targetType);
     var id = data.id,
@@ -214,7 +218,8 @@ function ResourceDetailDrawer(props) {
       topo: topo,
       userId: userId,
       activeData: activeData,
-      resourceData: resourceData
+      resourceData: resourceData,
+      onClose: close
     }));
   };
 
@@ -228,11 +233,7 @@ function ResourceDetailDrawer(props) {
     })),
     width: 580,
     hasMask: false,
-    onClose: function onClose() {
-      return resourceDetailDispatchers.update({
-        visible: false
-      });
-    }
+    onClose: close
   }, visible && resourceData && renderContent()));
 }
 

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js

@@ -30,7 +30,7 @@ import Configurator from "./components/Configurator";
 import { formatMetric } from "../../../../../../models/attributeFormatter";
 import LinkTopoCard from "./components/LinkTopo/LinkTopoCard";
 import EventsCard from "./EventsCard";
-import { queryLastestValue } from "./components/LinkTopo/services"; // url 处理，UICBB 的地址需截取前缀
+import { checkMenu, isOpenFlow, queryLastestValue } from "./components/LinkTopo/services"; // url 处理，UICBB 的地址需截取前缀
 
 function formatUrl(url) {
   var _window, _window$location;
@@ -285,26 +285,26 @@ export default function ResourceOverview(props) {
 
 
   function _getAddressFormat() {
-    _getAddressFormat = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref2) {
+    _getAddressFormat = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(_ref2) {
       var owned_computer_room, owned_cabinet, start_u_location, end_u_location, address, _res$find, _res$find$attributes, _res$find2, _res$find2$attributes, res, u;
 
-      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
               owned_computer_room = _ref2.owned_computer_room, owned_cabinet = _ref2.owned_cabinet, start_u_location = _ref2.start_u_location, end_u_location = _ref2.end_u_location;
               address = '';
 
               if (!(owned_computer_room && owned_cabinet)) {
-                _context3.next = 7;
+                _context4.next = 7;
                 break;
               }
 
-              _context3.next = 5;
+              _context4.next = 5;
               return queryCisByIds([owned_computer_room, owned_cabinet]);
 
             case 5:
-              res = _context3.sent;
+              res = _context4.sent;
               address = (((_res$find = res.find(function (item) {
                 return item.id === owned_computer_room;
               })) === null || _res$find === void 0 ? void 0 : (_res$find$attributes = _res$find.attributes) === null || _res$find$attributes === void 0 ? void 0 : _res$find$attributes.display_name) || '') + " " + (((_res$find2 = res.find(function (item) {
@@ -318,14 +318,14 @@ export default function ResourceOverview(props) {
                 u = (start_u_location || '') + "-" + (end_u_location || '');
               }
 
-              return _context3.abrupt("return", address || u ? "" + (address || '') + (u ? " " + u : '') : '');
+              return _context4.abrupt("return", address || u ? "" + (address || '') + (u ? " " + u : '') : '');
 
             case 10:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
         }
-      }, _callee3);
+      }, _callee4);
     }));
     return _getAddressFormat.apply(this, arguments);
   }
@@ -388,22 +388,22 @@ export default function ResourceOverview(props) {
   }
 
   function _alarmRiskOperation() {
-    _alarmRiskOperation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(type, params) {
+    _alarmRiskOperation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(type, params) {
       var res;
-      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) {
-          switch (_context4.prev = _context4.next) {
+          switch (_context5.prev = _context5.next) {
             case 0:
               if (!(type === 'alarm')) {
-                _context4.next = 6;
+                _context5.next = 6;
                 break;
               }
 
-              _context4.next = 3;
+              _context5.next = 3;
               return service.handleAlarm(params);
 
             case 3:
-              res = _context4.sent;
+              res = _context5.sent;
 
               _Message.success('受理成功');
 
@@ -420,10 +420,10 @@ export default function ResourceOverview(props) {
 
             case 6:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
         }
-      }, _callee4);
+      }, _callee5);
     }));
     return _alarmRiskOperation.apply(this, arguments);
   }
@@ -442,31 +442,31 @@ export default function ResourceOverview(props) {
 
 
   function _baseInfoColChange() {
-    _baseInfoColChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(col) {
+    _baseInfoColChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(col) {
       var _col;
 
-      var infoData, attributeMap, _iterator, _step, item, value, contentTitle, _data, _ref3, _ref3$, _item, _attributeMap, object, _object, displayName, attr;
+      var infoData, attributeMap, _iterator, _step, item, value, contentTitle, _data, _ref4, _ref4$, _item, _attributeMap, object, _object, displayName, attr;
 
-      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) {
-          switch (_context6.prev = _context6.next) {
+          switch (_context7.prev = _context7.next) {
             case 0:
               if ((_col = col) !== null && _col !== void 0 && _col.length) {
-                _context6.next = 3;
+                _context7.next = 3;
                 break;
               }
 
               setBaseInfo([]);
-              return _context6.abrupt("return");
+              return _context7.abrupt("return");
 
             case 3:
               settBaseInfoInitLoading(true);
               infoData = [];
-              _context6.next = 7;
+              _context7.next = 7;
               return getAttribute(id);
 
             case 7:
-              attributeMap = _context6.sent;
+              attributeMap = _context7.sent;
               // console.log('getAttribute', attributeMap);
               col = col.filter(function (item) {
                 return !item.hidden;
@@ -475,21 +475,21 @@ export default function ResourceOverview(props) {
 
             case 10:
               if ((_step = _iterator()).done) {
-                _context6.next = 26;
+                _context7.next = 26;
                 break;
               }
 
               item = _step.value;
               value = formatMetric(attributeMap[item.dataIndex], ciTypeMeta.attributeMap[item.dataIndex]);
               contentTitle = value;
-              return _context6.delegateYield( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+              return _context7.delegateYield( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
                 var link, address, owned_computer_room, owned_cabinet, roomLink, node;
-                return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+                return _regeneratorRuntime.wrap(function _callee6$(_context6) {
                   while (1) {
-                    switch (_context5.prev = _context5.next) {
+                    switch (_context6.prev = _context6.next) {
                       case 0:
-                        _context5.t0 = item.dataIndex;
-                        _context5.next = _context5.t0 === 'display_name' ? 3 : _context5.t0 === 'ciName' ? 6 : _context5.t0 === 'res_address' ? 9 : _context5.t0 === 'imageName' ? 16 : 20;
+                        _context6.t0 = item.dataIndex;
+                        _context6.next = _context6.t0 === 'display_name' ? 3 : _context6.t0 === 'ciName' ? 6 : _context6.t0 === 'res_address' ? 9 : _context6.t0 === 'imageName' ? 16 : 20;
                         break;
 
                       case 3:
@@ -510,19 +510,19 @@ export default function ResourceOverview(props) {
                         }
 
                         contentTitle = attributeMap.display_name || '-';
-                        return _context5.abrupt("break", 21);
+                        return _context6.abrupt("break", 21);
 
                       case 6:
                         value = ciTypeMeta.displayName;
                         contentTitle = value;
-                        return _context5.abrupt("break", 21);
+                        return _context6.abrupt("break", 21);
 
                       case 9:
-                        _context5.next = 11;
+                        _context6.next = 11;
                         return getAddressFormat(attributeMap);
 
                       case 11:
-                        address = _context5.sent;
+                        address = _context6.sent;
                         owned_computer_room = attributeMap.owned_computer_room, owned_cabinet = attributeMap.owned_cabinet; // 跳转3D机房定位设备
 
                         if (owned_computer_room && owned_cabinet) {
@@ -541,23 +541,23 @@ export default function ResourceOverview(props) {
                         }
 
                         contentTitle = address;
-                        return _context5.abrupt("break", 21);
+                        return _context6.abrupt("break", 21);
 
                       case 16:
                         node = topo.getDataModel().getDataByTag(id);
                         value = (node === null || node === void 0 ? void 0 : node.a('customName')) || (node === null || node === void 0 ? void 0 : node.a('name')) || '-';
                         contentTitle = value;
-                        return _context5.abrupt("break", 21);
+                        return _context6.abrupt("break", 21);
 
                       case 20:
-                        return _context5.abrupt("break", 21);
+                        return _context6.abrupt("break", 21);
 
                       case 21:
                       case "end":
-                        return _context5.stop();
+                        return _context6.stop();
                     }
                   }
-                }, _callee5);
+                }, _callee6);
               })(), "t0", 15);
 
             case 15:
@@ -568,9 +568,9 @@ export default function ResourceOverview(props) {
               }
 
               _data = topo.attributeMetricDisplay.getData() || [];
-              _ref3 = [].concat(_data.filter(function (m) {
+              _ref4 = [].concat(_data.filter(function (m) {
                 return m.id === id;
-              })), _ref3$ = _ref3[0], _item = _ref3$ === void 0 ? {} : _ref3$;
+              })), _ref4$ = _ref4[0], _item = _ref4$ === void 0 ? {} : _ref4$;
               _attributeMap = _item.attributeMap || {};
               object = _attributeMap[item.dataIndex + "_object"] || {};
 
@@ -597,7 +597,7 @@ export default function ResourceOverview(props) {
               }));
 
             case 24:
-              _context6.next = 10;
+              _context7.next = 10;
               break;
 
             case 26:
@@ -606,10 +606,10 @@ export default function ResourceOverview(props) {
 
             case 28:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
         }
-      }, _callee6);
+      }, _callee7);
     }));
     return _baseInfoColChange.apply(this, arguments);
   }
@@ -620,44 +620,44 @@ export default function ResourceOverview(props) {
 
 
   function _getAttribute() {
-    _getAttribute = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(id) {
-      var _yield$resourceOvervi, baseInfos, res, _ref4, attributes;
+    _getAttribute = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(id) {
+      var _yield$resourceOvervi, baseInfos, res, _ref5, attributes;
 
-      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
         while (1) {
-          switch (_context7.prev = _context7.next) {
+          switch (_context8.prev = _context8.next) {
             case 0:
               if (id) {
-                _context7.next = 2;
+                _context8.next = 2;
                 break;
               }
 
-              return _context7.abrupt("return");
+              return _context8.abrupt("return");
 
             case 2:
               if (!(resourceOverviewProps !== null && resourceOverviewProps !== void 0 && resourceOverviewProps.getData)) {
-                _context7.next = 9;
+                _context8.next = 9;
                 break;
               }
 
-              _context7.next = 5;
+              _context8.next = 5;
               return resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.getData({
                 id: id
               });
 
             case 5:
-              _yield$resourceOvervi = _context7.sent;
+              _yield$resourceOvervi = _context8.sent;
               baseInfos = _yield$resourceOvervi.baseInfos;
 
               if (!baseInfos) {
-                _context7.next = 9;
+                _context8.next = 9;
                 break;
               }
 
-              return _context7.abrupt("return", baseInfos);
+              return _context8.abrupt("return", baseInfos);
 
             case 9:
-              _context7.next = 11;
+              _context8.next = 11;
               return service.commonQueryCiData({
                 condition: "id('" + id + "')",
                 refAttribute: true,
@@ -670,16 +670,16 @@ export default function ResourceOverview(props) {
               });
 
             case 11:
-              res = _context7.sent;
-              _ref4 = (res === null || res === void 0 ? void 0 : res.data[0]) || {}, attributes = _ref4.attributes;
-              return _context7.abrupt("return", attributes || {});
+              res = _context8.sent;
+              _ref5 = (res === null || res === void 0 ? void 0 : res.data[0]) || {}, attributes = _ref5.attributes;
+              return _context8.abrupt("return", attributes || {});
 
             case 14:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
         }
-      }, _callee7);
+      }, _callee8);
     }));
     return _getAttribute.apply(this, arguments);
   }
@@ -689,14 +689,14 @@ export default function ResourceOverview(props) {
   }
 
   function _metricColChange() {
-    _metricColChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(col) {
+    _metricColChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(col) {
       var _col2, _col3;
 
-      var codes, endTime, params, _ref5, times, metricList, newMetricList, metricLists;
+      var codes, endTime, params, _ref6, times, metricList, newMetricList, metricLists;
 
-      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
         while (1) {
-          switch (_context8.prev = _context8.next) {
+          switch (_context9.prev = _context9.next) {
             case 0:
               // console.log('metricColChange col', col);
               col = (_col2 = col) === null || _col2 === void 0 ? void 0 : _col2.filter(function (item) {
@@ -704,13 +704,13 @@ export default function ResourceOverview(props) {
               });
 
               if ((_col3 = col) !== null && _col3 !== void 0 && _col3.length) {
-                _context8.next = 4;
+                _context9.next = 4;
                 break;
               }
 
               setMetric([]); // Message.error('指标未设置')
 
-              return _context8.abrupt("return");
+              return _context9.abrupt("return");
 
             case 4:
               codes = col.map(function (item) {
@@ -726,7 +726,7 @@ export default function ResourceOverview(props) {
               };
 
               if (isAppTopo) {
-                _ref5 = resourceOverviewProps.metricProps || {}, times = _ref5.times;
+                _ref6 = resourceOverviewProps.metricProps || {}, times = _ref6.times;
 
                 if (times !== null && times !== void 0 && times.length) {
                   params.startTime = times[0];
@@ -735,18 +735,16 @@ export default function ResourceOverview(props) {
               }
 
               setMetricInitLoading(true);
-              _context8.next = 11;
+              _context9.next = 11;
               return service.getMetricList(params);
 
             case 11:
-              metricList = _context8.sent;
-              _context8.next = 14;
-              return queryLastestValue({
+              metricList = _context9.sent;
+              newMetricList = queryMetricList({
+                'name': data.attributes.display_name
+              }, {
                 'id': data.attributes.name
               });
-
-            case 14:
-              newMetricList = _context8.sent;
               metricLists = metricList.concat(getNewMetricList(newMetricList));
               rlog.debug('metricColChange', metricLists, monitorMetricModels);
               setMetric(col.map(function (item, key) {
@@ -773,16 +771,75 @@ export default function ResourceOverview(props) {
                 }, 60000);
               }
 
-            case 20:
+            case 18:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
         }
-      }, _callee8);
+      }, _callee9);
     }));
     return _metricColChange.apply(this, arguments);
   }
 
+  var queryMetricList = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(data, param) {
+      var checkMenus, isOpen;
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              if (!(ciType !== 'network_link')) {
+                _context3.next = 2;
+                break;
+              }
+
+              return _context3.abrupt("return", []);
+
+            case 2:
+              _context3.next = 4;
+              return checkMenu();
+
+            case 4:
+              checkMenus = _context3.sent;
+
+              if (!(checkMenus[0].passed == 'PASS')) {
+                _context3.next = 13;
+                break;
+              }
+
+              _context3.next = 8;
+              return isOpenFlow(data);
+
+            case 8:
+              isOpen = _context3.sent;
+
+              if (!isOpen) {
+                _context3.next = 13;
+                break;
+              }
+
+              _context3.next = 12;
+              return queryLastestValue(param);
+
+            case 12:
+              return _context3.abrupt("return", _context3.sent);
+
+            case 13:
+              return _context3.abrupt("return", []);
+
+            case 14:
+            case "end":
+              return _context3.stop();
+          }
+        }
+      }, _callee3);
+    }));
+
+    return function queryMetricList(_x9, _x10) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+
   var getNewMetricList = function getNewMetricList(data) {
     return [{
       errorMsg: null,

package/lib/core/models/TopoApp.js

@@ -56,7 +56,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "9.0.0-a.2" === 'string' ? "9.0.0-a.2" : null;
+var version = typeof "9.0.0-a.4" === 'string' ? "9.0.0-a.4" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/store/models/viewer/resourceDetail.js

@@ -29,6 +29,13 @@ var _default = {
         visible: false,
         id: null // 资源id
 
+      };
+    },
+    close: function close() {
+      return {
+        visible: false,
+        id: null // 资源id
+
       };
     }
   },

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

@@ -98,9 +98,7 @@ function ResourceDetailDrawer(props) {
   }, []); // 解决切换拓扑图隐藏概览
 
   (0, _react.useEffect)(function () {
-    resourceDetailDispatchers.update({
-      visible: false
-    }); // TODO 其他数据重置
+    close(); // TODO 其他数据重置
   }, [topoId]);
 
   function getUser() {
@@ -176,6 +174,12 @@ function ResourceDetailDrawer(props) {
     }
   }
 
+  function close() {
+    resourceDetailDispatchers.update({
+      visible: false
+    });
+  }
+
   function init(data, targetType) {
     // console.log('初始化基本信息', data, targetType);
     var id = data.id,
@@ -236,7 +240,8 @@ function ResourceDetailDrawer(props) {
       topo: topo,
       userId: userId,
       activeData: activeData,
-      resourceData: resourceData
+      resourceData: resourceData,
+      onClose: close
     }));
   };
 
@@ -250,11 +255,7 @@ function ResourceDetailDrawer(props) {
     })),
     width: 580,
     hasMask: false,
-    onClose: function onClose() {
-      return resourceDetailDispatchers.update({
-        visible: false
-      });
-    }
+    onClose: close
   }, visible && resourceData && renderContent()));
 }