From 54bbaa1946b9ad152b9f7e96911249ddcd99bfcc Mon Sep 17 00:00:00 2001
From: lyt <1105290566@qq.com>
Date: Wed, 23 Jun 2021 17:29:23 +0800
Subject: [PATCH] =?UTF-8?q?'admin-21.06.23:=E4=BC=98=E5=8C=96=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=86=85=E5=B5=8Ciframe=E3=80=81=E5=85=B6=E5=AE=83?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BC=98=E5=8C=96=E7=AD=89'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                          | 11 ++++++++++-
 package.json                          |  4 ++--
 src/layout/routerView/iframes.vue     |  2 +-
 src/theme/element.scss                |  3 +++
 src/views/pages/cityLinkage/index.vue |  2 ++
 src/views/pages/tree/index.vue        | 22 ++++++++++++----------
 6 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 233c51f9..d46835ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,20 @@
 
 🎉🎉🔥 `vue-next-admin` 基于 vue3.x 、Typescript、vite、Element plus 等，适配手机、平板、pc 的后台开源免费模板库（vue2.x 请切换 vue-prev-admin 分支）
 
+## 1.0.6
+
+`2021.06.23`
+
+- 🎯 优化 去掉内嵌 iframe 内边距（padding）
+- 🎯 优化 城市多级联动组件
+- 🎯 优化 Tree 树形控件改成表格组件
+- 🐞 修复 Cascader 级联选择器高度问题
+
 ## 1.0.5
 
 `2021.06.22`
 
-- 🌟 更新 vite 降级为@vite2.3.7，降级方法 `cnpm install @vite2.3.7 --save-dev`，防止 element plus 字体图标消失
+- 🌟 更新 vite 降级为@vite2.3.7，降级方法 `cnpm install vite@2.3.7`，防止 element plus 字体图标消失
 - 🐞 修复 开启后端控制路由（isRequestRoutes = true）时，内嵌 iframe、外链不可使用的问题
 
 ## 1.0.4
diff --git a/package.json b/package.json
index 10a3fb93..864c6a80 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vue-next-admin",
-	"version": "1.0.5",
+	"version": "1.0.6",
 	"scripts": {
 		"dev": "vite",
 		"build": "vite build",
@@ -38,7 +38,7 @@
 		"@typescript-eslint/eslint-plugin": "^4.28.0",
 		"@typescript-eslint/parser": "^4.28.0",
 		"@vitejs/plugin-vue": "^1.2.3",
-		"@vue/compiler-sfc": "^3.1.1",
+		"@vue/compiler-sfc": "^3.1.2",
 		"dotenv": "^10.0.0",
 		"eslint": "^7.29.0",
 		"eslint-plugin-vue": "^7.11.1",
diff --git a/src/layout/routerView/iframes.vue b/src/layout/routerView/iframes.vue
index 0fe34964..6cd07475 100644
--- a/src/layout/routerView/iframes.vue
+++ b/src/layout/routerView/iframes.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="layout-scrollbar">
+	<div>
 		<div class="layout-view-bg-white flex h100" v-loading="iframeLoading">
 			<iframe :src="iframeUrl" frameborder="0" height="100%" width="100%" id="iframe" v-show="!iframeLoading"></iframe>
 		</div>
diff --git a/src/theme/element.scss b/src/theme/element.scss
index 83917e73..2768f402 100644
--- a/src/theme/element.scss
+++ b/src/theme/element.scss
@@ -1005,6 +1005,9 @@
 .el-select-dropdown__wrap {
 	max-height: 274px !important; /*修复Select 选择器高度问题*/
 }
+.el-cascader-menu__wrap.el-scrollbar__wrap {
+	height: 204px !important; /*修复Cascader 级联选择器高度问题*/
+}
 
 /* Drawer 抽屉
 ------------------------------- */
diff --git a/src/views/pages/cityLinkage/index.vue b/src/views/pages/cityLinkage/index.vue
index 4fa95ac3..d9ce310c 100644
--- a/src/views/pages/cityLinkage/index.vue
+++ b/src/views/pages/cityLinkage/index.vue
@@ -68,7 +68,9 @@ export default {
 		// 省下拉改变时
 		const onProvinceChange = (name: string) => {
 			state.linkage.city = '';
+			state.linkage.area = '';
 			state.linkage.cityList = [];
+			state.linkage.areaList = [];
 			state.linkage.provinceList.map((v: any) => {
 				if (v.name === name) state.linkage.cityList = v.children;
 			});
diff --git a/src/views/pages/tree/index.vue b/src/views/pages/tree/index.vue
index ae4795ac..3459ef54 100644
--- a/src/views/pages/tree/index.vue
+++ b/src/views/pages/tree/index.vue
@@ -161,14 +161,14 @@ export default {
 <style scoped lang="scss">
 .tree-container {
 	.tree-head {
-		background-color: #f8f8f8;
-		line-height: 40px;
-		height: 40px;
-		border: 1px solid #dcdee3;
+		height: 48px;
+		line-height: 48px;
+		border: 1px solid #ebeef5;
 		border-bottom: none;
 		display: flex;
-		color: #606266;
 		padding-right: 8px;
+		font-weight: bold;
+		color: #909399;
 		.tree-head-check {
 			width: 38px;
 			text-align: right;
@@ -184,27 +184,29 @@ export default {
 	}
 	.el-tree {
 		overflow: hidden;
-		border-bottom: 1px solid #dcdee3;
+		border-bottom: 1px solid #ebeef5;
 		.tree-custom-node {
 			flex: 1;
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
 			padding-right: 8px;
+			width: 100%;
 		}
 		&::v-deep(.el-tree-node) {
-			border: 1px solid #dcdee3;
+			border: 1px solid #ebeef5;
 			border-bottom: none;
+			color: #606266;
 			.el-tree-node__content {
-				line-height: 40px !important;
-				height: 40px !important;
+				line-height: 57px !important;
+				height: 57px !important;
 			}
 			.el-tree-node__children {
 				.el-tree-node {
 					border: none;
 				}
 				.el-tree-node__content {
-					border-top: 1px solid #dcdee3;
+					border-top: 1px solid #ebeef5;
 				}
 			}
 		}