doui-react 1.0.0 → 2.0.0

package/es/tree-select/component/use-tree-select.js

@@ -1,10 +1,9 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["presetProcessOption", "treeNodeAlign"],
-  _excluded2 = ["optionFilterProp", "optionLabelProp", "options", "popupClassName", "activeBackgroundColor", "indent", "multiple"];
+  _excluded2 = ["optionFilterProp", "optionLabelProp", "options", "activeBackgroundColor", "indent", "multiple"];
 import { Checkbox } from "../../checkbox";
 import { useSelect } from "../../select/component/use-select";
-import { cx } from '@emotion/css';
 import style from "../style";
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 export function useTreeSelect(_ref) {
@@ -18,7 +17,6 @@ export function useTreeSelect(_ref) {
     treeNodeFilterProp = _useSelect.optionFilterProp,
     treeNodeLabelProp = _useSelect.optionLabelProp,
     treeData = _useSelect.options,
-    popupClassName = _useSelect.popupClassName,
     _useSelect$activeBack = _useSelect.activeBackgroundColor,
     activeBackgroundColor = _useSelect$activeBack === void 0 ? '#e6f7ff' : _useSelect$activeBack,
     indent = _useSelect.indent,
@@ -51,7 +49,9 @@ export function useTreeSelect(_ref) {
     treeNodeLabelProp: treeNodeLabelProp,
     treeData: treeData,
     multiple: multiple,
-    popupClassName: cx(popupClassName, classString),
+    classNames: {
+      root: classString
+    },
     treeCheckable: multiple,
     treeExpandAction: multiple ? false : 'click',
     treeIcon: multiple

package/es/tree-select/style/index.js

@@ -9,7 +9,7 @@ var style = {
       indent = _ref.indent,
       switcherIcon = _ref.switcherIcon,
       treeNodeAlign = _ref.treeNodeAlign;
-    return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    span.ant-select-tree-node-content-wrapper {\n      display: flex;\n      align-items: ", ";\n      overflow: hidden;\n\n      &.ant-select-tree-node-selected {\n        background-color: ", ";\n      }\n    }\n\n    .ant-select-tree .ant-select-tree-treenode {\n      &:has(.ant-select-tree-indent-unit) .ant-select-tree-node-content-wrapper {\n        margin-left: ", ";\n      }\n\n      .ant-select-tree-switcher {\n        display: ", ";\n      }\n\n      .ant-select-tree-checkbox {\n        display: none !important;\n      }\n\n      .ant-select-tree-iconEle {\n        width: unset;\n        height: unset;\n        margin-right: 10px;\n      }\n\n      .ant-select-tree-title {\n        min-width: 0;\n        overflow: hidden;\n      }\n    }\n  "])), getAlign(treeNodeAlign), activeBackgroundColor, transformValueWithStyleUnit(indent), switcherIcon === false ? 'none' : undefined);
+    return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    span.ant-select-tree-node-content-wrapper {\n      display: flex;\n      align-items: ", ";\n      overflow: hidden;\n\n      &.ant-select-tree-node-selected {\n        background-color: ", ";\n      }\n    }\n\n    .ant-select-tree .ant-select-tree-treenode {\n      &:has(.ant-select-tree-indent-unit) .ant-select-tree-node-content-wrapper {\n        margin-left: ", ";\n      }\n\n      .ant-select-tree-switcher {\n        display: ", ";\n      }\n\n      .ant-select-tree-checkbox {\n        display: none !important;\n      }\n\n      .ant-select-tree-iconEle {\n        width: unset;\n        height: unset;\n        margin-right: 10px;\n      }\n\n      .ant-select-tree-title {\n        min-width: 0;\n        overflow: hidden;\n      }\n\n      &.filter-node:not(.ant-select-tree-treenode-disabled) .ant-select-tree-title {\n        color: inherit;\n        font-weight: inherit;\n      }\n    }\n  "])), getAlign(treeNodeAlign), activeBackgroundColor, transformValueWithStyleUnit(indent), switcherIcon === false ? 'none' : undefined);
   }
 };
 export default style;

package/es/virtual-list/type/index.d.ts

@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 import { VirtuosoProps } from 'react-virtuoso';
-export interface VirtualListProps extends VirtuosoProps<any, any> {
+export interface VirtualListProps extends Omit<VirtuosoProps<any, any>, 'children'> {
     /**
      * @description 数据
      */

package/lib/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/lib/api/component/common.js

@@ -19,10 +19,13 @@ exports.uuid = uuid;
 exports.wait = wait;
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _dayjs = _interopRequireDefault(require("dayjs"));
+require("dayjs/locale/zh-cn");
 var _delay = _interopRequireDefault(require("delay"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _react = require("react");
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
+_dayjs.default.locale('zh-cn');
 var isJest = exports.isJest = !!process.env.JEST_WORKER_ID;
 function runDevOrJest(fn, jestFn) {
   return executeFunction(isJest ? jestFn : /* istanbul ignore next */fn);

package/lib/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/lib/api/component/global-style.js

@@ -4,20 +4,19 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.flexStyle = exports.commonFontFamily = void 0;
+exports.flexStyle = void 0;
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _ = require("./..");
 var _css = require("@emotion/css");
 var _react = require("@emotion/react");
-var _templateObject, _templateObject2, _templateObject3, _templateObject4;
+var _templateObject, _templateObject2, _templateObject3;
 var commonStyle = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  &.do-hide-scroll {\n    overflow: hidden !important;\n  }\n"])));
 (0, _css.injectGlobal)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  body {\n    ", "\n  }\n"])), commonStyle);
-var commonFontFamily = exports.commonFontFamily = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\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"])));
 var flexStyle = exports.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 (0, _react.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  flex-direction: ", ";\n  gap: ", ";\n  flex-wrap: ", ";\n  min-width: 0;\n"])), vertical ? 'column' : 'row', (0, _.transformValueToGap)(gap), wrap ? 'wrap' : 'nowrap');
+  return (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  flex-direction: ", ";\n  gap: ", ";\n  flex-wrap: ", ";\n  min-width: 0;\n"])), vertical ? 'column' : 'row', (0, _.transformValueToGap)(gap), wrap ? 'wrap' : 'nowrap');
 };

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

@@ -9,7 +9,7 @@ exports.unmountComponent = unmountComponent;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _ = require("./..");
-var _reactDom = _interopRequireDefault(require("react-dom"));
+var _client = require("react-dom/client");
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
 var _excluded = ["hideBodyScroll"];
 function getContainer() {
@@ -19,30 +19,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.default.render(element, container);
+      var root = (0, _client.createRoot)(container);
+      root.render(element);
+      container._reactRootContainer = root;
     },
     unmount: function unmount(container) {
-      _reactDom.default.unmountComponentAtNode(container);
+      var root = container._reactRootContainer;
+      if (root) {
+        root.unmount();
+        delete container._reactRootContainer;
+      }
     }
   };
 }

package/lib/api/component/validate-input.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.scriptReg = exports.inputValueReg = void 0;
 exports.validateScript = validateScript;
 exports.validateString = validateString;
-var inputValueReg = exports.inputValueReg = /^[a-zA-Z0-9_\-\s/.:*{}€,()%$|+#@=><']*$/i;
+var inputValueReg = exports.inputValueReg = /.*/i;
 var scriptReg = exports.scriptReg = /<[/]*[^/<]*\s*script[\s+]*[^/>]*[/]*>/i;
 function validateScript(value) {
   return !value.match(scriptReg);
@@ -16,9 +16,7 @@ function validateScript(value) {
  * validate data of general String type
  *  letters, numbers, spot, underlines and Spaces
  */
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function validateString(value) {
-  if (!inputValueReg.test(value)) {
-    return false;
-  }
-  return validateScript(value);
+  return true;
 }

package/lib/button/component/index.js

@@ -17,7 +17,7 @@ var _antd = require("antd");
 var _lodash = _interopRequireDefault(require("lodash"));
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
 var _excluded = ["tooltip", "placement", "trigger", "align"],
-  _excluded2 = ["show", "confirm", "onClick", "confirmMessage", "okText", "cancelText"],
+  _excluded2 = ["show", "confirm", "onClick", "description", "okText", "cancelText"],
   _excluded3 = ["portalTo"];
 function useButton(props) {
   var _props$loading;
@@ -35,10 +35,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 = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var params = useButton(props);
   if (_lodash.default.isNil(tooltip)) {
@@ -58,21 +55,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 = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
   if (!show) {
-    return null;
+    return;
   }
   if (confirm) {
+    var title = _lodash.default.isBoolean(confirm) ? '是否确定?' : confirm;
     return (0, _jsxRuntime.jsx)(_antd.Popconfirm, {
-      title: confirmMessage || 'Are you sure?',
+      title: title,
+      description: description,
       onConfirm: onClick,
-      okText: okText || 'OK',
+      okText: okText,
       cancelText: cancelText,
       placement: props.placement,
-      arrowPointAtCenter: props.arrowPointAtCenter,
+      arrow: props.arrow,
       getPopupContainer: _api.getPopupContainer,
       children: (0, _jsxRuntime.jsx)(BaseButton, (0, _objectSpread2.default)({}, props))
     });

package/lib/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/lib/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/lib/date-picker/component/index.js

@@ -10,37 +10,33 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _api = require("../../api");
 var _antd = require("antd");
+var _dayjs = _interopRequireDefault(require("dayjs"));
 var _lodash = _interopRequireDefault(require("lodash"));
-var _momentTimezone = _interopRequireDefault(require("moment-timezone"));
 var _style = _interopRequireDefault(require("../style"));
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
-var _excluded = ["refs"];
+var _excluded = ["refs", "value"];
 function DatePicker(props) {
   var baseProps = generateProps(props);
-  var value = toMoment(props.value);
-  return (0, _jsxRuntime.jsx)(_antd.DatePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, baseProps), {}, {
-    value: value
-  }));
+  return (0, _jsxRuntime.jsx)(_antd.DatePicker, (0, _objectSpread2.default)({}, baseProps));
 }
 function RangePicker(props) {
   var baseProps = generateProps(props);
-  var value = _lodash.default.map(props.value, toMoment);
-  return (0, _jsxRuntime.jsx)(_antd.DatePicker.RangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, baseProps), {}, {
-    value: value
-  }));
-}
-function toMoment(input) {
-  if (!input) {
-    return;
-  }
-  return _momentTimezone.default.isMoment(input) ? input : (0, _momentTimezone.default)(input);
+  return (0, _jsxRuntime.jsx)(_antd.DatePicker.RangePicker, (0, _objectSpread2.default)({}, baseProps));
 }
 function generateProps(_ref) {
   var refs = _ref.refs,
+    value = _ref.value,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   return (0, _objectSpread2.default)({
     ref: refs,
     css: _style.default.wrapper,
-    getPopupContainer: _api.getPopupContainer
+    getPopupContainer: _api.getPopupContainer,
+    value: _lodash.default.isArray(value) ? _lodash.default.map(value, toDayjs) : toDayjs(value)
   }, props);
+}
+function toDayjs(input) {
+  if (!input) {
+    return;
+  }
+  return _dayjs.default.isDayjs(input) ? input : (0, _dayjs.default)(input);
 }

package/lib/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/lib/form/component/constant.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useUnsetWidthKeys = exports.registerMethods = exports.needCollectItemPropKeys = exports.formListActionKeys = exports.antdFormPropsKeys = exports.antdFormItemKeys = void 0;
-var antdFormPropsKeys = exports.antdFormPropsKeys = ['form', 'name', 'colon', 'disabled', 'component', 'initialValues', 'labelAlign', 'labelWrap', 'labelCol', 'labelWidth', 'layout', 'preserve', 'requiredMark', 'scrollToFirstError', 'size', 'validateMessages', 'validateTrigger', 'wrapperCol', 'onFieldsChange', 'onFinish', 'onFinishFailed', 'onValuesChange', 'onValidateFailed'];
-var antdFormItemKeys = exports.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'];
+var antdFormPropsKeys = exports.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'];
+var antdFormItemKeys = exports.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'];
 var formListActionKeys = exports.formListActionKeys = ['operation', 'defaultValue', 'insertIndex', 'index', 'from', 'to'];
 var needCollectItemPropKeys = exports.needCollectItemPropKeys = ['name', 'type', 'optionDependencies', 'rules', 'formListContext'];
 var useUnsetWidthKeys = exports.useUnsetWidthKeys = ['switch'];

package/lib/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/lib/form/component/form-item.js

@@ -26,7 +26,7 @@ var _utils = require("./utils");
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
 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"];
 function useCollectItemsStatus(_ref) {
   var name = _ref.name,
     preserveStatus = _ref.preserveStatus;
@@ -171,7 +171,6 @@ function FormItemComponent(_ref3) {
     labelWidth = item.labelWidth,
     controlWidth = item.controlWidth,
     requiredMark = item.requiredMark,
-    layout = item.layout,
     restItem = (0, _objectWithoutProperties2.default)(item, _excluded3);
 
   // 是否显示
@@ -189,7 +188,6 @@ function FormItemComponent(_ref3) {
     labelWidth: labelWidth,
     controlWidth: controlWidth,
     requiredMark: requiredMark,
-    layout: layout,
     type: restItem.type
   });
   var formItemProps = (0, _utils.getFormItemProps)((0, _objectSpread2.default)({

package/lib/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/lib/form/component/utils.d.ts

@@ -10,43 +10,53 @@ 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;
+        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;
-        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;
         icon: import("@emotion/react/jsx-runtime").JSX.Element;
     } | undefined;
@@ -54,7 +64,7 @@ export declare function getFormItemProps(props: 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/lib/form/component/utils.js

@@ -40,7 +40,7 @@ var _utils = require("../../select/component/utils");
 var _text = require("../../text");
 var _tooltip = require("../../tooltip");
 var _icons = require("@ant-design/icons");
-var _util = require("antd/lib/form/util");
+var _util = require("antd/es/form/util");
 var _delay = _interopRequireDefault(require("delay"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _constant = require("./constant");
@@ -64,7 +64,7 @@ function getFormProps(props) {
     autoComplete: 'off',
     labelWrap: true,
     validateMessages: {
-      required: '${label} is required.'
+      required: '请输入${label}'
     },
     validateTrigger: ['onChange', 'onBlur'],
     onFinishFailed: function onFinishFailed(error) {
@@ -176,7 +176,7 @@ function generateRules(_ref2) {
     });
   }
   if (item.requiredInOptions) {
-    var _message = _lodash.default.isString(item.requiredInOptions) ? item.requiredInOptions : 'The value does not exist.';
+    var _message = _lodash.default.isString(item.requiredInOptions) ? item.requiredInOptions : '该值不存在';
     var validator = function validator(_ref3) {
       var _form$getItems;
       var value = _ref3.value;
@@ -226,7 +226,7 @@ function generateRequiredMessage(item) {
     return item.required;
   }
   if (!item.label) {
-    return 'The value is required.';
+    return '必填项';
   }
 }
 function isValueNotExistInOptions(value, options) {

package/lib/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/lib/form/style/form-item.js

@@ -12,8 +12,8 @@ var _api = require("../../api");
 var _style = require("../../stack/style");
 var _css = require("@emotion/css");
 var _constant = require("../component/constant");
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
-var _excluded = ["labelWidth", "controlWidth", "requiredMark", "layout", "type"];
+var _templateObject, _templateObject2, _templateObject3;
+var _excluded = ["labelWidth", "controlWidth", "requiredMark", "type"];
 function getFormItemWidth(_ref) {
   var width = _ref.width,
     type = _ref.type;
@@ -29,18 +29,11 @@ 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 = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
-  var baseStyle = (0, _css.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\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  "])), (0, _api.transformValueWithStyleUnit)(labelWidth), (0, _api.transformValueWithStyleUnit)(controlWidth), requiredMark ? undefined : 'none', layout === 'horizontal' && getHorizontalStyle(), layout === 'vertical' && getVerticalStyle(), type === 'tree' && treeItemStyle());
+  var baseStyle = (0, _css.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\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  "])), (0, _api.transformValueWithStyleUnit)(labelWidth), (0, _api.transformValueWithStyleUnit)(controlWidth), requiredMark ? undefined : 'none', type === 'tree' && treeItemStyle());
   return (0, _css.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n    ", "\n    ", "\n  "])), (0, _style.getWidthAndFlex)(props), baseStyle);
 }
-function getHorizontalStyle() {
-  return (0, _css.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\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 (0, _css.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\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 (0, _css.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\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 (0, _css.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\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/lib/form/style/index.js

@@ -26,7 +26,7 @@ var style = {
   wrapper: function wrapper(_ref) {
     var labelWidth = _ref.labelWidth,
       formItemMarginBottom = _ref.formItemMarginBottom;
-    return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\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  "])), _api.commonFontFamily, (0, _api.transformValueWithStyleUnit)(formItemMarginBottom), (0, _api.transformValueWithStyleUnit)(labelWidth));
+    return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\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  "])), (0, _api.transformValueWithStyleUnit)(formItemMarginBottom), (0, _api.transformValueWithStyleUnit)(labelWidth));
   }
 };
 var _default = exports.default = style;