@riil-frontend/component-topology 12.1.0-dev.1 → 12.1.0-dev.11

package/es/networkTopo/utils/edgeGroupTagUtil.js

@@ -55,8 +55,8 @@ export function getEdgeGroupLinkIdConfig(edgeGroup, topo) {
   });
 }
 export function getEdgeGroupConfigId(edgeGroup) {
-  var sourceNode = edgeGroup.getSourceAgent();
-  var targetNode = edgeGroup.getTargetAgent();
+  var sourceNode = edgeGroup.getSource();
+  var targetNode = edgeGroup.getTarget();
   var sourceId = sourceNode.a('uuid');
   var targetId = targetNode.a('uuid');
   return [sourceId, targetId].sort().join(',');

package/es/utils/clusterUtil.js

@@ -5,7 +5,7 @@ import _extends from "@babel/runtime/helpers/extends";
  */
 import { transformTopoElements } from "@riil-frontend/component-topology-graph/es/utils";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
-import { getGroups, isExistedElement } from "./htElementUtils";
+import { getGroups, containsElement } from "./htElementUtils";
 import { findGroupChildren } from "./topoData";
 export function isCluster(node) {
   return !!node.cluster;
@@ -76,7 +76,7 @@ export function isClusterHtElement(element) {
   return !!element.a('cluster');
 }
 export function isClusterMemberHtElement(element) {
-  return element && element.getParent() && isClusterHtElement(element.getParent());
+  return (element === null || element === void 0 ? void 0 : element.getParent()) && isClusterHtElement(element.getParent());
 }
 /**
  * 集群无权限时收起
@@ -111,7 +111,7 @@ export function upgradeV103GraphClusterNode(topo, topoData) {
     var topoDataTrans = transformTopoElements(topoData);
     var dm = topo.getDataModel();
     var unExistedList = topoDataTrans.filter(function (data) {
-      return !isExistedElement(topo.getHtTopo(), dm, data);
+      return !containsElement(dm, data);
     });
 
     if (!unExistedList.length) {

package/es/utils/htElementUtils.js

@@ -115,9 +115,6 @@ export function getNodeData(element) {
 export function getEdges(dataModel) {
   return getElements(dataModel).filter(isValidEdge);
 }
-export function isEdgeGroupExpanded(edge) {
-  return isEdge(edge) && edge.getEdgeGroup() && !!edge.s("edge.expanded");
-}
 /**
  * 是否连线组代理
  * @param {*} edge
@@ -125,7 +122,10 @@ export function isEdgeGroupExpanded(edge) {
  */
 
 export function isEdgeGroupAgent(edge) {
-  return isEdge(edge) && edge.getEdgeGroup() && edge.isEdgeGroupAgent();
+  return isEdge(edge) && edge.a('x.edgegroup.isEdgeGroup');
+}
+export function isEdgeVisible(edge) {
+  return edge.s('2d.visible') || edge.s('2d.visible') === undefined;
 }
 /**
  * 获得两个节点间的连线列表
@@ -152,61 +152,18 @@ export function getEdgesBetweenNodes(node1, node2) {
   return edges;
 }
 /**
- * 获得节点间的连线组，连线<=1时返回null
- * @returns
+ * 获得连线组连线列表
+ * @param {*} dataModel 
+ * @returns 
  */
 
-export function getEdgeGroupByNodes(node1, node2) {
-  var htEdgeGroup = null;
-  getEdgesBetweenNodes(node1, node2).forEach(function (edge) {
-    if (!htEdgeGroup) {
-      htEdgeGroup = edge.getEdgeGroup();
-    }
-  });
-
-  if (!htEdgeGroup) {
-    return null;
-  }
-
-  return new EdgeGroup(htEdgeGroup);
-}
-/**
- * 获得节点间的连线组，连线<=1时返回null
- * @returns
- */
-
-export function getEdgeGroupByNodeTags(dataModel, nodeTag1, nodeTag2) {
-  var node1 = dataModel.getDataByTag(nodeTag1);
-  var node2 = dataModel.getDataByTag(nodeTag2);
-
-  if (!node1 || !node2) {
-    console.warn("getEdgeGroupByNodes 未找到节点", {
-      node1: node1,
-      node2: node2,
-      nodeTag1: nodeTag1,
-      nodeTag2: nodeTag2
-    });
-    return null;
-  }
-
-  return getEdgeGroupByNodes(node1, node2);
-}
-export function getEdgeGroups(dataModel) {
-  var edgeGroups = [];
-  getEdges(dataModel).forEach(function (edge) {
-    var group = edge.getEdgeGroup();
-
-    if (group && !edgeGroups.includes(group)) {
-      edgeGroups.push(group);
-    }
-  });
-  return edgeGroups;
-}
 export function getEdgeGroupAgents(dataModel) {
   return getEdges(dataModel).filter(isEdgeGroupAgent);
 }
 export function getEdgeDatas(dataModel) {
-  return getEdges(dataModel).map(function (element) {
+  return getEdges(dataModel).filter(function (edge) {
+    return !isEdgeGroupAgent(edge);
+  }).map(function (element) {
     var _element$getSource, _element$getTarget;
 
     return _extends({}, element.getAttrObject(), {
@@ -309,9 +266,13 @@ export function setElementRuntimeStyle(element, name, value) {
 }
 /**
  * 判断拓扑图是否存在元素
+ * 
+ * @param {*} dataModel 
+ * @param {{id?: string, tag?: string}} data 
+ * @returns 
  */
 
-export function isExistedElement(htTopo, dataModel, data) {
+export function containsElement(dataModel, data) {
   if (dataModel.getDataByTag(data.id)) {
     return true;
   } // 识别区域
@@ -320,34 +281,5 @@ export function isExistedElement(htTopo, dataModel, data) {
   var element = getElements(dataModel).find(function (item) {
     return data.tag && item.a("tag") === data.tag;
   });
-
-  if (element) {
-    return true;
-  } // 连线/连线组
-
-
-  var edges = getEdges(dataModel);
-
-  for (var i = 0; i < edges.length; i++) {
-    var edge = edges[i]; // 如果连线组折叠，判断子连线
-
-    var edgeData = htTopo.getEdgeData(edge);
-
-    if (edgeData) {
-      // eslint-disable-next-line no-underscore-dangle
-      var id = edgeData._attrObject.id;
-
-      if (id === data.id) {
-        return true;
-      }
-    } // 如果连线组展开，判断连线组
-    // eslint-disable-next-line no-underscore-dangle
-
-
-    if (edge.__edgeGroup && edge.__edgeGroup._tag === data.id) {
-      return true;
-    }
-  }
-
-  return false;
+  return !!element;
 }

package/lib/core/components/AlarmListPanel/components/AlarmListItem.js

@@ -50,8 +50,8 @@ function AlarmListItem(props) {
   // 传入参数
   var topo = props.topo,
       alarmInfo = props.alarmInfo,
-      onClick = props.onClick;
-  console.log("AlarmListPanel", topo, alarmInfo);
+      onClick = props.onClick; // console.log("AlarmListPanel", topo, alarmInfo);
+
   return /*#__PURE__*/_react["default"].createElement(_list["default"].Item, {
     className: _indexModule["default"].AlarmListItem,
     media: /*#__PURE__*/_react["default"].createElement(_icon["default"], {

package/lib/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js

@@ -53,14 +53,14 @@ function EdgeColorButton(props) {
     });
   };
 
-  var getLines = function getLines(list) {
+  var getCustomLines = function getCustomLines(list) {
     return list.filter(_edgeUtil.isCustomEdge);
   };
 
   (0, _react.useEffect)(function () {
     if (graphLoaded) {
       var edges = (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo);
-      var list = getLines(edges);
+      var list = getCustomLines(edges);
       setLineWidth(1); // eslint-disable-next-line eqeqeq
 
       if (selection.length == 1 && list.length === 1) {

package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js

@@ -48,20 +48,11 @@ var LINE_TYPE_OPTIONS = [{
   value: 'doublearc',
   label: '双弧线',
   icon: 'topo_linear_icon_arcline'
-} // {
-//   value: 'points',
-//   label: '自由线形',
-//   icon: 'topo_linear_icon_pointsline',
-// },
-];
-
-if (localStorage.getItem('topo.test.edge.customType') === 'true') {
-  LINE_TYPE_OPTIONS.push({
-    value: 'points',
-    label: '自由线形',
-    icon: 'topo_linear_icon_pointsline'
-  });
-}
+}, {
+  value: 'points',
+  label: '自由线形',
+  icon: 'topo_linear_icon_pointsline'
+}];
 
 var LineType = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
   var value = props.value,

package/lib/core/editor/components/Toolbar/widgets/FontFamilyWidget.js

@@ -7,9 +7,9 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _DropdownMenu = _interopRequireDefault(require("./components/DropdownMenu"));
+var _FontFamilySelect = _interopRequireDefault(require("./components/FontFamilySelect"));
 
-var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter.js"));
+var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter"));
 
 var _WidgetBox = _interopRequireDefault(require("./WidgetBox"));
 
@@ -17,31 +17,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function FontFamilySelect(props) {
-  var value = props.value,
-      onChange = props.onChange;
-  var items = ['宋体', '微软雅黑', '黑体', 'Arial'];
-  return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
-    value: (items.includes(value) ? value : null) || '',
-    valueRender: function valueRender(val) {
-      return /*#__PURE__*/_react["default"].createElement("div", {
-        style: {
-          width: 48
-        }
-      }, val || '微软雅黑');
-    },
-    onSelect: onChange
-  }, items.map(function (item) {
-    return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
-      key: item
-    }, /*#__PURE__*/_react["default"].createElement("div", {
-      style: {
-        fontFamily: item
-      }
-    }, item));
-  }));
-}
-
 function FontFamilyWidget(props) {
   var topo = props.topo,
       showLabel = props.showLabel,
@@ -51,7 +26,7 @@ function FontFamilyWidget(props) {
     label: "\u5B57\u4F53",
     tooltip: "\u5B57\u4F53",
     showLabel: showLabel
-  }, /*#__PURE__*/_react["default"].createElement(FontFamilySelect, {
+  }, /*#__PURE__*/_react["default"].createElement(_FontFamilySelect["default"], {
     value: style.fontFamily,
     onChange: function onChange(val) {
       topo.historyManager.beginTransaction();

package/lib/core/editor/components/Toolbar/widgets/FontSizeWidget.js

@@ -7,9 +7,9 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _DropdownMenu = _interopRequireDefault(require("./components/DropdownMenu"));
+var _FontSizeSelect = _interopRequireDefault(require("./components/FontSizeSelect"));
 
-var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter.js"));
+var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter"));
 
 var _WidgetBox = _interopRequireDefault(require("./WidgetBox"));
 
@@ -17,31 +17,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function FontSizeSelect(props) {
-  var value = props.value,
-      disabled = props.disabled,
-      onChange = props.onChange;
-  var items = [12, 14, 16, 18, 20, 24, 30, 36, 48, 60, 80];
-  return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
-    value: "" + (value || ''),
-    valueRender: function valueRender(val) {
-      return /*#__PURE__*/_react["default"].createElement("div", {
-        style: {
-          width: 18
-        }
-      }, val || 20);
-    },
-    disabled: disabled,
-    onSelect: function onSelect(val) {
-      return onChange(parseInt(val, 10));
-    }
-  }, items.map(function (item) {
-    return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
-      key: item
-    }, item);
-  }));
-}
-
 function FontSizeWidget(props) {
   var topo = props.topo,
       showLabel = props.showLabel,
@@ -57,7 +32,7 @@ function FontSizeWidget(props) {
     tooltip: "\u5B57\u53F7",
     showLabel: showLabel,
     disabled: disabled
-  }, /*#__PURE__*/_react["default"].createElement(FontSizeSelect, {
+  }, /*#__PURE__*/_react["default"].createElement(_FontSizeSelect["default"], {
     value: style.fontSize,
     disabled: disabled,
     onChange: function onChange(val) {

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

@@ -7,39 +7,16 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _variables = _interopRequireDefault(require("@alifd/theme-19926/variables.js"));
+var _FontStyleSelect = _interopRequireDefault(require("./components/FontStyleSelect"));
 
-var _htElementUtils = require("../../../../../utils/htElementUtils");
-
-var _DropdownMenu = _interopRequireDefault(require("./components/DropdownMenu"));
-
-var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter.js"));
+var _textStyleSettingRouter = _interopRequireDefault(require("./components/textStyleSetting/textStyleSettingRouter"));
 
 var _WidgetBox = _interopRequireDefault(require("./WidgetBox"));
 
-var _Tooltip = _interopRequireDefault(require("../components/Tooltip"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var items = [{
-  key: 'bold',
-  label: '加粗',
-  icon: 'bold',
-  tooltip: '加粗'
-}, {
-  key: 'italic',
-  label: '斜体',
-  icon: 'Italics',
-  tooltip: '斜体'
-}, {
-  key: 'underline',
-  label: '下划线',
-  icon: 'Underline',
-  tooltip: '下划线'
-}];
-
 function buildValue(obj) {
   return Object.keys(obj).filter(function (key) {
     return !!obj[key];
@@ -107,39 +84,12 @@ function FontStyleButton(props) {
     tooltip: "\u6587\u5B57\u6837\u5F0F\uFF08\u52A0\u7C97\u3001\u659C\u4F53\u3001\u4E0B\u5212\u7EBF\uFF09",
     disabled: disabled,
     showLabel: showLabel
-  }, /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_FontStyleSelect["default"], {
     value: value,
-    valueRender: function valueRender() {
-      return /*#__PURE__*/_react["default"].createElement("img", {
-        src: "/img/topo/editor/toolbar/bold/" + (disabled ? 'Disable' : 'Normal') + ".svg",
-        alt: ""
-      });
-    },
-    multiple: true,
     disabled: disabled,
-    onSelect: handleSelect
-  }, items.map(function (item) {
-    return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
-      key: item.key,
-      disabled: fieldDisabled[item.key]
-    }, /*#__PURE__*/_react["default"].createElement(_Tooltip["default"], {
-      trigger: /*#__PURE__*/_react["default"].createElement("div", {
-        style: {
-          display: 'flex',
-          alignItems: 'center'
-        }
-      }, /*#__PURE__*/_react["default"].createElement("img", {
-        src: "/img/topo/editor/toolbar/" + item.icon + "/" + (fieldDisabled[item.key] ? 'Disable' : 'Normal') + ".svg",
-        alt: ""
-      }), /*#__PURE__*/_react["default"].createElement("span", {
-        style: fieldDisabled[item.key] ? {} : {
-          color: _variables["default"]['$color-text1-4']
-        }
-      }, item.label)),
-      align: "r",
-      popupStyle: {}
-    }, item.tooltip));
-  })));
+    fieldDisabled: fieldDisabled,
+    onChange: handleSelect
+  }));
 }
 
 var _default = (0, _textStyleSettingRouter["default"])(FontStyleButton, {

package/lib/core/editor/components/Toolbar/widgets/Layout/index.js

@@ -162,7 +162,7 @@ function isLayoutEnabled(props) {
   } //中心节点布局,选中一个节点不是分层的情况下，按钮亮起
 
 
-  if (topoShowType !== 'layers' && selection.length === 1) {
+  if (topoShowType !== 'layers' && selection.length === 1 && ((0, _htElementDataUtil.isNode)(selection[0]) || (0, _htElementDataUtil.isGroup)(selection[0]))) {
     return true;
   }
 

package/lib/core/editor/components/Toolbar/widgets/components/FontFamilySelect.js

@@ -0,0 +1,38 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _DropdownMenu = _interopRequireDefault(require("./DropdownMenu"));
+
+function FontFamilySelect(props) {
+  var value = props.value,
+      onChange = props.onChange;
+  var items = ['宋体', '微软雅黑', '黑体', 'Arial'];
+  return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
+    value: (items.includes(value) ? value : null) || '',
+    valueRender: function valueRender(val) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        style: {
+          width: 48
+        }
+      }, val || '微软雅黑');
+    },
+    onSelect: onChange
+  }, items.map(function (item) {
+    return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
+      key: item
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      style: {
+        fontFamily: item
+      }
+    }, item));
+  }));
+}
+
+var _default = FontFamilySelect;
+exports["default"] = _default;

package/lib/core/editor/components/Toolbar/widgets/components/FontSizeSelect.js

@@ -0,0 +1,38 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _DropdownMenu = _interopRequireDefault(require("./DropdownMenu"));
+
+function FontSizeSelect(props) {
+  var value = props.value,
+      disabled = props.disabled,
+      onChange = props.onChange;
+  var items = [12, 14, 16, 18, 20, 24, 30, 36, 48, 60, 80];
+  return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
+    value: "" + (value || ''),
+    valueRender: function valueRender(val) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        style: {
+          width: 18
+        }
+      }, val || 20);
+    },
+    disabled: disabled,
+    onSelect: function onSelect(val) {
+      return onChange(parseInt(val, 10));
+    }
+  }, items.map(function (item) {
+    return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
+      key: item
+    }, item);
+  }));
+}
+
+var _default = FontSizeSelect;
+exports["default"] = _default;

package/lib/core/editor/components/Toolbar/widgets/components/FontStyleSelect.js

@@ -0,0 +1,83 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _variables = _interopRequireDefault(require("@alifd/theme-19926/variables.js"));
+
+var _DropdownMenu = _interopRequireDefault(require("./DropdownMenu"));
+
+var _Tooltip = _interopRequireDefault(require("../../components/Tooltip"));
+
+var items = [{
+  key: 'bold',
+  label: '加粗',
+  icon: 'bold',
+  tooltip: '加粗'
+}, {
+  key: 'italic',
+  label: '斜体',
+  icon: 'Italics',
+  tooltip: '斜体'
+}, {
+  key: 'underline',
+  label: '下划线',
+  icon: 'Underline',
+  tooltip: '下划线'
+}];
+
+function buildValue(obj) {
+  return Object.keys(obj).filter(function (key) {
+    return !!obj[key];
+  });
+}
+
+var fields = ['bold', 'italic', 'underline'];
+
+function FontStyleSelect(props) {
+  var value = props.value,
+      disabled = props.disabled,
+      onChange = props.onChange,
+      _props$fieldDisabled = props.fieldDisabled,
+      fieldDisabled = _props$fieldDisabled === void 0 ? {} : _props$fieldDisabled;
+  return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
+    value: value,
+    valueRender: function valueRender() {
+      return /*#__PURE__*/_react["default"].createElement("img", {
+        src: "/img/topo/editor/toolbar/bold/" + (disabled ? 'Disable' : 'Normal') + ".svg",
+        alt: ""
+      });
+    },
+    multiple: true,
+    disabled: disabled,
+    onSelect: onChange
+  }, items.map(function (item) {
+    return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
+      key: item.key,
+      disabled: !!fieldDisabled[item.key]
+    }, /*#__PURE__*/_react["default"].createElement(_Tooltip["default"], {
+      trigger: /*#__PURE__*/_react["default"].createElement("div", {
+        style: {
+          display: 'flex',
+          alignItems: 'center'
+        }
+      }, /*#__PURE__*/_react["default"].createElement("img", {
+        src: "/img/topo/editor/toolbar/" + item.icon + "/" + (fieldDisabled[item.key] ? 'Disable' : 'Normal') + ".svg",
+        alt: ""
+      }), /*#__PURE__*/_react["default"].createElement("span", {
+        style: fieldDisabled[item.key] ? {} : {
+          color: _variables["default"]['$color-text1-4']
+        }
+      }, item.label)),
+      align: "r",
+      popupStyle: {}
+    }, item.tooltip));
+  }));
+}
+
+var _default = FontStyleSelect;
+exports["default"] = _default;

package/lib/core/editor/components/settings/propertyViews/view/GlobalEdgeToggle.js

@@ -32,13 +32,13 @@ function GlobalEdgeToggle(props) {
         topo: topo,
         showType: 4
       });
-      topo.getHtTopo().expandAllEdgeGroups();
+      topo.getHtTopo().toggleAllEdgeGroups(true);
     } else {
       (0, _linkUtils.showLinkByConfig)({
         topo: topo,
         showType: 1
       });
-      topo.getHtTopo().collapseAllEdgeGroups();
+      topo.getHtTopo().toggleAllEdgeGroups(false);
     }
 
     displayConfigDispatchers.update({

package/lib/core/editor/hooks/useNewElementTheme.js

@@ -26,27 +26,31 @@ function useNewElementTheme(props) {
       inited = true;
     }
 
-    function handleDataModelChangeListener(e) {
-      var kind = e.kind,
-          data = e.data;
+    function handleAddElement(e) {
+      var data = e.data; // 设置主题样式
 
-      if (kind === 'add') {
-        // 设置主题样式
-        var displayConfig = topo.store.getModelState('displayConfig');
-        var theme = displayConfig.canvasTheme || 'white';
+      var displayConfig = topo.store.getModelState('displayConfig');
+      var theme = displayConfig.canvasTheme || 'white';
 
-        var themeConfig = _themes["default"].find(function (item) {
-          return item.name === theme;
-        });
+      var themeConfig = _themes["default"].find(function (item) {
+        return item.name === theme;
+      });
 
-        var _ThemeUtil2 = (0, _themeUtil["default"])({
-          topo: topo
-        }),
-            setElementTheme = _ThemeUtil2.setElementTheme;
+      var _ThemeUtil = (0, _themeUtil["default"])({
+        topo: topo
+      }),
+          setElementTheme = _ThemeUtil.setElementTheme;
 
-        setElementTheme(data, themeConfig); // 临时放这里，新加入节点按配置显示隐藏名称
+      setElementTheme(data, themeConfig); // 临时放这里，新加入节点按配置显示隐藏名称
+
+      (0, _nodeNameVisibleUtil.setNewNodeNameVisible)(topo, data);
+    }
 
-        (0, _nodeNameVisibleUtil.setNewNodeNameVisible)(topo, data);
+    function handleDataModelChangeListener(e) {
+      var kind = e.kind;
+
+      if (kind === 'add') {
+        handleAddElement(e);
       }
     }