@riil-frontend/component-topology 12.1.0-dev.8 → 12.1.0-dev.9

package/es/core/components/AlarmListPanel/components/AlarmListItem.js

@@ -32,8 +32,8 @@ function AlarmListItem(props) {
   // 传入参数
   var topo = props.topo,
       alarmInfo = props.alarmInfo,
-      onClick = props.onClick;
-  console.log("AlarmListPanel", topo, alarmInfo);
+      onClick = props.onClick; // console.log("AlarmListPanel", topo, alarmInfo);
+
   return /*#__PURE__*/React.createElement(_List.Item, {
     className: styles.AlarmListItem,
     media: /*#__PURE__*/React.createElement(_Icon, {

package/es/core/editor/components/Toolbar/widgets/Layout/index.js

@@ -7,7 +7,7 @@ import React, { useState, useMemo } from 'react';
 import LayoutSettings from "./components/LayoutSettings";
 import WidgetBox from "../WidgetBox";
 import DropdownButton from "../components/DropdownButton";
-import { isGroup, isLayer } from "../../../../../../utils/htElementDataUtil";
+import { isGroup, isLayer, isNode } from "../../../../../../utils/htElementDataUtil";
 
 function Layout(props) {
   var topo = props.topo,
@@ -147,7 +147,7 @@ function isLayoutEnabled(props) {
   } //中心节点布局,选中一个节点不是分层的情况下，按钮亮起
 
 
-  if (topoShowType !== 'layers' && selection.length === 1) {
+  if (topoShowType !== 'layers' && selection.length === 1 && (isNode(selection[0]) || isGroup(selection[0]))) {
     return true;
   }
 

package/es/core/models/Alarm.js

@@ -459,14 +459,14 @@ var Alarm = /*#__PURE__*/function () {
             console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
 
             if (!(isAvailableArray(alertData) && isAvailableArray(resIdsList))) {
-              _context8.next = 27;
+              _context8.next = 25;
               break;
             }
 
             sendAl = [];
             idsList = [].concat(nodeIdsList, linkIdsList);
-            operations = [];
-            console.log('idsList---------', idsList);
+            operations = []; // console.log('idsList---------', idsList)
+
             idsList.forEach(function (idItem) {
               if (idItem.operation === null) {
                 operations.push(idItem.ciId);
@@ -492,22 +492,21 @@ var Alarm = /*#__PURE__*/function () {
               if (resIdsList.indexOf(ciId) >= 0 && operations.indexOf(ciId) < 0) {
                 sendAl.push(obj);
               }
-            });
-            console.log("before-combAlarmData", sendAl, idsList);
+            }); // console.log("before-combAlarmData", sendAl, idsList);
 
             if (!(sendAl.length > 0)) {
-              _context8.next = 27;
+              _context8.next = 25;
               break;
             }
 
             rlog.debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
-            _context8.prev = 15;
-            _context8.next = 18;
+            _context8.prev = 13;
+            _context8.next = 16;
             return alarmDispatchers.combAlarmData({
               alarmdata: sendAl
             });
 
-          case 18:
+          case 16:
             _yield$alarmDispatche2 = _context8.sent;
             eqFlag = _yield$alarmDispatche2.eqFlag;
             alarmlist = _yield$alarmDispatche2.alarmlist;
@@ -528,19 +527,19 @@ var Alarm = /*#__PURE__*/function () {
               }
             }
 
-            _context8.next = 27;
+            _context8.next = 25;
             break;
 
-          case 24:
-            _context8.prev = 24;
-            _context8.t0 = _context8["catch"](15);
+          case 22:
+            _context8.prev = 22;
+            _context8.t0 = _context8["catch"](13);
             rlog.error('告警发送异常', _context8.t0);
 
-          case 27:
+          case 25:
           case "end":
             return _context8.stop();
         }
-      }, _callee8, this, [[15, 24]]);
+      }, _callee8, this, [[13, 22]]);
     }));
 
     function handleAlarmEvent(_x6) {

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 "12.1.0-dev.8" === 'string' ? "12.1.0-dev.8" : null;
+var version = typeof "12.1.0-dev.9" === 'string' ? "12.1.0-dev.9" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -9,32 +9,70 @@ import BlockBox from "./BlockBox";
 import Link from "../../../../../../../components/Link";
 import service from "../../../../../../services/overview";
 import styles from "./index.module.scss";
+import { getHistory } from '@riil-frontend/component-topology-utils';
 
 function formatUrl(url) {
-  return url;
+  var _window, _window$location;
+
+  console.log(url);
+  var prefix = '/default/pagecenter';
+
+  if (((_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname.indexOf(prefix)) === 0 && (url === null || url === void 0 ? void 0 : url.indexOf(prefix)) === 0) {
+    return url.split(prefix)[1];
+  } else {
+    return url;
+  }
 }
 
 function EventsCard(props) {
   var alarmRiskList = props.alarmRiskList,
       closeDetailDrawer = props.closeDetailDrawer,
-      onHandleAlarm = props.onHandleAlarm; // 告警table列配置
+      onHandleAlarm = props.onHandleAlarm;
+
+  var jumpTo = function jumpTo(url) {
+    closeDetailDrawer();
+
+    if (topo.viewProps.jumpto) {
+      topo.viewProps.jumpto(url);
+    } else {
+      getHistory().push(formatUrl(url));
+    }
+  }; // 告警table列配置
+
 
   var columns = [{
     title: "描述",
     dataIndex: "title",
     key: "title",
     cell: function cell(value, index, record) {
-      return /*#__PURE__*/React.createElement("div", {
-        className: styles["alarm-title"],
-        title: value,
-        onClick: closeDetailDrawer
-      }, /*#__PURE__*/React.createElement(_Icon, {
-        type: record.icon,
-        size: "xs",
-        className: styles["alarm-color-icon"] + " " + record.className
-      }), /*#__PURE__*/React.createElement(Link, {
-        to: formatUrl(record.link)
-      }, value));
+      return (
+        /*#__PURE__*/
+        // <div
+        //   className={styles["alarm-title"]}
+        //   title={value}
+        //   onClick={closeDetailDrawer}
+        // >
+        //   <Icon
+        //     type={record.icon}
+        //     size="xs"
+        //     className={`${styles["alarm-color-icon"]} ${record.className}`}
+        //   />
+        //   <Link to={formatUrl(record.link)}>{value}</Link>
+        // </div>
+        React.createElement("div", {
+          className: styles['alarm-title'],
+          title: value,
+          onClick: function onClick() {
+            jumpTo(record.link);
+          }
+        }, /*#__PURE__*/React.createElement(_Icon, {
+          type: record.icon,
+          size: "xs",
+          className: styles['alarm-color-icon'] + " " + record.className
+        }), /*#__PURE__*/React.createElement("span", {
+          className: styles.link
+        }, value))
+      );
     }
   }, {
     title: "时间",

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss

@@ -154,3 +154,11 @@
   background-color: transparent;
   border-color: transparent;
 }
+.link{
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: var(--color-link-1);
+  cursor: pointer;
+}

package/es/utils/topoData.js

@@ -190,7 +190,7 @@ function buildGlobal(_ref2) {
       // 是否可编辑----控制[编辑]按钮
       moveable: true,
       // 节点是否可移动
-      toggleGroupByDblClick: true
+      toggleGroupByDblClick: false
     }, (result === null || result === void 0 ? void 0 : (_result$global2 = result.global) === null || _result$global2 === void 0 ? void 0 : _result$global2.control) || {}, (result === null || result === void 0 ? void 0 : (_result$customGlobal = result.customGlobal) === null || _result$customGlobal === void 0 ? void 0 : _result$customGlobal.control) || {}),
     topoDisplayConfig: _extends({
       // alarmSwitch: (result.global || {}).alarmSwitch ?? true,

package/lib/core/components/AlarmListPanel/components/AlarmListItem.js

@@ -50,8 +50,8 @@ function AlarmListItem(props) {
   // 传入参数
   var topo = props.topo,
       alarmInfo = props.alarmInfo,
-      onClick = props.onClick;
-  console.log("AlarmListPanel", topo, alarmInfo);
+      onClick = props.onClick; // console.log("AlarmListPanel", topo, alarmInfo);
+
   return /*#__PURE__*/_react["default"].createElement(_list["default"].Item, {
     className: _indexModule["default"].AlarmListItem,
     media: /*#__PURE__*/_react["default"].createElement(_icon["default"], {

package/lib/core/editor/components/Toolbar/widgets/Layout/index.js

@@ -162,7 +162,7 @@ function isLayoutEnabled(props) {
   } //中心节点布局,选中一个节点不是分层的情况下，按钮亮起
 
 
-  if (topoShowType !== 'layers' && selection.length === 1) {
+  if (topoShowType !== 'layers' && selection.length === 1 && ((0, _htElementDataUtil.isNode)(selection[0]) || (0, _htElementDataUtil.isGroup)(selection[0]))) {
     return true;
   }
 

package/lib/core/models/Alarm.js

@@ -481,14 +481,14 @@ var Alarm = /*#__PURE__*/function () {
             console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
 
             if (!((0, _utils.isAvailableArray)(alertData) && (0, _utils.isAvailableArray)(resIdsList))) {
-              _context8.next = 27;
+              _context8.next = 25;
               break;
             }
 
             sendAl = [];
             idsList = [].concat(nodeIdsList, linkIdsList);
-            operations = [];
-            console.log('idsList---------', idsList);
+            operations = []; // console.log('idsList---------', idsList)
+
             idsList.forEach(function (idItem) {
               if (idItem.operation === null) {
                 operations.push(idItem.ciId);
@@ -514,23 +514,22 @@ var Alarm = /*#__PURE__*/function () {
               if (resIdsList.indexOf(ciId) >= 0 && operations.indexOf(ciId) < 0) {
                 sendAl.push(obj);
               }
-            });
-            console.log("before-combAlarmData", sendAl, idsList);
+            }); // console.log("before-combAlarmData", sendAl, idsList);
 
             if (!(sendAl.length > 0)) {
-              _context8.next = 27;
+              _context8.next = 25;
               break;
             }
 
             _componentTopologyUtils.rlog.debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
 
-            _context8.prev = 15;
-            _context8.next = 18;
+            _context8.prev = 13;
+            _context8.next = 16;
             return alarmDispatchers.combAlarmData({
               alarmdata: sendAl
             });
 
-          case 18:
+          case 16:
             _yield$alarmDispatche2 = _context8.sent;
             eqFlag = _yield$alarmDispatche2.eqFlag;
             alarmlist = _yield$alarmDispatche2.alarmlist;
@@ -551,20 +550,20 @@ var Alarm = /*#__PURE__*/function () {
               }
             }
 
-            _context8.next = 27;
+            _context8.next = 25;
             break;
 
-          case 24:
-            _context8.prev = 24;
-            _context8.t0 = _context8["catch"](15);
+          case 22:
+            _context8.prev = 22;
+            _context8.t0 = _context8["catch"](13);
 
             _componentTopologyUtils.rlog.error('告警发送异常', _context8.t0);
 
-          case 27:
+          case 25:
           case "end":
             return _context8.stop();
         }
-      }, _callee8, this, [[15, 24]]);
+      }, _callee8, this, [[13, 22]]);
     }));
 
     function handleAlarmEvent(_x6) {

package/lib/core/models/TopoApp.js

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

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

@@ -27,31 +27,70 @@ var _overview = _interopRequireDefault(require("../../../../../../services/overv
 
 var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
+
 function formatUrl(url) {
-  return url;
+  var _window, _window$location;
+
+  console.log(url);
+  var prefix = '/default/pagecenter';
+
+  if (((_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname.indexOf(prefix)) === 0 && (url === null || url === void 0 ? void 0 : url.indexOf(prefix)) === 0) {
+    return url.split(prefix)[1];
+  } else {
+    return url;
+  }
 }
 
 function EventsCard(props) {
   var alarmRiskList = props.alarmRiskList,
       closeDetailDrawer = props.closeDetailDrawer,
-      onHandleAlarm = props.onHandleAlarm; // 告警table列配置
+      onHandleAlarm = props.onHandleAlarm;
+
+  var jumpTo = function jumpTo(url) {
+    closeDetailDrawer();
+
+    if (topo.viewProps.jumpto) {
+      topo.viewProps.jumpto(url);
+    } else {
+      (0, _componentTopologyUtils.getHistory)().push(formatUrl(url));
+    }
+  }; // 告警table列配置
+
 
   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: closeDetailDrawer
-      }, /*#__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"], {
-        to: formatUrl(record.link)
-      }, value));
+      return (
+        /*#__PURE__*/
+        // <div
+        //   className={styles["alarm-title"]}
+        //   title={value}
+        //   onClick={closeDetailDrawer}
+        // >
+        //   <Icon
+        //     type={record.icon}
+        //     size="xs"
+        //     className={`${styles["alarm-color-icon"]} ${record.className}`}
+        //   />
+        //   <Link to={formatUrl(record.link)}>{value}</Link>
+        // </div>
+        _react["default"].createElement("div", {
+          className: _indexModule["default"]['alarm-title'],
+          title: value,
+          onClick: function onClick() {
+            jumpTo(record.link);
+          }
+        }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
+          type: record.icon,
+          size: "xs",
+          className: _indexModule["default"]['alarm-color-icon'] + " " + record.className
+        }), /*#__PURE__*/_react["default"].createElement("span", {
+          className: _indexModule["default"].link
+        }, value))
+      );
     }
   }, {
     title: "时间",

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss

@@ -154,3 +154,11 @@
   background-color: transparent;
   border-color: transparent;
 }
+.link{
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: var(--color-link-1);
+  cursor: pointer;
+}

package/lib/utils/topoData.js

@@ -231,7 +231,7 @@ function buildGlobal(_ref2) {
       // 是否可编辑----控制[编辑]按钮
       moveable: true,
       // 节点是否可移动
-      toggleGroupByDblClick: true
+      toggleGroupByDblClick: false
     }, (result === null || result === void 0 ? void 0 : (_result$global2 = result.global) === null || _result$global2 === void 0 ? void 0 : _result$global2.control) || {}, (result === null || result === void 0 ? void 0 : (_result$customGlobal = result.customGlobal) === null || _result$customGlobal === void 0 ? void 0 : _result$customGlobal.control) || {}),
     topoDisplayConfig: (0, _extends2["default"])({
       // alarmSwitch: (result.global || {}).alarmSwitch ?? true,

package/package.json

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