From aeebe25c602a6ed0444ed56d29b13c9a5fda8b02 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Sat, 21 Dec 2019 23:32:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/generator/generator.js    |  8 +++
 src/views/generator/config.vue    | 37 ++++++++------
 src/views/generator/index.vue     | 81 +++++++++++++++++++------------
 src/views/generator/preview.vue   | 20 +++-----
 src/views/tools/picture/index.vue |  2 +-
 5 files changed, 88 insertions(+), 60 deletions(-)

diff --git a/src/api/generator/generator.js b/src/api/generator/generator.js
index 85ba185..0c49718 100644
--- a/src/api/generator/generator.js
+++ b/src/api/generator/generator.js
@@ -23,3 +23,11 @@ export function save(data) {
   })
 }
 
+export function sync(tables) {
+  return request({
+    url: 'api/generator/sync',
+    method: 'post',
+    data: tables
+  })
+}
+
diff --git a/src/views/generator/config.vue b/src/views/generator/config.vue
index 8145f9f..48a39d2 100644
--- a/src/views/generator/config.vue
+++ b/src/views/generator/config.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="app-container">
     <el-row :gutter="15">
-      <!--角色管理-->
       <el-col style="margin-bottom: 10px">
         <el-card class="box-card" shadow="never">
           <div slot="header" class="clearfix">
@@ -10,10 +9,18 @@
               :loading="columnLoading"
               icon="el-icon-check"
               size="mini"
-              style="float: right; padding: 6px 9px"
+              style="float: right; padding: 6px 9px;"
               type="primary"
               @click="saveColumnConfig"
             >保存</el-button>
+            <el-button
+              :loading="syncLoading"
+              icon="el-icon-refresh"
+              size="mini"
+              style="float: right; padding: 6px 9px;margin-right: 10px"
+              type="success"
+              @click="sync"
+            >同步</el-button>
           </div>
           <el-form size="small" label-width="90px">
             <el-table v-loading="loading" :data="data" :max-height="tableHeight" size="small" style="width: 100%;margin-bottom: 15px">
@@ -179,7 +186,7 @@
 <script>
 import crud from '@/mixins/crud'
 import { update, get } from '@/api/generator/genConfig'
-import { save } from '@/api/generator/generator'
+import { save, sync } from '@/api/generator/generator'
 import { getDicts } from '@/api/system/dict'
 export default {
   name: 'GeneratorConfig',
@@ -187,7 +194,7 @@ export default {
   mixins: [crud],
   data() {
     return {
-      activeName: 'first', tableName: '', tableHeight: 550, columnLoading: false, configLoading: false, dicts: [],
+      activeName: 'first', tableName: '', tableHeight: 550, columnLoading: false, configLoading: false, dicts: [], syncLoading: false,
       form: { id: null, tableName: '', author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '', apiAlias: null },
       rules: {
         author: [
@@ -235,11 +242,7 @@ export default {
     saveColumnConfig() {
       this.columnLoading = true
       save(this.data).then(res => {
-        this.$notify({
-          title: '保存成功',
-          type: 'success',
-          duration: 2500
-        })
+        this.notify('保存成功', 'success')
         this.columnLoading = false
       }).catch(err => {
         this.columnLoading = false
@@ -251,11 +254,7 @@ export default {
         if (valid) {
           this.configLoading = true
           update(this.form).then(res => {
-            this.$notify({
-              title: '保存成功',
-              type: 'success',
-              duration: 2500
-            })
+            this.notify('保存成功', 'success')
             this.form = res
             this.form.cover = this.form.cover.toString()
             this.configLoading = false
@@ -265,6 +264,16 @@ export default {
           })
         }
       })
+    },
+    sync() {
+      this.syncLoading = true
+      sync([this.tableName]).then(() => {
+        this.init()
+        this.notify('同步成功', 'success')
+        this.syncLoading = false
+      }).then(() => {
+        this.syncLoading = false
+      })
     }
   }
 }
diff --git a/src/views/generator/index.vue b/src/views/generator/index.vue
index f678c91..e780545 100644
--- a/src/views/generator/index.vue
+++ b/src/views/generator/index.vue
@@ -2,21 +2,31 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
-      <el-input v-model="query.name" clearable size="small" placeholder="请输入表名" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <div v-if="crud.props.searchToggle">
+        <el-input v-model="query.name" clearable size="small" placeholder="请输入表名" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <rrOperation :crud="crud" />
+      </div>
+      <crudOperation>
+        <el-button
+          slot="left"
+          class="filter-item"
+          size="mini"
+          type="success"
+          icon="el-icon-refresh"
+          :loading="syncLoading"
+          :disabled="crud.selections.length === 0"
+          @click="sync"
+        >同步</el-button>
+      </crudOperation>
     </div>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" style="width: 100%;">
-      <el-table-column label="序号" width="85" align="center">
-        <template slot-scope="scope">
-          <div>{{ scope.$index + 1 }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" prop="tableName" label="表名" />
-      <el-table-column :show-overflow-tooltip="true" prop="engine" label="数据库引擎" />
-      <el-table-column :show-overflow-tooltip="true" prop="coding" label="字符编码集" />
-      <el-table-column :show-overflow-tooltip="true" prop="remark" label="备注" />
-      <el-table-column prop="createTime" label="创建日期">
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table-column type="selection" width="55" />
+      <el-table-column v-if="columns.visible('tableName')" :show-overflow-tooltip="true" prop="tableName" label="表名" />
+      <el-table-column v-if="columns.visible('engine')" :show-overflow-tooltip="true" prop="engine" label="数据库引擎" />
+      <el-table-column v-if="columns.visible('coding')" :show-overflow-tooltip="true" prop="coding" label="字符编码集" />
+      <el-table-column v-if="columns.visible('remark')" :show-overflow-tooltip="true" prop="remark" label="备注" />
+      <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
@@ -39,37 +49,32 @@
       </el-table-column>
     </el-table>
     <!--分页组件-->
-    <el-pagination
-      :total="total"
-      :current-page="page + 1"
-      style="margin-top: 8px;"
-      layout="total, prev, pager, next, sizes"
-      @size-change="sizeChange"
-      @current-change="pageChange"
-    />
+    <pagination />
   </div>
 </template>
 
 <script>
-import crud from '@/mixins/crud'
-import { generator } from '@/api/generator/generator'
+import { generator, sync } from '@/api/generator/generator'
+import CRUD, { presenter, header } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+
+// crud交由presenter持有
+const defaultCrud = CRUD({ url: 'api/generator/tables' })
 export default {
   name: 'GeneratorIndex',
-  mixins: [crud],
+  components: { pagination, crudOperation, rrOperation },
+  mixins: [presenter(defaultCrud), header()],
   data() {
     return {
+      syncLoading: false
     }
   },
   created() {
-    this.$nextTick(() => {
-      this.init()
-    })
+    this.crud.optShow = { add: false, edit: false, del: false, download: false }
   },
   methods: {
-    beforeInit() {
-      this.url = 'api/generator/tables'
-      return true
-    },
     toGen(tableName) {
       // 生成代码
       generator(tableName, 0).then(data => {
@@ -85,6 +90,20 @@ export default {
       generator(tableName, 2).then(data => {
         this.downloadFile(data, tableName, 'zip')
       })
+    },
+    sync() {
+      const tables = []
+      this.crud.selections.forEach(val => {
+        tables.push(val.tableName)
+      })
+      this.syncLoading = true
+      sync(tables).then(() => {
+        this.crud.refresh()
+        this.crud.notify('同步成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.syncLoading = false
+      }).then(() => {
+        this.syncLoading = false
+      })
     }
   }
 }
diff --git a/src/views/generator/preview.vue b/src/views/generator/preview.vue
index 8ee6cac..e95fc46 100644
--- a/src/views/generator/preview.vue
+++ b/src/views/generator/preview.vue
@@ -1,15 +1,9 @@
 <template>
-  <el-tabs v-if="!error" v-model="activeName" type="card">
+  <el-tabs v-model="activeName" type="card">
     <el-tab-pane v-for="item in data" :key="item.name" :lazy="true" :label="item.name" :name="item.name">
       <Java :value="item.content" :height="height" />
     </el-tab-pane>
   </el-tabs>
-  <div v-else class="app-container">
-    <el-alert
-      :title="error"
-      type="error"
-    />
-  </div>
 </template>
 
 <script>
@@ -20,18 +14,16 @@ export default {
   components: { Java },
   data() {
     return {
-      data: null, error: null, height: '', activeName: 'Entity'
+      data: null, height: '', activeName: 'Entity'
     }
   },
   created() {
     this.height = document.documentElement.clientHeight - 180 + 'px'
     const tableName = this.$route.params.tableName
-    this.$nextTick(() => {
-      generator(tableName, 1).then(data => {
-        this.data = data
-      }).catch(err => {
-        this.error = err.response.data.message
-      })
+    generator(tableName, 1).then(data => {
+      this.data = data
+    }).catch(() => {
+      this.$router.go(-1)
     })
   }
 }
diff --git a/src/views/tools/picture/index.vue b/src/views/tools/picture/index.vue
index e706e84..ead112a 100644
--- a/src/views/tools/picture/index.vue
+++ b/src/views/tools/picture/index.vue
@@ -35,7 +35,7 @@
             class="filter-item"
             size="mini"
             type="success"
-            icon="el-icon-upload"
+            icon="el-icon-refresh"
             :loading="syncLoading"
             @click="sync"
           >同步</el-button>