Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -87,8 +87,9 @@
|
|||||||
ref="multipleTable"
|
ref="multipleTable"
|
||||||
:data="localProTableList"
|
:data="localProTableList"
|
||||||
tooltip-effect="dark"
|
tooltip-effect="dark"
|
||||||
style="width: 100%;overflow-y: scroll; height: calc(100% - 150px)"
|
style="width: 100%;height: inherit"
|
||||||
border
|
border
|
||||||
|
:max-height="400"
|
||||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
|
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
|
||||||
fontWeight: 'normal', height: '48px'}"
|
fontWeight: 'normal', height: '48px'}"
|
||||||
@selection-change="handleSelectionChange">
|
@selection-change="handleSelectionChange">
|
||||||
@@ -1676,7 +1677,7 @@ export default {
|
|||||||
|
|
||||||
.local-products-or-project-library {
|
.local-products-or-project-library {
|
||||||
//position: relative;
|
//position: relative;
|
||||||
height: 100%;
|
height: calc(100% - 100px);
|
||||||
|
|
||||||
.container {
|
.container {
|
||||||
height: calc(~'100% - 55px');
|
height: calc(~'100% - 55px');
|
||||||
|
|||||||
Reference in New Issue
Block a user