zhangqian
2023-05-23 94d9769eb923ab46c7730e8af1d2c1b5f2d5045e
Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
7个文件已修改
352 ■■■■ 已修改文件
force-app/main/default/components/RelationListPagingCmp.component 144 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/RentalFixtureSetDetilSelect.page 77 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/RentalFixtureSetSelect.page 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/staticresources/RelationListPagingCmpCss.css 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/staticresources/RelationListPagingCmpJS.js 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/staticresources/RentalFixtureSetDetilSelectCss.css 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/staticresources/RentalFixtureSetSelectCss.css 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/components/RelationListPagingCmp.component
@@ -77,35 +77,47 @@
                    <apex:inputHidden id="currentPageRecordCnt" value="{!currentPageRecordCnt}"/>
                    <!-- 左 ヘッダ -->
                    <div id="out_Div_L">
                        <table class="list" style="border-bottom-width: 0px; font-size:11px; border-spacing:0;" border="" id="tableHeader_L">
                            <tr class="dataRow" height="1px">
                        <table class="list" style="border-bottom-width: 0px; font-size:11px; border-spacing:0;table-layout:fixed" border="" id="tableHeader_L">
                            <!-- 20230511 ljh lightning start -->
                            <!-- <tr class="dataRow" height="1px">
<apex:outputPanel layout="none" rendered="{!hasChkBox}">
                                <td class="col_chk"></td>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!Not(hasChkBox)}">
                                <td class="col_noChk"></td>
                                <td class="col_noChk"></td>
</apex:outputPanel>
<apex:variable value="{!0}" var="cnt" />
<apex:repeat value="{!titleLeft}" var="t">
                                <td class="col_{!columnLeftCss[cnt]}"></td>
    <apex:variable value="{!cnt + 1}" var="cnt" />
</apex:repeat>
                            </tr>
                            <tr> -->
                            <!-- 20230511 ljh lightning end -->
                            <tr class="headerRow" height="30px">
<apex:outputPanel layout="none" rendered="{!hasChkBox}">
    <apex:outputPanel layout="none" rendered="{!Not(isRadioBox)}">
                                <td style="width:20px" class="col_chk" align="center">
                                <!-- 20230511 ljh lightning start -->
                                <!-- <td style="width:20px" class="col_chk" align="center"> -->
                                <td style="width:32px" class="col_chk" align="center">
                                <!-- 20230511 ljh lightning end -->
                                    <input type='checkbox' onClick='checkAll()' id='checker'/>
                                </td>
    </apex:outputPanel>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!isRadioBox}">
                             <td class="col_chk"></td>
                            <!-- 20230511 ljh lightning start -->
                             <!-- <td class="col_chk"></td> -->
                             <td style="width:32px;" class="col_chk"></td>
                             <!-- 20230511 ljh lightning start -->
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!Not(hasChkBox)}">
                                <td class="col_noChk"></td>
                                <!-- 20230511 ljh lightning start-->
                                <!-- <td class="col_noChk"></td> -->
                                <td class="col_noChk" style="display:none"></td>
                                <!-- 20230511 ljh lightning end-->
</apex:outputPanel>
<apex:variable value="{!0}" var="cnt" />
<apex:repeat value="{!titleLeft}" var="t">
@@ -132,19 +144,24 @@
                    </div>
                    <!-- 右 ヘッダ -->
                    <div id="out_Div">
                        <table class="list" style="border-bottom-width: 0px; font-size:11px; border-spacing:0;" border="" id="tableHeader">
                            <tr class="dataRow" height="1px">
                        <table class="list" style="border-bottom-width: 0px; font-size:11px; border-spacing:0;table-layout:fixed;" border="" id="tableHeader">
                            <!-- 20230512 ljh lightning start-->
                            <!-- <tr class="dataRow" height="1px">
                            <apex:variable value="{!0}" var="cnt" />
                            <apex:repeat value="{!titleRight}" var="t">
                                <td class="col_{!columnRightCss[cnt]}"></td>
                                <apex:variable value="{!cnt + 1}" var="cnt" />
                            </apex:repeat>
                            <td class="col_Scroll"></td>
                            </tr>
                            <td class="col_Scroll"></td>
                            </tr>-->
                            <!-- 20230512 ljh lightning end-->
                            <tr class="headerRow" height="30px">
                            <apex:variable value="{!0}" var="cnt" />
                            <apex:repeat value="{!titleRight}" var="t">
                                <td class="col_{!columnRightCss[cnt]}">
                                <!-- 20230511 ljh lightning start -->
                                <!-- <td class="col_{!columnRightCss[cnt]} "> -->
                                <td class="col_{!columnRightCss[cnt]} colViewing" onclick ="test(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;">
                                        <!-- 20220107 ljh update start -->
@@ -169,13 +186,15 @@
                    <div style="clear:both;height:0px;"></div>
                    <!-- 左 データリスト -->
                    <div id="in_Div_L">
                        <table class="list" style="border-bottom-width: 0px; font-size:11px; border-spacing:0;" border="" id="tableData_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">
<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}">
                                <td class="dataCellBorder1" style="" align="center">
                                <!-- 20230512 ljh lightning add style="width:32px;" -->
                                <td class="dataCellBorder1" style="width:32px;" 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>
@@ -224,7 +243,8 @@
                    </div>
                    <!-- 右 データリスト -->
                    <div id="in_Div">
                        <table class="list" style="border-bottom-width: 0px; font-size:11px; border-spacing:0;" border="" id="tableData">
                        <!-- 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">
                            <apex:variable value="{!1}" var="cnt" />
                            <apex:repeat value="{!pageController.viewList}" var="or" id="oppTable">
                                <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);}">
@@ -287,7 +307,8 @@
                        </table>
                    </div><!-- /in_Div -->
                </apex:outputPanel>
                <apex:outputPanel layout="none" rendered="{!isDisplayPaging}">
                <!-- 20230523  ljh lightning 分页 代码换位置  start -->
                <!-- <apex:outputPanel layout="none" rendered="{!isDisplayPaging}">
                    <apex:outputPanel layout="none" rendered="{!hasPrevious}">
                        <button onclick="if('{!userCustomPaging}' == 'true') {searchPreviousCustom();} else {searchPreviousJs();}return false;" class="btn">前へ</button>
@@ -311,17 +332,71 @@
                        <apex:selectList value="{!goPageInt}" size="1" style="width:50px" id="goPageInt"><apex:selectOptions value="{!pageNumList}" id="pageNumList"/></apex:selectList> 
                        <button onclick="if('{!userCustomPaging}' == 'true') {searchGoPageCustom();} else {searchGoPageJs();}return false;" class="btn">go</button>
                    </apex:outputPanel>
                </apex:outputPanel>
                </apex:outputPanel> -->
                <!-- 20230523  ljh lightning 分页 代码换位置  end -->
            </apex:pageBlock>
            <!-- 20230523  ljh lightning 分页 代码换位置  start -->
            <apex:outputPanel layout="none" rendered="{!isDisplayPaging}">
                <apex:outputPanel layout="none" rendered="{!hasPrevious}">
                    <button onclick="if('{!userCustomPaging}' == 'true') {searchPreviousCustom();} else {searchPreviousJs();}return false;" class="btn">前へ</button>
                </apex:outputPanel>
                <apex:outputPanel layout="none" rendered="{!!hasPrevious}">
                    <button class="btn" disabled="disabled"
                            style="cursor: default;border-color: #e5e5e5; background: #f0f0f0;color: #a8a8a8;">前へ</button>
                </apex:outputPanel>
                <span class="count">{!page}</span><span>|</span>
                <span class="count">{!maxPage}</span>
                <apex:outputPanel layout="none" rendered="{!hasNext}">
                    <button onclick="if('{!userCustomPaging}' == 'true') {searchNextCustom();} else {searchNextJs();}return false;" class="btn" >次へ</button>
                </apex:outputPanel>
                <apex:outputPanel layout="none" rendered="{!!hasNext}">
                    <button class="btn" disabled="disabled"
                    style="cursor: default;border-color: #e5e5e5; background: #f0f0f0;color: #a8a8a8;">次へ</button>
                </apex:outputPanel>
&nbsp;&nbsp;
                <apex:outputPanel id="canGoPage" layout="none" rendered="{!canGoPage}">
                    <apex:selectList value="{!goPageInt}" size="1" style="width:50px" id="goPageInt"><apex:selectOptions value="{!pageNumList}" id="pageNumList"/></apex:selectList> 
                    <button onclick="if('{!userCustomPaging}' == 'true') {searchGoPageCustom();} else {searchGoPageJs();}return false;" class="btn">go</button>
                </apex:outputPanel>
            </apex:outputPanel>
            <!-- 20230523  ljh lightning 分页 代码换位置  end -->
<script type="text/javascript">
var heightAjustment = 120;
var widthAjustment = 30;
var bottomspace = '{!bottomSp}';
var i = 0;
j$(document).ready(function(){
    console.log({!isFirstRefresh});
    if({!isFirstRefresh}){
      blockme();
      init();
    }
    // 20230523  ljh lightning start
    if(i == 0){
        tableWidth = j$('body .pbBody table#tableHeader').width();
        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();
            }
        });
        i++;
    }
    // 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());
    });
    // 20230523  ljh lightning end
});
function runSFDCAddRemote(MetadataConnectionWarning) {
@@ -331,22 +406,23 @@
  // blockme();
  sortTablefunc(key);
}
// 20230523  ljh lightning start
// j$(function() {
//     var tableWidth = 0;
//     j$('body .pbBody table#tableHeader tr.headerRow td').each(function() {
//         var colClass = getColClassName(this);
//         if (colClass != 'col_Scroll') {
//             var headerCol = j$('body .pbBody table.list tr.headerRow td.' + colClass);
//             tableWidth += headerCol.width();
//         }
//     });
//     j$('table#tableData').css('width', (tableWidth + 2) + 'px');
//     j$('table#tableHeader').css('width', (tableWidth + 2) + 'px');
j$(function() {
    var tableWidth = 0;
    j$('body .pbBody table#tableHeader tr.headerRow td').each(function() {
        var colClass = getColClassName(this);
        if (colClass != 'col_Scroll') {
            var headerCol = j$('body .pbBody table.list tr.headerRow td.' + colClass);
            tableWidth += headerCol.width();
        }
    });
    j$('table#tableData').css('width', (tableWidth + 2) + 'px');
    j$('table#tableHeader').css('width', (tableWidth + 2) + 'px');
    // list の headerRow の tdに toggleWidth() を追加
    bindTdToggleWidth();
});
//     // list の headerRow の tdに toggleWidth() を追加
//     bindTdToggleWidth();
// });
// 20230523  ljh lightning end
var elements = document.getElementsByTagName("select");
for (i = 0; i < elements.length; i++) {
    var id = elements[i].id;
@@ -374,8 +450,8 @@
j$("a[name='out_Div_a']").bind("click",function(event){
    event.stopPropagation();
});
windowResize();
// windowResize(); // 20230523 ljh lightning
</script>
        </apex:outputPanel>
    <!-- </apex:form> -->
</apex:component>
</apex:component>
force-app/main/default/pages/RentalFixtureSetDetilSelect.page
@@ -7,7 +7,11 @@
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
<!-- 20230511 ljh lightning start -->
<style type="text/css">
    table.list td  input[type="text"]{width:55%;}
</style>
<!-- 20230511 ljh lightning end -->
<script type="text/javascript">
var heightAjustment = 120;
var widthAjustment = 30;
@@ -25,41 +29,46 @@
        </apex:actionFunction>
        <apex:outputPanel id="pageallPanel">
            <apex:pageBlock id="searchBlock" tabStyle="Report">
                <apex:pageBlockButtons location="bottom">
                        <!--20230425 zq lightning下修改样式 <apex:commandButton style="float:left;" action="{!save}" value="確定" onclick="blockme();" rerender="allForm, checEventFrame" oncomplete="unblockUI();" />
                            <apex:commandButton style="float:right;" value="返回上一级" action="{!goBack}"/>
                        -->
                        <apex:commandButton action="{!save}" value="確定" onclick="blockme();" rerender="allForm, checEventFrame" oncomplete="unblockUI();" />
                        <apex:commandButton style="float:right;margin: 0 10px;" value="返回上一级" action="{!goBack}"/>
                <!-- 20230522 ljh lightning start -->
                <!-- <apex:pageBlockButtons location="bottom">
                        <apex:commandButton style="float:left;" action="{!save}" value="確定" onclick="blockme();" rerender="allForm, checEventFrame" oncomplete="unblockUI();" />
                        <apex:commandButton style="float:right;" value="返回上一级" action="{!goBack}"/>
                        <apex:commandButton style="float:right;" value="返回申请单" action="{!cancel}"/>
                </apex:pageBlockButtons>
                </apex:pageBlockButtons>
                <div style="clear:both;"></div>   -->
                <!-- 20230522 ljh lightning end -->
                <table>
                    <tr>
                        <td colspan="2">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Name.label}</td>
                        <td colspan="3"><apex:outputText value="{!parentObj.Name}" style="width:100px"/></td>
                    </tr>
                    <tr>
                        <td colspan="2">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Fixture_Set_Idx__c.label}</td>
                        <td colspan="3"><apex:outputText value="{!parentObj.Fixture_Set_Idx__c}" style="width:100px"/></td>
                    </tr>
                    <tr>
                        <td colspan="2">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Loaner_name_F__c.label}</td>
                        <td colspan="3"><apex:outputText value="{!parentObj.Loaner_name_F__c}" style="width:100px"/></td>
                    </tr>
<!--                        <tr>
                        <td colspan="2">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Loaner_code__c.label}</td>
                        <td colspan="3"><apex:outputText value="{!parentObj.Loaner_code__c}" style="width:100px"/></td>
                    </tr> -->
                    <!-- <tr>
                        <td colspan="2">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Rental_Num__c.label}</td>
                        <td colspan="3"><apex:outputText value="{!parentObj.Rental_Num__c}" style="width:100px"/></td>
                    </tr> -->
<!--TODO  同一附属品:レ -->
                </table>
                <!-- 20230522 ljh lightning start -->
                <div style="width:50%;float:right;">
                        <apex:commandButton style="float:left;" action="{!save}" value="確定" onclick="blockme();" rerender="allForm, checEventFrame" oncomplete="unblockUI();" />
                        <apex:commandButton style="float:right;" value="返回上一级" action="{!goBack}"/>
                        <apex:commandButton style="float:right;" value="返回申请单" action="{!cancel}"/>
                <div style="clear:both;"></div>
                    <table>
                        <tr>
                            <td colspan="2">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Name.label}</td>
                            <td colspan="3"><apex:outputText value="{!parentObj.Name}" style="width:100px"/></td>
                        </tr>
                        <tr>
                            <td colspan="2">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Fixture_Set_Idx__c.label}</td>
                            <td colspan="3"><apex:outputText value="{!parentObj.Fixture_Set_Idx__c}" style="width:100px"/></td>
                        </tr>
                        <tr>
                            <td colspan="2">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Loaner_name_F__c.label}</td>
                            <td colspan="3"><apex:outputText value="{!parentObj.Loaner_name_F__c}" style="width:100px"/></td>
                        </tr>
 <!--                        <tr>
                            <td colspan="2">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Loaner_code__c.label}</td>
                            <td colspan="3"><apex:outputText value="{!parentObj.Loaner_code__c}" style="width:100px"/></td>
                        </tr> -->
                        <!-- <tr>
                            <td colspan="2">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Rental_Num__c.label}</td>
                            <td colspan="3"><apex:outputText value="{!parentObj.Rental_Num__c}" style="width:100px"/></td>
                        </tr> -->
 <!--TODO  同一附属品:レ -->
                    </table>
                </div>
                <!-- 20230522 ljh lightning end -->
            </apex:pageBlock>
            <c:RelationListPagingCmp id="cmpid" pgController="{!this}" hasCheckbox="false" noSort="true"/>
        </apex:outputPanel>
force-app/main/default/pages/RentalFixtureSetSelect.page
@@ -1,4 +1,6 @@
<apex:page standardController="Rental_Apply_Equipment_Set__c" extensions="RentalFixtureSetSelectController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
<!-- <apex:page standardController="Rental_Apply_Equipment_Set__c" extensions="RentalFixtureSetSelectController" showHeader="false" sidebar="false" id="allPage" action="{!init}"> -->
<apex:page standardController="Rental_Apply_Equipment_Set__c" extensions="RentalFixtureSetSelectController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true">
<!-- 20230509 ljh lightning 切换 -->
<head>
<title>备品配套选择</title>
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
@@ -6,7 +8,11 @@
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
<!-- 20230509 ljh lightning start -->
<style type="text/css">
table.list td  input[type="text"]{width:55%;}
</style>
<!-- 20230509 ljh lightning end -->
<script type="text/javascript">
var heightAjustment = 120;
var widthAjustment = 30;
force-app/main/default/staticresources/RelationListPagingCmpCss.css
@@ -11,7 +11,7 @@
  position:relative;
  overflow: hidden;
  float:left;
  width:32768px;
  /* width:32768px; */ /* 20230523 ljh lightning */
}
div#out_Div_L {
  position:relative;
@@ -22,7 +22,7 @@
  position:relative;
  overflow: auto;  /*スクロールバー*/
  float:left;
  width:32768px;
  /* width:32768px; */ /* 20230523 ljh lightning */
  height: 100px; /* tbodyを表示する高さ、後でjsにて調整 */
}
div#in_Div_L {
@@ -57,10 +57,20 @@
body .pbBody table.list tr.dataRow td.dataCellBorder1 {padding:0px 0px 0px 0px; border-width: 0px 0px 1px 1px; vertical-align: middle; word-break:break-all;}
}
table.list td {width:100px;}
/* table.list td {width:100px;} */ /* 20230523 ljh lightning */
table.list td.col_noChk {width:0px;}
table.list td select {width:95%;}
table.list td input {width:95%;}
/* 20230509 ljh lightning start */
/* table.list td input {width:95%;} */
table.list td input[type="text"] {width:95%;}
input.inc.btn{
  padding: 0 4px;
}
input.dec.btn{
  padding: 0 4px;
}
/* 20230509 ljh lightning end */
table.list td textarea {
  height:50px;
  width:90%;
@@ -81,4 +91,21 @@
*/
body .pbBody table.list tr.headerRow td.col_Scroll {width:0px; padding:0px; border-width:0px;}
body .pbBody table.list tr.dataRow td.col_Scroll {width:0px; padding:0px; border-width:0px;}
body .pbBody table.list tr.dataRow td.col_Scroll {width:0px; padding:0px; border-width:0px;}
/* 20230508 ljh lightning切换 start */
body .pbBody table.list tr.headerRow td, body .pbBody table.list tr.headerRow th {
  background: #f2f3f3;
  border-width: 0 0 1px 1px;
  border-color: #e0e3e5;
  color: #000;
  font-size: .9em;
  font-weight: bold;
  padding: 5px 2px 4px 5px;
  white-space:normal;
}
body .pbBody table.list tr th, body .pbBody table.list tr td {
  border: 1px solid #ededed;
  color: #000;
  white-space:normal;
}
/* 20230508 ljh lightning切换 start */
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;
    //コンポネートなのでIDを変更
    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のwidth
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) {
force-app/main/default/staticresources/RentalFixtureSetDetilSelectCss.css
@@ -5,7 +5,14 @@
table.list .col_Is_Optional__c {width:59px;}
table.list .col_Quantity__c {width:49px;}
table.list .col_Is_OneToOne__c {width:49px;}
table.list .col_Rental_Num__c {width:98px;}
/* 20230517 ljh lightning start */
/* table.list .col_Rental_Num__c {width:98px;} */
table.list .col_Rental_Num__c {width:150px;}
/* 20230517 ljh lightning end */
table.list .col_Rental_Num__c input {width:55%;}
table.list .col_Fixture_Set_Detail__r_Fixture_Model_No_F__c {width:280px;}
table.list .col_Fixture_Set_Detail__r_Name_CHN__c {width:230px;}
table.list .col_Fixture_Set_Detail__r_Name_CHN__c {width:230px;}
/* 20230517 ljh lightning start */
table.list .col_IndexFromUniqueKey_Text__c {width:70px;}
/* 20230517 ljh lightning end */
force-app/main/default/staticresources/RentalFixtureSetSelectCss.css
@@ -1,7 +1,15 @@
table.list .col_Name_CHN__c {width:230px;}
table.list .col_Product2__r_Asset_Model_No__c {width:280px;}
table.list .col_Asset_Model_No__c {width:280px;}
table.list .col_Rental_Num__c {width:98px;}
/* 20230512 ljh lightning start */
/* table.list .col_Rental_Num__c {width:98px;} */
table.list .col_Rental_Num__c {width:150px;}
/* 20230512 ljh lightning end */
table.list .col_Rental_Num__c input {width:55%;}
table.list .col_Fixture_Set__r_Name {width:280px;}
table.list .col_Fixture_Set__r_Loaner_name__c {width:230px;}
table.list .col_Fixture_Set__r_Loaner_name__c {width:230px;}
/* 20230512 ljh lightning start */
table.list .col_Irreplaceable_flag__c {width:80px;}
table.list .col_Same_Accessory_flag__c{width:80px;}
table.list .col_FixtureSetDetailSelect_VF__c{width:90px;}
/* 20230512 ljh lightning end */