@riil-frontend/component-topology 6.0.0-alpha.42 → 6.0.0-alpha.44

package/lib/components/VerticalIconTab/VerticalIconTab.js

@@ -9,6 +9,8 @@ var _tab = _interopRequireDefault(require("@alifd/next/lib/tab"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _balloon = _interopRequireDefault(require("@alifd/next/lib/balloon"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -26,8 +28,10 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  */
 function CustomTabItem(_ref) {
   var title = _ref.title,
+      titleTootip = _ref.titleTootip,
       icon = _ref.icon;
-  return /*#__PURE__*/_react["default"].createElement("div", {
+
+  var tabItem = /*#__PURE__*/_react["default"].createElement("div", {
     className: "v-icon-tab-item"
   }, /*#__PURE__*/_react["default"].createElement("img", {
     src: icon,
@@ -35,6 +39,15 @@ function CustomTabItem(_ref) {
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "tab-title"
   }, title));
+
+  return /*#__PURE__*/_react["default"].createElement(_balloon["default"].Tooltip, {
+    trigger: tabItem,
+    align: "r" // 解决遮挡下拉浮层问题
+    ,
+    popupStyle: {
+      zIndex: 1000
+    }
+  }, titleTootip);
 }
 /**
  * 竖向

package/lib/components/VerticalIconTab/VerticalIconTab.module.scss

@@ -33,6 +33,7 @@
       justify-content: center;
       margin: 0 4px;
       border-radius: 4px;
+      user-select: none;
 
       &:hover {
         background-color: rgba(76, 137, 255, 0.1);

package/lib/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js

@@ -87,13 +87,18 @@ var _default = function _default(props) {
             case 7:
               extraOnOk = displaySettingProps === null || displaySettingProps === void 0 ? void 0 : displaySettingProps.onOk;
 
-              if (extraOnOk) {
-                extraOnOk(displayConfig);
+              if (!extraOnOk) {
+                _context2.next = 11;
+                break;
               }
 
+              _context2.next = 11;
+              return extraOnOk(displayConfig);
+
+            case 11:
               topo.historyManager.endTransaction();
 
-            case 10:
+            case 12:
             case "end":
               return _context2.stop();
           }

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

@@ -147,7 +147,7 @@ var Topology = function Topology(props) {
     return function () {
       _rlog["default"].info('TopoView 退出');
 
-      topo.selectionManager.destroy();
+      topo.selectionModel.destroy();
       topoDispatchers.reset();
     };
   }, []);
@@ -177,7 +177,7 @@ var Topology = function Topology(props) {
       topo.historyManager = new _HistoryManager["default"](topo, htHistoryManager);
     }
 
-    topo.selectionManager.init();
+    topo.selectionModel.init();
     topoDispatchers.update({
       graphLoaded2: true
     });
@@ -197,7 +197,7 @@ var Topology = function Topology(props) {
     (0, _graphLinkUtil.fixLink)(topo);
     (0, _clusterUtil.handleClusterNoPermission)(topo);
     (0, _edgeUtil.updateEdgeExpanded)(topo);
-    topo.selectionManager.init();
+    topo.selectionModel.init();
     topoDispatchers.update({
       graphLoaded: true
     });

package/lib/core/editor/components/Sidebar/panes.js

@@ -16,28 +16,33 @@ var _ImagePanel = _interopRequireDefault(require("./views/ImagePanel"));
 var _LinkPanel = _interopRequireDefault(require("./views/LinkPanel"));
 
 var panes = [{
-  title: '链路',
   key: '1',
+  title: '链路',
+  titleTootip: '在两个节点之间添加链路&线',
   icon: '/img/topo/editor/sidebar/icon/链路.svg',
   content: _LinkPanel["default"]
 }, {
   title: '组件',
   key: '2',
+  titleTootip: '基础组件',
   icon: '/img/topo/editor/sidebar/icon/组件.svg',
   content: _ComponentPanel["default"]
 }, {
   title: '图片',
   key: '3',
+  titleTootip: '图片素材',
   icon: '/img/topo/editor/sidebar/icon/图片.svg',
   content: _ImagePanel["default"]
 }, {
   title: '背景',
   key: '4',
+  titleTootip: '背景素材',
   icon: '/img/topo/editor/sidebar/icon/背景.svg',
   content: _BackgroundPanel["default"]
 }, {
   title: '画布',
   key: '5',
+  titleTootip: '拓扑图画布底图',
   icon: '/img/topo/editor/sidebar/icon/画布.svg',
   content: _CanvasPanel["default"]
 }];

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

@@ -39,7 +39,7 @@ function AddResourceButton(props) {
       topoEdit = props.topoEdit,
       editorProps = props.editorProps; // 选中的元素
 
-  var selection = topo.selectionManager.useSelection();
+  var selection = topo.selectionModel.useSelection();
 
   var _useState = (0, _react.useState)(getAddType(selection)),
       addType = _useState[0],

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

@@ -36,7 +36,7 @@ function BoxBackgroundButton(props) {
       setDisabled = _useState[1]; // 选中的元素
 
 
-  var selection = topo.selectionManager.useSelection();
+  var selection = topo.selectionModel.useSelection();
   (0, _react.useEffect)(function () {// setDisabled(false)
   }, [selection]);
   var icon = disabled ? /*#__PURE__*/_react["default"].createElement("img", {

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

@@ -48,7 +48,7 @@ function EdgeColorButton(props) {
       graphLoaded = _topo$store$useModelS.graphLoaded; // 选中的元素
 
 
-  var selection = topo.selectionManager.useHtSelection();
+  var selection = topo.selectionModel.useHtSelection();
 
   var loopEdges = function loopEdges(edges, operateEdgeFn) {
     edges.forEach(function (edge) {

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

@@ -46,7 +46,7 @@ function EdgeTypeButton(props) {
       graphLoaded = _topo$store$useModelS.graphLoaded; // 选中的元素
 
 
-  var selection = topo.selectionManager.useHtSelection();
+  var selection = topo.selectionModel.useHtSelection();
   (0, _react.useEffect)(function () {
     if (graphLoaded) {
       var edges = (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo);

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

@@ -27,30 +27,42 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function FontColorDropdown(props) {
   var onChange = props.onChange,
       topo = props.topo,
-      color = props.color,
-      background = props.background,
       opacity = props.opacity;
 
   var _useState = (0, _react.useState)(false),
       disabled = _useState[0],
       setDisabled = _useState[1];
 
-  var backOpacityChange = function backOpacityChange(value) {
+  var onPickerFocus = function onPickerFocus() {
+    topo.historyManager.beginTransaction();
+  };
+
+  var onPickerBlur = function onPickerBlur() {
+    topo.historyManager.endTransaction();
+  };
+
+  var backOpacityChange = function backOpacityChange(value, type) {
+    if (type === 'select') onPickerFocus();
     onChange({
       opacity: value / 100
     });
+    if (type === 'select') onPickerBlur();
   };
 
-  var colorChang = function colorChang(value) {
+  var colorChang = function colorChang(value, type) {
+    if (type === 'select') onPickerFocus();
     onChange({
       color: value
     });
+    if (type === 'select') onPickerBlur();
   };
 
   var backgroundChang = function backgroundChang(value) {
+    onPickerFocus();
     onChange({
       background: value
     });
+    onPickerBlur();
   };
 
   var icon = disabled ? /*#__PURE__*/_react["default"].createElement("img", {
@@ -67,9 +79,16 @@ function FontColorDropdown(props) {
     className: _FontColorButtonModule["default"].content
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: _FontColorButtonModule["default"].fontColor
-  }, /*#__PURE__*/_react["default"].createElement("span", null, "\u5B57\u4F53\u989C\u8272"), /*#__PURE__*/_react["default"].createElement(_ColorPanel["default"], {
-    onChange: colorChang
-  })), /*#__PURE__*/_react["default"].createElement("div", {
+  }, /*#__PURE__*/_react["default"].createElement("span", null, "\u5B57\u4F53\u989C\u8272"), /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      marginTop: '10px',
+      marginLeft: '-4px'
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_ColorPanel["default"], {
+    onChange: colorChang,
+    onPickerFocus: onPickerFocus,
+    onPickerBlur: onPickerBlur
+  }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: _FontColorButtonModule["default"].backgroundColor
   }, /*#__PURE__*/_react["default"].createElement("span", null, "\u80CC\u666F\u586B\u5145"), /*#__PURE__*/_react["default"].createElement("div", {
     className: _FontColorButtonModule["default"].backOpacity
@@ -81,11 +100,19 @@ function FontColorDropdown(props) {
     unit: "%",
     list: [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100],
     onChange: backOpacityChange,
-    defaultValue: opacity
-  })), /*#__PURE__*/_react["default"].createElement(_ColorPanel["default"], {
+    defaultValue: opacity * 100
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      marginTop: '10px',
+      marginLeft: '-4px',
+      marginBottom: '3px'
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_ColorPanel["default"], {
     showClear: true,
-    onChange: backgroundChang
-  }))));
+    onChange: backgroundChang,
+    onPickerFocus: onPickerFocus,
+    onPickerBlur: onPickerBlur
+  })))));
 }
 
 function FontColorButton(props) {
@@ -102,7 +129,6 @@ function FontColorButton(props) {
     background: style.background,
     opacity: style.opacity,
     onChange: function onChange(val) {
-      topo.historyManager.beginTransaction();
       setStyle(val);
       topo.historyManager.endTransaction();
     },

package/lib/core/editor/components/Toolbar/widgets/FontColorButton.module.scss

@@ -1,20 +1,20 @@
 .content {
-  height: 296px;
+  margin: 4px 0px 0px 6px;
  .fontColor{
   width: 100%;
-  height: 143px;//159px
+  margin-bottom: 16px;
   .colorPanelBox{
     padding: 9px;
     padding-top: 8px;
   }
   &>span{
     font-size: 12px;
-    color: black;
     font-family: PingFangSC-Regular, PingFang SC;
     font-weight: 400;
     color: #4D6277;
     line-height: 17px;
    }
+   
  }
  .backgroundColor{
   width: 100%;
@@ -32,9 +32,8 @@
     line-height: 17px;
    }
    .backOpacity{
-    margin-top: 2px;
+    margin-top: 5px;
     margin-bottom: 5px;
-    margin-left: 11px;
     line-height: 8px;
     display: flex;
     flex-direction: row;

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

@@ -74,7 +74,7 @@ function FontStyleButton(props) {
       setValue = _useState2[1]; // 选中的元素
 
 
-  var selection = topo.selectionManager.useHtSelection();
+  var selection = topo.selectionModel.useHtSelection();
   (0, _react.useEffect)(function () {
     var isAllText = !selection.filter(function (ele) {
       return !(0, _htElementUtils.isText)(ele);

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

@@ -34,7 +34,7 @@ function Layout(props) {
       setLayout = _useState[1]; // 选中的元素
 
 
-  var selectionElements = topo.selectionManager.useHtSelection();
+  var selectionElements = topo.selectionModel.useHtSelection();
 
   var _topo$store$useModelS = topo.store.useModelState('selection'),
       selection = _topo$store$useModelS.selection;
@@ -102,7 +102,7 @@ function LayoutWidget(props) {
   // type为partition且selection.length>=0时可以点击布局， selection[0].className != 'ht.Node'
   // type为auto且selection.length==0时可以点击布局 
 
-  var selectionElements = topo.selectionManager.useHtSelection();
+  var selectionElements = topo.selectionModel.useHtSelection();
   var topoShowType = topoState.type; // 获取ID以及拓扑类型 // 拓扑类型：auto自由布局，layers分层，partition分区
 
   var disabled = (0, _react.useMemo)(function () {

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

@@ -53,7 +53,7 @@ function NodeAlignWidget(props) {
       graphLoaded = _topo$store$useModelS.graphLoaded; // 选中的元素
 
 
-  var selection = topo.selectionManager.useHtSelection();
+  var selection = topo.selectionModel.useHtSelection();
 
   var setSpace = function setSpace(type, num) {
     topo.historyManager.beginTransaction(); // eslint-disable-next-line no-shadow
@@ -87,6 +87,13 @@ function NodeAlignWidget(props) {
       setLeftInputVal();
       setRightInputVal();
       setDistributionDisabled(nodes.length <= 2);
+
+      if (nodes.length === 2) {
+        var h = topo.view.topoClient.htTopoClient.getElementsSpace(nodes, 'h')[0];
+        var v = topo.view.topoClient.htTopoClient.getElementsSpace(nodes, 'v')[0];
+        setLeftInputVal(h * 1 > 0 ? h : 0);
+        setRightInputVal(v * 1 > 0 ? v : 0);
+      }
     } // eslint-disable-next-line react-hooks/exhaustive-deps
 
   }, [graphLoaded, selection]);

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

@@ -42,7 +42,7 @@ function NodeImageButton(props) {
       setImgVal = _useState2[1]; // 选中的元素
 
 
-  var selection = topo.selectionManager.useHtSelection();
+  var selection = topo.selectionModel.useHtSelection();
   (0, _react.useEffect)(function () {
     var nodes = selection.filter(function (ele) {
       return (0, _htElementUtils.isGroup)(ele) || (0, _htElementUtils.isNode)(ele);

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

@@ -46,7 +46,7 @@ function NodeSizeButton(props) {
       setSize = _useState2[1]; // 选中的元素
 
 
-  var selection = topo.selectionManager.useSelection();
+  var selection = topo.selectionModel.useSelection();
   var settingRuntimeState = (0, _useSettingRuntimeState["default"])();
   (0, _react.useEffect)(function () {
     var elements = selection.map(function (item) {

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/ElementTextStyleSetting.js

@@ -29,7 +29,7 @@ function ElementTextStyleSetting(props) {
       graphLoaded = _topo$store$useModelS.graphLoaded; // 选中的元素
 
 
-  var selection = topo.selectionManager.useSelection();
+  var selection = topo.selectionModel.useSelection();
   var htSelection = (0, _react.useMemo)(function () {
     if (!selection.length) {
       return [];

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/textStyleSettingRouter.js

@@ -17,7 +17,7 @@ function textStyleSettingRouter(Component, options) {
   var names = (options === null || options === void 0 ? void 0 : options.names) || [];
   return function TextStyleSettingButton(props) {
     var topo = props.topo;
-    var selection = topo.selectionManager.useHtSelection();
+    var selection = topo.selectionModel.useHtSelection();
     var Widget = !selection.length ? _GlobalTagStyleSetting["default"] : _ElementTextStyleSetting["default"];
     return /*#__PURE__*/_react["default"].createElement(Widget, (0, _extends2["default"])({
       Component: Component

package/lib/core/editor/components/settings/CloseablePanel.module.scss

@@ -1,9 +1,21 @@
+@import '~@alifd/next/variables.scss';
+
+
 .panel {
   height: 100%;
   display: flex;
   flex-direction: column;
   background: #FFFFFF;
+
+  
+  :global {
+    .#{$css-prefix}drawer-header {
+      padding-left: 16px;
+      padding-right: 16px;
+    }
+  }
 }
 .body {
   flex: 1;
+  overflow: auto;
 }

package/lib/core/editor/components/settings/PropertyView.js

@@ -3,21 +3,25 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports["default"] = PropertyView;
+exports["default"] = PropertyPanel;
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _CloseablePanel = _interopRequireDefault(require("./CloseablePanel"));
 
-var _OpenPropertyPanelListener = _interopRequireDefault(require("./OpenPropertyPanelListener"));
+var _PropertyViewManager = _interopRequireDefault(require("./core/PropertyViewManager"));
 
 var _Settings = _interopRequireDefault(require("./Settings"));
 
 var _SettingsModule = _interopRequireDefault(require("./Settings.module.scss"));
 
-function PropertyView(props) {
+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; }
+
+function PropertyPanel(props) {
   var _classNames;
 
   var topo = props.topo,
@@ -35,37 +39,40 @@ function PropertyView(props) {
       topoEditDispatchers = _topo$store$useModel[1];
 
   var propertyPanelVisible = topoEditState.propertyPanelVisible;
+  var propertyViewManager = (0, _react.useMemo)(function () {
+    return new _PropertyViewManager["default"](topo);
+  }, []);
+  (0, _react.useEffect)(function () {
+    if (graphLoaded) {
+      propertyViewManager.init();
+    }
 
-  if (!graphLoaded) {
-    return null;
-  }
+    return function () {
+      propertyViewManager.destroy();
+    };
+  }, [graphLoaded, propertyViewManager]);
 
   var renderContent = function renderContent() {
     if (!propertyPanelVisible) {
       return null;
     }
 
-    return /*#__PURE__*/_react["default"].createElement(_OpenPropertyPanelListener["default"], {
-      topo: topo
-    }, /*#__PURE__*/_react["default"].createElement(_Settings["default"], {
+    return /*#__PURE__*/_react["default"].createElement(_Settings["default"], {
       topo: topo,
+      selection: selection,
+      propertyViewManager: propertyViewManager,
       topoShowType: topoShowType,
       topoEditApi: topo.topoEdit,
-      selection: selection,
       editorProps: editorProps
-    }));
+    });
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])(_SettingsModule["default"].settingsPanel, (_classNames = {}, _classNames[_SettingsModule["default"].settingsPanelHide] = !propertyPanelVisible, _classNames))
+    className: (0, _classnames["default"])(_SettingsModule["default"].propertyPanel, (_classNames = {}, _classNames[_SettingsModule["default"].hide] = !propertyPanelVisible, _classNames))
   }, /*#__PURE__*/_react["default"].createElement(_CloseablePanel["default"], {
     title: "\u6570\u636E\u5C5E\u6027",
     onClose: function onClose() {
-      topoEditDispatchers.update({
-        propertyPanelVisible: false
-      });
+      propertyViewManager.close();
     }
-  }, /*#__PURE__*/_react["default"].createElement(_OpenPropertyPanelListener["default"], {
-    topo: topo
-  }, renderContent())));
+  }, renderContent()));
 }