You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by so...@apache.org on 2022/03/18 14:18:52 UTC
[dolphinscheduler] branch dev updated: [Feature][UI Next][V1.0.0-Alpha] The label of the form in the unified project is arranged up and down. (#8991)
This is an automated email from the ASF dual-hosted git repository.
songjian pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 7d94ada [Feature][UI Next][V1.0.0-Alpha] The label of the form in the unified project is arranged up and down. (#8991)
7d94ada is described below
commit 7d94adabc8073e00263f982ed7882b8cb7b03a63
Author: labbomb <73...@qq.com>
AuthorDate: Fri Mar 18 22:18:45 2022 +0800
[Feature][UI Next][V1.0.0-Alpha] The label of the form in the unified project is arranged up and down. (#8991)
* The label of the form in the unified project is arranged up and down
* delete label-width
---
dolphinscheduler-ui-next/src/views/datasource/list/detail.tsx | 2 --
.../views/projects/workflow/components/dag/dag-auto-layout-modal.tsx | 2 --
.../src/views/projects/workflow/definition/components/copy-modal.tsx | 2 --
.../views/projects/workflow/definition/components/import-modal.tsx | 2 --
.../src/views/projects/workflow/definition/components/start-modal.tsx | 2 +-
.../views/projects/workflow/definition/components/timing-modal.tsx | 2 +-
dolphinscheduler-ui-next/src/views/resource/file/create/index.tsx | 2 --
dolphinscheduler-ui-next/src/views/resource/file/folder/index.tsx | 2 --
dolphinscheduler-ui-next/src/views/resource/file/rename/index.tsx | 2 --
dolphinscheduler-ui-next/src/views/resource/file/upload/index.tsx | 2 --
.../src/views/resource/udf/function/components/function-modal.tsx | 4 ----
.../src/views/resource/udf/resource/components/folder-modal.tsx | 2 --
.../src/views/resource/udf/resource/components/upload-modal.tsx | 2 --
.../src/views/security/tenant-manage/components/tenant-modal.tsx | 2 --
14 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/dolphinscheduler-ui-next/src/views/datasource/list/detail.tsx b/dolphinscheduler-ui-next/src/views/datasource/list/detail.tsx
index 2d4f76d..08a66b9 100644
--- a/dolphinscheduler-ui-next/src/views/datasource/list/detail.tsx
+++ b/dolphinscheduler-ui-next/src/views/datasource/list/detail.tsx
@@ -141,8 +141,6 @@ const DetailModal = defineComponent({
rules={rules}
ref='detailFormRef'
require-mark-placement='left'
- label-placement='left'
- label-width={180}
label-align='right'
>
<NFormItem
diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-auto-layout-modal.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-auto-layout-modal.tsx
index 3cfcb0e..427a93d 100644
--- a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-auto-layout-modal.tsx
+++ b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-auto-layout-modal.tsx
@@ -68,11 +68,9 @@ export default defineComponent({
autoFocus={false}
>
<NForm
- label-width='80'
model={formValue.value}
rules={{}}
size='medium'
- label-placement='left'
ref={formRef}
>
<NFormItem label={t('project.dag.layout_type')} path='type'>
diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/copy-modal.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/copy-modal.tsx
index 487175f..c93be0b 100644
--- a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/copy-modal.tsx
+++ b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/copy-modal.tsx
@@ -95,8 +95,6 @@ export default defineComponent({
<NForm
rules={this.copyRules}
ref='copyFormRef'
- label-placement='left'
- label-width='160'
>
<NFormItem
label={t('project.workflow.project_name')}
diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/import-modal.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/import-modal.tsx
index ddb084d..ffea6ab 100644
--- a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/import-modal.tsx
+++ b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/import-modal.tsx
@@ -72,8 +72,6 @@ export default defineComponent({
<NForm
rules={this.importRules}
ref='importFormRef'
- label-placement='left'
- label-width='160'
>
<NFormItem label={t('project.workflow.upload_file')} path='file'>
<NButton>
diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/start-modal.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/start-modal.tsx
index 4201fe7..69758df 100644
--- a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/start-modal.tsx
+++ b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/start-modal.tsx
@@ -219,7 +219,7 @@ export default defineComponent({
onConfirm={this.handleStart}
confirmLoading={this.saving}
>
- <NForm ref='startFormRef' label-placement='left' label-width='160'>
+ <NForm ref='startFormRef'>
<NFormItem
label={t('project.workflow.workflow_name')}
path='workflow_name'
diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/timing-modal.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/timing-modal.tsx
index 1590619..b04f282 100644
--- a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/timing-modal.tsx
+++ b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/timing-modal.tsx
@@ -260,7 +260,7 @@ export default defineComponent({
onConfirm={this.handleTiming}
confirmLoading={this.saving}
>
- <NForm ref='timingFormRef' label-placement='left' label-width='160'>
+ <NForm ref='timingFormRef'>
<NFormItem
label={t('project.workflow.start_and_stop_time')}
path='startEndTime'
diff --git a/dolphinscheduler-ui-next/src/views/resource/file/create/index.tsx b/dolphinscheduler-ui-next/src/views/resource/file/create/index.tsx
index 06be655..31e8453 100644
--- a/dolphinscheduler-ui-next/src/views/resource/file/create/index.tsx
+++ b/dolphinscheduler-ui-next/src/views/resource/file/create/index.tsx
@@ -68,8 +68,6 @@ export default defineComponent({
<NForm
rules={this.rules}
ref='fileFormRef'
- label-placement='left'
- label-width='160'
class={styles['form-content']}
>
<NFormItem label={t('resource.file.file_name')} path='fileName'>
diff --git a/dolphinscheduler-ui-next/src/views/resource/file/folder/index.tsx b/dolphinscheduler-ui-next/src/views/resource/file/folder/index.tsx
index 318d12b..98b4c79 100644
--- a/dolphinscheduler-ui-next/src/views/resource/file/folder/index.tsx
+++ b/dolphinscheduler-ui-next/src/views/resource/file/folder/index.tsx
@@ -66,8 +66,6 @@ export default defineComponent({
<NForm
rules={this.rules}
ref='folderFormRef'
- label-placement='left'
- label-width='160'
>
<NFormItem label={t('resource.file.folder_name')} path='name'>
<NInput
diff --git a/dolphinscheduler-ui-next/src/views/resource/file/rename/index.tsx b/dolphinscheduler-ui-next/src/views/resource/file/rename/index.tsx
index 5ad0147..12358ef 100644
--- a/dolphinscheduler-ui-next/src/views/resource/file/rename/index.tsx
+++ b/dolphinscheduler-ui-next/src/views/resource/file/rename/index.tsx
@@ -82,8 +82,6 @@ export default defineComponent({
<NForm
rules={this.rules}
ref='renameFormRef'
- label-placement='left'
- label-width='160'
>
<NFormItem label={t('resource.file.name')} path='name'>
<NInput
diff --git a/dolphinscheduler-ui-next/src/views/resource/file/upload/index.tsx b/dolphinscheduler-ui-next/src/views/resource/file/upload/index.tsx
index c63fbb6..ff88afa 100644
--- a/dolphinscheduler-ui-next/src/views/resource/file/upload/index.tsx
+++ b/dolphinscheduler-ui-next/src/views/resource/file/upload/index.tsx
@@ -72,8 +72,6 @@ export default defineComponent({
<NForm
rules={this.rules}
ref='uploadFormRef'
- label-placement='left'
- label-width='160'
>
<NFormItem label={t('resource.file.file_name')} path='name'>
<NInput
diff --git a/dolphinscheduler-ui-next/src/views/resource/udf/function/components/function-modal.tsx b/dolphinscheduler-ui-next/src/views/resource/udf/function/components/function-modal.tsx
index 7256691..d2000af 100644
--- a/dolphinscheduler-ui-next/src/views/resource/udf/function/components/function-modal.tsx
+++ b/dolphinscheduler-ui-next/src/views/resource/udf/function/components/function-modal.tsx
@@ -131,8 +131,6 @@ export default defineComponent({
<NForm
rules={this.rules}
ref='functionFormRef'
- label-placement='left'
- label-width='160'
>
<NFormItem label={t('resource.function.type')} path='type'>
<NRadioGroup
@@ -194,8 +192,6 @@ export default defineComponent({
<NForm
rules={this.uploadRules}
ref='uploadFormRef'
- label-placement='left'
- label-width='160'
>
<NFormItem
label={t('resource.function.udf_resources_directory')}
diff --git a/dolphinscheduler-ui-next/src/views/resource/udf/resource/components/folder-modal.tsx b/dolphinscheduler-ui-next/src/views/resource/udf/resource/components/folder-modal.tsx
index e6a737d..3ebf87e 100644
--- a/dolphinscheduler-ui-next/src/views/resource/udf/resource/components/folder-modal.tsx
+++ b/dolphinscheduler-ui-next/src/views/resource/udf/resource/components/folder-modal.tsx
@@ -86,8 +86,6 @@ export default defineComponent({
<NForm
rules={this.rules}
ref='folderFormRef'
- label-placement='left'
- label-width='160'
>
<NFormItem label={t('resource.udf.folder_name')} path='name'>
<NInput
diff --git a/dolphinscheduler-ui-next/src/views/resource/udf/resource/components/upload-modal.tsx b/dolphinscheduler-ui-next/src/views/resource/udf/resource/components/upload-modal.tsx
index 1a1c21a..90050db 100644
--- a/dolphinscheduler-ui-next/src/views/resource/udf/resource/components/upload-modal.tsx
+++ b/dolphinscheduler-ui-next/src/views/resource/udf/resource/components/upload-modal.tsx
@@ -73,8 +73,6 @@ export default defineComponent({
<NForm
rules={this.rules}
ref='uploadFormRef'
- label-placement='left'
- label-width='160'
>
<NFormItem label={t('resource.udf.file_name')} path='name'>
<NInput
diff --git a/dolphinscheduler-ui-next/src/views/security/tenant-manage/components/tenant-modal.tsx b/dolphinscheduler-ui-next/src/views/security/tenant-manage/components/tenant-modal.tsx
index eca45bb..9636f57 100644
--- a/dolphinscheduler-ui-next/src/views/security/tenant-manage/components/tenant-modal.tsx
+++ b/dolphinscheduler-ui-next/src/views/security/tenant-manage/components/tenant-modal.tsx
@@ -111,8 +111,6 @@ const TenantModal = defineComponent({
model={this.model}
rules={this.rules}
ref='tenantFormRef'
- label-placement='left'
- label-width={140}
require-mark-placement='left'
size='small'
style="{ maxWidth: '240px' }"