p96170835
/
amis
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #563 from RickCole21/master 

diff-editor 语言选择json时，自动格式化文本
This commit is contained in:
liaoxuezhi 2020-04-27 15:59:44 +08:00 committed by GitHub
parent b33edbe0c2 16d6cbe5f4
commit 1a627cdea1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/renderers/Form/DiffEditor.tsx
View File

@ -21,10 +21,21 @@ export interface DiffEditorProps extends FormControlProps {
diffValue?: string;
}
function normalizeValue(value: any) {
function normalizeValue(value: any, language?: string) {
if (value && typeof value !== 'string') {
value = JSON.stringify(value, null, 4);
}
if (language && language === 'json') {
try {
value = JSON.stringify(
typeof value === 'string' ? JSON.parse(value) : value,
null,
4
);
} catch (e) {}
}
return value;
}
@ -92,7 +103,7 @@ export class DiffEditor extends React.Component<DiffEditorProps, any> {
}
componentDidUpdate(prevProps: any) {
const {data, value, diffValue} = this.props;
const {data, value, diffValue, language} = this.props;
if (
this.originalEditor &&
@ -103,8 +114,8 @@ export class DiffEditor extends React.Component<DiffEditorProps, any> {
.getModel()
.setValue(
isPureVariable(diffValue as string)
? filter(normalizeValue(diffValue || ''), data, '| raw')
: normalizeValue(diffValue)
? normalizeValue(filter(diffValue || '', data, '| raw'), language)
: normalizeValue(diffValue, language)
);
}
@ -114,7 +125,7 @@ export class DiffEditor extends React.Component<DiffEditorProps, any> {
value !== prevProps.value &&
!this.state.focused
) {
this.modifiedEditor.getModel().setValue(normalizeValue(value));
this.modifiedEditor.getModel().setValue(normalizeValue(value, language));
}
}
@ -145,11 +156,14 @@ export class DiffEditor extends React.Component<DiffEditorProps, any> {
this.editor.setModel({
original: this.monaco.editor.createModel(
isPureVariable(diffValue as string)
? filter(normalizeValue(diffValue || ''), data, '| raw')
: normalizeValue(diffValue),
? normalizeValue(filter(diffValue || '', data, '| raw'), language)
: normalizeValue(diffValue, language),
language
),
modified: this.monaco.editor.createModel(normalizeValue(value), language)
modified: this.monaco.editor.createModel(
normalizeValue(value, language),
language
)
});
this.updateContainerSize();