@kdcloudjs/kdesign 1.3.4 → 1.3.7

package/es/select/select.js

@@ -67,7 +67,6 @@ var InternalSelect = function InternalSelect(props, ref) {
       setInitValue = _useMergedState2[1];
 
   var realChildren = Array.isArray(options) ? options : toArray(children); // options配置项和默认children
-  // console.log('real', realChildren)
 
   var innerRef = React.useRef();
   var selectRef = ref || innerRef;
@@ -251,6 +250,7 @@ var InternalSelect = function InternalSelect(props, ref) {
         return (child === null || child === void 0 ? void 0 : child.value) === key;
       }
     })) || {};
+    var optionsObj = obj.props ? obj.props : obj || {};
 
     if (value !== undefined) {
       // onChange && onChange(labelInValue ? { value: key, label } : key)
@@ -271,13 +271,13 @@ var InternalSelect = function InternalSelect(props, ref) {
           _spliceInstanceProperty(optsArr).call(optsArr, idx, 1);
         } else {
           valArr.push(key);
-          optsArr.push({
+          optsArr.push(_extends(_extends({}, optionsObj), {
             value: key,
             label: obj.props ? (_a = obj.props) === null || _a === void 0 ? void 0 : _a.children : obj.label || key
-          });
+          }));
         }
 
-        onChange && onChange(labelInValue ? optsArr : valArr);
+        onChange && onChange(labelInValue ? optsArr : valArr, optsArr);
 
         if (!isSelected) {
           onDeselect && onDeselect(key); // 下拉项取消选中时调用，参数为选中项的value,多选模式下生效
@@ -287,7 +287,10 @@ var InternalSelect = function InternalSelect(props, ref) {
         onChange && onChange(labelInValue ? {
           value: key,
           label: label
-        } : key);
+        } : key, _extends(_extends({}, optionsObj), {
+          value: key,
+          label: label
+        }));
       }
 
       onSelect && onSelect(key);
@@ -303,7 +306,10 @@ var InternalSelect = function InternalSelect(props, ref) {
       onChange && onChange(labelInValue ? {
         value: key,
         label: label
-      } : key);
+      } : key, _extends(_extends({}, optionsObj), {
+        value: key,
+        label: label
+      }));
     } else {
       var _multipleRef$current2 = multipleRef.current,
           _selectedVal = _multipleRef$current2.selectedVal,
@@ -318,15 +324,15 @@ var InternalSelect = function InternalSelect(props, ref) {
       } else {
         _selectedVal.push(key);
 
-        _selectMulOpts.push({
+        _selectMulOpts.push(_extends(_extends({}, optionsObj), {
           value: key,
           label: obj.props ? (_c = obj.props) === null || _c === void 0 ? void 0 : _c.children : obj.label || key
-        });
+        }));
       } // setInitValue([...selectedVal])
 
 
       setMulOptions(_toConsumableArray(_selectMulOpts));
-      onChange && onChange(labelInValue ? _selectMulOpts : _selectedVal);
+      onChange && onChange(labelInValue ? _selectMulOpts : _selectedVal, _selectMulOpts);
 
       if (!isSelected) {
         onDeselect && onDeselect(key); // 下拉项取消选中时调用，参数为选中项的value,多选模式下生效
@@ -347,9 +353,9 @@ var InternalSelect = function InternalSelect(props, ref) {
 
     if ((realChildren === null || realChildren === void 0 ? void 0 : realChildren.length) !== selectedVal.length) {
       _mapInstanceProperty(realChildren).call(realChildren, function (child) {
-        var _child$props = child.props,
-            value = _child$props.value,
-            children = _child$props.children;
+        var _ref = child.props || child,
+            value = _ref.value,
+            children = _ref.children;
 
         if (!_includesInstanceProperty(selectedVal).call(selectedVal, value)) {
           selectedVal.push(value);
@@ -362,12 +368,12 @@ var InternalSelect = function InternalSelect(props, ref) {
 
       setMulOptions(_toConsumableArray(selectMulOpts));
     } else {
-      multipleRef.current.selectedVal = [];
-      multipleRef.current.selectMulOpts = [];
+      multipleRef.current.selectedVal = selectedVal = [];
+      multipleRef.current.selectMulOpts = selectMulOpts = [];
       setMulOptions([]);
     }
 
-    onChange && onChange(labelInValue ? selectMulOpts : selectedVal);
+    onChange && onChange(labelInValue ? selectMulOpts : selectedVal, selectMulOpts);
   }; // 筛选内容 ---可以优化，抽成hook
 
 
@@ -428,7 +434,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     _spliceInstanceProperty(selectMulOpts).call(selectMulOpts, idx, 1);
 
     setMulOptions(_toConsumableArray(selectMulOpts));
-    onChange && onChange(labelInValue ? selectMulOpts : selectedVal);
+    onChange && onChange(labelInValue ? selectMulOpts : selectedVal, selectMulOpts);
     e.stopPropagation();
   }; // 渲染后缀图标
 
@@ -659,8 +665,8 @@ var InternalSelect = function InternalSelect(props, ref) {
     var _a;
 
     if (selectRef === null || selectRef === void 0 ? void 0 : selectRef.current) {
-      var _ref = (_a = selectRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect(),
-          width = _ref.width;
+      var _ref2 = (_a = selectRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect(),
+          width = _ref2.width;
 
       return {
         width: (dropdownStyle === null || dropdownStyle === void 0 ? void 0 : dropdownStyle.width) || (width > 75 ? width : 75),

package/es/style/core/reset.less

@@ -194,10 +194,10 @@ template {
 /**
  * Reset scrollbar style
  */
-::-webkit-scrollbar {
-  width: 10px !important;
-  height: 10px !important;
-}
+// ::-webkit-scrollbar {
+//   width: 10px !important;
+//   height: 10px !important;
+// }
 
 ::-webkit-scrollbar-button {
   width: 0;

package/es/style/index.css

@@ -1779,10 +1779,6 @@ template {
 /**
  * Reset scrollbar style
  */
-::-webkit-scrollbar {
-  width: 10px !important;
-  height: 10px !important;
-}
 ::-webkit-scrollbar-button {
   width: 0;
   height: 0;

package/es/table/feature/useRangeSelection.d.ts

@@ -0,0 +1,3 @@
+import { TableRangeSelection, TablePipeline } from '../interface';
+declare function useRangeSelection(pipeline: TablePipeline, rangeSelection?: TableRangeSelection): void;
+export default useRangeSelection;

package/es/table/feature/useRangeSelection.js

@@ -0,0 +1,10 @@
+import _extends from "@babel/runtime-corejs3/helpers/extends";
+import { features } from '@kdcloudjs/table';
+
+function useRangeSelection(pipeline, rangeSelection) {
+  if (rangeSelection) {
+    pipeline.use(features.rangeSelection(_extends({}, rangeSelection)));
+  }
+}
+
+export default useRangeSelection;

package/es/table/interface.d.ts

@@ -1,6 +1,16 @@
+/// <reference types="react" />
 import { TableProps as BaseTableProps, TablePipeline as TP, ArtColumnStaticPart } from '@kdcloudjs/table';
-import { SortFeatureOptions, RowDetailFeatureOptions, FilterFeatureOptions, TreeModeFeatureOptions, ColumnDragOptions, ColumnResizeOptions, ContextMenuFeatureOptions } from '@kdcloudjs/table/es/table/pipeline/features';
-export interface TableProps extends BaseTableProps {
+import { SortFeatureOptions, RowDetailFeatureOptions, FilterFeatureOptions, TreeModeFeatureOptions, ColumnDragOptions, ColumnResizeOptions, ContextMenuFeatureOptions, RangeSelectionFeatureOptions } from '@kdcloudjs/table/es/table/pipeline/features';
+declare type TablePropsOfComponents = Pick<BaseTableProps, 'components'> & {
+    components?: {
+        /** 复选框 */
+        Checkbox?: React.ComponentType;
+        /** 单选框 */
+        Radio?: React.ComponentType;
+    };
+};
+declare type TablePropsOfExtend = Omit<BaseTableProps, 'components'>;
+export interface TableProps extends TablePropsOfExtend, TablePropsOfComponents {
     rowSelection?: TableRowSelection;
     prefixCls?: string;
     rowDetail?: TableRowDetail;
@@ -11,6 +21,7 @@ export interface TableProps extends BaseTableProps {
     columnDrag?: boolean | ColumnDragOptions;
     columnResize?: boolean | ColumnResizeOptions;
     contextMenu?: IContextMenu;
+    rangeSelection?: TableRangeSelection;
 }
 export declare type RowSelectionType = 'checkbox' | 'radio';
 export declare type RowSelectionFixed = 'start' | 'end';
@@ -32,3 +43,5 @@ export declare type TableSort = SortFeatureOptions;
 export declare type TableTreeMode = TreeModeFeatureOptions;
 export declare type TablePipeline = TP;
 export declare type IContextMenu = boolean | ContextMenuFeatureOptions;
+export declare type TableRangeSelection = RangeSelectionFeatureOptions;
+export {};

package/es/table/table.js

@@ -17,6 +17,7 @@ import useTreeMode from './feature/treeMode';
 import useColumnResize from './feature/columnResize';
 import useColumnDrag from './feature/columnDrag';
 import useContextMenu from './feature/contextMenu';
+import useRangeSelection from './feature/useRangeSelection';
 import devWarning from '../_utils/devwarning';
 
 function Table(props) {
@@ -46,6 +47,7 @@ function Table(props) {
       getRowProps = props.getRowProps,
       getTableProps = props.getTableProps,
       contextMenu = props.contextMenu,
+      rangeSelection = props.rangeSelection,
       cssVariables = props.cssVariables;
 
   var _useContext = useContext(ConfigContext),
@@ -56,19 +58,24 @@ function Table(props) {
   var tableCls = classNames(tablePrefixCls, className);
   var pipeline = useTablePipeline({
     components: {
-      Checkbox: Checkbox,
-      Radio: Radio
+      Checkbox: (components === null || components === void 0 ? void 0 : components.Checkbox) || Checkbox,
+      Radio: (components === null || components === void 0 ? void 0 : components.Radio) || Radio
     }
   }).primaryKey(primaryKey === undefined ? '' : primaryKey).input({
     columns: columns,
     dataSource: dataSource
   });
+
+  if (footerDataSource) {
+    pipeline.footerDataSource(footerDataSource);
+  }
   /* -------------------------------------------------------------------------- */
 
   /* features                                                                   */
 
   /* -------------------------------------------------------------------------- */
 
+
   useRowSelection(pipeline, rowSelection);
   useRowDetail(pipeline, rowDetail);
   useFilter(pipeline, filter);
@@ -78,6 +85,7 @@ function Table(props) {
   useColumnResize(pipeline, columnResize);
   useColumnDrag(pipeline, columnDrag);
   useContextMenu(pipeline, contextMenu);
+  useRangeSelection(pipeline, rangeSelection);
   /* -------------------------------------------------------------------------- */
 
   /* after useTablePipeline, merge pipeline.getProps result                     */
@@ -101,18 +109,17 @@ function Table(props) {
     className: tableCls,
     style: style,
     isLoading: isLoading,
-    components: _extends({
-      LoadingIcon: function LoadingIcon() {
+    components: {
+      LoadingIcon: (components === null || components === void 0 ? void 0 : components.LoadingIcon) || function () {
         return /*#__PURE__*/React.createElement(Spin, {
           type: "container"
         });
       },
-      EmptyContent: function EmptyContent() {
+      EmptyContent: (components === null || components === void 0 ? void 0 : components.EmptyContent) || function () {
         return /*#__PURE__*/React.createElement(Empty, null);
       }
-    }, components),
+    },
     useVirtual: useVirtual,
-    footerDataSource: footerDataSource,
     estimatedRowHeight: estimatedRowHeight,
     emptyCellHeight: emptyCellHeight,
     hasHeader: hasHeader,

package/lib/_utils/usePopper.d.ts

@@ -15,6 +15,7 @@ export interface PopperProps {
     mouseEnterDelay?: number;
     mouseLeaveDelay?: number;
     defaultVisible?: boolean;
+    autoPlacement?: boolean;
     popperClassName?: string;
     placement?: PlacementType;
     popperStyle?: React.CSSProperties;

package/lib/_utils/usePopper.js

@@ -186,6 +186,8 @@ function usePopper(locatorElement, popperElement, props) {
       mouseLeaveDelay = _props$mouseLeaveDela === void 0 ? 0.1 : _props$mouseLeaveDela,
       _props$defaultVisible = props.defaultVisible,
       defaultVisible = _props$defaultVisible === void 0 ? false : _props$defaultVisible,
+      _props$autoPlacement = props.autoPlacement,
+      autoPlacement = _props$autoPlacement === void 0 ? true : _props$autoPlacement,
       _props$getTriggerElem = props.getTriggerElement,
       getTriggerElement = _props$getTriggerElem === void 0 ? function (locatorNode) {
     return locatorNode;
@@ -323,36 +325,38 @@ function usePopper(locatorElement, popperElement, props) {
       var currentPos = trigger === 'contextMenu' ? mousePos : locatorPos;
       var _currentPlacement = placement;
 
-      if (top - gap - popperHeight <= 5 && bottom + gap + popperHeight < document.body.clientHeight - 5) {
-        _currentPlacement = _currentPlacement.replace('top', 'bottom');
-      }
+      if (autoPlacement) {
+        if (top - gap - popperHeight <= 5 && bottom + gap + popperHeight < document.body.clientHeight - 5) {
+          _currentPlacement = _currentPlacement.replace('top', 'bottom');
+        }
 
-      if (bottom + gap + popperHeight >= document.body.clientHeight - 5 && top - gap - popperHeight > 5) {
-        _currentPlacement = _currentPlacement.replace('bottom', 'top');
-      }
+        if (bottom + gap + popperHeight >= document.body.clientHeight - 5 && top - gap - popperHeight > 5) {
+          _currentPlacement = _currentPlacement.replace('bottom', 'top');
+        }
 
-      if (left + popperWidth >= document.body.clientWidth - 5 && right - popperWidth > 5) {
-        _currentPlacement = _currentPlacement.replace('Left', 'Right');
-      }
+        if (left + popperWidth >= document.body.clientWidth - 5 && right - popperWidth > 5) {
+          _currentPlacement = _currentPlacement.replace('Left', 'Right');
+        }
 
-      if (right - popperWidth <= 5 && left + popperWidth < document.body.clientWidth - 5) {
-        _currentPlacement = _currentPlacement.replace('Right', 'Left');
-      }
+        if (right - popperWidth <= 5 && left + popperWidth < document.body.clientWidth - 5) {
+          _currentPlacement = _currentPlacement.replace('Right', 'Left');
+        }
 
-      if (top + popperHeight >= document.body.clientHeight - 5 && bottom - popperHeight > 5) {
-        _currentPlacement = _currentPlacement.replace('Top', 'Bottom');
-      }
+        if (top + popperHeight >= document.body.clientHeight - 5 && bottom - popperHeight > 5) {
+          _currentPlacement = _currentPlacement.replace('Top', 'Bottom');
+        }
 
-      if (bottom - popperHeight <= 5 && top + popperHeight < document.body.clientHeight - 5) {
-        _currentPlacement = _currentPlacement.replace('Bottom', 'Top');
-      }
+        if (bottom - popperHeight <= 5 && top + popperHeight < document.body.clientHeight - 5) {
+          _currentPlacement = _currentPlacement.replace('Bottom', 'Top');
+        }
 
-      if (left - gap - popperWidth <= 5 && right + gap + popperWidth < document.body.clientWidth - 5) {
-        _currentPlacement = _currentPlacement.replace('left', 'right');
-      }
+        if (left - gap - popperWidth <= 5 && right + gap + popperWidth < document.body.clientWidth - 5) {
+          _currentPlacement = _currentPlacement.replace('left', 'right');
+        }
 
-      if (right + gap + popperWidth >= document.body.clientWidth - 5 && left - gap - popperWidth > 5) {
-        _currentPlacement = _currentPlacement.replace('right', 'left');
+        if (right + gap + popperWidth >= document.body.clientWidth - 5 && left - gap - popperWidth > 5) {
+          _currentPlacement = _currentPlacement.replace('right', 'left');
+        }
       }
 
       var leftLeft = currentPos.left - popperWidth - gap;
@@ -465,7 +469,7 @@ function usePopper(locatorElement, popperElement, props) {
       setArrowPos(_arrowPos);
       setCurrentPlacement(_currentPlacement);
     }
-  }, [locatorRef, popperRef, container, trigger, mousePos, placement, gap, arrowOffset, arrowSize, arrowWidth]);
+  }, [locatorRef, popperRef, container, trigger, mousePos, placement, gap, arrowOffset, arrowSize, arrowWidth, autoPlacement]);
   (0, _react.useEffect)(function () {
     if (canAlign) {
       alignPopper();
@@ -479,7 +483,7 @@ function usePopper(locatorElement, popperElement, props) {
   if (arrowPos.left) arrowStyle["--arrowLeft"] = arrowPos.left + 'px';
   var popperContainerStyle = (0, _extends2.default)((0, _extends2.default)((0, _extends2.default)({
     position: 'absolute'
-  }, popperStyle), align), arrow ? arrowStyle : {});
+  }, align), arrow ? arrowStyle : {}), popperStyle);
   var popperProps = {
     ref: popperRef,
     style: popperContainerStyle,

package/lib/anchor/anchor.js

@@ -367,7 +367,9 @@ var InternalAnchor = function InternalAnchor(props, ref) {
     !isLocked && setOptionShow(visible);
   };
 
-  var popperProps = (0, _extends2.default)((0, _extends2.default)({}, anchorProps), {
+  var popperProps = (0, _extends2.default)((0, _extends2.default)({
+    autoPlacement: false
+  }, anchorProps), {
     prefixCls: anchorPrefixCls,
     defaultVisible: optionShow,
     visible: optionShow,
@@ -375,6 +377,22 @@ var InternalAnchor = function InternalAnchor(props, ref) {
     onVisibleChange: handleVisibleChange
   });
 
+  var fixedRef = _react.default.useRef(null);
+
+  if (type === 'advanced' && isLocked) {
+    if (fixedRef.current) {
+      var _fixedRef$current$get = fixedRef.current.getBoundingClientRect(),
+          left = _fixedRef$current$get.left,
+          top = _fixedRef$current$get.top;
+
+      popperProps.popperStyle = {
+        position: 'fixed',
+        left: left,
+        top: top
+      };
+    }
+  }
+
   var addChildrenProps = function addChildrenProps(linksChildren) {
     var _context4;
 
@@ -504,6 +522,7 @@ var InternalAnchor = function InternalAnchor(props, ref) {
     });
 
     return /*#__PURE__*/_react.default.createElement("div", {
+      ref: fixedRef,
       className: anchorAdvancedClass,
       style: dropdownStyle
     }, lockedIcon !== false && /*#__PURE__*/_react.default.createElement("span", {

package/lib/base-data/style/index.css

@@ -222,6 +222,7 @@
 }
 .kd-baseData-dropdown-options {
   height: var(--kd-c-base-data-dropdown-options-sizing-height, 32px);
+  cursor: pointer;
 }
 .kd-baseData-dropdown-options:hover {
   background: var(--kd-c-base-data-color-background-hover, var(--kd-g-color-hover, #f5f5f5));

package/lib/base-data/style/index.less

@@ -115,6 +115,7 @@
 
     &-options {
       height: @base-data-dropdown-options-height;
+      cursor: pointer;
 
       &:hover {
         background: @base-data-hover-bg;

package/lib/button/style/index.css

@@ -241,6 +241,15 @@
 .kd-btn-size-small.kd-btn-icon-only {
   font-size: var(--kd-c-button-icon-font-size-small, 14px);
   padding: 0 var(--kd-c-button-icon-spacing-padding-horizontal, 4px);
+  display: -webkit-inline-box;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+  -webkit-box-pack: center;
+      -ms-flex-pack: center;
+          justify-content: center;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
 }
 .kd-btn-size-small .kd-btn-group-basic-icon {
   font-size: var(--kd-c-button-icon-font-size-small, 14px);
@@ -255,6 +264,15 @@
 .kd-btn-size-middle.kd-btn-icon-only {
   font-size: var(--kd-c-button-icon-font-size-middle, 16px);
   padding: 0 var(--kd-c-button-icon-spacing-padding-horizontal, 4px);
+  display: -webkit-inline-box;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+  -webkit-box-pack: center;
+      -ms-flex-pack: center;
+          justify-content: center;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
 }
 .kd-btn-size-middle .kd-btn-group-basic-icon {
   font-size: var(--kd-c-button-icon-font-size-middle, 16px);
@@ -269,6 +287,15 @@
 .kd-btn-size-large.kd-btn-icon-only {
   font-size: var(--kd-c-button-icon-font-size-large, 18px);
   padding: 0 var(--kd-c-button-icon-spacing-padding-horizontal, 4px);
+  display: -webkit-inline-box;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+  -webkit-box-pack: center;
+      -ms-flex-pack: center;
+          justify-content: center;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
 }
 .kd-btn-size-large .kd-btn-group-basic-icon {
   font-size: var(--kd-c-button-icon-font-size-large, 18px);
@@ -337,6 +364,15 @@
 }
 .kd-btn-loading {
   cursor: default;
+  display: -webkit-inline-box;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+  -webkit-box-pack: center;
+      -ms-flex-pack: center;
+          justify-content: center;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
 }
 .kd-btn-block {
   width: 100%;

package/lib/button/style/index.less

@@ -114,6 +114,9 @@
     &.@{btn-prefix-cls}-icon-only {
       font-size: @btn-icon-small-font-size;
       padding: 0 @btn-icon-padding-horizontal;
+      display: inline-flex;
+      justify-content: center;
+      align-items: center;
     }
 
     .@{btn-prefix-cls}-group-basic-icon {
@@ -127,6 +130,9 @@
     &.@{btn-prefix-cls}-icon-only {
       font-size: @btn-icon-middle-font-size;
       padding: 0 @btn-icon-padding-horizontal;
+      display: inline-flex;
+      justify-content: center;
+      align-items: center;
     }
 
     .@{btn-prefix-cls}-group-basic-icon {
@@ -140,6 +146,9 @@
     &.@{btn-prefix-cls}-icon-only {
       font-size: @btn-icon-large-font-size;
       padding: 0 @btn-icon-padding-horizontal;
+      display: inline-flex;
+      justify-content: center;
+      align-items: center;
     }
 
     .@{btn-prefix-cls}-group-basic-icon {
@@ -234,6 +243,9 @@
   // 加载中按钮
   &-loading {
     cursor: default;
+    display: inline-flex;
+    justify-content: center;
+    align-items: center;
   }
   // 按钮开启块化撑满父元素
   &-block {
@@ -271,11 +283,11 @@
             background: @btn-group-trigger-color-background-hover;
             border-color: @btn-group-trigger-color-background-hover;
           }
-  
+
           &:active {
             background: @btn-group-trigger-color-background-active;
           }
-  
+
           &:disabled {
             background: @btn-group-trigger-color-background-disabled !important;
           }

package/lib/checkbox/checkbox.js

@@ -104,6 +104,8 @@ var InternalCheckbox = function InternalCheckbox(props, ref) {
     (0, _isBoolean.default)(checked) && checked !== selected && setSelected(checked);
   }, [checked, selected]);
   (0, _react.useEffect)(function () {
+    var _a;
+
     var handleRepeatClick = function handleRepeatClick(e) {
       var element = e.target;
 
@@ -112,10 +114,12 @@ var InternalCheckbox = function InternalCheckbox(props, ref) {
       }
     };
 
-    labelRef.current.addEventListener('click', handleRepeatClick);
+    (_a = labelRef === null || labelRef === void 0 ? void 0 : labelRef.current) === null || _a === void 0 ? void 0 : _a.addEventListener('click', handleRepeatClick);
     return function () {
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-      labelRef.current.removeEventListener('click', handleRepeatClick);
+      var _a; // eslint-disable-next-line react-hooks/exhaustive-deps
+
+
+      (_a = labelRef === null || labelRef === void 0 ? void 0 : labelRef.current) === null || _a === void 0 ? void 0 : _a.removeEventListener('click', handleRepeatClick);
     };
   }, []);
 

package/lib/form/Field.js

@@ -137,7 +137,8 @@ var Field = function Field(props) {
       getInternalHooks = fieldContext.getInternalHooks,
       vertical = fieldContext.vertical,
       getDefaultValue = fieldContext.getDefaultValue,
-      local = fieldContext.local;
+      local = fieldContext.local,
+      formDisabled = fieldContext.disabled;
 
   var _getInternalHooks = getInternalHooks(_useForm.INTERNAL_HOOK_KEY),
       registerField = _getInternalHooks.registerField,
@@ -305,17 +306,17 @@ var Field = function Field(props) {
         chDisabled = _ch$props.disabled,
         chDefaultValue = _ch$props.defaultValue;
 
-    var onChange = function onChange(evt) {
+    var onChange = function onChange() {
       if (chValue === undefined) {
-        setFieldValue(getInputValueFormProp(evt));
+        setFieldValue(getInputValueFormProp(arguments.length <= 0 ? undefined : arguments[0]));
       }
 
       if (typeof faChange === 'function') {
-        faChange(evt);
+        faChange.apply(void 0, arguments);
       }
 
       if (typeof chChange === 'function') {
-        chChange(evt);
+        chChange.apply(void 0, arguments);
       }
     };
 
@@ -333,7 +334,7 @@ var Field = function Field(props) {
     return (0, _extends5.default)((0, _extends5.default)({}, rest), (_extends3 = {
       onChange: onChange,
       defaultValue: defaultValue
-    }, (0, _defineProperty2.default)(_extends3, innerValuePropName, fieldValue), (0, _defineProperty2.default)(_extends3, "disabled", chDisabled || faDisabled), _extends3));
+    }, (0, _defineProperty2.default)(_extends3, innerValuePropName, fieldValue), (0, _defineProperty2.default)(_extends3, "disabled", chDisabled !== undefined ? chDisabled : faDisabled !== undefined ? faDisabled : formDisabled), _extends3));
   };
 
   return /*#__PURE__*/_react.default.createElement("div", {

package/lib/form/Form.d.ts

@@ -4,6 +4,7 @@ declare type BaseFormProps = Omit<React.FormHTMLAttributes<HTMLFormElement>, 'on
 export interface FormProps<Values = any> extends BaseFormProps {
     children?: React.ReactNode;
     defaultValues?: Store;
+    disabled?: boolean;
     className?: string;
     form?: FormInstance<Values>;
     labelAlign?: LabelAlign;

package/lib/form/Form.js

@@ -81,7 +81,8 @@ var Form = function Form(props, ref) {
       onFinish = formProps.onFinish,
       onFinishFailed = formProps.onFinishFailed,
       onValuesChange = formProps.onValuesChange,
-      restProps = __rest(formProps, ["children", "defaultValues", "className", "form", "labelAlign", "labelWidth", "layout", "name", "prefixCls", "wrapperWidth", "onFinish", "onFinishFailed", "onValuesChange"]);
+      disabled = formProps.disabled,
+      restProps = __rest(formProps, ["children", "defaultValues", "className", "form", "labelAlign", "labelWidth", "layout", "name", "prefixCls", "wrapperWidth", "onFinish", "onFinishFailed", "onValuesChange", "disabled"]);
 
   var formPrefixCls = getPrefixCls(prefixCls, 'form', customizePrefixCls);
   var formClassName = (0, _classnames2.default)((_classnames = {}, (0, _defineProperty2.default)(_classnames, "".concat(formPrefixCls), true), (0, _defineProperty2.default)(_classnames, (0, _concat.default)(_context = "".concat(formPrefixCls, "-")).call(_context, layout), true), _classnames), className);
@@ -121,6 +122,7 @@ var Form = function Form(props, ref) {
       labelWidth: labelWidth,
       wrapperWidth: wrapperWidth,
       local: formLang,
+      disabled: disabled,
       vertical: layout === 'vertical'
     });
   }, [formInstance, labelAlign, labelWidth, wrapperWidth, layout, formLang]);

package/lib/form/interface.d.ts

@@ -34,6 +34,7 @@ export interface InternalFormInstance extends FormInstance {
     labelAlign?: LabelAlign;
     wrapperWidth?: string | number;
     vertical?: boolean;
+    disabled?: boolean;
     local?: InnerLocale;
     getInternalHooks: (key: string) => InternalHooks | null;
 }