@riil-frontend/component-topology 5.0.14 → 5.0.16

package/lib/core/models/utils/linkUtils.js

@@ -204,6 +204,7 @@ function _getLinksDetail() {
 function buildTopoLinkData() {}
 
 var compatibleWith = function compatibleWith(value) {
+  console.log("compatibleWith", value);
   var pluralType = value !== null && value !== void 0 ? value : 2;
 
   if (value === false) {
@@ -220,7 +221,7 @@ var compatibleWith = function compatibleWith(value) {
 exports.compatibleWith = compatibleWith;
 var plurals = {
   0: [],
-  1: [],
+  1: ["phy"],
   2: ["phy"],
   3: ["agg"],
   4: ["phy", "agg"]
@@ -253,12 +254,12 @@ var showLinkByConfig = function showLinkByConfig(props) {
       } else {
         var _d$attributes, _d$attributes2;
 
-        var d = topo.dataModel.getDataById(edge.getTag()); // console.log("edge", edge, d);
-        // 判断是否聚合链路
+        var d = topo.dataModel.getDataById(edge.getTag()); // 判断是否聚合链路
 
         if ((d === null || d === void 0 ? void 0 : (_d$attributes = d.attributes) === null || _d$attributes === void 0 ? void 0 : _d$attributes.destination_type) === "network.agg_interface" && (d === null || d === void 0 ? void 0 : (_d$attributes2 = d.attributes) === null || _d$attributes2 === void 0 ? void 0 : _d$attributes2.source_type) === "network.agg_interface") {
           edge.s("2d.visible", showAgg);
         } else {
+          // console.log("edge", edge, d, showAgg);
           edge.s("2d.visible", showPhy);
         }
       }

package/lib/core/utils/edgeUtil.js

@@ -38,13 +38,13 @@ var updateEdgeExpanded = function updateEdgeExpanded(topo) {
 
     _rlog["default"].debug("updateEdgeExpanded 折叠");
   } else {
+    htTopo.expandAllEdgeGroups();
     (0, _linkUtils.showLinkByConfig)({
       topo: topo,
       showType: isEditMode ? 4 : expandAllEdges
     });
-    htTopo.expandAllEdgeGroups();
 
-    _rlog["default"].debug("updateEdgeExpanded 展开");
+    _rlog["default"].debug("updateEdgeExpanded 展开-isEditMode", isEditMode);
   }
 
   if (topo.linkDynamicStyleExecutor) {

package/lib/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleContainer.js

@@ -7,13 +7,14 @@ exports["default"] = WebConsoleContainer;
 
 var _react = _interopRequireDefault(require("react"));
 
-// import WebConsoleForm from './WebConsoleForm/WebConsoleForm'
+var _WebConsoleForm = _interopRequireDefault(require("./WebConsoleForm/WebConsoleForm"));
+
 function WebConsoleContainer(props) {
   var _topo$viewProps, _topo$viewProps$viewe;
 
   var data = props.data,
       topo = props.topo;
-  var WebConsoleForm = (_topo$viewProps = topo.viewProps) === null || _topo$viewProps === void 0 ? void 0 : (_topo$viewProps$viewe = _topo$viewProps.viewerProps) === null || _topo$viewProps$viewe === void 0 ? void 0 : _topo$viewProps$viewe.WebConsoleForm;
+  var WebConsoleForm = ((_topo$viewProps = topo.viewProps) === null || _topo$viewProps === void 0 ? void 0 : (_topo$viewProps$viewe = _topo$viewProps.viewerProps) === null || _topo$viewProps$viewe === void 0 ? void 0 : _topo$viewProps$viewe.WebConsoleForm) || _WebConsoleForm["default"];
 
   if (!WebConsoleForm) {
     return null;

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

@@ -5,19 +5,122 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = WebConsoleForm;
 
-var _react = _interopRequireDefault(require("react"));
+var _loading = _interopRequireDefault(require("@alifd/next/lib/loading"));
+
+var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
+
+var _input = _interopRequireDefault(require("@alifd/next/lib/input"));
+
+var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
+
+var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
+
+var _react = _interopRequireWildcard(require("react"));
 
 var _useWebConsole2 = _interopRequireDefault(require("./hooks/useWebConsole"));
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var FormItem = _form["default"].Item;
+
 function WebConsoleForm(props) {
   var ciId = props.ciId;
+  var ipv4Address = props.ciData.attributes.ipv4_address;
 
   var _useWebConsole = (0, _useWebConsole2["default"])({
-    ciId: ciId
+    ciId: ciId,
+    ipv4Address: ipv4Address
   }),
       queryDataLoading = _useWebConsole.queryDataLoading,
       webConsoleUrl = _useWebConsole.webConsoleUrl,
       save = _useWebConsole.save;
 
-  return /*#__PURE__*/_react["default"].createElement("div", null, "WebConsoleForm", webConsoleUrl);
+  var _useState = (0, _react.useState)(true),
+      isEdit = _useState[0],
+      handleInput = _useState[1];
+
+  var _useState2 = (0, _react.useState)(false),
+      isSave = _useState2[0],
+      handleSaveBtn = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(false),
+      isShow = _useState3[0],
+      handleEdit = _useState3[1];
+
+  var field = _field["default"].useField({
+    autoUnmount: true,
+    values: {},
+    onChange: function onChange(name, value) {
+      field.getValue('url').length > 0 ? handleSaveBtn(false) : handleSaveBtn(true);
+    }
+  });
+
+  (0, _react.useEffect)(function () {
+    field.setValue('url', webConsoleUrl);
+  }, [webConsoleUrl]);
+  (0, _react.useEffect)(function () {
+    field.getError('url') == null ? handleSaveBtn(false) : handleSaveBtn(true);
+  }, [field.getError('url')]);
+
+  function handleEditLink() {
+    handleInput(false);
+    handleEdit(true);
+  }
+
+  function saveData() {
+    save(field.getValue('url'));
+    handleEdit(function (isShow) {
+      return !isShow;
+    });
+    handleInput(function (isEdit) {
+      return !isEdit;
+    });
+  }
+
+  return /*#__PURE__*/_react["default"].createElement(_loading["default"], {
+    visible: queryDataLoading
+  }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_form["default"], {
+    field: field,
+    labelAlign: "top"
+  }, /*#__PURE__*/_react["default"].createElement(FormItem, {
+    style: {
+      'paddingTop': '12px'
+    },
+    label: "\u94FE\u63A5",
+    maxLength: 1000,
+    minmaxLengthMessage: "\u94FE\u63A5\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC71000\u4E2A\u5B57\u7B26",
+    minmaxLengthTrigger: "onBlur",
+    format: "url",
+    formatMessage: "\u94FE\u63A5\u4E0D\u662F\u5408\u6CD5\u7684URL\u5730\u5740",
+    formatTrigger: "onBlur"
+  }, /*#__PURE__*/_react["default"].createElement(_input["default"], {
+    style: {
+      width: '358px',
+      height: '60px',
+      'bordeRadius': '4px'
+    },
+    name: "url",
+    placeholder: "\u8BF7\u8F93\u5165\u94FE\u63A5\u5730\u5740",
+    trim: true,
+    disabled: isEdit
+  })), /*#__PURE__*/_react["default"].createElement(FormItem, null, isShow ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_button["default"], {
+    type: "primary",
+    disabled: isSave,
+    onClick: saveData,
+    name: "baocun"
+  }, "\u4FDD\u5B58")) : /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_button["default"], {
+    component: "a",
+    type: "primary",
+    onClick: function onClick() {
+      window.open(field.getValue('url'));
+    }
+  }, "\u8BBF\u95EE"), /*#__PURE__*/_react["default"].createElement(_button["default"], {
+    type: "normal",
+    style: {
+      'marginLeft': '10px'
+    },
+    onClick: handleEditLink
+  }, "\u7F16\u8F91\u94FE\u63A5"))))));
 }

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/lib/networkTopo/components/TopoView.js

@@ -88,14 +88,18 @@ function NetworkTopologyCore(props) {
             switch (_context.prev = _context.next) {
               case 0:
                 // 单多链路切换
-                (0, _linkUtils.showLinkByConfig)({
-                  topo: topo,
-                  showType: config.expandAllEdges
-                });
-
+                // console.log("单多链路切换-config", config.expandAllEdges);
                 if (config.expandAllEdges !== 1) {
                   topo.getHtTopo().expandAllEdgeGroups();
+                  (0, _linkUtils.showLinkByConfig)({
+                    topo: topo,
+                    showType: config.expandAllEdges
+                  });
                 } else {
+                  (0, _linkUtils.showLinkByConfig)({
+                    topo: topo,
+                    showType: config.expandAllEdges
+                  });
                   topo.getHtTopo().collapseAllEdgeGroups();
                 } // 更新链路动态样式
 
@@ -104,7 +108,7 @@ function NetworkTopologyCore(props) {
                   topo.linkDynamicStyleExecutor.execute();
                 }
 
-              case 3:
+              case 2:
               case "end":
                 return _context.stop();
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "5.0.14",
+  "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.14/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@5.0.16/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }