foxit-component 0.0.1-alpha.5 → 0.0.1-alpha.8

package/es/Button/Button.d.ts

@@ -8,5 +8,6 @@ export interface ButtonProps {
     className?: string;
     style?: React.CSSProperties;
     [key: string]: unknown;
+    loading?: boolean;
 }
-export declare const Button: ({ primary, size, children, className, style, ...props }: ButtonProps) => import("react/jsx-runtime").JSX.Element;
+export declare const Button: ({ primary, size, children, className, style, loading, ...props }: ButtonProps) => import("react/jsx-runtime").JSX.Element;

package/es/Button/Button.js

@@ -1,12 +1,12 @@
 import { __rest, __assign } from '../node_modules/tslib/tslib.es6.js';
-import { jsx } from 'react/jsx-runtime';
+import { jsxs, jsx } from 'react/jsx-runtime';
 import classNames from 'classnames';
-import './button.css.js';
+import { Icon } from '../Icon/index.js';
 
 var Button = function (_a) {
-    var _b = _a.primary, primary = _b === void 0 ? false : _b, _c = _a.size, size = _c === void 0 ? 'large' : _c, _d = _a.children, children = _d === void 0 ? '' : _d, className = _a.className, style = _a.style, props = __rest(_a, ["primary", "size", "children", "className", "style"]);
+    var _b = _a.primary, primary = _b === void 0 ? false : _b, _c = _a.size, size = _c === void 0 ? 'large' : _c, _d = _a.children, children = _d === void 0 ? '' : _d, className = _a.className, style = _a.style, loading = _a.loading, props = __rest(_a, ["primary", "size", "children", "className", "style", "loading"]);
     var mode = primary ? 'foxit-button-primary' : 'foxit-button-secondary';
-    return (jsx("button", __assign({ type: "button", className: classNames('foxit-button', "foxit-button-".concat(size), mode, className), style: style }, props, { children: children })));
+    return (jsxs("button", __assign({ type: "button", className: classNames('foxit-button', "foxit-button-".concat(size), mode, className), style: style }, props, { children: [loading && jsx(Icon, { name: "LoadingOutlined", className: "foxit-button-loading" }), children] })));
 };
 
 export { Button };

package/es/Checkbox/Checkbox.d.ts

@@ -1,10 +1,18 @@
-import React from 'react';
+import React, { FC } from 'react';
 import './checkbox.css';
 interface CheckboxProps {
     onChange?: (checked: boolean) => void;
     checked?: boolean;
     disabled?: boolean;
+    value?: string;
     children: React.ReactNode;
 }
-declare const Checkbox: React.FC<CheckboxProps>;
+interface CheckboxGroupProps {
+    value?: string[];
+    onChange?: (checkedValues: string[]) => void;
+    children: React.ReactNode;
+}
+declare const Checkbox: React.FC<CheckboxProps> & {
+    Group: FC<CheckboxGroupProps>;
+};
 export default Checkbox;

package/es/Checkbox/Checkbox.js

@@ -1,19 +1,49 @@
-import { __assign } from '../node_modules/tslib/tslib.es6.js';
+import { __assign, __spreadArray } from '../node_modules/tslib/tslib.es6.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
-import { useState } from 'react';
-import './checkbox.css.js';
+import { createContext, useContext, useState, useEffect } from 'react';
 
+var CheckboxGroupContext = createContext(null);
 var Checkbox = function (_a) {
-    var onChange = _a.onChange, checked = _a.checked, _b = _a.disabled, disabled = _b === void 0 ? false : _b, children = _a.children;
+    var onChange = _a.onChange, checked = _a.checked, _b = _a.disabled, disabled = _b === void 0 ? false : _b, value = _a.value, children = _a.children;
+    var groupContext = useContext(CheckboxGroupContext);
     var _c = useState(checked || false), internalChecked = _c[0], setInternalChecked = _c[1];
+    useEffect(function () {
+        if (checked !== undefined) {
+            setInternalChecked(checked);
+        }
+    }, [checked]);
     var handleChange = function (e) {
         var newChecked = e.target.checked;
         setInternalChecked(newChecked);
         if (onChange) {
             onChange(newChecked);
         }
+        if (groupContext && value) {
+            groupContext.onChange(value, newChecked);
+        }
+    };
+    var isChecked = groupContext ? groupContext.value.includes(value || '') : internalChecked;
+    return (jsxs("label", __assign({ className: "foxit-checkbox-container ".concat(disabled ? 'disabled' : '') }, { children: [jsx("input", { type: "checkbox", checked: isChecked, disabled: disabled, onChange: handleChange }), jsx("span", { className: "foxit-checkbox-checkmark ".concat(disabled ? 'disabled' : '') }), jsx("span", __assign({ className: "foxit-checkbox-content" }, { children: children }))] })));
+};
+var CheckboxGroup = function (_a) {
+    var value = _a.value, onChange = _a.onChange, children = _a.children;
+    var _b = useState([]), checkedValues = _b[0], setCheckedValues = _b[1];
+    useEffect(function () {
+        if (value !== undefined) {
+            setCheckedValues(value);
+        }
+    }, [value]);
+    var handleCheckboxChange = function (checkboxValue, checked) {
+        var newCheckedValues = checked
+            ? __spreadArray(__spreadArray([], checkedValues, true), [checkboxValue], false) : checkedValues.filter(function (v) { return v !== checkboxValue; });
+        setCheckedValues(newCheckedValues);
+        if (onChange) {
+            onChange(newCheckedValues);
+        }
     };
-    return (jsxs("label", __assign({ className: "foxit-checkbox-container ".concat(disabled ? 'disabled' : '') }, { children: [jsx("input", { type: "checkbox", checked: checked !== undefined ? checked : internalChecked, disabled: disabled, onChange: handleChange }), jsx("span", { className: "foxit-checkbox-checkmark ".concat(disabled ? 'disabled' : '') }), jsx("span", __assign({ className: "foxit-checkbox-content" }, { children: children }))] })));
+    var currentValue = value !== undefined ? value : checkedValues;
+    return (jsx(CheckboxGroupContext.Provider, __assign({ value: { value: currentValue, onChange: handleCheckboxChange } }, { children: jsx("div", __assign({ className: "foxit-checkbox-group" }, { children: children })) })));
 };
+Checkbox.Group = CheckboxGroup;
 
 export { Checkbox as default };

package/es/Empty/Empty.js

@@ -1,7 +1,6 @@
 import { __assign } from '../node_modules/tslib/tslib.es6.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { Icon } from '../Icon/index.js';
-import './empty.css.js';
 
 var Empty = function (_a) {
     var description = _a.description;

package/es/Form/Form.js

@@ -3,7 +3,6 @@ import { jsx } from 'react/jsx-runtime';
 import { forwardRef, useRef, useCallback, useImperativeHandle } from 'react';
 import FormProvider from './FormProvider.js';
 import './FormContext.js';
-import './form.css.js';
 
 var Form = function (_a, ref) {
     var children = _a.children, onFinish = _a.onFinish, initialValues = _a.initialValues;

package/es/Form/FormItem.js

@@ -2,7 +2,6 @@ import { __assign } from '../node_modules/tslib/tslib.es6.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
 import React, { useContext, useEffect, useCallback } from 'react';
 import { FormContext } from './FormContext.js';
-import './form.css.js';
 
 var FormItem = function (_a) {
     var _b, _c, _d;

package/es/Form/FormProvider.js

@@ -1,43 +1,39 @@
 import { __assign } from '../node_modules/tslib/tslib.es6.js';
 import { jsx } from 'react/jsx-runtime';
-import { forwardRef, useState, useRef, useEffect, useCallback, useImperativeHandle } from 'react';
+import { forwardRef, useRef, useState, useEffect, useCallback, useImperativeHandle } from 'react';
 import { FormContext } from './FormContext.js';
 
 var FormProvider = function (_a, ref) {
     var children = _a.children, _b = _a.initialValues, initialValues = _b === void 0 ? {} : _b;
-    var _c = useState({}), formFields = _c[0], setFormFields = _c[1];
+    var formFieldsRef = useRef({});
+    var _c = useState({}), forceUpdate = _c[1]; // Used to force re-render when ref changes
     var formInstanceRef = useRef({});
     // 初始值的设置
     useEffect(function () {
         if (Object.keys(initialValues).length > 0) {
-            setFormFields(function (prevFields) {
-                var newFields = __assign({}, prevFields);
-                for (var key in initialValues) {
-                    if (!newFields[key]) {
-                        newFields[key] = { value: initialValues[key], rules: [] };
-                    }
-                    else {
-                        newFields[key] = __assign(__assign({}, newFields[key]), { value: initialValues[key] });
-                    }
+            formFieldsRef.current = __assign({}, formFieldsRef.current); // Create a new object
+            for (var key in initialValues) {
+                if (!formFieldsRef.current[key]) {
+                    formFieldsRef.current[key] = { value: initialValues[key], rules: [] };
                 }
-                return newFields;
-            });
+                else {
+                    formFieldsRef.current[key] = __assign(__assign({}, formFieldsRef.current[key]), { value: initialValues[key] });
+                }
+            }
+            forceUpdate({}); // Trigger re-render
         }
     }, [initialValues]);
     // 注册字段
     var registerField = useCallback(function (name, rules) {
-        setFormFields(function (prevFields) {
-            var _a;
-            return (__assign(__assign({}, prevFields), (_a = {}, _a[name] = __assign(__assign({}, prevFields[name]), { rules: rules || [] }), _a)));
-        });
+        formFieldsRef.current = __assign({}, formFieldsRef.current); // Create a new object
+        formFieldsRef.current[name] = __assign(__assign({}, formFieldsRef.current[name]), { rules: rules || [] });
+        forceUpdate({}); // Trigger re-render
     }, []);
     // 销毁字段
     var unregisterField = useCallback(function (name) {
-        setFormFields(function (prevFields) {
-            var newFields = __assign({}, prevFields);
-            delete newFields[name];
-            return newFields;
-        });
+        formFieldsRef.current = __assign({}, formFieldsRef.current); // Create a new object
+        delete formFieldsRef.current[name];
+        forceUpdate({}); // Trigger re-render
     }, []);
     // 验证字段
     var validateField = useCallback(function (name, value, rules) {
@@ -77,78 +73,74 @@ var FormProvider = function (_a, ref) {
     }, []);
     // 设置字段值
     var setFieldsValue = useCallback(function (values) {
-        setFormFields(function (prevFields) {
-            var _a;
-            var newFields = __assign({}, prevFields);
-            for (var key in values) {
-                if (Object.prototype.hasOwnProperty.call(values, key)) {
-                    var newValue = values[key];
-                    newFields[key] = __assign(__assign({}, newFields[key]), { value: newValue });
-                    // 验证字段
-                    var validation = validateField(key, newValue, ((_a = newFields[key]) === null || _a === void 0 ? void 0 : _a.rules) || []);
-                    if (validation) {
-                        if (validation.type === 'error') {
-                            newFields[key] = __assign(__assign({}, newFields[key]), { error: validation.message, warning: undefined // Clear any previous warnings
-                             });
-                        }
-                        else if (validation.type === 'warning') {
-                            newFields[key] = __assign(__assign({}, newFields[key]), { warning: validation.message, error: undefined // Clear any previous errors
-                             });
-                        }
+        var _a;
+        formFieldsRef.current = __assign({}, formFieldsRef.current); // Create a new object
+        for (var key in values) {
+            if (Object.prototype.hasOwnProperty.call(values, key)) {
+                var newValue = values[key];
+                formFieldsRef.current[key] = __assign(__assign({}, formFieldsRef.current[key]), { value: newValue });
+                // 验证字段
+                var validation = validateField(key, newValue, ((_a = formFieldsRef.current[key]) === null || _a === void 0 ? void 0 : _a.rules) || []);
+                if (validation) {
+                    if (validation.type === 'error') {
+                        formFieldsRef.current[key] = __assign(__assign({}, formFieldsRef.current[key]), { error: validation.message, warning: undefined // Clear any previous warnings
+                         });
                     }
-                    else {
-                        newFields[key] = __assign(__assign({}, newFields[key]), { error: undefined, warning: undefined });
+                    else if (validation.type === 'warning') {
+                        formFieldsRef.current[key] = __assign(__assign({}, formFieldsRef.current[key]), { warning: validation.message, error: undefined // Clear any previous errors
+                         });
                     }
                 }
+                else {
+                    formFieldsRef.current[key] = __assign(__assign({}, formFieldsRef.current[key]), { error: undefined, warning: undefined });
+                }
             }
-            return newFields;
-        });
-    }, [formFields, validateField]);
+        }
+        forceUpdate({}); // Trigger re-render
+    }, [validateField]);
     // 获取字段值
     var getFieldsValue = useCallback(function (names) {
         if (!names) {
-            return Object.keys(formFields).reduce(function (acc, key) {
-                acc[key] = formFields[key].value;
+            return Object.keys(formFieldsRef.current).reduce(function (acc, key) {
+                acc[key] = formFieldsRef.current[key].value;
                 return acc;
             }, {});
         }
         return names.reduce(function (acc, key) {
             var _a;
-            acc[key] = (_a = formFields[key]) === null || _a === void 0 ? void 0 : _a.value;
+            acc[key] = (_a = formFieldsRef.current[key]) === null || _a === void 0 ? void 0 : _a.value;
             return acc;
         }, {});
-    }, [formFields]);
+    }, []);
     // 重置字段
     var resetFields = useCallback(function (names) {
-        setFormFields(function (prevFields) {
-            var newFields = __assign({}, prevFields);
-            if (names) {
-                names.forEach(function (name) {
-                    if (newFields[name]) {
-                        newFields[name].value = initialValues[name] || '';
-                        newFields[name].error = undefined;
-                        newFields[name].warning = undefined;
-                    }
-                });
-            }
-            else {
-                Object.keys(newFields).forEach(function (key) {
-                    newFields[key].value = initialValues[key] || '';
-                    newFields[key].error = undefined;
-                    newFields[key].warning = undefined;
-                });
-            }
-            return newFields;
-        });
-    }, [formFields, initialValues]);
+        formFieldsRef.current = __assign({}, formFieldsRef.current); // Create a new object
+        if (names) {
+            names.forEach(function (name) {
+                if (formFieldsRef.current[name]) {
+                    formFieldsRef.current[name].value = initialValues[name] || '';
+                    formFieldsRef.current[name].error = undefined;
+                    formFieldsRef.current[name].warning = undefined;
+                }
+            });
+        }
+        else {
+            Object.keys(formFieldsRef.current).forEach(function (key) {
+                formFieldsRef.current[key].value = initialValues[key] || '';
+                formFieldsRef.current[key].error = undefined;
+                formFieldsRef.current[key].warning = undefined;
+            });
+        }
+        forceUpdate({}); // Trigger re-render
+    }, [initialValues]);
     var validateFields = useCallback(function (names) {
         return new Promise(function (resolve, reject) {
-            var fieldsToValidate = names || Object.keys(formFields);
+            var fieldsToValidate = names || Object.keys(formFieldsRef.current);
             var values = getFieldsValue(fieldsToValidate);
             var errors = {};
             for (var _i = 0, fieldsToValidate_1 = fieldsToValidate; _i < fieldsToValidate_1.length; _i++) {
                 var key = fieldsToValidate_1[_i];
-                var field = formFields[key];
+                var field = formFieldsRef.current[key];
                 if (!field)
                     continue; // Skip if field is not registered
                 var validation = validateField(key, values[key], field.rules || []);
@@ -162,55 +154,49 @@ var FormProvider = function (_a, ref) {
                 }
             }
             if (Object.keys(errors).length > 0) {
-                setFormFields(function (prevFields) {
-                    var newFields = __assign({}, prevFields);
-                    for (var key in errors) {
-                        newFields[key] = __assign(__assign({}, newFields[key]), { error: errors[key] });
-                    }
-                    return newFields;
-                });
+                formFieldsRef.current = __assign({}, formFieldsRef.current); // Create a new object
+                for (var key in errors) {
+                    formFieldsRef.current[key] = __assign(__assign({}, formFieldsRef.current[key]), { error: errors[key] });
+                }
+                forceUpdate({}); // Trigger re-render
                 reject(errors);
             }
             else {
                 resolve(values);
             }
         });
-    }, [formFields, getFieldsValue, validateField]);
+    }, [getFieldsValue, validateField]);
     var setFieldsStatus = useCallback(function (status) {
-        setFormFields(function (prevFields) {
-            var newFields = __assign({}, prevFields);
-            status.forEach(function (_a) {
-                var type = _a.type, name = _a.name, message = _a.message;
-                if (Array.isArray(name)) {
-                    name.forEach(function (n) {
-                        if (newFields[n]) {
-                            // Only update if field exists
-                            if (type === 'error') {
-                                newFields[n] = __assign(__assign({}, newFields[n]), { error: message });
-                            }
-                            else if (type === 'warning') {
-                                newFields[n] = __assign(__assign({}, newFields[n]), { warning: message });
-                            }
-                        }
-                    });
-                }
-                else {
-                    if (newFields[name]) {
+        formFieldsRef.current = __assign({}, formFieldsRef.current); // Create a new object
+        status.forEach(function (_a) {
+            var type = _a.type, name = _a.name, message = _a.message;
+            if (Array.isArray(name)) {
+                name.forEach(function (n) {
+                    if (formFieldsRef.current[n]) {
                         // Only update if field exists
                         if (type === 'error') {
-                            newFields[name] = __assign(__assign({}, newFields[name]), { error: message });
+                            formFieldsRef.current[n] = __assign(__assign({}, formFieldsRef.current[n]), { error: message });
                         }
                         else if (type === 'warning') {
-                            newFields[name] = __assign(__assign({}, newFields[name]), { warning: message });
+                            formFieldsRef.current[n] = __assign(__assign({}, formFieldsRef.current[n]), { warning: message });
                         }
                     }
+                });
+            }
+            else {
+                if (formFieldsRef.current[name]) {
+                    // Only update if field exists
+                    if (type === 'error') {
+                        formFieldsRef.current[name] = __assign(__assign({}, formFieldsRef.current[name]), { error: message });
+                    }
+                    else if (type === 'warning') {
+                        formFieldsRef.current[name] = __assign(__assign({}, formFieldsRef.current[name]), { warning: message });
+                    }
                 }
-            });
-            return newFields;
+            }
         });
-    }, [formFields]);
-    // 暴露给外部的方法
-    useImperativeHandle(ref, function () { return (__assign({}, formInstanceRef.current)); });
+        forceUpdate({}); // Trigger re-render
+    }, []);
     formInstanceRef.current = {
         setFieldsValue: setFieldsValue,
         getFieldsValue: getFieldsValue,
@@ -220,7 +206,9 @@ var FormProvider = function (_a, ref) {
         registerField: registerField,
         unregisterField: unregisterField
     };
-    return (jsx(FormContext.Provider, __assign({ value: { form: formInstanceRef.current, formFields: formFields } }, { children: children })));
+    // 暴露给外部的方法
+    useImperativeHandle(ref, function () { return (__assign({}, formInstanceRef.current)); });
+    return (jsx(FormContext.Provider, __assign({ value: { form: formInstanceRef.current, formFields: formFieldsRef.current } }, { children: children })));
 };
 var FormProvider$1 = forwardRef(FormProvider);
 

package/es/Input/Input.js

@@ -2,7 +2,6 @@ import { __rest, __assign } from '../node_modules/tslib/tslib.es6.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { useState } from 'react';
 import classNames from 'classnames';
-import './input.css.js';
 import { Icon } from '../Icon/index.js';
 
 var Input = function (_a) {
@@ -11,12 +10,13 @@ var Input = function (_a) {
 };
 var SearchInput = function (_a) {
     var onSearch = _a.onSearch, rest = __rest(_a, ["onSearch"]);
+    var _b = useState(rest.value || ''), value = _b[0], setValue = _b[1];
     var handleSearch = function () {
         if (onSearch) {
-            onSearch(rest.value);
+            onSearch(value);
         }
     };
-    return (jsx(Input, __assign({}, rest, { addonAfter: jsx("div", __assign({ style: { display: 'flex' }, onClick: handleSearch }, { children: jsx(Icon, { name: "SearchOutlined" }) })) })));
+    return (jsx(Input, __assign({}, rest, { onChange: function (e) { return setValue(e.target.value); }, addonAfter: jsx("div", __assign({ style: { display: 'flex' }, onClick: handleSearch }, { children: jsx(Icon, { name: "SearchOutlined" }) })) })));
 };
 var PasswordInput = function (props) {
     var _a = useState(false), visible = _a[0], setVisible = _a[1];

package/es/Menu/Menu.js

@@ -2,7 +2,6 @@ import { __assign, __spreadArray } from '../node_modules/tslib/tslib.es6.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { useState } from 'react';
 import { Icon } from '../Icon/index.js';
-import './menu.css.js';
 
 var getItem = function (label, key, icon, children, type) {
     return {

package/es/Modal/Modal.js

@@ -1,17 +1,73 @@
-import { __assign } from '../node_modules/tslib/tslib.es6.js';
+import { __assign, __awaiter, __generator } from '../node_modules/tslib/tslib.es6.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
+import { useState } from 'react';
 import { Icon } from '../Icon/index.js';
 import { createRoot } from 'react-dom/client';
 import { Modal as Modal$1 } from './ModalTemp.js';
 import { Button } from '../Button/Button.js';
-import './modal.css.js';
 
 var ModalContent = function (_a) {
     var title = _a.title, onCancel = _a.onCancel, _b = _a.onCancelText, onCancelText = _b === void 0 ? undefined : _b, onOk = _a.onOk, _c = _a.onOkText, onOkText = _c === void 0 ? undefined : _c, children = _a.children, _d = _a.width, width = _d === void 0 ? '400px' : _d;
+    var _e = useState(false), loading = _e[0], setLoading = _e[1];
+    var _f = useState(false), cancelLoading = _f[0], setCancelLoading = _f[1];
+    var handleOk = function () { return __awaiter(void 0, void 0, void 0, function () {
+        var result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!onOk) return [3 /*break*/, 6];
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, , 5, 6]);
+                    result = onOk();
+                    if (!(result instanceof Promise)) return [3 /*break*/, 3];
+                    setLoading(true);
+                    return [4 /*yield*/, result];
+                case 2:
+                    _a.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    onOk();
+                    _a.label = 4;
+                case 4: return [3 /*break*/, 6];
+                case 5:
+                    setLoading(false);
+                    return [7 /*endfinally*/];
+                case 6: return [2 /*return*/];
+            }
+        });
+    }); };
+    var handleCancel = function () { return __awaiter(void 0, void 0, void 0, function () {
+        var result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!onCancel) return [3 /*break*/, 6];
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, , 5, 6]);
+                    result = onCancel();
+                    if (!(result instanceof Promise)) return [3 /*break*/, 3];
+                    setCancelLoading(true);
+                    return [4 /*yield*/, result];
+                case 2:
+                    _a.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    onCancel();
+                    _a.label = 4;
+                case 4: return [3 /*break*/, 6];
+                case 5:
+                    setCancelLoading(false);
+                    return [7 /*endfinally*/];
+                case 6: return [2 /*return*/];
+            }
+        });
+    }); };
     return (jsxs("div", __assign({ className: "foxit-modal-content-container", style: {
             maxWidth: width,
             width: width
-        } }, { children: [jsxs("div", __assign({ className: "foxit-modal-head" }, { children: [jsx("div", __assign({ className: "foxit-modal-title" }, { children: title })), jsx("div", __assign({ onClick: onCancel, className: "foxit-modal-close-button" }, { children: jsx(Icon, { name: "CloseOutlined" }) }))] })), jsx("div", { children: children }), jsxs("div", __assign({ className: "foxit-modal-footer" }, { children: [onCancelText && (jsx(Button, __assign({ size: "medium", onClick: onCancel }, { children: onCancelText }))), onOkText && (jsx(Button, __assign({ primary: true, size: "medium", onClick: onOk }, { children: onOkText })))] }))] })));
+        } }, { children: [jsxs("div", __assign({ className: "foxit-modal-head" }, { children: [jsx("div", __assign({ className: "foxit-modal-title" }, { children: title })), jsx("div", __assign({ onClick: onCancel, className: "foxit-modal-close-button" }, { children: jsx(Icon, { name: "CloseOutlined" }) }))] })), jsx("div", { children: children }), jsxs("div", __assign({ className: "foxit-modal-footer" }, { children: [onCancelText && (jsx(Button, __assign({ size: "medium", onClick: handleCancel, loading: cancelLoading }, { children: onCancelText }))), onOkText && (jsx(Button, __assign({ primary: true, size: "medium", onClick: handleOk, loading: loading }, { children: onOkText })))] }))] })));
 };
 var Modal = function (_a) {
     var title = _a.title, opened = _a.opened, onOk = _a.onOk, onOkText = _a.onOkText, onCancel = _a.onCancel, onCancelText = _a.onCancelText, maskClosable = _a.maskClosable, children = _a.children, width = _a.width;
@@ -25,15 +81,43 @@ Modal.confirm = function (_a) {
     var root = createRoot(modalRoot);
     var handleClose = function () {
         root.unmount();
-        document.body.removeChild(modalRoot);
+        if (document.body.contains(modalRoot)) {
+            document.body.removeChild(modalRoot);
+        }
     };
-    root.render(jsx(Modal$1, __assign({ opened: true, onClose: handleClose, maskClosable: maskClosable, position: "top" }, { children: jsx(ModalContent, __assign({ title: title, width: width, onCancel: function () {
-                onCancel === null || onCancel === void 0 ? void 0 : onCancel();
-                handleClose();
-            }, onCancelText: onCancelText, onOk: function () {
-                onOk === null || onOk === void 0 ? void 0 : onOk();
-                handleClose();
-            }, onOkText: onOkText }, { children: content })) })));
+    root.render(jsx(Modal$1, __assign({ opened: true, onClose: handleClose, maskClosable: maskClosable, position: "top" }, { children: jsx(ModalContent, __assign({ title: title, width: width, onCancel: onCancel instanceof Function && onCancel.constructor.name === 'AsyncFunction'
+                ? function () { return __awaiter(void 0, void 0, void 0, function () {
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0: return [4 /*yield*/, onCancel()];
+                            case 1:
+                                _a.sent();
+                                handleClose();
+                                return [2 /*return*/];
+                        }
+                    });
+                }); }
+                : function () {
+                    onCancel === null || onCancel === void 0 ? void 0 : onCancel();
+                    handleClose();
+                }, onCancelText: onCancelText, onOk: 
+            // 判断传进来的onOk是否为async函数
+            onOk instanceof Function && onOk.constructor.name === 'AsyncFunction'
+                ? function () { return __awaiter(void 0, void 0, void 0, function () {
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0: return [4 /*yield*/, onOk()];
+                            case 1:
+                                _a.sent();
+                                handleClose();
+                                return [2 /*return*/];
+                        }
+                    });
+                }); }
+                : function () {
+                    onOk === null || onOk === void 0 ? void 0 : onOk();
+                    handleClose();
+                }, onOkText: onOkText }, { children: content })) })));
 };
 
 export { Modal };

package/es/Modal/ModalTemp.js

@@ -4,7 +4,6 @@ import { useState, useEffect, useRef } from 'react';
 import { CSSTransition } from 'react-transition-group';
 import { createPortal } from 'react-dom';
 import classNames from 'classnames';
-import './modal.css.js';
 
 var contentAnimation = {
     enter: 'foxit-modal-opacity-0 foxit-modal-scale-0',
@@ -24,6 +23,10 @@ var Portal = function (_a) {
     useEffect(function () {
         var _a, _b;
         (_b = (_a = document === null || document === void 0 ? void 0 : document.body) === null || _a === void 0 ? void 0 : _a.appendChild) === null || _b === void 0 ? void 0 : _b.call(_a, container);
+        return function () {
+            var _a, _b;
+            (_b = (_a = document === null || document === void 0 ? void 0 : document.body) === null || _a === void 0 ? void 0 : _a.removeChild) === null || _b === void 0 ? void 0 : _b.call(_a, container);
+        };
     }, [container]);
     return createPortal(children, container);
 };

package/es/Pagination/Pagination.d.ts

@@ -5,6 +5,7 @@ interface PaginationProps {
     pageSize: number;
     onChange?: (page: number) => void;
     defaultCurrent?: number;
+    current?: number;
 }
 declare const Pagination: React.FC<PaginationProps>;
 export default Pagination;