[Update] 修改generic detail

src/layout/components/GenericDetailPage/index.vue

@@ -1,8 +1,10 @@
 <template>
-  <Page>
+  <Page v-loading="loading">
-    <span slot="title">
+    <template #title>
-      {{ title }}
+      <span>
-    </span>
+        {{ validTitle }}
+      </span>
+    </template>
 
     <template #headingRightSide>
       <span v-if="hasRightSide">
@@ -35,6 +37,10 @@ export default {
     ActionsGroup
   },
   props: {
+    object: {
+      type: Object,
+      required: true
+    },
     title: {
       type: String,
       default: ''
@@ -51,71 +57,77 @@ export default {
       type: Boolean,
       default: true
     },
-    canDelete: {
+    actions: {
-      type: [Boolean, Function],
+      type: Object, // 查看defaultActions设置
-      default: true
+      default: () => ({})
     },
-    deleteCallback: {
+    getObjectName: {
       type: Function,
-      default: function(item) {
+      default: function(obj) {
-        return this.defaultDelete(item)
+        return obj.name
       }
     },
-    deleteUrl: {
+    getTitle: {
-      type: String,
-      default: function() {
-        return getApiPath(this)
-      }
-    },
-    deleteSuccessRoute: {
-      type: String,
-      default: function() {
-        return this.$route.name.replace('Detail', 'List')
-      }
-    },
-    canUpdate: {
-      type: [Boolean, Function],
-      default: true
-    },
-    updateCallback: {
       type: Function,
-      default: function(item) {
+      default: function(obj) {
-        return this.defaultUpdate(item)
+        const objectType = this.$tr(this.$route.meta.title)
-      }
+          .replace('Detail', '')
-    },
+          .replace('详情', '')
-    updateRoute: {
+        console.log('Object is: ', this.obj)
-      type: String,
+        const objectName = this.getObjectName(obj)
-      default: function() {
+        return `${objectType}: ${objectName}`
-        return this.$route.name.replace('Detail', 'Update')
       }
     }
   },
   data() {
+    const defaultActions = {
+      canDelete: true,
+      deleteCallback: function(item) { this.defaultDelete(item) },
+      deleteApiUrl: getApiPath(this),
+      deleteSuccessRoute: this.$route.name.replace('Detail', 'List'),
+      canUpdate: true,
+      updateCallback: function(item) { this.defaultUpdate(item) },
+      updateRoute: this.$route.name.replace('Detail', 'Update'),
+      detailApiUrl: getApiPath(this)
+    }
     return {
-      activeName: this.activeMenu || null,
+      loading: false,
-      pageActions: [
+      activeName: this.activeMenu || 'info',
+      validActions: Object.assign(defaultActions, this.actions)
+    }
+  },
+  computed: {
+    pageActions() {
+      return [
         {
           name: 'update',
           title: this.$tc('Update'),
-          can: this.canUpdate,
+          can: this.validActions.canUpdate,
-          callback: this.updateCallback.bind(this)
+          callback: this.validActions.updateCallback.bind(this)
         },
         {
           name: 'delete',
           title: this.$tc('Delete'),
-          can: this.canDelete,
+          can: this.validActions.canDelete,
-          callback: this.deleteCallback.bind(this)
+          callback: this.validActions.deleteCallback.bind(this)
         }
       ]
+    },
+    validTitle() {
+      return this.title || this.getTitle(this.object)
     }
   },
+  mounted() {
+    this.getObject()
+  },
   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)
+        const url = this.validActions.deleteApiUrl
-        return this.$axios.delete(this.deleteUrl)
+        this.$log.debug('Start perform delete: ', url)
+        return this.$axios.delete(url)
       }
       this.$alert(msg, title, {
         type: 'warning',
@@ -128,7 +140,7 @@ export default {
             await performDelete.bind(this)()
             done()
             this.$message.success(this.$tc('Delete success'))
-            this.$router.push({ name: this.deleteSuccessRoute })
+            this.$router.push({ name: this.validActions.deleteSuccessRoute })
           } catch (error) {
             this.$message.error(this.$tc('Delete failed' + ' ' + error))
           } finally {
@@ -141,9 +153,17 @@ export default {
     },
     defaultUpdate() {
       const id = this.$route.params.id
-      this.$router.push({ name: this.updateRoute, params: { id: id }})
+      const routeName = this.validActions.updateRoute
+      this.$router.push({ name: routeName, params: { id: id }})
     },
     getObject() {
+      this.loading = true
+      const url = this.validActions.detailApiUrl
+      this.$axios.get(url).then(data => {
+        this.$emit('update:object', data)
+      }).finally(() => {
+        this.loading = false
+      })
     }
   }
 }

src/views/users/UserGroupDetail/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <GenericDetailPage v-loading="loading" :title="title" v-bind="config">
+  <GenericDetailPage :object.sync="group" v-bind="config">
-    <template v-slot:info>
+    <template #info>
       <div>
         <el-row :gutter="20">
           <el-col :span="14">
@@ -24,7 +24,7 @@
 </template>
 
 <script>
-import { getUserGroupDetail, getUserGroupMembers } from '@/api/user'
+import { getUserGroupMembers } from '@/api/user'
 import { GenericDetailPage } from '@/layout/components'
 import DetailCard from '@/components/DetailCard'
 import Select2 from '@/components/Select2'
@@ -64,9 +64,9 @@ export default {
     }
   },
   computed: {
-    title() {
+    // title() {
-      return this.$t('users.userGroup') + ': ' + this.group.name
+    //   return this.$t('users.userGroup') + ': ' + this.group.name
-    },
+    // },
     detailItems() {
       return [
         {
@@ -89,12 +89,6 @@ export default {
     }
   },
   mounted() {
-    getUserGroupDetail(this.$route.params.id).then(data => {
-      this.group = data
-    }).finally(() => {
-      this.loading = false
-    })
-
     getUserGroupMembers(this.$route.params.id).then(data => {
       this.groupMembers = data.map(v => {
         const member = {}