@riil-frontend/component-topology 6.0.20 → 7.0.0-dev.10

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,
@@ -149,7 +147,19 @@ var Topology = function Topology(props) {
     topo.selectionModel.init();
     topoDispatchers.update({
       graphLoaded: true
-    });
+    }); // url选中元素
+
+    var _topo$store$getModelS = topo.store.getModelState('selection'),
+        initSelectionId = _topo$store$getModelS.initSelectionId;
+
+    if (initSelectionId) {
+      var ele = topo.getHtTopo().getGraphView().dm().getDataByTag(initSelectionId);
+      topo.getHtTopo().getGraphView().sm().setSelection([ele]);
+      var selectionDispatchers = topo.store.getModelDispatchers('selection');
+      selectionDispatchers.update({
+        initSelectionId: null
+      });
+    }
 
     if (onLoaded) {
       onLoaded(topoData);
@@ -193,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;
@@ -210,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;
@@ -252,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: {
@@ -299,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,
@@ -312,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/EditorPlugin.js

@@ -2,7 +2,6 @@ import _extends from "@babel/runtime/helpers/extends";
 import React, { useEffect } from 'react';
 import CustomIconPlugin from "./CustomIconPlugin";
 import SaveLoading from "./plugins/SaveLoading";
-import MultipleResourceSelectPlugin from "./plugins/MultipleResourceSelectPlugin";
 import GroupAddResourceDrawerPlugin from "./GroupAddResourceDrawerPlugin";
 import MetricPollingPlugin from "../../viewer/components/plugins/MetricPollingPlugin";
 import AddElementThemePlugin from "./plugins/AddElementThemePlugin";
@@ -27,7 +26,7 @@ export default function TopoEditorPlugin(props) {
     return null;
   }
 
-  var plugins = [CorePlugin, SaveLoading, AddElementThemePlugin, CustomIconPlugin, GroupAddResourceDrawerPlugin, MultipleResourceSelectPlugin, MetricPollingPlugin].concat((editorProps === null || editorProps === void 0 ? void 0 : editorProps.plugins) || []);
+  var plugins = [CorePlugin, SaveLoading, AddElementThemePlugin, CustomIconPlugin, GroupAddResourceDrawerPlugin, MetricPollingPlugin].concat((editorProps === null || editorProps === void 0 ? void 0 : editorProps.plugins) || []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, plugins.map(function (Plugin, index) {
     return /*#__PURE__*/React.createElement(Plugin, _extends({
       key: index,

package/es/core/editor/components/Toolbar/widgets/FontStyleButton.js

@@ -52,16 +52,8 @@ function FontStyleButton(props) {
     underline: underline
   })),
       value = _useState2[0],
-      setValue = _useState2[1]; // 选中的元素
+      setValue = _useState2[1];
 
-
-  var selection = topo.selectionModel.useHtSelection();
-  useEffect(function () {
-    var containText = selection.filter(function (ele) {
-      return isText(ele);
-    }).length;
-    setDisabled(!containText);
-  }, [selection]);
   useEffect(function () {
     setValue(buildValue({
       bold: bold,

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js

@@ -4,21 +4,21 @@ var _excluded = ["color", "background", "opacity", "bold", "italic"];
 import fontStyleUtil from "../../../../../../settings/common/text/fontStyleUtil";
 import { formatBackgroundRgbaColor, parseBackground, parseColor } from "../colorUtil";
 export function getTextStyle(element) {
-  var underline = null;
   return _extends({
     color: parseColor(element.a('edge.tag.color')),
     fontFamily: element.a('edge.tag.fontFamily') || '微软雅黑',
-    underline: underline
+    fontSize: element.a('edge.tag.fontSize'),
+    bold: !!element.a('edge.tag.fontBold'),
+    italic: !!element.a('edge.tag.fontItalic')
   }, parseBackground(element.a('edge.tag.background')));
 }
 export function setTextStyle(element, style, topo) {
-  var _fontStyleUtil$remove = fontStyleUtil.removeBoldItalic(style),
-      color = _fontStyleUtil$remove.color,
-      background = _fontStyleUtil$remove.background,
-      opacity = _fontStyleUtil$remove.opacity,
-      bold = _fontStyleUtil$remove.bold,
-      italic = _fontStyleUtil$remove.italic,
-      otherStyle = _objectWithoutPropertiesLoose(_fontStyleUtil$remove, _excluded);
+  var color = style.color,
+      background = style.background,
+      opacity = style.opacity,
+      bold = style.bold,
+      italic = style.italic,
+      otherStyle = _objectWithoutPropertiesLoose(style, _excluded);
 
   var tagStyle = _extends({}, otherStyle);
 
@@ -55,11 +55,11 @@ export function setTextStyle(element, style, topo) {
  */
 
 export function getEnabledFields(element) {
-  return ['fontFamily', 'color', 'background', 'opacity'];
+  return ['fontFamily', 'color', 'background', 'opacity', 'fontSize', 'bold', 'italic'];
 }
 export function getFieldDisabled(element) {
   return {
-    fontSize: true
+    fontSize: false
   };
 }
 export default {

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/nodeTag.js

@@ -1,23 +1,23 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/extends";
-var _excluded = ["color", "background", "opacity", "bold", "italic"];
+var _excluded = ["color", "background", "opacity", "bold", "italic", "underline"];
 import fontStyleUtil from "../../../../../../settings/common/text/fontStyleUtil";
 import { formatBackgroundRgbaColor, parseBackground, parseColor } from "../colorUtil";
 export function getTextStyle(element) {
-  var underline = null;
+  var underline = !!element.a('node.tag.fontUnderline');
   return _extends({
     color: parseColor(element.a('ht.color')),
     underline: underline
   }, fontStyleUtil.toMap(element.a('ht.font')), parseBackground(element.a('ht.background')));
 }
 export function setTextStyle(element, style, topo) {
-  var _fontStyleUtil$remove = fontStyleUtil.removeBoldItalic(style),
-      color = _fontStyleUtil$remove.color,
-      background = _fontStyleUtil$remove.background,
-      opacity = _fontStyleUtil$remove.opacity,
-      bold = _fontStyleUtil$remove.bold,
-      italic = _fontStyleUtil$remove.italic,
-      otherStyle = _objectWithoutPropertiesLoose(_fontStyleUtil$remove, _excluded);
+  var color = style.color,
+      background = style.background,
+      opacity = style.opacity,
+      bold = style.bold,
+      italic = style.italic,
+      underline = style.underline,
+      otherStyle = _objectWithoutPropertiesLoose(style, _excluded);
 
   var tagStyle = _extends({}, otherStyle);
 
@@ -33,6 +33,10 @@ export function setTextStyle(element, style, topo) {
     tagStyle.fontItalic = italic;
   }
 
+  if ('underline' in style) {
+    tagStyle.fontUnderline = underline;
+  }
+
   if ('background' in style) {
     // 背景颜色
     var prevStyle = getTextStyle(element);
@@ -48,7 +52,7 @@ export function setTextStyle(element, style, topo) {
   }
 }
 export function getEnabledFields(element) {
-  return ['fontFamily', 'color', 'background', 'opacity'];
+  return ['fontFamily', 'color', 'background', 'opacity', 'fontSize', 'bold', 'italic', 'underline'];
 }
 /**
  * 获得字段是否禁用
@@ -59,10 +63,10 @@ export function getEnabledFields(element) {
 
 export function getFieldDisabled(element) {
   return {
-    fontSize: true,
-    bold: true,
-    italic: true,
-    underline: true
+    fontSize: false,
+    bold: false,
+    italic: false,
+    underline: false
   };
 }
 export default {

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/GlobalTagStyleSetting/GlobalTagStyleSetting.js

@@ -4,10 +4,10 @@ var _excluded = ["Component"];
 import React, { useMemo } from 'react';
 import { setGlobalTagStyle, useValues } from "./globalTag";
 var fieldDisabled = {
-  fontSize: true,
-  bold: true,
-  italic: true,
-  underline: true
+  fontSize: false,
+  bold: false,
+  italic: false,
+  underline: false
 };
 
 function GlobalTagStyleSetting(props) {

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/GlobalTagStyleSetting/globalTag.js

@@ -1,7 +1,7 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/extends";
 var _excluded = ["color", "background", "opacity"],
-    _excluded2 = ["color", "background", "opacity", "bold", "italic"];
+    _excluded2 = ["color", "background", "opacity", "bold", "italic", "underline"];
 import fontStyleUtil from "../../../../../settings/common/text/fontStyleUtil";
 import { formatBackgroundRgbaColor, parseBackground, formatRgbaColor } from "../ElementTextStyleSetting/colorUtil";
 var defaultStyle = {
@@ -15,7 +15,10 @@ export function useValues(topo) {
   return _extends({
     color: (nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.color) || defaultStyle.color,
     fontFamily: (nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.fontFamily) || defaultStyle.fontFamily,
-    fontSize: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.fontSize
+    fontSize: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.fontSize,
+    bold: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.bold,
+    italic: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.italic,
+    underline: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.underline
   }, parseBackground(nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.background));
 }
 export var setGlobalTagStyle = function setGlobalTagStyle(topo, styleData) {
@@ -61,13 +64,13 @@ function buildStyle(styleData, prevTagStyle) {
 }
 
 function buildGlobalStyle(styleData) {
-  var _fontStyleUtil$remove = fontStyleUtil.removeBoldItalic(styleData),
-      color = _fontStyleUtil$remove.color,
-      background = _fontStyleUtil$remove.background,
-      opacity = _fontStyleUtil$remove.opacity,
-      bold = _fontStyleUtil$remove.bold,
-      italic = _fontStyleUtil$remove.italic,
-      otherStyle = _objectWithoutPropertiesLoose(_fontStyleUtil$remove, _excluded2);
+  var color = styleData.color,
+      background = styleData.background,
+      opacity = styleData.opacity,
+      bold = styleData.bold,
+      italic = styleData.italic,
+      underline = styleData.underline,
+      otherStyle = _objectWithoutPropertiesLoose(styleData, _excluded2);
 
   var tagStyle = _extends({}, otherStyle);
 
@@ -83,6 +86,10 @@ function buildGlobalStyle(styleData) {
     tagStyle.fontItalic = italic;
   }
 
+  if ('underline' in styleData) {
+    tagStyle.fontUnderline = underline;
+  }
+
   if ('background' in styleData) {
     // 背景颜色
     tagStyle.background = formatRgbaColor(background);

package/es/core/editor/components/settings/propertyViews/node/data/Data.js

@@ -142,7 +142,8 @@ export default function Data(props) {
     nodeElement: node,
     node: values,
     topo: topo,
-    topoEditApi: topoEditApi
+    topoEditApi: topoEditApi,
+    nodeBindResourceDrawerComponent: editorProps.nodeBindResourceDrawerComponent
   }))), bindType === "topo" && RelateTopoTree && /*#__PURE__*/React.createElement(_Form.Item, {
     label: "\u5173\u8054\u62D3\u6251"
   }, /*#__PURE__*/React.createElement(RelateTopoTree, {

package/es/core/editor/components/settings/propertyViews/node/data/NodeRelateResourceButton.js

@@ -1,7 +1,7 @@
 import _Button from "@alifd/next/es/button";
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useState } from 'react';
-import BindResourceDrawer from "./BindResourceDrawer";
+import DefaultBindResourceDrawer from "./BindResourceDrawer";
 import { isClusterMemberHtElement } from "../../../../../../../utils/clusterUtil";
 /**
  * @return {React.ReactNode | null}
@@ -13,7 +13,8 @@ export default function NodeRelateResourceButton(props) {
   var nodeElement = props.nodeElement,
       topo = props.topo,
       topoEditApi = props.topoEditApi,
-      node = props.node;
+      node = props.node,
+      nodeBindResourceDrawerComponent = props.nodeBindResourceDrawerComponent;
   var hide = isClusterMemberHtElement(nodeElement) || ((_node$attrObject$data = node.attrObject.data) === null || _node$attrObject$data === void 0 ? void 0 : _node$attrObject$data.relateResource) === false;
   var currentResId = node.tag;
 
@@ -21,6 +22,7 @@ export default function NodeRelateResourceButton(props) {
       visible = _useState[0],
       setVisible = _useState[1];
 
+  var BindResourceDrawer = nodeBindResourceDrawerComponent || DefaultBindResourceDrawer;
   return !hide ? /*#__PURE__*/React.createElement(_Button, {
     type: "primary",
     text: true,

package/es/core/editor/hooks/useKeyboardShortcut.js

@@ -22,7 +22,7 @@ export default function useKeyboardShortcut(props) {
 
       }
 
-      if (e.keyCode === 32) {
+      if (e.keyCode === 32 && e.target.nodeName !== 'TEXTAREA') {
         // 空格
         var _topo$store$getModelS = topo.store.getModelState('topoEdit'),
             viewMouseMode = _topo$store$getModelS.viewMouseMode;

package/es/core/editor/hooks/useUpdateHtTopoDefaultTagStyle.js

@@ -13,12 +13,12 @@ function useUpdateHtTopoDefaultTagStyle(props) {
   var nodeLabelStyle = displayConfig.nodeLabelStyle,
       defaultEdgeLabelStyle = displayConfig.defaultEdgeLabelStyle;
   useEffect(function () {
-    if (nodeLabelStyle) {
+    if (nodeLabelStyle && topo.getHtTopo().setDefaultNodeLabelStyle) {
       topo.getHtTopo().setDefaultNodeLabelStyle(nodeLabelStyle);
     }
   }, [nodeLabelStyle]);
   useEffect(function () {
-    if (defaultEdgeLabelStyle) {
+    if (defaultEdgeLabelStyle && topo.getHtTopo().setDefaultEdgeTagStyle) {
       topo.getHtTopo().setDefaultEdgeTagStyle(defaultEdgeLabelStyle);
     }
   }, [defaultEdgeLabelStyle]);