@aloudata/aloudata-design 0.3.0-beta.1 → 0.3.0

package/lib/InputNumber/style/index.less

@@ -1,15 +1,17 @@
+/* stylelint-disable no-descending-specificity */
 @import '../../style/index.less';
 
 @InputNumber-height-large: 36px;
 @InputNumber-fontSize-large: 16px;
+@InputNumber-borderRadius-large: 8px;
 
 @InputNumber-height-middle: 32px;
 @InputNumber-fontSize-middle: 14px;
+@InputNumber-borderRadius-middle: 6px;
 
 @InputNumber-height-small: 28px;
 @InputNumber-fontSize-small: 12px;
-
-@InputNumber-borderRadius: 8px;
+@InputNumber-borderRadius-small: 4px;
 //默认
 @InputNumber-bgColor: @BG97;
 @InputNumber-borderColor: @NL90;
@@ -22,24 +24,25 @@
 //disable
 @InputNumber-disabled-bgColor: @BG95;
 @InputNumber-disabled-borderColor: @NL90;
-@InputNumber-disabled-color: @NL80;
+@InputNumber-disabled-color: @NL60;
 //光标颜色
 @InputNumber-cursor-color: @B60;
 
 //前后填充
 @InputNumber-addon-bgColor: @BG95;
-@InputNumber-addon-color: @NL50;
-@InputNumber-addon-disable-color: @NL80;
+@InputNumber-addon-color: @NL30;
+@InputNumber-addon-borderColor: @NL90;
+@InputNumber-addon-disable-color: @NL60;
 
 .ald-inputNumber {
   &.ant-input-number {
     height: @InputNumber-height-middle;
-    overflow: hidden;
+    // overflow: hidden;
     color: @InputNumber-color;
     font-size: @InputNumber-fontSize-middle;
     background-color: @InputNumber-bgColor;
     border-color: @InputNumber-borderColor;
-    border-radius: @InputNumber-borderRadius;
+    border-radius: @InputNumber-borderRadius-middle;
     box-shadow: none;
 
     .ant-input-number-input-wrap {
@@ -52,28 +55,56 @@
     }
 
     .ant-input-number-handler-wrap {
+      overflow: hidden;
+
       .ant-input-number-handler {
         background-color: @BG95;
-      }
 
-      .ant-input-number-handler:active {
-        background-color: @NL95;
+        .ant-input-number-handler-up-inner,
+        .ant-input-number-handler-down-inner {
+          color: @NL50;
+        }
+
+        &:hover,
+        &:active {
+          background-color: @NL95;
+
+          .ant-input-number-handler-up-inner,
+          .ant-input-number-handler-down-inner {
+            color: @B60;
+          }
+        }
       }
     }
 
     &.ald-inputNumber-large {
       height: @InputNumber-height-large;
       font-size: @InputNumber-fontSize-large;
+      border-radius: @InputNumber-borderRadius-large;
+
+      .ant-input-number-handler-wrap {
+        border-radius: 0 @InputNumber-borderRadius-large @InputNumber-borderRadius-large 0;
+      }
     }
 
     &.ald-inputNumber-middle {
       height: @InputNumber-height-middle;
       font-size: @InputNumber-fontSize-middle;
+      border-radius: @InputNumber-borderRadius-middle;
+
+      .ant-input-number-handler-wrap {
+        border-radius: 0 @InputNumber-borderRadius-middle @InputNumber-borderRadius-middle 0;
+      }
     }
 
     &.ald-inputNumber-small {
       height: @InputNumber-height-small;
       font-size: @InputNumber-fontSize-small;
+      border-radius: @InputNumber-borderRadius-small;
+
+      .ant-input-number-handler-wrap {
+        border-radius: 0 @InputNumber-borderRadius-small @InputNumber-borderRadius-small 0;
+      }
     }
 
     &-disabled {
@@ -87,44 +118,79 @@
       }
     }
 
+    &:hover:not(.ald-inputNumber-disabled),
     &-focused {
       background-color: @InputNumber-active-bgColor;
       border-color: @InputNumber-active-borderColor;
+      box-shadow: 0 0 0 0.5px @InputNumber-active-borderColor;
     }
   }
 
   &.ant-input-number-group-wrapper {
     // height: @InputNumber-height-middle;
-    overflow: hidden;
+    // overflow: hidden;
     color: @InputNumber-color;
-    background-color: @InputNumber-wrapper-bgColor;
+    // background-color: @InputNumber-wrapper-bgColor;
     border-color: @InputNumber-borderColor;
-    border-radius: @InputNumber-borderRadius;
     box-shadow: none;
 
     &.ald-inputNumber-large {
       font-size: @InputNumber-fontSize-large;
+      border-radius: @InputNumber-borderRadius-large;
+
+      .ant-input-number-group-addon {
+        &:first-child {
+          border-radius: @InputNumber-borderRadius-large 0 0 @InputNumber-borderRadius-large;
+        }
+
+        &:last-child {
+          border-radius: 0 @InputNumber-borderRadius-large @InputNumber-borderRadius-large 0;
+        }
+      }
     }
 
     &.ald-inputNumber-middle {
       font-size: @InputNumber-fontSize-middle;
+      border-radius: @InputNumber-borderRadius-middle;
+
+      .ant-input-number-group-addon {
+        &:first-child {
+          border-radius: @InputNumber-borderRadius-middle 0 0 @InputNumber-borderRadius-middle;
+        }
+
+        &:last-child {
+          border-radius: 0 @InputNumber-borderRadius-middle @InputNumber-borderRadius-middle 0;
+        }
+      }
     }
 
     &.ald-inputNumber-small {
       font-size: @InputNumber-fontSize-small;
+      border-radius: @InputNumber-borderRadius-small;
+
+      .ant-input-number-group-addon {
+        &:first-child {
+          border-radius: @InputNumber-borderRadius-small 0 0 @InputNumber-borderRadius-small;
+        }
+
+        &:last-child {
+          border-radius: 0 @InputNumber-borderRadius-small @InputNumber-borderRadius-small 0;
+        }
+      }
     }
 
     .ant-input-number-wrapper {
       height: 100%;
-      overflow: hidden;
+      // overflow: hidden;
       font-size: inherit;
 
       .ant-input-number-group-addon {
-        overflow: hidden;
+        // overflow: hidden;
         color: @InputNumber-addon-color;
         font-size: inherit;
         background-color: @InputNumber-addon-bgColor;
-        border-radius: @InputNumber-borderRadius;
+        // border-radius: @InputNumber-borderRadius-middle;
+        border-color: @InputNumber-addon-borderColor;
 
         &:first-child {
           border-top-right-radius: 0;
@@ -138,8 +204,14 @@
       }
 
       .ald-inputNumber {
+        position: relative;
+        z-index: 2;
         margin: 0;
         padding: 0;
+
+        .ant-input-number-handler-wrap {
+          border-radius: 0;
+        }
       }
     }
 

package/lib/Menu/style/index.less

@@ -16,9 +16,9 @@
     background-color: @NL90;
   }
 
-  .ald-iconfont {
+  .ald-iconSvg {
     font-size: 16px;
-    font-family: @icon-font !important;
+    // font-family: @icon-font !important;
     font-style: normal;
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
@@ -31,7 +31,8 @@
   .ant-dropdown-menu-submenu-title
     .ant-dropdown-menu-submenu-expand-icon
     .ant-dropdown-menu-submenu-arrow-icon {
-    .ald-iconfont('\e691');
+    color: @NL50;
+    .ald-iconSvg('arrows_right_sm',14px);
   }
 
   .ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected {

package/lib/Modal/index.js

@@ -21,9 +21,9 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _Button = _interopRequireDefault(require("../Button"));
 
-var _Icon = _interopRequireDefault(require("../Icon"));
+var _CloseLine = _interopRequireDefault(require("../Icon/icons/CloseLine"));
 
-var _excluded = ["className", "children", "forbidBodyScroll", "footer", "okText", "cancelText", "onOk", "onCancel", "width", "closeIcon"];
+var _excluded = ["className", "children", "forbidBodyScroll", "footer", "okText", "cancelText", "onOk", "onCancel", "width", "confirmLoading", "closeIcon"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -54,6 +54,7 @@ var OriginModal = function OriginModal(props) {
       onOk = props.onOk,
       onCancel = props.onCancel,
       width = props.width,
+      confirmLoading = props.confirmLoading,
       closeIcon = props.closeIcon,
       restProps = _objectWithoutProperties(props, _excluded);
 
@@ -62,6 +63,7 @@ var OriginModal = function OriginModal(props) {
     onClick: onCancel
   }, cancelText || '取消'), /*#__PURE__*/_react.default.createElement(_Button.default, {
     type: "primary",
+    loading: confirmLoading,
     size: "large",
     onClick: onOk
   }, okText || '确定'));
@@ -73,8 +75,8 @@ var OriginModal = function OriginModal(props) {
     width: width || DEFAULT_WIDTH,
     closeIcon: closeIcon || /*#__PURE__*/_react.default.createElement(_Button.default, {
       size: "small",
-      icon: /*#__PURE__*/_react.default.createElement(_Icon.default, {
-        type: "close",
+      icon: /*#__PURE__*/_react.default.createElement(_CloseLine.default, {
+        fill: "currentColor",
         size: 12
       }),
       className: "ald-modal-close"

package/lib/Modal/style/index.less

@@ -8,8 +8,8 @@
 
   .ald-modal-close {
     position: relative;
-    top: -4px;
-    left: -10px;
+    top: 8px;
+    left: -16px;
   }
 
   .ant-modal-header {
@@ -105,7 +105,7 @@
     }
 
     .ant-btn-default {
-      padding: @Button-border-padding;
+      padding: @Button-border-padding-middle;
       color: @Button-secondary-color;
       background-color: @Button-secondary-bgColor;
       border: 1px solid;

package/lib/Navigator/style/index.less

@@ -67,26 +67,46 @@
         height: 48px;
         margin-top: 12px;
         padding: 0 12px;
-        .textStyle(@BG60, 14px, 48px, 600, normal);
+        .textStyle(@BG60, 14px, 48px, 400, normal);
       }
     }
 
     .ald-nav-menu-item {
+      position: relative;
       display: flex;
       align-items: center;
       height: 48px;
+      margin-bottom: 4px;
       padding: 0 12px;
       line-height: 48px;
       border-radius: 8px;
 
+      &::before {
+        position: absolute;
+        top: 0;
+        left: 0;
+        display: block;
+        width: 0%;
+        height: inherit;
+        background: @ND80;
+        border-radius: inherit;
+        content: '';
+      }
+
       &-icon {
+        position: relative;
+        z-index: 1;
+        display: flex;
+        align-items: center;
         margin-right: 12px;
       }
 
       &-content {
+        position: relative;
+        z-index: 1;
         flex: 1;
         overflow: hidden;
-        .textStyle(@B95, 16px, 24px, 600, normal);
+        .textStyle(@B95, 16px, 24px, 400, normal);
 
         &-text {
           white-space: nowrap;
@@ -94,14 +114,18 @@
       }
 
       &:hover {
+        background-color: @ND90;
         cursor: pointer;
       }
 
       &.ald-nav-menu-item-selected {
-        background-color: @B60;
-
         .ald-nav-menu-item-content {
-          .textStyle(@ND0, 16px, 24px, 600, normal);
+          .textStyle(@ND0, 16px, 24px, 400, normal);
+        }
+
+        &::before {
+          animation: 0.26s linear 0s hoverBgChange;
+          animation-fill-mode: forwards;
         }
       }
     }
@@ -116,3 +140,20 @@
     }
   }
 }
+
+@keyframes hoverBgChange {
+  0% {
+    width: 0%;
+    background-color: @ND80;
+  }
+
+  90% {
+    width: 100%;
+    background-color: @ND80;
+  }
+
+  100% {
+    width: 100%;
+    background-color: @B40;
+  }
+}

package/lib/Select/index.d.ts

@@ -14,9 +14,10 @@ export interface LabeledValue {
     label: React.ReactNode;
 }
 export declare type SelectValue = RawValue | RawValue[] | LabeledValue | LabeledValue[] | undefined;
+export declare type SelectType = SizeType | 'mini';
 export interface InternalSelectProps<ValueType = any, OptionType extends BaseOptionType | DefaultOptionType = DefaultOptionType> extends Omit<RcSelectProps<ValueType, OptionType>, 'mode'> {
     suffixIcon?: React.ReactNode;
-    size?: SizeType;
+    size?: SelectType;
     disabled?: boolean;
     mode?: 'multiple' | 'tags' | 'SECRET_COMBOBOX_MODE_DO_NOT_USE';
     bordered?: boolean;

package/lib/Select/index.js

@@ -69,7 +69,8 @@ var InternalSelect = function InternalSelect(_ref, ref) {
       customDisabled = _ref.disabled,
       notFoundContent = _ref.notFoundContent,
       customStatus = _ref.status,
-      showArrow = _ref.showArrow,
+      _ref$showArrow = _ref.showArrow,
+      showArrow = _ref$showArrow === void 0 ? true : _ref$showArrow,
       props = _objectWithoutProperties(_ref, _excluded);
 
   var _React$useContext = React.useContext(_configProvider.ConfigContext),

package/lib/Select/rc-select/Selector/MultipleSelector.js

@@ -235,7 +235,7 @@ var SelectSelector = function SelectSelector(props) {
   React.useEffect(function () {
     var prefixEl = prefixRef.current;
     var size = ['large', 'small', 'mini'].includes(props.size) ? props.size.toUpperCase() : 'MIDDLE';
-    var selectorPaddingLeft = parseInt(_variables.default["SELECTOR_PADDING_LEFT"]);
+    var selectorPaddingLeft = parseInt(_variables.default["SELECTOR_PADDING_HORIZONTAL_".concat(size)]);
 
     if (prefixEl) {
       var prefixOffsetWidth = prefixEl.offsetWidth;
@@ -244,7 +244,7 @@ var SelectSelector = function SelectSelector(props) {
     }
 
     return setPlaceholderLeft(selectorPaddingLeft);
-  }, []);
+  }, [values]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, selectionNode, !values.length && !inputValue && /*#__PURE__*/React.createElement("span", {
     className: (0, _classnames.default)("".concat(selectionPrefixCls, "-placeholder"), 'ald-select-selection-placeholder', _defineProperty({}, "ald-select-selection-placeholder-prefix", prefix)),
     style: {

package/lib/Select/rc-select/hooks/useOptions.d.ts

@@ -6,6 +6,6 @@ import type { FieldNames } from '../Select';
  */
 export default function useOptions<OptionType>(options: OptionType[], children: React.ReactNode, fieldNames: FieldNames, optionFilterProp: string, optionLabelProp: string): {
     options: OptionType[];
-    valueOptions: Map<React.ReactText, OptionType>;
+    valueOptions: Map<string | number, OptionType>;
     labelOptions: Map<React.ReactNode, OptionType>;
 };

package/lib/Select/style/index.d.ts

@@ -1,4 +1,3 @@
-import 'antd/lib/style/index.less';
 import '../../Empty/style';
 import '../../style';
 import './index.less';

package/lib/Select/style/index.js

@@ -1,7 +1,5 @@
 "use strict";
 
-require("antd/lib/style/index.less");
-
 require("../../Empty/style");
 
 require("../../style");

package/lib/Select/style/index.less

@@ -4,6 +4,7 @@
 
 .ald-select {
   .ant-select-selector:not(.ant-select-customize-input) {
+    background-color: @selector-bgColor-default;
     border-color: @selector-borderColor-default;
 
     .ald-select-selector-prefix {
@@ -22,6 +23,7 @@
   }
 
   &.ant-select-disabled .ant-select-selector:not(.ant-select-customize-input) {
+    background-color: @selector-bgColor-disabled;
     border-color: @selector-borderColor-disabled;
     cursor: initial;
 
@@ -44,11 +46,19 @@
     }
   }
 
+  &.ant-select-multiple.ant-select-disabled.ant-select:not(.ant-select-customize-input) {
+    .ant-select-selector {
+      background-color: @selector-bgColor-disabled;
+      border-color: @selector-borderColor-disabled;
+      cursor: initial;
+    }
+  }
+
   &:not(.ant-select-disabled):hover,
   &.ant-select.ant-select-focused:not(.ant-select-disabled) {
     .ant-select-selector {
       border-color: @selector-borderColor-active;
-      box-shadow: none;
+      box-shadow: 0 0 0 0.5px @B60;
 
       &:focus-visible {
         outline: none;
@@ -61,7 +71,9 @@
       .ant-select-selection-placeholder {
         color: @selector-placeholderColor-active;
       }
+    }
 
+    &.ant-select-open {
       .ant-select-selection-overflow,
       .ant-select-selection-item {
         color: @selector-valueColor-active;
@@ -69,14 +81,54 @@
         border: none;
       }
     }
+
+    &:not(.ant-select-open) {
+      .ant-select-selector {
+        border-color: @selector-borderColor-default;
+        box-shadow: none;
+
+        &:focus-visible {
+          outline: none;
+        }
+
+        .ald-select-selector-prefix {
+          color: @selector-labelColor-default;
+        }
+
+        .ant-select-selection-placeholder {
+          color: @selector-placeholderColor-default;
+        }
+      }
+    }
+  }
+
+  .ant-select-clear,
+  .ant-select-arrow {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: @NL50;
+    font-size: inherit;
+  }
+
+  &.ant-select-disabled {
+    .ant-select-clear,
+    .ant-select-arrow {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      color: @NL60;
+      font-size: inherit;
+    }
   }
 
   &.ald-select-large {
+    font-size: @selector-fontSize-large;
+
     .ant-select-selector {
       align-items: center;
       height: @selector-height-large;
-      padding: 0 @selector-paddingLeft;
-      font-size: @selector-fontSize-large;
+      padding: 0 @selector-paddingHorizontal-large;
       line-height: @selector-lineHeight-large;
       border-radius: @selector-borderRadius-large;
 
@@ -94,11 +146,12 @@
   }
 
   &.ald-select-middle {
+    font-size: @selector-fontSize-middle;
+
     .ant-select-selector {
       align-items: center;
       height: @selector-height-middle;
-      padding: 0 @selector-paddingLeft;
-      font-size: @selector-fontSize-middle;
+      padding: 0 @selector-paddingHorizontal-middle;
       line-height: @selector-lineHeight-middle;
       border-radius: @selector-borderRadius-middle;
 
@@ -116,11 +169,12 @@
   }
 
   &.ald-select-small {
+    font-size: @selector-fontSize-small;
+
     .ant-select-selector {
       align-items: center;
       height: @selector-height-small;
-      padding: 0 @selector-paddingLeft;
-      font-size: @selector-fontSize-small;
+      padding: 0 @selector-paddingHorizontal-small;
       line-height: @selector-lineHeight-small;
       border-radius: @selector-borderRadius-small;
 
@@ -138,11 +192,12 @@
   }
 
   &.ald-select-mini {
+    font-size: @selector-fontSize-mini;
+
     .ant-select-selector {
       align-items: center;
       height: @selector-height-mini;
-      padding: 0 @selector-paddingLeft;
-      font-size: @selector-fontSize-mini;
+      padding: 0 @selector-paddingHorizontal-mini;
       line-height: @selector-lineHeight-mini;
       border-radius: @selector-borderRadius-mini;
 
@@ -195,6 +250,12 @@
             content: '，';
           }
         }
+
+        .ant-select-selection-search-input {
+          height: inherit;
+          line-height: inherit;
+          caret-color: @B60;
+        }
       }
 
       .ant-select-selection-overflow-item:first-of-type {
@@ -203,6 +264,10 @@
         }
       }
     }
+
+    .ant-select-selector::after {
+      height: 1.5715em;
+    }
   }
 }
 
@@ -210,9 +275,15 @@
   .ald-select-item {
     display: flex;
     align-items: center;
-    padding: 0 4px;
+    margin: 0 4px;
+    padding: 0;
     font-size: 14px;
     background-color: @select-option-bgColor;
+    border-radius: 6px;
+
+    &:hover {
+      background-color: @select-option-bgColor-hover;
+    }
 
     .ald-select-single-check {
       display: flex;