@riil-frontend/component-topology 7.0.0-dev.2 → 7.0.0-dev.3

package/es/core/components/TopoView/topoView.js

@@ -7,7 +7,6 @@ import TopoGraph, { TopoEvent } from '@riil-frontend/component-topology-graph';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog'; // 通用
 
 import showMessage from "../../utils/showMessage";
-import TitleBar from "../titlebar/TitleBar";
 import { TPL_TREE } from "../../../utils/template";
 import { updateEdgeExpanded } from "../../utils/edgeUtil";
 import useRouterAdapter from "../../hooks/useRouterAdapter";
@@ -264,12 +263,7 @@ var Topology = function Topology(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: styles.topoView,
     "data-version": topo.version
-  }, titleBar !== false && (titleBar || /*#__PURE__*/React.createElement(TitleBar, {
-    topo: topo,
-    viewerProps: viewerProps,
-    onEnterEdit: onEnterEdit,
-    topoEditApi: topoEdit
-  })), isEditMode && /*#__PURE__*/React.createElement(EditorToolbar, {
+  }, titleBar !== false && titleBar, isEditMode && /*#__PURE__*/React.createElement(EditorToolbar, {
     topo: topo,
     topoEdit: topoEdit,
     topoContext: {

package/es/core/components/titlebar/index.js

@@ -5,4 +5,5 @@ import NodesDragSwitch from "../../viewer/components/titlebar/widgets/NodesDragS
 import AlarmListShowButton from "../../viewer/components/titlebar/widgets/AlarmListShowButton";
 import TitleWidget from "./widgets/TitleWidget";
 import ViewerTools from "../../viewer/components/titlebar/ViewerTools";
-export { TitleBar, SearchWidget, NodesDragSwitch, DisplaySettingButton, AlarmListShowButton, TitleWidget, ViewerTools };
+import DebugTools from "../../editor/components/titlebar/widgets/DebugTools";
+export { TitleBar, SearchWidget, NodesDragSwitch, DisplaySettingButton, AlarmListShowButton, TitleWidget, ViewerTools, DebugTools };

package/es/core/models/TopoApp.js

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

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

@@ -196,9 +196,20 @@ function ResourceDetailDrawer(props) {
   }
 
   var renderContent = function renderContent() {
-    var _viewerProps$resource;
+    // 支持自定义概览
+    var _ref = (viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.resourceDetailProps) || {},
+        getResourceDetail = _ref.getResourceDetail;
+
+    var ResourceDetailWidget;
+
+    if (getResourceDetail) {
+      ResourceDetailWidget = getResourceDetail(resourceData);
+    }
+
+    if (!ResourceDetailWidget) {
+      ResourceDetailWidget = ResourceDetail;
+    }
 
-    var ResourceDetailWidget = (viewerProps === null || viewerProps === void 0 ? void 0 : (_viewerProps$resource = viewerProps.resourceDetailProps) === null || _viewerProps$resource === void 0 ? void 0 : _viewerProps$resource.ResourceDetailWidget) || ResourceDetail;
     return /*#__PURE__*/React.createElement(ResourceDetailWidget, _extends({}, props, {
       topo: topo,
       userId: userId,

package/es/style.js

@@ -1,45 +1,45 @@
 import '@riil-frontend/component-topology-graph/es/style';
 import '@alifd/next/es/box/style';
 import '@alifd/next/es/message/style';
-import '@alifd/next/es/button/style';
-import '@alifd/next/es/icon/style';
-import '@alifd/next/es/overlay/style';
-import '@alifd/next/es/list/style';
-import '@alifd/next/es/card/style';
-import '@riil-frontend/component-no-data-page/es/style';
-import '@alifd/next/es/drawer/style';
-import '@alifd/next/es/form/style';
-import '@alifd/next/es/field/style';
-import '@alifd/next/es/radio/style';
-import '@alifd/next/es/checkbox/style';
-import '@alifd/next/es/table/style';
-import '@alifd/next/es/search/style';
-import '@alifd/next/es/grid/style';
-import '@riil-frontend/component-action-tree/es/style';
-import '@riil-frontend/component-table-layout/es/style';
-import '@riil-frontend/hooks/es/style';
-import '@alifd/next/es/balloon/style';
 import '@riil-frontend/component-topology-utils/es/style';
-import '@alifd/next/es/dropdown/style';
-import '@alifd/next/es/menu/style';
-import '@alifd/next/es/dialog/style';
 import '@riil-frontend/utils/es/style';
 import '@riil-frontend/component-riil-event-emitter/es/style';
+import '@alifd/next/es/drawer/style';
 import '@alifd/next/es/menu-button/style';
+import '@alifd/next/es/search/style';
 import '@alifd/next/es/tab/style';
+import '@alifd/next/es/table/style';
+import '@riil-frontend/component-table-layout/es/style';
 import '@riil-frontend/component-pager/es/style';
+import '@alifd/next/es/button/style';
+import '@alifd/next/es/icon/style';
 import '@alifd/next/es/loading/style';
 import '@alifd/next/es/divider/style';
+import '@riil-frontend/component-no-data-page/es/style';
 
+import '@alifd/next/es/overlay/style';
+import '@alifd/next/es/checkbox/style';
 import '@riil-frontend/component-crucial-link-topo/es/style';
 import '@alifd/next/es/input/style';
+import '@alifd/next/es/field/style';
+import '@alifd/next/es/form/style';
+import '@alifd/next/es/dialog/style';
 import '@alifd/next/es/upload/style';
 import '@alifd/next/es/config-provider/style';
 import '@riil-frontend/component-common-res-list/es/style';
+import '@alifd/next/es/balloon/style';
+import '@alifd/next/es/menu/style';
+import '@alifd/next/es/dropdown/style';
 import '@alifd/next/es/range/style';
+import '@alifd/next/es/radio/style';
 import '@alifd/next/es/tag/style';
 import '@alifd/next/es/number-picker/style';
 import '@alifd/next/es/select/style';
 import '@alifd/next/es/collapse/style';
+import '@alifd/next/es/list/style';
 
+import '@alifd/next/es/grid/style';
+import '@riil-frontend/component-action-tree/es/style';
+import '@riil-frontend/hooks/es/style';
+import '@alifd/next/es/card/style';
 import './index.scss';

package/lib/core/components/TopoView/topoView.js

@@ -21,8 +21,6 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _showMessage = _interopRequireDefault(require("../../utils/showMessage"));
 
-var _TitleBar = _interopRequireDefault(require("../titlebar/TitleBar"));
-
 var _template = require("../../../utils/template");
 
 var _edgeUtil = require("../../utils/edgeUtil");
@@ -306,12 +304,7 @@ var Topology = function Topology(props) {
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _TopoViewModule["default"].topoView,
     "data-version": topo.version
-  }, titleBar !== false && (titleBar || /*#__PURE__*/_react["default"].createElement(_TitleBar["default"], {
-    topo: topo,
-    viewerProps: viewerProps,
-    onEnterEdit: onEnterEdit,
-    topoEditApi: topoEdit
-  })), isEditMode && /*#__PURE__*/_react["default"].createElement(_EditorToolbar["default"], {
+  }, titleBar !== false && titleBar, isEditMode && /*#__PURE__*/_react["default"].createElement(_EditorToolbar["default"], {
     topo: topo,
     topoEdit: topoEdit,
     topoContext: {

package/lib/core/components/titlebar/index.js

@@ -30,4 +30,8 @@ exports.TitleWidget = _TitleWidget["default"];
 
 var _ViewerTools = _interopRequireDefault(require("../../viewer/components/titlebar/ViewerTools"));
 
-exports.ViewerTools = _ViewerTools["default"];
+exports.ViewerTools = _ViewerTools["default"];
+
+var _DebugTools = _interopRequireDefault(require("../../editor/components/titlebar/widgets/DebugTools"));
+
+exports.DebugTools = _DebugTools["default"];

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "7.0.0-dev.2" === 'string' ? "7.0.0-dev.2" : null;
+var version = typeof "7.0.0-dev.3" === 'string' ? "7.0.0-dev.3" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -218,9 +218,20 @@ function ResourceDetailDrawer(props) {
   }
 
   var renderContent = function renderContent() {
-    var _viewerProps$resource;
+    // 支持自定义概览
+    var _ref = (viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.resourceDetailProps) || {},
+        getResourceDetail = _ref.getResourceDetail;
+
+    var ResourceDetailWidget;
+
+    if (getResourceDetail) {
+      ResourceDetailWidget = getResourceDetail(resourceData);
+    }
+
+    if (!ResourceDetailWidget) {
+      ResourceDetailWidget = _ResourceDetail["default"];
+    }
 
-    var ResourceDetailWidget = (viewerProps === null || viewerProps === void 0 ? void 0 : (_viewerProps$resource = viewerProps.resourceDetailProps) === null || _viewerProps$resource === void 0 ? void 0 : _viewerProps$resource.ResourceDetailWidget) || _ResourceDetail["default"];
     return /*#__PURE__*/_react["default"].createElement(ResourceDetailWidget, (0, _extends2["default"])({}, props, {
       topo: topo,
       userId: userId,

package/lib/style.js

@@ -1,45 +1,45 @@
 require('@riil-frontend/component-topology-graph/lib/style');
 require('@alifd/next/lib/box/style');
 require('@alifd/next/lib/message/style');
-require('@alifd/next/lib/button/style');
-require('@alifd/next/lib/icon/style');
-require('@alifd/next/lib/overlay/style');
-require('@alifd/next/lib/list/style');
-require('@alifd/next/lib/card/style');
-require('@riil-frontend/component-no-data-page/lib/style');
-require('@alifd/next/lib/drawer/style');
-require('@alifd/next/lib/form/style');
-require('@alifd/next/lib/field/style');
-require('@alifd/next/lib/radio/style');
-require('@alifd/next/lib/checkbox/style');
-require('@alifd/next/lib/table/style');
-require('@alifd/next/lib/search/style');
-require('@alifd/next/lib/grid/style');
-require('@riil-frontend/component-action-tree/lib/style');
-require('@riil-frontend/component-table-layout/lib/style');
-require('@riil-frontend/hooks/lib/style');
-require('@alifd/next/lib/balloon/style');
 require('@riil-frontend/component-topology-utils/lib/style');
-require('@alifd/next/lib/dropdown/style');
-require('@alifd/next/lib/menu/style');
-require('@alifd/next/lib/dialog/style');
 require('@riil-frontend/utils/lib/style');
 require('@riil-frontend/component-riil-event-emitter/lib/style');
+require('@alifd/next/lib/drawer/style');
 require('@alifd/next/lib/menu-button/style');
+require('@alifd/next/lib/search/style');
 require('@alifd/next/lib/tab/style');
+require('@alifd/next/lib/table/style');
+require('@riil-frontend/component-table-layout/lib/style');
 require('@riil-frontend/component-pager/lib/style');
+require('@alifd/next/lib/button/style');
+require('@alifd/next/lib/icon/style');
 require('@alifd/next/lib/loading/style');
 require('@alifd/next/lib/divider/style');
+require('@riil-frontend/component-no-data-page/lib/style');
 
+require('@alifd/next/lib/overlay/style');
+require('@alifd/next/lib/checkbox/style');
 require('@riil-frontend/component-crucial-link-topo/lib/style');
 require('@alifd/next/lib/input/style');
+require('@alifd/next/lib/field/style');
+require('@alifd/next/lib/form/style');
+require('@alifd/next/lib/dialog/style');
 require('@alifd/next/lib/upload/style');
 require('@alifd/next/lib/config-provider/style');
 require('@riil-frontend/component-common-res-list/lib/style');
+require('@alifd/next/lib/balloon/style');
+require('@alifd/next/lib/menu/style');
+require('@alifd/next/lib/dropdown/style');
 require('@alifd/next/lib/range/style');
+require('@alifd/next/lib/radio/style');
 require('@alifd/next/lib/tag/style');
 require('@alifd/next/lib/number-picker/style');
 require('@alifd/next/lib/select/style');
 require('@alifd/next/lib/collapse/style');
+require('@alifd/next/lib/list/style');
 
+require('@alifd/next/lib/grid/style');
+require('@riil-frontend/component-action-tree/lib/style');
+require('@riil-frontend/hooks/lib/style');
+require('@alifd/next/lib/card/style');
 require('./index.scss');

package/package.json

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