From c01122b440dc8a3c38d7cb48cf3081636451c235 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Thu, 30 Apr 2020 17:40:45 +0800
Subject: [PATCH] Optimize workflow instance page

---
 .../instance/pages/list/_source/list.vue      | 47 +++++++++----------
 .../pages/instance/pages/list/index.vue       |  1 +
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
index af0036ab12..2996f7d731 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
@@ -19,48 +19,48 @@
     <div class="table-box">
       <table class="fixed">
         <tr>
-          <th scope="col" width="50">
+          <th scope="col" style="min-width: 50px">
             <x-checkbox @on-change="_topCheckBoxClick" v-model="checkAll"></x-checkbox>
           </th>
-          <th scope="col" width="30">
+          <th scope="col" style="min-width: 30px">
             <span>{{$t('#')}}</span>
           </th>
-          <th scope="col" width="200">
+          <th scope="col" style="min-width: 300px">
             <span>{{$t('Process Name')}}</span>
           </th>
-          <th scope="col" width="60">
-            <span>{{$t('Executor')}}</span>
+          <th scope="col" style="min-width: 30px">
+            <span>{{$t('State')}}</span>
           </th>
-          <th scope="col" width="70">
+          <th scope="col" style="min-width: 70px">
             <span>{{$t('Run Type')}}</span>
           </th>
-          <th scope="col" width="130">
+          <th scope="col" style="min-width: 130px">
             <span>{{$t('Scheduling Time')}}</span>
           </th>
-          <th scope="col" width="130">
+          <th scope="col" style="min-width: 130px">
             <span>{{$t('Start Time')}}</span>
           </th>
-          <th scope="col" width="130">
+          <th scope="col" style="min-width: 130px">
             <span>{{$t('End Time')}}</span>
           </th>
-          <th scope="col" width="60">
+          <th scope="col" style="min-width: 60px">
             <span>{{$t('Duration')}}s</span>
           </th>
-          <th scope="col" width="60">
+          <th scope="col" style="min-width: 60px">
             <span>{{$t('Run Times')}}</span>
           </th>
-          <th scope="col" width="125">
-            <span>{{$t('host')}}</span>
-          </th>
-          <th scope="col" width="55">
+          <th scope="col" style="min-width: 55px">
             <span>{{$t('fault-tolerant sign')}}</span>
           </th>
-          <th scope="col" width="30">
-            <div style="width: 30px">
-              <span>{{$t('State')}}</span>
+          <th scope="col" style="min-width: 135px">
+            <span>{{$t('host')}}</span>
+          </th>
+          <th scope="col" style="min-width: 60px">
+            <div style="width: 60px">
+              <span>{{$t('Executor')}}</span>
             </div>
           </th>
-          <th scope="col" width="210">
+          <th scope="col" style="min-width: 210px">
             <span>{{$t('Operation')}}</span>
           </th>
         </tr>
@@ -73,8 +73,7 @@
             <span class="ellipsis" style="padding-left: 4px;"><router-link :to="{ path: '/projects/instance/list/' + item.id}" tag="a" class="links" :title="item.name">{{item.name}}</router-link></span>
           </td>
           <td>
-            <span style="word-break: break-all" v-if="item.executorName">{{item.executorName}}</span>
-            <span v-else>-</span>
+            <span v-html="_rtState(item.state)" style="cursor: pointer;"></span>
           </td>
           <td><span>{{_rtRunningType(item.commandType)}}</span></td>
           <td>
@@ -91,14 +90,14 @@
           </td>
           <td width="70"><span>{{item.duration || '-'}}</span></td>
           <td width="70"><span>{{item.runTimes}}</span></td>
+          <td><span>{{item.recovery}}</span></td>
           <td>
             <span v-if="item.host">{{item.host}}</span>
             <span v-else>-</span>
           </td>
-          <td><span>{{item.recovery}}</span></td>
-
           <td>
-            <span v-html="_rtState(item.state)" style="cursor: pointer;"></span>
+            <span style="word-break: break-all" v-if="item.executorName">{{item.executorName}}</span>
+            <span v-else>-</span>
           </td>
           <td>
             <div v-show="item.disabled">
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
index 4a4206218a..d26da294f3 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
@@ -204,6 +204,7 @@
     }
     .table-box {
       .fixed {
+        table-layout: auto;
         tr {
           th:last-child,td:last-child {
             background: inherit;