Bläddra i källkod

[Version] V.3.8

[Adds]
1.底部弹框2行溢出时改变高度
master
dhj 4 år sedan
förälder
incheckning
e1f0a223ca
2 ändrade filer med 13 tillägg och 8 borttagningar
  1. +4
    -4
      src/views/main_web/workspace.vue
  2. +9
    -4
      static/css/main.css

+ 4
- 4
src/views/main_web/workspace.vue Visa fil

@@ -373,7 +373,7 @@
file.extension != 'png' && file.extension != 'png' &&
file.extension != 'bmp' && file.extension != 'bmp' &&
file.extension != 'gif' && 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)" @contextmenu.prevent="rightShowMenu($event, file, 1)"
></div> ></div>
<div <div
@@ -383,7 +383,7 @@
file.extension == 'png' || file.extension == 'png' ||
file.extension == 'bmp' || file.extension == 'bmp' ||
file.extension == 'gif' || 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)" @contextmenu.prevent="rightShowMenu($event, file, 1)"
> >
<div class="file_Im gbox-mid"> <div class="file_Im gbox-mid">
@@ -662,7 +662,7 @@
</section> </section>
</section> </section>


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


+ 9
- 4
static/css/main.css Visa fil

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