From 99f957b48ce2aa7d5cc1cfd9a0b6ab99bdc29756 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 27 Apr 2020 13:46:16 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9list=20table?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AutoDataSearch/index.vue       |  1 -
 .../IBox.vue => components/IBox/index.vue}    |  0
 src/components/ListTable/index.vue            | 10 ++++----
 src/components/index.js                       |  1 +
 .../GenericCreateUpdatePage/index.vue         | 24 ++++++++++---------
 src/layout/components/index.js                |  1 -
 src/views/users/UserGroupList.vue             |  8 ++-----
 7 files changed, 21 insertions(+), 24 deletions(-)
 rename src/{layout/components/IBox.vue => components/IBox/index.vue} (100%)

diff --git a/src/components/AutoDataSearch/index.vue b/src/components/AutoDataSearch/index.vue
index d38a8e1b7..601b8e1a5 100644
--- a/src/components/AutoDataSearch/index.vue
+++ b/src/components/AutoDataSearch/index.vue
@@ -42,7 +42,6 @@ export default {
   },
   methods: {
     genericOptions(data) {
-      console.log(data)
       const _this = this // 透传This
       Object.keys(data).forEach(function(key) {
         if (data[key].filter) {
diff --git a/src/layout/components/IBox.vue b/src/components/IBox/index.vue
similarity index 100%
rename from src/layout/components/IBox.vue
rename to src/components/IBox/index.vue
diff --git a/src/components/ListTable/index.vue b/src/components/ListTable/index.vue
index f70598470..a75d38f43 100644
--- a/src/components/ListTable/index.vue
+++ b/src/components/ListTable/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <TableAction :table-url="tableConfig.url" :search-table="search" v-bind="headerActions" :selected-rows="selectedRows" :reload-table="reloadTable" />
-    <el-card class="table-content" shadow="never">
+    <IBox class="table-content">
       <AutoDataTable :key="tableConfig.url" ref="dataTable" :config="tableConfig" @selection-change="handleSelectionChange" />
       <Dialog :title="$tc('Export')" :visible.sync="showExportDialog" center @confirm="handleDialogConfirm('export')" @cancel="handleDialogCancel('export')">
         <el-form>
@@ -35,14 +35,14 @@
           </el-upload>
         </div>
       </Dialog>
-    </el-card>
+    </IBox>
   </div>
 </template>
 
 <script>
-/* eslint-disable no-unused-vars */
 import AutoDataTable from '../AutoDataTable'
 import Dialog from '../Dialog'
+import IBox from '../IBox'
 import TableAction from './TableAction'
 import { createSourceIdCache } from '@/api/common'
 
@@ -51,7 +51,8 @@ export default {
   components: {
     AutoDataTable,
     TableAction,
-    Dialog
+    Dialog,
+    IBox
   },
   props: {
     // 定义 table 的配置
@@ -140,7 +141,6 @@ export default {
       return this.downloadCsv(url)
     },
     handleImport() {
-
     },
     async downloadUpdateTempUrl() {
       var resources = []
diff --git a/src/components/index.js b/src/components/index.js
index 21bb26775..17bb8a290 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -16,4 +16,5 @@ export { default as ActiveCard } from './ActiveCard'
 export { default as Select2 } from './Select2'
 export { default as SvgIcon } from './SvgIcon'
 export { default as TreeTable } from './TreeTable'
+export { default as IBox } from './IBox'
 
diff --git a/src/layout/components/GenericCreateUpdatePage/index.vue b/src/layout/components/GenericCreateUpdatePage/index.vue
index 035bbac04..2ff5b1461 100644
--- a/src/layout/components/GenericCreateUpdatePage/index.vue
+++ b/src/layout/components/GenericCreateUpdatePage/index.vue
@@ -15,7 +15,8 @@
   </Page>
 </template>
 <script>
-import { Page, IBox } from '@/layout/components'
+import { IBox } from '@/components'
+import { Page } from '@/layout/components'
 import AutoDataForm from '@/components/AutoDataForm'
 export default {
   name: 'GenericCreateUpdatePage',
@@ -35,7 +36,7 @@ export default {
     },
     object: {
       type: Object,
-      default: () => ({})
+      default: null
     },
     initial: {
       type: Object,
@@ -116,13 +117,18 @@ export default {
       return this.getUrl()
     }
   },
-  mounted() {
+  async mounted() {
+    this.loading = true
     if (this.method === 'put') {
-      this.getObjectDetail()
+      if (this.object === null) {
+        await this.getObjectDetail()
+      } else {
+        this.form = this.object
+      }
     } else {
       this.form = Object.assign(this.form, this.initial)
-      this.loading = false
     }
+    this.loading = false
   },
   methods: {
     handleSubmit(values) {
@@ -155,13 +161,9 @@ export default {
         }
       })
     },
-    getObjectDetail() {
-      this.$axios.get(this.totalUrl).then(data => {
+    async getObjectDetail() {
+      return this.$axios.get(this.totalUrl).then(data => {
         this.form = data
-      }).catch(error => {
-        console.log(error)
-      }).finally(() => {
-        this.loading = false
       })
     }
   }
diff --git a/src/layout/components/index.js b/src/layout/components/index.js
index ac38237ce..aec0a083a 100644
--- a/src/layout/components/index.js
+++ b/src/layout/components/index.js
@@ -6,6 +6,5 @@ export { default as TagsView } from './TagsView'
 export { default as GenericDetailPage } from './GenericDetailPage'
 export { default as TabPage } from './TabPage'
 export { default as Footer } from './Footer'
-export { default as IBox } from './IBox'
 export { default as GenericListPage } from './GenericListPage'
 export { default as GenericCreateUpdatePage } from './GenericCreateUpdatePage'
diff --git a/src/views/users/UserGroupList.vue b/src/views/users/UserGroupList.vue
index bb826a1e0..51a5d1b3f 100644
--- a/src/views/users/UserGroupList.vue
+++ b/src/views/users/UserGroupList.vue
@@ -22,12 +22,8 @@ export default {
         detailRoute: 'UserGroupDetail'
       },
       headerActions: {
-        createRoute: 'UserGroupCreate',
-        performBulkDelete: function(rows) {
-          console.log('hello')
-        }
-      },
-      helpMessage: '用户列表'
+        createRoute: 'UserGroupCreate'
+      }
     }
   }
 }