fix(form:array): fix invalid ui in ui schema

- close ng-alain/ng-alain#2429
ng-alain · Oct 17, 2023 · 71bbb34 · 71bbb34
1 parent d80f8fb
commit 71bbb34
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/packages/form/src/sf.component.ts b/packages/form/src/sf.component.ts
@@ -441,13 +441,12 @@ export class SFComponent implements OnInit, OnChanges, OnDestroy {
         }
 
         if (property.items) {
-          const uiSchemaInArr = (uiSchema[uiKey] || {}).$items || {};
           ui.$items = {
             ...(property.items.ui as SFUISchemaItem),
-            ...uiSchemaInArr[uiKey],
+            ...uiSchema[uiKey],
             ...ui.$items
           };
-          inFn(property.items, property.items, uiSchemaInArr, ui.$items, ui.$items);
+          inFn(property.items, property.items, uiSchema[uiKey]?.$items ?? {}, ui.$items, ui.$items);
         }
 
         if (property.properties && Object.keys(property.properties).length) {

diff --git a/packages/form/src/widgets/array/index.en-US.md b/packages/form/src/widgets/array/index.en-US.md
@@ -61,6 +61,6 @@ const ui = {
 | `[removable]` | Whether includes remove button | `boolean` | `true` |
 | `[removeTitle]` | Remove button title | `string` | `remove` |
 | `[required]` | Add required style to current item	 | `boolean` | - |
-| `[$items]` | UI description of array element | `SFUISchema` | `remove` |
+| `[$items]` | UI description of array element | `SFUISchema` | - |
 | `(add)` | Add callback，`property` indicates form property after add | `(property: FormProperty) => void` | - |
 | `(remove)` | Remove callback | `(index: number) => void` | - |
diff --git a/packages/form/src/widgets/array/index.zh-CN.md b/packages/form/src/widgets/array/index.zh-CN.md
@@ -61,6 +61,6 @@ const ui = {
 | `[removable]` | 是否包含移除按钮 | `boolean` | `true` |
 | `[removeTitle]` | 移除按钮文本 | `string` | `移除` |
 | `[required]` | 当前项是否为必填，仅影响样式 | `boolean` | - |
-| `[$items]` | 数组元素类型UI描述 | `SFUISchema` | `移除` |
+| `[$items]` | 数组元素类型UI描述 | `SFUISchema` | - |
 | `(add)` | 添加回调，`property` 表示添加后的表单属性 | `(property: FormProperty) => void` | - |
 | `(remove)` | 移除回调 | `(index: number) => void` | - |