fix: prop should return undefined when all items are undefined

LeoYuan · LeoYuan · commit 5bb9ec7a1dfa · 2022-03-17T10:08:22.000+08:00
diff --git a/packages/designer/src/document/node/props/prop.ts b/packages/designer/src/document/node/props/prop.ts
@@ -159,7 +159,7 @@ export class Prop implements IPropParent {
           const v = prop.export(stage);
           if (v != null) {
             maps = maps || {};
-            maps[prop.key || key] = prop.export(stage);
+            maps[prop.key || key] = v;
           }
         }
       });
@@ -170,9 +170,13 @@ export class Prop implements IPropParent {
       if (!this._items) {
         return this._value;
       }
-      return this.items!.map((prop) => {
+      const values = this.items!.map((prop) => {
         return prop.export(stage);
       });
+      if (values.every(val => val === undefined)) {
+        return undefined;
+      }
+      return values;
     }
   }
 
diff --git a/packages/designer/tests/document/node/props/prop.test.ts b/packages/designer/tests/document/node/props/prop.test.ts
@@ -430,6 +430,11 @@ describe('Prop 类测试', () => {
         // illegal
         // expect(prop.set(5, 1)).toBeNull();
       });
+
+      it('should return undefined when all items are undefined', () => {
+        prop = new Prop(mockedPropsInst, [undefined, undefined], '___loopArgs___');
+        expect(prop.getValue()).toBeUndefined();
+      });
     });
   });
 

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ export class Prop implements IPropParent {`
`159`	`159`	`const v = prop.export(stage);`
`160`	`160`	`if (v != null) {`
`161`	`161`	`maps = maps \|\| {};`
`162`		`- maps[prop.key \|\| key] = prop.export(stage);`
	`162`	`+ maps[prop.key \|\| key] = v;`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`	`});`
`@@ -170,9 +170,13 @@ export class Prop implements IPropParent {`
`170`	`170`	`if (!this._items) {`
`171`	`171`	`return this._value;`
`172`	`172`	`}`
`173`		`- return this.items!.map((prop) => {`
	`173`	`+ const values = this.items!.map((prop) => {`
`174`	`174`	`return prop.export(stage);`
`175`	`175`	`});`
	`176`	`+ if (values.every(val => val === undefined)) {`
	`177`	`+ return undefined;`
	`178`	`+ }`
	`179`	`+ return values;`
`176`	`180`	`}`
`177`	`181`	`}`
`178`	`182`