@riil-frontend/component-topology 4.0.6 → 4.0.9

package/es/constants/ResourceTypeLimit.js

@@ -1,4 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
+import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 var excludeTypes = ['data_center', 'manage_assets', 'network_link', 'access_link']; // 过滤模型树
 
 export function filterModelTree(modelTree) {
@@ -21,17 +22,20 @@ export function getCiModels(modelTree) {
 } // 资源选择组件过滤类型
 
 export var filterCiTypes = function filterCiTypes(tree) {
-  return tree.filter(function (node) {
+  var resultTree = tree.filter(function (node) {
     return !excludeTypes.includes(node.value);
   }).map(function (node) {
     return _extends({}, node, {
       children: filterCiTypes(node.children || [])
     });
-  });
+  }); // rlog.debug('资源选择组件过滤类型', tree, resultTree)
+
+  return resultTree;
 };
 export var getNetworkTopoCommonResListProps = function getNetworkTopoCommonResListProps() {
   return {
-    innerTreeFilters: ['monitorable', 'discoverable'],
+    innerTreeFilters: ['monitorable'],
+    // innerTreeFilters: ['monitorable', 'discoverable'],
     filterCiRes: filterCiTypes
   };
 }; // 拓扑中心资源类型限制

package/es/core/editor/components/settings/propertyViews/group/DataTab/GroupNodeList.js

@@ -22,7 +22,11 @@ export default function GroupNodeList(props) {
     node.setParent(null);
     var viewRect = topo.getGraphView().getViewRect();
     var nodeRect = node.getRect();
-    node.setPosition(viewRect.x + nodeRect.width / 2 + 2, viewRect.y + nodeRect.height / 2 + 4);
+    node.setPosition(viewRect.x + nodeRect.width + 2, viewRect.y + nodeRect.height + 4); // 解决集群从区域内移出时，连线位置未更新的问题
+
+    setTimeout(function () {
+      node.iv();
+    }, 50);
   };
 
   return /*#__PURE__*/React.createElement(ResourceList, {

package/es/core/models/TopoApp.js

@@ -21,7 +21,7 @@ import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig"; // eslint-disable-next-line no-undef
 
-var version = typeof "4.0.6" === 'string' ? "4.0.6" : null;
+var version = typeof "4.0.9" === 'string' ? "4.0.9" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/services/index.js

@@ -17,7 +17,7 @@ function _queryCisByIds() {
             return commonQueryCiDataByIds(ids, {
               orders: [],
               pageIndex: 1,
-              pageSize: 1000
+              pageSize: 100000
             });
 
           case 2:

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

@@ -362,7 +362,7 @@ export default function ResourceOverview(props) {
                 alertStatusList: ['toDeal', 'woDealing', 'dealing'],
                 // toDeal: 待处理, dealing：处理中
                 pageNum: 1,
-                pageSize: 999,
+                pageSize: 10000,
                 sortField: 'alertLevel',
                 sortOrder: 'asc'
               });
@@ -396,7 +396,7 @@ export default function ResourceOverview(props) {
                 ciIdList: [id].concat(childrenIds),
                 statusList: ['toDeal', 'dealing'],
                 current: 1,
-                pageSize: 999
+                pageSize: 10000
               });
 
             case 17:

package/lib/constants/ResourceTypeLimit.js

@@ -10,6 +10,8 @@ exports.getNetworkTopoCommonResListProps = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
 var excludeTypes = ['data_center', 'manage_assets', 'network_link', 'access_link']; // 过滤模型树
 
 function filterModelTree(modelTree) {
@@ -34,20 +36,23 @@ function getCiModels(modelTree) {
 
 
 var filterCiTypes = function filterCiTypes(tree) {
-  return tree.filter(function (node) {
+  var resultTree = tree.filter(function (node) {
     return !excludeTypes.includes(node.value);
   }).map(function (node) {
     return (0, _extends2["default"])({}, node, {
       children: filterCiTypes(node.children || [])
     });
-  });
+  }); // rlog.debug('资源选择组件过滤类型', tree, resultTree)
+
+  return resultTree;
 };
 
 exports.filterCiTypes = filterCiTypes;
 
 var getNetworkTopoCommonResListProps = function getNetworkTopoCommonResListProps() {
   return {
-    innerTreeFilters: ['monitorable', 'discoverable'],
+    innerTreeFilters: ['monitorable'],
+    // innerTreeFilters: ['monitorable', 'discoverable'],
     filterCiRes: filterCiTypes
   };
 }; // 拓扑中心资源类型限制

package/lib/core/editor/components/settings/propertyViews/group/DataTab/GroupNodeList.js

@@ -32,7 +32,11 @@ function GroupNodeList(props) {
     node.setParent(null);
     var viewRect = topo.getGraphView().getViewRect();
     var nodeRect = node.getRect();
-    node.setPosition(viewRect.x + nodeRect.width / 2 + 2, viewRect.y + nodeRect.height / 2 + 4);
+    node.setPosition(viewRect.x + nodeRect.width + 2, viewRect.y + nodeRect.height + 4); // 解决集群从区域内移出时，连线位置未更新的问题
+
+    setTimeout(function () {
+      node.iv();
+    }, 50);
   };
 
   return /*#__PURE__*/_react["default"].createElement(_ResourceList["default"], {

package/lib/core/models/TopoApp.js

@@ -50,7 +50,7 @@ var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTagTipConfig"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "4.0.6" === 'string' ? "4.0.6" : null;
+var version = typeof "4.0.9" === 'string' ? "4.0.9" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/services/index.js

@@ -29,7 +29,7 @@ function _queryCisByIds() {
             return (0, _cmdb.commonQueryCiDataByIds)(ids, {
               orders: [],
               pageIndex: 1,
-              pageSize: 1000
+              pageSize: 100000
             });
 
           case 2:

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

@@ -394,7 +394,7 @@ function ResourceOverview(props) {
                 alertStatusList: ['toDeal', 'woDealing', 'dealing'],
                 // toDeal: 待处理, dealing：处理中
                 pageNum: 1,
-                pageSize: 999,
+                pageSize: 10000,
                 sortField: 'alertLevel',
                 sortOrder: 'asc'
               });
@@ -428,7 +428,7 @@ function ResourceOverview(props) {
                 ciIdList: [id].concat(childrenIds),
                 statusList: ['toDeal', 'dealing'],
                 current: 1,
-                pageSize: 999
+                pageSize: 10000
               });
 
             case 17:

package/package.json

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