fix(core): indexes need exclude incomplete number (#3437)

alibaba · Oct 8, 2022 · d328bb3 · d328bb3
1 parent 3f8aa1b
commit d328bb3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/packages/core/src/__tests__/array.spec.ts b/packages/core/src/__tests__/array.spec.ts
@@ -538,6 +538,21 @@ test('nest array remove', async () => {
   ).not.toBeUndefined()
 })
 
+test('indexes: nest path need exclude incomplete number', () => {
+  const form = attach(createForm())
+
+  const objPathIncludeNum = attach(
+    form.createField({
+      name: 'attr',
+      basePath: 'metrics.0.a.10.iconWidth50',
+    })
+  )
+
+  expect(objPathIncludeNum.indexes.length).toBe(2)
+  expect(objPathIncludeNum.indexes).toEqual([0, 10])
+  expect(objPathIncludeNum.index).toBe(10)
+})
+
 test('incomplete insertion of array elements', async () => {
   const form = attach(
     createForm({

diff --git a/packages/core/src/models/BaseField.ts b/packages/core/src/models/BaseField.ts
@@ -53,7 +53,7 @@ export class BaseField<Decorator = any, Component = any, TextType = any> {
   }
 
   get indexes() {
-    return this.path.transform(/\d/, (...args) =>
+    return this.path.transform(/^\d+$/, (...args) =>
       args.map((index) => Number(index))
     )
   }