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

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

package/es/core/store/models/topoMod.js

@@ -400,7 +400,7 @@ export default function (topoApp) {
 
                   case 29:
                     _context6.next = 31;
-                    return topoApp.options.loadData(topoId);
+                    return topoApp.options.loadData(topoId, topoApp.serverApi);
 
                   case 31:
                     result = _context6.sent;

package/es/networkTopo/getTopoData.js

@@ -1,7 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService from "@riil-frontend/component-topology-common/es/services/topo";
 import { getLinksDetail } from "../core/models/utils/linkUtils";
 import { queryCisByIds } from "../core/services";
 import { addTopoDataResourcePermission } from "./utils/resourcePermissionUtil"; // import "./utils/__tests__/resourcePermissionUtil.test";
@@ -127,12 +126,12 @@ function _buildData() {
   return _buildData.apply(this, arguments);
 }
 
-export default function getTopoData(_x4) {
+export default function getTopoData(_x4, _x5) {
   return _getTopoData.apply(this, arguments);
 }
 
 function _getTopoData() {
-  _getTopoData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id) {
+  _getTopoData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id, topoService) {
     var data;
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) {

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

@@ -71,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,
@@ -244,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;
@@ -261,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);
 
@@ -346,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,
@@ -359,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/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')));
 }