fix(form): fix DigitRange un support theme error

ant-design · Jun 24, 2023 · 70ad3bc · 70ad3bc
1 parent c86532f
commit 70ad3bc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/field/src/components/DigitRange/index.tsx b/packages/field/src/components/DigitRange/index.tsx
@@ -1,4 +1,4 @@
-import { useIntl } from '@ant-design/pro-provider';
+import { proTheme, useIntl } from '@ant-design/pro-provider';
 import { Input, InputNumber } from 'antd';
 import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import React from 'react';
@@ -40,6 +40,7 @@ const FieldDigitRange: ProFieldFC<FieldDigitRangeProps> = (
   const { value, defaultValue, onChange, id } = fieldProps;
   const intl = useIntl();
 
+  const { token } = proTheme.useToken();
   const [valuePair, setValuePair] = useMergedState(() => defaultValue, {
     value: value,
     onChange: onChange,
@@ -117,7 +118,7 @@ const FieldDigitRange: ProFieldFC<FieldDigitRangeProps> = (
             borderInlineStart: 0,
             borderInlineEnd: 0,
             pointerEvents: 'none',
-            backgroundColor: '#FFF',
+            backgroundColor: token?.colorBgContainer,
           }}
           placeholder={separator}
           disabled

diff --git a/packages/table/src/components/Form/FormRender.tsx b/packages/table/src/components/Form/FormRender.tsx
@@ -224,7 +224,8 @@ const FormRender = <T, U = any>({
         formRef={formRef}
         action={action}
         dateFormatter={dateFormatter}
-        onInit={(values: T) => {
+        onInit={(values: T, form) => {
+          formRef.current = form;
           // 触发一个 submit，之所以这里触发是为了保证 value 都被 format了
           if (type !== 'form') {
             // 修改 pageSize，变成从 url 中获取的