This is an automated email from the ASF dual-hosted git repository. benjobs pushed a commit to branch FE in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit c157d26d03c89b46c8b0def984e4c6a3b57ff79b Author: benjobs <[email protected]> AuthorDate: Sun Sep 15 00:40:25 2024 +0800 [Improve] FE style improvement --- .../src/views/flink/app/Detail.vue | 2 +- .../src/views/flink/app/View.vue | 15 +++------------ .../src/views/flink/app/hooks/useApp.tsx | 10 +++------- .../src/views/flink/app/hooks/useAppTableAction.ts | 12 ++++++------ .../src/views/flink/project/View.vue | 2 +- 5 files changed, 14 insertions(+), 27 deletions(-) diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/Detail.vue b/streampark-console/streampark-console-webapp/src/views/flink/app/Detail.vue index bd95c760c..ec591fbf0 100644 --- a/streampark-console/streampark-console-webapp/src/views/flink/app/Detail.vue +++ b/streampark-console/streampark-console-webapp/src/views/flink/app/Detail.vue @@ -49,7 +49,7 @@ const { t } = useI18n(); - const appNotRunning = ref(false); + const appNotRunning = ref(true); const yarn = ref(''); const externalLinks = ref<ExternalLink[]>([]); diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/View.vue b/streampark-console/streampark-console-webapp/src/views/flink/app/View.vue index d8772c3be..6e9cf1149 100644 --- a/streampark-console/streampark-console-webapp/src/views/flink/app/View.vue +++ b/streampark-console/streampark-console-webapp/src/views/flink/app/View.vue @@ -39,7 +39,6 @@ import { BasicTable, TableAction } from '/@/components/Table'; import { AppListRecord } from '/@/api/flink/app/app.type'; import { releaseTitleMap } from './data'; - import { handleView } from './utils'; import { useDrawer } from '/@/components/Drawer'; import { useModal } from '/@/components/Modal'; @@ -213,10 +212,8 @@ ); /* view */ - async function handleJobView(app: AppListRecord) { - if (app['appControl']['allowView'] === true) { - await handleView(app); - } + function handleJobView(app: AppListRecord) { + router.push({ path: '/flink/app/detail', query: { appId: app.id } }); } /* Update options data */ @@ -347,13 +344,7 @@ <template v-if="column.dataIndex === 'jobName'"> <span class="app_type app_jar" v-if="record['jobType'] === JobTypeEnum.JAR"> JAR </span> <span class="app_type app_sql" v-if="record['jobType'] === JobTypeEnum.SQL"> SQL </span> - <span - class="link" - :class="{ - 'cursor-pointer': record['appControl']['allowView'] === true, - }" - @click="handleJobView(record)" - > + <span class="link cursor-pointer" @click="handleJobView(record)"> <Popover :title="t('common.detailText')"> <template #content> <div class="flex"> diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useApp.tsx b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useApp.tsx index b0b627545..6ed5bfe92 100644 --- a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useApp.tsx +++ b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useApp.tsx @@ -226,11 +226,7 @@ export const useFlinkApplication = (openStartModal: Fn) => { ], content: () => { return ( - <Form - class="!pt-40px" - layout='vertical' - baseColProps = {{ span: 20, offset: 2 }} - > + <Form class="!pt-40px" layout="vertical" baseColProps={{ span: 20, offset: 2 }}> <Form.Item label="Job Name" validateStatus={unref(validateStatus)} @@ -321,8 +317,8 @@ export const useFlinkApplication = (openStartModal: Fn) => { class="!pt-40px" ref={mappingRef} name="mappingForm" - baseColProps = {{ span: 20, offset: 2 }} - layout='vertical' + baseColProps={{ span: 20, offset: 2 }} + layout="vertical" v-model:model={formValue} > <Form.Item label="Job Name"> diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useAppTableAction.ts b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useAppTableAction.ts index 81f0171b7..ec5557c0b 100644 --- a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useAppTableAction.ts +++ b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useAppTableAction.ts @@ -100,18 +100,18 @@ export const useAppTableAction = ( icon: 'ant-design:pause-circle-outlined', onClick: handleCancel.bind(null, record), }, - { - tooltip: { title: t('flink.app.operation.edit') }, - auth: 'app:update', - icon: 'clarity:note-edit-line', - onClick: handleEdit.bind(null, record, currentPageNo), - }, { tooltip: { title: t('flink.app.operation.detail') }, auth: 'app:detail', icon: 'carbon:data-view-alt', onClick: handleDetail.bind(null, record), }, + { + tooltip: { title: t('flink.app.operation.edit') }, + auth: 'app:update', + icon: 'clarity:note-edit-line', + onClick: handleEdit.bind(null, record, currentPageNo), + }, { tooltip: { title: t('flink.app.operation.startLog') }, ifShow: [ExecModeEnum.KUBERNETES_SESSION, ExecModeEnum.KUBERNETES_APPLICATION].includes( diff --git a/streampark-console/streampark-console-webapp/src/views/flink/project/View.vue b/streampark-console/streampark-console-webapp/src/views/flink/project/View.vue index eb5798e91..94c564cc4 100644 --- a/streampark-console/streampark-console-webapp/src/views/flink/project/View.vue +++ b/streampark-console/streampark-console-webapp/src/views/flink/project/View.vue @@ -294,7 +294,7 @@ handlePageDataReload(true); } start(); - }, 2000); + }, 5000); /* View log */ function handleViewLog(value: Recordable) {
