@gm-pc/react 1.24.7-beta.7 → 1.24.7-beta.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-pc/react",
-  "version": "1.24.7-beta.7",
+  "version": "1.24.7-beta.9",
   "description": "观麦前端基础组件库",
   "author": "liyatang <liyatang@qq.com>",
   "homepage": "https://github.com/gmfe/gm-pc#readme",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@gm-common/hooks": "^2.10.0",
     "@gm-common/tool": "^2.10.0",
-    "@gm-pc/locales": "^1.24.7-beta.7",
+    "@gm-pc/locales": "^1.24.7-beta.9",
     "big.js": "^6.0.1",
     "classnames": "^2.2.5",
     "lodash": "^4.17.19",
@@ -48,5 +48,5 @@
     "react-router-dom": "^5.2.0",
     "react-window": "^1.8.5"
   },
-  "gitHead": "58b7be53ccb4e7c4eeceb175a82fc3c4a05ffe9a"
+  "gitHead": "b83d17168b78de9248fccce1fb6b7afa6ac4f5a3"
 }

package/src/component/dialog/confirm.tsx

@@ -10,6 +10,10 @@ import { Button } from '../button'
 interface InnerProps extends ConfirmProps {
   resolve: any
   reject: any
+  /**
+   * @deprecated
+   * 这个没用
+   * */
   confirmLoading?: boolean
 }
 
@@ -22,28 +26,42 @@ const Inner: FC<InnerProps> = ({
   resolve,
   reject,
   confirmLoading,
+  onOk,
+  onCancel,
 }) => {
   const [checked, setChecked] = useState<boolean>(false)
 
   const readText = _.isString(read) ? read : getLocale('我已阅读以上提示，确认删除')
+  const [loading, setLoading] = useState<boolean>(false)
+
+  const handleOk = async () => {
+    const fn = onOk || resolve
+    try {
+      setLoading(true)
+      await fn()
+      Dialog.hide()
+    } finally {
+      setLoading(false)
+    }
+  }
 
   const buttons: DialogButtonProps[] = [
     {
       text: cancelBtnText || getLocale('取消'),
       btnType: 'default',
       onClick() {
-        reject(new Error('cancel'))
+        const fn = onCancel || reject
+
+        fn(new Error('cancel'))
+
         Dialog.hide()
       },
     },
     {
       text: okBtnText || getLocale('确定'),
       btnType: okBtnType || 'primary',
-      onClick() {
-        resolve()
-        Dialog.hide()
-      },
-      loading: confirmLoading,
+      onClick: handleOk,
+      loading: loading,
       disabled: read ? !checked : false,
     },
   ]
@@ -64,9 +82,8 @@ const Inner: FC<InnerProps> = ({
             key={btn.text}
             type={btn.btnType}
             disabled={btn.disabled}
-            onClick={() => {
-              btn.onClick()
-            }}
+            onClick={() => btn.onClick()}
+            loading={btn.loading}
             className='gm-margin-left-10'
           >
             {btn.text}

package/src/component/dialog/types.ts

@@ -43,6 +43,8 @@ interface ConfirmProps extends SpecificDialogProps {
   /** 阅读提示 */
   read?: boolean | string
   confirmLoading?: boolean
+  onOk: () => any
+  onCancel: (error: any) => any
 }
 
 interface PromptProps extends ConfirmProps, ConfigProviderProps {

package/src/component/form/form_group.tsx

@@ -129,10 +129,17 @@ const FormGroup: FC<FormGroupProps> = ({
 export default FormGroup
 
 type ActionProps = Omit<FormGroupProps, 'formRefs' | 'onSubmitValidated' | 'onSubmit'> & {
-  onSubmit?(event: BaseSyntheticEvent): void
+  onSubmit?(event: BaseSyntheticEvent): Promise<void> | void
 }
 
 const Action: FC<ActionProps> = ({ onCancel, onSubmit, disabled, saveText, actions }) => {
+  const [loading, setLoading] = useState(false)
+
+  const handleClick = (e: BaseSyntheticEvent) => {
+    setLoading(true)
+    Promise.resolve(onSubmit?.(e)).finally(() => setLoading(false))
+  }
+
   return (
     <>
       {onCancel && (
@@ -141,7 +148,7 @@ const Action: FC<ActionProps> = ({ onCancel, onSubmit, disabled, saveText, actio
           <div className='gm-gap-10' />
         </>
       )}
-      <Button type='primary' disabled={disabled} onClick={onSubmit}>
+      <Button type='primary' disabled={disabled} loading={loading} onClick={handleClick}>
         {saveText || getLocale('确定')}
       </Button>
       {actions}