Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix(exportschema): exportSchema(IPublicEnumTransformStage.Save) type conver #2661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liujuping merged 2 commits into from
Nov 20, 2023
Merged

fix(exportschema): exportSchema(IPublicEnumTransformStage.Save) type conver #2661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7ad125
fix(exportschema): exportSchema(IPublicEnumTransformStage.Save) type …
ChiZng Nov 17, 2023
59338e8
test(prop): nullProp equals null, not
ChiZng Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions packages/designer/src/document/node/props/prop.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/designer/tests/document/node/props/prop.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
16 changes: 8 additions & 8 deletions packages/designer/tests/fixtures/schema/form.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ export default {
labelTipsText: {
type: 'i18n',
use: 'zh-CN',
'en-US': null,
'en-US': '',
'zh-CN': '',
},
},
Expand Down Expand Up @@ -337,7 +337,7 @@ export default {
labelTipsText: {
type: 'i18n',
use: 'zh-CN',
'en-US': null,
'en-US': '',
'zh-CN': '',
},
},
Expand Down Expand Up @@ -407,7 +407,7 @@ export default {
labelTipsText: {
type: 'i18n',
use: 'zh-CN',
'en-US': null,
'en-US': '',
'zh-CN': '',
},
},
Expand Down Expand Up @@ -489,7 +489,7 @@ export default {
labelTipsText: {
type: 'i18n',
use: 'zh-CN',
'en-US': null,
'en-US': '',
'zh-CN': '',
},
},
Expand Down Expand Up @@ -578,7 +578,7 @@ export default {
labelTipsText: {
type: 'i18n',
use: 'zh-CN',
'en-US': null,
'en-US': '',
'zh-CN': '',
},
searchDelay: 300,
Expand Down Expand Up @@ -697,7 +697,7 @@ export default {
labelTipsText: {
type: 'i18n',
use: 'zh-CN',
'en-US': null,
'en-US': '',
'zh-CN': '',
},
},
Expand Down Expand Up @@ -789,7 +789,7 @@ export default {
labelTipsText: {
type: 'i18n',
use: 'zh-CN',
'en-US': null,
'en-US': '',
'zh-CN': '',
},
},
Expand Down Expand Up @@ -871,7 +871,7 @@ export default {
labelTipsText: {
type: 'i18n',
use: 'zh-CN',
'en-US': null,
'en-US': '',
'zh-CN': '',
},
},
Expand Down