From 21fa3148e426b9d6382a07d9f5a5830cf74c6bec Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Thu, 7 May 2020 17:33:04 +0800
Subject: [PATCH] Fix worker grouping

---
 .../pages/security/pages/workerGroups/_source/list.vue | 10 +++++-----
 .../home/pages/security/pages/workerGroups/index.vue   |  4 ++--
 dolphinscheduler-ui/src/js/conf/home/router/index.js   |  8 ++++++++
 .../js/module/components/secondaryMenu/_source/menu.js |  9 +++++++++
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue
index edfdee20b..8cb7116a3 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue
@@ -34,9 +34,9 @@
           <th>
             <span>{{$t('Update Time')}}</span>
           </th>
-          <th width="70">
+          <!-- <th width="70">
             <span>{{$t('Operation')}}</span>
-          </th>
+          </th> -->
         </tr>
         <tr v-for="(item, $index) in list" :key="$index">
           <td>
@@ -48,7 +48,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,7 +58,7 @@
             <span v-if="item.updateTime">{{item.updateTime | formatDate}}</span>
             <span v-else>-</span>
           </td>
-          <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
@@ -75,7 +75,7 @@
                 </x-button>
               </template>
             </x-poptip>
-          </td>
+          </td> -->
         </tr>
       </table>
     </div>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue
index 54a0440c5..c73545390 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue
@@ -18,9 +18,9 @@
   <m-list-construction :title="$t('Worker group manage')">
     <template slot="conditions">
       <m-conditions @on-conditions="_onConditions">
-        <template slot="button-group" v-if="isADMIN">
+        <!-- <template slot="button-group" v-if="isADMIN">
           <x-button type="ghost" size="small" @click="_create('')">{{$t('Create worker group')}}</x-button>
-        </template>
+        </template> -->
       </m-conditions>
     </template>
     <template slot="content">
diff --git a/dolphinscheduler-ui/src/js/conf/home/router/index.js b/dolphinscheduler-ui/src/js/conf/home/router/index.js
index 91e015b2f..b4236f368 100644
--- a/dolphinscheduler-ui/src/js/conf/home/router/index.js
+++ b/dolphinscheduler-ui/src/js/conf/home/router/index.js
@@ -374,6 +374,14 @@ const router = new Router({
             title: `${i18n.$t('Queue manage')}`
           }
         },
+        {
+          path: '/security/worker-groups',
+          name: 'worker-groups-manage',
+          component: resolve => require(['../pages/security/pages/workerGroups/index'], resolve),
+          meta: {
+            title: `${i18n.$t('Worker group manage')}`
+          }
+        },
         {
           path: '/security/token',
           name: 'token-manage',
diff --git a/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js b/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
index 82c9864d2..0d1e305bc 100644
--- a/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
+++ b/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
@@ -109,6 +109,15 @@ const menu = {
       icon: 'ans-icon-recycle',
       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('Token manage')}`,
       id: 2,
-- 
GitLab