@riil-frontend/component-topology 11.0.1 → 11.0.3

package/lib/core/models/tagstips/ElementTagTipConfig.js

@@ -98,7 +98,7 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
   _proto.getLinkConfigItems = function getLinkConfigItems() {
     var mtCodes = (0, _utils.getLinkMtCodes)(this.topoData);
     var linkFidldMap = this.getLinkFidldMap();
-    return [{
+    var list = [{
       id: 'm.critical_link',
       label: '关键链路'
     }, {
@@ -113,6 +113,14 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
         list: linkFidldMap[t.id] || []
       });
     });
+    return list; // return [
+    //   { id: 'ax1', label: '本级平台', children: list, type: 'folder', disabled: true },
+    //   {
+    //     id: 'bb22', label: '下级平台', type: 'folder', children: [
+    //       { id: 'xvdafa', label: '关键链路', icon: '/img/model/networkLink.svg' },
+    //     ]
+    //   },
+    // ]
   };
 
   _proto.getFiedldMapByType = function getFiedldMapByType(mtCodes, type) {
@@ -140,16 +148,18 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
       map[mtCode] = [].concat(extItems, attributes.map(function (item) {
         return {
           type: 'attribute',
-          typeName: '属性',
+          id: "attribute:" + item.code,
+          code: "attribute:" + item.code,
           name: item.name,
-          code: "attribute:" + item.code
+          typeName: '属性'
         };
       }), metrics.map(function (item) {
         return {
           type: 'metric',
-          typeName: '指标',
+          id: "metric:" + item.code,
+          code: "metric:" + item.code,
           name: item.name,
-          code: "metric:" + item.code
+          typeName: '指标'
         };
       }));
     });

package/lib/core/utils/showGraphManageStatusUtil.js

@@ -30,15 +30,16 @@ function showManageStatus(options) {
           manageStatus = resource.manageStatus,
           permission = resource.permission;
       var isNotMonite = manageStatus === 0;
-      var readable = !!(permission !== null && permission !== void 0 && permission.readable);
+      var readable = !!(permission !== null && permission !== void 0 && permission.readable); // 没有告警且有查看权限，才显示未监控状态
+
       var showUnMoniteStatus = !hasAlarm(id) && isNotMonite && readable;
       var element = topo.getDataModel().getDataByTag(id);
-      if (!element) return;
+      if (!element) return; // ht元素设置是否显示监控状态，是否展示，用于缩小色块时显示未监控颜色
+
+      element.a('ci.isMonitoring', !showUnMoniteStatus);
 
       if (type === 'node') {
         try {
-          element.a('isMonitoring', showUnMoniteStatus); // 用于缩小色块时显示未监控颜色
-
           if (showUnMoniteStatus) {
             topo.getHtTopo().setNodeStyleIcon(element, {
               styleIcon: 'unMoniter',

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

@@ -7,6 +7,8 @@ exports["default"] = ResourceDetail;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _FullheightTab = _interopRequireDefault(require("../../../../../components/FullheightTab"));
@@ -19,17 +21,24 @@ var _WebConsoleContainer = _interopRequireDefault(require("./components/WebConso
 
 var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
+var _excluded = ["canShow", "getCustomDetailContent"];
+
 function ResourceDetail(props) {
   var _topo$viewProps, _topo$viewProps$topoC;
 
   var topo = props.topo,
       userId = props.userId,
       activeData = props.activeData,
-      resourceData = props.resourceData;
+      resourceData = props.resourceData,
+      viewerProps = props.viewerProps;
+  var canShow = props.canShow,
+      getCustomDetailContent = props.getCustomDetailContent,
+      widgetProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
   var tabBodys = [{
     title: '资源概览',
-    content: /*#__PURE__*/_react["default"].createElement(_ResourceOverview["default"], (0, _extends2["default"])({}, props, activeData, {
-      userId: userId
+    content: /*#__PURE__*/_react["default"].createElement(_ResourceOverview["default"], (0, _extends2["default"])({}, widgetProps, activeData, {
+      userId: userId,
+      resourceDetailProps: viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.resourceDetailProps
     }))
   }, {
     title: '集群成员',

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

@@ -27,8 +27,6 @@ var _Link = _interopRequireDefault(require("../../../../../../../components/Link
 
 var _services = require("../../../../../../services");
 
-var _alarm = _interopRequireDefault(require("../../../../../../services/alarm"));
-
 var _overview = _interopRequireDefault(require("../../../../../../services/overview"));
 
 var _BaseInfoBlock = _interopRequireDefault(require("./BaseInfoBlock"));
@@ -78,21 +76,23 @@ function formatUrl(url) {
   }
 }
 /**
- * 资源概览
+ * 资源概览。
+ * 业务拓扑集成了，修改时请注意
  */
 
 
 function ResourceOverview(props) {
-  var _viewerProps$resource, _data$attributes;
+  var _data$attributes;
 
   var topo = props.topo,
       id = props.id,
       type = props.type,
       ciType = props.ciType,
+      resourceData = props.resourceData,
       userId = props.userId,
-      viewerProps = props.viewerProps,
+      resourceDetailProps = props.resourceDetailProps,
       style = props.style;
-  var resourceOverviewProps = (viewerProps === null || viewerProps === void 0 ? void 0 : (_viewerProps$resource = viewerProps.resourceDetailProps) === null || _viewerProps$resource === void 0 ? void 0 : _viewerProps$resource.resourceOverviewProps) || {}; // 是否是业务拓扑
+  var resourceOverviewProps = (resourceDetailProps === null || resourceDetailProps === void 0 ? void 0 : resourceDetailProps.resourceOverviewProps) || {}; // 是否是业务拓扑
 
   var isAppTopo = !!resourceOverviewProps.getData;
 
@@ -466,8 +466,7 @@ function ResourceOverview(props) {
     id: id,
     ciType: ciType,
     type: type,
-    // name: '123'
-    name: props.name ? props.name : props.resourceData.attributes.name
+    name: resourceData.name ? resourceData.name : resourceData.attributes.name
   }; // 基本信息设置改变
 
   function baseInfoColChange(_x6) {

package/lib/utils/tree.js

@@ -10,6 +10,8 @@ exports.treeNodeCount = exports.loopTreeFun = exports.loopTreeByKey = exports.lo
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _treeUtil = require("./treeUtil");
+
 var iconImg = ['/img/topo/Tree_Icon_Folder1.svg', '/img/topo/Tree_Icon_Topology.svg'];
 /**
  * 递归数组生成树结构
@@ -149,22 +151,12 @@ var loopTreeByKey = function loopTreeByKey(data, key, value, callback) {
 
 
 exports.loopTreeByKey = loopTreeByKey;
-
-var loopTreeFun = function loopTreeFun(data, callback) {
-  data.forEach(function (item, index, arr) {
-    if (item !== null && item !== void 0 && item.children) {
-      loopTreeFun(item.children, callback);
-    }
-
-    callback(item, index, arr);
-  });
-};
+var loopTreeFun = _treeUtil.loopTreeNode;
 /**
  * 更新文件夹下拓扑数量（目前只支持两级文件夹计算）
  * @param {array} data
  */
 
-
 exports.loopTreeFun = loopTreeFun;
 
 var treeNodeCount = function treeNodeCount(data) {

package/lib/utils/treeUtil.js

@@ -0,0 +1,20 @@
+"use strict";
+
+exports.__esModule = true;
+exports.loopTreeNode = void 0;
+
+/**
+ * 单纯递归循环遍历树
+ * @param {array} data
+ */
+var loopTreeNode = function loopTreeNode(data, callback) {
+  data.forEach(function (item, index, arr) {
+    if (item !== null && item !== void 0 && item.children) {
+      loopTreeNode(item.children, callback);
+    }
+
+    callback(item, index, arr);
+  });
+};
+
+exports.loopTreeNode = loopTreeNode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "11.0.1",
+  "version": "11.0.3",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -92,6 +92,7 @@
     "enzyme-adapter-react-16": "^1.15.4",
     "eslint": "^6.0.1",
     "html2canvas": "^1.3.2",
+    "jest": "^29.6.2",
     "jspdf": "^2.3.1",
     "lnk-cli": "^1.0.1",
     "lodash": "^4.17.19",
@@ -117,6 +118,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@11.0.1/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@11.0.3/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }