This is an automated email from the ASF dual-hosted git repository.

benjobs pushed a commit to branch dev-2.1.5
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git


The following commit(s) were added to refs/heads/dev-2.1.5 by this push:
     new 6c2a5fe63 [Improve] FE style improvement (#4066)
6c2a5fe63 is described below

commit 6c2a5fe63fccdc397d3740c9c7f684d801c14eea
Author: benjobs <[email protected]>
AuthorDate: Sun Sep 15 15:06:18 2024 +0800

    [Improve] FE style improvement (#4066)
---
 .../src/views/flink/app/Detail.vue                        |  2 +-
 .../src/views/flink/app/View.vue                          | 15 +++------------
 .../src/views/flink/app/hooks/useAppTableAction.ts        | 12 ++++++------
 .../src/views/flink/project/View.vue                      |  2 +-
 4 files changed, 11 insertions(+), 20 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/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) {

Reply via email to