@riil-frontend/component-topology 13.0.5 → 13.0.8

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

@@ -9,10 +9,6 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
-
-var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
-
 var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -311,8 +307,7 @@ function ResourceOverview(props) {
 
   function getAddressFormat(_x3) {
     return _getAddressFormat.apply(this, arguments);
-  } // 告警table列配置
-
+  }
 
   function _getAddressFormat() {
     _getAddressFormat = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(_ref2) {
@@ -358,102 +353,6 @@ function ResourceOverview(props) {
     return _getAddressFormat.apply(this, arguments);
   }
 
-  var columns = [{
-    title: '描述',
-    dataIndex: 'title',
-    key: 'title',
-    cell: function cell(value, index, record) {
-      return /*#__PURE__*/_react["default"].createElement("div", {
-        className: _indexModule["default"]['alarm-title'],
-        title: value,
-        onClick: onClose
-      }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
-        type: record.icon,
-        size: "xs",
-        className: _indexModule["default"]['alarm-color-icon'] + " " + record.className
-      }), /*#__PURE__*/_react["default"].createElement(_Link["default"], {
-        className: _indexModule["default"].link,
-        to: formatUrl(record.link)
-      }, value));
-    }
-  }, {
-    title: '时间',
-    dataIndex: 'time',
-    key: 'time',
-    width: 144,
-    cell: function cell(value, index, record) {
-      return /*#__PURE__*/_react["default"].createElement("div", {
-        title: (0, _moment["default"])(value).format('YYYY-MM-DD HH:mm:ss')
-      }, (0, _moment["default"])(value).format('YYYY-MM-DD HH:mm:ss'));
-    }
-  }, {
-    title: '操作',
-    dataIndex: 'status',
-    key: 'status',
-    width: 64,
-    cell: function cell(status, index, record) {
-      if (record.type === 'alarm') {
-        return status === 'toDeal' ? /*#__PURE__*/_react["default"].createElement(_button["default"], {
-          text: true,
-          type: "primary",
-          onClick: function onClick() {
-            return alarmRiskOperation(record.type, record.params);
-          }
-        }, "\u53D7\u7406") : /*#__PURE__*/_react["default"].createElement(_button["default"], {
-          disabled: true,
-          text: true,
-          type: "primary"
-        }, "\u5DF2\u53D7\u7406");
-      } else {
-        // return <Button text type="primary" onClick={() => alarmRiskOperation(record.type, record)}>受理</Button>
-        return '';
-      }
-    }
-  }]; // 告警/风险 操作 (受理)
-
-  function alarmRiskOperation(_x4, _x5) {
-    return _alarmRiskOperation.apply(this, arguments);
-  }
-
-  function _alarmRiskOperation() {
-    _alarmRiskOperation = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(type, params) {
-      var res;
-      return _regenerator["default"].wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
-          case 0:
-            if (!(type === 'alarm')) {
-              _context4.next = 6;
-              break;
-            }
-
-            _context4.next = 3;
-            return _overview["default"].handleAlarm(params);
-
-          case 3:
-            res = _context4.sent;
-
-            _message["default"].success('受理成功');
-
-            refreshAlarmData(id); // if (isAppTopo) {
-            //   const {
-            //     displayName: ciName,
-            //     attributeMap: modelAttributeMap,
-            //     domain,
-            //   } = topo.ciTyeCache.getCiType(ciType);
-            //   initAppTopo(monitorMetricModels, modelAttributeMap, ciName, domain);
-            // } else {
-            //   getAlarmRiskData(id);
-            // }
-
-          case 6:
-          case "end":
-            return _context4.stop();
-        }
-      }, _callee4);
-    }));
-    return _alarmRiskOperation.apply(this, arguments);
-  }
-
   var elementData = {
     id: id,
     ciType: ciType,
@@ -461,36 +360,36 @@ function ResourceOverview(props) {
     name: resourceData.name ? resourceData.name : resourceData.attributes.name
   }; // 基本信息设置改变
 
-  function baseInfoColChange(_x6) {
+  function baseInfoColChange(_x4) {
     return _baseInfoColChange.apply(this, arguments);
   } // 获取属性信息
 
 
   function _baseInfoColChange() {
-    _baseInfoColChange = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(col) {
+    _baseInfoColChange = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(col) {
       var _col;
 
       var infoData, attributeMap, _loop, _iterator, _step;
 
-      return _regenerator["default"].wrap(function _callee5$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regenerator["default"].wrap(function _callee4$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
             if ((_col = col) !== null && _col !== void 0 && _col.length) {
-              _context6.next = 3;
+              _context5.next = 3;
               break;
             }
 
             setBaseInfo([]);
-            return _context6.abrupt("return");
+            return _context5.abrupt("return");
 
           case 3:
             settBaseInfoInitLoading(true);
             infoData = [];
-            _context6.next = 7;
+            _context5.next = 7;
             return getAttribute(id);
 
           case 7:
-            attributeMap = _context6.sent;
+            attributeMap = _context5.sent;
             // console.log('getAttribute', attributeMap);
             col = col.filter(function (item) {
               return !item.hidden;
@@ -498,14 +397,14 @@ function ResourceOverview(props) {
             _loop = /*#__PURE__*/_regenerator["default"].mark(function _loop() {
               var item, value, contentTitle, link, address, owned_computer_room, owned_cabinet, roomLink, node, data, _ref3, _ref3$, _item, _attributeMap, object, _object2, displayName, attr;
 
-              return _regenerator["default"].wrap(function _loop$(_context5) {
-                while (1) switch (_context5.prev = _context5.next) {
+              return _regenerator["default"].wrap(function _loop$(_context4) {
+                while (1) switch (_context4.prev = _context4.next) {
                   case 0:
                     item = _step.value;
                     value = (0, _metricUtil.formatMetric)(attributeMap[item.dataIndex], ciTypeMeta.attributeMap[item.dataIndex]);
                     contentTitle = value;
-                    _context5.t0 = item.dataIndex;
-                    _context5.next = _context5.t0 === 'display_name' ? 6 : _context5.t0 === 'ciName' ? 9 : _context5.t0 === 'res_address' ? 12 : _context5.t0 === 'imageName' ? 19 : 23;
+                    _context4.t0 = item.dataIndex;
+                    _context4.next = _context4.t0 === 'display_name' ? 6 : _context4.t0 === 'ciName' ? 9 : _context4.t0 === 'res_address' ? 12 : _context4.t0 === 'imageName' ? 19 : 23;
                     break;
 
                   case 6:
@@ -526,19 +425,19 @@ function ResourceOverview(props) {
                     }
 
                     contentTitle = attributeMap.display_name || '-';
-                    return _context5.abrupt("break", 24);
+                    return _context4.abrupt("break", 24);
 
                   case 9:
                     value = ciTypeMeta.displayName;
                     contentTitle = value;
-                    return _context5.abrupt("break", 24);
+                    return _context4.abrupt("break", 24);
 
                   case 12:
-                    _context5.next = 14;
+                    _context4.next = 14;
                     return getAddressFormat(attributeMap);
 
                   case 14:
-                    address = _context5.sent;
+                    address = _context4.sent;
                     owned_computer_room = attributeMap.owned_computer_room, owned_cabinet = attributeMap.owned_cabinet; // 跳转3D机房定位设备
 
                     if (owned_computer_room && owned_cabinet) {
@@ -557,16 +456,16 @@ function ResourceOverview(props) {
                     }
 
                     contentTitle = address;
-                    return _context5.abrupt("break", 24);
+                    return _context4.abrupt("break", 24);
 
                   case 19:
                     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", 24);
+                    return _context4.abrupt("break", 24);
 
                   case 23:
-                    return _context5.abrupt("break", 24);
+                    return _context4.abrupt("break", 24);
 
                   case 24:
                     // 拿翻译字段属性数据
@@ -606,7 +505,7 @@ function ResourceOverview(props) {
 
                   case 33:
                   case "end":
-                    return _context5.stop();
+                    return _context4.stop();
                 }
               }, _loop);
             });
@@ -614,14 +513,14 @@ function ResourceOverview(props) {
 
           case 11:
             if ((_step = _iterator()).done) {
-              _context6.next = 15;
+              _context5.next = 15;
               break;
             }
 
-            return _context6.delegateYield(_loop(), "t0", 13);
+            return _context5.delegateYield(_loop(), "t0", 13);
 
           case 13:
-            _context6.next = 11;
+            _context5.next = 11;
             break;
 
           case 15:
@@ -630,56 +529,56 @@ function ResourceOverview(props) {
 
           case 17:
           case "end":
-            return _context6.stop();
+            return _context5.stop();
         }
-      }, _callee5);
+      }, _callee4);
     }));
     return _baseInfoColChange.apply(this, arguments);
   }
 
-  function getAttribute(_x7) {
+  function getAttribute(_x5) {
     return _getAttribute.apply(this, arguments);
   } // 指标设置改变
 
 
   function _getAttribute() {
-    _getAttribute = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(id) {
+    _getAttribute = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(id) {
       var _yield$resourceOvervi2, baseInfos, res, _ref4, attributes;
 
-      return _regenerator["default"].wrap(function _callee6$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+      return _regenerator["default"].wrap(function _callee5$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
             if (id) {
-              _context7.next = 2;
+              _context6.next = 2;
               break;
             }
 
-            return _context7.abrupt("return");
+            return _context6.abrupt("return");
 
           case 2:
             if (!(resourceOverviewProps !== null && resourceOverviewProps !== void 0 && resourceOverviewProps.getData)) {
-              _context7.next = 9;
+              _context6.next = 9;
               break;
             }
 
-            _context7.next = 5;
+            _context6.next = 5;
             return resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.getData({
               id: id
             });
 
           case 5:
-            _yield$resourceOvervi2 = _context7.sent;
+            _yield$resourceOvervi2 = _context6.sent;
             baseInfos = _yield$resourceOvervi2.baseInfos;
 
             if (!baseInfos) {
-              _context7.next = 9;
+              _context6.next = 9;
               break;
             }
 
-            return _context7.abrupt("return", baseInfos);
+            return _context6.abrupt("return", baseInfos);
 
           case 9:
-            _context7.next = 11;
+            _context6.next = 11;
             return _overview["default"].commonQueryCiData({
               condition: "id('" + id + "')",
               refAttribute: true,
@@ -692,31 +591,31 @@ function ResourceOverview(props) {
             });
 
           case 11:
-            res = _context7.sent;
+            res = _context6.sent;
             _ref4 = (res === null || res === void 0 ? void 0 : res.data[0]) || {}, attributes = _ref4.attributes;
-            return _context7.abrupt("return", attributes || {});
+            return _context6.abrupt("return", attributes || {});
 
           case 14:
           case "end":
-            return _context7.stop();
+            return _context6.stop();
         }
-      }, _callee6);
+      }, _callee5);
     }));
     return _getAttribute.apply(this, arguments);
   }
 
-  function metricColChange(_x8) {
+  function metricColChange(_x6) {
     return _metricColChange.apply(this, arguments);
   }
 
   function _metricColChange() {
-    _metricColChange = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(col) {
+    _metricColChange = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(col) {
       var _col2, _col3;
 
       var codes, endTime, params, _ref6, times, metricList, metricLists;
 
-      return _regenerator["default"].wrap(function _callee7$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+      return _regenerator["default"].wrap(function _callee6$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
             // console.log('metricColChange col', col);
             col = (_col2 = col) === null || _col2 === void 0 ? void 0 : _col2.filter(function (item) {
@@ -724,13 +623,13 @@ function ResourceOverview(props) {
             });
 
             if ((_col3 = col) !== null && _col3 !== void 0 && _col3.length) {
-              _context8.next = 4;
+              _context7.next = 4;
               break;
             }
 
             setMetric([]); // Message.error('指标未设置')
 
-            return _context8.abrupt("return");
+            return _context7.abrupt("return");
 
           case 4:
             codes = col.map(function (item) {
@@ -755,11 +654,11 @@ function ResourceOverview(props) {
             }
 
             setMetricInitLoading(true);
-            _context8.next = 11;
+            _context7.next = 11;
             return _overview["default"].getMetricList(params);
 
           case 11:
-            metricList = _context8.sent;
+            metricList = _context7.sent;
             metricLists = metricList.concat(getNewMetricList());
 
             _rlog.rlog.debug('metricColChange', metricLists, monitorMetricModels);
@@ -790,9 +689,9 @@ function ResourceOverview(props) {
 
           case 17:
           case "end":
-            return _context8.stop();
+            return _context7.stop();
         }
-      }, _callee7);
+      }, _callee6);
     }));
     return _metricColChange.apply(this, arguments);
   }

package/lib/networkTopo/hooks/viewer/useEdgeFlow.js

@@ -8,15 +8,15 @@ var _react = require("react");
 /**
  * 默认情况下，拓扑图不存在链路的动态效果
  * 未监控的链路，不展示动态效果
- * @param {*} props 
+ * @param {*} props
  */
 function useEdgeFlow(props) {
   var topo = props.topo;
-  var topoState = topo.store.useModelState('topoMod');
-  var displayConfig = topo.store.useModelState('displayConfig');
+  var topoState = topo.store.useModelState("topoMod");
+  var displayConfig = topo.store.useModelState("displayConfig");
   var graphLoaded = topoState.graphLoaded,
       viewState = topoState.viewState;
-  var isViewer = viewState !== 'edit';
+  var isViewer = viewState !== "edit";
   var edgeFlow = displayConfig.edgeFlow,
       edgeFlowDirection = displayConfig.edgeFlowDirection;
   var resources = topo.dataModel.useCis();
@@ -26,7 +26,7 @@ function useEdgeFlow(props) {
       var edgeFlowConfig = edgeFlow ? {
         type: edgeFlow,
         // 必填，支持传送带drip、光点point、箭头arrow
-        direction: !edgeFlowDirection || edgeFlowDirection === 'from' ? 'to' : 'from' // 流动方向，可为空. 默认上行目的到源
+        direction: !edgeFlowDirection || edgeFlowDirection === "from" ? "to" : "from" // 流动方向，可为空. 默认上行目的到源
 
       } : null;
       topo.getHtTopo().setGlobalEdgeFlow(edgeFlowConfig); // 未监控的链路，不展示动态效果
@@ -39,8 +39,12 @@ function useEdgeFlow(props) {
           var element = topo.getDataModel().getDataByTag(id);
           if (!element) return;
 
-          if (element instanceof ht.Edge && isNotMonite) {
-            element.s('flow', false);
+          if (element instanceof ht.Edge) {
+            var isBreak = element.a("linkbreak");
+
+            if (isNotMonite || isBreak) {
+              element.s("flow", false);
+            }
           }
         });
       }

package/lib/style.js

@@ -11,14 +11,14 @@ require('@alifd/next/lib/tab/style');
 require('@alifd/next/lib/table/style');
 require('@riil-frontend/component-table-layout/lib/style');
 require('@riil-frontend/component-pager/lib/style');
-require('@alifd/next/lib/button/style');
-require('@alifd/next/lib/icon/style');
 require('@alifd/next/lib/loading/style');
 require('@alifd/next/lib/divider/style');
 require('@riil-frontend/component-no-data-page/lib/style');
 
 require('@alifd/next/lib/overlay/style');
 require('@alifd/next/lib/checkbox/style');
+require('@alifd/next/lib/button/style');
+require('@alifd/next/lib/icon/style');
 require('@riil-frontend/component-crucial-link-topo/lib/style');
 require('@alifd/next/lib/switch/style');
 require('@alifd/next/lib/input/style');

package/package.json

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