Commit adbfcbc6 authored by 向偲彪's avatar 向偲彪
Browse files

The background color of the list is deepened, and the workflow layout page and... 

The background color of the list is deepened, and the workflow layout page and job definition page display dag automatic layout button
parent 21bd3c14

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue

+2 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
                  icon="ans-icon-triangle-solid-right"

                  size="xsmall"

                  data-container="body"

                  v-if="type === 'instance'"

                  v-if="(type === 'instance' || 'definition') && urlParam.id !=undefined"

                  style="vertical-align: middle;"

                  @click="dagAutomaticLayout">

          </x-button>
@@ -155,6 +155,7 @@ 
        isLoading: false,

        taskId: null,

        arg: false,



      }

    },

    mixins: [disabledState],

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

+3 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
          <th scope="col" style="min-width: 40px">

            <span>{{$t('#')}}</span>

          </th>

          <th scope="col" style="min-width: 200px">

          <th scope="col" style="min-width: 200px;max-width: 300px;">

            <span>{{$t('Process Name')}}</span>

          </th>

          <th scope="col" style="min-width: 50px">
@@ -57,9 +57,9 @@ 
          <td width="50">

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

          </td>

          <td>

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

            <span class="ellipsis">

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

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

                {{item.name}}

              </router-link>

            </span>

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

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
          <th scope="col" style="min-width: 30px">

            <span>{{$t('#')}}</span>

          </th>

          <th scope="col" style="min-width: 300px">

          <th scope="col" style="min-width: 200px;max-width: 300px;">

            <span>{{$t('Process Name')}}</span>

          </th>

          <th scope="col" style="min-width: 30px">
@@ -69,7 +69,7 @@ 
          <td width="50">

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

          </td>

          <td>

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

            <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

+4 −4
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@ 
          <th scope="col" style="min-width: 50px">

            <span>{{$t('#')}}</span>

          </th>

          <th scope="col" style="min-width: 250px">

          <th scope="col" style="min-width: 200px;max-width: 300px;">

            <span>{{$t('Name')}}</span>

          </th>

          <th scope="col" style="min-width: 250px">

          <th scope="col" style="min-width: 200px;max-width: 300px;">

            <span>{{$t('Process Instance')}}</span>

          </th>

          <th scope="col" style="min-width: 60px">
@@ -65,10 +65,10 @@ 
          <td>

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

          </td>

          <td>

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

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

          </td>

          <td><a href="javascript:" class="links" @click="_go(item)"><span class="ellipsis">{{item.processInstanceName}}</span></a></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>

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

            <span v-else>-</span>

dolphinscheduler-ui/src/sass/common/_table.scss

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ 
      font-size: 12px;

      border-bottom: 1px solid #ecf3ff;

      &:hover {

        background: #f6faff;

        background: #ddecff;

      }

      th,td{

        &:nth-child(1) {
@@ -165,7 +165,7 @@ 
      }

      &:hover {

        td {

          background: #f6faff;

          background: #ddecff;

        }

      }

    }