Merge branch 'master' into LEXUpgrade2023-Deloitte

buli

2023-07-14 e6068da47c1bef5517c9e5fdc8c726766867ad4e

 force-app/main/default/pages/NewAndEditReport.page

@@ -1,6 +1,12 @@
<apex:page standardController="Report__c" extensions="NewAndEditReportController" id="page" lightningStylesheets="true">
<apex:page
    standardController="Report__c"
    extensions="NewAndEditReportController"
    id="page"
>
    <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
    <apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
    <apex:includeScript
        value="{! URLFOR($Resource.AWSService, 'AWSService.js') }"
    />
    <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
    <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
    <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
@@ -638,16 +644,24 @@
    <div class="bPageTitle">
        <div class="ptBody">
            <div class="content">
                <img src="/img/s.gif" alt="报告书" class="pageTitleIcon" title="报告书" />
                <h1 class="pageType">报告书
                <img
                    src="/img/s.gif"
                    alt="报告书"
                    class="pageTitleIcon"
                    title="报告书"
                />
                <h1 class="pageType">
                    报告书
                    <span class="titleSeparatingColon">:</span>
                </h1>
                <h2 class="pageDescription"> 新建报告书</h2>
                <div class="blank">&nbsp;</div>
            </div>
            <div class="links">
                <a href="javascript:openPopupFocusEscapePounds(%27https://help.salesforce.com/apex/htdoor?loc=help&amp;target=leads_edit.htm&amp;section=Leads&amp;language=zh_CN&amp;release=234.18.8&amp;instance=CS117&amp;showSplash=true%27, %27Help%27, 700, 600, %27width=700,height=600,resizable=yes,toolbar=yes,status=no,scrollbars=yes,menubar=yes,directories=no,location=no,dependant=no%27, false, false);"
                    title="此页面的帮助 （新窗口）">
                <a
                    href="javascript:openPopupFocusEscapePounds(%27https://help.salesforce.com/apex/htdoor?loc=help&amp;target=leads_edit.htm&amp;section=Leads&amp;language=zh_CN&amp;release=234.18.8&amp;instance=CS117&amp;showSplash=true%27, %27Help%27, 700, 600, %27width=700,height=600,resizable=yes,toolbar=yes,status=no,scrollbars=yes,menubar=yes,directories=no,location=no,dependant=no%27, false, false);"
                    title="此页面的帮助 （新窗口）"
                >
                    <span class="helpLink">此页面的帮助</span>
                    <img src="/img/s.gif" alt="" class="helpIcon" />
                </a>
@@ -667,20 +681,44 @@
                    <tbody>
                        <tr>
                            <td class="pbTitle">
                                <img src="/img/s.gif" alt="" class="minWidth" title="" width="1" height="1" />
                                <img
                                    src="/img/s.gif"
                                    alt=""
                                    class="minWidth"
                                    title=""
                                    width="1"
                                    height="1"
                                />
                                <h2 class="mainTitle">报告书编辑</h2>
                            </td>
                            <td class="pbButton" id="topButtonRow" style="pointer-events: none; opacity: 0.4;">
                                <input class="btn" type="Button" value="保存" onclick="saveReportProcess('Save')" />
                                <input class="btn" type="Button" value="保存并新建" onclick="saveReportProcess('SaveAndNew')" />
                                <apex:commandButton action="{!cancel}" value="取消" />
                            <td
                                class="pbButton"
                                id="topButtonRow"
                                style="pointer-events: none; opacity: 0.4"
                            >
                                <input
                                    class="btn"
                                    type="Button"
                                    value="保存"
                                    onclick="saveReportProcess('Save')"
                                />
                                <input
                                    class="btn"
                                    type="Button"
                                    value="保存并新建"
                                    onclick="saveReportProcess('SaveAndNew')"
                                />
                                <apex:commandButton
                                    action="{!cancel}"
                                    value="取消"
                                />
                            </td>
                        </tr>
                    </tbody>
                </table>
            </div>
            <!-- Error Msg-->
            <div style="text-align: center;">
            <div style="text-align: center">
                <apex:outputPanel id="errorMsg">
                    <apex:pageMessages id="msgContent" escape="false" />
                </apex:outputPanel>
@@ -688,23 +726,44 @@
            <br/>
            <!-- Iterate the layoutSections, which is a list of sections -->
            <apex:repeat value="{!layoutSections}" var="layoutSection">
                <apex:pageBlockSection title="{!layoutSection.name}" showHeader="{!layoutSection.useHeader}" collapsible="{!layoutSection.allowCollapse}"
                    columns="{!layoutSection.columns}">

                <apex:pageBlockSection
                    title="{!layoutSection.name}"
                    showHeader="{!layoutSection.useHeader}"
                    collapsible="{!layoutSection.allowCollapse}"
                    columns="{!layoutSection.columns}"
                >
                    <!--Each section has layoutFields, let's iterate them as well-->
                    <apex:repeat value="{!layoutSection.layoutFields}" var="layoutField">
                    <apex:repeat
                        value="{!layoutSection.layoutFields}"
                        var="layoutField"
                    >
                        <!-- <apex:inputField html-title="{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}"  styleClass="{!ApiPrefix} {!ApiPrefix}_{!layoutField.fieldAPI}" value="{!Report__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)}"
                            required="{!layoutField.isRequired}" /> -->
                        <apex:inputField styleClass="PIBackApi PIBackApi_{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" value="{!Report__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)&&isNewMode}"
                            required="{!layoutField.isRequired}" />
                        <apex:inputField styleClass="PIBackApi PIBackApi_{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" value="{!Report__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)&&not(isNewMode)&&layoutField.fieldAPI!='RecordTypeId'}"
                            required="{!layoutField.isRequired}" />
                        <apex:outputField styleClass="PIBackApi PIBackApi_{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" value="{!Report__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)&&not(isNewMode)&&layoutField.fieldAPI=='RecordTypeId'}"
                        <apex:inputField
                            styleClass="PIBackApi PIBackApi_{!layoutField.fieldAPI}"
                            html-data-id="{!layoutField.fieldAPI}"
                            value="{!Report__c[layoutField.fieldAPI]}"
                            rendered="{!not(layoutField.isPlaceHOlder)&&isNewMode}"
                            required="{!layoutField.isRequired}"
                        />
                        <apex:pageblocksectionitem rendered="{!layoutField.isPlaceHolder}">
                        <apex:inputField
                            styleClass="PIBackApi PIBackApi_{!layoutField.fieldAPI}"
                            html-data-id="{!layoutField.fieldAPI}"
                            value="{!Report__c[layoutField.fieldAPI]}"
                            rendered="{!not(layoutField.isPlaceHOlder)&&not(isNewMode)&&layoutField.fieldAPI!='RecordTypeId'}"
                            required="{!layoutField.isRequired}"
                        />
                        <apex:outputField
                            styleClass="PIBackApi PIBackApi_{!layoutField.fieldAPI}"
                            html-data-id="{!layoutField.fieldAPI}"
                            value="{!Report__c[layoutField.fieldAPI]}"
                            rendered="{!not(layoutField.isPlaceHOlder)&&not(isNewMode)&&layoutField.fieldAPI=='RecordTypeId'}"
                        />
                        <apex:pageblocksectionitem
                            rendered="{!layoutField.isPlaceHolder}"
                        >
                        </apex:pageblocksectionitem>
                    </apex:repeat>

                </apex:pageBlockSection>
            </apex:repeat>
            <script>
@@ -721,7 +780,6 @@
                }
                console.log(api_id_map);
                sfdcPage.appendToOnloadQueue(function () {
                    debugger
                    //判断是否为只读选项
                    var layoutSections = JSON.parse('{!layoutSectionsStr}');
                    for (let m = 0; m < layoutSections.length; m++) {
@@ -823,17 +881,41 @@
                    <tbody>
                        <tr>
                            <td class="pbTitle">
                                <img src="/img/s.gif" alt="" class="minWidth" title="" width="1" height="1" />&nbsp;</td>
                            <td class="pbButtonb" id="bottomButtonRow" style="pointer-events: none; opacity: 0.4;">
                                <input class="btn" type="Button" value="保存" onclick="saveReportProcess('Save')" />
                                <input class="btn" type="Button" value="保存并新建" onclick="saveReportProcess('SaveAndNew')" />
                                <apex:commandButton action="{!cancel}" value="取消" />
                                <img
                                    src="/img/s.gif"
                                    alt=""
                                    class="minWidth"
                                    title=""
                                    width="1"
                                    height="1"
                                />&nbsp;
                            </td>
                            <td
                                class="pbButtonb"
                                id="bottomButtonRow"
                                style="pointer-events: none; opacity: 0.4"
                            >
                                <input
                                    class="btn"
                                    type="Button"
                                    value="保存"
                                    onclick="saveReportProcess('Save')"
                                />
                                <input
                                    class="btn"
                                    type="Button"
                                    value="保存并新建"
                                    onclick="saveReportProcess('SaveAndNew')"
                                />
                                <apex:commandButton
                                    action="{!cancel}"
                                    value="取消"
                                />
                            </td>
                        </tr>
                    </tbody>
                </table>
            </div>
        </apex:pageblock>

    </apex:form>
</apex:page>