@gm-pc/react 1.24.7-beta.6 → 1.24.7-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-pc/react",
-  "version": "1.24.7-beta.6",
+  "version": "1.24.7-beta.8",
   "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.6",
+    "@gm-pc/locales": "^1.24.7-beta.8",
     "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": "c762f1339236ce80bc519f8acf1d6d7f9f00cc52"
+  "gitHead": "3f0df53aec9bd33fac253c45126a45826e7364e6"
 }

package/src/component/dialog/dialog.tsx

@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import React, { FC, useState } from 'react'
 import { DialogProps, DialogStatic } from './types'
 import { getLocale } from '@gm-pc/locales'
 import _ from 'lodash'
@@ -15,6 +15,7 @@ const Dialog: FC<DialogProps> & DialogStatic = ({
   onHide = () => Dialog.hide(),
   children,
 }) => {
+  const [loading, setLoading] = useState(false)
   return (
     <Modal
       title={title}
@@ -26,20 +27,28 @@ const Dialog: FC<DialogProps> & DialogStatic = ({
       <div>{children}</div>
       {buttons && (
         <Flex justifyEnd className='gm-dialog-buttons gm-margin-top-10'>
-          {_.map(buttons, (btn) => (
-            <Button
-              loading={btn.loading}
-              key={btn.text}
-              type={btn.btnType}
-              disabled={btn.disabled}
-              onClick={() => {
-                btn.onClick()
-              }}
-              className='gm-margin-left-10'
-            >
-              {btn.text}
-            </Button>
-          ))}
+          {_.map(buttons, (btn) => {
+            const isPrimary = btn.btnType === 'primary' || btn.btnType === 'danger'
+
+            return (
+              <Button
+                loading={btn.loading || (isPrimary && loading)}
+                key={btn.text}
+                type={btn.btnType}
+                disabled={btn.disabled}
+                onClick={() => {
+                  setLoading(true)
+                  // console.log('btn.onClick', btn.onClick())
+                  Promise.resolve(btn.onClick()).finally(() => {
+                    setLoading(false)
+                  })
+                }}
+                className='gm-margin-left-10'
+              >
+                {btn.text}
+              </Button>
+            )
+          })}
         </Flex>
       )}
     </Modal>

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}