doui-react 1.0.2 → 2.0.0

package/es/api/component/common.d.ts

@@ -1,5 +1,5 @@
 import { FunctionType } from "..";
-import { ReactNode } from 'react';
+import 'dayjs/locale/zh-cn';
 export declare const isJest: boolean;
 export declare function runDevOrJest<T, U>(fn: T, jestFn: U): any;
 export declare function getPopupContainer(triggerNode: HTMLElement): HTMLElement;
@@ -12,7 +12,7 @@ export declare function uuid(): string;
  * 1. 不是 js 对象，比如 undefined, null, number, string, boolean 等
  * 2. 是 ReactNode
  */
-export declare function isReactNode(node?: ReactNode): boolean;
+export declare function isReactNode(node?: any): boolean;
 type OptionType = string | number | boolean;
 export declare function includesNonStrictMode(options?: Array<OptionType>, value?: OptionType | Array<OptionType>): boolean;
 export declare function mergeProps<T, U>(originProps: T, patchProps: U): {} & T & U;

package/es/api/component/common.js

@@ -1,9 +1,12 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import dayjs from 'dayjs';
+import 'dayjs/locale/zh-cn';
 import delay from 'delay';
 import _ from 'lodash';
 import { cloneElement, isValidElement } from 'react';
 import { Fragment as _Fragment, jsx as _jsx } from "@emotion/react/jsx-runtime";
+dayjs.locale('zh-cn');
 export var isJest = !!process.env.JEST_WORKER_ID;
 export function runDevOrJest(fn, jestFn) {
   return executeFunction(isJest ? jestFn : /* istanbul ignore next */fn);

package/es/api/component/global-style.d.ts

@@ -1,3 +1,2 @@
 import { BaseFlexProps } from "..";
-export declare const commonFontFamily: import("@emotion/react").SerializedStyles;
 export declare const flexStyle: ({ vertical, gap, wrap }: BaseFlexProps) => import("@emotion/react").SerializedStyles;

package/es/api/component/global-style.js

@@ -1,16 +1,15 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/esm/taggedTemplateLiteral";
-var _templateObject, _templateObject2, _templateObject3, _templateObject4;
+var _templateObject, _templateObject2, _templateObject3;
 import { transformValueToGap } from "./..";
 import { injectGlobal } from '@emotion/css';
 import { css } from '@emotion/react';
 var commonStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  &.do-hide-scroll {\n    overflow: hidden !important;\n  }\n"])));
 injectGlobal(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  body {\n    ", "\n  }\n"])), commonStyle);
-export var commonFontFamily = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  font-family: 'MyriadPro-Cond', 'Helvetica Neue', Helvetica, sans-serif;\n\n  input,\n  button,\n  select,\n  textarea {\n    font-family: 'MyriadPro-Cond', 'Helvetica Neue', Helvetica, sans-serif;\n  }\n"])));
 export var flexStyle = function flexStyle(_ref) {
   var vertical = _ref.vertical,
     _ref$gap = _ref.gap,
     gap = _ref$gap === void 0 ? 8 : _ref$gap,
     _ref$wrap = _ref.wrap,
     wrap = _ref$wrap === void 0 ? true : _ref$wrap;
-  return css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: ", ";\n  gap: ", ";\n  flex-wrap: ", ";\n  min-width: 0;\n"])), vertical ? 'column' : 'row', transformValueToGap(gap), wrap ? 'wrap' : 'nowrap');
+  return css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: ", ";\n  gap: ", ";\n  flex-wrap: ", ";\n  min-width: 0;\n"])), vertical ? 'column' : 'row', transformValueToGap(gap), wrap ? 'wrap' : 'nowrap');
 };

package/es/api/component/react-dom.js

@@ -2,7 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["hideBodyScroll"];
 import { hideBodyScroll } from "./..";
-import ReactDOM from 'react-dom';
+import { createRoot } from 'react-dom/client';
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 function getContainer() {
   var container = document.createElement('div');
@@ -11,30 +11,18 @@ function getContainer() {
 }
 // 处理React17和18版本的兼容性
 function getReactDOM() {
-  // const { createRoot } = ReactDOM as any;
-  // if (createRoot) {
-  //   return {
-  //     render: (element, container: any) => {
-  //       const root = createRoot(container);
-  //       root.render(element);
-  //       container._reactRootContainer = root;
-  //     },
-  //     unmount: (container: any) => {
-  //       const root = container._reactRootContainer;
-  //       if (root) {
-  //         root.unmount();
-  //         delete container._reactRootContainer;
-  //       }
-  //     },
-  //   };
-  // }
-
   return {
     render: function render(element, container) {
-      ReactDOM.render(element, container);
+      var root = createRoot(container);
+      root.render(element);
+      container._reactRootContainer = root;
     },
     unmount: function unmount(container) {
-      ReactDOM.unmountComponentAtNode(container);
+      var root = container._reactRootContainer;
+      if (root) {
+        root.unmount();
+        delete container._reactRootContainer;
+      }
     }
   };
 }

package/es/button/component/index.js

@@ -2,7 +2,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["tooltip", "placement", "trigger", "align"],
-  _excluded2 = ["show", "confirm", "onClick", "confirmMessage", "okText", "cancelText"],
+  _excluded2 = ["show", "confirm", "onClick", "description", "okText", "cancelText"],
   _excluded3 = ["portalTo"];
 import { getPopupContainer } from "../../api";
 import { useLoading } from "../../hooks";
@@ -28,10 +28,7 @@ function BaseButton(_ref) {
     _ref$placement = _ref.placement,
     placement = _ref$placement === void 0 ? 'top' : _ref$placement,
     trigger = _ref.trigger,
-    _ref$align = _ref.align,
-    align = _ref$align === void 0 ? {
-      offset: [0, 2]
-    } : _ref$align,
+    align = _ref.align,
     props = _objectWithoutProperties(_ref, _excluded);
   var params = useButton(props);
   if (_.isNil(tooltip)) {
@@ -51,21 +48,23 @@ function ButtonWrapper(_ref2) {
     show = _ref2$show === void 0 ? true : _ref2$show,
     confirm = _ref2.confirm,
     onClick = _ref2.onClick,
-    confirmMessage = _ref2.confirmMessage,
+    description = _ref2.description,
     okText = _ref2.okText,
     cancelText = _ref2.cancelText,
     props = _objectWithoutProperties(_ref2, _excluded2);
   if (!show) {
-    return null;
+    return;
   }
   if (confirm) {
+    var title = _.isBoolean(confirm) ? '是否确定?' : confirm;
     return _jsx(Popconfirm, {
-      title: confirmMessage || '是否确定?',
+      title: title,
+      description: description,
       onConfirm: onClick,
       okText: okText,
       cancelText: cancelText,
       placement: props.placement,
-      arrowPointAtCenter: props.arrowPointAtCenter,
+      arrow: props.arrow,
       getPopupContainer: getPopupContainer,
       children: _jsx(BaseButton, _objectSpread({}, props))
     });

package/es/button/type/index.d.ts

@@ -1,9 +1,9 @@
 import { FunctionReturn } from "../../api";
 import { PortalProps } from "../../portal";
 import { ButtonProps as AntdButtonProps, PopconfirmProps } from 'antd';
-import { EllipsisConfig } from 'antd/lib/typography/Base';
+import { EllipsisConfig } from 'antd/es/typography/Base';
 import { MouseEvent, ReactNode } from 'react';
-export interface ButtonProps extends AntdButtonProps, Omit<PopconfirmProps, 'title'> {
+export interface ButtonProps extends AntdButtonProps, Omit<PopconfirmProps, 'title' | 'classNames' | 'color' | 'styles'> {
     /**
      * @description 提示信息
      * @link TooltipProps: https://4x.ant.design/components/tooltip-cn/#API
@@ -13,11 +13,7 @@ export interface ButtonProps extends AntdButtonProps, Omit<PopconfirmProps, 'tit
      * @description 是否需要确认
      * @default false
      */
-    confirm?: boolean;
-    /**
-     * @description 确认信息
-     */
-    confirmMessage?: ReactNode;
+    confirm?: boolean | ReactNode;
     /**
      * @description 是否显示
      * @default true

package/es/checkbox/type/index.d.ts

@@ -1,7 +1,7 @@
 import { BaseFlexProps } from "../../api";
 import { BaseBoxProps } from "../../radio";
 import { BaseSelectProps } from "../../select";
-import { CheckboxGroupProps as AntdCheckboxGroupProps } from 'antd/lib/checkbox/Group';
+import { CheckboxGroupProps as AntdCheckboxGroupProps } from 'antd/es/checkbox/Group';
 import { ReactNode } from 'react';
 type UnionType = Omit<AntdCheckboxGroupProps, 'options' | 'defaultValue' | 'onChange' | 'value'> & Omit<BaseBoxProps, 'defaultValue'> & BaseSelectProps & BaseFlexProps;
 export interface CheckboxProps extends UnionType {

package/es/date-picker/component/index.js

@@ -1,38 +1,34 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-var _excluded = ["refs"];
+var _excluded = ["refs", "value"];
 import { getPopupContainer } from "../../api";
 import { DatePicker as AntdDatePicker } from 'antd';
+import dayjs from 'dayjs';
 import _ from 'lodash';
-import moment from 'moment-timezone';
 import style from "../style";
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 export function DatePicker(props) {
   var baseProps = generateProps(props);
-  var value = toMoment(props.value);
-  return _jsx(AntdDatePicker, _objectSpread(_objectSpread({}, baseProps), {}, {
-    value: value
-  }));
+  return _jsx(AntdDatePicker, _objectSpread({}, baseProps));
 }
 export function RangePicker(props) {
   var baseProps = generateProps(props);
-  var value = _.map(props.value, toMoment);
-  return _jsx(AntdDatePicker.RangePicker, _objectSpread(_objectSpread({}, baseProps), {}, {
-    value: value
-  }));
-}
-function toMoment(input) {
-  if (!input) {
-    return;
-  }
-  return moment.isMoment(input) ? input : moment(input);
+  return _jsx(AntdDatePicker.RangePicker, _objectSpread({}, baseProps));
 }
 function generateProps(_ref) {
   var refs = _ref.refs,
+    value = _ref.value,
     props = _objectWithoutProperties(_ref, _excluded);
   return _objectSpread({
     ref: refs,
     css: style.wrapper,
-    getPopupContainer: getPopupContainer
+    getPopupContainer: getPopupContainer,
+    value: _.isArray(value) ? _.map(value, toDayjs) : toDayjs(value)
   }, props);
+}
+function toDayjs(input) {
+  if (!input) {
+    return;
+  }
+  return dayjs.isDayjs(input) ? input : dayjs(input);
 }

package/es/date-picker/type/index.d.ts

@@ -1,21 +1,12 @@
 import { BaseComponentProps } from "../../api";
-import { PickerBaseProps, PickerDateProps, PickerTimeProps, RangePickerBaseProps, RangePickerDateProps, RangePickerTimeProps } from 'antd/lib/date-picker/generatePicker';
-import { Moment } from 'moment/moment';
-import { Key } from 'react';
+import type { DatePickerProps as AntdDatePickerProps, RangePickerProps as AntdRangePickerProps } from 'antd/es/date-picker';
 export interface CommonProps extends BaseComponentProps {
     /**
      * @description 日期选择器类型
      * @default date
      */
-    picker?: PickerProps['picker'];
+    picker?: AntdDatePickerProps['picker'];
+    value?: any;
 }
-type OmitValue<Props> = Omit<Props, 'value'>;
-type PickerProps<DateType = Moment> = OmitValue<PickerBaseProps<DateType>> | OmitValue<PickerDateProps<DateType>> | OmitValue<PickerTimeProps<DateType>>;
-export type DatePickerProps = PickerProps & CommonProps & {
-    value?: Moment | Key;
-};
-type RangePickerType<DateType = Moment> = OmitValue<RangePickerBaseProps<DateType>> | OmitValue<RangePickerDateProps<DateType>> | OmitValue<RangePickerTimeProps<DateType>>;
-export type RangePickerProps = RangePickerType & CommonProps & {
-    value?: DatePickerProps['value'][];
-};
-export {};
+export type DatePickerProps = Omit<AntdDatePickerProps, 'value'> & CommonProps;
+export type RangePickerProps = Omit<AntdRangePickerProps, 'value'> & CommonProps;

package/es/form/component/constant.js

@@ -1,5 +1,5 @@
-export var antdFormPropsKeys = ['form', 'name', 'colon', 'disabled', 'component', 'initialValues', 'labelAlign', 'labelWrap', 'labelCol', 'labelWidth', 'layout', 'preserve', 'requiredMark', 'scrollToFirstError', 'size', 'validateMessages', 'validateTrigger', 'wrapperCol', 'onFieldsChange', 'onFinish', 'onFinishFailed', 'onValuesChange', 'onValidateFailed'];
-export var antdFormItemKeys = ['colon', 'dependencies', 'extra', 'getValueFromEvent', 'getValueProps', 'hasFeedback', 'help', 'hidden', 'htmlFor', 'initialValue', 'label', 'labelAlign', 'labelCol', 'messageVariables', 'name', 'normalize', 'noStyle', 'preserve', 'required', 'rules', 'shouldUpdate', 'tooltip', 'trigger', 'validateFirst', 'validateStatus', 'validateTrigger', 'valuePropName', 'wrapperCol', 'className', 'style', 'isListField'];
+export var antdFormPropsKeys = ['form', 'name', 'colon', 'disabled', 'component', 'initialValues', 'labelAlign', 'labelWrap', 'labelCol', 'labelWidth', 'layout', 'preserve', 'variant', 'requiredMark', 'feedbackIcons', 'scrollToFirstError', 'size', 'validateMessages', 'validateTrigger', 'wrapperCol', 'clearOnDestroy', 'onFieldsChange', 'onFinish', 'onFinishFailed', 'onValuesChange', 'onValidateFailed'];
+export var antdFormItemKeys = ['colon', 'dependencies', 'extra', 'getValueFromEvent', 'getValueProps', 'hasFeedback', 'help', 'hidden', 'htmlFor', 'initialValue', 'label', 'labelAlign', 'labelCol', 'messageVariables', 'name', 'normalize', 'noStyle', 'preserve', 'required', 'rules', 'shouldUpdate', 'tooltip', 'layout', 'trigger', 'validateFirst', 'validateDebounce', 'validateStatus', 'validateTrigger', 'valuePropName', 'wrapperCol', 'className', 'style', 'isListField'];
 export var formListActionKeys = ['operation', 'defaultValue', 'insertIndex', 'index', 'from', 'to'];
 export var needCollectItemPropKeys = ['name', 'type', 'optionDependencies', 'rules', 'formListContext'];
 export var useUnsetWidthKeys = ['switch'];

package/es/form/component/form-item-map.d.ts

@@ -33,7 +33,7 @@ export declare const formItemMap: {
     checkbox: typeof FormItemCheckbox;
     switch: typeof Switch;
     radio: typeof Radio;
-    slider: import("react").ForwardRefExoticComponent<(import("antd").SliderSingleProps | import("antd/lib/slider").SliderRangeProps) & import("react").RefAttributes<unknown>>;
+    slider: import("react").ForwardRefExoticComponent<(import("antd").SliderSingleProps | import("antd/es/slider").SliderRangeProps) & import("react").RefAttributes<import("rc-slider").SliderRef>>;
     date: typeof DatePicker;
     rangeDate: typeof RangePicker;
 };

package/es/form/component/form-item.js

@@ -3,7 +3,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["item", "items"],
   _excluded2 = ["type", "name", "disabled", "dateProps", "render", "onChange"],
-  _excluded3 = ["show", "className", "style", "flex", "labelWidth", "controlWidth", "requiredMark", "layout"];
+  _excluded3 = ["show", "className", "style", "flex", "labelWidth", "controlWidth", "requiredMark"];
 import { executeFunction, mergeFunction, mergeProps } from "../../api";
 import { useFormContext, useFormListContext } from "./..";
 import { useDeepEffect } from "../../hooks";
@@ -163,7 +163,6 @@ function FormItemComponent(_ref3) {
     labelWidth = item.labelWidth,
     controlWidth = item.controlWidth,
     requiredMark = item.requiredMark,
-    layout = item.layout,
     restItem = _objectWithoutProperties(item, _excluded3);
 
   // 是否显示
@@ -181,7 +180,6 @@ function FormItemComponent(_ref3) {
     labelWidth: labelWidth,
     controlWidth: controlWidth,
     requiredMark: requiredMark,
-    layout: layout,
     type: restItem.type
   });
   var formItemProps = getFormItemProps(_objectSpread({

package/es/form/component/form-list.d.ts

@@ -1,6 +1,6 @@
 import { FormInstance, FormListActionProps, FormListProps, FormValues } from "..";
-import { ErrorListProps } from 'antd/lib/form/ErrorList';
-import { FormListFieldData, FormListOperation } from 'antd/lib/form/FormList';
+import { ErrorListProps } from 'antd/es/form/ErrorList';
+import { FormListFieldData, FormListOperation } from 'antd/es/form/FormList';
 import { NamePath } from 'rc-field-form/es/interface';
 import { StoreValue } from 'rc-field-form/lib/interface';
 import { ReactNode } from 'react';

package/es/form/component/utils.d.ts

@@ -10,51 +10,61 @@ export declare function getFormItemProps(props: any): {
     name: string | string[] | undefined;
     tooltip: {
         color?: string | undefined;
-        title?: import("react").ReactNode | import("antd/lib/tooltip").RenderFunction;
-        overlay?: import("react").ReactNode | import("antd/lib/tooltip").RenderFunction;
-        placement?: import("antd/lib/tooltip").TooltipPlacement | undefined;
-        builtinPlacements?: import("rc-trigger").BuildInPlacements | undefined;
+        title?: import("react").ReactNode | import("antd/es/_util/getRenderPropValue").RenderFunction;
+        overlay?: import("react").ReactNode | import("antd/es/_util/getRenderPropValue").RenderFunction;
+        styles?: Partial<Record<"body" | "root", import("react").CSSProperties>> | undefined;
+        classNames: Partial<Record<"body" | "root", string>>;
+        rootClassName?: string | undefined;
+        placement?: import("antd/es/tooltip").TooltipPlacement | undefined;
+        builtinPlacements?: import("@rc-component/trigger").BuildInPlacements | undefined;
         openClassName?: string | undefined;
-        arrowPointAtCenter: boolean;
-        autoAdjustOverflow?: boolean | import("antd/lib/tooltip").AdjustOverflow | undefined;
-        getPopupContainer: (triggerNode: HTMLElement) => HTMLElement;
+        arrowPointAtCenter?: boolean | undefined;
+        arrow: boolean | {
+            arrowPointAtCenter?: boolean | undefined;
+            pointAtCenter?: boolean | undefined;
+        };
+        autoAdjustOverflow?: boolean | import("antd/es/tooltip").AdjustOverflow | undefined;
+        getPopupContainer: typeof import("../../api").getPopupContainer;
         children?: import("react").ReactNode;
-        visible?: boolean | undefined;
+        destroyTooltipOnHide?: boolean | {
+            keepParent?: boolean | undefined;
+        } | undefined;
+        destroyOnHidden?: boolean | undefined;
         open?: boolean | undefined;
-        defaultVisible?: boolean | undefined;
         defaultOpen?: boolean | undefined;
-        onVisibleChange?: ((visible: boolean) => void) | undefined;
         onOpenChange?: ((visible: boolean) => void) | undefined;
-        afterVisibleChange?: ((visible: boolean) => void) | undefined;
         afterOpenChange?: ((visible: boolean) => void) | undefined;
+        visible?: boolean | undefined;
+        defaultVisible?: boolean | undefined;
+        onVisibleChange?: ((visible: boolean) => void) | undefined;
+        afterVisibleChange?: ((visible: boolean) => void) | undefined;
+        zIndex?: number | undefined;
+        animation?: string | undefined;
+        motion?: import("rc-motion").CSSMotionProps | undefined;
         id?: string | undefined;
         prefixCls?: string | undefined;
-        onPopupAlign?: ((element: HTMLElement, align: import("rc-trigger/lib/interface").AlignType) => void) | undefined;
-        trigger?: string | string[] | undefined;
         transitionName?: string | undefined;
-        animation?: string | undefined;
-        motion?: import("rc-motion").CSSMotionProps | undefined;
-        overlayStyle?: import("react").CSSProperties | undefined;
-        overlayClassName: string;
         mouseEnterDelay?: number | undefined;
         mouseLeaveDelay?: number | undefined;
+        onPopupAlign?: ((element: HTMLElement, align: import("@rc-component/trigger").AlignType) => void) | undefined;
+        overlayClassName?: string | undefined;
+        align?: import("@rc-component/trigger").AlignType | undefined;
+        overlayStyle?: import("react").CSSProperties | undefined;
+        trigger?: import("@rc-component/trigger").ActionType | import("@rc-component/trigger").ActionType[] | undefined;
+        popupVisible?: boolean | undefined;
+        forceRender?: boolean | undefined;
+        fresh?: boolean | undefined;
         getTooltipContainer?: ((node: HTMLElement) => HTMLElement) | undefined;
-        destroyTooltipOnHide?: boolean | {
-            keepParent?: boolean | undefined;
-        } | undefined;
-        align?: import("rc-trigger/lib/interface").AlignType | undefined;
-        showArrow?: boolean | undefined;
+        showArrow?: boolean | import("@rc-component/trigger").ArrowType | undefined;
         arrowContent?: import("react").ReactNode;
-        popupVisible?: boolean | undefined;
         overlayInnerStyle?: import("react").CSSProperties | undefined;
-        zIndex?: number | undefined;
         icon: import("@emotion/react/jsx-runtime").JSX.Element;
     } | undefined;
     initialValue: any;
 };
 export declare function getComponentProps(props: any): _.Omit<any, string>;
 interface GenerateFormItemProps extends CommonParams {
-    item: FormItemProps;
+    item: Omit<FormItemProps, 'children'>;
     formListContext: FormListContext;
     isFormList?: boolean;
 }
@@ -75,7 +85,7 @@ export declare function transformPathToName(path?: NamePath): string | undefined
 export declare function transformKeyToPath(params?: Record<string, any>): Record<string, any>;
 export declare function parseFormFailedError(error: ValidateErrorEntity): Record<string, string>;
 export declare function noStyle(item: FormItemProps): boolean;
-export declare function transformOptions(item: FormItemProps, values: FormValues, params: CommonParams): ((values: FormValues, params: import("..").OptionsParams) => import("../../api").FunctionReturn<SelectOptions>) | ((search?: string) => import("../../api").FunctionReturn<SelectOptions>) | import("../../api").FunctionReturn<SelectOptions> | undefined;
+export declare function transformOptions(item: FormItemProps, values: FormValues, params: CommonParams): import("../../api").FunctionReturn<SelectOptions> | ((values: FormValues, params: import("..").OptionsParams) => import("../../api").FunctionReturn<SelectOptions>) | ((search?: string) => import("../../api").FunctionReturn<SelectOptions>) | undefined;
 interface FocusFirstInputParams extends CommonParams {
     focusFirstOnMount: FormProps['focusFirstOnMount'];
 }

package/es/form/component/utils.js

@@ -13,7 +13,7 @@ import { getOptionsValue } from "../../select/component/utils";
 import { generateTooltip } from "../../text";
 import { getTooltipProps } from "../../tooltip";
 import { InfoCircleOutlined } from '@ant-design/icons';
-import { getFieldId } from 'antd/lib/form/util';
+import { getFieldId } from 'antd/es/form/util';
 import delay from 'delay';
 import _ from 'lodash';
 import { antdFormItemKeys, antdFormPropsKeys, registerMethods } from "./constant";

package/es/form/style/form-item.d.ts

@@ -1,3 +1,3 @@
 import { FormItemProps, FormItemPropsWithType } from "..";
 export declare function getFormItemWidth({ width, type }: FormItemPropsWithType): string | number | undefined;
-export declare function getFormItemStyle({ labelWidth, controlWidth, requiredMark, layout, type, ...props }: FormItemProps): string;
+export declare function getFormItemStyle({ labelWidth, controlWidth, requiredMark, type, ...props }: FormItemProps): string;

package/es/form/style/form-item.js

@@ -1,7 +1,7 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/esm/taggedTemplateLiteral";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
-var _excluded = ["labelWidth", "controlWidth", "requiredMark", "layout", "type"];
+var _templateObject, _templateObject2, _templateObject3;
+var _excluded = ["labelWidth", "controlWidth", "requiredMark", "type"];
 import { transformValueWithStyleUnit } from "../../api";
 import { getWidthAndFlex } from "../../stack/style";
 import { css } from '@emotion/css';
@@ -21,18 +21,11 @@ export function getFormItemStyle(_ref2) {
     controlWidth = _ref2.controlWidth,
     _ref2$requiredMark = _ref2.requiredMark,
     requiredMark = _ref2$requiredMark === void 0 ? true : _ref2$requiredMark,
-    layout = _ref2.layout,
     type = _ref2.type,
     props = _objectWithoutProperties(_ref2, _excluded);
-  var baseStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    &.ant-form-item {\n      min-width: 0;\n\n      .ant-form-item-label {\n        width: ", ";\n\n        .ant-form-item-tooltip {\n          color: inherit;\n          font-size: 13px;\n          margin-inline-start: unset;\n          margin-left: 3px;\n        }\n      }\n\n      .ant-form-item-control-input {\n        width: ", ";\n      }\n\n      .ant-form-item-required::before {\n        display: ", ";\n      }\n\n      ", "\n      ", "\n      ", "\n    }\n  "])), transformValueWithStyleUnit(labelWidth), transformValueWithStyleUnit(controlWidth), requiredMark ? undefined : 'none', layout === 'horizontal' && getHorizontalStyle(), layout === 'vertical' && getVerticalStyle(), type === 'tree' && treeItemStyle());
+  var baseStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    &.ant-form-item {\n      min-width: 0;\n\n      .ant-form-item-label {\n        width: ", ";\n\n        .ant-form-item-tooltip {\n          color: inherit;\n          font-size: 13px;\n          margin-inline-start: unset;\n          margin-left: 3px;\n        }\n      }\n\n      .ant-form-item-control-input {\n        width: ", ";\n      }\n\n      label.ant-form-item-required::before {\n        display: ", ";\n      }\n\n      // ", "\n    }\n  "])), transformValueWithStyleUnit(labelWidth), transformValueWithStyleUnit(controlWidth), requiredMark ? undefined : 'none', type === 'tree' && treeItemStyle());
   return css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n    ", "\n    ", "\n  "])), getWidthAndFlex(props), baseStyle);
 }
-function getHorizontalStyle() {
-  return css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n    .ant-form-item-row {\n      flex-direction: row;\n    }\n\n    .ant-form-item-label {\n      padding-bottom: 0;\n\n      > label {\n        height: 32px;\n        margin-right: 8px;\n      }\n    }\n\n    .ant-form-item-control {\n      flex: 1;\n      min-width: 0;\n    }\n  "])));
-}
-function getVerticalStyle() {
-  return css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n    .ant-form-item-row {\n      flex-direction: column;\n    }\n\n    .ant-form-item-label {\n      > label {\n        height: auto;\n        margin-bottom: 4px;\n      }\n\n      .ant-form-item-required::before {\n        position: unset;\n      }\n    }\n  "])));
-}
 function treeItemStyle() {
-  return css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n    &,\n    .ant-form-item-row,\n    .ant-form-item-control,\n    .ant-form-item-control-input,\n    .ant-form-item-control-input-content {\n      height: 100%;\n    }\n  "])));
+  return css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n    &,\n    .ant-form-item-row,\n    .ant-form-item-control,\n    .ant-form-item-control-input,\n    .ant-form-item-control-input-content,\n    .ant-select-in-form-item {\n      height: 100%;\n    }\n  "])));
 }

package/es/form/style/index.js

@@ -1,13 +1,13 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/esm/taggedTemplateLiteral";
 var _templateObject;
-import { commonFontFamily, transformValueWithStyleUnit } from "../../api";
+import { transformValueWithStyleUnit } from "../../api";
 import { css } from '@emotion/react';
 export * from "./form-item";
 var style = {
   wrapper: function wrapper(_ref) {
     var labelWidth = _ref.labelWidth,
       formItemMarginBottom = _ref.formItemMarginBottom;
-    return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    ", "\n\n    .ant-form-item {\n      margin-bottom: ", ";\n    }\n\n    .ant-form-item-label {\n      width: ", ";\n    }\n\n    .ant-form-item-with-help .ant-form-item-explain {\n      line-height: 1.1;\n      padding: 4px 0;\n\n      .ant-form-item-explain-error + .ant-form-item-explain-error {\n        margin-top: 2px;\n      }\n    }\n\n    &.ant-form-horizontal {\n      .ant-form-item-required::before {\n        position: absolute;\n        left: -10px;\n      }\n    }\n\n    &.ant-form-vertical {\n      .ant-form-item-label {\n        padding-bottom: 2px;\n      }\n    }\n\n    // disabled \u65F6\u4E5F\u9700\u8981\u663E\u793A error \u6846\n    .ant-picker-status-error.ant-picker,\n    .ant-select-status-error.ant-select:not(.ant-select-customize-input) .ant-select-selector,\n    .ant-input-status-error:not(.ant-input-borderless),\n    .ant-input-number-status-error:not(.ant-input-number-borderless),\n    .ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-borderless) {\n      border-color: #ff4d4f;\n    }\n  "])), commonFontFamily, transformValueWithStyleUnit(formItemMarginBottom), transformValueWithStyleUnit(labelWidth));
+    return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    .ant-form-item {\n      margin-bottom: ", ";\n    }\n\n    .ant-form-item-label {\n      width: ", ";\n    }\n\n    .ant-form-item-with-help .ant-form-item-explain {\n      line-height: 1.1;\n      padding: 4px 0;\n\n      .ant-form-item-explain-error + .ant-form-item-explain-error {\n        margin-top: 2px;\n      }\n    }\n\n    &.ant-form-horizontal {\n      .ant-form-item-required::before {\n        position: absolute;\n        left: -10px;\n      }\n    }\n\n    &.ant-form-vertical {\n      .ant-form-item-label {\n        padding-bottom: 5px;\n      }\n    }\n  "])), transformValueWithStyleUnit(formItemMarginBottom), transformValueWithStyleUnit(labelWidth));
   }
 };
 export default style;

package/es/form/type/form-item.d.ts

@@ -7,13 +7,13 @@ import { RadioProps } from "../../radio";
 import { SelectOptions, SelectProps } from "../../select";
 import { SwitchProps } from "../../switch";
 import { TreeSelectProps } from "../../tree-select";
-import { FormItemProps as AntdFormItemProps } from 'antd/lib/form/FormItem';
-import { SliderRangeProps, SliderSingleProps } from 'antd/lib/slider';
+import { FormItemProps as AntdFormItemProps } from 'antd/es/form/FormItem';
+import { SliderRangeProps, SliderSingleProps } from 'antd/es/slider';
 import { Rule } from 'rc-field-form/lib/interface';
 import { ReactElement, ReactNode } from 'react';
 import { InputComponentType, OtherComponentType } from '../component/form-item';
 type SliderProps = SliderSingleProps | SliderRangeProps;
-type UnionType = Omit<AntdFormItemProps & InputProps & SelectProps & TreeSelectProps & SwitchProps & RadioProps & CheckboxProps & SliderProps, 'rules' | 'type' | 'disabled' | 'options' | 'required'>;
+type UnionType = Omit<AntdFormItemProps & InputProps & SelectProps & TreeSelectProps & SwitchProps & RadioProps & CheckboxProps & SliderProps, 'rules' | 'type' | 'disabled' | 'options' | 'required' | 'children'>;
 /**
  * @noExtends
  */
@@ -84,10 +84,9 @@ export interface FormItemProps extends UnionType {
      */
     controlWidth?: number | string;
     /**
-     * @description 布局方式
-     * @default horizontal
+     * @description 是否显示必填标记
      */
-    layout?: 'horizontal' | 'vertical';
+    requiredMark?: boolean;
     preserveStatus?: boolean;
     /**
      * @description 自定义渲染

package/es/form/type/form-list.d.ts

@@ -1,7 +1,7 @@
 import { ButtonProps } from "../../button";
 import { FormItemProps, FormValues } from "..";
 import { ListOperation } from "../../hooks";
-import { FormListFieldData } from 'antd/lib/form/FormList';
+import { FormListFieldData } from 'antd/es/form/FormList';
 import { ReactNode } from 'react';
 export interface FormListContext extends FormListCommonProps {
     name: FormItemProps['name'];
@@ -9,7 +9,7 @@ export interface FormListContext extends FormListCommonProps {
 /**
  * @noExtends
  */
-export interface FormListProps extends FormItemProps {
+export interface FormListProps extends Omit<FormItemProps, 'children'> {
     /**
      * @description 表单名称，支持层级嵌套，如：a.b.c
      */

package/es/form/type/index.d.ts

@@ -1,9 +1,9 @@
 import { FunctionReturn } from "../../api";
 import { ButtonProps } from "../../button";
 import { FormContext, FormItemContext, FormItemProps, FormListContext } from "..";
-import { FormProps as AntdFormProps } from 'antd/lib/form/Form';
-import { FormInstance as AntdFormInstance } from 'antd/lib/form/hooks/useForm';
-import { InputFocusOptions } from 'antd/lib/input/Input';
+import { FormProps as AntdFormProps } from 'antd/es/form/Form';
+import { FormInstance as AntdFormInstance } from 'antd/es/form/hooks/useForm';
+import { InputFocusOptions } from 'antd/es/input/Input';
 import { ValidateOptions } from 'rc-field-form/es/interface';
 import { StoreValue } from 'rc-field-form/lib/interface';
 import { ReactNode } from 'react';