Skip to content

Commit 5669e4b

Browse files
authored
[Improvement-17248][UI] Optimize file details display area to reduce blank space (#17731)
1 parent 0bc817e commit 5669e4b

File tree

4 files changed

+49
-39
lines changed

4 files changed

+49
-39
lines changed

dolphinscheduler-ui/src/components/monaco-editor/index.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ const props = {
5555
readOnly: false,
5656
language: 'shell'
5757
})
58+
},
59+
height: {
60+
type: String as PropType<string>,
61+
default: '300px'
5862
}
5963
}
6064

@@ -164,7 +168,8 @@ export default defineComponent({
164168
<div
165169
ref='editorRef'
166170
style={{
167-
height: '300px',
171+
height: this.height,
172+
minHeight: '150px',
168173
width: '100%',
169174
border: '1px solid #eee'
170175
}}

dolphinscheduler-ui/src/views/resource/components/resource/create/index.tsx

Lines changed: 33 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -66,40 +66,37 @@ export default defineComponent({
6666
const { t } = useI18n()
6767
return (
6868
<Card title={t('resource.file.file_details')}>
69-
<NForm
70-
rules={this.rules}
71-
ref='fileFormRef'
72-
class={styles['form-content']}
73-
>
74-
<NFormItem label={t('resource.file.file_name')} path='fileName'>
75-
<NInput
76-
allowInput={this.trim}
77-
v-model={[this.fileForm.fileName, 'value']}
78-
placeholder={t('resource.file.enter_name_tips')}
79-
style={{ width: '300px' }}
80-
class='input-file-name'
81-
/>
82-
</NFormItem>
83-
<NFormItem label={t('resource.file.file_format')} path='suffix'>
84-
<NSelect
85-
defaultValue={[this.fileForm.suffix]}
86-
v-model={[this.fileForm.suffix, 'value']}
87-
options={this.fileSuffixOptions}
88-
style={{ width: '100px' }}
89-
class='select-file-format'
90-
/>
91-
</NFormItem>
92-
<NFormItem label={t('resource.file.file_content')} path='content'>
93-
<div
94-
style={{
95-
width: '90%'
96-
}}
97-
>
98-
<MonacoEditor v-model={[this.fileForm.content, 'value']} />
99-
</div>
100-
</NFormItem>
101-
<div class={styles['file-edit-content']}>
102-
<div class={styles.submit}>
69+
<div class={styles['file-edit-content']}>
70+
<NForm
71+
rules={this.rules}
72+
ref='fileFormRef'
73+
class={styles['form-content']}
74+
>
75+
<NFormItem label={t('resource.file.file_name')} path='fileName'>
76+
<NInput
77+
allowInput={this.trim}
78+
v-model={[this.fileForm.fileName, 'value']}
79+
placeholder={t('resource.file.enter_name_tips')}
80+
style={{ width: '300px' }}
81+
class='input-file-name'
82+
/>
83+
</NFormItem>
84+
<NFormItem label={t('resource.file.file_format')} path='suffix'>
85+
<NSelect
86+
defaultValue={[this.fileForm.suffix]}
87+
v-model={[this.fileForm.suffix, 'value']}
88+
options={this.fileSuffixOptions}
89+
style={{ width: '100px' }}
90+
class='select-file-format'
91+
/>
92+
</NFormItem>
93+
<NFormItem label={t('resource.file.file_content')} path='content'>
94+
<MonacoEditor
95+
v-model={[this.fileForm.content, 'value']}
96+
height='calc(100vh - 440px)'
97+
/>
98+
</NFormItem>
99+
<div class={styles['button-area']}>
103100
<NButton
104101
type='info'
105102
size='small'
@@ -120,8 +117,8 @@ export default defineComponent({
120117
{t('resource.file.return')}
121118
</NButton>
122119
</div>
123-
</div>
124-
</NForm>
120+
</NForm>
121+
</div>
125122
</Card>
126123
)
127124
}

dolphinscheduler-ui/src/views/resource/components/resource/edit/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,10 @@ export default defineComponent({
9696
<NFormItem path='content'>
9797
<MonacoEditor
9898
v-model={[this.resourceViewRef.state.value.content, 'value']}
99+
height='calc(100vh - 380px)'
99100
/>
100101
</NFormItem>
101-
<NSpace>
102+
<NSpace class={styles['button-area']}>
102103
<NButton
103104
type='info'
104105
size='small'

dolphinscheduler-ui/src/views/resource/components/resource/index.module.scss

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
.file-edit-content {
1919
width: 100%;
20-
padding-bottom: 20px;
2120
> h2 {
2221
line-height: 60px;
2322
text-align: center;
@@ -26,6 +25,14 @@
2625
}
2726
}
2827

28+
.editor-wrapper {
29+
overflow: hidden;
30+
}
31+
32+
.button-area {
33+
padding: 16px 0;
34+
}
35+
2936
.form-content {
3037
padding: 0 50px 0 50px;
3138
}

0 commit comments

Comments
 (0)