@riil-frontend/component-topology 2.15.40 → 2.15.43

package/es/common/components/ColorPicker/ColorPicker.js

@@ -21,9 +21,11 @@ var ColorPicker = /*#__PURE__*/function (_Component) {
       var _this$props = _this.props,
           prevValue = _this$props.value,
           onChange = _this$props.onChange;
+      var value = color.hex; // const rgb = color.rgb;
+      // const rgba = `rgba(${rgb.r},${rgb.g},${rgb.b},${rgb.a})`
 
-      if (prevValue !== color.hex) {
-        onChange(color.hex);
+      if (value !== prevValue) {
+        onChange(value);
       }
     };
 
@@ -58,6 +60,7 @@ var ColorPicker = /*#__PURE__*/function (_Component) {
     }, /*#__PURE__*/React.createElement(SketchPicker, {
       color: value // width={230}
       ,
+      disableAlpha: true,
       styles: {
         'default': {
           picker: {

package/es/components/Drawer/index.js

@@ -2,28 +2,24 @@ import _Drawer from "@alifd/next/es/drawer";
 import _extends from "@babel/runtime/helpers/extends";
 import _Button from "@alifd/next/es/button";
 import React from 'react';
+import classnames from 'classnames';
 import styles from "./index.module.scss";
 var headerStyle = {
-  position: 'absolute',
-  top: 0,
-  left: 0,
-  width: '100%',
   zIndex: 1000
 };
-var bodyStyle = {
-  margin: '46px auto',
-  padding: '16px 24px'
-};
+var bodyStyle = {};
 
 var Drawer = function Drawer(props) {
   var visible = props.visible,
       disabled = props.disabled,
       loading = props.loading,
       title = props.title,
-      _props$showButtons = props.showButtons,
-      showButtons = _props$showButtons === void 0 ? true : _props$showButtons,
+      _props$footer = props.footer,
+      footer = _props$footer === void 0 ? true : _props$footer,
       _props$buttons = props.buttons,
       buttons = _props$buttons === void 0 ? props.buttons || ['保存', '取消'] : _props$buttons,
+      _props$footerActions = props.footerActions,
+      footerActions = _props$footerActions === void 0 ? ['确定', '取消'] : _props$footerActions,
       onClose = props.onClose,
       onSave = props.onSave,
       drawerProps = props.drawerProps,
@@ -34,12 +30,14 @@ var Drawer = function Drawer(props) {
     width: "40%",
     headerStyle: headerStyle,
     bodyStyle: bodyStyle,
-    closeMode: ['close', 'esc'],
-    className: styles.drawer
+    closeMode: ['close', 'esc']
   }, drawerProps, {
+    className: classnames(styles.drawer, drawerProps.className),
     visible: visible,
     onClose: onClose
-  }), children, showButtons && /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement("div", {
+    className: classnames(styles.content, drawerProps.bodyClassName)
+  }, children), footer && /*#__PURE__*/React.createElement("div", {
     className: styles.footer
   }, /*#__PURE__*/React.createElement(_Button, {
     className: styles.button,

package/es/components/Drawer/index.module.scss

@@ -3,26 +3,35 @@
 .drawer {
   & > div {
     display: flex;
+    flex-direction: column;
   }
 
   :global {
+    .#{$css-prefix}drawer-header {
+    }
     .#{$css-prefix}drawer-body {
       flex: 1;
+      display: flex;
+      flex-direction: column;
+      padding: 0;
+      overflow: auto;
     }
   }
 }
 
+.content {
+  flex: 1;
+  padding: 16px 24px;
+  overflow: auto;
+
+}
 
 .footer {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
+  background: #fff;
   border-top: 1px solid #e8e8e8;
+  border-radius: 0 0 4px 4px;
   padding: 10px 16px;
   text-align: right;
-  left: 0;
-  background: #fff;
-  border-radius: 0 0 4px 4px;
 
   & .button {
     &:not(:first-child) {

package/es/components/ResourceSelectDrawer/ResourceSelectDrawer.js

@@ -91,7 +91,7 @@ function ResourceSelectDrawer(props) {
     onClose: onClose,
     drawerProps: {
       width: '616px',
-      className: styles.drawer
+      bodyClassName: styles.body
     },
     buttons: ['确定', '取消']
   }, visible && /*#__PURE__*/React.createElement(ResourceSelectList, {

package/es/components/ResourceSelectDrawer/ResourceSelectDrawer.module.scss

@@ -1,14 +1,5 @@
 @import '~@alifd/next/variables.scss';
 
-.drawer {
-  & > div {
-    display: flex;
-  }
-
-  :global {
-    .#{$css-prefix}drawer-body {
-      flex: 1;
-      padding: 0 8px !important;
-    }
-  }
+.body {
+  padding: 0 8px !important;
 }

package/es/core/editor/components/settings/propertyViews/node/NodePropertyView.js

@@ -5,7 +5,7 @@ import _Field from "@alifd/next/es/field";
 import _extends from "@babel/runtime/helpers/extends";
 import _Collapse from "@alifd/next/es/collapse";
 import _Select from "@alifd/next/es/select";
-import React, { useState, useEffect } from 'react';
+import React, { useEffect } from 'react';
 import NodeSizeInput from "../../common/NodeSizeInput/NodeSizeInput";
 import textStyles from "../../../../../common/text.module.scss";
 import NodeIconSelect from "./NodeIconSelect";
@@ -73,8 +73,9 @@ export default function NodePropertyView(props) {
   };
 
   var handleBindTopoChange = function handleBindTopoChange(value, data) {
-    // 设置名称为拓扑名称
-    node.a('name', data.label); // node.a('customName', null);
+    // 设置名称为拓扑名称，清空自定义名称
+    node.a('name', data.label);
+    node.a('customName', null);
   };
 
   var renderData = function renderData() {

package/es/core/models/TopoApp.js

@@ -20,7 +20,7 @@ import { updateEdgeExpanded } from "../utils/edgeUtil";
 import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory"; // eslint-disable-next-line no-undef
 
-var version = typeof "2.15.40" === 'string' ? "2.15.40" : null;
+var version = typeof "2.15.43" === 'string' ? "2.15.43" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/common/components/ColorPicker/ColorPicker.js

@@ -37,9 +37,11 @@ var ColorPicker = /*#__PURE__*/function (_Component) {
       var _this$props = _this.props,
           prevValue = _this$props.value,
           onChange = _this$props.onChange;
+      var value = color.hex; // const rgb = color.rgb;
+      // const rgba = `rgba(${rgb.r},${rgb.g},${rgb.b},${rgb.a})`
 
-      if (prevValue !== color.hex) {
-        onChange(color.hex);
+      if (value !== prevValue) {
+        onChange(value);
       }
     };
 
@@ -76,6 +78,7 @@ var ColorPicker = /*#__PURE__*/function (_Component) {
     }, /*#__PURE__*/_react["default"].createElement(_reactColor.SketchPicker, {
       color: value // width={230}
       ,
+      disableAlpha: true,
       styles: {
         'default': {
           picker: {

package/lib/components/Drawer/index.js

@@ -13,29 +13,26 @@ var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
 
 var _react = _interopRequireDefault(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
 var headerStyle = {
-  position: 'absolute',
-  top: 0,
-  left: 0,
-  width: '100%',
   zIndex: 1000
 };
-var bodyStyle = {
-  margin: '46px auto',
-  padding: '16px 24px'
-};
+var bodyStyle = {};
 
 var Drawer = function Drawer(props) {
   var visible = props.visible,
       disabled = props.disabled,
       loading = props.loading,
       title = props.title,
-      _props$showButtons = props.showButtons,
-      showButtons = _props$showButtons === void 0 ? true : _props$showButtons,
+      _props$footer = props.footer,
+      footer = _props$footer === void 0 ? true : _props$footer,
       _props$buttons = props.buttons,
       buttons = _props$buttons === void 0 ? props.buttons || ['保存', '取消'] : _props$buttons,
+      _props$footerActions = props.footerActions,
+      footerActions = _props$footerActions === void 0 ? ['确定', '取消'] : _props$footerActions,
       onClose = props.onClose,
       onSave = props.onSave,
       drawerProps = props.drawerProps,
@@ -46,12 +43,14 @@ var Drawer = function Drawer(props) {
     width: "40%",
     headerStyle: headerStyle,
     bodyStyle: bodyStyle,
-    closeMode: ['close', 'esc'],
-    className: _indexModule["default"].drawer
+    closeMode: ['close', 'esc']
   }, drawerProps, {
+    className: (0, _classnames["default"])(_indexModule["default"].drawer, drawerProps.className),
     visible: visible,
     onClose: onClose
-  }), children, showButtons && /*#__PURE__*/_react["default"].createElement("div", {
+  }), /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])(_indexModule["default"].content, drawerProps.bodyClassName)
+  }, children), footer && /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].footer
   }, /*#__PURE__*/_react["default"].createElement(_button["default"], {
     className: _indexModule["default"].button,

package/lib/components/Drawer/index.module.scss

@@ -3,26 +3,35 @@
 .drawer {
   & > div {
     display: flex;
+    flex-direction: column;
   }
 
   :global {
+    .#{$css-prefix}drawer-header {
+    }
     .#{$css-prefix}drawer-body {
       flex: 1;
+      display: flex;
+      flex-direction: column;
+      padding: 0;
+      overflow: auto;
     }
   }
 }
 
+.content {
+  flex: 1;
+  padding: 16px 24px;
+  overflow: auto;
+
+}
 
 .footer {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
+  background: #fff;
   border-top: 1px solid #e8e8e8;
+  border-radius: 0 0 4px 4px;
   padding: 10px 16px;
   text-align: right;
-  left: 0;
-  background: #fff;
-  border-radius: 0 0 4px 4px;
 
   & .button {
     &:not(:first-child) {

package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js

@@ -108,7 +108,7 @@ function ResourceSelectDrawer(props) {
     onClose: onClose,
     drawerProps: {
       width: '616px',
-      className: _ResourceSelectDrawerModule["default"].drawer
+      bodyClassName: _ResourceSelectDrawerModule["default"].body
     },
     buttons: ['确定', '取消']
   }, visible && /*#__PURE__*/_react["default"].createElement(_ResourceSelectList["default"], {

package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.module.scss

@@ -1,14 +1,5 @@
 @import '~@alifd/next/variables.scss';
 
-.drawer {
-  & > div {
-    display: flex;
-  }
-
-  :global {
-    .#{$css-prefix}drawer-body {
-      flex: 1;
-      padding: 0 8px !important;
-    }
-  }
+.body {
+  padding: 0 8px !important;
 }

package/lib/core/editor/components/settings/propertyViews/node/NodePropertyView.js

@@ -99,8 +99,9 @@ function NodePropertyView(props) {
   };
 
   var handleBindTopoChange = function handleBindTopoChange(value, data) {
-    // 设置名称为拓扑名称
-    node.a('name', data.label); // node.a('customName', null);
+    // 设置名称为拓扑名称，清空自定义名称
+    node.a('name', data.label);
+    node.a('customName', null);
   };
 
   var renderData = function renderData() {

package/lib/core/models/TopoApp.js

@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "2.15.40" === 'string' ? "2.15.40" : null;
+var version = typeof "2.15.43" === 'string' ? "2.15.43" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/package.json

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