@riil-frontend/component-topology 10.0.20 → 10.0.22

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

@@ -29,24 +29,24 @@ function ResourceDetailDrawer(props) {
   var _topo$store$useModelS = topo.store.useModelState('topoMod'),
       topoId = _topo$store$useModelS.topoId;
 
-  var elementDetailManager = (0, _useElementDetailManager["default"])({
+  var detailManager = (0, _useElementDetailManager["default"])({
     topo: topo,
     canShow: canShow,
     resourceDetailProps: viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.resourceDetailProps
   });
-  var visible = elementDetailManager.visible,
-      id = elementDetailManager.id,
-      resourceData = elementDetailManager.resourceData,
-      Content = elementDetailManager.Content;
+  var visible = detailManager.visible,
+      id = detailManager.id,
+      resourceData = detailManager.resourceData,
+      Content = detailManager.Content;
   (0, _react.useEffect)(function () {
-    elementDetailManager.init();
+    detailManager.init();
     return function () {
-      elementDetailManager.destroy();
+      detailManager.destroy();
     };
   }, []); // 解决切换拓扑图隐藏概览
 
   (0, _react.useEffect)(function () {
-    elementDetailManager.reset();
+    detailManager.reset();
   }, [topoId]);
   return /*#__PURE__*/_react["default"].createElement(_DetailDrawer["default"], {
     visible: visible,
@@ -54,16 +54,16 @@ function ResourceDetailDrawer(props) {
       id: id,
       data: resourceData,
       topo: topo,
-      onChange: elementDetailManager.open
+      detailManager: detailManager
     }),
-    onClose: elementDetailManager.close
+    onClose: detailManager.close
   }, visible && /*#__PURE__*/_react["default"].createElement(Content, (0, _extends2["default"])({}, props, {
     topo: topo,
     visible: visible,
     id: id,
     viewerProps: viewerProps,
-    onClose: elementDetailManager.close,
-    onChangeActive: elementDetailManager.open
+    onClose: detailManager.close,
+    onChangeActive: detailManager.open
   })));
 }
 

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

@@ -12,11 +12,15 @@ var _react = _interopRequireDefault(require("react"));
 var _ResourceDetailDrawer = _interopRequireDefault(require("./ResourceDetailDrawer"));
 
 function ResourceDetailPlugin(props) {
-  var viewerProps = props.viewerProps;
+  var topo = props.topo,
+      viewerProps = props.viewerProps;
   var resourceDetailProps = viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.resourceDetailProps;
   var hideResourceDetailDrawer = (viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.hideResourceDetailDrawer) === true;
 
-  if (hideResourceDetailDrawer) {
+  var _topo$store$useModelS = topo.store.useModelState('topoMod'),
+      graphLoaded = _topo$store$useModelS.graphLoaded;
+
+  if (graphLoaded || hideResourceDetailDrawer) {
     return null;
   }
 

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

@@ -21,7 +21,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function NodeDrawerTitle(_ref) {
   var id = _ref.id,
-      onChange = _ref.onChange,
+      detailManager = _ref.detailManager,
       topo = _ref.topo;
 
   var _useState = (0, _react.useState)(''),
@@ -58,9 +58,7 @@ function NodeDrawerTitle(_ref) {
       className: _indexModule["default"]['drawer-title']
     }, name),
     onItemClick: function onItemClick(key) {
-      return onChange({
-        id: key
-      });
+      return detailManager.openByDataId(key);
     }
   }, (0, _utils.isAvailableArray)(filterNodes) && filterNodes.length ? filterNodes.map(function (item) {
     return /*#__PURE__*/_react["default"].createElement(_menuButton["default"].Item, {
@@ -74,7 +72,6 @@ function NodeDrawerTitle(_ref) {
 
 function LinkDrawerTitle(_ref2) {
   var id = _ref2.id,
-      onChange = _ref2.onChange,
       topo = _ref2.topo;
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"]['drawer-title']
@@ -84,7 +81,6 @@ function LinkDrawerTitle(_ref2) {
 function Title(props) {
   var id = props.id,
       data = props.data,
-      onChange = props.onChange,
       topo = props.topo;
 
   if (!id) {

package/package.json

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