@gm-pc/react 1.21.1-alpha.4 → 1.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-pc/react",
-  "version": "1.21.1-alpha.4",
+  "version": "1.22.0",
   "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.21.0",
+    "@gm-pc/locales": "^1.22.0",
     "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": "0ca36eb94f309b229dd8f7e29756e86802fe3de2"
+  "gitHead": "89bf53db3f0327b2352131bf15ea1d038b021f4a"
 }

package/src/component/dialog/prompt.tsx

@@ -4,6 +4,7 @@ import Dialog from './dialog'
 import { PromptProps } from './types'
 import { getLocale } from '@gm-pc/locales'
 import { Input } from '../input'
+import { ConfigProvider } from '../config_provider'
 
 const Prompt = (props: string | PromptProps): Promise<string> => {
   let p = props
@@ -20,6 +21,7 @@ const Prompt = (props: string | PromptProps): Promise<string> => {
     defaultValue,
     placeholder,
     onValidate,
+    fontSize,
     ...rest
   } = p as PromptProps
 
@@ -43,24 +45,26 @@ const Prompt = (props: string | PromptProps): Promise<string> => {
     }
 
     const child = (
-      <div>
+      <ConfigProvider fontSize={fontSize}>
         <div>
-          <Input
-            type='text'
-            defaultValue={value}
-            onChange={(e: ChangeEvent<HTMLInputElement>) => {
-              value = e.target.value
-            }}
-            placeholder={placeholder}
-            onKeyDown={(e: KeyboardEvent) => {
-              if (e.key === 'Enter') {
-                handleOk()
-              }
-            }}
-          />
+          <div>
+            <Input
+              type='text'
+              defaultValue={value}
+              onChange={(e: ChangeEvent<HTMLInputElement>) => {
+                value = e.target.value
+              }}
+              placeholder={placeholder}
+              onKeyDown={(e: KeyboardEvent) => {
+                if (e.key === 'Enter') {
+                  handleOk()
+                }
+              }}
+            />
+          </div>
+          {children}
         </div>
-        {children}
-      </div>
+      </ConfigProvider>
     )
 
     Dialog.render({

package/src/component/dialog/stories.tsx

@@ -4,6 +4,7 @@ import Alert from './alert'
 import Confirm from './confirm'
 import Prompt from './prompt'
 import Delete from './delete_com'
+import { ConfigProvider } from '../config_provider'
 
 export const ComDialog = () => {
   return (
@@ -156,6 +157,7 @@ export const ComPrompt = () => {
       <button
         onClick={() => {
           Prompt({
+            fontSize: 'sm',
             size: 'sm',
             children: '请填写，< 5 不通过',
             // @ts-ignore
@@ -182,6 +184,12 @@ export const ComPrompt = () => {
   )
 }
 
+export const ComPromptFontSize = () => (
+  <ConfigProvider fontSize='sm'>
+    <ComPrompt />
+  </ConfigProvider>
+)
+
 export default {
   title: '反馈/Dialog',
 }

package/src/component/dialog/types.ts

@@ -1,5 +1,6 @@
 import { HTMLAttributes, ReactNode } from 'react'
 import { ButtonType } from '../button'
+import { ConfigProviderProps } from '../config_provider'
 
 type DialogSize = 'sm' | 'md' | 'lg' | 'xl'
 
@@ -12,7 +13,7 @@ interface DialogButtonProps {
   disabled?: boolean
 }
 
-interface DialogProps {
+interface DialogProps extends ConfigProviderProps {
   title?: string
   size?: DialogSize
   buttons?: DialogButtonProps[]
@@ -42,7 +43,7 @@ interface ConfirmProps extends SpecificDialogProps {
   read?: boolean | string
 }
 
-interface PromptProps extends ConfirmProps {
+interface PromptProps extends ConfirmProps, ConfigProviderProps {
   defaultValue?: string
   placeholder?: string
 }

package/src/component/function_set/function_set.tsx

@@ -5,6 +5,7 @@ import Overlay from './overlay'
 import { Button } from '../button'
 import { getLocale } from '@gm-pc/locales'
 import { IconDownUp } from '../icon_down_up'
+import { ConfigConsumer, ConfigProvider } from '../config_provider'
 
 interface InnerProps extends HTMLAttributes<HTMLDivElement> {
   disabled: boolean
@@ -59,16 +60,24 @@ class FunctionSet extends Component<FunctionSetProps> {
       return null
     }
     return (
-      <Popover
-        ref={this._popoverRef}
-        popup={<Overlay data={newData} onSelect={this._handleSelect} isReverse={right} />}
-        right={right}
-        type='hover'
-        disabled={disabled}
-        pureContainer
-      >
-        <Inner disabled={!!disabled}>{children}</Inner>
-      </Popover>
+      <ConfigConsumer>
+        {(config) => (
+          <Popover
+            ref={this._popoverRef}
+            popup={
+              <ConfigProvider {...config}>
+                <Overlay data={newData} onSelect={this._handleSelect} isReverse={right} />
+              </ConfigProvider>
+            }
+            right={right}
+            type='hover'
+            disabled={disabled}
+            pureContainer
+          >
+            <Inner disabled={!!disabled}>{children}</Inner>
+          </Popover>
+        )}
+      </ConfigConsumer>
     )
   }
 }