From 426b36ddaca2b5344d1153cf5aea943b45b9b39e Mon Sep 17 00:00:00 2001 From: dhb52 Date: Mon, 27 May 2024 22:50:25 +0800 Subject: [PATCH 01/12] =?UTF-8?q?refactor(sj=5F1.0.0):=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4CustomerTableHeaderOperation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/retry/task/index.vue | 15 +++- .../customer-table-header-operation.vue | 86 ------------------- 2 files changed, 11 insertions(+), 90 deletions(-) delete mode 100644 src/views/retry/task/modules/customer-table-header-operation.vue diff --git a/src/views/retry/task/index.vue b/src/views/retry/task/index.vue index 02d4cef..c47a046 100644 --- a/src/views/retry/task/index.vue +++ b/src/views/retry/task/index.vue @@ -14,7 +14,6 @@ import { useAppStore } from '@/store/modules/app'; import { useTable, useTableOperate } from '@/hooks/common/table'; import { retryTaskStatusTypeRecord, retryTaskTypeRecord } from '@/constants/business'; import { tagColor } from '@/utils/common'; -import CustomerTableHeaderOperation from './modules/customer-table-header-operation.vue'; import RetryTaskOperateDrawer from './modules/retry-task-operate-drawer.vue'; import RetryTaskBatchAddDrawer from './modules/retry-task-batch-add-drawer.vue'; import RetryTaskSearch from './modules/retry-task-search.vue'; @@ -311,15 +310,23 @@ async function updateRetryTaskStatus(id: number, groupName: string, retryStatus: header-class="view-card-header" > -defineOptions({ - name: 'CustomerTableHeaderOperation' -}); - -interface Props { - itemAlign?: NaiveUI.Align; - disabledDelete?: boolean; - loading?: boolean; - showDelete?: boolean; - showAdd?: boolean; -} - -withDefaults(defineProps(), { - showDelete: true, - showAdd: true -}); - -interface Emits { - (e: 'add'): void; - (e: 'batchAdd'): void; - (e: 'delete'): void; - (e: 'refresh'): void; -} - -const emit = defineEmits(); - -const columns = defineModel('columns', { - default: () => [] -}); - -function add() { - emit('add'); -} - -function batchAdd() { - emit('batchAdd'); -} - -function batchDelete() { - emit('delete'); -} - -function refresh() { - emit('refresh'); -} - - - - - From 6d32a839d9850f87fe210cb2cc4eadfd460b5f97 Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Mon, 27 May 2024 23:00:49 +0800 Subject: [PATCH 02/12] =?UTF-8?q?feat(sj=5F1.0.0=5Fbeta3):=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=BB=84=E5=AF=BC=E5=87=BA=E5=AF=BC=E5=85=A5=E5=92=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95=E6=8E=92=E5=BA=8F=201.=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=84=E7=9A=84=E5=AF=BC=E5=85=A5=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=202.=20=E8=B0=83=E6=95=B4=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=89=B9=E9=87=8F=E5=92=8C=E4=BB=BB=E5=8A=A1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=9A=84=E9=A1=BA=E5=BA=8F=203.=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E4=BB=BB=E5=8A=A1=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=92=8C=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=E7=9A=84=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=204.=20=E8=B0=83=E6=95=B4=E9=87=8D=E8=AF=95=E5=9C=BA?= =?UTF-8?q?=E6=99=AF=E7=9A=84=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/file-upload.vue | 5 ++- src/locales/langs/en-us.ts | 1 + src/locales/langs/zh-cn.ts | 1 + src/router/elegant/routes.ts | 62 +++++++++++++-------------- src/typings/app.d.ts | 1 + src/views/group/index.vue | 17 +++++++- 6 files changed, 53 insertions(+), 34 deletions(-) diff --git a/src/components/common/file-upload.vue b/src/components/common/file-upload.vue index e22591b..853dd63 100644 --- a/src/components/common/file-upload.vue +++ b/src/components/common/file-upload.vue @@ -1,9 +1,10 @@ Date: Mon, 27 May 2024 23:27:02 +0800 Subject: [PATCH 03/12] =?UTF-8?q?feat(sj=5F1.0.0=5Fbeta3):=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=8F=9C=E5=8D=95=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/elegant/routes.ts | 70 +++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/src/router/elegant/routes.ts b/src/router/elegant/routes.ts index 2a08ac6..2170882 100644 --- a/src/router/elegant/routes.ts +++ b/src/router/elegant/routes.ts @@ -215,16 +215,6 @@ export const generatedRoutes: GeneratedRoute[] = [ icon: 'eos-icons:cronjob' }, children: [ - { - name: 'job_task', - path: '/job/task', - component: 'view.job_task', - meta: { - title: 'job_task', - i18nKey: 'route.job_task', - icon: 'octicon:tasklist' - } - }, { name: 'job_batch', path: '/job/batch', @@ -232,7 +222,19 @@ export const generatedRoutes: GeneratedRoute[] = [ meta: { title: 'job_batch', i18nKey: 'route.job_batch', - icon: 'carbon:batch-job' + icon: 'carbon:batch-job', + order: 20 + } + }, + { + name: 'job_task', + path: '/job/task', + component: 'view.job_task', + meta: { + title: 'job_task', + i18nKey: 'route.job_task', + icon: 'octicon:tasklist', + order: 10 } } ] @@ -444,17 +446,6 @@ export const generatedRoutes: GeneratedRoute[] = [ icon: 'carbon:retry-failed' }, children: [ - { - name: 'retry_scene', - path: '/retry/scene', - component: 'view.retry_scene', - meta: { - title: 'retry_scene', - i18nKey: 'route.retry_scene', - icon: 'cbi:scene-dynamic', - order: 1 - } - }, { name: 'retry_dead-letter', path: '/retry/dead-letter', @@ -477,6 +468,17 @@ export const generatedRoutes: GeneratedRoute[] = [ order: 20 } }, + { + name: 'retry_scene', + path: '/retry/scene', + component: 'view.retry_scene', + meta: { + title: 'retry_scene', + i18nKey: 'route.retry_scene', + icon: 'cbi:scene-dynamic', + order: 1 + } + }, { name: 'retry_task', path: '/retry/task', @@ -537,16 +539,6 @@ export const generatedRoutes: GeneratedRoute[] = [ icon: 'lucide:workflow' }, children: [ - { - name: 'workflow_task', - path: '/workflow/task', - component: 'view.workflow_task', - meta: { - title: 'workflow_task', - i18nKey: 'route.workflow_task', - icon: 'octicon:tasklist' - } - }, { name: 'workflow_batch', path: '/workflow/batch', @@ -554,7 +546,8 @@ export const generatedRoutes: GeneratedRoute[] = [ meta: { title: 'workflow_batch', i18nKey: 'route.workflow_batch', - icon: 'carbon:batch-job' + icon: 'carbon:batch-job', + order: 10 } }, { @@ -607,6 +600,17 @@ export const generatedRoutes: GeneratedRoute[] = [ } } ] + }, + { + name: 'workflow_task', + path: '/workflow/task', + component: 'view.workflow_task', + meta: { + title: 'workflow_task', + i18nKey: 'route.workflow_task', + icon: 'octicon:tasklist', + order: 1 + } } ] } From 1049a082c2b6e9cc9b515b9f347775bf472e9536 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Tue, 28 May 2024 00:30:34 +0800 Subject: [PATCH 04/12] =?UTF-8?q?wip(sj=5F1.0.0):=20=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=AF=BC=E5=85=A5=E3=80=81=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/job/task/index.vue | 23 ++++++++++++++++++++++- src/views/retry/scene/index.vue | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/views/job/task/index.vue b/src/views/job/task/index.vue index 04a3298..e49b4a2 100644 --- a/src/views/job/task/index.vue +++ b/src/views/job/task/index.vue @@ -10,9 +10,11 @@ import { blockStrategyRecord, taskTypeRecord, triggerTypeRecord } from '@/consta import StatusSwitch from '@/components/common/status-switch.vue'; import { useRouterPush } from '@/hooks/common/router'; import { useAuth } from '@/hooks/business/auth'; +import { downloadFetch } from '@/utils/download'; import JobTaskOperateDrawer from './modules/job-task-operate-drawer.vue'; import JobTaskSearch from './modules/job-task-search.vue'; import JobTaskDetailDrawer from './modules/job-task-detail-drawer.vue'; + const { hasAuth } = useAuth(); const appStore = useAppStore(); @@ -33,6 +35,11 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP jobStatus: null }, columns: () => [ + { + type: 'selection', + align: 'center', + width: 48 + }, { key: 'index', title: $t('common.index'), @@ -245,6 +252,10 @@ async function handleTriggerJob(id: string) { function goToBatch(jobId: string) { routerPushByKey('job_batch', { query: { jobId } }); } + +function handleExport() { + downloadFetch('/job/export', checkedRowKeys.value, $t('page.jobTask.title')); +}