Skip to content

[improve] improved interaction styling for the template editor #4051

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
tomsun28 merged 3 commits into from
Mar 4, 2026
+20 −0
Merged

[improve] improved interaction styling for the template editor #4051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88217c9
[improve] improved interaction styling for the template editor
Duansg Feb 27, 2026
7b758cf
Merge branch 'master' into improve-template
Duansg Mar 2, 2026
7674706
Merge branch 'master' into improve-template
tomsun28 Mar 4, 2026
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
17 changes: 17 additions & 0 deletions web-app/src/app/routes/setting/define/define.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,14 @@
{{ 'app-' + currentApp + '.yml' }}
<i nz-icon nzType="more" nzTheme="outline"></i>
</button>
<button *ngIf="currentApp != null && !isEditing" nz-button nzType="primary" (click)="isEditing = true">
<i nz-icon nzType="edit" nzTheme="outline"></i>
{{ 'common.button.edit' | i18n }}
</button>
<button *ngIf="isEditing && currentApp != null" nz-button nzDanger (click)="isEditing = false; code = originalCode">
<i nz-icon nzType="close-circle" nzTheme="outline"></i>
{{ 'common.button.cancel' | i18n }}
</button>
<button *ngIf="!loading && code != originalCode" nz-button nzType="primary" [nzLoading]="saveLoading" (click)="onSaveAndApply()">
<i nz-icon nzType="save" nzTheme="outline"></i>
{{ 'define.save-apply' | i18n }}
Expand All @@ -102,6 +110,15 @@
</app-toolbar>
<div style="flex: 1; margin: 4px 8px 4px 4px">
<nz-code-editor
*ngIf="!isEditing || currentApp == null"
class="editor"
[nzLoading]="loading"
[(ngModel)]="code"
[nzEditorMode]="'normal'"
[nzEditorOption]="{ language: 'yaml', theme: 'vs', folding: true, automaticLayout: true, readOnly: !isEditing }"
></nz-code-editor>
<nz-code-editor
*ngIf="isEditing && currentApp != null"
class="editor"
[nzLoading]="loading"
[nzOriginalText]="originalCode"
Expand Down
3 changes: 3 additions & 0 deletions web-app/src/app/routes/setting/define/define.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ export class DefineComponent implements OnInit {
currentApp: any = null;
saveLoading = false;
deleteLoading = false;
isEditing = false;

ngOnInit(): void {
this.route.queryParamMap.subscribe((paramMap: ParamMap) => {
Expand Down Expand Up @@ -126,6 +127,7 @@ export class DefineComponent implements OnInit {

loadAppDefineContent(app: any) {
this.loading = true;
this.isEditing = false;
this.currentApp = app;
const getAppYml$ = this.appDefineSvc
.getAppDefineYmlContent(app)
Expand Down Expand Up @@ -194,6 +196,7 @@ export class DefineComponent implements OnInit {

onNewMonitorDefine() {
this.currentApp = null;
this.isEditing = true;
this.code = `${this.i18nSvc.fanyi('define.new.code')}\n\n\n\n\n`;
this.originalCode = this.i18nSvc.fanyi('define.new.code');
}
Expand Down
Loading