fix: fix get items error in row setter

AndyJinSS · AndyJinSS · commit 40dbaea709bc · 2023-04-10T15:40:30.000+08:00
diff --git a/src/setter/object-setter/index.tsx b/src/setter/object-setter/index.tsx
@@ -60,7 +60,7 @@ function getItemsFromProps(props: RowSetterProps, state?: RowSetterState) {
   const items: IPublicModelSettingField[] = [];
   if (columns && config?.items) {
     const l = Math.min(config.items.length, columns);
-    for (let i = 0; i < l; i++) {
+    for (let i = 0; i < config.items.length; i++) {
       const conf = config.items[i];
       if (conf.isRequired || conf.important || (conf.setter as any)?.isRequired) {
         const item = state?.items?.filter(d => d.name === conf.name)?.[0] || field.createField({
@@ -77,6 +77,9 @@ function getItemsFromProps(props: RowSetterProps, state?: RowSetterState) {
         };
         items.push(item);
       }
+      if (items.length >= l) {
+        break;
+      }
     }
   }
   return items;

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ function getItemsFromProps(props: RowSetterProps, state?: RowSetterState) {`
`60`	`60`	`const items: IPublicModelSettingField[] = [];`
`61`	`61`	`if (columns && config?.items) {`
`62`	`62`	`const l = Math.min(config.items.length, columns);`
`63`		`- for (let i = 0; i < l; i++) {`
	`63`	`+ for (let i = 0; i < config.items.length; i++) {`
`64`	`64`	`const conf = config.items[i];`
`65`	`65`	`if (conf.isRequired \|\| conf.important \|\| (conf.setter as any)?.isRequired) {`
`66`	`66`	`const item = state?.items?.filter(d => d.name === conf.name)?.[0] \|\| field.createField({`
`@@ -77,6 +77,9 @@ function getItemsFromProps(props: RowSetterProps, state?: RowSetterState) {`
`77`	`77`	`};`
`78`	`78`	`items.push(item);`
`79`	`79`	`}`
	`80`	`+ if (items.length >= l) {`
	`81`	`+ break;`
	`82`	`+ }`
`80`	`83`	`}`
`81`	`84`	`}`
`82`	`85`	`return items;`