Unverified Commit 7477f9c9 authored by xingchun-chen's avatar xingchun-chen Committed by GitHub
Browse files

Merge pull request #2622 from break60/dev 

Fix worker grouping
parents 6127f3a4 cff7b888

dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue

+3 −25
Original line number Diff line number Diff line
@@ -34,9 +34,6 @@ 
          <th>

            <span>{{$t('Update Time')}}</span>

          </th>

          <th width="70">

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

          </th>

        </tr>

        <tr v-for="(item, $index) in list" :key="$index">

          <td>
@@ -48,7 +45,7 @@ 
            </span>

          </td>

          <td>

            <span>{{item.ipList}}</span>

            <span>{{item.ipList.join(',')}}</span>

          </td>

          <td>

            <span v-if="item.createTime">{{item.createTime | formatDate}}</span>
@@ -58,24 +55,6 @@ 
            <span v-if="item.updateTime">{{item.updateTime | formatDate}}</span>

            <span v-else>-</span>

          </td>

          <td>

            <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" icon="ans-icon-edit" :title="$t('Edit')" @click="_edit(item)">

            </x-button>

            <x-poptip

                    :ref="'poptip-delete-' + $index"

                    placement="bottom-end"

                    width="90">

              <p>{{$t('Delete?')}}</p>

              <div style="text-align: right; margin: 0;padding-top: 4px;">

                <x-button type="text" size="xsmall" shape="circle" @click="_closeDelete($index)">{{$t('Cancel')}}</x-button>

                <x-button type="primary" size="xsmall" shape="circle" @click="_delete(item,$index)">{{$t('Confirm')}}</x-button>

              </div>

              <template slot="reference">

                <x-button type="error" shape="circle" size="xsmall" data-toggle="tooltip" icon="ans-icon-trash" :title="$t('delete')">

                </x-button>

              </template>

            </x-poptip>

          </td>

        </tr>

      </table>

    </div>
@@ -128,8 +107,7 @@ 
    created () {

      this.list = this.workerGroupList

    },

    mounted () {

    },

    components: { }

    mounted () {},

    components: {},

  }

</script>
 
 No newline at end of file

dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue

+2 −7
Original line number Diff line number Diff line
@@ -17,11 +17,7 @@ 
<template>

  <m-list-construction :title="$t('Worker group manage')">

    <template slot="conditions">

      <m-conditions @on-conditions="_onConditions">

        <template slot="button-group" v-if="isADMIN">

          <x-button type="ghost" size="small" @click="_create('')">{{$t('Create worker group')}}</x-button>

        </template>

      </m-conditions>

      <m-conditions @on-conditions="_onConditions"></m-conditions>

    </template>

    <template slot="content">

      <template v-if="workerGroupList.length || total>0">
@@ -141,8 +137,7 @@ 
        this.searchParams.pageNo = _.isEmpty(a.query) ? 1 : a.query.pageNo

      }

    },

    created () {

    },

    created () {},

    mounted () {

      this.$modal.destroy()

    },

dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js

+9 −0
Original line number Diff line number Diff line
@@ -100,6 +100,15 @@ const menu = { 
      icon: 'ans-icon-danger-solid',

      children: []

    },

    {

      name: `${i18n.$t('Worker group manage')}`,

      id: 4,

      path: 'worker-groups-manage',

      isOpen: true,

      disabled: true,

      icon: 'ans-icon-diary',

      children: []

    },

    {

      name: `${i18n.$t('Queue manage')}`,

      id: 3,