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

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.4" === 'string' ? "7.0.0-dev.4" : 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");
@@ -73,7 +71,6 @@ var Topology = function Topology(props) {
       onLoad = props.onLoad,
       onDestroy = props.onDestroy,
       onRefreshTopo = props.onRefresh,
-      onEnterEdit = props.onEnterEdit,
       onSave = props.onSave,
       nodeDeleteable = props.nodeDeleteable,
       onNodeDelete = props.onNodeDelete,
@@ -246,10 +243,6 @@ var Topology = function Topology(props) {
         rightEventHandle(event);
         break;
 
-      case _componentTopologyGraph.TopoEvent.EVENT_DATA_PICK:
-        topoEdit.onBindData(event.data);
-        break;
-
       case _componentTopologyGraph.TopoEvent.EVENT_DATA_DELETE:
         topoEdit.onDeleteElement(event.data);
         break;
@@ -263,10 +256,6 @@ var Topology = function Topology(props) {
         onRefresh(event.data);
         break;
 
-      case _componentTopologyGraph.TopoEvent.EVENT_EDIT_EXIT:
-        topoEdit.onExitEdit(event.data);
-        break;
-
       case _componentTopologyGraph.TopoEvent.EVENT_CONTEXT_TOOL:
         _rlog["default"].debug('自定义工具栏事件', event);
 
@@ -306,12 +295,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: {
@@ -353,8 +337,6 @@ Topology.propTypes = {
   viewerProps: _propTypes["default"].object,
   editorProps: _propTypes["default"].object,
   topoContext: _propTypes["default"].object,
-  // 进入编辑模式
-  onEnterEdit: _propTypes["default"].func,
   onRefresh: _propTypes["default"].func,
   onSave: _propTypes["default"].func,
   nodeDeleteable: _propTypes["default"].func,
@@ -366,7 +348,7 @@ Topology.propTypes = {
   /**
    * @deprecated 工具栏
    */
-  titleBar: _propTypes["default"].oneOf([_react["default"].ReactNode, false])
+  titleBar: _propTypes["default"].any
 };
 Topology.defaultProps = {
   defaultEnterEditMode: false,

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/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js

@@ -23,8 +23,9 @@ function getTextStyle(element) {
   return (0, _extends2["default"])({
     color: (0, _colorUtil.parseColor)(element.a('edge.tag.color')),
     fontFamily: element.a('edge.tag.fontFamily') || '微软雅黑',
+    fontSize: element.a('edge.tag.fontSize'),
     bold: !!element.a('edge.tag.fontBold'),
-    itatic: !!element.a('edge.tag.fontItalic')
+    italic: !!element.a('edge.tag.fontItalic')
   }, (0, _colorUtil.parseBackground)(element.a('edge.tag.background')));
 }