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

package/lib/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.js

@@ -9,6 +9,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
+var _resizeObserverPolyfill = _interopRequireDefault(require("resize-observer-polyfill"));
+
 var _HtImagePaletteModule = _interopRequireDefault(require("./HtImagePalette.module.scss"));
 
 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); }
@@ -36,13 +38,22 @@ function HtImagePalette(props) {
       viewRef.current = htTopo.createImagePalette(container, {
         icons: icons
       });
-      console.error(viewRef.current);
     } catch (error) {
       _rlog["default"].error('初始化资源面板失败', error);
-    } // 注销组件
+    }
+
+    var hanleResize = function hanleResize() {
+      if (viewRef.current) {
+        topo.getHtTopo().invalideComponents();
+      }
+    };
 
+    var resizeObserver = new _resizeObserverPolyfill["default"](hanleResize);
+    resizeObserver.observe(container); // 注销组件
 
     return function () {
+      resizeObserver.disconnect();
+
       if (viewRef.current) {
         viewRef.current.destroy();
         viewRef.current = null;

package/lib/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.module.scss

@@ -1,5 +1,5 @@
 .container {
   width: 100%;
   height: 100%;
-  overflow: auto;
+  overflow: hidden;
 }

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

@@ -21,13 +21,22 @@ function Content(props) {
       onPickerBlur = props.onPickerBlur,
       lineSizeChange = props.lineSizeChange,
       lineWidth = props.lineWidth;
-  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("div", null, "\u7EBF"), /*#__PURE__*/_react["default"].createElement("div", {
+  return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      width: 200,
+      marginTop: '6px',
+      marginLeft: '12px'
+    }
+  }, /*#__PURE__*/_react["default"].createElement("div", null, "\u7EBF"), /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      width: 183,
       display: 'flex',
       marginTop: '8px'
     }
   }, /*#__PURE__*/_react["default"].createElement("img", {
+    style: {
+      width: 14,
+      height: 14
+    },
     src: "/img/topo/editor/toolbar/\u7EBF\u6761\u586B\u5145/\u8FB9\u6846.svg",
     title: "\u7EBF\u6761\u5BBD\u5EA6"
   }), /*#__PURE__*/_react["default"].createElement(_FontColorRange["default"], {
@@ -39,7 +48,7 @@ function Content(props) {
   })), /*#__PURE__*/_react["default"].createElement("div", {
     style: {
       marginTop: '5px',
-      marginLeft: '-2px'
+      marginLeft: '-5px'
     }
   }, /*#__PURE__*/_react["default"].createElement(_ColorPanel["default"], {
     onChange: onChange,

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

@@ -39,7 +39,7 @@ function EdgeColorButton(props) {
       disabled = _useState[0],
       setDisabled = _useState[1];
 
-  var _useState2 = (0, _react.useState)(),
+  var _useState2 = (0, _react.useState)(1),
       lineWidth = _useState2[0],
       setLineWidth = _useState2[1]; // 拓扑图是否加载
 
@@ -72,7 +72,7 @@ function EdgeColorButton(props) {
     if (graphLoaded) {
       var edges = (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo);
       var list = getLines(edges);
-      setLineWidth(0); // eslint-disable-next-line eqeqeq
+      setLineWidth(1); // eslint-disable-next-line eqeqeq
 
       if (selection.length == 1 && selection[0].a('type') == 'line') {
         setLineWidth(list[0] && (list[0].a('styles') && list[0].a('styles').width || list[0].getStyleMap()['edge.width']) || 2);

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

@@ -45,12 +45,8 @@ function NodeAlignWidget(props) {
       setRightInputVal = _useState3[1];
 
   var _useState4 = (0, _react.useState)(true),
-      leftDisable = _useState4[0],
-      setLeftDisable = _useState4[1];
-
-  var _useState5 = (0, _react.useState)(true),
-      rightDisable = _useState5[0],
-      setRightDisable = _useState5[1]; // 拓扑图是否加载
+      distributionDisabled = _useState4[0],
+      setDistributionDisabled = _useState4[1]; // 拓扑图是否加载
 
 
   var _topo$store$useModelS = topo.store.useModelState('topoMod'),
@@ -60,7 +56,8 @@ function NodeAlignWidget(props) {
   var selection = topo.selectionManager.useSelection();
 
   var setSpace = function setSpace(type, num) {
-    topo.historyManager.beginTransaction();
+    topo.historyManager.beginTransaction(); // eslint-disable-next-line no-shadow
+
     var selection = topo.getHtTopo().getGraphView().getSelectionModel().getSelection().toArray();
     var nodes = selection.filter(function (ele) {
       return !(0, _htElementUtils.isLayer)(ele) && !(0, _htElementUtils.isEdge)(ele);
@@ -85,31 +82,14 @@ function NodeAlignWidget(props) {
       var nodes = selectionEle.filter(function (ele) {
         return !(0, _htElementUtils.isLayer)(ele) && !(0, _htElementUtils.isEdge)(ele);
       });
-      setDisabled(nodes.length <= 1);
-      getClickType('none');
-      setLeftInputVal();
-      setRightInputVal();
-    }
-  }, [graphLoaded, selection]);
+      setDisabled(nodes.length <= 1); // eslint-disable-next-line no-use-before-define
 
-  var getClickType = function getClickType(type) {
-    if (leftInputVal || rightInputVal) {
       setLeftInputVal();
       setRightInputVal();
-    }
-
-    setLeftDisable(true);
-    setRightDisable(true);
-
-    if (type === 'top' || type === 'middle' || type === 'bottom') {
-      setLeftDisable(false);
-    }
-
-    if (type === 'left' || type === 'center' || type === 'right') {
-      setRightDisable(false);
-    }
-  };
+      setDistributionDisabled(nodes.length <= 2);
+    } // eslint-disable-next-line react-hooks/exhaustive-deps
 
+  }, [graphLoaded, selection]);
   var icon = disabled ? /*#__PURE__*/_react["default"].createElement("img", {
     src: "/img/topo/editor/toolbar/\u5BF9\u9F50/Disable.svg",
     alt: ""
@@ -127,9 +107,9 @@ function NodeAlignWidget(props) {
     trigger: icon
   }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_AlignSetting["default"], {
     topo: topo,
-    getClickType: getClickType
+    distributionDisabled: distributionDisabled
   }), /*#__PURE__*/_react["default"].createElement(_numberPicker["default"], {
-    disabled: leftDisable,
+    disabled: disabled,
     size: "small",
     hasTrigger: false,
     placeholder: "\u591A\u4E2A\u503C",
@@ -139,7 +119,7 @@ function NodeAlignWidget(props) {
     max: 10000,
     onChange: leftInputChange
   }), /*#__PURE__*/_react["default"].createElement(_numberPicker["default"], {
-    disabled: rightDisable,
+    disabled: disabled,
     size: "small",
     hasTrigger: false,
     placeholder: "\u591A\u4E2A\u503C",

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

@@ -1,15 +1,17 @@
 .leftInput{
   width: 100px !important;
-  margin-right: 10px;
-  margin-left: 5px;
+  margin: 0px 10px 18px 9px;
   :global{
     input{
       background: url('/img/topo/editor/toolbar/对齐/水平间距_normal.svg')no-repeat 5px center !important;
-      background-position: right center !important;
+      background-position: 81px center !important;
     }
     .next-disabled input{
       background: url('/img/topo/editor/toolbar/对齐/水平间距_disable.svg')no-repeat 5px center !important;
-      background-position: right center !important;
+      background-position: 81px center !important;
+    }
+    .next-input.next-small input{
+      height: calc(30px - 1px * 2);
     }
   }
 }
@@ -18,11 +20,14 @@
   :global{
     input{
       background: url('/img/topo/editor/toolbar/对齐/垂直间距 _normal.svg')no-repeat 5px center !important;
-      background-position: right center !important;
+      background-position: 82px center !important;
     }
     .next-disabled input{
       background: url('/img/topo/editor/toolbar/对齐/垂直间距_disable.svg')no-repeat 5px center !important;
-      background-position: right center !important;
+      background-position: 82px center !important;
+    }
+    .next-input.next-small input{
+      height: calc(30px - 1px * 2);
     }
   }
 }

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

@@ -0,0 +1,61 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.formatBackgroundRgbaColor = formatBackgroundRgbaColor;
+exports.formatHexColor = formatHexColor;
+exports.parseColor = parseColor;
+
+var _color = _interopRequireDefault(require("color"));
+
+/**
+ * 解析颜色字符串为对象
+ * 
+ * @param {string} colorStr 
+ * @returns {null|{hex, rgb:{r,g,b,a}}}
+ */
+function parseColor(colorStr) {
+  if (!colorStr) {
+    return null;
+  }
+
+  var color = (0, _color["default"])(colorStr);
+  var rgb = color.rgb();
+  return {
+    hex: color.hex(),
+    rgb: {
+      r: rgb.color[0],
+      g: rgb.color[1],
+      b: rgb.color[2],
+      a: rgb.valpha
+    }
+  };
+}
+
+function formatHexColor(color) {
+  return color ? color.hex : null;
+}
+/**
+ * 格式化背景rgba颜色
+ * @param {{background, opacity}} prevColor
+ * @param {{background, opacity}} currentColor
+ */
+
+
+function formatBackgroundRgbaColor(prevColor, currentColor) {
+  if (!('background' in currentColor) && !('opacity' in currentColor)) {
+    return null;
+  }
+
+  var colorObj = Object.assign(prevColor, currentColor);
+  var background = colorObj.background,
+      opacity = colorObj.opacity;
+
+  if (!background) {
+    return null;
+  }
+
+  var rgb = background.rgb;
+  return "rgba(" + rgb.r + ", " + rgb.g + ", " + rgb.b + ", " + opacity + ")";
+}

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

@@ -8,9 +8,14 @@ exports.setTextStyle = setTextStyle;
 function getTextStyle(element) {
   return {
     color: null,
+    // 文字颜色
     fontFamily: null,
-    fontSize: null,
-    fontStyle: []
+    fontSize: null // fontBold: false, // 文字样式加粗 @V1.2
+    // fontItalic: false, // 文字样式斜体 @V1.2
+    // fontUnderline: false, // 文字样式下划线 @V1.2
+    // background: {rgb: {}, hex: ''}, // 背景颜色，rgba格式。null表示无
+    // opacity: 1, // 背景透明度。值范围 0-1, null，null表示无
+
   };
 }
 

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

@@ -11,21 +11,36 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _fontStyleUtil = _interopRequireDefault(require("../../../../../../settings/common/text/fontStyleUtil"));
 
+var _colorUtil = require("../colorUtil");
+
 function getTextStyle(element) {
+  var _background$rgb;
+
   var underline = element.s('text.decoration') === 'underline';
+  var background = (0, _colorUtil.parseColor)(element.s('textBackground'));
   return (0, _extends2["default"])({
-    color: null,
+    color: (0, _colorUtil.parseColor)(element.s('text.color')),
     underline: underline
-  }, _fontStyleUtil["default"].toMap(element.s('text.font')));
+  }, _fontStyleUtil["default"].toMap(element.s('text.font')), {
+    background: background,
+    // 背景颜色，格式: {rgba: {}, hex: ''} | null
+    opacity: background === null || background === void 0 ? void 0 : (_background$rgb = background.rgb) === null || _background$rgb === void 0 ? void 0 : _background$rgb.a // 背景透明度。值范围 0-1, null，null表示无
+
+  });
 }
 
 function setTextStyle(element, style) {
-  var underline = style.underline;
-
   if ('underline' in style) {
-    element.s('text.decoration', underline ? 'underline' : null);
+    element.s('text.decoration', style.underline ? 'underline' : null);
   }
 
+  if ('color' in style) {
+    element.s('text.color', style.color.hex);
+  } // 背景颜色
+
+
+  var prevStyle = getTextStyle(element);
+  element.s('textBackground', (0, _colorUtil.formatBackgroundRgbaColor)(prevStyle, style));
   var fontStyle = (0, _extends2["default"])({}, getTextStyle(element), style);
 
   var fontStr = _fontStyleUtil["default"].build(fontStyle);

package/lib/core/editor/components/settings/common/AlignSetting/AlignSetting.module.scss

@@ -1,12 +1,13 @@
 @import "@alifd/next/variables";
 
 .AlignSetting {
+  margin: 11px 7px 17px 7px;
   :global {
     .#{$css-prefix}divider-ver {
       background: #EBECF0;
       margin-right: 3px;
       height: 16px;
-
+      width:1px;
     }
   }
 
@@ -16,7 +17,7 @@
     border-radius: 4px;
     border: none !important;
     color: #4D6277;
-    padding-left: 6px;
+    padding-left: 2px;
     margin-right: 3px;
 
     &:active {

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.34" === 'string' ? "6.0.0-alpha.34" : 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.34",
+  "version": "6.0.0-alpha.37",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -41,6 +41,7 @@
     "@ahooksjs/use-sortable-plugin": "^0.2.1",
     "@ahooksjs/use-tree-plugin": "^0.2.1",
     "@alifd/biz-anchor": "^1.1.7",
+    "color": "^4.2.3",
     "@ice/store": "^1.4.2",
     "@riil-frontend/component-topo-icon-select": "^1.0.17",
     "@riil-frontend/component-topology-utils": "^2.1.0",
@@ -115,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.34/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.37/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }