From 11a71a04aed2163f2749bfe301fecd7411c3a3c4 Mon Sep 17 00:00:00 2001
From: pig666 <pig666@qq.com>
Date: Mon, 1 Jun 2020 12:18:15 +0800
Subject: [PATCH] :bookmark: Releasing / Version tags. 2.7.5

---
 package.json                   |  2 +-
 src/const/crud/admin/user.js   | 50 +++++++++++++++------------
 src/main.js                    |  4 +--
 src/page/index/tags.vue        |  2 +-
 src/page/login/index.vue       |  2 +-
 src/page/login/userlogin.vue   |  1 -
 src/page/wel.vue               |  2 +-
 src/views/admin/dict/index.vue |  1 -
 src/views/admin/menu/index.vue | 10 ++----
 src/views/admin/role/index.vue | 35 +++++++++----------
 src/views/admin/user/index.vue | 63 ++++++++++++----------------------
 11 files changed, 73 insertions(+), 99 deletions(-)

diff --git a/package.json b/package.json
index 6668327..500f445 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pig-ui",
-  "version": "2.7.3",
+  "version": "2.7.5",
   "private": true,
   "scripts": {
     "pre": "cnpm install || yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org ",
diff --git a/src/const/crud/admin/user.js b/src/const/crud/admin/user.js
index 136c9fe..cc357dc 100644
--- a/src/const/crud/admin/user.js
+++ b/src/const/crud/admin/user.js
@@ -14,9 +14,12 @@
  * this software without specific prior written permission.
  * Author: lengleng (wangiegie@gmail.com)
  */
-import { getDetails } from '@/api/admin/user'
+import {getDetails} from '@/api/admin/user'
 
-var validateUsername = (rule, value, callback) => {
+const validateUsername = (rule, value, callback) => {
+  if (!value) {
+    return callback(new Error('请输入用户名'))
+  }
   getDetails(value).then(response => {
     if (window.boxType === 'edit') callback()
     let result = response.data.data
@@ -28,6 +31,18 @@ var validateUsername = (rule, value, callback) => {
   })
 }
 
+// 设置密码校验规则
+const checkPassword = (rule, value, callback) => {
+  if (window.boxType === 'edit') {
+    return callback()
+  }
+  if (!value) {
+    callback(new Error('请输入密码'))
+  } else {
+    callback()
+  }
+}
+
 // 设置手机号的验证规则
 const checkPhone = (rule, value, callback) => {
   if (!value) {
@@ -59,7 +74,7 @@ export const tableOption = {
     prop: 'userId',
     span: 24,
     hide: true,
-    editDisabled: true,
+    editDisplay: false,
     addDisplay: false
   }, {
     fixed: true,
@@ -73,13 +88,13 @@ export const tableOption = {
       required: true,
       message: '请输入用户名'
     },
-    {
-      min: 3,
-      max: 20,
-      message: '长度在 3 到 20 个字符',
-      trigger: 'blur'
-    },
-    { validator: validateUsername, trigger: 'blur' }
+      {
+        min: 3,
+        max: 20,
+        message: '长度在 3 到 20 个字符',
+        trigger: 'blur'
+      },
+      {validator: validateUsername, trigger: 'blur'}
     ]
   }, {
     label: '密码',
@@ -88,16 +103,7 @@ export const tableOption = {
     value: '',
     hide: true,
     span: 24,
-    rules: [{
-      required: true,
-      message: '密码不能为空',
-      trigger: 'blur'
-    },{
-      min: 6,
-      max: 20,
-      message: '长度在 6 到 20 个字符',
-      trigger: 'blur'
-    }]
+    rules: [{validator: checkPassword, trigger: 'blur'}]
   }, {
     label: '所属部门',
     prop: 'deptId',
@@ -116,11 +122,11 @@ export const tableOption = {
     type: 'phone',
     value: '',
     span: 24,
-    rules: [ {
+    rules: [{
       required: true,
       message: '密码不能为空',
       trigger: 'blur'
-    },{
+    }, {
       validator: checkPhone,
       trigger: 'blur'
     }]
diff --git a/src/main.js b/src/main.js
index 0935554..673ef3a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -26,12 +26,12 @@ import basicContainer from './components/basic-container/main'
 Vue.use(VueAxios, axios)
 
 Vue.use(ElementUI, {
-  size: 'medium',
+  size: 'small',
   menuType: 'text'
 })
 
 Vue.use(Avue, {
-  size: 'medium',
+  size: 'small',
   menuType: 'text'
 })
 
diff --git a/src/page/index/tags.vue b/src/page/index/tags.vue
index f40bdfd..43f42a3 100644
--- a/src/page/index/tags.vue
+++ b/src/page/index/tags.vue
@@ -27,7 +27,7 @@
       </el-tabs>
       <el-dropdown class="avue-tags__menu">
         <el-button type="primary"
-                   size="mini">
+                   >
           更多
           <i class="el-icon-arrow-down el-icon--right"></i>
         </el-button>
diff --git a/src/page/login/index.vue b/src/page/login/index.vue
index a524945..6799556 100644
--- a/src/page/login/index.vue
+++ b/src/page/login/index.vue
@@ -6,7 +6,7 @@
              src="/img/logo.png"
              alt="">
         <p class="title">{{website.infoTitle}}</p>
-        <p>©2020 v2.7.3</p>
+        <p>©2020 v2.7.5</p>
       </div>
       <div class="login-border">
         <div class="login-main">
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index bf7e25f..7648209 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -58,7 +58,6 @@
     </el-form-item>
     <el-form-item>
       <el-button type="primary"
-                 size="small"
                  @click.native.prevent="handleLogin"
                  class="login-submit">登录</el-button>
     </el-form-item>
diff --git a/src/page/wel.vue b/src/page/wel.vue
index 3953fa4..4c2b546 100644
--- a/src/page/wel.vue
+++ b/src/page/wel.vue
@@ -4,7 +4,7 @@
       <div class="banner-text">
         <span>
           <a href="https://avue.top/#/pay" target="_blank">
-            <img src="https://img.shields.io/badge/Avue-2.3.5-green.svg" alt="Build Status">
+            <img src="https://img.shields.io/badge/Element-2.13.0-green.svg" alt="Build Status">
           </a>
           <img src="https://img.shields.io/badge/Spring%20Boot-2.2.6.RELEASE-yellowgreen.svg" alt="Downloads">
           <img src="https://img.shields.io/badge/Spring%20Cloud-Hoxton.SR3-blue.svg" alt="Coverage Status">
diff --git a/src/views/admin/dict/index.vue b/src/views/admin/dict/index.vue
index 2926b70..3126d7c 100644
--- a/src/views/admin/dict/index.vue
+++ b/src/views/admin/dict/index.vue
@@ -38,7 +38,6 @@
           <el-button
             v-if="permissions.sys_dict_add"
             type="text"
-            size="small"
             icon="el-icon-menu"
             @click="handleItem(scope.row,scope.index)">字典项
           </el-button>
diff --git a/src/views/admin/menu/index.vue b/src/views/admin/menu/index.vue
index 79d27cc..08200ea 100644
--- a/src/views/admin/menu/index.vue
+++ b/src/views/admin/menu/index.vue
@@ -40,23 +40,17 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
-              size="small"
               type="text"
               icon="el-icon-plus"
               @click="addOrUpdateHandle(false,scope.row.id)"
               v-if="permissions.sys_menu_add">添加
             </el-button>
-            <el-button size="small"
-                       type="text"
+            <el-button type="text"
                        icon="el-icon-edit"
                        @click="addOrUpdateHandle(true,scope.row.id)"
                        v-if="permissions.sys_menu_edit">修改
             </el-button>
-            <el-button
-              size="small"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
+            <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
               v-if="permissions.sys_menu_del">删除
             </el-button>
           </template>
diff --git a/src/views/admin/role/index.vue b/src/views/admin/role/index.vue
index a8c5033..1de9362 100644
--- a/src/views/admin/role/index.vue
+++ b/src/views/admin/role/index.vue
@@ -38,7 +38,7 @@
             class="filter-item"
             type="primary"
             icon="el-icon-edit"
-            @click="handleCreate">添加
+            @click="$refs.crud.rowAdd()">添加
           </el-button>
         </template>
         <template slot="dsScopeForm" slot-scope="scope">
@@ -62,21 +62,18 @@
           <el-button
             v-if="roleManager_btn_edit"
             type="text"
-            size="mini"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row,scope.index)">编辑
           </el-button>
           <el-button
             v-if="roleManager_btn_del"
             type="text"
-            size="mini"
             icon="el-icon-delete"
             @click="handleDelete(scope.row,scope.index)">删除
           </el-button>
           <el-button
             v-if="roleManager_btn_perm"
             type="text"
-            size="mini"
             icon="el-icon-plus"
             @click="handlePermission(scope.row,scope.index)">权限
           </el-button>
@@ -105,24 +102,23 @@
            class="dialog-footer">
         <el-button
           type="primary"
-          size="small"
           @click="updatePermession(roleId)">更 新
         </el-button>
         <el-button
           type="default"
-          size="small"
-          @click="cancal()">取消</el-button>
+          @click="cancal()">取消
+        </el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
-  import { addObj, delObj, fetchList, fetchRoleTree, permissionUpd, putObj } from '@/api/admin/role'
-  import { tableOption } from '@/const/crud/admin/role'
-  import { fetchTree } from '@/api/admin/dept'
-  import { fetchMenuTree } from '@/api/admin/menu'
-  import { mapGetters } from 'vuex'
+  import {addObj, delObj, fetchList, fetchRoleTree, permissionUpd, putObj} from '@/api/admin/role'
+  import {tableOption} from '@/const/crud/admin/role'
+  import {fetchTree} from '@/api/admin/dept'
+  import {fetchMenuTree} from '@/api/admin/menu'
+  import {mapGetters} from 'vuex'
 
   export default {
     name: 'TableRole',
@@ -185,11 +181,9 @@
       },
       handleFilter(form) {
         this.searchForm = form
+        this.page.currentPage = 1
         this.getList(this.page, form)
       },
-      handleCreate() {
-        this.$refs.crud.rowAdd()
-      },
       handleOpenBefore(show) {
         fetchTree().then(response => {
           this.dsScopeData = response.data.data
@@ -204,7 +198,7 @@
       handleUpdate(row, index) {
         this.$refs.crud.rowEdit(row, index)
       },
-      cancal () {
+      cancal() {
         this.dialogPermissionVisible = false;
       },
       handlePermission(row) {
@@ -254,7 +248,7 @@
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
-        }).then(function() {
+        }).then(function () {
           return delObj(row.roleId)
         }).then(() => {
           this.getList(this.page)
@@ -285,12 +279,12 @@
           loading()
         })
       },
-      updatePermession (roleId) {
+      updatePermession(roleId) {
         this.menuIds = ''
         this.menuIds = this.$refs.menuTree.getCheckedKeys().join(',').concat(',').concat(this.$refs.menuTree.getHalfCheckedKeys().join(','))
         permissionUpd(roleId, this.menuIds).then(() => {
           this.dialogPermissionVisible = false
-          this.$store.dispatch('GetMenu', {type:false})
+          this.$store.dispatch('GetMenu', {type: false})
           this.$notify.success('修改成功')
         })
       }
@@ -302,15 +296,18 @@
   .el-dialog__wrapper {
     .el-dialog {
       width: 61% !important;
+
       .dialog-main-tree {
         max-height: 400px;
         overflow-y: auto;
       }
     }
+
     .el-form-item__label {
       width: 20% !important;
       padding-right: 20px;
     }
+
     .el-form-item__content {
       margin-left: 20% !important;
     }
diff --git a/src/views/admin/user/index.vue b/src/views/admin/user/index.vue
index e9f0329..dd66b03 100644
--- a/src/views/admin/user/index.vue
+++ b/src/views/admin/user/index.vue
@@ -35,8 +35,7 @@
         <template slot="menuLeft">
           <el-button v-if="sys_user_add"
                      class="filter-item"
-                     @click="handleCreate"
-                     size="small"
+                     @click="$refs.crud.rowAdd()"
                      type="primary"
                      icon="el-icon-edit">添加
           </el-button>
@@ -63,13 +62,11 @@
         <template slot="menu"
                   slot-scope="scope">
           <el-button v-if="sys_user_edit"
-                     size="small"
                      type="text"
                      icon="el-icon-edit"
                      @click="handleUpdate(scope.row,scope.index)">编辑
           </el-button>
           <el-button v-if="sys_user_del"
-                     size="small"
                      type="text"
                      icon="el-icon-delete"
                      @click="deletes(scope.row,scope.index)">删除
@@ -78,10 +75,10 @@
         <template slot="deptIdForm"
                   slot-scope="scope">
           <avue-input-tree v-model="form.deptId"
-                      placeholder="请选择所属部门"
-                      :node-click="getNodeData"
-                      :dic="treeDeptData"
-                      :props="defaultProps"></avue-input-tree>
+                           placeholder="请选择所属部门"
+                           :node-click="getNodeData"
+                           :dic="treeDeptData"
+                           :props="defaultProps"></avue-input-tree>
         </template>
         <template slot="roleForm"
                   slot-scope="scope">
@@ -162,11 +159,6 @@
           this.rolesOptions = response.data.data;
         });
       },
-      handleDept() {
-        fetchTree().then(response => {
-          this.treeDeptData = response.data.data;
-        });
-      },
       sizeChange(pageSize) {
         this.page.pageSize = pageSize
       },
@@ -174,28 +166,32 @@
         this.page.currentPage = current
       },
       handleFilter(param, done) {
+        this.page.currentPage = 1
         this.getList(this.page, param);
         done()
       },
       handleRefreshChange() {
         this.getList(this.page)
       },
-      handleCreate() {
-        this.$refs.crud.rowAdd();
-      },
       handleOpenBefore(show, type) {
-        window.boxType = type;
-        this.handleDept();
+        window.boxType = type
+        // 查询部门树
+        fetchTree().then(response => {
+          this.treeDeptData = response.data.data
+        })
+        // 查询角色列表
+        deptRoleList().then(response => {
+          this.rolesOptions = response.data.data
+        })
+        // 若是编辑、查看回显角色名称
         if (['edit', 'views'].includes(type)) {
-          this.role = [];
-          for (var i = 0; i < this.form.roleList.length; i++) {
+          this.role = []
+          for (let i = 0; i < this.form.roleList.length; i++) {
             this.role[i] = this.form.roleList[i].roleId;
           }
-          deptRoleList().then(response => {
-            this.rolesOptions = response.data.data;
-          });
         } else if (type === 'add') {
-          this.role = [];
+          // 若是添加角色列表设置为空
+          this.role = []
         }
         show();
       },
@@ -221,7 +217,7 @@
           loading();
         });
       },
-      deletes(row, index) {
+      deletes(row) {
         this.$confirm("此操作将永久删除该用户(用户名:" + row.username + "), 是否继续?", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消", type: "warning"
@@ -238,20 +234,3 @@
     }
   };
 </script>
-<style lang="scss">
-  .user {
-    height: 100%;
-
-    &__tree {
-      padding-top: 3px;
-      padding-right: 20px;
-    }
-
-    &__main {
-      .el-card__body {
-        padding-top: 0;
-      }
-    }
-  }
-</style>
-