@riil-frontend/component-topology 11.0.2 → 11.0.4

package/es/core/hooks/useTopoEdit.js

@@ -234,7 +234,8 @@ var useTopoEdit = function useTopoEdit(params) {
       content: "是否仅删除区域或将区域包含的内容一同删除？",
       //footer:()=>{return <><Button type="primary" onClick={doDeleteOnlyGroup}>仅删除区域</Button><Button type="primary" onClick={doDeleteOnlyGroup}>确定</Button></>},
       okProps: {
-        children: "仅删除区域"
+        children: "仅删除区域",
+        type: "normal"
       },
       cancelProps: {
         children: "全部删除"
@@ -289,27 +290,30 @@ var useTopoEdit = function useTopoEdit(params) {
     });
 
     function doDeleteOnlyGroup() {
-      // console.log("仅删除区域", topo.view.topoClient, data);
+      topo.historyManager.beginTransaction(); // console.log("仅删除区域", topo.view.topoClient, data);
+
       var children = getGroupChildren(group);
       children.map(function (child) {
-        child.setParent(null);
-        var viewRect = topo.getGraphView().getViewRect();
-        var nodeRect = child.getRect();
-        child.setPosition(viewRect.x + nodeRect.width + 2, viewRect.y + nodeRect.height + 4); // 解决集群从区域内移出时，连线位置未更新的问题
+        child.setParent(null); // var viewRect = topo.getGraphView().getViewRect();
+        // var nodeRect = child.getRect();
+        // child.setPosition(
+        //   viewRect.x + nodeRect.width + 2,
+        //   viewRect.y + nodeRect.height + 4
+        // ); // 解决集群从区域内移出时，连线位置未更新的问题
 
         setTimeout(function () {
           child.iv();
           topo.historyManager.endTransaction();
         }, 50);
       });
-      topo.view.topoClient.deleteGroup(data); // console.log("仅删除区域", children, group);
+      topo.view.topoClient.deleteGroup(data);
+      topo.historyManager.endTransaction(); // console.log("仅删除区域", children, group);
     }
 
     function doDelete() {
       topo.historyManager.beginTransaction(); // FIXME 。如果命中其他的动态条件，则立即显示
 
       topo.view.topoClient.deleteGroup(data);
-      topo.historyManager.endTransaction();
     }
   };
 

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

package/es/core/utils/showGraphManageStatusUtil.js

@@ -20,7 +20,8 @@ export 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; // ht元素设置是否显示监控状态，是否展示，用于缩小色块时显示未监控颜色

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

@@ -1,4 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
+var _excluded = ["canShow", "getCustomDetailContent"];
 import React from 'react';
 import Tab from "../../../../../components/FullheightTab";
 import ClusterMemberTable from "./components/ClusterMemberTable";
@@ -11,11 +13,18 @@ export default function ResourceDetail(props) {
   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 = _objectWithoutPropertiesLoose(props, _excluded);
+
   var tabBodys = [{
     title: '资源概览',
-    content: /*#__PURE__*/React.createElement(ResourceOverview, _extends({}, props, activeData, {
-      userId: userId
+    content: /*#__PURE__*/React.createElement(ResourceOverview, _extends({}, widgetProps, activeData, {
+      userId: userId,
+      resourceDetailProps: viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.resourceDetailProps
     }))
   }, {
     title: '集群成员',

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

@@ -17,7 +17,6 @@ import { rlog } from '@riil-frontend/component-topology-utils/lib/rlog'; // impo
 
 import Link from "../../../../../../../components/Link";
 import { queryCisByIds, commonQueryCiData } from "../../../../../../services";
-import alarmService from "../../../../../../services/alarm";
 import service from "../../../../../../services/overview";
 import BaseInfoBlock from "./BaseInfoBlock";
 import BlockBox from "./BlockBox";
@@ -44,21 +43,23 @@ function formatUrl(url) {
   }
 }
 /**
- * 资源概览
+ * 资源概览。
+ * 业务拓扑集成了，修改时请注意
  */
 
 
 export default 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;
 
@@ -432,8 +433,7 @@ export default 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/core/hooks/useTopoEdit.js

@@ -263,7 +263,8 @@ var useTopoEdit = function useTopoEdit(params) {
       content: "是否仅删除区域或将区域包含的内容一同删除？",
       //footer:()=>{return <><Button type="primary" onClick={doDeleteOnlyGroup}>仅删除区域</Button><Button type="primary" onClick={doDeleteOnlyGroup}>确定</Button></>},
       okProps: {
-        children: "仅删除区域"
+        children: "仅删除区域",
+        type: "normal"
       },
       cancelProps: {
         children: "全部删除"
@@ -318,27 +319,30 @@ var useTopoEdit = function useTopoEdit(params) {
     });
 
     function doDeleteOnlyGroup() {
-      // console.log("仅删除区域", topo.view.topoClient, data);
+      topo.historyManager.beginTransaction(); // console.log("仅删除区域", topo.view.topoClient, data);
+
       var children = (0, _htElementUtils.getGroupChildren)(group);
       children.map(function (child) {
-        child.setParent(null);
-        var viewRect = topo.getGraphView().getViewRect();
-        var nodeRect = child.getRect();
-        child.setPosition(viewRect.x + nodeRect.width + 2, viewRect.y + nodeRect.height + 4); // 解决集群从区域内移出时，连线位置未更新的问题
+        child.setParent(null); // var viewRect = topo.getGraphView().getViewRect();
+        // var nodeRect = child.getRect();
+        // child.setPosition(
+        //   viewRect.x + nodeRect.width + 2,
+        //   viewRect.y + nodeRect.height + 4
+        // ); // 解决集群从区域内移出时，连线位置未更新的问题
 
         setTimeout(function () {
           child.iv();
           topo.historyManager.endTransaction();
         }, 50);
       });
-      topo.view.topoClient.deleteGroup(data); // console.log("仅删除区域", children, group);
+      topo.view.topoClient.deleteGroup(data);
+      topo.historyManager.endTransaction(); // console.log("仅删除区域", children, group);
     }
 
     function doDelete() {
       topo.historyManager.beginTransaction(); // FIXME 。如果命中其他的动态条件，则立即显示
 
       topo.view.topoClient.deleteGroup(data);
-      topo.historyManager.endTransaction();
     }
   };
 

package/lib/core/models/TopoApp.js

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

package/lib/core/utils/showGraphManageStatusUtil.js

@@ -30,7 +30,8 @@ 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; // ht元素设置是否显示监控状态，是否展示，用于缩小色块时显示未监控颜色

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

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