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/components/RelationListPagingCmp.component | 47 +++++++++++++++++++++++++++--------------------
1 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/force-app/main/default/components/RelationListPagingCmp.component b/force-app/main/default/components/RelationListPagingCmp.component
index b7945a1..49b6327 100644
--- a/force-app/main/default/components/RelationListPagingCmp.component
+++ b/force-app/main/default/components/RelationListPagingCmp.component
@@ -194,7 +194,7 @@
<apex:outputPanel layout="none" rendered="{!hasChkBox}">
<!-- 20230512 ljh lightning add style="width:32px;" -->
- <td class="dataCellBorder1" style="width:32px;" align="center">
+ <td class="dataCellBorder1" style="width:32px;height:38px;" align="center">
<apex:outputPanel layout="none" rendered="{!Not(isRadioBox)}">
<apex:inputCheckbox value="{!or.check}" id="rowCheck" styleClass="rowchkcls" disabled="{!!or.canEdit}" onchange="setChangeFlg('{!or.lineNo}')"/>
</apex:outputPanel>
@@ -206,7 +206,8 @@
</td>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!Not(hasChkBox)}">
- <td class="col_noChk">
+ <!-- 20230602 ljh 楂樺害鍥哄畾 38px; -->
+ <td class="col_noChk" style="height: 38px;">
<apex:inputCheckbox value="{!or.check}" styleClass="rowchkcls" style="display:none"/>
<apex:inputText value="{!or.orderNo}" styleClass="ordernocls" style="display:none"/>
</td>
@@ -214,7 +215,8 @@
<apex:variable value="{!0}" var="cnt_2" />
<apex:repeat value="{!columnsLeftApi}" var="c">
- <td class="dataCellBorder1 col_{!columnLeftCss[cnt_2]}">
+ <!-- 20230602 ljh 楂樺害鍥哄畾 38px; -->
+ <td class="dataCellBorder1 col_{!columnLeftCss[cnt_2]}" style="height: 38px;">
<apex:outputPanel rendered="{!(c.size==1 && columnLeftRW[c[0]]=='r')}" layout="none">
<!-- in_Div_L銇瓵ccount鍚嶃伅鐗规畩瀵惧繙銆併儶銉炽偗銇仚銈� -->
<apex:outputPanel rendered="{!c[0]=='Name'}" layout="none">
@@ -250,7 +252,7 @@
<tr class="dataRow {!IF(MOD(cnt, 2)==0, 'odd', 'even')} {!IF(cnt==1, 'first', '')}" onmouseover="if (window.hiOn){hiOn(this);} " onmouseout="if (window.hiOff){hiOff(this);} " onblur="if (window.hiOff){hiOff(this);}" onfocus="if (window.hiOn){hiOn(this);}">
<apex:variable value="{!0}" var="cnt_3" />
<apex:repeat value="{!columnsRightApi}" var="c">
- <td class="dataCellBorder1 col_{!columnRightCss[cnt_3]}">
+ <td class="dataCellBorder1 col_{!columnRightCss[cnt_3]}" style="height: 38px;">
<apex:outputPanel rendered="{!(c.size==1 && columnRightRW[c[0]]=='r')}" layout="none">
<apex:outputField value="{!or.sobj[c[0]]}"/>
</apex:outputPanel>
@@ -374,26 +376,22 @@
}
// 20230523 ljh lightning start
if(i == 0){
+ sbwidth = scrollbarWidth();
i++;
tableWidth = j$('body .pbBody table#tableHeader').width();
- // var widthTemp = 0;
- j$('body .pbBody table#tableHeader tr.headerRow td').each(function() {
- var colClass = getColClassName(this);
- if (colClass != 'col_Scroll') {
- var temp = j$('body .pbBody table.list tr.headerRow td.' + colClass).width();
- listColClassWidthMap[colClass] = temp;
- //widthTemp += temp;
- }
- });
- var blockWidthNew = j$(escapeVfId('allPage:allForm:searchBlock')).width() - j$('div#out_Div_L').width();
- // console.log(widthTemp+'~'+blockWidthNew+'~'+tableWidth);
+ // var blockWidth = j$(escapeVfId('allPage:allForm:searchBlock')).width() - j$('div#out_Div_L').width()-sbwidth;
+ var blockWidth = j$(escapeVfId('allPage:allForm:searchBlock')).width() - j$('div#out_Div_L').width() - widthAjustment - sbwidth - 20;
var tableHeader_L = j$(escapeVfId('tableHeader_L')).width();
+ console.log('~'+tableHeader_L);
j$('div#in_Div_L').css('width', tableHeader_L+ 'px');
j$('table#tableData_L').css('width', tableHeader_L + 'px');
- // j$('table#tableHeader').css('width', (tableWidth + 2) + 'px');
- if(tableWidth > blockWidthNew){
- j$('div#in_Div').css('width', blockWidthNew + 'px'); // 20230519 ljh
- j$('div#out_Div').css('width', blockWidthNew + 'px'); // 20230519 ljh
+ console.log('tableWidth:'+tableWidth+'blockWidth:'+blockWidth);
+ if(tableWidth > blockWidth){
+ console.log('111');
+ j$('div#in_Div').css('width', blockWidth+ 'px'); // 20230519 ljh +20
+ j$('div#out_Div').css('width', blockWidth + 'px'); // 20230519 ljh
+ j$('table#tableHeader').css('width', tableWidth + 'px'); // 20230725 ljh
+ j$('table#tableData').css('width', tableWidth + 'px'); // 20230725 ljh
}
j$('div#in_Div').scroll(function() {
j$('div#out_Div').scrollLeft(j$(this).scrollLeft());
@@ -404,6 +402,15 @@
});
j$('div#in_Div_L').scroll(function() {
j$('div#in_Div').scrollTop(j$(this).scrollTop());
+ });
+
+ j$('body .pbBody table#tableHeader tr.headerRow td').each(function() {
+ var colClass = getColClassName(this);
+ if (colClass != 'col_Scroll') {
+ var temp = j$('body .pbBody table.list tr.headerRow td.' + colClass).width();
+ console.log('colClass'+temp);
+ listColClassWidthMap[colClass] = temp;
+ }
});
}
@@ -477,4 +484,4 @@
</script>
</apex:outputPanel>
<!-- </apex:form> -->
-</apex:component>
+</apex:component>
\ No newline at end of file
--
Gitblit v1.9.1