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

package/dist/DoubleCircleIcon/index.d.ts

@@ -5,5 +5,6 @@ declare const DoubleCircleIcon: (props: {
     size?: number | undefined;
     innerColor?: string | undefined;
     children: React.ReactNode;
+    type?: "error" | "success" | "warning" | "info" | undefined;
 }) => JSX.Element;
 export default DoubleCircleIcon;

package/dist/DoubleCircleIcon/index.js

@@ -1,3 +1,4 @@
+import classnames from 'classnames';
 import React from 'react';
 import "./style/index.less";
 var INNER_SIZE_RATIO = 0.75; // 外面有两个圆，中间是个图标
@@ -6,7 +7,9 @@ var DoubleCircleIcon = function DoubleCircleIcon(props) {
   var outColor = props.outColor,
       size = props.size,
       innerColor = props.innerColor,
-      children = props.children;
+      children = props.children,
+      _props$type = props.type,
+      type = _props$type === void 0 ? 'info' : _props$type;
   var innerSize;
 
   if (size) {
@@ -19,7 +22,7 @@ var DoubleCircleIcon = function DoubleCircleIcon(props) {
       width: size,
       height: size
     },
-    className: 'icon'
+    className: classnames('ald-double-circle-icon', "ald-double-circle-icon-".concat(type))
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       background: innerColor,

package/dist/DoubleCircleIcon/style/index.less

@@ -1,6 +1,6 @@
 @import '../../style/index.less';
 
-.icon {
+.ald-double-circle-icon {
   font-family: 'PingFang SC';
   display: inline-flex;
   align-items: center;
@@ -21,3 +21,35 @@
     background-color: @B90;
   }
 }
+
+.ald-double-circle-icon-info {
+  background-color: @B95;
+
+  .inner {
+    background-color: @B90;
+  }
+}
+
+.ald-double-circle-icon-success{
+  background-color: @SA95;
+
+  .inner {
+    background-color: @SA90;
+  }
+}
+
+.ald-double-circle-icon-error {
+  background-color: @SC95;
+
+  .inner {
+    background-color: @SC90;
+  }
+}
+
+.ald-double-circle-icon-warning {
+  background-color: @SB95;
+
+  .inner {
+    background-color: @SB90;
+  }
+}

package/dist/Dropdown/style/index.less

@@ -26,20 +26,11 @@
     background-color: @NL97;
   }
 
-  .ant-dropdown-menu-submenu-title {
-    padding: 8px 24px 8px 12px;
-    line-height: 20px;
-    border-radius: 6px;
-
-    .ant-dropdown-menu-submenu-expand-icon {
-      right: 12px;
-    }
-  }
 
   .ant-dropdown-menu-item {
     padding: 8px 12px;
     line-height: 20px;
-    border-radius: 6px;
+    border-radius: 0;
   }
 
   .ant-dropdown-menu-item,
@@ -59,6 +50,16 @@
   }
 }
 
+.ant-dropdown-menu-submenu-title {
+  padding: 8px 24px 8px 12px;
+  line-height: 20px;
+  border-radius: 0 !important;
+
+  .ant-dropdown-menu-submenu-expand-icon {
+    right: 12px;
+  }
+}
+
 .ald-submenu.ant-dropdown-menu-submenu-popup {
   padding: 0;
   border: none;

package/dist/Input/style/index.less

@@ -9,21 +9,21 @@
 @input-height-large: 36px;
 @input-padding-large: 5px 13px;
 @input-font-size-large: 16px;
-@input-border-radius-large: 8px;
+@input-border-radius-large: 6px;
 @input-prefix-margin-right-large: 8px;
 @input-clear-icon-large: 20px;
 // size===middle
 @input-height-middle: 32px;
 @input-padding-middle: 5px 11px;
 @input-font-size-middle: 14px;
-@input-border-radius-middle: 6px;
+@input-border-radius-middle: 4px;
 @input-prefix-margin-right-middle: 8px;
 @input-clear-icon-middle: 16px;
 // size===small
 @input-height-small: 28px;
 @input-padding-small: 5px 9px;
 @input-font-size-small: 12px;
-@input-border-radius-small: 6px;
+@input-border-radius-small: 4px;
 @input-prefix-margin-right-small: 4px;
 @input-clear-icon-small: 14px;
 //custom status
@@ -34,7 +34,7 @@
 @input-bg-color: @BG100;
 // active status
 @input-active-border-color: @B40;
-@input-box-shadow-active: @shadow-xs;
+// @input-box-shadow-active: @shadow-xs;
 // disabled status
 @input-disabled-border-color: @BG60;
 @input-disabled-bg-color: @BG90;
@@ -47,7 +47,7 @@
   background-color: @input-bg-color;
   border-color: @input-border-color;
   border-radius: @input-border-radius-middle;
-  box-shadow: @shadow-xs;
+  // box-shadow: @shadow-xs;
   caret-color: @B60;
 
   &::placeholder {
@@ -67,7 +67,7 @@
   &:hover,
   &-focused {
     border-color: @input-active-border-color;
-    box-shadow: @input-box-shadow-active;
+    // box-shadow: @input-box-shadow-active;
   }
 
   &[disabled].ald-input {
@@ -112,7 +112,7 @@
   &:focus,
   &-focused {
     border-color: @input-active-border-color;
-    box-shadow: @input-box-shadow-active;
+    // box-shadow: @input-box-shadow-active;
   }
 
   .ant-input {
@@ -155,12 +155,12 @@
 .ant-input-affix-wrapper-focused {
   &.ant-input-password {
     border-color: @input-active-border-color;
-    box-shadow: @input-box-shadow-active;
+    // box-shadow: @input-box-shadow-active;
   }
 
   &:hover {
     border-color: @input-active-border-color;
-    box-shadow: @input-box-shadow-active;
+    // box-shadow: @input-box-shadow-active;
   }
 
   .ant-input:hover {

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,10 +1,10 @@
 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", "className", "width"],
-    _excluded7 = ["icon", "okButtonProps", "cancelButtonProps", "okType", "width"];
+    _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); }
 
@@ -25,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 = [];
@@ -54,6 +55,21 @@ function getButtonProps(buttonProps, defaultBtnType, okType) {
   });
 }
 
+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,
@@ -66,24 +82,32 @@ var OriginModal = function OriginModal(props) {
       _props$cancelButtonPr = props.cancelButtonProps,
       cancelButtonProps = _props$cancelButtonPr === void 0 ? {} : _props$cancelButtonPr,
       _props$okText = props.okText,
-      okText = _props$okText === void 0 ? "确定" : _props$okText,
+      okText = _props$okText === void 0 ? '确定' : _props$okText,
       _props$cancelText = props.cancelText,
-      cancelText = _props$cancelText === void 0 ? "取消" : _props$cancelText,
+      cancelText = _props$cancelText === void 0 ? '取消' : _props$cancelText,
       icon = props.icon,
       title = props.title,
+      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'),
     okText: okText,
@@ -101,114 +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,
+      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,
+      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,
+      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,
-      className = props.className,
       width = props.width,
+      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,
-    className: classNames('ald-modal-warning', className),
-    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,
+      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

@@ -68,6 +68,15 @@
       margin-inline-start: 12px;
     }
   }
+  
+}
+
+.ald-modal-padding-less{
+  .ant-modal-content {
+    .ant-modal-body{
+      margin: 0 -24px;
+    }
+  }
 }
 
 .ant-modal-confirm {
@@ -82,8 +91,22 @@
         margin-left: 28px;
       }
     }
+
   }
 
+  .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;
   }

package/dist/Select/style/status.less

@@ -6,7 +6,7 @@
    */
   &:hover,&.ald-select-open{
     border-color:@B40;
-    box-shadow: @shadow-drop;
+    // box-shadow: @shadow-drop;
   }
 
   /** 

package/package.json

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