@riil-frontend/component-topology 5.0.15 → 5.0.16

package/lib/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/hooks/useWebConsole.js

@@ -25,7 +25,7 @@ function queryWebConsoleUrlById(_x) {
 
 function _queryWebConsoleUrlById() {
   _queryWebConsoleUrlById = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(id) {
-    var _list$, list;
+    var _list, list;
 
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) {
@@ -37,29 +37,31 @@ function _queryWebConsoleUrlById() {
 
           case 3:
             list = _context2.sent;
-            return _context2.abrupt("return", (_list$ = list[0]) === null || _list$ === void 0 ? void 0 : _list$.webUrl);
+            ;
+            return _context2.abrupt("return", (_list = list[list.length - 1]) === null || _list === void 0 ? void 0 : _list.webUrl);
 
-          case 7:
-            _context2.prev = 7;
+          case 8:
+            _context2.prev = 8;
             _context2.t0 = _context2["catch"](0);
 
             _rlog["default"].error('资源web控制台.加载数据异常', _context2.t0);
 
-          case 10:
+          case 11:
             return _context2.abrupt("return", null);
 
-          case 11:
+          case 12:
           case "end":
             return _context2.stop();
         }
       }
-    }, _callee2, null, [[0, 7]]);
+    }, _callee2, null, [[0, 8]]);
   }));
   return _queryWebConsoleUrlById.apply(this, arguments);
 }
 
 function useWebConsole(props) {
   var ciId = props.ciId;
+  var ipv4Address = props.ipv4Address;
 
   var _useState = (0, _react.useState)(null),
       webConsoleUrl = _useState[0],
@@ -69,6 +71,12 @@ function useWebConsole(props) {
   var requestWebConsoleUrl = (0, _ahooks.useRequest)(queryWebConsoleUrlById, {
     manual: true,
     onSuccess: function onSuccess(result) {
+      if (ipv4Address != undefined) {
+        result = result === undefined ? "http://" + ipv4Address : result;
+      } else {
+        result = result === undefined ? null : result;
+      }
+
       setWebConsoleUrl(result);
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "5.0.15",
+  "version": "5.0.16",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -115,6 +115,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@5.0.15/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@5.0.16/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }