From 212967a5a65a12f9673170b80e3d8c766dcee5d0 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期四, 06 七月 2023 10:46:18 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/components/RelationListPagingCmp.component | 64 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/force-app/main/default/components/RelationListPagingCmp.component b/force-app/main/default/components/RelationListPagingCmp.component
index b37cf06..fe2b49f 100644
--- a/force-app/main/default/components/RelationListPagingCmp.component
+++ b/force-app/main/default/components/RelationListPagingCmp.component
@@ -160,7 +160,7 @@
<apex:repeat value="{!titleRight}" var="t">
<!-- 20230511 ljh lightning start -->
<!-- <td class="col_{!columnRightCss[cnt]} "> -->
- <td class="col_{!columnRightCss[cnt]} colViewing" onclick ="test(this);return false;">
+ <td class="col_{!columnRightCss[cnt]} colViewing" onclick ="ToggleWidth(this);return false;">
<!-- 20230511 ljh lightning end -->
<apex:outputPanel layout="none" rendered="{!Not(noSortHeader)}">
<a href="#" name="out_Div_a" onclick="sortTableJs('{!cnt + titleLeft.size}');return false;" style="text-decoration: underline;">
@@ -187,14 +187,14 @@
<!--銆�宸� 銉囥兗銈裤儶銈广儓 -->
<div id="in_Div_L">
<!-- 20230512 ljh lightning add table-layout:fixed" -->
- <table class="list" style="border-bottom-width: 0px; font-size:11px; border-spacing:0;table-layout:fixed" border="" id="tableData_L">
+ <table class="list" style="border-bottom-width: 0px; font-size:11px; border-spacing:0;table-layout:fixed;" border="" id="tableData_L">
<apex:variable value="{!1}" var="cnt" />
<apex:repeat value="{!pageController.viewList}" var="or" id="oppTable_L">
<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: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,28 +376,52 @@
}
// 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') {
- listColClassWidthMap[colClass] = j$('body .pbBody table.list tr.headerRow td.' + colClass).width();
+ var temp = j$('body .pbBody table.list tr.headerRow td.' + colClass).width();
+ listColClassWidthMap[colClass] = temp;
+ //widthTemp += temp;
}
});
- i++;
+ var blockWidthNew = j$(escapeVfId('allPage:allForm:searchBlock')).width() - j$('div#out_Div_L').width()-sbwidth;
+ // console.log(widthTemp+'~'+blockWidthNew+'~'+tableWidth);
+ var tableHeader_L = j$(escapeVfId('tableHeader_L')).width();
+ 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
+ }
+ 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());
+ });
+
}
// windowResize();
-
// 銈广偗銉兗銉�ｅ嫊
- 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());
- });
+ // 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());
+ // });
// 20230523 ljh lightning end
});
--
Gitblit v1.9.1