'admin-21.06.23:优化去掉内嵌iframe、其它组件优化等'

This commit is contained in:
lyt 2021-06-23 17:29:23 +08:00
parent 8ab22b0a02
commit 54bbaa1946
6 changed files with 30 additions and 14 deletions

View File

@ -2,11 +2,20 @@
🎉🎉🔥 `vue-next-admin` 基于 vue3.x 、Typescript、vite、Element plus 等适配手机、平板、pc 的后台开源免费模板库vue2.x 请切换 vue-prev-admin 分支) 🎉🎉🔥 `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 ## 1.0.5
`2021.06.22` `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、外链不可使用的问题 - 🐞 修复 开启后端控制路由isRequestRoutes = true内嵌 iframe、外链不可使用的问题
## 1.0.4 ## 1.0.4

View File

@ -1,6 +1,6 @@
{ {
"name": "vue-next-admin", "name": "vue-next-admin",
"version": "1.0.5", "version": "1.0.6",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"build": "vite build", "build": "vite build",
@ -38,7 +38,7 @@
"@typescript-eslint/eslint-plugin": "^4.28.0", "@typescript-eslint/eslint-plugin": "^4.28.0",
"@typescript-eslint/parser": "^4.28.0", "@typescript-eslint/parser": "^4.28.0",
"@vitejs/plugin-vue": "^1.2.3", "@vitejs/plugin-vue": "^1.2.3",
"@vue/compiler-sfc": "^3.1.1", "@vue/compiler-sfc": "^3.1.2",
"dotenv": "^10.0.0", "dotenv": "^10.0.0",
"eslint": "^7.29.0", "eslint": "^7.29.0",
"eslint-plugin-vue": "^7.11.1", "eslint-plugin-vue": "^7.11.1",

View File

@ -1,5 +1,5 @@
<template> <template>
<div class="layout-scrollbar"> <div>
<div class="layout-view-bg-white flex h100" v-loading="iframeLoading"> <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> <iframe :src="iframeUrl" frameborder="0" height="100%" width="100%" id="iframe" v-show="!iframeLoading"></iframe>
</div> </div>

View File

@ -1005,6 +1005,9 @@
.el-select-dropdown__wrap { .el-select-dropdown__wrap {
max-height: 274px !important; /*修复Select 选择器高度问题*/ max-height: 274px !important; /*修复Select 选择器高度问题*/
} }
.el-cascader-menu__wrap.el-scrollbar__wrap {
height: 204px !important; /*修复Cascader 级联选择器高度问题*/
}
/* Drawer 抽屉 /* Drawer 抽屉
------------------------------- */ ------------------------------- */

View File

@ -68,7 +68,9 @@ export default {
// //
const onProvinceChange = (name: string) => { const onProvinceChange = (name: string) => {
state.linkage.city = ''; state.linkage.city = '';
state.linkage.area = '';
state.linkage.cityList = []; state.linkage.cityList = [];
state.linkage.areaList = [];
state.linkage.provinceList.map((v: any) => { state.linkage.provinceList.map((v: any) => {
if (v.name === name) state.linkage.cityList = v.children; if (v.name === name) state.linkage.cityList = v.children;
}); });

View File

@ -161,14 +161,14 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
.tree-container { .tree-container {
.tree-head { .tree-head {
background-color: #f8f8f8; height: 48px;
line-height: 40px; line-height: 48px;
height: 40px; border: 1px solid #ebeef5;
border: 1px solid #dcdee3;
border-bottom: none; border-bottom: none;
display: flex; display: flex;
color: #606266;
padding-right: 8px; padding-right: 8px;
font-weight: bold;
color: #909399;
.tree-head-check { .tree-head-check {
width: 38px; width: 38px;
text-align: right; text-align: right;
@ -184,27 +184,29 @@ export default {
} }
.el-tree { .el-tree {
overflow: hidden; overflow: hidden;
border-bottom: 1px solid #dcdee3; border-bottom: 1px solid #ebeef5;
.tree-custom-node { .tree-custom-node {
flex: 1; flex: 1;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding-right: 8px; padding-right: 8px;
width: 100%;
} }
&::v-deep(.el-tree-node) { &::v-deep(.el-tree-node) {
border: 1px solid #dcdee3; border: 1px solid #ebeef5;
border-bottom: none; border-bottom: none;
color: #606266;
.el-tree-node__content { .el-tree-node__content {
line-height: 40px !important; line-height: 57px !important;
height: 40px !important; height: 57px !important;
} }
.el-tree-node__children { .el-tree-node__children {
.el-tree-node { .el-tree-node {
border: none; border: none;
} }
.el-tree-node__content { .el-tree-node__content {
border-top: 1px solid #dcdee3; border-top: 1px solid #ebeef5;
} }
} }
} }