@lobehub/ui 1.155.2 → 1.155.4

package/es/Form/components/FormFooter.js

@@ -2,20 +2,18 @@
 
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["className", "children"];
+var _excluded = ["children"];
 import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 import { jsx as _jsx } from "react/jsx-runtime";
 var FormFooter = /*#__PURE__*/memo(function (_ref) {
-  var className = _ref.className,
-    children = _ref.children,
+  var children = _ref.children,
     rest = _objectWithoutProperties(_ref, _excluded);
   return /*#__PURE__*/_jsx(Flexbox, _objectSpread(_objectSpread({
-    className: className,
     gap: 8,
+    horizontal: true,
     justify: 'flex-end'
   }, rest), {}, {
-    horizontal: true,
     children: children
   }));
 });

package/es/Form/index.d.ts

@@ -1,5 +1,5 @@
 import { Form as AntForm, FormProps as AntFormProps, type FormInstance } from 'antd';
-import { type ReactNode, RefAttributes } from 'react';
+import { CSSProperties, type ReactNode, RefAttributes } from 'react';
 import FormGroup, { type FormGroupProps, FormVariant, ItemsType } from './components/FormGroup';
 import FormItem, { type FormItemProps } from './components/FormItem';
 export interface ItemGroup {
@@ -11,12 +11,18 @@ export interface ItemGroup {
 }
 export interface FormProps extends Omit<AntFormProps, 'variant'> {
     children?: ReactNode;
+    classNames?: {
+        footer?: string;
+    };
     collapsible?: boolean;
     footer?: ReactNode;
     gap?: number | string;
     itemMinWidth?: FormItemProps['minWidth'];
     items?: ItemGroup[] | FormItemProps[];
     itemsType?: ItemsType;
+    styles?: {
+        footer?: CSSProperties;
+    };
     variant?: FormVariant;
 }
 export type { FormInstance } from 'antd';
@@ -24,6 +30,7 @@ export interface IForm {
     (props: FormProps & RefAttributes<FormInstance>): ReactNode;
     Group: typeof FormGroup;
     Item: typeof FormItem;
+    Provider: typeof AntForm.Provider;
     useForm: typeof AntForm.useForm;
 }
 declare const Form: IForm;

package/es/Form/index.js

@@ -2,7 +2,7 @@
 
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["className", "itemMinWidth", "footer", "form", "items", "children", "itemsType", "variant", "gap", "style", "collapsible"];
+var _excluded = ["className", "itemMinWidth", "footer", "form", "items", "children", "itemsType", "variant", "gap", "style", "collapsible", "classNames", "styles"];
 import { Form as AntForm } from 'antd';
 import { forwardRef } from 'react';
 import FormFooter from "./components/FormFooter";
@@ -26,10 +26,14 @@ var FormParent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     gap = _ref.gap,
     style = _ref.style,
     collapsible = _ref.collapsible,
+    _ref$classNames = _ref.classNames,
+    classNames = _ref$classNames === void 0 ? {} : _ref$classNames,
+    _ref$styles = _ref.styles,
+    styles = _ref$styles === void 0 ? {} : _ref$styles,
     rest = _objectWithoutProperties(_ref, _excluded);
   var _useStyles = useStyles(),
     cx = _useStyles.cx,
-    styles = _useStyles.styles;
+    s = _useStyles.styles;
   var mapFlat = function mapFlat(item, itemIndex) {
     return /*#__PURE__*/_jsx(FormItem, _objectSpread({
       divider: itemIndex !== 0,
@@ -52,7 +56,7 @@ var FormParent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     }, groupIndex);
   };
   return /*#__PURE__*/_jsxs(AntForm, _objectSpread(_objectSpread({
-    className: cx(styles.form, variant === 'pure' && styles.pure, styles.mobile, className),
+    className: cx(s.form, variant === 'pure' && s.pure, s.mobile, className),
     colon: false,
     form: form,
     layout: 'horizontal',
@@ -72,6 +76,8 @@ var FormParent = /*#__PURE__*/forwardRef(function (_ref, ref) {
         return mapFlat(item, i);
       })
     }) : undefined, children, footer && /*#__PURE__*/_jsx(FormFooter, {
+      className: classNames === null || classNames === void 0 ? void 0 : classNames.footer,
+      style: styles === null || styles === void 0 ? void 0 : styles.footer,
       children: footer
     })]
   }));
@@ -80,4 +86,5 @@ var Form = FormParent;
 Form.Item = FormItem;
 Form.Group = FormGroup;
 Form.useForm = AntForm.useForm;
+Form.Provider = AntForm.Provider;
 export default Form;

package/es/FormModal/index.d.ts

@@ -7,12 +7,13 @@ export interface FormModalProps extends PickModalProps, PickFormProps {
     classNames?: {
         form?: FormProps['className'];
     } & ModalProps['classNames'];
-    finishButtonProps?: ModalProps['okButtonProps'];
-    finishLoading?: ModalProps['confirmLoading'];
-    finishText?: ModalProps['okText'];
+    onSubmit?: ModalProps['onOk'];
     styles?: {
         form?: FormProps['style'];
     } & ModalProps['styles'];
+    submitButtonProps?: ModalProps['okButtonProps'];
+    submitLoading?: ModalProps['confirmLoading'];
+    submitText?: ModalProps['okText'];
 }
 declare const FormModal: import("react").ForwardRefExoticComponent<FormModalProps & import("react").RefAttributes<FormInstance<any>>>;
 export default FormModal;

package/es/FormModal/index.js

@@ -1,17 +1,15 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["classNames", "className", "style", "closable", "styles", "children", "allowFullscreen", "title", "wrapClassName", "afterOpenChange", "width", "onCancel", "centered", "open", "afterClose", "destroyOnClose", "closeIcon", "paddings", "maxHeight", "enableResponsive", "zIndex", "mask", "getContainer", "keyboard", "focusTriggerAfterClose", "forceRender", "loading", "footer", "finishButtonProps", "finishLoading", "onFinish", "finishText", "variant", "gap"],
+var _excluded = ["classNames", "className", "style", "closable", "styles", "allowFullscreen", "title", "wrapClassName", "afterOpenChange", "width", "onCancel", "centered", "open", "afterClose", "destroyOnClose", "closeIcon", "paddings", "maxHeight", "enableResponsive", "zIndex", "mask", "getContainer", "keyboard", "focusTriggerAfterClose", "forceRender", "loading", "footer", "submitButtonProps", "submitLoading", "onFinish", "submitText", "variant", "gap", "onSubmit"],
   _excluded2 = ["form", "footer"],
   _excluded3 = ["form", "footer"];
 import { Button } from 'antd';
 import { useResponsive } from 'antd-style';
 import { forwardRef } from 'react';
-import { Flexbox } from 'react-layout-kit';
 import Form from "../Form";
 import Modal from "../Modal";
 import { useStyles } from "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
 var FormModal = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var _ref$classNames = _ref.classNames,
     classNames = _ref$classNames === void 0 ? {} : _ref$classNames,
@@ -20,7 +18,6 @@ var FormModal = /*#__PURE__*/forwardRef(function (_ref, ref) {
     closable = _ref.closable,
     _ref$styles = _ref.styles,
     styles = _ref$styles === void 0 ? {} : _ref$styles,
-    children = _ref.children,
     allowFullscreen = _ref.allowFullscreen,
     title = _ref.title,
     wrapClassName = _ref.wrapClassName,
@@ -43,13 +40,14 @@ var FormModal = /*#__PURE__*/forwardRef(function (_ref, ref) {
     forceRender = _ref.forceRender,
     loading = _ref.loading,
     footer = _ref.footer,
-    finishButtonProps = _ref.finishButtonProps,
-    finishLoading = _ref.finishLoading,
+    submitButtonProps = _ref.submitButtonProps,
+    submitLoading = _ref.submitLoading,
     onFinish = _ref.onFinish,
-    finishText = _ref.finishText,
+    submitText = _ref.submitText,
     _ref$variant = _ref.variant,
     variant = _ref$variant === void 0 ? 'pure' : _ref$variant,
     gap = _ref.gap,
+    onSubmit = _ref.onSubmit,
     rest = _objectWithoutProperties(_ref, _excluded);
   var _useResponsive = useResponsive(),
     mobile = _useResponsive.mobile;
@@ -71,7 +69,7 @@ var FormModal = /*#__PURE__*/forwardRef(function (_ref, ref) {
     classNames: modalClassNames,
     closable: closable,
     closeIcon: closeIcon,
-    confirmLoading: finishLoading,
+    confirmLoading: submitLoading,
     destroyOnClose: destroyOnClose,
     enableResponsive: enableResponsive,
     focusTriggerAfterClose: focusTriggerAfterClose,
@@ -95,34 +93,33 @@ var FormModal = /*#__PURE__*/forwardRef(function (_ref, ref) {
     width: width,
     wrapClassName: wrapClassName,
     zIndex: zIndex,
-    children: /*#__PURE__*/_jsxs(Form, _objectSpread(_objectSpread({
+    children: /*#__PURE__*/_jsx(Form, _objectSpread({
       className: cx(s.form, formClassName),
+      classNames: {
+        footer: cx(s.footer, footerClassName)
+      },
       clearOnDestroy: destroyOnClose,
+      footer: footer || /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
+        block: true,
+        htmlType: "submit",
+        loading: submitLoading,
+        onClick: onSubmit,
+        type: 'primary'
+      }, submitButtonProps), {}, {
+        style: _objectSpread({
+          flex: 1
+        }, submitButtonProps === null || submitButtonProps === void 0 ? void 0 : submitButtonProps.style),
+        children: submitText || 'Submit'
+      })),
       gap: gap || (variant === 'pure' ? 24 : gap),
       onFinish: onFinish,
       ref: ref,
       style: formStyle,
+      styles: {
+        footer: footerStyle
+      },
       variant: variant
-    }, rest), {}, {
-      children: [children, /*#__PURE__*/_jsx(Flexbox, {
-        className: cx(s.footer, footerClassName),
-        gap: 8,
-        horizontal: true,
-        style: footerStyle,
-        width: '100%',
-        children: footer || /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
-          block: true,
-          htmlType: "submit",
-          loading: finishLoading,
-          type: 'primary'
-        }, finishButtonProps), {}, {
-          style: _objectSpread({
-            flex: 1
-          }, finishButtonProps === null || finishButtonProps === void 0 ? void 0 : finishButtonProps.style),
-          children: finishText || 'Submit'
-        }))
-      })]
-    }))
+    }, rest))
   });
 });
 export default FormModal;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/ui",
-  "version": "1.155.2",
+  "version": "1.155.4",
   "description": "Lobe UI is an open-source UI component library for building AIGC web apps",
   "keywords": [
     "lobehub",