Browse Source

[Fix][UI Next][V1.0.0-Alpha] Fix the scale of the table on the task instance page is out of balance. (#9006)

3.0.0/version-upgrade
songjianet 3 years ago committed by GitHub
parent
commit
2e9740c39e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      dolphinscheduler-ui-next/src/views/projects/task/instance/index.tsx
  2. 14
      dolphinscheduler-ui-next/src/views/projects/task/instance/use-table.ts
  3. 7
      dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-auto-layout-modal.tsx
  4. 5
      dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/copy-modal.tsx
  5. 5
      dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/import-modal.tsx
  6. 5
      dolphinscheduler-ui-next/src/views/resource/file/folder/index.tsx
  7. 5
      dolphinscheduler-ui-next/src/views/resource/file/rename/index.tsx
  8. 5
      dolphinscheduler-ui-next/src/views/resource/file/upload/index.tsx
  9. 10
      dolphinscheduler-ui-next/src/views/resource/udf/function/components/function-modal.tsx
  10. 5
      dolphinscheduler-ui-next/src/views/resource/udf/resource/components/folder-modal.tsx
  11. 5
      dolphinscheduler-ui-next/src/views/resource/udf/resource/components/upload-modal.tsx
  12. 8
      dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/detail.tsx

6
dolphinscheduler-ui-next/src/views/projects/task/instance/index.tsx

@ -182,7 +182,11 @@ const TaskInstance = defineComponent({
</NSpace> </NSpace>
</NCard> </NCard>
<Card class={styles['table-card']}> <Card class={styles['table-card']}>
<NDataTable columns={this.columns} data={this.tableData} /> <NDataTable
columns={this.columns}
data={this.tableData}
scrollX={1800}
/>
<div class={styles.pagination}> <div class={styles.pagination}>
<NPagination <NPagination
v-model:page={this.page} v-model:page={this.page}

14
dolphinscheduler-ui-next/src/views/projects/task/instance/use-table.ts

@ -73,7 +73,6 @@ export function useTable() {
{ {
title: t('project.task.workflow_instance'), title: t('project.task.workflow_instance'),
key: 'processInstanceName', key: 'processInstanceName',
width: 250,
render: (row: { render: (row: {
processInstanceId: number processInstanceId: number
processInstanceName: string processInstanceName: string
@ -106,18 +105,15 @@ export function useTable() {
}, },
{ {
title: t('project.task.submit_time'), title: t('project.task.submit_time'),
key: 'submitTime', key: 'submitTime'
width: 170
}, },
{ {
title: t('project.task.start_time'), title: t('project.task.start_time'),
key: 'startTime', key: 'startTime'
width: 170
}, },
{ {
title: t('project.task.end_time'), title: t('project.task.end_time'),
key: 'endTime', key: 'endTime'
width: 170
}, },
{ {
title: t('project.task.duration'), title: t('project.task.duration'),
@ -134,13 +130,13 @@ export function useTable() {
}, },
{ {
title: t('project.task.host'), title: t('project.task.host'),
key: 'host', key: 'host'
width: 160
}, },
{ {
title: t('project.task.operation'), title: t('project.task.operation'),
key: 'operation', key: 'operation',
width: 150, width: 150,
fixed: 'right',
render(row: any) { render(row: any) {
return h(NSpace, null, { return h(NSpace, null, {
default: () => [ default: () => [

7
dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-auto-layout-modal.tsx

@ -67,12 +67,7 @@ export default defineComponent({
onCancel={cancel} onCancel={cancel}
autoFocus={false} autoFocus={false}
> >
<NForm <NForm model={formValue.value} rules={{}} size='medium' ref={formRef}>
model={formValue.value}
rules={{}}
size='medium'
ref={formRef}
>
<NFormItem label={t('project.dag.layout_type')} path='type'> <NFormItem label={t('project.dag.layout_type')} path='type'>
<NRadioGroup <NRadioGroup
v-model={[formValue.value.type, 'value']} v-model={[formValue.value.type, 'value']}

5
dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/copy-modal.tsx

@ -92,10 +92,7 @@ export default defineComponent({
onConfirm={this.handleCopy} onConfirm={this.handleCopy}
confirmLoading={this.saving} confirmLoading={this.saving}
> >
<NForm <NForm rules={this.copyRules} ref='copyFormRef'>
rules={this.copyRules}
ref='copyFormRef'
>
<NFormItem <NFormItem
label={t('project.workflow.project_name')} label={t('project.workflow.project_name')}
path='projectCode' path='projectCode'

5
dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/import-modal.tsx

@ -69,10 +69,7 @@ export default defineComponent({
onConfirm={this.handleImport} onConfirm={this.handleImport}
confirmLoading={this.saving} confirmLoading={this.saving}
> >
<NForm <NForm rules={this.importRules} ref='importFormRef'>
rules={this.importRules}
ref='importFormRef'
>
<NFormItem label={t('project.workflow.upload_file')} path='file'> <NFormItem label={t('project.workflow.upload_file')} path='file'>
<NButton> <NButton>
<NUpload <NUpload

5
dolphinscheduler-ui-next/src/views/resource/file/folder/index.tsx

@ -63,10 +63,7 @@ export default defineComponent({
cancelClassName='btn-cancel' cancelClassName='btn-cancel'
confirmLoading={this.saving} confirmLoading={this.saving}
> >
<NForm <NForm rules={this.rules} ref='folderFormRef'>
rules={this.rules}
ref='folderFormRef'
>
<NFormItem label={t('resource.file.folder_name')} path='name'> <NFormItem label={t('resource.file.folder_name')} path='name'>
<NInput <NInput
v-model={[this.folderForm.name, 'value']} v-model={[this.folderForm.name, 'value']}

5
dolphinscheduler-ui-next/src/views/resource/file/rename/index.tsx

@ -79,10 +79,7 @@ export default defineComponent({
cancelClassName='btn-cancel' cancelClassName='btn-cancel'
confirmLoading={this.saving} confirmLoading={this.saving}
> >
<NForm <NForm rules={this.rules} ref='renameFormRef'>
rules={this.rules}
ref='renameFormRef'
>
<NFormItem label={t('resource.file.name')} path='name'> <NFormItem label={t('resource.file.name')} path='name'>
<NInput <NInput
v-model={[this.renameForm.name, 'value']} v-model={[this.renameForm.name, 'value']}

5
dolphinscheduler-ui-next/src/views/resource/file/upload/index.tsx

@ -69,10 +69,7 @@ export default defineComponent({
cancelClassName='btn-cancel' cancelClassName='btn-cancel'
confirmLoading={this.saving} confirmLoading={this.saving}
> >
<NForm <NForm rules={this.rules} ref='uploadFormRef'>
rules={this.rules}
ref='uploadFormRef'
>
<NFormItem label={t('resource.file.file_name')} path='name'> <NFormItem label={t('resource.file.file_name')} path='name'>
<NInput <NInput
v-model={[this.uploadForm.name, 'value']} v-model={[this.uploadForm.name, 'value']}

10
dolphinscheduler-ui-next/src/views/resource/udf/function/components/function-modal.tsx

@ -128,10 +128,7 @@ export default defineComponent({
cancelClassName='btn-cancel' cancelClassName='btn-cancel'
confirmLoading={this.saving} confirmLoading={this.saving}
> >
<NForm <NForm rules={this.rules} ref='functionFormRef'>
rules={this.rules}
ref='functionFormRef'
>
<NFormItem label={t('resource.function.type')} path='type'> <NFormItem label={t('resource.function.type')} path='type'>
<NRadioGroup <NRadioGroup
v-model={[this.functionForm.type, 'value']} v-model={[this.functionForm.type, 'value']}
@ -189,10 +186,7 @@ export default defineComponent({
</NInputGroup> </NInputGroup>
</NFormItem> </NFormItem>
{this.uploadShow && ( {this.uploadShow && (
<NForm <NForm rules={this.uploadRules} ref='uploadFormRef'>
rules={this.uploadRules}
ref='uploadFormRef'
>
<NFormItem <NFormItem
label={t('resource.function.udf_resources_directory')} label={t('resource.function.udf_resources_directory')}
path='pid' path='pid'

5
dolphinscheduler-ui-next/src/views/resource/udf/resource/components/folder-modal.tsx

@ -83,10 +83,7 @@ export default defineComponent({
cancelClassName='btn-cancel' cancelClassName='btn-cancel'
confirmLoading={this.saving} confirmLoading={this.saving}
> >
<NForm <NForm rules={this.rules} ref='folderFormRef'>
rules={this.rules}
ref='folderFormRef'
>
<NFormItem label={t('resource.udf.folder_name')} path='name'> <NFormItem label={t('resource.udf.folder_name')} path='name'>
<NInput <NInput
v-model={[this.folderForm.name, 'value']} v-model={[this.folderForm.name, 'value']}

5
dolphinscheduler-ui-next/src/views/resource/udf/resource/components/upload-modal.tsx

@ -70,10 +70,7 @@ export default defineComponent({
cancelClassName='btn-cancel' cancelClassName='btn-cancel'
confirmLoading={this.saving} confirmLoading={this.saving}
> >
<NForm <NForm rules={this.rules} ref='uploadFormRef'>
rules={this.rules}
ref='uploadFormRef'
>
<NFormItem label={t('resource.udf.file_name')} path='name'> <NFormItem label={t('resource.udf.file_name')} path='name'>
<NInput <NInput
v-model={[this.uploadForm.name, 'value']} v-model={[this.uploadForm.name, 'value']}

8
dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/detail.tsx

@ -15,13 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
import { import { defineComponent, toRefs, watch, onMounted, ref } from 'vue'
defineComponent,
toRefs,
watch,
onMounted,
ref
} from 'vue'
import { NSelect, NInput } from 'naive-ui' import { NSelect, NInput } from 'naive-ui'
import { isFunction } from 'lodash' import { isFunction } from 'lodash'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'

Loading…
Cancel
Save