From 2a837fe53422a278b589cdcc4cdf07c3dfb989a3 Mon Sep 17 00:00:00 2001
From: "zhili.wzl" <zhili.wzl@alibaba-inc.com>
Date: Fri, 26 Nov 2021 22:56:06 +0800
Subject: [PATCH] fix(react-settings-form): fix typings

---
 .../components/BorderStyleSetter/index.tsx    | 20 +++++++++----------
 .../components/DisplayStyleSetter/index.tsx   |  3 ++-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/react-settings-form/src/components/BorderStyleSetter/index.tsx b/packages/react-settings-form/src/components/BorderStyleSetter/index.tsx
index 7e97edf7e..73b8aa980 100644
--- a/packages/react-settings-form/src/components/BorderStyleSetter/index.tsx
+++ b/packages/react-settings-form/src/components/BorderStyleSetter/index.tsx
@@ -71,19 +71,17 @@ export const BorderStyleSetter: React.FC<IBorderStyleSetterProps> = observer(
       [field.value]
     )
     const prefix = usePrefix('border-style-setter')
-    const createReaction =
-      (position: string) => (field: Formily.Core.Models.Field) => {
-        field.display =
-          currentPosition.value === position ? 'visible' : 'hidden'
-        if (position !== 'center') {
-          const borderStyle = field.query('.borderStyle').value()
-          const borderWidth = field.query('.borderWidth').value()
-          const borderColor = field.query('.borderColor').value()
-          if (borderStyle || borderWidth || borderColor) {
-            field.value = undefined
-          }
+    const createReaction = (position: string) => (field: FieldType) => {
+      field.display = currentPosition.value === position ? 'visible' : 'hidden'
+      if (position !== 'center') {
+        const borderStyle = field.query('.borderStyle').value()
+        const borderWidth = field.query('.borderWidth').value()
+        const borderColor = field.query('.borderColor').value()
+        if (borderStyle || borderWidth || borderColor) {
+          field.value = undefined
         }
       }
+    }
 
     return (
       <FoldItem label={field.title}>
diff --git a/packages/react-settings-form/src/components/DisplayStyleSetter/index.tsx b/packages/react-settings-form/src/components/DisplayStyleSetter/index.tsx
index 834f7af79..2deb0884e 100644
--- a/packages/react-settings-form/src/components/DisplayStyleSetter/index.tsx
+++ b/packages/react-settings-form/src/components/DisplayStyleSetter/index.tsx
@@ -1,5 +1,6 @@
 import React from 'react'
 import { useField, Field, observer } from '@formily/react'
+import { Field as FieldType } from '@formily/core'
 import { FormItem } from '@formily/antd'
 import { Radio } from 'antd'
 import { usePrefix, IconWidget } from '@designable/react'
@@ -15,7 +16,7 @@ export interface IDisplayStyleSetterProps {
 
 export const DisplayStyleSetter: React.FC<IDisplayStyleSetterProps> = observer(
   (props) => {
-    const field = useField<Formily.Core.Models.Field>()
+    const field = useField<FieldType>()
     const prefix = usePrefix('display-style-setter')
     return (
       <>