Fix destructor (alibaba#506)

cds803 · Dec 15, 2019 · 4d82891 · 4d82891
1 parent 0b061bb
commit 4d82891
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 8 deletions.
diff --git a/packages/react-schema-renderer/src/components/SchemaMarkup.tsx b/packages/react-schema-renderer/src/components/SchemaMarkup.tsx
@@ -27,7 +27,7 @@ export const SchemaMarkupField: React.FC<IMarkupSchemaFieldProps> = ({
   const parentSchema = useContext(MarkupContext)
   if (!parentSchema) return <Fragment />
   if (parentSchema.isObject()) {
-    const propName = name || getRadomName()
+    const propName = (name || getRadomName()).replace(/\s*/g, '')
     const schema = parentSchema.setProperty(propName, props)
     return (
       <MarkupContext.Provider value={schema}>{children}</MarkupContext.Provider>
@@ -80,7 +80,7 @@ export function createVirtualBox<T = {}>(
           const props = schema.getExtendsComponentProps()
           return React.createElement(component, {
             children,
-            ...props,
+            ...props
           })
         }
       : () => <Fragment />

diff --git a/packages/react-schema-renderer/src/shared/linkage.ts b/packages/react-schema-renderer/src/shared/linkage.ts
@@ -1,9 +1,41 @@
 import { JSONCondition } from '../shared/condition'
 import { FormPath, IFormEffect } from '@uform/react'
-import { isFn } from '@uform/shared'
+import { isFn, isStr } from '@uform/shared'
 import { ISchemaFormActions } from '../types'
 import { compileObject } from './expression'
 
+const pathExpRE = /\[\s*(?:([+-])\s*(\d+)?)?\s*\]/g
+
+const transformTargetPath = (target: string, indexes: number[]) => {
+  if (!isStr(target)) return target
+  let index = 0
+  const newTarget = target.replace(
+    pathExpRE,
+    (_: string, operator: string, delta: string) => {
+      if (delta) {
+        if (operator === '+') {
+          return String(indexes[index++] + Number(delta))
+        } else if (operator === '-') {
+          return String(indexes[index++] - Number(delta))
+        }
+      } else {
+        if (operator === '+') {
+          return String(indexes[index++] + 1)
+        } else if (operator === '-') {
+          return String(indexes[index++] - 1)
+        }
+      }
+      return String(indexes[index++])
+    }
+  )
+  pathExpRE.lastIndex = 0
+  return newTarget
+}
+
+const getPathIndexes = (path: any): number[] => {
+  return path.transform(/\d+/, (...args) => args.map(i => Number(i))) as any
+}
+
 export const presetLinkage = (
   resolve: (params: any, actions: ISchemaFormActions) => void,
   reject?: (params: any, actions: ISchemaFormActions) => void
@@ -12,9 +44,12 @@ export const presetLinkage = (
     const { name, target, triggerType = 'onFieldChange' } = params
     const { hasChanged, getFormState, getFieldState } = actions
     $(triggerType, name).subscribe(fieldState => {
+      const fieldName = FormPath.parse(fieldState.name)
+      const fieldIndexes = getPathIndexes(fieldName)
       const formState = getFormState()
-      const targetState = getFieldState(target)
-      const fieldValue = FormPath.parse(name).getIn(formState.values)
+      const newTarget = transformTargetPath(target, fieldIndexes)
+      const targetState = getFieldState(newTarget)
+      const fieldValue = fieldName.getIn(formState.values)
       const options = compileObject(params, {
         ...context,
         $value: fieldValue,
@@ -23,6 +58,7 @@ export const presetLinkage = (
         $target: targetState || {}
       })
       options.condition = JSONCondition.calculate(options.condition, fieldValue)
+      options.target = newTarget
       if (
         hasChanged(fieldState, 'value') ||
         hasChanged(fieldState, 'initialized') ||

diff --git a/packages/react-schema-renderer/src/shared/schema.ts b/packages/react-schema-renderer/src/shared/schema.ts
@@ -88,7 +88,7 @@ export class Schema implements ISchema {
       this.key = key
     }
     if (this.parent && this.parent.isArray()) {
-      this.path = this.parent.path + '.*.' + this.key
+      this.path = this.parent.path + '.*'
     } else {
       if (this.parent) {
         this.path = this.parent.path

diff --git a/packages/react/src/shared.ts b/packages/react/src/shared.ts
@@ -162,8 +162,9 @@ export const createFormEffects = <Payload = any, Actions = any>(
               isFn(matcher) && !matcher['path']
                 ? matcher
                 : (payload: T): boolean => {
-                    return FormPath.parse(matcher as any).match(
-                      payload && (payload as any).name
+                    return FormPath.parse(matcher as any).matchAliasGroup(
+                      payload && (payload as any).name,
+                      payload && (payload as any).path
                     )
                   }
             )