@gm-pc/react 1.25.0-beta.0 → 1.25.1-beta.0

package/src/component/dialog/alert.tsx

@@ -1,38 +1,38 @@
-import _ from 'lodash'
-import Dialog from './dialog'
-import { AlertProps } from './types'
-import { getLocale } from '@gm-pc/locales'
-
-const Alert = (props: string | AlertProps): Promise<void> => {
-  let p = props
-  if (!_.isObject(props)) {
-    p = {
-      children: props,
-    }
-  }
-
-  const { okBtnText, children, ...rest } = p as AlertProps
-
-  return new Promise((resolve, reject) => {
-    Dialog.render({
-      children,
-      buttons: [
-        {
-          text: okBtnText || getLocale('确定'),
-          btnType: 'primary',
-          onClick() {
-            resolve()
-            Dialog.hide()
-          },
-        },
-      ],
-      onHide: () => {
-        Dialog.hide()
-        reject(new Error('cancel'))
-      },
-      ...rest,
-    })
-  })
-}
-
-export default Alert
+import _ from 'lodash'
+import Dialog from './dialog'
+import { AlertProps } from './types'
+import { getLocale } from '@gm-pc/locales'
+
+const Alert = (props: string | AlertProps): Promise<void> => {
+  let p = props
+  if (!_.isObject(props)) {
+    p = {
+      children: props,
+    }
+  }
+
+  const { okBtnText, children, ...rest } = p as AlertProps
+
+  return new Promise((resolve, reject) => {
+    Dialog.render({
+      children,
+      buttons: [
+        {
+          text: okBtnText || getLocale('确定'),
+          btnType: 'primary',
+          onClick() {
+            resolve()
+            Dialog.hide()
+          },
+        },
+      ],
+      onHide: () => {
+        Dialog.hide()
+        reject(new Error('cancel'))
+      },
+      ...rest,
+    })
+  })
+}
+
+export default Alert

package/src/component/dialog/confirm.tsx

@@ -1,120 +1,120 @@
-import _ from 'lodash'
-import Dialog from './dialog'
-import { ConfirmProps, DialogButtonProps } from './types'
-import { getLocale } from '@gm-pc/locales'
-import React, { FC, useState } from 'react'
-import { Checkbox } from '@gm-pc/react/src/index'
-import { Flex } from '../flex'
-import { Button } from '../button'
-
-interface InnerProps extends ConfirmProps {
-  resolve: any
-  reject: any
-  /**
-   * @deprecated
-   * 这个没用
-   * */
-  confirmLoading?: boolean
-}
-
-const Inner: FC<InnerProps> = ({
-  children,
-  okBtnText,
-  okBtnType,
-  cancelBtnText,
-  read,
-  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() {
-        const fn = onCancel || reject
-
-        fn(new Error('cancel'))
-
-        Dialog.hide()
-      },
-    },
-    {
-      text: okBtnText || getLocale('确定'),
-      btnType: okBtnType || 'primary',
-      onClick: handleOk,
-      loading: loading,
-      disabled: read ? !checked : false,
-    },
-  ]
-
-  return (
-    <div>
-      {children}
-      {read && (
-        <div className='gm-margin-top-20'>
-          <Checkbox checked={checked} onChange={() => setChecked(!checked)}>
-            {readText}
-          </Checkbox>
-        </div>
-      )}
-      <Flex justifyEnd className='gm-dialog-buttons gm-margin-top-10'>
-        {_.map(buttons, (btn) => (
-          <Button
-            key={btn.text}
-            type={btn.btnType}
-            disabled={btn.disabled}
-            onClick={() => btn.onClick()}
-            loading={btn.loading}
-            className='gm-margin-left-10'
-          >
-            {btn.text}
-          </Button>
-        ))}
-      </Flex>
-    </div>
-  )
-}
-
-const Confirm = (props: string | ConfirmProps): Promise<void> => {
-  let p = props
-  if (!_.isObject(props)) {
-    p = {
-      children: props,
-    }
-  }
-
-  const newProps = p as ConfirmProps
-  const { children, okBtnText, cancelBtnText, read, ...rest } = newProps
-
-  return new Promise((resolve, reject) => {
-    Dialog.render({
-      children: <Inner {...newProps} reject={reject} resolve={resolve} />,
-      onHide: () => {
-        Dialog.hide()
-        reject(new Error('cancel'))
-      },
-      ...rest,
-    })
-  })
-}
-
-export default Confirm
+import _ from 'lodash'
+import Dialog from './dialog'
+import { ConfirmProps, DialogButtonProps } from './types'
+import { getLocale } from '@gm-pc/locales'
+import React, { FC, useState } from 'react'
+import { Checkbox } from '@gm-pc/react/src/index'
+import { Flex } from '../flex'
+import { Button } from '../button'
+
+interface InnerProps extends ConfirmProps {
+  resolve: any
+  reject: any
+  /**
+   * @deprecated
+   * 这个没用
+   * */
+  confirmLoading?: boolean
+}
+
+const Inner: FC<InnerProps> = ({
+  children,
+  okBtnText,
+  okBtnType,
+  cancelBtnText,
+  read,
+  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() {
+        const fn = onCancel || reject
+
+        fn(new Error('cancel'))
+
+        Dialog.hide()
+      },
+    },
+    {
+      text: okBtnText || getLocale('确定'),
+      btnType: okBtnType || 'primary',
+      onClick: handleOk,
+      loading: loading,
+      disabled: read ? !checked : false,
+    },
+  ]
+
+  return (
+    <div>
+      {children}
+      {read && (
+        <div className='gm-margin-top-20'>
+          <Checkbox checked={checked} onChange={() => setChecked(!checked)}>
+            {readText}
+          </Checkbox>
+        </div>
+      )}
+      <Flex justifyEnd className='gm-dialog-buttons gm-margin-top-10'>
+        {_.map(buttons, (btn) => (
+          <Button
+            key={btn.text}
+            type={btn.btnType}
+            disabled={btn.disabled}
+            onClick={() => btn.onClick()}
+            loading={btn.loading}
+            className='gm-margin-left-10'
+          >
+            {btn.text}
+          </Button>
+        ))}
+      </Flex>
+    </div>
+  )
+}
+
+const Confirm = (props: string | ConfirmProps): Promise<void> => {
+  let p = props
+  if (!_.isObject(props)) {
+    p = {
+      children: props,
+    }
+  }
+
+  const newProps = p as ConfirmProps
+  const { children, okBtnText, cancelBtnText, read, ...rest } = newProps
+
+  return new Promise((resolve, reject) => {
+    Dialog.render({
+      children: <Inner {...newProps} reject={reject} resolve={resolve} />,
+      onHide: () => {
+        Dialog.hide()
+        reject(new Error('cancel'))
+      },
+      ...rest,
+    })
+  })
+}
+
+export default Confirm

package/src/component/dialog/delete_com.tsx

@@ -1,27 +1,27 @@
-import _ from 'lodash'
-import { DeleteProps } from './types'
-import { getLocale } from '@gm-pc/locales'
-import Confirm from './confirm'
-
-const DeleteCom = (props: string | DeleteProps): Promise<void> => {
-  let p = props
-  if (!_.isObject(props)) {
-    p = {
-      children: props,
-    }
-  }
-
-  const newProps = p as DeleteProps
-
-  return Confirm(
-    Object.assign(
-      {
-        okBtnText: getLocale('删除'),
-        okBtnType: 'danger',
-      },
-      newProps
-    )
-  )
-}
-
-export default DeleteCom
+import _ from 'lodash'
+import { DeleteProps } from './types'
+import { getLocale } from '@gm-pc/locales'
+import Confirm from './confirm'
+
+const DeleteCom = (props: string | DeleteProps): Promise<void> => {
+  let p = props
+  if (!_.isObject(props)) {
+    p = {
+      children: props,
+    }
+  }
+
+  const newProps = p as DeleteProps
+
+  return Confirm(
+    Object.assign(
+      {
+        okBtnText: getLocale('删除'),
+        okBtnType: 'danger',
+      },
+      newProps
+    )
+  )
+}
+
+export default DeleteCom

package/src/component/dialog/dialog.tsx

@@ -1,70 +1,70 @@
-import React, { FC, useState } from 'react'
-import { DialogProps, DialogStatic } from './types'
-import { getLocale } from '@gm-pc/locales'
-import _ from 'lodash'
-import { Modal } from '../modal'
-import { Button } from '../button'
-import { Flex } from '../flex'
-import EVENT_TYPE from '../../event_type'
-import { LayoutRoot } from '../layout_root'
-
-const Dialog: FC<DialogProps> & DialogStatic = ({
-  title = getLocale('提示'),
-  size = 'sm',
-  buttons,
-  onHide = () => Dialog.hide(),
-  children,
-}) => {
-  const [loading, setLoading] = useState(false)
-  return (
-    <Modal
-      title={title}
-      size={size}
-      className='gm-dialog'
-      disableMaskClose
-      onHide={onHide}
-    >
-      <div>{children}</div>
-      {buttons && (
-        <Flex justifyEnd className='gm-dialog-buttons gm-margin-top-10'>
-          {_.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>
-  )
-}
-
-Dialog.render = function (props: DialogProps): void {
-  window.dispatchEvent(new window.CustomEvent(EVENT_TYPE.MODAL_SHOW))
-  LayoutRoot.setComponent(LayoutRoot.Type.MODAL, <Dialog {...props} />)
-}
-
-Dialog.hide = function (): void {
-  window.dispatchEvent(new window.CustomEvent(EVENT_TYPE.MODAL_HIDE))
-  LayoutRoot.removeComponent(LayoutRoot.Type.MODAL)
-}
-
-// input key down
-
-export default Dialog
+import React, { FC, useState } from 'react'
+import { DialogProps, DialogStatic } from './types'
+import { getLocale } from '@gm-pc/locales'
+import _ from 'lodash'
+import { Modal } from '../modal'
+import { Button } from '../button'
+import { Flex } from '../flex'
+import EVENT_TYPE from '../../event_type'
+import { LayoutRoot } from '../layout_root'
+
+const Dialog: FC<DialogProps> & DialogStatic = ({
+  title = getLocale('提示'),
+  size = 'sm',
+  buttons,
+  onHide = () => Dialog.hide(),
+  children,
+}) => {
+  const [loading, setLoading] = useState(false)
+  return (
+    <Modal
+      title={title}
+      size={size}
+      className='gm-dialog'
+      disableMaskClose
+      onHide={onHide}
+    >
+      <div>{children}</div>
+      {buttons && (
+        <Flex justifyEnd className='gm-dialog-buttons gm-margin-top-10'>
+          {_.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>
+  )
+}
+
+Dialog.render = function (props: DialogProps): void {
+  window.dispatchEvent(new window.CustomEvent(EVENT_TYPE.MODAL_SHOW))
+  LayoutRoot.setComponent(LayoutRoot.Type.MODAL, <Dialog {...props} />)
+}
+
+Dialog.hide = function (): void {
+  window.dispatchEvent(new window.CustomEvent(EVENT_TYPE.MODAL_HIDE))
+  LayoutRoot.removeComponent(LayoutRoot.Type.MODAL)
+}
+
+// input key down
+
+export default Dialog

package/src/component/dialog/index.ts

@@ -1,16 +1,16 @@
-export { default as Dialog } from './dialog'
-export { default as Alert } from './alert'
-export { default as Confirm } from './confirm'
-export { default as Prompt } from './prompt'
-// 文件名从 delete => delete_com，避免编译错误
-export { default as Delete } from './delete_com'
-
-export type {
-  DialogProps,
-  DialogSize,
-  DialogButtonProps,
-  DialogPromptProps,
-  ConfirmProps,
-  PromptProps,
-  DeleteProps,
-} from './types'
+export { default as Dialog } from './dialog'
+export { default as Alert } from './alert'
+export { default as Confirm } from './confirm'
+export { default as Prompt } from './prompt'
+// 文件名从 delete => delete_com，避免编译错误
+export { default as Delete } from './delete_com'
+
+export type {
+  DialogProps,
+  DialogSize,
+  DialogButtonProps,
+  DialogPromptProps,
+  ConfirmProps,
+  PromptProps,
+  DeleteProps,
+} from './types'