Browse Source

Fix host being null, causing the list to not be displayed (#4718)

break60 4 years ago committed by GitHub
parent
commit
ac266eccaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
  2. 4
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue

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

@ -55,7 +55,7 @@
<th scope="col" style="min-width: 135px"> <th scope="col" style="min-width: 135px">
<span>{{$t('Executor')}}</span> <span>{{$t('Executor')}}</span>
</th> </th>
<th scope="col" :style="{'min-width': ((Math.max(list.length && list[0].host.length, 22) + 40) * 6) + 'px'}"> <th scope="col" style="max-width: 600px">
<span>{{$t('host')}}</span> <span>{{$t('host')}}</span>
</th> </th>
<th scope="col" style="min-width: 230px"> <th scope="col" style="min-width: 230px">
@ -93,7 +93,7 @@
<span v-if="item.executorName">{{item.executorName}}</span> <span v-if="item.executorName">{{item.executorName}}</span>
<span v-else>-</span> <span v-else>-</span>
</td> </td>
<td><span>{{item.host || '-'}}</span></td> <td style="max-width: 600px"><span style="padding-right: 5px">{{item.host || '-'}}</span></td>
<td style="z-index: inherit;"> <td style="z-index: inherit;">
<div v-show="item.disabled"> <div v-show="item.disabled">
<x-button type="info" <x-button type="info"

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

@ -46,7 +46,7 @@
<th scope="col" style="min-width: 130px"> <th scope="col" style="min-width: 130px">
<span>{{$t('End Time')}}</span> <span>{{$t('End Time')}}</span>
</th> </th>
<th scope="col" :style="{'min-width': (Math.max(list.length && list[0].host.length, 22) * 6) + 'px'}"> <th scope="col" style="max-width: 600px">
<span>{{$t('host')}}</span> <span>{{$t('host')}}</span>
</th> </th>
<th scope="col" style="min-width: 70px"> <th scope="col" style="min-width: 70px">
@ -87,7 +87,7 @@
<span v-if="item.endTime">{{item.endTime | formatDate}}</span> <span v-if="item.endTime">{{item.endTime | formatDate}}</span>
<span v-else>-</span> <span v-else>-</span>
</td> </td>
<td><span>{{item.host || '-'}}</span></td> <td style="max-width: 600px"><span style="padding-right: 5px">{{item.host || '-'}}</span></td>
<td><span>{{item.duration}}</span></td> <td><span>{{item.duration}}</span></td>
<td><span>{{item.retryTimes}}</span></td> <td><span>{{item.retryTimes}}</span></td>
<td> <td>

Loading…
Cancel
Save