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

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

@@ -5,6 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.formatBackgroundRgbaColor = formatBackgroundRgbaColor;
 exports.formatHexColor = formatHexColor;
+exports.formatRgbaColor = formatRgbaColor;
 exports.parseBackground = parseBackground;
 exports.parseColor = parseColor;
 
@@ -47,6 +48,11 @@ function parseBackground(colorStr) {
 function formatHexColor(color) {
   return color ? color.hex : null;
 }
+
+function formatRgbaColor(color) {
+  var rgb = color.rgb;
+  return "rgba(" + rgb.r + ", " + rgb.g + ", " + rgb.b + ", " + rgb.a + ")";
+}
 /**
  * 格式化背景rgba颜色
  * @param {{background, opacity}} prevColor
@@ -56,7 +62,7 @@ function formatHexColor(color) {
 
 function formatBackgroundRgbaColor(prevColor, currentColor) {
   if (!('background' in currentColor) && !('opacity' in currentColor)) {
-    return null;
+    return formatRgbaColor(prevColor.background);
   }
 
   var colorObj = Object.assign(prevColor, currentColor);

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

@@ -32,7 +32,8 @@ function setTextStyle(element, style) {
 
 
   var prevStyle = getTextStyle(element);
-  element.s('textBackground', (0, _colorUtil.formatBackgroundRgbaColor)(prevStyle, style));
+  var background = (0, _colorUtil.formatBackgroundRgbaColor)(prevStyle, style);
+  element.s('textBackground', background);
   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

@@ -17,7 +17,7 @@
     border: none !important;
     color: #4D6277;
     padding-left: 2px;
-    margin-right: 3px;
+    margin-right: 4px;
 
     &:active {
       background: #F2F7FD !important;

package/lib/core/editor/components/settings/common/NameInput.js

@@ -0,0 +1,33 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _input = _interopRequireDefault(require("@alifd/next/lib/input"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var NameInput = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
+  var multipleLine = props.multipleLine;
+
+  if (multipleLine) {
+    return /*#__PURE__*/_react["default"].createElement(_input["default"].TextArea, (0, _extends2["default"])({
+      ref: ref,
+      autoHeight: {
+        minRows: 4,
+        maxRows: 4
+      }
+    }, props));
+  }
+
+  return /*#__PURE__*/_react["default"].createElement(_input["default"], (0, _extends2["default"])({
+    ref: ref
+  }, props));
+});
+
+var _default = NameInput;
+exports["default"] = _default;

package/lib/core/editor/components/settings/propertyViews/box/NameInput.js

@@ -5,17 +5,17 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
-var _input = _interopRequireDefault(require("@alifd/next/lib/input"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _NameInput = _interopRequireDefault(require("../../common/NameInput"));
+
 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 NameInput = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
+var BoxNameInput = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
   var onChange = props.onChange,
       topo = props.topo;
 
@@ -47,14 +47,15 @@ var NameInput = /*#__PURE__*/_react["default"].forwardRef(function (props, ref)
     topo.historyManager.endTransaction();
   };
 
-  return /*#__PURE__*/_react["default"].createElement(_input["default"], (0, _extends2["default"])({}, props, {
+  return /*#__PURE__*/_react["default"].createElement(_NameInput["default"], (0, _extends2["default"])({}, props, {
     ref: ref,
     value: value,
+    multipleLine: true,
     onChange: handleChange,
     onFocus: handleFocus,
     onBlur: handleBlur
   }));
 });
 
-var _default = NameInput;
+var _default = BoxNameInput;
 exports["default"] = _default;

package/lib/core/editor/components/settings/propertyViews/group/SettingTab/GroupBasicSetting.js

@@ -9,8 +9,6 @@ var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _input = _interopRequireDefault(require("@alifd/next/lib/input"));
-
 var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
 
 var _collapse = _interopRequireDefault(require("@alifd/next/lib/collapse"));
@@ -27,6 +25,8 @@ var _GroupExpandSetting = _interopRequireDefault(require("./GroupExpandSetting")
 
 var _SpecialCharacterValidateUtil = require("../../../../../../../utils/SpecialCharacterValidateUtil");
 
+var _NameInput = _interopRequireDefault(require("../../../common/NameInput"));
+
 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; }
@@ -74,8 +74,9 @@ function GroupBasicSetting(props) {
     label: isCluster ? '集群名称' : '区域名称'
   }, _SpecialCharacterValidateUtil.SPECIAL_CHARACTER_FORM_ITEM_VALIDATE_PROPS, {
     patternTrigger: "onChange"
-  }), /*#__PURE__*/_react["default"].createElement(_input["default"], {
+  }), /*#__PURE__*/_react["default"].createElement(_NameInput["default"], {
     name: "attrObject.name",
+    multipleLine: true,
     maxLength: 30,
     placeholder: "\u8BF7\u8F93\u5165",
     onFocus: function onFocus() {

package/lib/core/editor/components/settings/propertyViews/layer/BasicSetting.js

@@ -9,8 +9,6 @@ var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _input = _interopRequireDefault(require("@alifd/next/lib/input"));
-
 var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
@@ -19,6 +17,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _SpecialCharacterValidateUtil = require("../../../../../../utils/SpecialCharacterValidateUtil");
 
+var _NameInput = _interopRequireDefault(require("../../common/NameInput"));
+
 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; }
@@ -62,8 +62,9 @@ function BasicSetting(props) {
       paddingLeft: 32,
       paddingRight: 16
     }
-  }), /*#__PURE__*/_react["default"].createElement(_input["default"], {
+  }), /*#__PURE__*/_react["default"].createElement(_NameInput["default"], {
     name: "styleMap.label",
+    multipleLine: true,
     maxLength: 30,
     placeholder: "\u8BF7\u8F93\u5165",
     onFocus: function onFocus() {

package/lib/core/editor/components/settings/propertyViews/node/Setting/NameInput.js

@@ -5,17 +5,17 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
-var _input = _interopRequireDefault(require("@alifd/next/lib/input"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _NameInput = _interopRequireDefault(require("../../../common/NameInput"));
+
 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 NameInput = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
+var NodeNameInput = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
   var onChange = props.onChange,
       topo = props.topo;
 
@@ -47,14 +47,15 @@ var NameInput = /*#__PURE__*/_react["default"].forwardRef(function (props, ref)
     topo.historyManager.endTransaction();
   };
 
-  return /*#__PURE__*/_react["default"].createElement(_input["default"], (0, _extends2["default"])({}, props, {
+  return /*#__PURE__*/_react["default"].createElement(_NameInput["default"], (0, _extends2["default"])({}, props, {
     ref: ref,
     value: value,
+    multipleLine: true,
     onChange: handleChange,
     onFocus: handleFocus,
     onBlur: handleBlur
   }));
 });
 
-var _default = NameInput;
+var _default = NodeNameInput;
 exports["default"] = _default;

package/lib/core/hooks/useCanvasTheme.js

@@ -51,7 +51,7 @@ function useCanvasTheme(props) {
 
   (0, _react.useEffect)(function () {
     // 设置
-    var themeConfig = themeMap[canvasTheme];
+    var themeConfig = themeMap[canvasTheme || 'white'];
 
     if (graphLoaded && themeConfig) {
       var _topo$historyManager2;

package/lib/core/models/TopoApp.js

@@ -52,7 +52,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "6.0.0-alpha.44" === 'string' ? "6.0.0-alpha.44" : null;
+var version = typeof "6.0.0-alpha.46" === 'string' ? "6.0.0-alpha.46" : 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.44",
+  "version": "6.0.0-alpha.46",
   "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.44/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.46/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }