Skip to content

Commit

Permalink
修复echarts ueditor demo弹窗zIndex层级
Browse files Browse the repository at this point in the history
  • Loading branch information
daxiongYang committed May 25, 2018
1 parent dfff102 commit 9a591ab
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 7 deletions.
2 changes: 0 additions & 2 deletions src/assets/scss/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,6 @@ img {
}
}
> .el-tabs__content {
position: relative;
z-index: 920;
padding: 0 15px 15px;
> .site-tabs__tools {
position: fixed;
Expand Down
10 changes: 7 additions & 3 deletions src/views/demo/echarts.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
<el-alert
title="提示:"
type="warning"
description="1. 此Demo只提供ECharts官方使用文档,入门部署和体验功能。具体使用请参考:http://echarts.baidu.com/index.html"
:closable="false"
style="margin-bottom: 10px;">
:closable="false">
<div slot-scope="description">
<p class="el-alert__description">1. 此Demo只提供ECharts官方使用文档,入门部署和体验功能。具体使用请参考:http://echarts.baidu.com/index.html</p>
</div>
</el-alert>

<el-row :gutter="20">
Expand Down Expand Up @@ -453,6 +454,9 @@

<style lang="scss">
.mod-demo-echarts {
> .el-alert {
margin-bottom: 10px;
}
> .el-row {
margin-top: -10px;
margin-bottom: -10px;
Expand Down
13 changes: 11 additions & 2 deletions src/views/demo/ueditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
<el-alert
title="提示:"
type="warning"
:closable="false"
style="margin-bottom: 10px;">
:closable="false">
<div slot-scope="description">
<p class="el-alert__description">1. 此Demo只提供UEditor官方使用文档,入门部署和体验功能。具体使用请参考:http://fex.baidu.com/ueditor/</p>
<p class="el-alert__description">2. 浏览器控制台报错“请求后台配置项http错误,上传功能将不能正常使用!”,此错需要后台提供上传接口方法(赋值给serverUrl属性)</p>
Expand Down Expand Up @@ -53,3 +52,13 @@
}
}
</script>

<style lang="scss">
.mod-demo-ueditor {
position: relative;
z-index: 510;
> .el-alert {
margin-bottom: 10px;
}
}
</style>

0 comments on commit 9a591ab

Please sign in to comment.