From a2399a5c9d25b7980c8f3f53166f21e96032af46 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@prec-tech.com>
Date: 星期五, 02 六月 2023 17:54:12 +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 | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/components/RelationListPagingCmp.component b/force-app/main/default/components/RelationListPagingCmp.component
index b7945a1..8601682 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>
--
Gitblit v1.9.1