@riil-frontend/component-topology 12.1.0-dev.4 → 12.1.0-dev.6

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

@@ -1,33 +1,8 @@
 import React, { useState, useEffect } from 'react';
-import DropdownMenu from "./components/DropdownMenu";
-import textStyleSettingRouter from "./components/textStyleSetting/textStyleSettingRouter.js";
+import FontFamilySelect from "./components/FontFamilySelect";
+import textStyleSettingRouter from "./components/textStyleSetting/textStyleSettingRouter";
 import WidgetBox from "./WidgetBox";
 
-function FontFamilySelect(props) {
-  var value = props.value,
-      onChange = props.onChange;
-  var items = ['宋体', '微软雅黑', '黑体', 'Arial'];
-  return /*#__PURE__*/React.createElement(DropdownMenu, {
-    value: (items.includes(value) ? value : null) || '',
-    valueRender: function valueRender(val) {
-      return /*#__PURE__*/React.createElement("div", {
-        style: {
-          width: 48
-        }
-      }, val || '微软雅黑');
-    },
-    onSelect: onChange
-  }, items.map(function (item) {
-    return /*#__PURE__*/React.createElement(DropdownMenu.Item, {
-      key: item
-    }, /*#__PURE__*/React.createElement("div", {
-      style: {
-        fontFamily: item
-      }
-    }, item));
-  }));
-}
-
 function FontFamilyWidget(props) {
   var topo = props.topo,
       showLabel = props.showLabel,

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

@@ -1,33 +1,8 @@
-import React, { useEffect, useState } from 'react';
-import DropdownMenu from "./components/DropdownMenu";
-import textStyleSettingRouter from "./components/textStyleSetting/textStyleSettingRouter.js";
+import React, { useEffect } from 'react';
+import FontSizeSelect from "./components/FontSizeSelect";
+import textStyleSettingRouter from "./components/textStyleSetting/textStyleSettingRouter";
 import WidgetBox from "./WidgetBox";
 
-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.createElement(DropdownMenu, {
-    value: "" + (value || ''),
-    valueRender: function valueRender(val) {
-      return /*#__PURE__*/React.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.createElement(DropdownMenu.Item, {
-      key: item
-    }, item);
-  }));
-}
-
 function FontSizeWidget(props) {
   var topo = props.topo,
       showLabel = props.showLabel,

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

@@ -1,26 +1,7 @@
 import React, { useState, useEffect } from 'react';
-import variables from '@alifd/theme-19926/variables.js';
-import { isText } from "../../../../../utils/htElementUtils";
-import DropdownMenu from "./components/DropdownMenu";
-import textStyleSettingRouter from "./components/textStyleSetting/textStyleSettingRouter.js";
+import FontStyleSelect from "./components/FontStyleSelect";
+import textStyleSettingRouter from "./components/textStyleSetting/textStyleSettingRouter";
 import WidgetBox from "./WidgetBox";
-import Tooltip from "../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) {
@@ -89,39 +70,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.createElement(DropdownMenu, {
+  }, /*#__PURE__*/React.createElement(FontStyleSelect, {
     value: value,
-    valueRender: function valueRender() {
-      return /*#__PURE__*/React.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.createElement(DropdownMenu.Item, {
-      key: item.key,
-      disabled: fieldDisabled[item.key]
-    }, /*#__PURE__*/React.createElement(Tooltip, {
-      trigger: /*#__PURE__*/React.createElement("div", {
-        style: {
-          display: 'flex',
-          alignItems: 'center'
-        }
-      }, /*#__PURE__*/React.createElement("img", {
-        src: "/img/topo/editor/toolbar/" + item.icon + "/" + (fieldDisabled[item.key] ? 'Disable' : 'Normal') + ".svg",
-        alt: ""
-      }), /*#__PURE__*/React.createElement("span", {
-        style: fieldDisabled[item.key] ? {} : {
-          color: variables['$color-text1-4']
-        }
-      }, item.label)),
-      align: "r",
-      popupStyle: {}
-    }, item.tooltip));
-  })));
+    fieldDisabled: fieldDisabled,
+    onChange: handleSelect
+  }));
 }
 
 export default textStyleSettingRouter(FontStyleButton, {

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

@@ -0,0 +1,29 @@
+import React from 'react';
+import DropdownMenu from "./DropdownMenu";
+
+function FontFamilySelect(props) {
+  var value = props.value,
+      onChange = props.onChange;
+  var items = ['宋体', '微软雅黑', '黑体', 'Arial'];
+  return /*#__PURE__*/React.createElement(DropdownMenu, {
+    value: (items.includes(value) ? value : null) || '',
+    valueRender: function valueRender(val) {
+      return /*#__PURE__*/React.createElement("div", {
+        style: {
+          width: 48
+        }
+      }, val || '微软雅黑');
+    },
+    onSelect: onChange
+  }, items.map(function (item) {
+    return /*#__PURE__*/React.createElement(DropdownMenu.Item, {
+      key: item
+    }, /*#__PURE__*/React.createElement("div", {
+      style: {
+        fontFamily: item
+      }
+    }, item));
+  }));
+}
+
+export default FontFamilySelect;

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

@@ -0,0 +1,29 @@
+import React from 'react';
+import DropdownMenu from "./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.createElement(DropdownMenu, {
+    value: "" + (value || ''),
+    valueRender: function valueRender(val) {
+      return /*#__PURE__*/React.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.createElement(DropdownMenu.Item, {
+      key: item
+    }, item);
+  }));
+}
+
+export default FontSizeSelect;

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

@@ -0,0 +1,71 @@
+import React from 'react';
+import variables from '@alifd/theme-19926/variables.js';
+import DropdownMenu from "./DropdownMenu";
+import Tooltip from "../../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.createElement(DropdownMenu, {
+    value: value,
+    valueRender: function valueRender() {
+      return /*#__PURE__*/React.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.createElement(DropdownMenu.Item, {
+      key: item.key,
+      disabled: !!fieldDisabled[item.key]
+    }, /*#__PURE__*/React.createElement(Tooltip, {
+      trigger: /*#__PURE__*/React.createElement("div", {
+        style: {
+          display: 'flex',
+          alignItems: 'center'
+        }
+      }, /*#__PURE__*/React.createElement("img", {
+        src: "/img/topo/editor/toolbar/" + item.icon + "/" + (fieldDisabled[item.key] ? 'Disable' : 'Normal') + ".svg",
+        alt: ""
+      }), /*#__PURE__*/React.createElement("span", {
+        style: fieldDisabled[item.key] ? {} : {
+          color: variables['$color-text1-4']
+        }
+      }, item.label)),
+      align: "r",
+      popupStyle: {}
+    }, item.tooltip));
+  }));
+}
+
+export default FontStyleSelect;

package/es/core/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "12.1.0-dev.4" === 'string' ? "12.1.0-dev.4" : null;
+var version = typeof "12.1.0-dev.6" === 'string' ? "12.1.0-dev.6" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/viewer/components/plugins/ElementDetailDrawer/hooks/useElementDetailManager.js

@@ -1,5 +1,6 @@
 import React, { useMemo } from 'react';
 import DefaultDetailContent from "../../ResourceDetail/DefaultDetailContent";
+import { isEdgeGroupAgent } from "../../../../../../utils/htElementUtils";
 
 function useElementDetailManager(props) {
   var topo = props.topo,
@@ -62,7 +63,7 @@ function useElementDetailManager(props) {
   }
 
   function openByHtElement(htElement) {
-    var isEdgeGroupAgent = htElement instanceof ht.Edge && htElement.isEdgeGroupAgent() && !htElement.s('edge.expanded');
+    var isEdgeGroupAgent = isEdgeGroupAgent(htElement);
     open({
       id: isEdgeGroupAgent || !htElement.getTag() ? "ht:" + htElement.getId() : htElement.getTag(),
       htElement: htElement

package/es/networkTopo/models/EdgeGroupTagTipBuilder.js

@@ -1,4 +1,4 @@
-import { getEdgeGroups } from "../../utils/htElementUtils";
+import { getEdgeGroupAgents, getEdgeGroups } from "../../utils/htElementUtils";
 import { getEdgeGroupLinkIdConfig } from "../utils/edgeGroupTagUtil";
 
 var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
@@ -16,11 +16,11 @@ var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
 
     var topo = this.topo;
     var dm = this.topo.getDataModel();
-    var edgeGroupsTagsTips = getEdgeGroups(dm).map(function (edgeGroup) {
-      var edge = edgeGroup.getEdges().getArray()[0]; // 获取配置的链路
-
-      var linkId = getEdgeGroupLinkIdConfig(edge, topo);
-      var edgeGroupId = [edge.getSourceAgent().getId(), edge.getTargetAgent().getId()];
+    var edgeGroupAgents = getEdgeGroupAgents(dm);
+    var edgeGroupsTagsTips = edgeGroupAgents.map(function (edgeGroupAgent) {
+      // 获取配置的链路
+      var linkId = getEdgeGroupLinkIdConfig(edgeGroupAgent, topo);
+      var edgeGroupId = [edgeGroupAgent.getSource().getId(), edgeGroupAgent.getTarget().getId()];
       var data = {
         tags: [],
         tips: []
@@ -31,7 +31,7 @@ var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
       }
 
       return {
-        htId: edge.getId(),
+        htId: edgeGroupAgent.getId(),
         edgeGroupId: edgeGroupId,
         tags: data.tags,
         tips: data.tips,

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/htElementUtils.js

@@ -122,7 +122,7 @@ export function getEdges(dataModel) {
  */
 
 export function isEdgeGroup(edge) {
-  return isEdge(edge) && edge.a('edgegroup.isEdgeGroup');
+  return isEdge(edge) && edge.a('x.edgegroup.isEdgeGroup');
 }
 /**
  * 是否连线组代理
@@ -131,7 +131,7 @@ export function isEdgeGroup(edge) {
  */
 
 export function isEdgeGroupAgent(edge) {
-  return isEdgeGroup(edge) && isEdgeVisible(edge);
+  return isEdgeGroup(edge);
 }
 /**
  * TODO
@@ -209,6 +209,12 @@ export function getEdgeGroupByNodeTags(dataModel, nodeTag1, nodeTag2) {
 
   return getEdgeGroupByNodes(node1, node2);
 }
+/**
+ * 获得连线组连线列表
+ * @param {*} dataModel 
+ * @returns 
+ */
+
 export function getEdgeGroups(dataModel) {
   var edgeGroups = [];
   getEdges(dataModel).forEach(function (edge) {
@@ -220,6 +226,12 @@ export function getEdgeGroups(dataModel) {
   });
   return edgeGroups;
 }
+/**
+ * 获得连线组连线列表
+ * @param {*} dataModel 
+ * @returns 
+ */
+
 export function getEdgeGroupAgents(dataModel) {
   return getEdges(dataModel).filter(isEdgeGroupAgent);
 }

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/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;