Unverified Commit f84f6ce6 authored by kezhenxu94's avatar kezhenxu94 Committed by GitHub
Browse files

Merge branch 'dev' into issue/1463

parents 26ec4745 85d4f03d

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
          <td width="50">

            <span>{{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}</span>

          </td>

          <td style="min-width: 200px;max-width: 300px;">

          <td style="min-width: 200px;max-width: 300px;padding-right: 10px;">

            <span class="ellipsis">

              <router-link :to="{ path: '/projects/definition/list/' + item.id}" tag="a" class="links" :title="item.name">

                {{item.name}}

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
          <td width="50">

            <span>{{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}</span>

          </td>

          <td style="min-width: 200px;max-width: 300px;">

          <td style="min-width: 200px;max-width: 300px;padding-right: 10px;">

            <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>

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue

+2 −2
Original line number Diff line number Diff line
@@ -65,10 +65,10 @@ 
          <td>

            <span>{{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}</span>

          </td>

          <td style="min-width: 200px;max-width: 300px;">

          <td style="min-width: 200px;max-width: 300px;padding-right: 10px;">

            <span class="ellipsis" :title="item.name">{{item.name}}</span>

          </td>

          <td style="min-width: 200px;max-width: 300px;"><a href="javascript:" class="links" @click="_go(item)"><span class="ellipsis" :title="item.processInstanceName">{{item.processInstanceName}}</span></a></td>

          <td style="min-width: 200px;max-width: 300px;padding-right: 10px;"><a href="javascript:" class="links" @click="_go(item)"><span class="ellipsis" :title="item.processInstanceName">{{item.processInstanceName}}</span></a></td>

          <td>

            <span v-if="item.executorName">{{item.executorName}}</span>

            <span v-else>-</span>