From aa36c9e43805c6f420227c0d433c9e0f3b72384b Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Thu, 22 Aug 2019 20:13:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B9?=
 =?UTF-8?q?=E4=BE=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/generator/generator.vue            | 175 +++++++++++++------
 src/views/generator/index.vue                |  67 -------
 src/views/system/dept/form.vue               |   2 +-
 src/views/system/dict/form.vue               |   2 +-
 src/views/system/dictDetail/form.vue         |   2 +-
 src/views/system/job/form.vue                |   2 +-
 src/views/system/menu/form.vue               |   2 +-
 src/views/system/permission/form.vue         |   2 +-
 src/views/system/role/form.vue               |   2 +-
 src/views/system/role/index.vue              |   6 +
 src/views/system/timing/index.vue            |   2 +-
 src/views/system/user/center/updateEmail.vue |   2 +-
 src/views/system/user/center/updatePass.vue  |   2 +-
 src/views/system/user/form.vue               |   2 +-
 src/views/tools/picture/index.vue            |   2 +-
 src/views/tools/qiniu/list.vue               |   2 +-
 16 files changed, 142 insertions(+), 132 deletions(-)

diff --git a/src/views/generator/generator.vue b/src/views/generator/generator.vue
index c01a18f..3b185ec 100644
--- a/src/views/generator/generator.vue
+++ b/src/views/generator/generator.vue
@@ -1,45 +1,72 @@
 <template>
   <div>
     <el-button type="primary" size="mini" @click="toGen">生成代码</el-button>
-    <el-dialog :visible.sync="dialog" title="代码生成配置" append-to-body width="800px">
-      <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
-        <el-table-column label="序号" width="80" align="center">
-          <template slot-scope="scope">
-            <div>{{ scope.$index + 1 }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="columnName" label="字段名称"/>
-        <el-table-column prop="columnType" label="字段类型"/>
-        <el-table-column prop="columnComment" label="字段标题">
-          <template slot-scope="scope">
-            <el-input v-model="data[scope.$index].columnComment" class="edit-input"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="查询方式">
-          <template slot-scope="scope">
-            <el-select v-model="data[scope.$index].columnQuery" class="edit-input" clearable placeholder="请选择">
-              <el-option
-                label="模糊查询"
-                value="1"/>
-              <el-option
-                label="精确查询"
-                value="2"/>
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" prop="columnShow" label="列表显示">
-          <template slot-scope="scope">
-            <el-tooltip :content="scope.row.columnShow === 'true' ?'显示':'不显示'" placement="top">
-              <el-switch
-                v-model="data[scope.$index].columnShow"
-                active-color="#13ce66"
-                inactive-color="#ff4949"
-                active-value="true"
-                inactive-value="false"/>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
+    <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" title="代码生成配置" append-to-body width="850px">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-form-item label="模块名称" prop="moduleName">
+          <el-input v-model="form.moduleName"/>
+        </el-form-item>
+        <el-form-item label="至于包下" prop="pack">
+          <el-input v-model="form.pack"/>
+        </el-form-item>
+        <el-form-item label="前端路径" prop="path">
+          <el-input v-model="form.path"/>
+        </el-form-item>
+        <el-table v-loading="loading" :data="data" size="small" style="width: 100%;margin-bottom: 15px">
+          <el-table-column label="序号" width="80" align="center">
+            <template slot-scope="scope">
+              <div>{{ scope.$index + 1 }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="columnName" label="字段名称"/>
+          <el-table-column prop="columnType" label="字段类型"/>
+          <el-table-column prop="columnComment" label="字段标题">
+            <template slot-scope="scope">
+              <el-input v-model="data[scope.$index].columnComment" class="edit-input"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="查询方式">
+            <template slot-scope="scope">
+              <el-select v-model="data[scope.$index].columnQuery" class="edit-input" clearable placeholder="请选择">
+                <el-option
+                  label="模糊查询"
+                  value="1"/>
+                <el-option
+                  label="精确查询"
+                  value="2"/>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="columnShow" label="列表显示">
+            <template slot-scope="scope">
+              <el-tooltip :content="scope.row.columnShow === 'true' ?'显示':'不显示'" placement="top">
+                <el-switch
+                  v-model="data[scope.$index].columnShow"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949"
+                  active-value="true"
+                  inactive-value="false"/>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-form-item label="作者名称" prop="author">
+          <el-input v-model="form.author"/>
+        </el-form-item>
+        <el-form-item label="去表前缀" prop="prefix">
+          <el-input v-model="form.prefix" placeholder="默认不去除表前缀"/>
+        </el-form-item>
+        <!--    可自定义显示配置    -->
+        <!--        <el-form-item label="Api路径">-->
+        <!--          <el-input v-model="form.apiPath"/>-->
+        <!--        </el-form-item>-->
+        <el-form-item label="是否覆盖" prop="cover">
+          <el-radio-group v-model="form.cover" size="mini">
+            <el-radio-button label="true">是</el-radio-button>
+            <el-radio-button label="false">否</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="text" @click="cancel">取消</el-button>
         <el-button :loading="genLoading" type="primary" @click="doSubmit">生成</el-button>
@@ -50,6 +77,7 @@
 
 <script>
 import initData from '@/mixins/initData'
+import { update, get } from '@/api/genConfig'
 import { generator } from '@/api/generator'
 export default {
   name: 'Generator',
@@ -62,7 +90,25 @@ export default {
   },
   data() {
     return {
-      genLoading: false, dialog: false, columnQuery: ''
+      genLoading: false, dialog: false, columnQuery: '',
+      form: { author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '' },
+      rules: {
+        author: [
+          { required: true, message: '作者不能为空', trigger: 'blur' }
+        ],
+        pack: [
+          { required: true, message: '包路径不能为空', trigger: 'blur' }
+        ],
+        moduleName: [
+          { required: true, message: '包路径不能为空', trigger: 'blur' }
+        ],
+        path: [
+          { required: true, message: '前端代码生成路径不能为空', trigger: 'blur' }
+        ],
+        cover: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ]
+      }
     }
   },
   methods: {
@@ -71,6 +117,10 @@ export default {
       this.time = 130
       this.$nextTick(() => {
         this.init()
+        get().then(data => {
+          this.form = data
+          this.form.cover = this.form.cover.toString()
+        })
       })
     },
     beforeInit() {
@@ -81,21 +131,33 @@ export default {
     },
     cancel() {
       this.dialog = false
+      this.genLoading = false
+      this.$refs['form'].resetFields()
+      this.form = { author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '' }
     },
     doSubmit() {
       this.genLoading = true
-      generator(this.data, this.name).then(res => {
-        this.$notify({
-          title: '生成成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.dialog = false
-        this.genLoading = false
-      }).catch(err => {
-        this.dialog = false
-        this.genLoading = false
-        console.log(err.response.data.message)
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          update(this.form).then(res => {
+            generator(this.data, this.name).then(res => {
+              this.$notify({
+                title: '生成成功',
+                type: 'success',
+                duration: 2500
+              })
+              this.cancel()
+            }).catch(err => {
+              this.cancel()
+              console.log(err.response.data.message)
+            })
+          }).catch(err => {
+            this.cancel()
+            console.log(err.response.data.message)
+          })
+        } else {
+          return false
+        }
       })
     }
   }
@@ -109,3 +171,12 @@ export default {
     }
   }
 </style>
+
+<style scoped>
+  /deep/ .el-dialog__body{
+    padding-bottom: 5px;
+  }
+  /deep/ .input-with-select .el-input-group__prepend {
+    background-color: #fff;
+  }
+</style>
diff --git a/src/views/generator/index.vue b/src/views/generator/index.vue
index aa60a46..de31b9b 100644
--- a/src/views/generator/index.vue
+++ b/src/views/generator/index.vue
@@ -4,47 +4,7 @@
     <div class="head-container">
       <el-input v-model="query.name" clearable 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 style="display: inline-block;margin: 0px 2px;">
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="warning"
-          icon="el-icon-setting"
-          @click="openConfig">生成器配置</el-button>
-      </div>
     </div>
-    <!--生成器配置-->
-    <el-dialog :visible.sync="dialog" title="生成器配置" append-to-body width="550px">
-      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="78px">
-        <el-form-item label="作者名称" prop="author">
-          <el-input v-model="form.author" style="width: 420px;"/>
-        </el-form-item>
-        <el-form-item label="去表前缀" prop="prefix">
-          <el-input v-model="form.prefix" placeholder="默认不去除表前缀" style="width: 420px;"/>
-        </el-form-item>
-        <el-form-item label="模块名称" prop="moduleName">
-          <el-input v-model="form.moduleName" style="width: 420px;"/>
-        </el-form-item>
-        <el-form-item label="至于包下" prop="pack">
-          <el-input v-model="form.pack" style="width: 420px;"/>
-        </el-form-item>
-        <el-form-item label="前端路径" prop="path">
-          <el-input v-model="form.path" style="width: 420px;"/>
-        </el-form-item>
-        <el-form-item label="API路径" prop="apiPath">
-          <el-input v-model="form.apiPath" style="width: 420px;"/>
-        </el-form-item>
-        <el-form-item label="是否覆盖" prop="cover">
-          <el-radio v-model="form.cover" label="true">是</el-radio>
-          <el-radio v-model="form.cover" label="false">否</el-radio>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="cancel">取消</el-button>
-        <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-      </div>
-    </el-dialog>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column label="序号" width="85" align="center">
@@ -79,7 +39,6 @@
 </template>
 
 <script>
-import { get, update } from '@/api/genConfig'
 import initData from '@/mixins/initData'
 import { parseTime } from '@/utils/index'
 import Generator from './generator'
@@ -127,13 +86,6 @@ export default {
       if (name) { this.params['name'] = name }
       return true
     },
-    openConfig() {
-      get().then(data => {
-        this.form = data
-        this.form.cover = this.form.cover.toString()
-      })
-      this.dialog = true
-    },
     cancel() {
       this.resetForm()
     },
@@ -146,25 +98,6 @@ export default {
           return false
         }
       })
-    },
-    doUpdate() {
-      update(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '更新成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.form = { author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '' }
     }
   }
 }
diff --git a/src/views/system/dept/form.vue b/src/views/system/dept/form.vue
index 695f6eb..245f395 100644
--- a/src/views/system/dept/form.vue
+++ b/src/views/system/dept/form.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :append-to-body="true" :visible.sync="dialog" :title="isAdd ? '新增部门' : '编辑部门'" width="500px">
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增部门' : '编辑部门'" width="500px">
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
       <el-form-item label="名称" prop="name">
         <el-input v-model="form.name" style="width: 370px;"/>
diff --git a/src/views/system/dict/form.vue b/src/views/system/dict/form.vue
index 38ae77a..166204e 100644
--- a/src/views/system/dict/form.vue
+++ b/src/views/system/dict/form.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :append-to-body="true" :visible.sync="dialog" :title="isAdd ? '新增字典' : '编辑字典'" width="500px">
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增字典' : '编辑字典'" width="500px">
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
       <el-form-item label="字典名称" prop="name">
         <el-input v-model="form.name" style="width: 370px;"/>
diff --git a/src/views/system/dictDetail/form.vue b/src/views/system/dictDetail/form.vue
index 443a894..5b213b2 100644
--- a/src/views/system/dictDetail/form.vue
+++ b/src/views/system/dictDetail/form.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :append-to-body="true" :visible.sync="dialog" :title="isAdd ? '新增字典详情' : '编辑字典详情'" width="500px">
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增字典详情' : '编辑字典详情'" width="500px">
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
       <el-form-item label="字典标签" prop="label">
         <el-input v-model="form.label" style="width: 370px;"/>
diff --git a/src/views/system/job/form.vue b/src/views/system/job/form.vue
index f969e70..c650865 100644
--- a/src/views/system/job/form.vue
+++ b/src/views/system/job/form.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :append-to-body="true" :visible.sync="dialog" :title="isAdd ? '新增岗位' : '编辑岗位'" width="500px">
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增岗位' : '编辑岗位'" width="500px">
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
       <el-form-item label="名称" prop="name">
         <el-input v-model="form.name" style="width: 370px;"/>
diff --git a/src/views/system/menu/form.vue b/src/views/system/menu/form.vue
index b58d662..3e95321 100644
--- a/src/views/system/menu/form.vue
+++ b/src/views/system/menu/form.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialog" :title="isAdd ? '新增菜单' : '编辑菜单'" append-to-body width="600px">
+  <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="isAdd ? '新增菜单' : '编辑菜单'" append-to-body width="600px">
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
       <el-form-item label="菜单图标">
         <el-popover
diff --git a/src/views/system/permission/form.vue b/src/views/system/permission/form.vue
index 83e73f2..207b5b9 100644
--- a/src/views/system/permission/form.vue
+++ b/src/views/system/permission/form.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialog" :title="isAdd ? '新增权限' : '编辑权限'" append-to-body width="500px">
+  <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="isAdd ? '新增权限' : '编辑权限'" append-to-body width="500px">
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
       <el-form-item label="名称" prop="name">
         <el-input v-model="form.name" style="width: 360px;"/>
diff --git a/src/views/system/role/form.vue b/src/views/system/role/form.vue
index 55f7471..75716a6 100644
--- a/src/views/system/role/form.vue
+++ b/src/views/system/role/form.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialog" :title="isAdd ? '新增角色' : '编辑角色'" append-to-body width="500px">
+  <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="isAdd ? '新增角色' : '编辑角色'" append-to-body width="500px">
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
       <el-form-item label="角色名称" prop="name">
         <el-input v-model="form.name" style="width: 370px;"/>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 1f08815..d0beb28 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -311,3 +311,9 @@ export default {
     font-size: 15px;
   }
 </style>
+
+<style scoped>
+  /deep/ .el-tree-node__label{
+    margin-left: 5px;
+  }
+</style>
diff --git a/src/views/system/timing/index.vue b/src/views/system/timing/index.vue
index 4301e4d..ff4948e 100644
--- a/src/views/system/timing/index.vue
+++ b/src/views/system/timing/index.vue
@@ -26,7 +26,7 @@
       </div>
     </div>
     <!--Form表单-->
-    <el-dialog :visible.sync="dialog" :title="isAdd ? '新增任务' : '编辑任务'" append-to-body width="600px">
+    <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="isAdd ? '新增任务' : '编辑任务'" append-to-body width="600px">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
         <el-form-item label="任务名称" prop="jobName">
           <el-input v-model="form.jobName" style="width: 460px;"/>
diff --git a/src/views/system/user/center/updateEmail.vue b/src/views/system/user/center/updateEmail.vue
index 837b456..1e373a0 100644
--- a/src/views/system/user/center/updateEmail.vue
+++ b/src/views/system/user/center/updateEmail.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="display: inline-block;">
-    <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :title="title" append-to-body width="475px" @close="cancel">
+    <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="title" append-to-body width="475px" @close="cancel">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="88px">
         <el-form-item label="新邮箱" prop="email">
           <el-input v-model="form.email" auto-complete="on" style="width: 200px;"/>
diff --git a/src/views/system/user/center/updatePass.vue b/src/views/system/user/center/updatePass.vue
index d18693c..d040092 100644
--- a/src/views/system/user/center/updatePass.vue
+++ b/src/views/system/user/center/updatePass.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="display: inline-block">
-    <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :title="title" append-to-body width="500px" @close="cancel">
+    <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="title" append-to-body width="500px" @close="cancel">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="88px">
         <el-form-item label="旧密码" prop="oldPass">
           <el-input v-model="form.oldPass" type="password" auto-complete="on" style="width: 370px;"/>
diff --git a/src/views/system/user/form.vue b/src/views/system/user/form.vue
index 3cf9120..52eb213 100644
--- a/src/views/system/user/form.vue
+++ b/src/views/system/user/form.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialog" :title="isAdd ? '新增用户' : '编辑用户'" append-to-body width="570px">
+  <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="isAdd ? '新增用户' : '编辑用户'" append-to-body width="570px">
     <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="66px">
       <el-form-item label="用户名" prop="username">
         <el-input v-model="form.username"/>
diff --git a/src/views/tools/picture/index.vue b/src/views/tools/picture/index.vue
index 062aa6f..21e2068 100644
--- a/src/views/tools/picture/index.vue
+++ b/src/views/tools/picture/index.vue
@@ -27,7 +27,7 @@
       </div>
     </div>
     <!--上传图片-->
-    <el-dialog :visible.sync="dialog" append-to-body width="600px" @close="doSubmit">
+    <el-dialog :visible.sync="dialog" :close-on-click-modal="false" append-to-body width="600px" @close="doSubmit">
       <el-upload
         :on-preview="handlePictureCardPreview"
         :before-remove="handleBeforeRemove"
diff --git a/src/views/tools/qiniu/list.vue b/src/views/tools/qiniu/list.vue
index 26f646b..88930b0 100644
--- a/src/views/tools/qiniu/list.vue
+++ b/src/views/tools/qiniu/list.vue
@@ -25,7 +25,7 @@
       </div>
     </div>
     <!-- 文件上传 -->
-    <el-dialog :visible.sync="dialog" append-to-body width="500px" @close="doSubmit">
+    <el-dialog :visible.sync="dialog" :close-on-click-modal="false" append-to-body width="500px" @close="doSubmit">
       <el-upload
         :before-remove="handleBeforeRemove"
         :on-success="handleSuccess"