瀏覽代碼

[Version] V.3.8

[Adds]
1.底部弹框2行溢出时改变高度
master
dhj 4 年之前
父節點
當前提交
e1f0a223ca
共有 2 個文件被更改,包括 13 次插入8 次删除
  1. +4
    -4
      src/views/main_web/workspace.vue
  2. +9
    -4
      static/css/main.css

+ 4
- 4
src/views/main_web/workspace.vue 查看文件

@@ -373,7 +373,7 @@
file.extension != 'png' &&
file.extension != 'bmp' &&
file.extension != 'gif' &&
file.extension != 'jpeg' + (isClient && !file.isDownload && (file.status == 0 || file.status == 2))?'toumin':''"
file.extension != 'jpeg' + (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&&isClient && !file.isDownload && (file.status == 0 || file.status == 2))?'toumin':''"
@contextmenu.prevent="rightShowMenu($event, file, 1)"
></div>
<div
@@ -383,7 +383,7 @@
file.extension == 'png' ||
file.extension == 'bmp' ||
file.extension == 'gif' ||
file.extension == 'jpeg'+ (isClient && !file.isDownload && (file.status == 0 || file.status == 2))?'toumin':''"
file.extension == 'jpeg'+ (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&&isClient && !file.isDownload && (file.status == 0 || file.status == 2))?'toumin':''"
@contextmenu.prevent="rightShowMenu($event, file, 1)"
>
<div class="file_Im gbox-mid">
@@ -662,7 +662,7 @@
</section>
</section>

<div :class="neibianju">
<div :class="neibianju" ref="outBox">
<div class="titleBox">
<div class="title_warp">
<div class="yiyun_section_top orginoverflow" id="bignav">
@@ -713,7 +713,7 @@
<div class="clear"></div>
</div>
</div>
<div class="fifleBox">
<div class="fifleBox" ref="inBox">
<div class="yiyun_section_warp layerout_H3">
<!-- 文件大box -->
<div class="yinyong_warpBox">


+ 9
- 4
static/css/main.css 查看文件

@@ -1881,7 +1881,7 @@ span.yiyun_tishibtn {
width: 136px;
float: left;
height: 200px;
margin: 0px 16px 30px 16px;
margin: 0px 16px 0px 16px;
}
.yiyun_wenjian_list:hover {
background-color: #d8d8d8;
@@ -4266,12 +4266,13 @@ button:focus {
margin: 0 auto;
}
.fifleBox{
min-height: 259px;
min-height: 215px;
max-height: 275px;
overflow-y: auto;
overflow-y: auto;
}
.neibianju1 .fifleBox{
height: calc(100vh - 210px);
max-height: calc(100vh - 210px);
overflow-y: auto;
}
.yiyun_title_label{
@@ -4571,7 +4572,7 @@ button:focus {
left: -30px;
}
.layerout_H2{
height: calc(100vh - 406px);
height: calc(100vh - 350px);
overflow-y: auto;
transition: ease all 0.5s;
background-color: #f6f6f6;
@@ -7503,6 +7504,10 @@ li.secondMenu ul li:hover {
border-radius: 16px 16px 0 0;
box-shadow: 0 -3px 11px 1px rgba(0,0,0,0.06);
overflow-y: auto;
position: absolute;
bottom: 0;
width: 100%;
box-sizing: border-box;
}
.neibianju1 {
background-color: #fff;