From a3d7193ea00eb2fb2674cf96eb398a408e71d075 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Sun, 22 Dec 2019 10:39:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8=EF=BC=8C=E4=BC=98=E5=8C=96=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E7=BA=A7=E5=88=AB=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/role.js          |  2 +-
 src/views/components/Editor.vue |  2 +-
 src/views/generator/config.vue  | 61 +++++++++++++++++++++++++--------
 src/views/generator/index.vue   | 25 ++++++++------
 src/views/system/role/index.vue | 32 ++++++++++++++---
 5 files changed, 89 insertions(+), 33 deletions(-)

diff --git a/src/api/system/role.js b/src/api/system/role.js
index 198e328..1f7bc1e 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -54,4 +54,4 @@ export function editMenu(data) {
   })
 }
 
-export default { add, edit, del, get, editMenu }
+export default { add, edit, del, get, editMenu, getLevel }
diff --git a/src/views/components/Editor.vue b/src/views/components/Editor.vue
index 8a12323..415ad15 100644
--- a/src/views/components/Editor.vue
+++ b/src/views/components/Editor.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <p class="warn-content">
-      Markdown 基于
+      富文本基于
       <el-link type="primary" href="https://www.kancloud.cn/wangfupeng/wangeditor3/332599" target="_blank">wangEditor</el-link>
       ，图片上传使用 <el-link type="primary" href="https://sm.ms/" target="_blank">SM.MS</el-link>
     </p>
diff --git a/src/views/generator/config.vue b/src/views/generator/config.vue
index 48a39d2..951acc6 100644
--- a/src/views/generator/config.vue
+++ b/src/views/generator/config.vue
@@ -5,22 +5,32 @@
         <el-card class="box-card" shadow="never">
           <div slot="header" class="clearfix">
             <span class="role-span">字段配置：{{ tableName }}</span>
+            <el-button
+              :loading="genLoading"
+              icon="el-icon-s-promotion"
+              size="mini"
+              style="float: right; padding: 6px 9px;"
+              type="success"
+              @click="toGen"
+            >保存&生成</el-button>
             <el-button
               :loading="columnLoading"
               icon="el-icon-check"
               size="mini"
-              style="float: right; padding: 6px 9px;"
+              style="float: right; padding: 6px 9px;margin-right: 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>
+            <el-tooltip class="item" effect="dark" content="数据库中表字段变动时使用该功能" placement="top-start">
+              <el-button
+                :loading="syncLoading"
+                icon="el-icon-refresh"
+                size="mini"
+                style="float: right; padding: 6px 9px;"
+                type="info"
+                @click="sync"
+              >同步</el-button>
+            </el-tooltip>
           </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">
@@ -95,6 +105,10 @@
                       label="Like"
                       value="Like"
                     />
+                    <el-option
+                      label="NotNull"
+                      value="NotNull"
+                    />
                     <el-option
                       label="BetWeen"
                       value="BetWeen"
@@ -161,14 +175,14 @@
               <el-input v-model="form.path" style="width: 40%" />
               <span style="color: #C0C0C0;margin-left: 10px;">输入views文件夹下的目录，不存在即创建</span>
             </el-form-item>
+            <!--            <el-form-item label="接口目录">-->
+            <!--              <el-input v-model="form.apiPath" style="width: 40%" />-->
+            <!--              <span style="color: #C0C0C0;margin-left: 10px;">Api存放路径[src/api]，为空则自动生成路径</span>-->
+            <!--            </el-form-item>-->
             <el-form-item label="去表前缀" prop="prefix">
               <el-input v-model="form.prefix" placeholder="默认不去除表前缀" style="width: 40%" />
               <span style="color: #C0C0C0;margin-left: 10px;">默认不去除表前缀，可自定义</span>
             </el-form-item>
-            <!--            <el-form-item label="Api路径">-->
-            <!--              <el-input v-model="form.apiPath"/>-->
-            <!--              <span style="color: #C0C0C0;margin-left: 10px;">Sender mailbox</span>-->
-            <!--            </el-form-item>-->
             <el-form-item label="是否覆盖" prop="cover">
               <el-radio-group v-model="form.cover" size="mini" style="width: 40%">
                 <el-radio-button label="true">是</el-radio-button>
@@ -186,7 +200,7 @@
 <script>
 import crud from '@/mixins/crud'
 import { update, get } from '@/api/generator/genConfig'
-import { save, sync } from '@/api/generator/generator'
+import { save, sync, generator } from '@/api/generator/generator'
 import { getDicts } from '@/api/system/dict'
 export default {
   name: 'GeneratorConfig',
@@ -194,7 +208,7 @@ export default {
   mixins: [crud],
   data() {
     return {
-      activeName: 'first', tableName: '', tableHeight: 550, columnLoading: false, configLoading: false, dicts: [], syncLoading: false,
+      activeName: 'first', tableName: '', tableHeight: 550, columnLoading: false, configLoading: false, dicts: [], syncLoading: false, genLoading: false,
       form: { id: null, tableName: '', author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '', apiAlias: null },
       rules: {
         author: [
@@ -274,6 +288,23 @@ export default {
       }).then(() => {
         this.syncLoading = false
       })
+    },
+    toGen() {
+      this.genLoading = true
+      save(this.data).then(res => {
+        this.notify('保存成功', 'success')
+        // 生成代码
+        generator(this.tableName, 0).then(data => {
+          this.genLoading = false
+          this.notify('生成成功', 'success')
+        }).catch(err => {
+          this.genLoading = false
+          console.log(err.response.data.message)
+        })
+      }).catch(err => {
+        this.genLoading = false
+        console.log(err.response.data.message)
+      })
     }
   }
 }
diff --git a/src/views/generator/index.vue b/src/views/generator/index.vue
index e780545..a0d022b 100644
--- a/src/views/generator/index.vue
+++ b/src/views/generator/index.vue
@@ -7,16 +7,17 @@
         <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>
+        <el-tooltip slot="right" class="item" effect="dark" content="数据库中表字段变动时使用该功能" placement="top-start">
+          <el-button
+            class="filter-item"
+            size="mini"
+            type="success"
+            icon="el-icon-refresh"
+            :loading="syncLoading"
+            :disabled="crud.selections.length === 0"
+            @click="sync"
+          >同步</el-button>
+        </el-tooltip>
       </crudOperation>
     </div>
     <!--表格渲染-->
@@ -54,7 +55,9 @@
 </template>
 
 <script>
+
 import { generator, sync } from '@/api/generator/generator'
+import { downloadFile } from '@/utils/index'
 import CRUD, { presenter, header } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -88,7 +91,7 @@ export default {
     toDownload(tableName) {
       // 打包下载
       generator(tableName, 2).then(data => {
-        this.downloadFile(data, tableName, 'zip')
+        downloadFile(data, tableName, 'zip')
       })
     },
     sync() {
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 3a0abd4..a0ab4c4 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -62,7 +62,7 @@
             <span class="role-span">角色列表</span>
           </div>
           <el-table ref="table" v-loading="crud.loading" highlight-current-row style="width: 100%;" :data="crud.data" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
-            <el-table-column type="selection" width="55" />
+            <el-table-column :selectable="checkboxT" type="selection" width="55" />
             <el-table-column v-if="columns.visible('name')" prop="name" label="名称" />
             <el-table-column v-if="columns.visible('dataScope')" prop="dataScope" label="数据权限" />
             <el-table-column v-if="columns.visible('permission')" prop="permission" label="角色权限" />
@@ -76,6 +76,7 @@
             <el-table-column v-permission="['admin','roles:edit','roles:del']" label="操作" width="130px" align="center" fixed="right">
               <template slot-scope="scope">
                 <udOperation
+                  v-if="scope.row.level >= level"
                   :data="scope.row"
                   :permission="permission"
                 />
@@ -142,7 +143,7 @@ export default {
   data() {
     return {
       defaultProps: { children: 'children', label: 'label' },
-      dateScopes: ['全部', '本级', '自定义'],
+      dateScopes: ['全部', '本级', '自定义'], level: 3,
       currentId: 0, menuLoading: false, showButton: false,
       menus: [], menuIds: [], depts: [],
       permission: {
@@ -162,6 +163,10 @@ export default {
   },
   created() {
     this.getMenus()
+    crudRoles.getLevel().then(data => {
+      this.level = data.level
+      console.log(this.level)
+    })
     this.$nextTick(() => {
       this.crud.toQuery()
     })
@@ -189,16 +194,31 @@ export default {
           type: 'warning'
         })
         return false
-      } else {
+      } else if (crud.form.dataScope === '自定义') {
         const depts = []
         crud.form.depts.forEach(function(data, index) {
           const dept = { id: data }
           depts.push(dept)
         })
         crud.form.depts = depts
+      } else {
+        crud.form.depts = []
       }
       return true
     },
+    [CRUD.HOOK.afterAddError](crud) {
+      this.afterErrorMethod(crud)
+    },
+    [CRUD.HOOK.afterEditError](crud) {
+      this.afterErrorMethod(crud)
+    },
+    afterErrorMethod(crud) {
+      const depts = []
+      crud.form.depts.forEach(function(dept, index) {
+        depts.push(dept.id)
+      })
+      crud.form.depts = depts
+    },
     // 获取所有菜单
     getMenus() {
       getMenusTree().then(res => {
@@ -213,8 +233,7 @@ export default {
         this.$refs.menu.setCheckedKeys([])
         // 保存当前的角色id
         this.currentId = val.id
-        // 点击后显示按钮
-        this.showButton = true
+        this.showButton = this.level <= val.level
         // 初始化
         this.menuIds = []
         // 菜单数据需要特殊处理
@@ -269,6 +288,9 @@ export default {
       if (this.form.dataScope === '自定义') {
         this.getDepts()
       }
+    },
+    checkboxT(row, rowIndex) {
+      return row.level >= this.level
     }
   }
 }