@pointcloud/pcloud-components 1.0.2 → 1.0.3

package/dist/esm/AnimatedScrollList/index.js

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import React, { useRef, useEffect, useCallback, useContext } from 'react';
+import React, { useRef, useEffect, useCallback, useContext, useMemo } from 'react';
 import classNames from 'classnames';
 import { ConfigContext } from "../ConfigProvider";
 import "./styles/index.less";
@@ -286,19 +286,23 @@ function AnimatedScrollList(props) {
   }, [data, renderItem, getItemKey]);
 
   // 容器样式
-  var containerStyle = _objectSpread({
-    height: containerHeight,
-    width: containerWidth,
-    overflow: showScrollbar ? 'auto' : 'hidden',
-    position: 'relative'
-  }, style);
+  var containerStyle = useMemo(function () {
+    return _objectSpread({
+      height: containerHeight,
+      width: containerWidth,
+      overflow: showScrollbar ? 'auto' : 'hidden',
+      position: 'relative'
+    }, style);
+  }, [containerHeight, containerWidth, showScrollbar, style]);
 
   // 内容容器样式
-  var contentStyle = {
-    display: 'flex',
-    flexDirection: isVertical ? 'column' : 'row',
-    willChange: 'transform'
-  };
+  var contentStyle = useMemo(function () {
+    return {
+      display: 'flex',
+      flexDirection: isVertical ? 'column' : 'row',
+      willChange: 'transform'
+    };
+  }, [isVertical]);
   return /*#__PURE__*/_jsxs("div", {
     className: wrapperClass,
     children: [header && /*#__PURE__*/_jsx("div", {

package/dist/esm/CRUD/index.js

@@ -137,7 +137,7 @@ var forwardCRUD = /*#__PURE__*/forwardRef(function (props, ref) {
     return classNames(_defineProperty({
       fullscreen: fullScreen
     }, "".concat(prefixCls, "-crud"), !!prefixCls), classname, className);
-  }, [fullScreen]);
+  }, [fullScreen, prefixCls, classname, className]);
   var visible = useMemo(function () {
     return conditionVisible ? 'visible' : 'hidden';
   }, [conditionVisible]);
@@ -585,6 +585,14 @@ var forwardCRUD = /*#__PURE__*/forwardRef(function (props, ref) {
       }, modalFormProps === null || modalFormProps === void 0 ? void 0 : modalFormProps.formProps)
     };
   }, [modalConfig, detailData, handleCancel, handleModalOk, modalFormProps, classname]);
+  var onActions = useMemo(function () {
+    return {
+      setFullScreen: setFullScreen,
+      handleRefresh: handleRefresh,
+      onColumnSettingChanged: onColumnSettingChanged,
+      setConditionVisible: setConditionVisible
+    };
+  }, [setFullScreen, handleRefresh, onColumnSettingChanged, setConditionVisible]);
   useImperativeHandle(ref, function () {
     return {
       refresh: function refresh(strategy, refreshOptions) {
@@ -657,12 +665,7 @@ var forwardCRUD = /*#__PURE__*/forwardRef(function (props, ref) {
         fullScreen: fullScreen,
         conditionVisible: conditionVisible,
         columns: originalColumnsRef.current,
-        onActions: {
-          setFullScreen: setFullScreen,
-          handleRefresh: handleRefresh,
-          onColumnSettingChanged: onColumnSettingChanged,
-          setConditionVisible: setConditionVisible
-        }
+        onActions: onActions
       })]
     }), /*#__PURE__*/_jsx(DTable, _objectSpread(_objectSpread({
       ref: tableRef

package/dist/esm/CRUD/toolbar.js

@@ -1,7 +1,7 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { memo, useState, useRef, useEffect, useMemo } from 'react';
+import { memo, useState, useRef, useEffect, useMemo, useCallback } from 'react';
 import classNames from 'classnames';
 import { Popover, Checkbox, Button } from 'antd';
 import { ReloadOutlined, FullscreenOutlined, FullscreenExitOutlined, BarsOutlined, HolderOutlined, SearchOutlined } from '@ant-design/icons';
@@ -67,18 +67,18 @@ function Toolbar(_ref) {
       setRotating(false);
     }, 500);
   };
-  var handleConfirm = function handleConfirm() {
+  var handleConfirm = useCallback(function () {
     var _onActions$onColumnSe;
     setColumnSettingVisible(false);
     onActions === null || onActions === void 0 || (_onActions$onColumnSe = onActions.onColumnSettingChanged) === null || _onActions$onColumnSe === void 0 || _onActions$onColumnSe.call(onActions, columnSetting.checkedList, columnSetting.sortedColumns);
-  };
-  var handleReset = function handleReset() {
+  }, [columnSetting.checkedList, columnSetting.sortedColumns]);
+  var handleReset = useCallback(function () {
     setColumnSetting({
       sortedColumns: columns,
       checkedList: checkedValues
     });
-  };
-  var onCheckAllChange = function onCheckAllChange(e) {
+  }, [columns, checkedValues]);
+  var onCheckAllChange = useCallback(function (e) {
     var checked = e.target.checked;
     if (checked) {
       // 全选所有列标题
@@ -100,7 +100,7 @@ function Toolbar(_ref) {
         });
       });
     }
-  };
+  }, [columns]);
   useEffect(function () {
     return function () {
       if (timer.current) clearTimeout(timer.current);

package/dist/esm/DForm/DItem/index.d.ts

@@ -1,5 +1,6 @@
-/// <reference types="react" />
+import React from 'react';
 import { DItemProps } from './itemType';
 export type { DItemProps };
 declare function DItem(props: DItemProps): JSX.Element;
-export default DItem;
+declare const _default: React.MemoExoticComponent<typeof DItem>;
+export default _default;

package/dist/esm/DForm/DItem/index.js

@@ -1,6 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["formItemProps", "label", "name", "renderType", "render", "children"];
+import React from 'react';
 import itemsRender from "./itemsRender";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -33,4 +34,4 @@ function DItem(props) {
     return /*#__PURE__*/_jsx(_Fragment, {});
   }
 }
-export default DItem;
+export default /*#__PURE__*/React.memo(DItem);

package/dist/esm/DForm/DItem/itemType.d.ts

@@ -1,4 +1,4 @@
-import { HTMLAttributes, ReactNode } from 'react';
+import { ReactNode } from 'react';
 import { InputProps, InputNumberProps, AutoCompleteProps, CascaderProps, SelectProps, TreeSelectProps, DatePickerProps, TimePickerProps, MentionProps, CheckboxProps, RadioProps, RateProps, SliderSingleProps, SwitchProps, TransferProps, UploadProps, ButtonProps, DividerProps, FormItemProps, RadioGroupProps, ColProps } from 'antd';
 import { PasswordProps, TextAreaProps } from 'antd/lib/input';
 import { RangePickerProps } from 'antd/lib/date-picker';
@@ -10,21 +10,12 @@ import { DTreeSelectProps } from '../../DTreeSelect';
 import { DUploadProps } from '../../DUpload';
 import { IPAddressProps } from '../../IPAddress';
 import { DRangePickerProps } from '../../DRangePicker/interface';
-export type RenderType = 'custom' | 'dInput' | 'ipAddress' | 'input' | 'textArea' | 'password' | 'inputNumber' | 'autoComplete' | 'dSelect' | 'select' | 'dCascader' | 'cascader' | 'dTreeSelect' | 'treeSelect' | 'datePicker' | 'dRangePicker' | 'timePicker' | 'rangePicker' | 'mentions' | 'checkbox' | 'checkboxGroup' | 'radio' | 'radioGroup' | 'rate' | 'slider' | 'switch' | 'transfer' | 'upload' | 'dUpload' | 'button' | 'divider';
+export type RenderType = 'custom' | 'other' | 'dInput' | 'ipAddress' | 'input' | 'textArea' | 'password' | 'inputNumber' | 'autoComplete' | 'dSelect' | 'select' | 'dCascader' | 'cascader' | 'dTreeSelect' | 'treeSelect' | 'datePicker' | 'dRangePicker' | 'timePicker' | 'rangePicker' | 'mentions' | 'checkbox' | 'checkboxGroup' | 'radio' | 'radioGroup' | 'rate' | 'slider' | 'switch' | 'transfer' | 'upload' | 'dUpload' | 'button' | 'divider';
 export type DItemBaseProps = Pick<FormItemProps, 'label' | 'name'> & {
     formItemProps?: FormItemProps & {
         grid?: Omit<ColProps, 'prefixCls'>;
     };
 };
-/** 自定义渲染的DItem */
-type CustomItemProps = DItemBaseProps & HTMLAttributes<HTMLElement> & {
-    /** 渲染类型 */
-    renderType?: 'custom' | 'other';
-    /** 自定义渲染函数 */
-    render?: (props: any, formItemProps: FormItemProps, allProps?: DItemProps) => ReactNode;
-    children?: ReactNode;
-    [key: string]: any;
-};
 export type DInputItemProps = {
     renderType?: 'dInput';
 } & DItemBaseProps & DInputProps;
@@ -115,5 +106,12 @@ export type ButtonItemProps = {
 export type DividerItemProps = {
     renderType?: 'divider';
 } & DItemBaseProps & DividerProps;
-export type DItemProps = CustomItemProps | DInputItemProps | DIpAddressProps | InputItemProps | TextAreaItemProps | PasswordItemProps | InputNumberItemProps | AutoCompleteItemProps | DSelectItemProps | SelectItemProps | DCascaderItemProps | CascaderItemProps | DTreeSelectItemProps | TreeSelectItemProps | DatePickerItemProps | TimePickerItemProps | RangePickerItemProps | DRangePickerItemProps | MentionItemProps | CheckboxItemProps | CheckboxGroupProps | DCheckboxGroupProps | RadioItemProps | RadioGroupProps | DRadioGorupProps | RateItemProps | SliderItemProps | SwitchItemProps | TransferItemProps | UploadItemProps | DUploadItemProps | ButtonItemProps | DividerItemProps;
-export {};
+export type DItemProps = {
+    renderType?: RenderType;
+    formItemProps?: FormItemProps & {
+        grid?: Omit<ColProps, 'prefixCls'>;
+    };
+    children?: ReactNode;
+    render?: any;
+    [key: string]: any;
+};

package/dist/esm/DForm/index.js

@@ -10,7 +10,7 @@ var _excluded = ["className", "defaultItemProps", "items", "children", "layout",
  * @Description  : 基于antd的Form组件
  */
 
-import React, { forwardRef, useContext, useState, useEffect, useImperativeHandle } from 'react';
+import React, { forwardRef, useContext, useState, useMemo, useEffect, useImperativeHandle } from 'react';
 import { Form, Row, Col } from 'antd';
 import { ConfigContext } from "../ConfigProvider";
 import helper from "./helper";
@@ -69,13 +69,16 @@ function InternalForm(props, ref) {
     getPrefixCls = _useContext.getPrefixCls;
   var _className = "".concat(getPrefixCls('form'), " ").concat(className, " ").concat(['inlineVertical', 'grid'].includes(layout) ? 'inlineVertical' : '');
   var _layout = ['inlineVertical', 'grid'].includes(layout) ? 'inline' : layout;
-  var _useState = useState(getChildren(items, children, defaultItemProps, layout)),
+  var propsDerivedChildren = useMemo(function () {
+    return getChildren(items, children, defaultItemProps, layout);
+  }, [items, children, defaultItemProps, layout]);
+  var _useState = useState(propsDerivedChildren),
     _useState2 = _slicedToArray(_useState, 2),
     itemChildren = _useState2[0],
     setItemChildren = _useState2[1];
   useEffect(function () {
-    setItemChildren(getChildren(items, children, defaultItemProps, layout));
-  }, [items, children, defaultItemProps, layout]);
+    setItemChildren(propsDerivedChildren);
+  }, [propsDerivedChildren]);
   useImperativeHandle(ref, function () {
     return {
       setItems: function setItems(value) {
@@ -93,7 +96,7 @@ function InternalForm(props, ref) {
         }
       }
     };
-  }, [items, children, defaultItemProps]);
+  }, [items, children, defaultItemProps, layout]);
   return /*#__PURE__*/_jsx(Form, _objectSpread(_objectSpread({}, otherProps), {}, {
     className: _className,
     layout: _layout,

package/dist/esm/DInput/index.js

@@ -9,7 +9,7 @@ var _excluded = ["className", "onChange", "onCompositionStart", "onCompositionEn
  * @LastEditTime : 2023-08-16 16:48:52
  * @Description  : 基于antd的Input组件
  */
-import React, { useRef, forwardRef, useState, useEffect, useContext } from 'react';
+import React, { useRef, forwardRef, useState, useEffect, useContext, useCallback } from 'react';
 import { Input } from 'antd';
 import { ConfigContext } from "../ConfigProvider";
 
@@ -53,7 +53,7 @@ function InternalInput(props, ref) {
 
   // debounce: 默认800ms，false或0表示不开启
   var _debounce = getDebounceTime(debounce);
-  var emitChange = function emitChange(_value, e) {
+  var emitChange = useCallback(function (_value, e) {
     if (_debounce > 0) {
       clearTimeout(debounceRef.current);
       debounceRef.current = setTimeout(function () {
@@ -62,7 +62,7 @@ function InternalInput(props, ref) {
     } else {
       onChange === null || onChange === void 0 || onChange(_value, e);
     }
-  };
+  }, [_debounce, onChange]);
 
   // 监听用户onChange事件（如果正在进行合成输入，则不响应用户事件）
   var _onChange = function _onChange(e) {
@@ -88,6 +88,14 @@ function InternalInput(props, ref) {
   useEffect(function () {
     return setValue(initValue);
   }, [initValue]);
+  useEffect(function () {
+    return function () {
+      if (debounceRef.current) {
+        clearTimeout(debounceRef.current);
+        debounceRef.current = null;
+      }
+    };
+  }, []);
   return /*#__PURE__*/_jsx(Input, _objectSpread(_objectSpread({}, otherProps), {}, {
     className: _className,
     ref: ref,

package/dist/esm/DModal/index.js

@@ -14,16 +14,16 @@ function DModal(props) {
     otherProps = _objectWithoutProperties(props, _excluded);
   var _useContext = useContext(ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
-  var containerRef = useRef();
+  var containerRef = useRef(null);
   var style = useMemo(function () {
     var _otherProps$style;
     return _objectSpread({
-      getContainer: containerRef.current,
+      getContainer: containerRef.current || document.body,
       width: ((_otherProps$style = otherProps.style) === null || _otherProps$style === void 0 ? void 0 : _otherProps$style.width) || '80%',
       centered: true,
       maskClosable: false
     }, otherProps);
-  }, [otherProps]);
+  }, [otherProps.open, otherProps.title, otherProps.wrapClassName, otherProps.style, otherProps.centered, otherProps.width, otherProps.zIndex]);
   useEffect(function () {
     if (otherProps.open) {
       document.body.style.overflow = 'hidden';
@@ -35,17 +35,24 @@ function DModal(props) {
     };
   }, [otherProps.open]);
   useEffect(function () {
-    if (containerRef.current) {
-      if (mode === 'absolute') {
-        containerRef.current.parentElement.style.position = '';
+    var _containerRef$current;
+    var parentElement = (_containerRef$current = containerRef.current) === null || _containerRef$current === void 0 ? void 0 : _containerRef$current.parentElement;
+    if (parentElement) {
+      if (mode === 'absolute' || mode === 'fixed' || mode === 'panel') {
+        parentElement.style.position = '';
       } else {
-        containerRef.current.parentElement.style.position = 'relative';
+        parentElement.style.position = 'relative';
       }
     }
-  }, [mode, containerRef.current]);
+  }, [mode]);
+  var getContainerClass = function getContainerClass() {
+    if (mode === 'fixed') return 'fixed-modal-container';
+    if (mode === 'absolute' || mode === 'panel') return 'absolute-modal-container';
+    return 'relative-modal-container';
+  };
   return /*#__PURE__*/_jsx("div", {
     ref: containerRef,
-    className: "".concat(getPrefixCls('modal-container'), " ").concat(getPrefixCls(mode === 'absolute' || mode === 'panel' ? 'absolute-modal-container' : 'relative-modal-container')),
+    className: "".concat(getPrefixCls('modal-container'), " ").concat(getPrefixCls(getContainerClass())),
     children: /*#__PURE__*/_jsx(Modal, _objectSpread(_objectSpread({}, style), {}, {
       children: children
     }))

package/dist/esm/DModal/interface.d.ts

@@ -3,6 +3,6 @@ import type { ModalProps } from 'antd';
 type IModalProps = Omit<ModalProps, 'className'>;
 export interface DModalProps extends IModalProps {
     children?: ReactNode | undefined;
-    mode?: 'absolute' | 'relative' | 'panel';
+    mode?: 'absolute' | 'relative' | 'panel' | 'fixed';
 }
 export {};

package/dist/esm/DModal/styles/index.less

@@ -1,27 +1,33 @@
-@import '../../commonStyle/index.less';
-
-.@{prefix}-modal-container {
-  .ant-modal-wrap {
-    .ant-modal {
-      max-width: unset;
-      height: 100%;
-
-      .ant-modal-content {
-        width: 100%;
-        height: 100%;
-      }
-    }
-  }
-}
-
-.@{prefix}-absolute-modal-container {
-  .ant-modal-wrap {
-    position: fixed;
-  }
-}
-
-.@{prefix}-relative-modal-container {
-  .ant-modal-wrap {
-    position: absolute;
-  }
-}
+@import '../../commonStyle/index.less';
+
+.@{prefix}-modal-container {
+  .ant-modal-wrap {
+    .ant-modal {
+      max-width: unset;
+      height: 100%;
+
+      .ant-modal-content {
+        width: 100%;
+        height: 100%;
+      }
+    }
+  }
+}
+
+.@{prefix}-absolute-modal-container {
+  .ant-modal-wrap {
+    position: fixed;
+  }
+}
+
+.@{prefix}-fixed-modal-container {
+  .ant-modal-wrap {
+    position: fixed;
+  }
+}
+
+.@{prefix}-relative-modal-container {
+  .ant-modal-wrap {
+    position: absolute;
+  }
+}

package/dist/esm/DTable/index.js

@@ -9,7 +9,7 @@ var _excluded = ["loadMore", "defaultColumnProps", "actionColumn", "showErrorMsg
  * @LastEditTime : 2023-08-16 16:45:15
  * @Description  : 基于antd的Table组件
  */
-import React, { forwardRef, useEffect, useRef, useState, useContext, useMemo, useImperativeHandle } from 'react';
+import React, { forwardRef, useEffect, useRef, useState, useContext, useMemo, useImperativeHandle, useCallback } from 'react';
 import { message, Table } from 'antd';
 import { ConfigContext } from "../ConfigProvider";
 import "./index.less";
@@ -131,19 +131,19 @@ function InternalTable(props, ref) {
   // pcf-table 样式中已经包含对_scroll的支持
   var _className = "".concat(getPrefixCls('table'), " ").concat(className || '', " ").concat(_pagination ? 'height-on-page' : '');
 
-  // loading 默认延迟 600ms
+  // loading 默认延迟 300ms
   var _loading = useMemo(function () {
     return typeof loading === 'boolean' ? {
       spinning: loading,
-      delay: 500
+      delay: 300
     } : _objectSpread({
-      delay: 500,
+      delay: 300,
       spinning: false
     }, loading);
   }, [loading]);
 
   // 加载数据
-  var loadData = function loadData(params) {
+  var loadData = useCallback(function (params) {
     if (typeof loadMore === 'function') {
       setTableSource(_objectSpread(_objectSpread({}, tableSource), {}, {
         loading: true
@@ -165,9 +165,11 @@ function InternalTable(props, ref) {
           });
         }
       }).catch(function (err) {
-        setTableSource(_objectSpread(_objectSpread({}, tableSource), {}, {
-          loading: false
-        }));
+        setTableSource(function (prev) {
+          return _objectSpread(_objectSpread({}, prev), {}, {
+            loading: false
+          });
+        });
         if (showErrorMsg) {
           var _err$response;
           var errMsg = (err === null || err === void 0 || (_err$response = err.response) === null || _err$response === void 0 || (_err$response = _err$response.data) === null || _err$response === void 0 ? void 0 : _err$response.msg) || (err === null || err === void 0 ? void 0 : err.msg) || (err === null || err === void 0 ? void 0 : err.message);
@@ -185,16 +187,16 @@ function InternalTable(props, ref) {
         records: dataSource
       });
     }
-  };
+  }, [loadMore, dataSource, _pagination]);
 
   // 手动刷新方法
-  var refresh = function refresh(params) {
+  var refresh = useCallback(function (params) {
     var refreshParams = _objectSpread(_objectSpread({}, tableParams), params);
     loadData(refreshParams);
-  };
+  }, [tableParams, loadData]);
 
   // 监听分页大小变化,如果外部也监听了onChange，则不会触发loadMore，但如果外部onChange返回值为undefined则正常触loadMore
-  var onChange = function onChange(page, pageSize) {
+  var onChange = useCallback(function (page, pageSize) {
     if (_pagination && typeof (_pagination === null || _pagination === void 0 ? void 0 : _pagination.onChange) === 'function') {
       var data = _pagination.onChange(page, pageSize);
       if (data === undefined) loadData(_objectSpread(_objectSpread({}, tableParams), {}, {
@@ -207,7 +209,7 @@ function InternalTable(props, ref) {
         size: pageSize
       }));
     }
-  };
+  }, [tableParams, loadData, _pagination]);
   var _tablePagination = _pagination ? _objectSpread(_objectSpread({}, _pagination), {}, {
     total: tableSource.total,
     current: tableParams.current,

package/dist/esm/ModalForm/index.js

@@ -4,7 +4,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import DForm from "../DForm";
 import DModal from "../DModal";
-import { useEffect, useState, useMemo } from 'react';
+import { useEffect, useState, useMemo, useCallback } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export default (function (props) {
@@ -31,51 +31,46 @@ export default (function (props) {
   var modalFooter = !!(formProps !== null && formProps !== void 0 && formProps.disabled) ? {
     footer: null
   } : {};
-  var handleOk = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var values;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.prev = 0;
-            _context.next = 3;
-            return form.validateFields();
-          case 3:
-            values = _context.sent;
-            if (!onOk) {
-              _context.next = 8;
-              break;
-            }
-            // 如果外部没有提供loading状态，内部自动管理
-            if (modalProps.confirmLoading === undefined) {
-              setIsLoading(true);
-            }
+  var handleOk = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var values;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.prev = 0;
+          _context.next = 3;
+          return form.validateFields();
+        case 3:
+          values = _context.sent;
+          if (!onOk) {
             _context.next = 8;
-            return onOk === null || onOk === void 0 ? void 0 : onOk(values);
-          case 8:
-            _context.next = 14;
             break;
-          case 10:
-            _context.prev = 10;
-            _context.t0 = _context["catch"](0);
-            console.error('Form validation failed:', _context.t0);
-            onError === null || onError === void 0 || onError(_context.t0);
-          case 14:
-            _context.prev = 14;
-            if (modalProps.confirmLoading === undefined) {
-              setIsLoading(false);
-            }
-            return _context.finish(14);
-          case 17:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[0, 10, 14, 17]]);
-    }));
-    return function handleOk() {
-      return _ref2.apply(this, arguments);
-    };
-  }();
+          }
+          // 如果外部没有提供loading状态，内部自动管理
+          if (modalProps.confirmLoading === undefined) {
+            setIsLoading(true);
+          }
+          _context.next = 8;
+          return onOk === null || onOk === void 0 ? void 0 : onOk(values);
+        case 8:
+          _context.next = 14;
+          break;
+        case 10:
+          _context.prev = 10;
+          _context.t0 = _context["catch"](0);
+          console.error('Form validation failed:', _context.t0);
+          onError === null || onError === void 0 || onError(_context.t0);
+        case 14:
+          _context.prev = 14;
+          if (modalProps.confirmLoading === undefined) {
+            setIsLoading(false);
+          }
+          return _context.finish(14);
+        case 17:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[0, 10, 14, 17]]);
+  })), [form, modalProps.confirmLoading, onOk, onError]);
   useEffect(function () {
     if (open) {
       var _Object$keys;
@@ -90,7 +85,7 @@ export default (function (props) {
     } else {
       setIsLoading(false);
     }
-  }, [open, formProps.values]);
+  }, [open]);
   return /*#__PURE__*/_jsxs(DModal, _objectSpread(_objectSpread(_objectSpread({
     open: open,
     style: {