From cdf7a13c47458e9e7acc71c844bb20654f2c9c8c Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期四, 06 七月 2023 11:12:50 +0800
Subject: [PATCH] 分配画面
---
force-app/main/default/staticresources/RelationListPagingCmpJS.js | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/staticresources/RelationListPagingCmpJS.js b/force-app/main/default/staticresources/RelationListPagingCmpJS.js
index c47f7d6..461a428 100644
--- a/force-app/main/default/staticresources/RelationListPagingCmpJS.js
+++ b/force-app/main/default/staticresources/RelationListPagingCmpJS.js
@@ -333,9 +333,14 @@
heightsp = bottomspace;
}
blockHeight = j$(window).innerHeight() - j$(escapeVfId('allPage:allForm:searchBlock')).height() - heightAjustment;
+ // console.log(j$(window).innerHeight() +'-'+ j$(escapeVfId('allPage:allForm:searchBlock')).height() +'-'+ heightAjustment+'-'+heightsp);
blockHeight = blockHeight - heightsp;
+
sbwidth = scrollbarWidth();
- blockWidth = j$(escapeVfId('allPage:allForm:searchBlock')).width() - j$('div#out_Div_L').width() - widthAjustment - sbwidth - 20;
+ // 20230531 ljh start
+ // blockWidth = j$(escapeVfId('allPage:allForm:searchBlock')).width() - j$('div#out_Div_L').width() - widthAjustment - sbwidth - 20;
+ blockWidth = j$(escapeVfId('allPage:allForm:searchBlock')).width() - j$('div#out_Div_L').width()- sbwidth;
+ // 20230531 ljh end
//銈炽兂銉濄儘銉笺儓銇伄銇D銈掑鏇�
// 20230519 ljh start
// j$(escapeVfId('allPage:allForm:cmpid:cmpinnerid:dataBlock')).css('height', blockHeight + 78 + 'px');
@@ -371,10 +376,19 @@
// 20230519 ljh 澧炶if鍒ゆ柇
// j$('div#out_Div').css('width', (blockWidth + sbwidth) + 'px');
// j$('div#in_Div').css('width', (blockWidth + sbwidth) + 'px');
- if (j$('table#tableData').width() > j$('div#in_Div').width()) {
- j$('div#out_Div').css('width', (blockWidth + sbwidth) + 'px');
- j$('div#in_Div').css('width', (blockWidth + sbwidth) + 'px');
+ // 20230704 ljh start
+ if(blockWidth > 1000){
+ j$('div#out_Div').css('width', (blockWidth) + 'px');
+ j$('div#in_Div').css('width', (blockWidth) + 'px');
+ }else{
+ j$('table#tableData').css('width', (blockWidth) + 'px');
+ j$('table#tableHeader').css('width', (blockWidth) + 'px');
}
+ // if (j$('table#tableData').width() > j$('div#in_Div').width()) {
+ // j$('div#out_Div').css('width', (blockWidth) + 'px');
+ // j$('div#in_Div').css('width', (blockWidth) + 'px');
+ // }
+ // 20230704 ljh end
}
if (j$('table#tableData').width() > j$('div#in_Div').width()) {
j$('div#in_Div').css('height', (blockHeight + sbwidth) +'px');
@@ -411,7 +425,6 @@
// tableWidth -= headerCol.width();
tableWidth -= listColClassWidthMap[colClass];
// 20230519 ljh lightning end
-
// 鍏ㄩ儴鏈�灏忓寲銇欍倠
j$('body .pbBody table.list td.' + colClass).children().hide();
j$('body .pbBody table.list td.' + colClass).width(7).css("font-size", "0");
@@ -424,9 +437,10 @@
tableWidth += listColClassWidthMap[colClass] + 2 - hiddenWidth; // 2 is border
// }
}
-
j$('table#tableData').css('width', (tableWidth + 2) + 'px');
j$('table#tableHeader').css('width', (tableWidth + 2) + 'px');
+
+
}
function getColClassName(pObj) {
--
Gitblit v1.9.1