@riil-frontend/component-topology 6.0.0-alpha.35 → 6.0.0-alpha.37

package/lib/core/editor/components/settings/common/AlignSetting/AlignTypeList.js

@@ -20,45 +20,46 @@ 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; }
 
 var TREE_LAYOUT_OPTIONS = [{
-  value: "left",
-  label: "左对齐",
-  icon: "tuopu_zuoceduiqi"
+  value: 'left',
+  label: '左对齐',
+  icon: 'tuopu_zuoceduiqi'
 }, {
-  value: "center",
-  label: "水平居中",
-  icon: "tuopu_shuipingjuzhongduiqi"
+  value: 'center',
+  label: '水平居中',
+  icon: 'tuopu_shuipingjuzhongduiqi'
 }, {
-  value: "right",
-  label: "右对齐",
-  icon: "tuopu_youceduiqi"
+  value: 'right',
+  label: '右对齐',
+  icon: 'tuopu_youceduiqi'
 }, {
-  value: "top",
-  label: "靠上对齐",
-  icon: "tuopu_dingbuduiqi"
+  value: 'top',
+  label: '靠上对齐',
+  icon: 'tuopu_dingbuduiqi'
 }, {
-  value: "middle",
-  label: "垂直居中",
-  icon: "tuopu_chuizhijuzhongduiqi"
+  value: 'middle',
+  label: '垂直居中',
+  icon: 'tuopu_chuizhijuzhongduiqi'
 }, {
-  value: "bottom",
-  label: "靠下对齐",
-  icon: "tuopu_dibuduiqi"
+  value: 'bottom',
+  label: '靠下对齐',
+  icon: 'tuopu_dibuduiqi'
 }, {
-  value: "divide"
+  value: 'divide'
 }, {
-  value: "distributeHorizontal",
-  label: "横向分布",
-  icon: "tuopu_shuipingdengjianjuduiqi"
+  value: 'distributeHorizontal',
+  label: '横向分布',
+  icon: 'tuopu_shuipingdengjianjuduiqi'
 }, {
-  value: "distributeVertical",
-  label: "纵向分布",
-  icon: "tuopu_chuizhidengjianjuduiqi"
+  value: 'distributeVertical',
+  label: '纵向分布',
+  icon: 'tuopu_chuizhidengjianjuduiqi'
 }];
 
 var AlignTypeList = function AlignTypeList(props) {
   var _props$selected = props.selected,
-      selected = _props$selected === void 0 ? "left" : _props$selected,
-      onChange = props.onChange;
+      selected = _props$selected === void 0 ? 'left' : _props$selected,
+      onChange = props.onChange,
+      distributionDisabled = props.distributionDisabled;
 
   var _useState = (0, _react.useState)(selected),
       value = _useState[0],
@@ -73,16 +74,19 @@ var AlignTypeList = function AlignTypeList(props) {
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _AlignSettingModule["default"].AlignSetting
   }, TREE_LAYOUT_OPTIONS.map(function (item, index, array) {
-    return item.value === "divide" ? /*#__PURE__*/_react["default"].createElement(_divider["default"], {
+    return item.value === 'divide' ? /*#__PURE__*/_react["default"].createElement(_divider["default"], {
       key: index,
       direction: "ver"
     }) : /*#__PURE__*/_react["default"].createElement(_button["default"], {
       key: index,
       className: "" + _AlignSettingModule["default"].redioBtn,
+      text: true,
       onClick: function onClick() {
         handleChange(item);
       },
-      title: item.label
+      title: item.label // eslint-disable-next-line no-unneeded-ternary
+      ,
+      disabled: (item.value === 'distributeHorizontal' || item.value === 'distributeVertical') && distributionDisabled
     }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
       type: item.icon
     }));

package/lib/core/editor/components/settings/common/AlignSetting/index.js

@@ -13,10 +13,9 @@ var _AlignTypeList = _interopRequireDefault(require("./AlignTypeList"));
 
 function AlignSetting(props) {
   var topo = props.topo,
-      getClickType = props.getClickType;
+      distributionDisabled = props.distributionDisabled;
 
   var alignOnChange = function alignOnChange(type) {
-    getClickType(type);
     topo.historyManager.beginTransaction();
     var selection = topo.getHtTopo().getGraphView().getSelectionModel().getSelection().toArray();
     var nodes = selection.filter(function (ele) {
@@ -29,6 +28,7 @@ function AlignSetting(props) {
 
   return /*#__PURE__*/_react["default"].createElement(_AlignTypeList["default"], {
     onChange: alignOnChange,
-    selected: "left"
+    selected: "left",
+    distributionDisabled: distributionDisabled
   });
 }

package/lib/core/hooks/useCanvasTheme.js

@@ -14,35 +14,49 @@ 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; }
 
 var themeMap = [{
-  value: 'white',
+  name: 'white',
   label: '白色',
-  color: '#FFFFFF'
+  color: null,
+  toolsTheme: 'lightgrayblue'
 }, {
-  value: 'lightblue',
+  name: 'lightblue',
   label: '蓝色',
-  color: '#F9FBFF'
+  color: '#F9FBFF',
+  toolsTheme: 'white'
 }, {
-  value: 'yellow',
+  name: 'yellow',
   label: '黄色',
   color: '#FFFDE6'
 }, {
-  value: 'green',
+  name: 'green',
   label: '绿色',
   color: '#EAFFE8'
 }, {
-  value: 'dark',
+  name: 'dark',
   label: '深色',
-  color: '#031425'
+  color: '#031425',
+  toolsTheme: 'black'
 }].reduce(function (map, item) {
   var _extends2;
 
-  return (0, _extends3["default"])({}, map, (_extends2 = {}, _extends2[item.value] = item, _extends2));
+  return (0, _extends3["default"])({}, map, (_extends2 = {}, _extends2[item.name] = item, _extends2));
 }, {});
 
 function useCanvasTheme(props) {
-  var canvasTheme = props.canvasTheme;
-  (0, _react.useEffect)(function () {// 设置
-  }, [canvasTheme]);
+  var topo = props.topo,
+      canvasTheme = props.canvasTheme; // 拓扑图是否加载
+
+  var _topo$store$useModelS = topo.store.useModelState('topoMod'),
+      graphLoaded = _topo$store$useModelS.graphLoaded;
+
+  (0, _react.useEffect)(function () {
+    // 设置
+    var themeConfig = themeMap[canvasTheme];
+
+    if (graphLoaded && themeConfig) {
+      topo.getHtTopo().setToolsTheme(themeConfig.toolsTheme);
+    }
+  }, [canvasTheme, graphLoaded]);
   return {
     canvasColor: themeMap[canvasTheme].color
   };

package/lib/core/models/TopoApp.js

@@ -52,7 +52,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionManager = _interopRequireDefault(require("./SelectionManager"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "6.0.0-alpha.35" === 'string' ? "6.0.0-alpha.35" : null;
+var version = typeof "6.0.0-alpha.37" === 'string' ? "6.0.0-alpha.37" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "6.0.0-alpha.35",
+  "version": "6.0.0-alpha.37",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.35/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.37/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }