From 94d9769eb923ab46c7730e8af1d2c1b5f2d5045e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@prec-tech.com>
Date: 星期二, 23 五月 2023 17:12:02 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/staticresources/RelationListPagingCmpJS.js | 61 ++++++++++++++++++++----------
1 files changed, 41 insertions(+), 20 deletions(-)
diff --git a/force-app/main/default/staticresources/RelationListPagingCmpJS.js b/force-app/main/default/staticresources/RelationListPagingCmpJS.js
index 0ed2bd5..c47f7d6 100644
--- a/force-app/main/default/staticresources/RelationListPagingCmpJS.js
+++ b/force-app/main/default/staticresources/RelationListPagingCmpJS.js
@@ -283,9 +283,16 @@
}
}
}
-
+// 20230511 ljh start
+function ToggleWidth(obj){
+ var colClass = getColClassName(obj);
+ j$(obj).toggleClass("colUnHideIcon");
+ // j$('<col class="col_Irreplaceable_flag__c">').toggleClass("colUnHideIcon");
+ rerenderColWidth(colClass, false);
+}
+// 20230511 ljh 娉ㄩ噴 start
// list 銇� headerRow 銇� td銇� toggleWidth() 銈掕拷鍔�
-function bindTdToggleWidth() {
+/*function bindTdToggleWidth() {
var i = 0;
j$('body .pbBody table#tableHeader tr.headerRow td').each(function() {
@@ -317,7 +324,8 @@
j$('div#in_Div_L').scroll(function() {
j$('div#in_Div').scrollTop(j$(this).scrollTop());
});
-}
+}*/
+// 20230511 ljh 娉ㄩ噴 start
function windowResize() {
var heightsp = 0;
@@ -329,9 +337,12 @@
sbwidth = scrollbarWidth();
blockWidth = j$(escapeVfId('allPage:allForm:searchBlock')).width() - j$('div#out_Div_L').width() - widthAjustment - sbwidth - 20;
//銈炽兂銉濄儘銉笺儓銇伄銇D銈掑鏇�
- j$(escapeVfId('allPage:allForm:cmpid:cmpinnerid:dataBlock')).css('height', blockHeight + 78 + 'px');
- j$('div#in_Div').css('width', blockWidth + 'px');
- j$('div#out_Div').css('width', blockWidth + 'px');
+ // 20230519 ljh start
+ // j$(escapeVfId('allPage:allForm:cmpid:cmpinnerid:dataBlock')).css('height', blockHeight + 78 + 'px');
+ j$(escapeVfId('allPage:allForm:cmpid:cmpinnerid:dataBlock')).css('height', blockHeight + 48 + 'px');
+ // 20230519 ljh end
+ // j$('div#in_Div').css('width', blockWidth + 'px'); // 20230519 ljh
+ // j$('div#out_Div').css('width', blockWidth + 'px'); // 20230519 ljh
j$('div#in_Div').css('height', blockHeight + 'px');
j$('div#in_Div_L').css('height', blockHeight + 'px');
@@ -351,10 +362,19 @@
}
if (j$('table#tableData').height() > j$('div#in_Div').height()) {
- j$('div#in_Div').css('width', (blockWidth + sbwidth) + 'px');
+ // 20230519 ljh 澧炶if鍒ゆ柇
+ // j$('div#in_Div').css('width', (blockWidth + sbwidth) + 'px');
+ if (j$('table#tableData').width() > j$('div#in_Div').width()) {
+ j$('div#in_Div').css('width', (blockWidth + sbwidth) + 'px');
+ }
} else {
- j$('div#out_Div').css('width', (blockWidth + sbwidth) + 'px');
- j$('div#in_Div').css('width', (blockWidth + sbwidth) + 'px');
+ // 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');
+ }
}
if (j$('table#tableData').width() > j$('div#in_Div').width()) {
j$('div#in_Div').css('height', (blockHeight + sbwidth) +'px');
@@ -379,33 +399,34 @@
var listColClassWidthMap = {}; // colclass ==> class銇畐idth
var blockHeight = 0;
var sbwidth = 0;
+var tableWidth = 0;// 20230519 ljh lightning add
window.onresize = windowResize;
function rerenderColWidth(colClass, isFirst) {
-
- var tableWidth = j$('body .pbBody table#tableHeader').width();
+ // tableWidth = j$('body .pbBody table#tableHeader').width();// 20230519 ljh lightning add
var headerCol = j$('body .pbBody table.list tr.headerRow td.' + colClass);
if (headerCol.hasClass("colUnHideIcon")) {
listColClassMap[colClass] = "colUnHideIcon";
- tableWidth -= headerCol.width();
+ // 20230519 ljh lightning start
+ // 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");
} else {
listColClassMap[colClass] = "colViewing";
- if (isFirst == false) {
+ // 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
- }
+ // }
}
- // 2023-05-04 zyh lightning鍗囩骇 start
- // j$('table#tableData').css('width', (tableWidth + 2) + 'px');
- j$('table#tableData').css('width', (150) + '%');
- // j$('table#tableHeader').css('width', (tableWidth + 2) + 'px');
- j$('table#tableHeader').css('width', (150) + '%');
- // 2023-05-04 zyh lightning鍗囩骇 end
+
+ j$('table#tableData').css('width', (tableWidth + 2) + 'px');
+ j$('table#tableHeader').css('width', (tableWidth + 2) + 'px');
}
function getColClassName(pObj) {
--
Gitblit v1.9.1