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

package/es/components/ColorPanel/index.js

@@ -138,7 +138,7 @@ function ColorPanel(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: styles.swatch,
     onClick: function onClick() {
-      colorChange('noColor', 'select', '-1');
+      colorChange(null, 'select', '-1');
     }
   }, /*#__PURE__*/React.createElement("img", {
     src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/\u80CC\u666F\u900F\u660E.svg",

package/es/core/editor/components/Sidebar/views/ImagePanel/ImagePanel.js

@@ -13,6 +13,11 @@ export default function ImagePanel(props) {
   var basicIcons = useMemo(function () {
     return getBasicIcons(topo, false);
   }, []);
+
+  var handleDownloadCustomImages = function handleDownloadCustomImages() {
+    window.open('/topo/v1/api/shape/download/all');
+  };
+
   return /*#__PURE__*/React.createElement(Collapse, {
     accordion: true,
     defaultExpandedKeys: ['资源图片'],
@@ -34,7 +39,8 @@ export default function ImagePanel(props) {
     key: "\u81EA\u5B9A\u4E49\u56FE\u7247",
     title: "\u81EA\u5B9A\u4E49\u56FE\u7247",
     extra: /*#__PURE__*/React.createElement(_Button, {
-      title: "\u5BFC\u51FA"
+      title: "\u5BFC\u51FA",
+      onClick: handleDownloadCustomImages
     }, /*#__PURE__*/React.createElement(_Icon, {
       type: "topo_button_icon_export"
     }))

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

@@ -36,6 +36,10 @@ export function formatHexColor(color) {
   return color ? color.hex : null;
 }
 export function formatRgbaColor(color) {
+  if (!color) {
+    return null;
+  }
+
   var rgb = color.rgb;
   return "rgba(" + rgb.r + ", " + rgb.g + ", " + rgb.b + ", " + rgb.a + ")";
 }

package/es/core/editor/components/settings/common/GroupNodeList/ResourceList.module.scss

@@ -2,6 +2,7 @@
 
 .list {
   max-height: 100%;
+  margin-top: -8px;
 
   .item{
     display: flex;

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

@@ -1,8 +1,11 @@
 import _Input from "@alifd/next/es/input";
 import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
+var _excluded = ["multipleLine"];
 import React from 'react';
 var NameInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var multipleLine = props.multipleLine;
+  var multipleLine = props.multipleLine,
+      inputProps = _objectWithoutPropertiesLoose(props, _excluded);
 
   if (multipleLine) {
     return /*#__PURE__*/React.createElement(_Input.TextArea, _extends({
@@ -11,11 +14,11 @@ var NameInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
         minRows: 4,
         maxRows: 4
       }
-    }, props));
+    }, inputProps));
   }
 
   return /*#__PURE__*/React.createElement(_Input, _extends({
     ref: ref
-  }, props));
+  }, inputProps));
 });
 export default NameInput;

package/es/core/editor/components/settings/propertyViews/group/cluster/ClusterGroupRelateData.js

@@ -1,10 +1,10 @@
 import _Collapse from "@alifd/next/es/collapse";
 import _Form from "@alifd/next/es/form";
 import React, { useEffect } from 'react';
+import NoDataPage from '@riil-frontend/component-no-data-page';
 import GroupNodeList from "../DataTab/GroupNodeList";
 import CollapsePanel from "../../../../../../../components/collapse/Panel";
 import NodeRelateResourceButton from "../../node/data/NodeRelateResourceButton";
-import NoDataPage from '@riil-frontend/component-no-data-page';
 import CollapseFullheightStyles from "../../../common/GroupNodeList/CollapseFullheight.module.scss";
 import textStyles from "../../../../../../common/text.module.scss";
 export default function ClusterGroupRelateData(props) {
@@ -44,12 +44,13 @@ export default function ClusterGroupRelateData(props) {
     key: "\u76F8\u5173\u8D44\u6E90",
     title: "\u76F8\u5173\u8D44\u6E90"
   }, /*#__PURE__*/React.createElement(_Form, {
-    labelAlign: "top"
-  }, /*#__PURE__*/React.createElement(_Form.Item, {
-    label: "\u5173\u8054\u8D44\u6E90",
+    labelAlign: "top",
     style: {
-      marginBottom: 4
+      marginTop: -4,
+      marginBottom: -12
     }
+  }, /*#__PURE__*/React.createElement(_Form.Item, {
+    label: "\u5173\u8054\u8D44\u6E90"
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'flex'

package/es/core/models/TopoApp.js

@@ -22,7 +22,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
 
-var version = typeof "6.0.0-alpha.46" === 'string' ? "6.0.0-alpha.46" : null;
+var version = typeof "6.0.0-alpha.48" === 'string' ? "6.0.0-alpha.48" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/components/ColorPanel/index.js

@@ -155,7 +155,7 @@ function ColorPanel(props) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].swatch,
     onClick: function onClick() {
-      colorChange('noColor', 'select', '-1');
+      colorChange(null, 'select', '-1');
     }
   }, /*#__PURE__*/_react["default"].createElement("img", {
     src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/\u80CC\u666F\u900F\u660E.svg",

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

@@ -34,6 +34,11 @@ function ImagePanel(props) {
   var basicIcons = (0, _react.useMemo)(function () {
     return (0, _icon2.getBasicIcons)(topo, false);
   }, []);
+
+  var handleDownloadCustomImages = function handleDownloadCustomImages() {
+    window.open('/topo/v1/api/shape/download/all');
+  };
+
   return /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
     accordion: true,
     defaultExpandedKeys: ['资源图片'],
@@ -55,7 +60,8 @@ function ImagePanel(props) {
     key: "\u81EA\u5B9A\u4E49\u56FE\u7247",
     title: "\u81EA\u5B9A\u4E49\u56FE\u7247",
     extra: /*#__PURE__*/_react["default"].createElement(_button["default"], {
-      title: "\u5BFC\u51FA"
+      title: "\u5BFC\u51FA",
+      onClick: handleDownloadCustomImages
     }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
       type: "topo_button_icon_export"
     }))

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

@@ -50,6 +50,10 @@ function formatHexColor(color) {
 }
 
 function formatRgbaColor(color) {
+  if (!color) {
+    return null;
+  }
+
   var rgb = color.rgb;
   return "rgba(" + rgb.r + ", " + rgb.g + ", " + rgb.b + ", " + rgb.a + ")";
 }

package/lib/core/editor/components/settings/common/GroupNodeList/ResourceList.module.scss

@@ -2,6 +2,7 @@
 
 .list {
   max-height: 100%;
+  margin-top: -8px;
 
   .item{
     display: flex;

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

@@ -9,10 +9,15 @@ var _input = _interopRequireDefault(require("@alifd/next/lib/input"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+
 var _react = _interopRequireDefault(require("react"));
 
+var _excluded = ["multipleLine"];
+
 var NameInput = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
-  var multipleLine = props.multipleLine;
+  var multipleLine = props.multipleLine,
+      inputProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
 
   if (multipleLine) {
     return /*#__PURE__*/_react["default"].createElement(_input["default"].TextArea, (0, _extends2["default"])({
@@ -21,12 +26,12 @@ var NameInput = /*#__PURE__*/_react["default"].forwardRef(function (props, ref)
         minRows: 4,
         maxRows: 4
       }
-    }, props));
+    }, inputProps));
   }
 
   return /*#__PURE__*/_react["default"].createElement(_input["default"], (0, _extends2["default"])({
     ref: ref
-  }, props));
+  }, inputProps));
 });
 
 var _default = NameInput;

package/lib/core/editor/components/settings/propertyViews/group/cluster/ClusterGroupRelateData.js

@@ -11,14 +11,14 @@ var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _componentNoDataPage = _interopRequireDefault(require("@riil-frontend/component-no-data-page"));
+
 var _GroupNodeList = _interopRequireDefault(require("../DataTab/GroupNodeList"));
 
 var _Panel = _interopRequireDefault(require("../../../../../../../components/collapse/Panel"));
 
 var _NodeRelateResourceButton = _interopRequireDefault(require("../../node/data/NodeRelateResourceButton"));
 
-var _componentNoDataPage = _interopRequireDefault(require("@riil-frontend/component-no-data-page"));
-
 var _CollapseFullheightModule = _interopRequireDefault(require("../../../common/GroupNodeList/CollapseFullheight.module.scss"));
 
 var _textModule = _interopRequireDefault(require("../../../../../../common/text.module.scss"));
@@ -64,12 +64,13 @@ function ClusterGroupRelateData(props) {
     key: "\u76F8\u5173\u8D44\u6E90",
     title: "\u76F8\u5173\u8D44\u6E90"
   }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
-    labelAlign: "top"
-  }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
-    label: "\u5173\u8054\u8D44\u6E90",
+    labelAlign: "top",
     style: {
-      marginBottom: 4
+      marginTop: -4,
+      marginBottom: -12
     }
+  }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: "\u5173\u8054\u8D44\u6E90"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     style: {
       display: 'flex'

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.46" === 'string' ? "6.0.0-alpha.46" : null;
+var version = typeof "6.0.0-alpha.48" === 'string' ? "6.0.0-alpha.48" : 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.46",
+  "version": "6.0.0-alpha.48",
   "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.46/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.48/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }