@aloudata/aloudata-design 0.4.8-beta.4 → 0.4.8-beta.5

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"],
+var _excluded = ["className", "type", "loading", "size", "disabled", "shape"],
+    _excluded2 = ["className", "children", "okType", "width", "closeIcon", "subTitle", "okButtonProps", "cancelButtonProps", "okText", "cancelText", "icon", "title"],
     _excluded3 = ["icon", "okButtonProps", "cancelButtonProps", "okType", "width"],
     _excluded4 = ["icon", "okButtonProps", "cancelButtonProps", "okType", "width"],
     _excluded5 = ["icon", "okButtonProps", "cancelButtonProps", "okType", "width"],
-    _excluded6 = ["icon", "okButtonProps", "cancelButtonProps", "okType", "width"];
+    _excluded6 = ["icon", "okButtonProps", "cancelButtonProps", "okType", "width"],
+    _excluded7 = ["icon", "okButtonProps", "cancelButtonProps", "okType", "width"];
+
+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; }
@@ -31,6 +32,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,15 +41,17 @@ 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 OriginModal = function OriginModal(props) {
@@ -61,9 +65,13 @@ 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);
+      restProps = _objectWithoutProperties(props, _excluded2);
 
   return /*#__PURE__*/React.createElement(AntdModal, _extends({}, restProps, {
     title: /*#__PURE__*/React.createElement("div", {
@@ -78,6 +86,8 @@ var OriginModal = function OriginModal(props) {
     className: classNames('ald-modal', className),
     okButtonProps: getButtonProps(okButtonProps, 'primary', okType),
     cancelButtonProps: getButtonProps(cancelButtonProps, 'secondary', okType),
+    okText: okText,
+    cancelText: cancelText,
     width: width || DEFAULT_WIDTH,
     closeIcon: closeIcon || /*#__PURE__*/React.createElement(CloseLLine, {
       size: 16,
@@ -97,7 +107,7 @@ Modal.info = function infoFn(props) {
       cancelButtonProps = _props$cancelButtonPr2 === void 0 ? {} : _props$cancelButtonPr2,
       okType = props.okType,
       width = props.width,
-      restProps = _objectWithoutProperties(props, _excluded2);
+      restProps = _objectWithoutProperties(props, _excluded3);
 
   return AntdModal.success(_objectSpread({
     okButtonProps: getButtonProps(okButtonProps, 'primary', okType),
@@ -119,7 +129,7 @@ Modal.success = function successFn(props) {
       cancelButtonProps = _props$cancelButtonPr3 === void 0 ? {} : _props$cancelButtonPr3,
       okType = props.okType,
       width = props.width,
-      restProps = _objectWithoutProperties(props, _excluded3);
+      restProps = _objectWithoutProperties(props, _excluded4);
 
   return AntdModal.success(_objectSpread({
     okButtonProps: getButtonProps(okButtonProps, 'primary', okType),
@@ -141,7 +151,7 @@ Modal.error = function errorFn(props) {
       cancelButtonProps = _props$cancelButtonPr4 === void 0 ? {} : _props$cancelButtonPr4,
       okType = props.okType,
       width = props.width,
-      restProps = _objectWithoutProperties(props, _excluded4);
+      restProps = _objectWithoutProperties(props, _excluded5);
 
   return AntdModal.success(_objectSpread({
     okButtonProps: getButtonProps(okButtonProps, 'dangerous', okType),
@@ -163,7 +173,7 @@ Modal.warning = function modalWarn(props) {
       cancelButtonProps = _props$cancelButtonPr5 === void 0 ? {} : _props$cancelButtonPr5,
       okType = props.okType,
       width = props.width,
-      restProps = _objectWithoutProperties(props, _excluded5);
+      restProps = _objectWithoutProperties(props, _excluded6);
 
   return AntdModal.success(_objectSpread({
     okButtonProps: getButtonProps(okButtonProps, 'dangerous', okType),
@@ -185,7 +195,7 @@ Modal.confirm = function confirmFn(props) {
       cancelButtonProps = _props$cancelButtonPr6 === void 0 ? {} : _props$cancelButtonPr6,
       okType = props.okType,
       width = props.width,
-      restProps = _objectWithoutProperties(props, _excluded6);
+      restProps = _objectWithoutProperties(props, _excluded7);
 
   return AntdModal.success(_objectSpread({
     okButtonProps: getButtonProps(okButtonProps, 'primary', okType),

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

@@ -43,8 +43,10 @@ export default function Radio(props) {
     } 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时

package/dist/Radio/style/index.less

@@ -1,8 +1,8 @@
 @import '../../style/index.less';
 
-@radio-icon-button-padding-large: 10px;
+@radio-icon-button-padding-large: 8px;
 @radio-icon-button-padding-middle: 9px;
-@radio-icon-button-padding-small: 8px;
+@radio-icon-button-padding-small: 7px;
 @radio-group-height-large: 36px;
 @radio-group-height-middle: 32px;
 @radio-group-height-small: 28px;
@@ -114,7 +114,9 @@
 }
 
 .ald-radio-button-wrapper-border-primary,
-.ald-radio-button-wrapper-border {
+.ald-radio-button-wrapper-border,
+.ald-radio-icon-button-wrapper-border,
+.ald-radio-icon-button-wrapper-border-primary {
   &.ald-radio-label.ald-radio-wrapper-disabled {
     opacity: 0.5;
 
@@ -191,7 +193,8 @@
 
   .ald-radio-button-wrapper-border,
   .ald-radio-button-wrapper-border-primary,
-  .ald-radio-icon-button-wrapper-border {
+  .ald-radio-icon-button-wrapper-border,
+  .ald-radio-icon-button-wrapper-border-primary {
     position: relative;
     display: flex;
     align-items: center;
@@ -231,7 +234,8 @@
   // button选中状态下的样式
   .ald-radio-wrapper-checked.ald-radio-button-wrapper-border,
   .ald-radio-wrapper-checked.ald-radio-button-wrapper-border-primary,
-  .ald-radio-wrapper-checked.ald-radio-icon-button-wrapper-border {
+  .ald-radio-wrapper-checked.ald-radio-icon-button-wrapper-border,
+  .ald-radio-wrapper-checked.ald-radio-icon-button-wrapper-border-primary {
     background: @BG80;
     transition: background 0.5s ease;
 
@@ -242,7 +246,8 @@
     }
   }
 
-  .ald-radio-wrapper-checked.ald-radio-button-wrapper-border-primary {
+  .ald-radio-wrapper-checked.ald-radio-button-wrapper-border-primary,
+  .ald-radio-wrapper-checked.ald-radio-icon-button-wrapper-border-primary {
     background: @B40;
     transition: background 0.5s ease;
 
@@ -310,6 +315,12 @@
   &.ald-radio-group-middle {
     height: @radio-group-height-middle;
 
+    .ald-radio-label {
+      .ald-radio-desc {
+        font-size: @font-size-middle;
+      }
+    }
+
     .ald-radio-icon-button-wrapper-filled {
       padding: 0 @radio-icon-button-padding-middle;
     }
@@ -319,13 +330,17 @@
       padding: 0 @radio-button-padding-middle - 1;
     }
 
-    .ald-radio-icon-button-wrapper-border {
+    .ald-radio-icon-button-wrapper-border,
+    .ald-radio-icon-button-wrapper-border-primary {
       padding: 0 @radio-icon-button-padding-middle - 1;
-    }
 
-    .ald-radio-label {
-      .ald-radio-desc {
-        font-size: @font-size-middle;
+      &.ald-radio-label .ald-radio-desc {
+        font-size: 14px;
+      }
+
+      &:not(:last-child) {
+        padding: 0 @radio-icon-button-padding-middle 0
+          @radio-icon-button-padding-middle - 1;
       }
     }
   }
@@ -333,6 +348,12 @@
   &.ald-radio-group-small {
     height: @radio-group-height-small;
 
+    .ald-radio-label {
+      .ald-radio-desc {
+        font-size: @font-size-small;
+      }
+    }
+
     .ald-radio-icon-button-wrapper-filled {
       padding: 0 @radio-icon-button-padding-small;
     }
@@ -342,19 +363,24 @@
       padding: 0 @radio-button-padding-small - 1;
     }
 
-    .ald-radio-icon-button-wrapper-border {
+    .ald-radio-icon-button-wrapper-border,
+    .ald-radio-icon-button-wrapper-border-primary {
       padding: 0 @radio-icon-button-padding-small - 1;
-    }
 
-    .ald-radio-label {
-      .ald-radio-desc {
-        font-size: @font-size-small;
+      &.ald-radio-label .ald-radio-desc {
+        font-size: 14px;
+      }
+
+      &:not(:last-child) {
+        padding: 0 @radio-icon-button-padding-small 0
+          @radio-icon-button-padding-small - 1;
       }
     }
 
     .ald-radio-button-wrapper-border,
     .ald-radio-icon-button-wrapper-border,
     .ald-radio-button-wrapper-border-primary,
+    .ald-radio-icon-button-wrapper-border-primary,
     .ald-radio-button-wrapper-filled,
     .ald-radio-icon-button-wrapper-filled {
       &:first-of-type {
@@ -374,6 +400,12 @@
   &.ald-radio-group.ald-radio-group-large {
     height: @radio-group-height-large;
 
+    .ald-radio-label {
+      .ald-radio-desc {
+        font-size: @font-size-large;
+      }
+    }
+
     .ald-radio-icon-button-wrapper-filled {
       padding: 0 @radio-icon-button-padding-large;
     }
@@ -383,19 +415,24 @@
       padding: 0 @radio-button-padding-large - 1;
     }
 
-    .ald-radio-icon-button-wrapper-border {
+    .ald-radio-icon-button-wrapper-border,
+    .ald-radio-icon-button-wrapper-border-primary {
       padding: 0 @radio-icon-button-padding-large - 1;
-    }
 
-    .ald-radio-label {
-      .ald-radio-desc {
-        font-size: @font-size-large;
+      &.ald-radio-label .ald-radio-desc {
+        font-size: 20px;
+      }
+
+      &:not(:last-child) {
+        padding: 0 @radio-icon-button-padding-large 0
+          @radio-icon-button-padding-large - 1;
       }
     }
 
     .ald-radio-button-wrapper-border,
     .ald-radio-icon-button-wrapper-border,
     .ald-radio-button-wrapper-border-primary,
+    .ald-radio-icon-button-wrapper-border-primary,
     .ald-radio-button-wrapper-filled,
     .ald-radio-icon-button-wrapper-filled {
       &:first-of-type {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aloudata/aloudata-design",
-  "version": "0.4.8-beta.4",
+  "version": "0.4.8-beta.5",
   "description": "",
   "license": "MIT",
   "module": "dist/index.js",