Merge branch 'dev'

FEMessage · Feb 19, 2020 · 2e754ac · 2e754ac
2 parents 2b1a910 + 1fb2797
commit 2e754ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/template/framework-admin/components/breadcrumb/bread-data.js b/template/framework-admin/components/breadcrumb/bread-data.js
@@ -2,7 +2,7 @@ const HOME = {name: '首页'}
 const ACCOUNT = {name: '账户管理', disabled: true}
 const FIELD = {name: '字段管理'}
 const GROUP = {name: '群组管理'}
-const ORGANNIZATION = {name: '组织管理'}
+const ORGANIZATION = {name: '组织管理'}
 const POSITION = {name: '职位管理'}
 const STAFF = {name: '员工管理'}
 
@@ -21,7 +21,7 @@ export default [
   },
   {
     name: 'account-organization',
-    breadcrumb: [ACCOUNT, ORGANNIZATION],
+    breadcrumb: [ACCOUNT, ORGANIZATION],
   },
   {
     name: 'account-position',

diff --git a/template/framework-admin/layouts/default.vue b/template/framework-admin/layouts/default.vue
@@ -100,7 +100,7 @@ export default {
   }
 
   .sub-content {
-    // overflow-y: auto;
+    width: calc(100vw - @sidebar-width);
     height: calc(100vh - @--header-height - @--breadcrumb-height);
   }