@aloudata/aloudata-design 0.4.8-beta.7 → 0.4.8-beta.9

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;

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 {

package/dist/Modal/index.js

@@ -85,7 +85,7 @@ 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,

package/dist/Radio/style/index.less

@@ -12,6 +12,10 @@
 @radio-button-padding-middle: 12px;
 
 // Radio组件基础样式
+[class^="ald-radio"] {
+  box-sizing: border-box;
+}
+
 .ald-radio-wrapper {
   display: inline-flex;
   gap: 4px;
@@ -156,7 +160,7 @@
   left: 0;
   z-index: 1;
   width: 0;
-  height: calc(100% - 2px);
+  height: 100%;
   background: @BG100;
   border: 1px solid @BG60;
   border-radius: @border-radius-middle;
@@ -199,7 +203,7 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    height: calc(100% - 2px);
+    height: 100%;
     background: @BG100;
     border-top: 1px solid @BG60;
     border-left: 1px solid @BG60;

package/dist/Select/components/MultipleOption.js

@@ -9,12 +9,14 @@ export default function MultipleList(params) {
       className = params.className;
 
   var onClick = function onClick() {
-    //TODO: 这里有bug 等待antd升级 https://github.com/ant-design/ant-design/pull/39078
+    if (disabled) return;
     onChange === null || onChange === void 0 ? void 0 : onChange(!selected);
   };
 
   return /*#__PURE__*/React.createElement("div", {
-    className: classnames('ald-multiple-option', className),
+    className: classnames('ald-multiple-option', className, {
+      'ald-multiple-option-disabled': disabled
+    }),
     onClick: onClick
   }, /*#__PURE__*/React.createElement(Checkbox, {
     checked: selected,

package/dist/Select/components/SingleOption.js

@@ -16,7 +16,9 @@ export default function SingleOption(params) {
   };
 
   return /*#__PURE__*/React.createElement("div", {
-    className: classnames('ald-single-option', className),
+    className: classnames('ald-single-option', className, {
+      'ald-single-option-disabled': disabled
+    }),
     onClick: onClick
   }, /*#__PURE__*/React.createElement("div", {
     className: "ald-icons-check-line"

package/dist/Select/style/multiple.less

@@ -21,6 +21,15 @@
   &:hover{
     background-color: @BG90;
   }
+
+  &.ald-multiple-option-disabled{
+    opacity: 0.5;
+
+    &:hover{
+      background: none;
+      cursor: default;
+    }
+  }
 }
 
 .ald-multiple-option-label{

package/dist/Select/style/single.less

@@ -25,5 +25,14 @@
     .ald-single-option-text{
       white-space: nowrap;
     }
+
+    &.ald-single-option-disabled{
+      opacity: 0.5;
+
+      &:hover{
+        background: none;
+        cursor: default;
+      }
+    }
   }
 }

package/dist/Table/style/index.less

@@ -63,8 +63,10 @@
   &-thead {
     flex: 1;
     overflow: hidden;
-    font-size: 14px;
+    font-size: 13px;
     font-weight: 600;
+    background-color: @BG80;
+    mix-blend-mode: multiply;
 
     .ald-table-row {
       min-width: 9999px; // 防止拖动时的闪动
@@ -76,7 +78,6 @@
       padding: 6px 16px;
       color: @NL0;
       line-height: 20px;
-      background-color: @BG80;
       height: 100%;
 
       .ald-table-cell-content {
@@ -92,7 +93,7 @@
         z-index: 1;
         display: inline-block;
         width: 12px;
-        height: 14px;
+        height: 1em;
         transform: translateY(-50%);
         touch-action: none;
 
@@ -101,6 +102,7 @@
           width: 1px;
           height: 100%;
           background-color: @BG70;
+          mix-blend-mode: multiply;
           content: '';
         }
       }
@@ -130,7 +132,7 @@
         display: flex;
         align-items: center;
         padding-left: 16px;
-        color: @NL40;
+        color: @NL0;
 
         .ald-table-cell-container {
           width: 100%;
@@ -192,8 +194,8 @@
 
     &-left {
       color: @NL0;
-      font-weight: 500;
-      font-size: 14px;
+      font-weight: 600;
+      font-size: 13px;
     }
 
     &-right {
@@ -202,7 +204,7 @@
       justify-content: flex-end;
       height: 28px;
       color: @NL0;
-      font-size: 14px;
+      font-size: 13px;
     }
   }
 

package/dist/Tabs/index.d.ts

@@ -39,6 +39,7 @@ export interface ITabsProps extends Omit<TabsProps, 'size'> {
     tabPosition?: 'left' | 'right' | 'top' | 'bottom';
     className?: string;
     children?: React.ReactNode;
+    headerBackgroundColor?: string;
 }
 declare function Tabs(props: ITabsProps): JSX.Element;
 declare namespace Tabs {

package/dist/Tabs/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["size", "className", "popupClassName", "adaptHeight"];
+var _excluded = ["size", "className", "popupClassName", "adaptHeight", "style", "headerBackgroundColor"];
 
 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); }
 
@@ -23,6 +23,9 @@ export default function Tabs(props) {
       className = props.className,
       popupClassName = props.popupClassName,
       adaptHeight = props.adaptHeight,
+      _props$style = props.style,
+      style = _props$style === void 0 ? {} : _props$style,
+      headerBackgroundColor = props.headerBackgroundColor,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var tabsProps = _objectSpread({}, otherProps);
@@ -37,6 +40,9 @@ export default function Tabs(props) {
     }, /*#__PURE__*/React.createElement(MoreVerticalLine, {
       color: "currentColor"
     })),
+    style: Object.assign(style, {
+      "--header-bg-color": headerBackgroundColor
+    }),
     tabBarGutter: 24,
     popupClassName: classNames(popupClassName, 'ald-tabs-dropdown'),
     className: classNames('ald-tabs', className, {

package/dist/Tabs/style/index.less

@@ -22,6 +22,10 @@
 .ant-tabs.ald-tabs {
   &.ant-tabs {
     color: @NL40;
+
+    .ant-tabs-nav {
+      background-color: var(--header-bg-color);
+    }
   }
 
   .ant-tabs-tab {
@@ -125,7 +129,7 @@
   &.ant-tabs-bottom > .ant-tabs-nav,
   &.ant-tabs-top > div > .ant-tabs-nav,
   &.ant-tabs-bottom > div > .ant-tabs-nav {
-    margin: 0 0 20px;
+    margin: 0 0 16px;
 
     &::before {
       border-color: @BG70;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aloudata/aloudata-design",
-  "version": "0.4.8-beta.7",
+  "version": "0.4.8-beta.9",
   "description": "",
   "license": "MIT",
   "module": "dist/index.js",
@@ -50,8 +50,8 @@
     ]
   },
   "dependencies": {
-    "@aloudata/icons-react": "0.1.5",
-    "@aloudata/icons-svg": "0.1.5",
+    "@aloudata/icons-react": "0.1.7",
+    "@aloudata/icons-svg": "0.1.7",
     "antd": "5.2.0",
     "memoize-one": "^6.0.0",
     "rc-menu": "^9.8.0",