@aloudata/aloudata-design 0.4.8-beta.1 → 0.4.8-beta.11

package/dist/Menu/style/index.less

@@ -2,7 +2,7 @@
 @import '../../Icon/index.less';
 @import './dropdown.less';
 
-.ald-menu.ant-menu {
+.ant-menu-light.ald-menu.ant-menu {
   &.ant-menu-root.ant-menu-vertical {
     border: none;
   }
@@ -23,7 +23,7 @@
     transition: none;
 
     &:hover {
-      background-color: @BG90 !important;
+      background-color: @BG90;
     }
 
     &:active {
@@ -68,3 +68,74 @@
     }
   }
 }
+
+.ant-menu-submenu.ant-menu-submenu-popup.ant-menu{
+  .ant-menu-vertical {
+    border: none;
+  }
+
+  .ant-menu-item,
+  .ant-menu-submenu,
+  .ant-menu-item-selected {
+    margin: 0;
+    height: initial;
+    padding: 6px 12px;
+    line-height: 20px;
+    font-size: 13px;
+    width: 100%;
+    border-radius: 0;
+    border: none;
+    background-color: @BG100;
+    color: @NL0;
+    transition: none;
+
+    &:hover {
+      background-color: @BG90 !important;
+    }
+
+    &:active {
+      background-color: none;
+    }
+
+    &:not(.ant-menu-item-selected):active {
+      background-color: @BG90;
+    }
+
+    &.ant-menu-item-disabled {
+      color: @NL50 !important;
+      transition: none;
+      background-color: @BG100 !important;
+      cursor: default;
+    }
+
+    .ant-menu-submenu-title {
+      line-height: 20px;
+      font-size: 13px;
+      width: 100%;
+      padding:0;
+      height: initial;
+      margin:0;
+
+      &:hover{
+        background: none;
+      }
+    }
+  }
+
+  .ant-menu.ant-menu-sub{
+    padding:4px 0;
+  }
+
+  .ant-menu-title-content{
+    line-height: 20px;
+    font-size: 13px;
+    width: 100%;
+    padding:0;
+    height: initial;
+    margin:0;
+
+    &:hover{
+      background: none;
+    }
+  } 
+}

package/dist/Modal/index.d.ts

@@ -16,11 +16,14 @@ export interface ModalProps extends Omit<AntdModalProps, 'okButtonProps' | 'canc
     cancelButtonProps?: IButtonProps;
     okButtonProps?: IButtonProps;
     okType?: ButtonType;
+    paddingLess?: boolean;
 }
-export interface ModalFuncProps extends Omit<AntdModalFuncProps, 'okButtonProps' | 'cancelButtonProps' | 'okType'> {
+export interface ModalFuncProps extends Omit<AntdModalFuncProps, 'okButtonProps' | 'cancelButtonProps' | 'okType' | 'icon'> {
     cancelButtonProps?: IButtonProps;
     okButtonProps?: IButtonProps;
     okType?: ButtonType;
+    subTitle?: React.ReactNode;
+    icon?: React.ReactElement;
 }
 declare const OriginModal: IModalInterface;
 export declare type ModalFunc = (props: ModalFuncProps) => {

package/dist/Modal/index.js

@@ -1,9 +1,12 @@
-var _excluded = ["className", "children", "okType", "width", "closeIcon", "subTitle", "okButtonProps", "cancelButtonProps", "icon", "title"],
-    _excluded2 = ["icon", "okButtonProps", "cancelButtonProps", "okType", "width"],
-    _excluded3 = ["icon", "okButtonProps", "cancelButtonProps", "okType", "width"],
-    _excluded4 = ["icon", "okButtonProps", "cancelButtonProps", "okType", "width"],
-    _excluded5 = ["icon", "okButtonProps", "cancelButtonProps", "okType", "width"],
-    _excluded6 = ["icon", "okButtonProps", "cancelButtonProps", "okType", "width"];
+var _excluded = ["className", "type", "loading", "size", "disabled", "shape"],
+    _excluded2 = ["className", "children", "okType", "width", "closeIcon", "subTitle", "okButtonProps", "cancelButtonProps", "okText", "cancelText", "icon", "title", "paddingLess"],
+    _excluded3 = ["okButtonProps", "cancelButtonProps", "okType", "width", "title", "subTitle", "okText", "cancelText", "className"],
+    _excluded4 = ["okButtonProps", "cancelButtonProps", "okType", "width", "title", "subTitle", "okText", "cancelText", "className"],
+    _excluded5 = ["okButtonProps", "cancelButtonProps", "okType", "width", "title", "subTitle", "okText", "cancelText", "className"],
+    _excluded6 = ["okButtonProps", "cancelButtonProps", "okType", "width", "title", "subTitle", "okText", "cancelText", "className"],
+    _excluded7 = ["okButtonProps", "cancelButtonProps", "okType", "width", "title", "subTitle", "className", "okText", "cancelText"];
+
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -11,8 +14,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -24,6 +25,7 @@ import useModal from 'antd/lib/modal/useModal/index';
 import classNames from 'classnames';
 import React from 'react';
 import { btnPrefix, getButtonSizeClass, getButtonType, getDangerStatus, getShape } from "../Button";
+import DoubleCircleIcon from "../DoubleCircleIcon";
 import theme from "../style/themes/default/themeColor.module.less"; // export type { ModalProps, ModalFuncProps };
 
 export var destroyFns = [];
@@ -31,6 +33,7 @@ var DEFAULT_WIDTH = 552;
 
 function getButtonProps(buttonProps, defaultBtnType, okType) {
   var btnType = okType || defaultBtnType;
+
   var buttonClassName = buttonProps.className,
       _buttonProps$type = buttonProps.type,
       type = _buttonProps$type === void 0 ? btnType : _buttonProps$type,
@@ -39,17 +42,34 @@ function getButtonProps(buttonProps, defaultBtnType, okType) {
       size = _buttonProps$size === void 0 ? 'middle' : _buttonProps$size,
       disabled = buttonProps.disabled,
       _buttonProps$shape = buttonProps.shape,
-      shape = _buttonProps$shape === void 0 ? 'default' : _buttonProps$shape;
-  return {
+      shape = _buttonProps$shape === void 0 ? 'default' : _buttonProps$shape,
+      restProps = _objectWithoutProperties(buttonProps, _excluded);
+
+  return _objectSpread(_objectSpread({}, restProps), {}, {
     disabled: loading ? true : disabled,
     loading: loading,
     type: getButtonType(type),
     className: classNames(btnPrefix, "".concat(btnPrefix, "-").concat(type), buttonClassName, getButtonSizeClass(size)),
     danger: getDangerStatus(type),
     shape: getShape(shape)
-  };
+  });
 }
 
+var ModalTitle = function ModalTitle(_ref) {
+  var icon = _ref.icon,
+      title = _ref.title,
+      subTitle = _ref.subTitle;
+  return /*#__PURE__*/React.createElement("div", {
+    className: 'ald-modal-title-container'
+  }, icon, /*#__PURE__*/React.createElement("div", {
+    className: 'ald-modal-text-container'
+  }, title && /*#__PURE__*/React.createElement("div", {
+    className: 'title'
+  }, title), subTitle && /*#__PURE__*/React.createElement("div", {
+    className: 'subTitle'
+  }, subTitle)));
+};
+
 var OriginModal = function OriginModal(props) {
   var className = props.className,
       children = props.children,
@@ -61,26 +81,41 @@ var OriginModal = function OriginModal(props) {
       okButtonProps = _props$okButtonProps === void 0 ? {} : _props$okButtonProps,
       _props$cancelButtonPr = props.cancelButtonProps,
       cancelButtonProps = _props$cancelButtonPr === void 0 ? {} : _props$cancelButtonPr,
+      _props$okText = props.okText,
+      okText = _props$okText === void 0 ? '确定' : _props$okText,
+      _props$cancelText = props.cancelText,
+      cancelText = _props$cancelText === void 0 ? '取消' : _props$cancelText,
       icon = props.icon,
       title = props.title,
-      restProps = _objectWithoutProperties(props, _excluded);
+      paddingLess = props.paddingLess,
+      restProps = _objectWithoutProperties(props, _excluded2);
 
   return /*#__PURE__*/React.createElement(AntdModal, _extends({}, restProps, {
-    title: /*#__PURE__*/React.createElement("div", {
-      className: 'ald-modal-title-container'
-    }, icon, /*#__PURE__*/React.createElement("div", {
-      className: 'ald-modal-text-container'
-    }, title && /*#__PURE__*/React.createElement("div", {
-      className: 'title'
-    }, title), subTitle && /*#__PURE__*/React.createElement("div", {
-      className: 'subTitle'
-    }, subTitle))),
-    className: classNames('ald-modal', className),
+    title: ModalTitle({
+      icon: icon,
+      title: title,
+      subTitle: subTitle
+    }) // title={
+    //   <div className={'ald-modal-title-container'}>
+    //     {icon}
+    //     <div className={'ald-modal-text-container'}>
+    //       {title && <div className={'title'}>{title}</div>}
+    //       {subTitle && <div className={'subTitle'}>{subTitle}</div>}
+    //     </div>
+    //   </div>
+    // }
+    ,
+    className: classNames('ald-modal', className, {
+      'ald-modal-padding-less': paddingLess
+    }),
     okButtonProps: getButtonProps(okButtonProps, 'primary', okType),
-    cancelButtonProps: getButtonProps(cancelButtonProps, 'secondary', okType),
+    cancelButtonProps: getButtonProps(cancelButtonProps, 'secondary'),
+    okText: okText,
+    cancelText: cancelText,
     width: width || DEFAULT_WIDTH,
     closeIcon: closeIcon || /*#__PURE__*/React.createElement(CloseLLine, {
       size: 16,
+      fill: theme.NL40,
       className: "ald-modal-close"
     })
   }), children);
@@ -90,112 +125,188 @@ OriginModal.useModal = useModal;
 var Modal = OriginModal;
 
 Modal.info = function infoFn(props) {
-  var icon = props.icon,
-      _props$okButtonProps2 = props.okButtonProps,
+  var _props$okButtonProps2 = props.okButtonProps,
       okButtonProps = _props$okButtonProps2 === void 0 ? {} : _props$okButtonProps2,
       _props$cancelButtonPr2 = props.cancelButtonProps,
       cancelButtonProps = _props$cancelButtonPr2 === void 0 ? {} : _props$cancelButtonPr2,
       okType = props.okType,
       width = props.width,
-      restProps = _objectWithoutProperties(props, _excluded2);
+      title = props.title,
+      subTitle = props.subTitle,
+      _props$okText2 = props.okText,
+      okText = _props$okText2 === void 0 ? '确定' : _props$okText2,
+      _props$cancelText2 = props.cancelText,
+      cancelText = _props$cancelText2 === void 0 ? '取消' : _props$cancelText2,
+      className = props.className,
+      restProps = _objectWithoutProperties(props, _excluded3);
 
-  return AntdModal.success(_objectSpread({
+  return AntdModal.info(_objectSpread({
     okButtonProps: getButtonProps(okButtonProps, 'primary', okType),
     cancelButtonProps: getButtonProps(cancelButtonProps, 'secondary', okType),
     width: width || DEFAULT_WIDTH,
-    icon: icon || /*#__PURE__*/React.createElement(InfoCircleLine, {
-      size: 16,
-      fill: theme.B40,
-      className: "ald-modal-close"
-    })
+    className: classNames('ald-modal', className),
+    title: ModalTitle({
+      icon: /*#__PURE__*/React.createElement(DoubleCircleIcon, {
+        type: "info"
+      }, /*#__PURE__*/React.createElement(InfoCircleLine, {
+        size: 16,
+        fill: theme.B40,
+        className: "ald-modal-close"
+      })),
+      title: title,
+      subTitle: subTitle
+    }),
+    okText: okText,
+    cancelText: cancelText
   }, restProps));
 };
 
 Modal.success = function successFn(props) {
-  var icon = props.icon,
-      _props$okButtonProps3 = props.okButtonProps,
+  var _props$okButtonProps3 = props.okButtonProps,
       okButtonProps = _props$okButtonProps3 === void 0 ? {} : _props$okButtonProps3,
       _props$cancelButtonPr3 = props.cancelButtonProps,
       cancelButtonProps = _props$cancelButtonPr3 === void 0 ? {} : _props$cancelButtonPr3,
       okType = props.okType,
       width = props.width,
-      restProps = _objectWithoutProperties(props, _excluded3);
+      title = props.title,
+      subTitle = props.subTitle,
+      _props$okText3 = props.okText,
+      okText = _props$okText3 === void 0 ? '确定' : _props$okText3,
+      _props$cancelText3 = props.cancelText,
+      cancelText = _props$cancelText3 === void 0 ? '取消' : _props$cancelText3,
+      className = props.className,
+      restProps = _objectWithoutProperties(props, _excluded4);
 
   return AntdModal.success(_objectSpread({
     okButtonProps: getButtonProps(okButtonProps, 'primary', okType),
     cancelButtonProps: getButtonProps(cancelButtonProps, 'secondary', okType),
     width: width || DEFAULT_WIDTH,
-    icon: icon || /*#__PURE__*/React.createElement(CheckCircleDuotone, {
-      fill: [theme.SA40, theme.ND0],
-      size: 16,
-      theme: "multi-color"
-    })
+    className: classNames('ald-modal', className),
+    title: ModalTitle({
+      icon: /*#__PURE__*/React.createElement(DoubleCircleIcon, {
+        type: "success"
+      }, /*#__PURE__*/React.createElement(CheckCircleDuotone, {
+        fill: [theme.SA40, theme.ND0],
+        size: 16,
+        theme: "multi-color"
+      })),
+      title: title,
+      subTitle: subTitle
+    }),
+    okText: okText,
+    cancelText: cancelText
   }, restProps));
 };
 
 Modal.error = function errorFn(props) {
-  var icon = props.icon,
-      _props$okButtonProps4 = props.okButtonProps,
+  var _props$okButtonProps4 = props.okButtonProps,
       okButtonProps = _props$okButtonProps4 === void 0 ? {} : _props$okButtonProps4,
       _props$cancelButtonPr4 = props.cancelButtonProps,
       cancelButtonProps = _props$cancelButtonPr4 === void 0 ? {} : _props$cancelButtonPr4,
       okType = props.okType,
       width = props.width,
-      restProps = _objectWithoutProperties(props, _excluded4);
+      title = props.title,
+      subTitle = props.subTitle,
+      _props$okText4 = props.okText,
+      okText = _props$okText4 === void 0 ? '确定' : _props$okText4,
+      _props$cancelText4 = props.cancelText,
+      cancelText = _props$cancelText4 === void 0 ? '取消' : _props$cancelText4,
+      className = props.className,
+      restProps = _objectWithoutProperties(props, _excluded5);
 
-  return AntdModal.success(_objectSpread({
+  return AntdModal.error(_objectSpread({
     okButtonProps: getButtonProps(okButtonProps, 'dangerous', okType),
     cancelButtonProps: getButtonProps(cancelButtonProps, 'secondary', okType),
     width: width || DEFAULT_WIDTH,
-    icon: icon || /*#__PURE__*/React.createElement(AlertTriangleDuotone, {
-      fill: [theme.SC40, theme.ND0],
-      size: 16,
-      theme: "multi-color"
-    })
+    className: classNames('ald-modal', className),
+    title: ModalTitle({
+      icon: /*#__PURE__*/React.createElement(DoubleCircleIcon, {
+        type: "error"
+      }, /*#__PURE__*/React.createElement(AlertTriangleDuotone, {
+        fill: [theme.SC40, theme.ND0],
+        size: 16,
+        theme: "multi-color"
+      })),
+      title: title,
+      subTitle: subTitle
+    }),
+    okText: okText,
+    cancelText: cancelText
   }, restProps));
 };
 
 Modal.warning = function modalWarn(props) {
-  var icon = props.icon,
-      _props$okButtonProps5 = props.okButtonProps,
+  var _props$okButtonProps5 = props.okButtonProps,
       okButtonProps = _props$okButtonProps5 === void 0 ? {} : _props$okButtonProps5,
       _props$cancelButtonPr5 = props.cancelButtonProps,
       cancelButtonProps = _props$cancelButtonPr5 === void 0 ? {} : _props$cancelButtonPr5,
       okType = props.okType,
       width = props.width,
-      restProps = _objectWithoutProperties(props, _excluded5);
+      title = props.title,
+      subTitle = props.subTitle,
+      _props$okText5 = props.okText,
+      okText = _props$okText5 === void 0 ? '确定' : _props$okText5,
+      _props$cancelText5 = props.cancelText,
+      cancelText = _props$cancelText5 === void 0 ? '取消' : _props$cancelText5,
+      className = props.className,
+      restProps = _objectWithoutProperties(props, _excluded6);
 
-  return AntdModal.success(_objectSpread({
+  return AntdModal.warning(_objectSpread({
     okButtonProps: getButtonProps(okButtonProps, 'dangerous', okType),
     cancelButtonProps: getButtonProps(cancelButtonProps, 'secondary', okType),
     width: width || DEFAULT_WIDTH,
-    icon: icon || /*#__PURE__*/React.createElement(AlertTriangleDuotone, {
-      fill: [theme.SB40, theme.ND0],
-      theme: "multi-color",
-      size: 16
-    })
+    // className: classNames('ald-modal-warning', className),
+    className: classNames('ald-modal ald-modal-warning', className),
+    title: ModalTitle({
+      icon: /*#__PURE__*/React.createElement(DoubleCircleIcon, {
+        type: "warning"
+      }, /*#__PURE__*/React.createElement(AlertTriangleDuotone, {
+        fill: [theme.SB40, theme.ND0],
+        theme: "multi-color",
+        size: 16
+      })),
+      title: title,
+      subTitle: subTitle
+    }),
+    okText: okText,
+    cancelText: cancelText
   }, restProps));
 };
 
 Modal.confirm = function confirmFn(props) {
-  var icon = props.icon,
-      _props$okButtonProps6 = props.okButtonProps,
+  var _props$okButtonProps6 = props.okButtonProps,
       okButtonProps = _props$okButtonProps6 === void 0 ? {} : _props$okButtonProps6,
       _props$cancelButtonPr6 = props.cancelButtonProps,
       cancelButtonProps = _props$cancelButtonPr6 === void 0 ? {} : _props$cancelButtonPr6,
       okType = props.okType,
       width = props.width,
-      restProps = _objectWithoutProperties(props, _excluded6);
+      title = props.title,
+      subTitle = props.subTitle,
+      className = props.className,
+      _props$okText6 = props.okText,
+      okText = _props$okText6 === void 0 ? '确定' : _props$okText6,
+      _props$cancelText6 = props.cancelText,
+      cancelText = _props$cancelText6 === void 0 ? '取消' : _props$cancelText6,
+      restProps = _objectWithoutProperties(props, _excluded7);
 
-  return AntdModal.success(_objectSpread({
+  return AntdModal.confirm(_objectSpread({
     okButtonProps: getButtonProps(okButtonProps, 'primary', okType),
     cancelButtonProps: getButtonProps(cancelButtonProps, 'secondary', okType),
     width: width || DEFAULT_WIDTH,
-    icon: icon || /*#__PURE__*/React.createElement(InfoCircleLine, {
-      size: 16,
-      fill: theme.SB40,
-      className: "ald-modal-close"
-    })
+    className: classNames('ald-modal', className),
+    title: ModalTitle({
+      icon: /*#__PURE__*/React.createElement(DoubleCircleIcon, {
+        type: "info"
+      }, /*#__PURE__*/React.createElement(InfoCircleLine, {
+        size: 16,
+        fill: theme.B40,
+        className: "ald-modal-close"
+      })),
+      title: title,
+      subTitle: subTitle
+    }),
+    okText: okText,
+    cancelText: cancelText
   }, restProps));
 };
 

package/dist/Modal/style/index.less

@@ -17,9 +17,10 @@
   .ald-modal-title-container {
     display: flex;
     align-items: center;
+    gap: 12px;
 
     .ald-modal-text-container {
-      margin-left: 12px;
+      // margin-left: 12px;
       flex: 1;
     }
 
@@ -61,12 +62,21 @@
     font-size: 13px;
   }
 
-  .ant-modal-footer{
+  .ant-modal-footer {
     .ant-btn + .ant-btn:not(.ant-dropdown-trigger) {
       margin-bottom: 0;
       margin-inline-start: 12px;
     }
-  } 
+  }
+  
+}
+
+.ald-modal-padding-less{
+  .ant-modal-content {
+    .ant-modal-body{
+      margin: 0 -24px;
+    }
+  }
 }
 
 .ant-modal-confirm {
@@ -75,15 +85,45 @@
       flex: 1;
       overflow: initial;
       margin-inline-start: 12px;
-  
+
       & + .ant-modal-confirm-content {
         margin-block-start: 16px;
-        margin-left:28px;
+        margin-left: 28px;
       }
     }
+
   }
 
-  .ant-modal-confirm-btns{
+  .ant-modal-confirm-body{
+    display: block;
+
+    > span.anticon{
+      display: none;
+
+      +.ant-modal-confirm-title+.ant-modal-confirm-content{
+        margin-left: 0;
+        margin-top: 16px;
+      }
+    }
+  } 
+
+  .ant-modal-confirm-btns {
     margin-block-start: 16px;
   }
 }
+
+.ald-modal-warning {
+  .ant-modal-confirm-btns {
+    .ald-btn {
+      background-color: @SB40;
+      border-color: @SB40;
+
+      &:hover,
+      &:active,
+      &:focus {
+        background-color: @SB40;
+        border-color: @SB40;
+      }
+    }
+  }
+}

package/dist/Radio/components/Group/index.js

@@ -12,9 +12,9 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { createContext, useRef } from 'react';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import classNames from 'classnames';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import React, { createContext, useRef } from 'react';
 export var RadioGroupContext = /*#__PURE__*/createContext({});
 export default function RadioGroup(props) {
   var children = props.children,
@@ -24,7 +24,9 @@ export default function RadioGroup(props) {
       size = _props$size === void 0 ? 'middle' : _props$size,
       _props$type = props.type,
       type = _props$type === void 0 ? 'radio' : _props$type,
-      className = props.className; // 滑块的ref
+      className = props.className,
+      _props$disabled = props.disabled,
+      disabled = _props$disabled === void 0 ? false : _props$disabled; // 滑块的ref
 
   var sliderRef = useRef(null); // 该hooks与useState相同，但是当props中有value值时，优先使用value的值
 
@@ -63,7 +65,8 @@ export default function RadioGroup(props) {
       radioGroupStyle: radioGroupStyle,
       size: size,
       type: type,
-      sliderRef: sliderRef
+      sliderRef: sliderRef,
+      disabled: disabled
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: getWrapperClass()

package/dist/Radio/components/Radio/index.js

@@ -5,10 +5,10 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import classNames from 'classnames';
-import React, { useContext, useEffect, useRef } from 'react';
 import _ from 'lodash';
-import { RadioGroupContext } from "../Group";
+import React, { useContext, useEffect, useRef } from 'react';
 import { getUUID } from "../../../_utils/hooks/useId";
+import { RadioGroupContext } from "../Group";
 export default function Radio(props) {
   var groupContext = useContext(RadioGroupContext);
   var labelRef = useRef(null);
@@ -17,7 +17,7 @@ export default function Radio(props) {
   var radioProps = _objectSpread({}, props);
 
   if (!_.isEmpty(groupContext)) {
-    radioProps.disabled = props.disabled;
+    radioProps.disabled = groupContext.disabled || props.disabled;
     radioProps.checked = !props.disabled && groupContext.value === props.value;
   } else {
     radioProps.checked = !('checked' in props) ? props.defaultChecked : radioProps.checked;
@@ -35,14 +35,18 @@ export default function Radio(props) {
     if (groupContext.type === 'button') {
       if (groupContext.radioGroupStyle === 'filled') {
         otherClass = 'ald-radio-button-wrapper-filled';
-      } else {
+      } else if (groupContext.radioGroupStyle === 'border') {
         otherClass = 'ald-radio-button-wrapper-border';
+      } else {
+        otherClass = 'ald-radio-button-wrapper-border-primary';
       }
     } else if (groupContext.type === 'iconButton') {
       if (groupContext.radioGroupStyle === 'filled') {
         otherClass = 'ald-radio-icon-button-wrapper-filled';
-      } else {
+      } else if (groupContext.radioGroupStyle === 'border') {
         otherClass = 'ald-radio-icon-button-wrapper-border';
+      } else {
+        otherClass = 'ald-radio-icon-button-wrapper-border-primary';
       }
     } else {
       // 当type未设置或者是radio时
@@ -67,7 +71,6 @@ export default function Radio(props) {
 
   var onChange = function onChange() {
     if (groupContext !== null && groupContext !== void 0 && groupContext.onChange) {
-      // console.log(e);
       // input事件的value会被toString，所以此处进行一个覆盖
       groupContext.onChange(props.value);
     }

package/dist/Radio/interface/radioGroup.d.ts

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-export declare type TRadioGroupStyle = 'border' | 'filled';
+export declare type TRadioGroupStyle = 'border' | 'filled' | 'borderPrimary';
 export declare type TRadioSize = 'large' | 'middle' | 'small' | 'default';
 export declare type TRadioType = 'radio' | 'button' | 'iconButton';
 export interface IRadioGroupProps {
@@ -13,6 +13,11 @@ export interface IRadioGroupProps {
      * @default -
      */
     defaultValue?: any;
+    /**
+     * @description 整组禁用
+     * @default false
+     */
+    disabled?: boolean;
     /**
      * @description 设置按钮组的大小，有'large' | 'middle'('default') | 'small
      * @default 'middle'