@riil-frontend/component-topology 12.0.0-dev.40 → 12.0.0-dev.42

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

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

@@ -9,32 +9,65 @@ 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();
+    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/ResourceOverview.js

@@ -15,7 +15,6 @@ import moment from 'moment';
 import React, { useEffect, useMemo, useState } from 'react';
 import { rlog } from '@riil-frontend/component-topology-utils/lib/rlog';
 import Link from "../../../../../../../components/Link";
-import { getHistory } from '@riil-frontend/component-topology-utils';
 import { queryCisByIds, commonQueryCiData } from "../../../../../../services";
 import service from "../../../../../../services/overview";
 import BaseInfoBlock from "./BaseInfoBlock";
@@ -154,13 +153,7 @@ export default function ResourceOverview(props) {
         window.topo_overview_metric_timer = null;
       }
     };
-  }, []);
-
-  var jumpTo = function jumpTo(url) {
-    getHistory.push(url);
-    onClose();
-  }; // 跳转前调用关闭操作
-
+  }, []); // 跳转前调用关闭操作
 
   function onClose() {
     isAppTopo && resourceOverviewProps.onClose && resourceOverviewProps.onClose();
@@ -339,13 +332,14 @@ export default function ResourceOverview(props) {
       return /*#__PURE__*/React.createElement("div", {
         className: styles['alarm-title'],
         title: value,
-        onClick: jumpTo(record.link)
+        onClick: onClose
       }, /*#__PURE__*/React.createElement(_Icon, {
         type: record.icon,
         size: "xs",
         className: styles['alarm-color-icon'] + " " + record.className
-      }), /*#__PURE__*/React.createElement("span", {
-        className: styles.link
+      }), /*#__PURE__*/React.createElement(Link, {
+        className: styles.link,
+        to: formatUrl(record.link)
       }, value));
     }
   }, {

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

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

@@ -27,31 +27,65 @@ 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();
+    (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/ResourceOverview.js

@@ -25,8 +25,6 @@ var _rlog = require("@riil-frontend/component-topology-utils/lib/rlog");
 
 var _Link = _interopRequireDefault(require("../../../../../../../components/Link"));
 
-var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
-
 var _services = require("../../../../../../services");
 
 var _overview = _interopRequireDefault(require("../../../../../../services/overview"));
@@ -189,14 +187,7 @@ function ResourceOverview(props) {
         window.topo_overview_metric_timer = null;
       }
     };
-  }, []);
-
-  var jumpTo = function jumpTo(url) {
-    _componentTopologyUtils.getHistory.push(url);
-
-    onClose();
-  }; // 跳转前调用关闭操作
-
+  }, []); // 跳转前调用关闭操作
 
   function onClose() {
     isAppTopo && resourceOverviewProps.onClose && resourceOverviewProps.onClose();
@@ -375,13 +366,14 @@ function ResourceOverview(props) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: _indexModule["default"]['alarm-title'],
         title: value,
-        onClick: jumpTo(record.link)
+        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("span", {
-        className: _indexModule["default"].link
+      }), /*#__PURE__*/_react["default"].createElement(_Link["default"], {
+        className: _indexModule["default"].link,
+        to: formatUrl(record.link)
       }, value));
     }
   }, {

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/package.json

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