Merge remote-tracking branch 'origin/master'

src/assets/styles/btn.scss

@@ -268,3 +268,8 @@
   font-size: 14px;
   border-radius: 4px;
 }
+
+/** 权限重写，所未勾选权限按钮的悬浮状态 */
+.permi-disabled {
+  cursor: not-allowed;
+}

src/assets/styles/index.scss

@@ -122,6 +122,7 @@ aside {
 //main-container全局样式
 .app-container {
   padding: 20px;
+  min-height: calc(100vh - 50px - 24px - 24px - 5px);
 }
 
 .components-container {

src/assets/styles/ruoyi.scss

@@ -90,6 +90,9 @@
 			margin-left: 1px;
 		}
 	}
+  .el-table__empty-block{
+    min-height: 88px;
+  }
 }
 
 /** 表单布局 **/
@@ -132,11 +135,11 @@
   }
 }
 
-.el-table .fixed-width .el-button--mini {
-	padding-left: 0;
-	padding-right: 0;
-	width: inherit;
-}
+ .el-table .fixed-width .el-button--mini {
+   padding: 4px 0;
+   width: inherit;
+   border-radius: 4px!important;
+ }
 
 /** 表格更多操作下拉样式 */
 .el-table .el-dropdown-link,.el-table .el-dropdown-selfdefine {

src/assets/styles/variables.scss

@@ -36,7 +36,7 @@ $base-sub-menu-background:#000c17;
 $base-sub-menu-hover:#001528;
 */
 
-$base-sidebar-width: 200px;
+$base-sidebar-width: 235px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass

src/main.js

@@ -124,3 +124,14 @@ export async function unmount() {
   instance = null
 }
 
+// 重写v-hasPermi(原来为没权限消失, 现在为禁止点击)
+Vue.directive('hasPermi', {
+  inserted: function(el, binding, vnode) {
+    const permission = binding.value
+    // 判断当前登陆用户有无此权限, 没有则此按钮禁用
+    if (!permission.some(element => store.getters.permissions.includes(element)) && !store.getters.permissions.includes('*:*:*')) {
+      el.disabled = true
+      el.classList.add('permi-disabled')
+    }
+  }
+})