From 8313c70235f3e6c733c0d60e42fe067a383f72c9 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Fri, 8 May 2020 09:06:37 +0800
Subject: [PATCH] fix

---
 .../pages/workerGroups/_source/list.vue       | 21 -------
 .../security/pages/workerGroups/index.vue     | 58 +++++++++----------
 2 files changed, 27 insertions(+), 52 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 5e8927d3f..599119638 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,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>
@@ -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>
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 678006961..32bb8620a 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
@@ -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">
@@ -92,32 +88,32 @@
       _onEdit (item) {
         this._create(item)
       },
-      // _create (item) {
-      //   let self = this
-      //   let modal = this.$modal.dialog({
-      //     closable: false,
-      //     showMask: true,
-      //     escClose: true,
-      //     className: 'v-modal-custom',
-      //     transitionName: 'opacityp',
-      //     render (h) {
-      //       return h(mCreateWorker, {
-      //         on: {
-      //           onUpdate () {
-      //             self._debounceGET('false')
-      //             modal.remove()
-      //           },
-      //           close () {
-      //             modal.remove()
-      //           }
-      //         },
-      //         props: {
-      //           item: item
-      //         }
-      //       })
-      //     }
-      //   })
-      // },
+      _create (item) {
+        let self = this
+        let modal = this.$modal.dialog({
+          closable: false,
+          showMask: true,
+          escClose: true,
+          className: 'v-modal-custom',
+          transitionName: 'opacityp',
+          render (h) {
+            return h(mCreateWorker, {
+              on: {
+                onUpdate () {
+                  self._debounceGET('false')
+                  modal.remove()
+                },
+                close () {
+                  modal.remove()
+                }
+              },
+              props: {
+                item: item
+              }
+            })
+          }
+        })
+      },
       _getList (flag) {
         this.isLoading = !flag
         this.getWorkerGroups(this.searchParams).then(res => {
-- 
GitLab