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

package/dist/Button/index.js

@@ -17,9 +17,9 @@ import { Button as AntdButton } from 'antd';
 import classNames from 'classnames';
 import React from 'react';
 var iconPrefixCls = 'aldicon';
-var ICON_LARGE = 24;
-var ICON_MIDDLE = 20;
-var ICON_SMALL = 16;
+var ICON_LARGE = 20;
+var ICON_MIDDLE = 16;
+var ICON_SMALL = 14;
 export var btnPrefix = 'ald-btn';
 export function getButtonType(buttonType) {
   if (!['primary', 'secondary', 'dangerous', 'text', 'link'].includes(buttonType)) {
@@ -44,7 +44,7 @@ export function getDangerStatus(buttonType) {
   return false;
 }
 export function getButtonSizeClass(ButtonSize) {
-  return ButtonSize === 'middle' || undefined ? "".concat(btnPrefix, "-middle") : "".concat(btnPrefix, "-").concat(ButtonSize);
+  return ['small', 'large'].includes(ButtonSize) ? "".concat(btnPrefix, "-").concat(ButtonSize) : "".concat(btnPrefix, "-middle");
 }
 export function getIconSize(ButtonSize) {
   if (ButtonSize === 'large') {
@@ -80,7 +80,7 @@ export var setIcon = function setIcon(iconNode, size, loading) {
   if (loading) {
     return /*#__PURE__*/React.createElement(LoadingLine, {
       spin: true,
-      size: ICON_LARGE,
+      size: getIconSize(size),
       className: classNames("".concat(iconPrefixCls, "-icon-left"), iconPrefixCls),
       fill: "currentColor"
     });

package/dist/Button/style/index.less

@@ -1,7 +1,7 @@
 @import '../../style/index.less';
 @import './variables.less';
 
-.ant-btn.ald-btn {
+.ald-btn {
   &.ald-btn {
     // &-loading::before{
     //   // display: none !important;
@@ -70,15 +70,15 @@
       border-color: @button-dangerous-bg-color;
       box-shadow: unset;
 
-      &:focus {
+      &:focus:not(:disabled) {
         color: @button-dangerous-color;
         background-color: @button-dangerous-bg-color;
         border-color: @button-dangerous-bg-color;
         box-shadow: unset;
       }
 
-      &:hover,
-      &:active {
+      &:hover:not(:disabled),
+      &:active:not(:disabled) {
         color: @button-dangerous-color-active;
         background-color: @button-dangerous-bg-color-active;
         border-color: @button-dangerous-bg-color-active;
@@ -254,13 +254,14 @@
 
       .aldicon-icon-left {
         svg {
-          vertical-align: -2px;
+          vertical-align: -4px;
         }
       }
 
-      .aldicon-icon-left + span {
-        margin-left: @button-left-icon-margin-right-large;
-      }
+      gap:@button-left-icon-margin-right-large;
+      // .aldicon-icon-left + span {
+      //   margin-left: @button-left-icon-margin-right-large;
+      // }
     }
 
     &-middle {
@@ -284,13 +285,14 @@
 
       .aldicon-icon-left {
         svg {
-          vertical-align: -2px;
+          vertical-align: -3px;
         }
       }
 
-      .aldicon-icon-left + span {
-        margin-left: @button-left-icon-margin-right-middle;
-      }
+      gap:@button-left-icon-margin-right-middle;
+      // .aldicon-icon-left + span {
+      //   margin-left: @button-left-icon-margin-right-middle;
+      // }
     }
 
     &-small {
@@ -318,39 +320,41 @@
         }
       }
 
-      .aldicon-icon-left + span {
-        margin-left: @button-left-icon-margin-right-small;
-      }
+      gap:@button-left-icon-margin-right-small;
+      // .aldicon-icon-left + span {
+      //   margin-left: @button-left-icon-margin-right-small;
+      // }
     }
 
-    &-mini {
-      height: @button-height-mini;
-      padding: @button-border-padding-mini;
-      font-size: @button-text-size-mini;
-      line-height: 22px;
-      border-radius: @button-border-radius-mini;
-
-      &.ant-btn-icon-only {
-        min-width: @button-height-mini;
-        height: @button-height-mini;
-        border-radius: @button-border-radius-mini;
-      }
-
-      &.ant-btn-circle {
-        min-width: @button-height-mini;
-        height: @button-height-mini;
-        border-radius: 50%;
-      }
-
-      .aldicon-icon-left {
-        svg {
-          vertical-align: -2px;
-        }
-      }
-
-      .aldicon-icon-left + span {
-        margin-left: @button-left-icon-margin-right-mini;
-      }
-    }
+    // &-mini {
+    //   height: @button-height-mini;
+    //   padding: @button-border-padding-mini;
+    //   font-size: @button-text-size-mini;
+    //   line-height: 22px;
+    //   border-radius: @button-border-radius-mini;
+
+    //   &.ant-btn-icon-only {
+    //     min-width: @button-height-mini;
+    //     height: @button-height-mini;
+    //     border-radius: @button-border-radius-mini;
+    //   }
+
+    //   &.ant-btn-circle {
+    //     min-width: @button-height-mini;
+    //     height: @button-height-mini;
+    //     border-radius: 50%;
+    //   }
+
+    //   .aldicon-icon-left {
+    //     svg {
+    //       vertical-align: -2px;
+    //     }
+    //   }
+
+    //   gap:@button-left-icon-margin-right-mini;
+    //   // .aldicon-icon-left + span {
+    //   //   margin-left: @button-left-icon-margin-right-mini;
+    //   // }
+    // }
   }
 }

package/dist/Button/style/variables.less

@@ -6,27 +6,27 @@
 /** size控制 **/
 @button-height-large: 36px;
 @button-text-size-large: 16px;
-@button-border-radius-large: 8px;
-@button-border-padding-large: 6px 14px;
+@button-border-radius-large: 6px;
+@button-border-padding-large: 6px 24px;
 @button-left-icon-margin-right-large: 8px;
 
 @button-height-middle: 32px;
-@button-text-size-middle: 14px;
-@button-border-radius-middle: 8px;
-@button-border-padding-middle: 6px 12px;
-@button-left-icon-margin-right-middle: 8px;
+@button-text-size-middle: 13px;
+@button-border-radius-middle: 4px;
+@button-border-padding-middle: 6px 20px;
+@button-left-icon-margin-right-middle: 4px;
 
 @button-height-small: 28px;
 @button-text-size-small: 12px;
-@button-border-radius-small: 6px;
-@button-border-padding-small: 6px 10px;
+@button-border-radius-small: 4px;
+@button-border-padding-small: 6px 16px;
 @button-left-icon-margin-right-small: 4px;
 
-@button-height-mini: 24px;
-@button-text-size-mini: 12px;
-@button-border-radius-mini: 4px;
-@button-border-padding-mini: 0 7px;
-@button-left-icon-margin-right-mini: 4px;
+// @button-height-mini: 24px;
+// @button-text-size-mini: 12px;
+// @button-border-radius-mini: 4px;
+// @button-border-padding-mini: 0 7px;
+// @button-left-icon-margin-right-mini: 4px;
 
 /****  type控制  ****/
 @button-primary-bg-color: @B40;

package/dist/Checkbox/style/index.less

@@ -3,15 +3,19 @@
 .ald-checkbox {
   height: 20px;
   color: @NL0;
-  font-size: 14px;
+  font-size: 13px;
   line-height: 20px;
 
-  .ant-checkbox-wrapper {
+  &.ant-checkbox-wrapper {
     height: 20px;
     color: @NL0;
     font-weight: 400;
-    font-size: 14px;
+    font-size: 13px;
     line-height: 20px;
+
+   .ant-checkbox-input{
+      margin:0;
+    }
   }
 
   .ant-checkbox-inner {

package/dist/Empty/image/SearchSmall.js

@@ -14,6 +14,11 @@ var SearchSmall = function SearchSmall() {
     fill: "#EFF2F5",
     stroke: "#F9FAFB",
     strokeWidth: "5"
+  }), /*#__PURE__*/React.createElement("path", {
+    fillRule: "evenodd",
+    clipRule: "evenodd",
+    d: "M19.4074 15.3333C17.1574 15.3333 15.3333 17.1574 15.3333 19.4074C15.3333 21.6575 17.1574 23.4815 19.4074 23.4815C20.5031 23.4815 21.4978 23.0489 22.23 22.3453C22.2466 22.3241 22.2646 22.3037 22.2842 22.2842C22.3037 22.2646 22.3241 22.2466 22.3453 22.23C23.0489 21.4978 23.4815 20.5031 23.4815 19.4074C23.4815 17.1574 21.6575 15.3333 19.4074 15.3333ZM23.6734 22.7306C24.3887 21.8138 24.8148 20.6603 24.8148 19.4074C24.8148 16.421 22.3938 14 19.4074 14C16.421 14 14 16.421 14 19.4074C14 22.3938 16.421 24.8148 19.4074 24.8148C20.6603 24.8148 21.8138 24.3887 22.7306 23.6734L24.8619 25.8047C25.1223 26.0651 25.5444 26.0651 25.8047 25.8047C26.0651 25.5444 26.0651 25.1223 25.8047 24.8619L23.6734 22.7306Z",
+    fill: "#667085"
   }));
 };
 

package/dist/Empty/style/index.less

@@ -46,12 +46,23 @@
       width:160px;
       height: 160px;
     }
+
+    .ald-empty-title{
+      margin-top: 20px;
+    }
   }
 
   &.ald-empty-small{
+    padding:24px;
+
     .ald-empty-image-wrap{
       width:40px;
       height: 40px;
+      
+    }
+
+    .ald-empty-title{
+      margin-top: 12px;
     }
   }
 }

package/dist/Icon/icons.js

@@ -1670,4 +1670,36 @@ export default [{
   "categoryCN": "线性",
   "author": "阿广",
   "svg": "<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" width=\"1em\" height=\"1em\"><path fill=\"#000\" d=\"M3.75 2.25h16.5a1.5 1.5 0 0 1 1.5 1.5v16.5a1.5 1.5 0 0 1-1.5 1.5H3.75a1.5 1.5 0 0 1-1.5-1.5V3.75a1.5 1.5 0 0 1 1.5-1.5Zm3.75 4.5v-3H3.75v3H7.5Zm12.75 1.5H9v5.25h11.25V8.25ZM3.75 13.5H7.5V8.25H3.75v5.25ZM7.5 15H3.75v5.25H7.5V15ZM9 15v5.25h11.25V15H9ZM20.25 3.75H9v3h11.25v-3Z\" clip-rule=\"evenodd\" fill-rule=\"evenodd\" data-follow-fill=\"#000\"></path></svg>"
+}, {
+  "id": 209,
+  "title": "圆点-小号-填充",
+  "name": "dot-s-fill",
+  "category": "Fill",
+  "categoryCN": "填充",
+  "author": "阿广",
+  "svg": "<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" width=\"1em\" height=\"1em\"><path fill=\"#000\" d=\"M12 15a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z\" data-follow-fill=\"#000\"></path></svg>"
+}, {
+  "id": 210,
+  "title": "定时-线性",
+  "name": "timing-line",
+  "category": "Line",
+  "categoryCN": "线性",
+  "author": "阿广",
+  "svg": "<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" width=\"1em\" height=\"1em\"><path stroke-width=\"1.5\" stroke=\"#000\" d=\"M12 5.25v7.5h5.25\" data-follow-stroke=\"#000\"></path><path fill=\"#000\" d=\"M5.085 7.5H9V9H3V3h1.5v2.76A9.75 9.75 0 0 1 21.75 12h-1.5A8.25 8.25 0 0 0 5.085 7.5Zm13.83 9H15V15h6v6h-1.5v-2.76A9.75 9.75 0 0 1 2.25 12h1.5a8.25 8.25 0 0 0 15.165 4.5Z\" clip-rule=\"evenodd\" fill-rule=\"evenodd\" data-follow-fill=\"#000\"></path></svg>"
+}, {
+  "id": 211,
+  "title": "明细加速-线性",
+  "name": "details-accelerate-line",
+  "category": "Line",
+  "categoryCN": "线性",
+  "author": "阿广",
+  "svg": "<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" width=\"1em\" height=\"1em\"><path fill=\"#000\" d=\"M6.75 4.5H1.5V6h5.25V4.5ZM6.75 18H1.5v1.5h5.25V18ZM6.75 11.25H1.5v1.5h5.25v-1.5ZM11.707 22.44a.75.75 0 0 1-.45-.802l1.366-8.887H9a.75.75 0 0 1-.75-.923l2.25-9.75a.75.75 0 0 1 .75-.577h7.5a.75.75 0 0 1 .735.915L18.188 8.25h3.562a.75.75 0 0 1 .675.42.75.75 0 0 1-.082.75l-9.75 12.75a.75.75 0 0 1-.593.33.818.818 0 0 1-.293-.06Zm4.605-12.69 1.5-6.75H11.85l-1.905 8.25h4.432l-1.192 7.71 7.065-9.21h-3.938Z\" data-follow-fill=\"#000\"></path></svg>"
+}, {
+  "id": 212,
+  "title": "聚合加速-线性",
+  "name": "polymerization-accelerate-line",
+  "category": "Line",
+  "categoryCN": "线性",
+  "author": "阿广",
+  "svg": "<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" width=\"1em\" height=\"1em\"><path stroke-linejoin=\"round\" stroke-width=\"1.5\" stroke=\"#000\" d=\"M6.75 5.25h-4.5v13.5h4.5\" data-follow-stroke=\"#000\"></path><path fill=\"#000\" d=\"M11.707 22.44a.75.75 0 0 1-.45-.802l1.366-8.888H9a.75.75 0 0 1-.75-.922l2.25-9.75a.75.75 0 0 1 .75-.578h7.5a.75.75 0 0 1 .735.915L18.188 8.25h3.562a.75.75 0 0 1 .675.42.75.75 0 0 1-.082.75l-9.75 12.75a.75.75 0 0 1-.593.33.82.82 0 0 1-.293-.06Zm4.605-12.69 1.5-6.75H11.85l-1.905 8.25h4.432l-1.192 7.71 7.065-9.21h-3.938Z\" data-follow-fill=\"#000\"></path></svg>"
 }];

package/dist/Input/style/index.less

@@ -222,7 +222,7 @@
 }
 
 .ald-input-group-large {
-  .ald-input {
+  &:not(.ant-input-group-compact) .ald-input {
     height: @input-height-large;
     padding: @input-padding-large;
     font-size: @input-font-size-large;
@@ -236,21 +236,26 @@
     }
   }
 
-  &.ant-input-group-compact {
-    .ald-input {
-      &:first-of-type {
-        border-radius: @input-border-radius-large 0 0 @input-border-radius-large;
-      }
-
-      &:last-of-type {
-        border-radius: 0 @input-border-radius-large @input-border-radius-large 0;
-      }
+  &.ant-input-group-compact{
+    .ald-input,.ald-select,.ald-btn.ant-btn{
+      border-radius: 0;
     }
   }
+
+  &.ant-input-group-compact>*:first-child{
+    border-start-start-radius: @input-border-radius-large !important;
+    border-end-start-radius: @input-border-radius-large !important;
+  }
+
+  &.ant-input-group-compact>*:last-child{
+    border-inline-end-width: 1px;
+    border-start-end-radius:  @input-border-radius-large !important;
+    border-end-end-radius:  @input-border-radius-large !important;
+  }
 }
 
 .ald-input-group-middle {
-  .ald-input {
+  &:not(.ant-input-group-compact) .ald-input {
     height: @input-height-middle;
     padding: @input-padding-middle;
     font-size: @input-font-size-middle;
@@ -265,21 +270,26 @@
     }
   }
 
-  &.ant-input-group-compact {
-    .ald-input {
-      &:first-of-type {
-        border-radius: @input-border-radius-middle 0 0 @input-border-radius-middle;
-      }
-
-      &:last-of-type {
-        border-radius: 0 @input-border-radius-middle @input-border-radius-middle 0;
-      }
+  &.ant-input-group-compact{
+    .ald-input,.ald-select,.ald-btn.ant-btn{
+      border-radius: 0;
     }
   }
+
+  &.ant-input-group-compact>*:first-child{
+    border-start-start-radius: @input-border-radius-middle !important;
+    border-end-start-radius: @input-border-radius-middle !important;
+  }
+
+  &.ant-input-group-compact>*:last-child{
+    border-inline-end-width: 1px;
+    border-start-end-radius:  @input-border-radius-middle !important;
+    border-end-end-radius:  @input-border-radius-middle !important;
+  }
 }
 
 .ald-input-group-small {
-  .ald-input {
+  &:not(.ant-input-group-compact) .ald-input {
     height: @input-height-small;
     padding: @input-padding-small;
     font-size: @input-font-size-small;
@@ -294,17 +304,22 @@
     }
   }
 
-  &.ant-input-group-compact {
-    .ald-input {
-      &:first-of-type {
-        border-radius: @input-border-radius-small 0 0 @input-border-radius-small;
-      }
-
-      &:last-of-type {
-        border-radius: 0 @input-border-radius-small @input-border-radius-small 0;
-      }
+  &.ant-input-group-compact{
+    .ald-input,.ald-select,.ald-btn.ant-btn{
+      border-radius: 0;
     }
   }
+
+  &.ant-input-group-compact>*:first-child{
+    border-start-start-radius: @input-border-radius-small !important;
+    border-end-start-radius: @input-border-radius-small !important;
+  }
+
+  &.ant-input-group-compact>*:last-child{
+    border-inline-end-width: 1px;
+    border-start-end-radius:  @input-border-radius-small !important;
+    border-end-end-radius:  @input-border-radius-small !important;
+  }
 }
 
 .ald-textarea-large {

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.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", "className", "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", {
@@ -77,10 +85,13 @@ var OriginModal = function OriginModal(props) {
     }, subTitle))),
     className: classNames('ald-modal', className),
     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);
@@ -97,7 +108,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 +130,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 +152,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),
@@ -162,13 +173,15 @@ Modal.warning = function modalWarn(props) {
       _props$cancelButtonPr5 = props.cancelButtonProps,
       cancelButtonProps = _props$cancelButtonPr5 === void 0 ? {} : _props$cancelButtonPr5,
       okType = props.okType,
+      className = props.className,
       width = props.width,
-      restProps = _objectWithoutProperties(props, _excluded5);
+      restProps = _objectWithoutProperties(props, _excluded6);
 
   return AntdModal.success(_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",
@@ -185,7 +198,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),