From ddb0231ef7c5cf2bad9d3f1afc2f733674ad38a5 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期四, 24 八月 2023 14:50:51 +0800
Subject: [PATCH] 再修理按钮
---
force-app/main/default/staticresources/RelationListPagingCmpJS.js | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/staticresources/RelationListPagingCmpJS.js b/force-app/main/default/staticresources/RelationListPagingCmpJS.js
index c47f7d6..c836700 100644
--- a/force-app/main/default/staticresources/RelationListPagingCmpJS.js
+++ b/force-app/main/default/staticresources/RelationListPagingCmpJS.js
@@ -333,9 +333,15 @@
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();
+ // 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;
+ var tableWidth = j$('table#tableData').width();
+ // 20230531 ljh end
//銈炽兂銉濄儘銉笺儓銇伄銇D銈掑鏇�
// 20230519 ljh start
// j$(escapeVfId('allPage:allForm:cmpid:cmpinnerid:dataBlock')).css('height', blockHeight + 78 + 'px');
@@ -371,14 +377,44 @@
// 20230519 ljh 澧炶if鍒ゆ柇
// j$('div#out_Div').css('width', (blockWidth + sbwidth) + 'px');
// j$('div#in_Div').css('width', (blockWidth + sbwidth) + 'px');
+ // 20230704 ljh start
+ /*if(blockWidth > 1000){
+ console.log('333');
+ // j$('div#out_Div').css('width', (blockWidth) + 'px');
+ // j$('div#in_Div').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');
+ }
+ }else{
+ console.log('222');
+ j$('table#tableData').css('width', (blockWidth) + 'px');
+ j$('table#tableHeader').css('width', (blockWidth) + 'px');
+ tableWidth = blockWidth; // 20230725 ljh
+ }*/
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');
+ j$('div#out_Div').css('width', (blockWidth) + 'px');
+ j$('div#in_Div').css('width', (blockWidth) + 'px');
+ j$('table#tableData').css('width', (tableWidth) + 'px');
+ j$('table#tableHeader').css('width', (tableWidth) + 'px');
}
+ // 20230704 ljh end
}
if (j$('table#tableData').width() > j$('div#in_Div').width()) {
j$('div#in_Div').css('height', (blockHeight + sbwidth) +'px');
}
+
+ j$('div#in_Div').scroll(function() {
+ j$('div#out_Div').scrollLeft(j$(this).scrollLeft());
+ j$('div#in_Div_L').scrollTop(j$(this).scrollTop());
+ });
+ j$('div#out_Div').scroll(function() {
+ j$('div#in_Div').scrollLeft(j$(this).scrollLeft());
+ });
+ j$('div#in_Div_L').scroll(function() {
+ j$('div#in_Div').scrollTop(j$(this).scrollTop());
+ });
+
}
function expandAll(){
@@ -404,27 +440,38 @@
function rerenderColWidth(colClass, isFirst) {
// tableWidth = j$('body .pbBody table#tableHeader').width();// 20230519 ljh lightning add
+ console.log('555'+tableWidth);
var headerCol = j$('body .pbBody table.list tr.headerRow td.' + colClass);
if (headerCol.hasClass("colUnHideIcon")) {
listColClassMap[colClass] = "colUnHideIcon";
// 20230519 ljh lightning start
// tableWidth -= headerCol.width();
+ console.log('666'+listColClassWidthMap[colClass]);
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");
+ // 20230728 ljh 浼樺寲
+ // j$('body .pbBody table.list td.' + colClass).width(7).css("font-size", "0");
+ j$('body .pbBody table.list td.' + colClass).outerWidth(10).css("font-size", "0");
} else {
listColClassMap[colClass] = "colViewing";
+ console.log('888'+tableWidth);
// if (isFirst == false) { // 20230519 ljh lightning 鍘绘帀鍒ゆ柇
var hiddenWidth = headerCol.width();
j$('body .pbBody table.list td.' + colClass).width("").css("font-size", "");
j$('body .pbBody table.list td.' + colClass).children().show();
tableWidth += listColClassWidthMap[colClass] + 2 - hiddenWidth; // 2 is border
// }
+ console.log('777'+listColClassWidthMap[colClass]);
}
-
+ console.log('444'+tableWidth);
+ // 20230725 ljh start
+ // if(tableWidth < 1000){
+ // j$('div#in_Div').css('width', tableWidth + 'px');
+ // j$('div#out_Div').css('width', tableWidth + 'px');
+ // }
+ // 20230725 ljh start
j$('table#tableData').css('width', (tableWidth + 2) + 'px');
j$('table#tableHeader').css('width', (tableWidth + 2) + 'px');
}
--
Gitblit v1.9.1