@riil-frontend/component-topology 11.0.12 → 11.0.13

package/es/components/BatchAttrMetric2/setting.js

@@ -6,7 +6,7 @@ import _Message from "@alifd/next/es/message";
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 var _excluded = ["value", "defaultSet", "dataSource"];
-import React, { useState, useMemo } from 'react';
+import React, { useState, useMemo, useEffect } from 'react';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import ActionTree from '@riil-frontend/component-action-tree';
 import NoDataPage from '@riil-frontend/component-topology-common/es/components/NoDataPage';
@@ -28,15 +28,21 @@ var Setting = function Setting(_ref) {
   var allCiSet = useMemo(function () {
     var map = {};
     loopTreeNode(dataSource, function (item) {
-      map[item.id] = item;
+      if (item.type !== 'folder') {
+        map[item.id] = item;
+      }
     });
     return map;
   }, [dataSource]);
 
-  var _useState = useState(Object.keys(allCiSet)[0]),
+  var _useState = useState(utils.getDefaultSelectedCiType(dataSource)),
       ciType = _useState[0],
       setCiType = _useState[1];
 
+  useEffect(function () {
+    setCiType(utils.getDefaultSelectedCiType(dataSource));
+  }, [dataSource]);
+
   var _useState2 = useState(''),
       search = _useState2[0],
       setSearch = _useState2[1];
@@ -72,7 +78,7 @@ var Setting = function Setting(_ref) {
   var onTreeSelect = function onTreeSelect(_ref2) {
     var selectedKey = _ref2[0];
 
-    if (selectedKey && allCiSet[selectedKey].type !== 'folder') {
+    if (selectedKey && allCiSet[selectedKey] && allCiSet[selectedKey].type !== 'folder') {
       setCiType(selectedKey);
     }
   };
@@ -126,12 +132,23 @@ var Setting = function Setting(_ref) {
   }, /*#__PURE__*/React.createElement(_Grid.Col, {
     span: 8,
     className: styles['tree-wrap']
-  }, /*#__PURE__*/React.createElement(ActionTree, {
+  }, dataSource.length && /*#__PURE__*/React.createElement(ActionTree, {
     dataSource: dataSource,
     onSelect: onTreeSelect,
     draggable: false,
     treeProps: {
-      selectedKeys: [ciType]
+      selectedKeys: [ciType],
+      defaultExpandedKeys: dataSource.filter(function (item) {
+        return item.type === 'folder';
+      }).map(function (item) {
+        return item.id;
+      }),
+      expandedKeys: dataSource.filter(function (item) {
+        return item.type === 'folder';
+      }).map(function (item) {
+        return item.id;
+      }),
+      defaultExpandAll: true
     }
   })), /*#__PURE__*/React.createElement(_Grid.Col, {
     className: styles['table-wrap']

package/es/components/BatchAttrMetric2/utils.js

@@ -1,6 +1,7 @@
 import React from "react";
 import styles from "./index.module.scss";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
+import { loopTreeNode } from "../../utils/treeUtil";
 /**
  * 获取树结构数据源
  * @param {*} allCiSet 数据源
@@ -77,4 +78,21 @@ export var typeCell = function typeCell(text) {
   }
 
   return "-";
-};
+};
+/**
+ * 获得默认选中第一个模型
+ * @param {*} tree 
+ * @returns 
+ */
+
+export function getDefaultSelectedCiType(tree) {
+  var ciType = null;
+  loopTreeNode(tree, function (item) {
+    if (item.type !== 'folder') {
+      if (!ciType) {
+        ciType = item.id;
+      }
+    }
+  });
+  return ciType;
+}

package/es/core/components/ResourceViewAttributeSetting/nodeCiTypeAttrUtil.js

@@ -29,6 +29,7 @@ export function getNodeModels(topo) {
       return {
         id: ciTypeObj.code,
         label: ciTypeObj.displayName,
+        typeCode: ciTypeObj.typeCode,
         icon: "/img/model/" + ciTypeObj.icon + ".svg",
         list: buildModelFields(ciTypeObj, 'node')
       };
@@ -65,6 +66,15 @@ export function getNodeModels(topo) {
         name: '资源类型',
         type: 'custom'
       }]);
+
+      if (topo.isCMPTopo) {
+        custom.push.apply(custom, [{
+          id: 'p:source',
+          code: 'name',
+          name: '所属平台',
+          type: 'custom'
+        }]);
+      }
     }
 
     var attributes = ciTypeObj.attributes.filter(function (attr) {

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

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

@@ -150,7 +150,7 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
     var metrics = ciTypeModel.metrics.filter(function (m) {
       return _this2.mtMetricsMap[type] && !!_this2.mtMetricsMap[type][m.code];
     });
-    return _extends({}, this.topo.ciTyeCache.getCiType('network_link'), baseInfo, {
+    return _extends({}, ciTypeModel, baseInfo, {
       metrics: metrics,
       metricMap: keyBy(metrics, 'code')
     });
@@ -179,6 +179,7 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
     return {
       id: ciTypeObj.code,
       label: ciTypeObj.displayName,
+      typeCode: ciTypeObj.typeCode,
       icon: "/img/model/" + ciTypeObj.icon + ".svg",
       list: this.buildModelFields(ciTypeObj, type)
     };

package/lib/components/BatchAttrMetric2/setting.js

@@ -54,15 +54,21 @@ var Setting = function Setting(_ref) {
   var allCiSet = (0, _react.useMemo)(function () {
     var map = {};
     (0, _treeUtil.loopTreeNode)(dataSource, function (item) {
-      map[item.id] = item;
+      if (item.type !== 'folder') {
+        map[item.id] = item;
+      }
     });
     return map;
   }, [dataSource]);
 
-  var _useState = (0, _react.useState)(Object.keys(allCiSet)[0]),
+  var _useState = (0, _react.useState)(utils.getDefaultSelectedCiType(dataSource)),
       ciType = _useState[0],
       setCiType = _useState[1];
 
+  (0, _react.useEffect)(function () {
+    setCiType(utils.getDefaultSelectedCiType(dataSource));
+  }, [dataSource]);
+
   var _useState2 = (0, _react.useState)(''),
       search = _useState2[0],
       setSearch = _useState2[1];
@@ -98,7 +104,7 @@ var Setting = function Setting(_ref) {
   var onTreeSelect = function onTreeSelect(_ref2) {
     var selectedKey = _ref2[0];
 
-    if (selectedKey && allCiSet[selectedKey].type !== 'folder') {
+    if (selectedKey && allCiSet[selectedKey] && allCiSet[selectedKey].type !== 'folder') {
       setCiType(selectedKey);
     }
   };
@@ -153,12 +159,23 @@ var Setting = function Setting(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_grid["default"].Col, {
     span: 8,
     className: _indexModule["default"]['tree-wrap']
-  }, /*#__PURE__*/_react["default"].createElement(_componentActionTree["default"], {
+  }, dataSource.length && /*#__PURE__*/_react["default"].createElement(_componentActionTree["default"], {
     dataSource: dataSource,
     onSelect: onTreeSelect,
     draggable: false,
     treeProps: {
-      selectedKeys: [ciType]
+      selectedKeys: [ciType],
+      defaultExpandedKeys: dataSource.filter(function (item) {
+        return item.type === 'folder';
+      }).map(function (item) {
+        return item.id;
+      }),
+      expandedKeys: dataSource.filter(function (item) {
+        return item.type === 'folder';
+      }).map(function (item) {
+        return item.id;
+      }),
+      defaultExpandAll: true
     }
   })), /*#__PURE__*/_react["default"].createElement(_grid["default"].Col, {
     className: _indexModule["default"]['table-wrap']

package/lib/components/BatchAttrMetric2/utils.js

@@ -3,7 +3,9 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports.typeCell = exports.treeDs = exports.defaultSelected = void 0;
+exports.defaultSelected = void 0;
+exports.getDefaultSelectedCiType = getDefaultSelectedCiType;
+exports.typeCell = exports.treeDs = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -11,6 +13,8 @@ var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
+var _treeUtil = require("../../utils/treeUtil");
+
 /**
  * 获取树结构数据源
  * @param {*} allCiSet 数据源
@@ -93,5 +97,23 @@ var typeCell = function typeCell(text) {
 
   return "-";
 };
+/**
+ * 获得默认选中第一个模型
+ * @param {*} tree 
+ * @returns 
+ */
 
-exports.typeCell = typeCell;
+
+exports.typeCell = typeCell;
+
+function getDefaultSelectedCiType(tree) {
+  var ciType = null;
+  (0, _treeUtil.loopTreeNode)(tree, function (item) {
+    if (item.type !== 'folder') {
+      if (!ciType) {
+        ciType = item.id;
+      }
+    }
+  });
+  return ciType;
+}

package/lib/core/components/ResourceViewAttributeSetting/nodeCiTypeAttrUtil.js

@@ -35,6 +35,7 @@ function getNodeModels(topo) {
       return {
         id: ciTypeObj.code,
         label: ciTypeObj.displayName,
+        typeCode: ciTypeObj.typeCode,
         icon: "/img/model/" + ciTypeObj.icon + ".svg",
         list: buildModelFields(ciTypeObj, 'node')
       };
@@ -71,6 +72,15 @@ function getNodeModels(topo) {
         name: '资源类型',
         type: 'custom'
       }]);
+
+      if (topo.isCMPTopo) {
+        custom.push.apply(custom, [{
+          id: 'p:source',
+          code: 'name',
+          name: '所属平台',
+          type: 'custom'
+        }]);
+      }
     }
 
     var attributes = ciTypeObj.attributes.filter(function (attr) {

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

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

@@ -164,7 +164,7 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
     var metrics = ciTypeModel.metrics.filter(function (m) {
       return _this2.mtMetricsMap[type] && !!_this2.mtMetricsMap[type][m.code];
     });
-    return (0, _extends2["default"])({}, this.topo.ciTyeCache.getCiType('network_link'), baseInfo, {
+    return (0, _extends2["default"])({}, ciTypeModel, baseInfo, {
       metrics: metrics,
       metricMap: (0, _keyBy["default"])(metrics, 'code')
     });
@@ -193,6 +193,7 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
     return {
       id: ciTypeObj.code,
       label: ciTypeObj.displayName,
+      typeCode: ciTypeObj.typeCode,
       icon: "/img/model/" + ciTypeObj.icon + ".svg",
       list: this.buildModelFields(ciTypeObj, type)
     };

package/package.json

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