fix(schema-renderer): fix linkage can not access expressionScope (#726)

alibaba · Mar 16, 2020 · 27de669 · 27de669
1 parent b755498
commit 27de669
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/docs/zh-cn/schema-develop/introduction.md b/docs/zh-cn/schema-develop/introduction.md
@@ -29,11 +29,13 @@ const App = () => {
       components={{
         Input
       }}
-      labelCol={7}
-      wrapperCol={12}
       onSubmit={console.log}
       schema={{
         type: 'object',
+        "x-component-props":{
+          labelCol:7,
+          wrapperCol:12
+        },
         properties: {
           string: {
             type: 'string',

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -776,6 +776,8 @@ export function createForm<FieldProps, VirtualFieldProps>(
       })
     }
 
+    //1. 无法自动交换通过移动来新增删除子列表元素的状态
+    //2. 暂时不支持通过setFieldState修改值场景的状态交换
     function swapState($from: number, $to: number) {
       const keys: string[] = ['initialValue', 'visibleCacheValue', 'values']
       const arrayName = field.getSourceState(state => state.name)

diff --git a/packages/react-schema-renderer/src/shared/linkage.ts b/packages/react-schema-renderer/src/shared/linkage.ts
@@ -47,7 +47,7 @@ export const parseLinkages = (
   {
     getFieldState,
     getFormState,
-    scope
+    scope: outerScope
   }: {
     getFieldState?: IFormActions['getFieldState']
     getFormState?: IFormActions['getFormState']
@@ -65,6 +65,7 @@ export const parseLinkages = (
     const targetState = getFieldState ? getFieldState(newTarget) : {}
     const fieldValue = fieldName.getIn(formState.values)
     const _scope = {
+      ...outerScope,
       ...scope,
       $value: fieldValue,
       $self: fieldState || {},