From 668ac84e8a087fdfcd2a173eb54952fc3c6018b2 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 21 Apr 2020 13:29:27 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AutoDataForm/index.vue         |  2 +-
 .../components/GenericDetailPage/index.vue    | 51 ++++++++++++++++---
 src/utils/common.js                           |  5 ++
 src/views/users/UserGroupCreateUpdate.vue     |  5 --
 src/views/users/UserGroupDetail/index.vue     |  2 +-
 5 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/src/components/AutoDataForm/index.vue b/src/components/AutoDataForm/index.vue
index eb0488b17..b87a4ba0f 100644
--- a/src/components/AutoDataForm/index.vue
+++ b/src/components/AutoDataForm/index.vue
@@ -10,7 +10,6 @@ import FormGroupHeader from '@/components/formGroupHeader'
 import { optionUrlMeta } from '@/api/common'
 import rules from '@/components/DataForm/rules'
 import Select2 from '@/components/Select2'
-import _ from 'lodash'
 export default {
   name: 'AutoDataForm',
   components: {
@@ -79,6 +78,7 @@ export default {
           type = 'input'
           if (!fieldMeta.max_length) {
             field.el.type = 'textarea'
+            field.el.rows = 3
           }
           break
         default:
diff --git a/src/layout/components/GenericDetailPage/index.vue b/src/layout/components/GenericDetailPage/index.vue
index 528db7790..d7d131782 100644
--- a/src/layout/components/GenericDetailPage/index.vue
+++ b/src/layout/components/GenericDetailPage/index.vue
@@ -26,6 +26,7 @@
 
 <script>
 import Page from '../Page/'
+import { getApiPath } from '@/utils/common'
 import ActionsGroup from '@/components/ActionsGroup'
 export default {
   name: 'GenericDetailPage',
@@ -60,9 +61,17 @@ export default {
         return this.defaultDelete(item)
       }
     },
-    deleteRoute: {
+    deleteUrl: {
       type: String,
-      default: null
+      default: function() {
+        return getApiPath(this)
+      }
+    },
+    deleteSuccessRoute: {
+      type: String,
+      default: function() {
+        return this.$route.name.replace('Detail', 'List')
+      }
     },
     canUpdate: {
       type: [Boolean, Function],
@@ -76,7 +85,9 @@ export default {
     },
     updateRoute: {
       type: String,
-      default: null
+      default: function() {
+        return this.$route.name.replace('Detail', 'Update')
+      }
     }
   },
   data() {
@@ -100,13 +111,39 @@ export default {
   },
   methods: {
     defaultDelete() {
-
+      const msg = this.$tc('Are you sure to delete') + ' ?'
+      const title = this.$tc('Info')
+      const performDelete = async function() {
+        this.$log.debug('Start perform delete: ', this.deleteUrl)
+        return this.$axios.delete(this.deleteUrl)
+      }
+      this.$alert(msg, title, {
+        type: 'warning',
+        confirmButtonClass: 'el-button--danger',
+        showCancelButton: true,
+        beforeClose: async(action, instance, done) => {
+          if (action !== 'confirm') return done()
+          instance.confirmButtonLoading = true
+          try {
+            await performDelete.bind(this)()
+            done()
+            this.$message.success(this.$tc('Delete success'))
+            this.$router.push({ name: this.deleteSuccessRoute })
+          } catch (error) {
+            this.$message.error(this.$tc('Delete failed' + ' ' + error))
+          } finally {
+            instance.confirmButtonLoading = false
+          }
+        }
+      }).catch(() => {
+        /* 取消*/
+      })
     },
     defaultUpdate() {
       const id = this.$route.params.id
-      const defaultUpdateRoute = this.$route.name.replace('Detail', 'Update')
-      const routeName = this.updateRoute || defaultUpdateRoute
-      this.$router.push({ name: routeName, params: { id: id }})
+      this.$router.push({ name: this.updateRoute, params: { id: id }})
+    },
+    getObject() {
     }
   }
 }
diff --git a/src/utils/common.js b/src/utils/common.js
index b540d5366..d2ee8a195 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -76,3 +76,8 @@ export function toSafeLocalDateStr(d) {
   const date_s = date.toLocaleString(getUserLang(), { hourCycle: 'h23' })
   return date_s.split('/').join('-')
 }
+
+export function getApiPath(that) {
+  const pagePath = that.$route.path
+  return `/api/v1${pagePath}/`
+}
diff --git a/src/views/users/UserGroupCreateUpdate.vue b/src/views/users/UserGroupCreateUpdate.vue
index 51ed0524b..4670abe64 100644
--- a/src/views/users/UserGroupCreateUpdate.vue
+++ b/src/views/users/UserGroupCreateUpdate.vue
@@ -12,11 +12,6 @@ export default {
     return {
       config: {
         initial: {
-          password_strategy: 0,
-          mfa_level: 0,
-          source: 'local',
-          role: 'Admin',
-          date_expired: '2099-12-31 00:00:00 +0800'
         },
         url: '/api/v1/users/groups/',
         fields: ['name', 'users', 'comment'],
diff --git a/src/views/users/UserGroupDetail/index.vue b/src/views/users/UserGroupDetail/index.vue
index bd1419d20..ecda3b0b4 100644
--- a/src/views/users/UserGroupDetail/index.vue
+++ b/src/views/users/UserGroupDetail/index.vue
@@ -51,7 +51,7 @@ export default {
             name: 'assetPermissions'
           }
         ],
-        canDelete: this.canDelete,
+        canDelete: true,
         canUpdate: true
       },
       groupMembers: [],