feat(schema-field): move transformer to json-schema package

alibaba · Jan 31, 2021 · 69677e1 · 69677e1
1 parent 36aef5b
commit 69677e1
Show file tree

Hide file tree

Showing 15 changed files with 98 additions and 889 deletions.
diff --git a/packages/antd/src/array-table/index.tsx b/packages/antd/src/array-table/index.tsx
@@ -6,11 +6,7 @@ import { SelectProps } from 'antd/lib/select'
 import cls from 'classnames'
 import { SortableContainer, SortableElement } from 'react-sortable-hoc'
 import { useForm, useField, observer } from '@formily/react'
-import {
-  useSchema,
-  RecursionField,
-  transformSchemaToFieldProps,
-} from '@formily/react-schema-field'
+import { useSchema, RecursionField } from '@formily/react-schema-field'
 import { FormPath, isArr, isBool } from '@formily/shared'
 import { Schema } from '@formily/json-schema'
 import { usePrefixCls } from '../__builtins__'
@@ -69,8 +65,7 @@ const useArrayTableSources = () => {
         return []
       const name = schema['x-component-props']?.['dataIndex'] || schema['name']
       const field = arrayField.query(arrayField.address.concat(name)).take()
-      const fieldProps =
-        field?.props || transformSchemaToFieldProps(name, schema, {})
+      const fieldProps = field?.props || schema.toFieldProps()
       const columnProps =
         field?.component?.[1] || schema['x-component-props'] || {}
       const display = field?.display || schema['x-display']

diff --git a/packages/json-schema/package.json b/packages/json-schema/package.json
@@ -30,7 +30,8 @@
     "mobx": "^6.0.3"
   },
   "dependencies": {
-    "@formily/shared":"^2.0.0-beta.3"
+    "@formily/core": "^2.0.0-beta.3",
+    "@formily/shared": "^2.0.0-beta.3"
   },
   "publishConfig": {
     "access": "public"