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

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";
@@ -39,7 +38,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,
@@ -205,10 +203,6 @@ var Topology = function Topology(props) {
         rightEventHandle(event);
         break;
 
-      case TopoEvent.EVENT_DATA_PICK:
-        topoEdit.onBindData(event.data);
-        break;
-
       case TopoEvent.EVENT_DATA_DELETE:
         topoEdit.onDeleteElement(event.data);
         break;
@@ -222,10 +216,6 @@ var Topology = function Topology(props) {
         onRefresh(event.data);
         break;
 
-      case TopoEvent.EVENT_EDIT_EXIT:
-        topoEdit.onExitEdit(event.data);
-        break;
-
       case TopoEvent.EVENT_CONTEXT_TOOL:
         rlog.debug('自定义工具栏事件', event);
         break;
@@ -264,12 +254,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: {
@@ -311,8 +296,6 @@ Topology.propTypes = {
   viewerProps: PropTypes.object,
   editorProps: PropTypes.object,
   topoContext: PropTypes.object,
-  // 进入编辑模式
-  onEnterEdit: PropTypes.func,
   onRefresh: PropTypes.func,
   onSave: PropTypes.func,
   nodeDeleteable: PropTypes.func,
@@ -324,7 +307,7 @@ Topology.propTypes = {
   /**
    * @deprecated 工具栏
    */
-  titleBar: PropTypes.oneOf([React.ReactNode, false])
+  titleBar: PropTypes.any
 };
 Topology.defaultProps = {
   defaultEnterEditMode: false,

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

@@ -7,8 +7,9 @@ export function getTextStyle(element) {
   return _extends({
     color: 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')
   }, parseBackground(element.a('edge.tag.background')));
 }
 export function setTextStyle(element, style, topo) {