@aloudata/aloudata-design 0.4.8 → 0.4.9

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,20 +34,21 @@
 @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;
 @input-disabled-font-color: @NL40;
 
 .ant-input.ald-input,
+.ant-input-affix-wrapper.ald-input, 
 .ald-input .ant-input {
   color: @NL0;
   font-weight: 400;
   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 +68,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 +113,7 @@
   &:focus,
   &-focused {
     border-color: @input-active-border-color;
-    box-shadow: @input-box-shadow-active;
+    // box-shadow: @input-box-shadow-active;
   }
 
   .ant-input {
@@ -137,7 +138,7 @@
   }
 
   .ant-input-prefix {
-    color: @NL50;
+    color: @NL40;
   }
 
   .ant-input-suffix {
@@ -155,12 +156,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 {
@@ -222,7 +223,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 +237,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 +271,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 +305,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 {
@@ -346,13 +362,14 @@ textarea.ald-input-textarea-small,
 textarea.ald-input-textarea,
 .ald-input-textarea .ant-input {
   color: @NL0;
-  background: @BG97;
+  background: @input-bg-color;
   caret-color: @B60;
+  border-color: @input-border-color;
 
   &:hover,
   &:active,
   &:focus {
-    border-color: @B60;
+    border-color: @B40;
     box-shadow: none;
   }
 
@@ -381,6 +398,11 @@ textarea.ald-input-textarea,
 }
 
 .ant-input-group-wrapper {
+  .ant-input-group-addon{
+    color:@NL40;
+    border-color: @input-border-color;
+  }
+
   &.ald-input-large {
     .ant-input-group-addon {
       padding: 4px 14px;

package/dist/InputNumber/style/index.less

@@ -3,17 +3,17 @@
 
 @inputNumber-height-large: 36px;
 @inputNumber-font-size-large: 16px;
-@inputNumber-border-radius-large: 8px;
+@inputNumber-border-radius-large: 6px;
 @inputNumber-padding-large: 0 14px;
 
 @inputNumber-height-middle: 32px;
 @inputNumber-font-size-middle: 14px;
-@inputNumber-border-radius-middle: 8px;
+@inputNumber-border-radius-middle: 4px;
 @inputNumber-padding-middle: 0 12px;
 
 @inputNumber-height-small: 28px;
 @inputNumber-font-size-small: 12px;
-@inputNumber-border-radius-small: 6px;
+@inputNumber-border-radius-small: 4px;
 @inputNumber-padding-small: 0 10px;
 
 //默认
@@ -102,6 +102,7 @@
     &.ald-inputNumber-large {
       height: @inputNumber-height-large;
       font-size: @inputNumber-font-size-large;
+      border-radius:  @inputNumber-border-radius-large ;
 
       .ant-input-number-input {
         padding: @inputNumber-padding-large;
@@ -115,6 +116,7 @@
     &.ald-inputNumber-middle {
       height: @inputNumber-height-middle;
       font-size: @inputNumber-font-size-middle;
+      border-radius:  @inputNumber-border-radius-middle ;
 
       .ant-input-number-input {
         padding: @inputNumber-padding-middle;
@@ -128,6 +130,7 @@
     &.ald-inputNumber-small {
       height: @inputNumber-height-small;
       font-size: @inputNumber-font-size-small;
+      border-radius: @inputNumber-border-radius-small;
 
       .ant-input-number-input {
         padding: @inputNumber-padding-small;
@@ -143,9 +146,11 @@
       background-color: @inputNumber-disabled-bg-color;
       border-color: @inputNumber-disabled-border-color;
       cursor: initial;
-
+      
       .ant-input-number-input-wrap .ant-input-number-input {
         cursor: initial;
+        color: @inputNumber-disabled-color;
+        background-color: @inputNumber-disabled-bg-color;
       }
     }
 

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 {
@@ -52,6 +52,11 @@
       &:hover{
         background: none;
       }
+
+      .ant-menu-submenu-expand-icon{
+        inset-inline-end:0;
+        width:initial;
+      }
     }
   }
 
@@ -68,3 +73,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) => {