Browse Source

Merge pull request #9 from apache/dev

update
pull/2/head
samz406 5 years ago committed by GitHub
parent
commit
37dbabbde6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
  2. 4
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
  3. 26
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue

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

@ -25,7 +25,7 @@
<th scope="col" width="40"> <th scope="col" width="40">
<span>{{$t('#')}}</span> <span>{{$t('#')}}</span>
</th> </th>
<th scope="col"> <th scope="col" width="200">
<span>{{$t('Process Name')}}</span> <span>{{$t('Process Name')}}</span>
</th> </th>
<th scope="col" width="50"> <th scope="col" width="50">
@ -37,13 +37,13 @@
<th scope="col" width="130"> <th scope="col" width="130">
<span>{{$t('Update Time')}}</span> <span>{{$t('Update Time')}}</span>
</th> </th>
<th scope="col"> <th scope="col" width="150">
<span>{{$t('Description')}}</span> <span>{{$t('Description')}}</span>
</th> </th>
<th scope="col" width="130"> <th scope="col" width="80">
<span>{{$t('Modify User')}}</span> <span>{{$t('Modify User')}}</span>
</th> </th>
<th scope="col" width="90"> <th scope="col" width="80">
<span>{{$t('Timing state')}}</span> <span>{{$t('Timing state')}}</span>
</th> </th>
<th scope="col" width="300"> <th scope="col" width="300">

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

@ -25,7 +25,7 @@
<th scope="col" width="30"> <th scope="col" width="30">
<span>{{$t('#')}}</span> <span>{{$t('#')}}</span>
</th> </th>
<th scope="col" width="70"> <th scope="col" width="200">
<span>{{$t('Process Name')}}</span> <span>{{$t('Process Name')}}</span>
</th> </th>
<th scope="col" width="60"> <th scope="col" width="60">
@ -56,7 +56,9 @@
<span>{{$t('fault-tolerant sign')}}</span> <span>{{$t('fault-tolerant sign')}}</span>
</th> </th>
<th scope="col" width="30"> <th scope="col" width="30">
<div style="width: 30px">
<span>{{$t('State')}}</span> <span>{{$t('State')}}</span>
</div>
</th> </th>
<th scope="col" width="210"> <th scope="col" width="210">
<span>{{$t('Operation')}}</span> <span>{{$t('Operation')}}</span>

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

@ -15,6 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
<template> <template>
<div class="wrap-table">
<m-list-construction :title="$t('Process Instance')"> <m-list-construction :title="$t('Process Instance')">
<template slot="conditions"> <template slot="conditions">
<m-instance-conditions @on-query="_onQuery"></m-instance-conditions> <m-instance-conditions @on-query="_onQuery"></m-instance-conditions>
@ -33,6 +34,7 @@
<m-spin :is-spin="isLoading" :is-left="isLeft"></m-spin> <m-spin :is-spin="isLoading" :is-left="isLeft"></m-spin>
</template> </template>
</m-list-construction> </m-list-construction>
</div>
</template> </template>
<script> <script>
import _ from 'lodash' import _ from 'lodash'
@ -196,4 +198,28 @@
</script> </script>
<style lang="scss" rel="stylesheet/scss"> <style lang="scss" rel="stylesheet/scss">
.wrap-table {
.table-box {
overflow-y: scroll;
}
.table-box {
.fixed {
tr {
th:last-child,td:last-child {
background: inherit;
width: 230px;
height: 40px;
line-height: 40px;
border-left:1px solid #ecf3ff;
position: absolute;
right: 0;
z-index: 2;
}
th:nth-last-child(2) {
padding-right: 260px;
}
}
}
}
}
</style> </style>

Loading…
Cancel
Save