From 962519811b7c4be07f30d09e791798b0ea79d3ae Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期三, 08 三月 2023 09:54:02 +0800
Subject: [PATCH] 同步代码
---
force-app/main/default/pages/NewAndEditLead.page | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/force-app/main/default/pages/NewAndEditLead.page b/force-app/main/default/pages/NewAndEditLead.page
index 6f17676..1dda546 100644
--- a/force-app/main/default/pages/NewAndEditLead.page
+++ b/force-app/main/default/pages/NewAndEditLead.page
@@ -1,4 +1,4 @@
-<apex:page standardController="Lead" extensions="NewAndEditLeadController" id="page">
+<apex:page lightningStylesheets="true" standardController="Lead" extensions="NewAndEditLeadController" id="page">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}" />
<apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}" />
@@ -13,9 +13,6 @@
<script>
AWSService.sfSessionId = '{!GETSESSIONID()}';
var staticResources = JSON.parse('{!staticResource}');
- //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
- var staticResourcesV2 = JSON.parse('{!staticResourceV2}');
- //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
var staticResourcesContact = JSON.parse('{!staticResourceContact}');
var staticResourceInquiryForm = JSON.parse('{!staticResourceInquiryForm}');
var requiredFieldAPIList = JSON.parse('{!requiredFieldAPIListStr}');
@@ -213,11 +210,9 @@
payloadJson.LastName = r.object[0].lastName;
payloadJson.Phone = r.object[0].phone;
payloadJson.Email = r.object[0].email;
- //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
- // payloadJson.Name_Encrypted__c = r.object[0].lastNameEncrypt;
- // payloadJson.Phone_Encrypted__c = r.object[0].phoneEncrypt;
- // Email_Encrypted__c = r.object[0].emailEncrypt;
- //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
+ payloadJson.Name_Encrypted__c = r.object[0].lastNameEncrypt;
+ payloadJson.Phone_Encrypted__c = r.object[0].phoneEncrypt;
+ payloadJson.Email_Encrypted__c = r.object[0].emailEncrypt;
//payloadJson.AWS_Data_Id__c = r.object[0].dataId;
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
if (isNewMode || {!isCloneMode}) {
@@ -253,18 +248,12 @@
let obj = JSON.parse(payloadForNewPI);
obj[0].dataId = '{!AWSDataId}';
let payloadForNewPIJson = JSON.stringify(obj);
- //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
- //AWSService.update(staticResources.updateUrl, leadJson, payloadForNewPIJson, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, false, insertOrUpdateBack, redirectCallBack);
- AWSService.update(staticResourcesV2.updateUrl, leadJson, payloadForNewPIJson, controllerSaveMethod, staticResourcesV2.token, staticResources.transactionUrl, false, insertOrUpdateBack, redirectCallBack);
- //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
+ AWSService.update(staticResources.updateUrl, leadJson, payloadForNewPIJson, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, false, insertOrUpdateBack, redirectCallBack);
}
function NewPIToAWS(leadJson, payloadForNewPI) {
let controllerSaveMethod = '{!$RemoteAction.NewAndEditLeadController.saveLead}';
- //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
- //AWSService.insert(staticResources.newUrl, leadJson, payloadForNewPI, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, true, insertOrUpdateBack, redirectCallBack);
- AWSService.insert(staticResourcesV2.newUrl, leadJson, payloadForNewPI, controllerSaveMethod, staticResourcesV2.token, staticResources.transactionUrl, true, insertOrUpdateBack, redirectCallBack);
- //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
+ AWSService.insert(staticResources.newUrl, leadJson, payloadForNewPI, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, true, insertOrUpdateBack, redirectCallBack);
}
function checkRequiredFieldMsg(formData) {
@@ -655,7 +644,7 @@
unblockUI();
}
-
+ debugger
document.getElementById('topButtonRow').style = '';
document.getElementById('bottomButtonRow').style = '';
let previous_value = {};
--
Gitblit v1.9.1