Skip to content

[Improvement-17248][UI] Optimize file details display area to reduce blank space #17731

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
ruanwenjun merged 13 commits into from
Dec 4, 2025
Merged

[Improvement-17248][UI] Optimize file details display area to reduce blank space #17731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
15fd520
[Improvement-17248][UI] Optimize file details display area to reduce …
zhan7236 Nov 26, 2025
6b4ef87
refactor: address Copilot AI code review feedback
zhan7236 Nov 26, 2025
13513de
Merge branch 'dev' into Improvement-17248
SbloodyS Nov 26, 2025
1911642
style: fix trailing whitespace in create/index.tsx
zhan7236 Nov 26, 2025
acb222b
refactor: use Flexbox layout to optimize file editor display area
zhan7236 Nov 26, 2025
22c8e59
fix: add overflow hidden to prevent editor from infinite expansion
zhan7236 Nov 26, 2025
9bfbe36
Merge branch 'dev' into Improvement-17248
SbloodyS Nov 27, 2025
148fa5c
fix: use viewport-based height calculation for Monaco Editor to ensur…
zhan7236 Nov 27, 2025
1047a44
Merge branch 'dev' into Improvement-17248
SbloodyS Nov 27, 2025
e36757d
Merge branch 'dev' into Improvement-17248
zhan7236 Nov 29, 2025
abecfd8
Merge branch 'dev' into Improvement-17248
SbloodyS Dec 1, 2025
761ef2d
fix: run pnpm lint to fix code format
zhan7236 Dec 3, 2025
1c8ddf8
Merge branch 'dev' into Improvement-17248
SbloodyS Dec 4, 2025
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
7 changes: 6 additions & 1 deletion dolphinscheduler-ui/src/components/monaco-editor/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ const props = {
readOnly: false,
language: 'shell'
})
},
height: {
type: String as PropType<string>,
default: '300px'
}
}

Expand Down Expand Up @@ -164,7 +168,8 @@ export default defineComponent({
<div
ref='editorRef'
style={{
height: '300px',
height: this.height,
minHeight: '150px',
width: '100%',
border: '1px solid #eee'
}}
Expand Down
69 changes: 33 additions & 36 deletions dolphinscheduler-ui/src/views/resource/components/resource/create/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,40 +66,37 @@ export default defineComponent({
const { t } = useI18n()
return (
<Card title={t('resource.file.file_details')}>
<NForm
rules={this.rules}
ref='fileFormRef'
class={styles['form-content']}
>
<NFormItem label={t('resource.file.file_name')} path='fileName'>
<NInput
allowInput={this.trim}
v-model={[this.fileForm.fileName, 'value']}
placeholder={t('resource.file.enter_name_tips')}
style={{ width: '300px' }}
class='input-file-name'
/>
</NFormItem>
<NFormItem label={t('resource.file.file_format')} path='suffix'>
<NSelect
defaultValue={[this.fileForm.suffix]}
v-model={[this.fileForm.suffix, 'value']}
options={this.fileSuffixOptions}
style={{ width: '100px' }}
class='select-file-format'
/>
</NFormItem>
<NFormItem label={t('resource.file.file_content')} path='content'>
<div
style={{
width: '90%'
}}
>
<MonacoEditor v-model={[this.fileForm.content, 'value']} />
</div>
</NFormItem>
<div class={styles['file-edit-content']}>
<div class={styles.submit}>
<div class={styles['file-edit-content']}>
<NForm
rules={this.rules}
ref='fileFormRef'
class={styles['form-content']}
>
<NFormItem label={t('resource.file.file_name')} path='fileName'>
<NInput
allowInput={this.trim}
v-model={[this.fileForm.fileName, 'value']}
placeholder={t('resource.file.enter_name_tips')}
style={{ width: '300px' }}
class='input-file-name'
/>
</NFormItem>
<NFormItem label={t('resource.file.file_format')} path='suffix'>
<NSelect
defaultValue={[this.fileForm.suffix]}
v-model={[this.fileForm.suffix, 'value']}
options={this.fileSuffixOptions}
style={{ width: '100px' }}
class='select-file-format'
/>
</NFormItem>
<NFormItem label={t('resource.file.file_content')} path='content'>
<MonacoEditor
v-model={[this.fileForm.content, 'value']}
height='calc(100vh - 440px)'
/>
</NFormItem>
<div class={styles['button-area']}>
<NButton
type='info'
size='small'
Expand All @@ -120,8 +117,8 @@ export default defineComponent({
{t('resource.file.return')}
</NButton>
</div>
</div>
</NForm>
</NForm>
</div>
</Card>
)
}
Expand Down
3 changes: 2 additions & 1 deletion dolphinscheduler-ui/src/views/resource/components/resource/edit/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,10 @@ export default defineComponent({
<NFormItem path='content'>
<MonacoEditor
v-model={[this.resourceViewRef.state.value.content, 'value']}
height='calc(100vh - 380px)'
/>
</NFormItem>
<NSpace>
<NSpace class={styles['button-area']}>
<NButton
type='info'
size='small'
Expand Down
9 changes: 8 additions & 1 deletion dolphinscheduler-ui/src/views/resource/components/resource/index.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

.file-edit-content {
width: 100%;
padding-bottom: 20px;
> h2 {
line-height: 60px;
text-align: center;
Expand All @@ -26,6 +25,14 @@
}
}

.editor-wrapper {
overflow: hidden;
}

.button-area {
padding: 16px 0;
}

.form-content {
padding: 0 50px 0 50px;
}
Expand Down
Loading