fix(exportschema): exportSchema(IPublicEnumTransformStage.Save) type …

…conver (#2661) * fix(exportschema): exportSchema(IPublicEnumTransformStage.Save) type conver * test(prop): nullProp equals null, not
alibaba · Nov 20, 2023 · 8208dd3 · 8208dd3
1 parent 0f8bc82
commit 8208dd3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/packages/designer/src/document/node/props/prop.ts b/packages/designer/src/document/node/props/prop.ts
@@ -290,10 +290,6 @@ export class Prop implements IProp, IPropParent {
     }
 
     if (type === 'literal' || type === 'expression') {
-      // TODO 后端改造之后删除此逻辑
-      if (this._value === null && stage === IPublicEnumTransformStage.Save) {
-        return '';
-      }
       return this._value;
     }
 

diff --git a/packages/designer/tests/document/node/props/prop.test.ts b/packages/designer/tests/document/node/props/prop.test.ts
@@ -136,7 +136,7 @@ describe('Prop 类测试', () => {
       expect(boolProp.export(IPublicEnumTransformStage.Save)).toBe(true);
       expect(strProp.export(IPublicEnumTransformStage.Save)).toBe('haha');
       expect(numProp.export(IPublicEnumTransformStage.Save)).toBe(1);
-      expect(nullProp.export(IPublicEnumTransformStage.Save)).toBe('');
+      expect(nullProp.export(IPublicEnumTransformStage.Save)).toBe(null);
       expect(nullProp.export(IPublicEnumTransformStage.Serilize)).toBe(null);
       expect(expProp.export(IPublicEnumTransformStage.Save)).toEqual({
         type: 'JSExpression',

diff --git a/packages/designer/tests/fixtures/schema/form.ts b/packages/designer/tests/fixtures/schema/form.ts
@@ -267,7 +267,7 @@ export default {
                                 labelTipsText: {
                                   type: 'i18n',
                                   use: 'zh-CN',
-                                  'en-US': null,
+                                  'en-US': '',
                                   'zh-CN': '',
                                 },
                               },
@@ -337,7 +337,7 @@ export default {
                                 labelTipsText: {
                                   type: 'i18n',
                                   use: 'zh-CN',
-                                  'en-US': null,
+                                  'en-US': '',
                                   'zh-CN': '',
                                 },
                               },
@@ -407,7 +407,7 @@ export default {
                                 labelTipsText: {
                                   type: 'i18n',
                                   use: 'zh-CN',
-                                  'en-US': null,
+                                  'en-US': '',
                                   'zh-CN': '',
                                 },
                               },
@@ -489,7 +489,7 @@ export default {
                                 labelTipsText: {
                                   type: 'i18n',
                                   use: 'zh-CN',
-                                  'en-US': null,
+                                  'en-US': '',
                                   'zh-CN': '',
                                 },
                               },
@@ -578,7 +578,7 @@ export default {
                                 labelTipsText: {
                                   type: 'i18n',
                                   use: 'zh-CN',
-                                  'en-US': null,
+                                  'en-US': '',
                                   'zh-CN': '',
                                 },
                                 searchDelay: 300,
@@ -697,7 +697,7 @@ export default {
                         labelTipsText: {
                           type: 'i18n',
                           use: 'zh-CN',
-                          'en-US': null,
+                          'en-US': '',
                           'zh-CN': '',
                         },
                       },
@@ -789,7 +789,7 @@ export default {
                                 labelTipsText: {
                                   type: 'i18n',
                                   use: 'zh-CN',
-                                  'en-US': null,
+                                  'en-US': '',
                                   'zh-CN': '',
                                 },
                               },
@@ -871,7 +871,7 @@ export default {
                                 labelTipsText: {
                                   type: 'i18n',
                                   use: 'zh-CN',
-                                  'en-US': null,
+                                  'en-US': '',
                                   'zh-CN': '',
                                 },
                               },