purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化单据的全屏事件

Browse Source
This commit is contained in:
季圣华
2021-11-04 22:35:31 +08:00
parent 592c840c1a
commit b62e0b95dc
2 changed files with 59 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
jshERP-web/src/assets/less/common.less
View File

@@ -1,58 +1,58 @@
/*列表上方操作按钮区域*/ /*列表上方操作按钮区域*/
.ant-card-body .table-operator { .ant-card-body .table-operator {
margin-bottom: 0px; margin-bottom: 0px;
} }
/** Button按钮间距 */ /** Button按钮间距 */
.table-operator .ant-btn { .table-operator .ant-btn {
margin: 0 8px 8px 0; margin: 0 8px 8px 0;
} }
.table-operator .ant-btn-group .ant-btn { .table-operator .ant-btn-group .ant-btn {
margin: 0; margin: 0;
} }
.table-operator .ant-btn-group .ant-btn:last-child { .table-operator .ant-btn-group .ant-btn:last-child {
margin: 0 8px 8px 0; margin: 0 8px 8px 0;
} }
/*列表td的padding设置 可以控制列表大小*/ /*列表td的padding设置 可以控制列表大小*/
.ant-table-tbody .ant-table-row td { .ant-table-tbody .ant-table-row td {
padding-top: 15px; padding-top: 15px;
padding-bottom: 15px; padding-bottom: 15px;
} }
/*列表页面弹出modal*/ /*列表页面弹出modal*/
.ant-modal-cust-warp { .ant-modal-cust-warp {
height: 100% height: 100%
} }
/*弹出modal Y轴滚动条*/ /*弹出modal Y轴滚动条*/
.ant-modal-cust-warp .ant-modal-body { .ant-modal-cust-warp .ant-modal-body {
height: calc(100% - 110px) !important; height: calc(100% - 110px) !important;
overflow-y: auto overflow-y: auto
} }
/*弹出modal 先有content后有body 故滚动条控制在body上*/ /*弹出modal 先有content后有body 故滚动条控制在body上*/
.ant-modal-cust-warp .ant-modal-content { .ant-modal-cust-warp .ant-modal-content {
height: 90% !important; height: 90%;
overflow-y: hidden overflow-y: hidden
} }
/*列表中有图片的加这个样式 参考用户管理*/ /*列表中有图片的加这个样式 参考用户管理*/
.anty-img-wrap { .anty-img-wrap {
height: 25px; height: 25px;
position: relative; position: relative;
} }
.anty-img-wrap > img { .anty-img-wrap > img {
max-height: 100%; max-height: 100%;
} }
/*列表中范围查询样式*/ /*列表中范围查询样式*/
.query-group-cust{width: calc(50% - 10px)} .query-group-cust{width: calc(50% - 10px)}
.query-group-split-cust:before{content:"~";width: 20px;display: inline-block;text-align: center} .query-group-split-cust:before{content:"~";width: 20px;display: inline-block;text-align: center}
/*erp风格子表外框padding设置*/ /*erp风格子表外框padding设置*/
.ant-card-wider-padding.cust-erp-sub-tab>.ant-card-body{padding:5px 12px} .ant-card-wider-padding.cust-erp-sub-tab>.ant-card-body{padding:5px 12px}
/* 内嵌子表背景颜色 */ /* 内嵌子表背景颜色 */
.j-inner-table-wrapper /deep/ .ant-table-expanded-row .ant-table-wrapper .ant-table-tbody .ant-table-row { .j-inner-table-wrapper /deep/ .ant-table-expanded-row .ant-table-wrapper .ant-table-tbody .ant-table-row {
background-color: #FFFFFF; background-color: #FFFFFF;
} }

3
jshERP-web/src/components/jeecg/JModal/index.vue
View File

@@ -44,7 +44,7 @@
<script> <script>
import { getClass, getStyle } from '@/utils/props-util' import { getClass, getStyle } from '@/utils/props-util'
import { handleIntroJs } from "@/utils/util" import { triggerWindowResizeEvent, handleIntroJs } from "@/utils/util"
import Vue from 'vue' import Vue from 'vue'
export default { export default {
@@ -172,6 +172,7 @@
/** 切换全屏 */ /** 切换全屏 */
toggleFullscreen() { toggleFullscreen() {
this.innerFullscreen = !this.innerFullscreen this.innerFullscreen = !this.innerFullscreen
triggerWindowResizeEvent()
}, },
} }