@aloudata/aloudata-design 1.6.2 → 1.6.3

package/dist/Checkbox/index.js

@@ -1,4 +1,5 @@
-var _excluded = ["className"];
+var _excluded = ["className", "disabled"],
+    _excluded2 = ["className", "disabled"];
 
 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); }
 
@@ -7,18 +8,35 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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; }
 
 import { Checkbox as AntdCheckbox } from 'antd';
+import DisabledContext from 'antd/lib/config-provider/DisabledContext';
 import classNames from 'classnames';
 import React from 'react';
 import CheckboxGroup from "./component/CheckboxGroup";
 
 function Checkbox(props) {
   var className = props.className,
+      customDisabled = props.disabled,
       otherProps = _objectWithoutProperties(props, _excluded);
 
+  var disabled = React.useContext(DisabledContext);
+  var mergedDisabled = customDisabled !== null && customDisabled !== void 0 ? customDisabled : disabled;
   return /*#__PURE__*/React.createElement(AntdCheckbox, _extends({
-    className: classNames('ald-checkbox', className)
+    className: classNames('ald-checkbox', className),
+    disabled: mergedDisabled
   }, otherProps));
 }
 
-Checkbox.Group = CheckboxGroup;
+Checkbox.Group = function Group(props) {
+  var className = props.className,
+      customDisabled = props.disabled,
+      otherProps = _objectWithoutProperties(props, _excluded2);
+
+  var disabled = React.useContext(DisabledContext);
+  var mergedDisabled = customDisabled !== null && customDisabled !== void 0 ? customDisabled : disabled;
+  return /*#__PURE__*/React.createElement(CheckboxGroup, _extends({
+    className: classNames('ald-checkbox-group', className),
+    disabled: mergedDisabled
+  }, otherProps));
+};
+
 export default Checkbox;

package/dist/Checkbox/type.d.ts

@@ -34,7 +34,7 @@ export interface ICheckboxProps extends CheckboxProps {
      * @type boolean
      * @default false
      */
-    indeterminate?: false;
+    indeterminate?: boolean;
     /**
      * @description 变化时的回调函数
      * @type  function(e:Event)
@@ -84,7 +84,7 @@ export interface ICheckboxGroupProps extends CheckboxGroupProps {
      * @type 'vertical' | 'horizontal'
      * @default -
      */
-    direction: EDirection.VERTICAL;
+    direction?: 'vertical' | 'horizontal';
     /**
      * @description className
      * @type string

package/dist/Form/index.d.ts

@@ -10,11 +10,15 @@ declare const AldForm: <Values = any>(props: FormProps<Values> & {
     children?: React.ReactNode;
 } & {
     ref?: React.Ref<FormInstance<Values>> | undefined;
+    labelWidth?: number | undefined;
 }) => React.ReactElement;
+interface IFormItemProps extends FormItemProps {
+    labelWidth?: number;
+}
 declare const AldFormItem: {
-    (props: FormItemProps): JSX.Element;
+    (props: IFormItemProps): JSX.Element;
     useStatus: () => {
-        status?: "" | "error" | "success" | "warning" | "validating" | undefined;
+        status?: "" | "warning" | "error" | "success" | "validating" | undefined;
         errors: React.ReactNode[];
         warnings: React.ReactNode[];
     };

package/dist/Form/index.js

@@ -1,7 +1,14 @@
-var _excluded = ["children", "colon", "size"];
+var _excluded = ["children", "colon", "size", "labelWidth", "style"],
+    _excluded2 = ["labelWidth", "style"];
 
 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; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+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 _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; }
@@ -23,23 +30,37 @@ var AldForm = /*#__PURE__*/forwardRef(function (props, ref) {
       colon = _props$colon === void 0 ? false : _props$colon,
       _props$size = props.size,
       size = _props$size === void 0 ? contextSize : _props$size,
+      labelWidth = props.labelWidth,
+      _props$style = props.style,
+      style = _props$style === void 0 ? {} : _props$style,
       restProps = _objectWithoutProperties(props, _excluded);
 
+  var customStyle = labelWidth ? _objectSpread(_objectSpread({}, style), {}, {
+    '--label-width': "".concat(labelWidth, "px")
+  }) : style;
   return /*#__PURE__*/React.createElement(SizeContextProvider, {
     size: size
   }, /*#__PURE__*/React.createElement(InternalForm, _extends({
     colon: colon,
-    size: size
+    size: size,
+    style: customStyle
   }, restProps, {
     ref: ref
   }), children));
 });
 
 var AldFormItem = function AldFormItem(props) {
-  //@ts-ignore  antd formItem 的ts接口里面无gutter 但是实际上是支持的
+  var labelWidth = props.labelWidth,
+      _props$style2 = props.style,
+      style = _props$style2 === void 0 ? {} : _props$style2,
+      restProps = _objectWithoutProperties(props, _excluded2);
+
+  var customStyle = labelWidth ? _objectSpread(_objectSpread({}, style), {}, {
+    '--label-width': "".concat(labelWidth, "px")
+  }) : style;
   return /*#__PURE__*/React.createElement(Item, _extends({
-    gutter: 12
-  }, props));
+    style: customStyle
+  }, restProps));
 };
 
 AldFormItem.useStatus = Item.useStatus;

package/dist/Form/style/index.less

@@ -9,8 +9,8 @@
     }
 
     .ant-form-item-label {
-      display: inline-flex;
-      align-items: center;
+      width: var(--label-width);
+      margin-right: 12px;
 
       label {
         overflow: hidden;
@@ -19,15 +19,9 @@
         font-style: normal;
         font-weight: 500;
         line-height: 20px;
-        height: auto !important;
-
-        &[for='textarea'] {
-          align-self: flex-start;
-        }
+        height: 32px;
 
         &.ant-form-item-no-colon {
-          display: flex;
-
           &::after {
             display: none;
           }
@@ -37,6 +31,7 @@
 
     .ant-form-item-control {
       line-height: 20px;
+      justify-content: center;
 
       .ant-form-item-control-input {
         min-height: 20px;
@@ -64,15 +59,25 @@
     }
   }
 
-  // &.ant-form-small {
-  //   .ant-form-item {
-  //     .ant-form-item-control {
-  //       .ant-form-item-control-input {
-  //         min-height: 16px;
-  //       }
-  //     }
-  //   }
-  // }
+  &-small {
+    .ant-form-item {
+      .ant-form-item-label {
+        label {
+          height: 28px;
+        }
+      }
+    }
+  }
+
+  &-large {
+    .ant-form-item {
+      .ant-form-item-label {
+        label {
+          height: 36px;
+        }
+      }
+    }
+  }
 }
 
 .ant-form-vertical {

package/dist/Menu/style/index.less

@@ -54,8 +54,8 @@
       }
 
       .ant-menu-submenu-expand-icon {
-        inset-inline-end: 0;
         width: initial;
+        right: 8px;
       }
     }
   }

package/dist/Select/style/multiple.less

@@ -1,38 +1,37 @@
 @import './variables.less';
 
-.ald-multiple-option-list{
+.ald-multiple-option-list {
   display: flex;
   justify-content: space-between;
   flex-direction: column;
   color: @NL0;
   font-size: 13px;
   line-height: 20px;
-
 }
 
-.ald-multiple-option{
-  padding: 8px 14px;
+.ald-multiple-option {
+  padding: 8px 12px;
   // height: 20px;
   margin-left: 0;
   display: flex;
   height: 36px;
   box-sizing: border-box;
 
-  &:hover{
+  &:hover {
     background-color: @BG90;
   }
 
-  &.ald-multiple-option-disabled{
+  &.ald-multiple-option-disabled {
     opacity: 0.5;
 
-    &:hover{
+    &:hover {
       background: none;
       cursor: default;
     }
   }
 }
 
-.ald-multiple-option-label{
+.ald-multiple-option-label {
   white-space: nowrap;
   margin-left: 10px;
   flex: 1;
@@ -48,8 +47,8 @@
     cursor: text;
     align-items: flex-start;
 
-    .ant-select-selection-overflow{
+    .ant-select-selection-overflow {
       height: 100%;
     }
   }
-}
+}

package/dist/Switch/style/index.less

@@ -9,20 +9,22 @@
 @switch-text-margin-left: 8px;
 @switch-aspect-ratio: 2; //宽高比
 @switch-height-radius-ratio: 2; //高度和边框圆角比
+@switch-background-color: #dbdbdb;
+@switch-background-color-checked: #3271c9;
 
 .ald-switch.ald-switch {
   display: inline-block;
   font-size: 0;
 
   .ald-switch-btn {
-    background: @BG60;
+    background: @switch-background-color;
 
     &:focus {
       box-shadow: none;
     }
 
     &:hover {
-      background: @BG60;
+      background: @switch-background-color;
     }
   }
 
@@ -36,10 +38,10 @@
 
   &.ald-switch-checked {
     .ald-switch-btn {
-      background-color: @B40;
+      background-color: @switch-background-color-checked;
 
       &:hover {
-        background-color: @B40;
+        background-color: @switch-background-color-checked;
       }
     }
   }
@@ -67,7 +69,6 @@
       min-width: @switch-handle-height-middle * @switch-aspect-ratio;
       height: @switch-handle-height-middle;
       line-height: @switch-handle-height-middle;
-      border-radius: @switch-handle-height-middle / @switch-height-radius-ratio;
 
       .ant-switch-handle {
         top: @switch-handle-gap-middle;
@@ -79,7 +80,7 @@
           width: @switch-handle-middle - 4px;
           height: @switch-handle-middle - 4px;
           font-size: @switch-handle-middle - 4px;
-          
+
           svg {
             width: @switch-handle-middle - 4px;
             height: @switch-handle-middle - 4px;
@@ -110,7 +111,6 @@
       min-width: @switch-handle-height-small * @switch-aspect-ratio;
       height: @switch-handle-height-small;
       line-height: @switch-handle-height-small;
-      border-radius: @switch-handle-height-small / @switch-height-radius-ratio;
 
       .ant-switch-handle {
         top: @switch-handle-gap-small;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aloudata/aloudata-design",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "description": "",
   "license": "MIT",
   "module": "dist/index.js",