Merge branch 'master' into LEXUpgrade2023-Deloitte

buli

2023-07-14 e6068da47c1bef5517c9e5fdc8c726766867ad4e

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

@@ -1,4 +1,4 @@
<apex:page controller="SearchContactController" showHeader="false" id="page">
<apex:page controller="SearchContactController" showHeader="false" id="page" lightningStylesheets="true">
    <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}" />
    <apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
    <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}" />
@@ -83,8 +83,19 @@
                let contactInfo = new Object();
                contactInfo.Name = obj.currentTarget.innerText;
                contactInfo.ContactId = obj.currentTarget.id;

                //2022-5-7 yjk 增加邮箱、手机号 
                var tdNodes = obj.currentTarget.parentNode.childNodes;
                var email = tdNodes[2].innerText;
                
                var mobile = tdNodes[4].innerText;
                var phone = mobile? mobile :tdNodes[3].innerText;
                contactInfo.email = email;
                contactInfo.phone = phone;
                var selectedContactNode = winMain.document.getElementById('{!JSENCODE($CurrentPage.parameters.contactId)}');
                selectedContactNode.value = JSON.stringify(contactInfo);
                

                closeWindow();
            }