fix(schema): compat eva expression actions (#951)

* fix: expression * feat: add unitest
alibaba · Jul 6, 2020 · aed0369 · aed0369
1 parent 0162788
commit aed0369
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 0 deletions.
diff --git a/packages/react-schema-renderer/src/__tests__/actions.spec.tsx b/packages/react-schema-renderer/src/__tests__/actions.spec.tsx
@@ -77,3 +77,47 @@ test('createFormActions', async () => {
   expect(queryByTestId('inputA').getAttribute('value')).toEqual(VALUE_A)
   expect(queryByTestId('inputB').getAttribute('value')).toEqual(VALUE_B)
 })
+
+test('createFormActions', async () => {
+  const actionsSymbol = Symbol.for("__REVA_ACTIONS")
+  const actions = createFormActions()
+  const actions2 = createFormActions()
+  expect(actions[actionsSymbol]).toEqual(true)
+  expect(actions2[actionsSymbol]).toEqual(true)
+  const TestComponent = () => (
+    <SchemaForm
+      actions={actions}
+      effects={($, { setFieldState }) => {
+        $('onFormInit').subscribe(() => {
+          setFieldState('aaa', state => {
+            state.value = 'change value of aaa field onFormInit'
+          })
+        })
+      }}
+      components={{ SchemaForm }}
+    >
+      <Field name="nested"
+        x-component="SchemaForm"
+        x-component-props={{
+          actions: actions2
+        }}
+      />
+      <Field
+        name="aaa"
+        type="string"
+        x-props={{
+          'data-testid': 'inputA'
+        }}
+      />
+    </SchemaForm>
+  )
+
+  const { queryByTestId } = render(<TestComponent />)
+  expect(queryByTestId('inputA').getAttribute('value')).toEqual(
+    'change value of aaa field onFormInit'
+  )
+  actions.setFormState(state => (state.values = { aaa: 123 }))
+  await wait()
+  expect(actions[actionsSymbol]).toEqual(true)
+  expect(actions2[actionsSymbol]).toEqual(true)
+})
diff --git a/packages/react-schema-renderer/src/shared/expression.ts b/packages/react-schema-renderer/src/shared/expression.ts
@@ -8,6 +8,7 @@ import {
 } from '@formily/shared'
 
 const ExpRE = /^\s*\{\{(.*)\}\}\s*$/
+const actionsSymbol = Symbol.for("__REVA_ACTIONS")
 
 export const complieExpression = <Source = any, Context = any>(
   source: Source,
@@ -25,6 +26,9 @@ export const complieExpression = <Source = any, Context = any>(
     } else if (isArr(source)) {
       return source.map(value => complie(value))
     } else if (isPlainObj(source)) {
+      if (source[actionsSymbol]) {
+        return source
+      }
       if (source['_isAMomentObject']) {
         return source
       }