From 1fb2797390058c01d8cf657478bd919b956a0c17 Mon Sep 17 00:00:00 2001
From: Han <xsytby1112@gmail.com>
Date: Wed, 19 Feb 2020 18:59:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20windows=20=E4=B8=8B=E4=B8=BB=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=AE=B9=E5=99=A8=E5=AE=BD=E5=BA=A6=E5=8F=98=E5=AE=BD?=
 =?UTF-8?q?=20(#145)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: windows 下 el-scrollbar 导致子容器宽度变宽

* chore: 修改错误的拼写
---
 template/framework-admin/components/breadcrumb/bread-data.js | 4 ++--
 template/framework-admin/layouts/default.vue                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/template/framework-admin/components/breadcrumb/bread-data.js b/template/framework-admin/components/breadcrumb/bread-data.js
index c1ef9f4..ebd20df 100644
--- 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
index 524f254..4c80d37 100644
--- 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);
   }