From 639b0139b5713badf37e67b4fe7b9d3b3a592163 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期一, 09 五月 2022 13:38:24 +0800
Subject: [PATCH] fixRequiredFieldValidation0509
---
force-app/main/default/pages/NewAndEditAgencyContact.page | 135 +++++++++++++++++++++++++++++++++-----------
1 files changed, 100 insertions(+), 35 deletions(-)
diff --git a/force-app/main/default/pages/NewAndEditAgencyContact.page b/force-app/main/default/pages/NewAndEditAgencyContact.page
index dd21ac9..3839ef1 100644
--- a/force-app/main/default/pages/NewAndEditAgencyContact.page
+++ b/force-app/main/default/pages/NewAndEditAgencyContact.page
@@ -1,9 +1,15 @@
<apex:page standardController="Agency_Contact__c" extensions="NewAndEditAgencyContactController" id="page">
<apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
- <script src="../../soap/ajax/53.0/connection.js" type="text/javascript"></script>
+ <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
+ <style>
+ .disabledbutton {
+ pointer-events: none;
+ opacity: 0.4;
+ }
+ </style>
<script>
var config = {};
@@ -12,6 +18,7 @@
ApiPrefix:"{!ApiPrefix}",
SaveAndNew:false,
AWSToSobjectMap:{!AWSToSobjectMapJson},
+ AWSToSobjectNonEncryptedMapKeySet:{!AWSToSobjectNonEncryptedMapKeySet},
AWSToSobjectNonEncryptedMap:{!AWSToSobjectNonEncryptedMapJson},
AWSToSobjectEncryptedMap:{!AWSToSobjectEncryptedMapJson},
SobjectToAWSModel:function (sobjJson) {
@@ -60,18 +67,23 @@
//payloadJson.AWS_Data_Id__c = r.object[0].dataId;
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
- if (isNewMode) {
+ if (isNewMode || {!isCloneMode}) {
payloadJson.AWS_Data_Id__c = r.object[0].dataId;
+ delete payloadJson.OwnerId;
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
+ }
+ if('{!rtTypeId}'){
+ payloadJson.RecordTypeId = '{!rtTypeId}';//Add by zhj for Record Type Issue 20220421
}
return payloadJson;
},
queryBack:function (data) {
console.log('data = ' + data);
if(data.object){
- for(let f in config.AWSToSobjectNonEncryptedMap){
- let ele = GetEleByClass(config.ApiPrefix + "_"+ config.AWSToSobjectNonEncryptedMap[f]);
+ for(let fi in config.AWSToSobjectNonEncryptedMapKeySet){
+ let f = config.AWSToSobjectNonEncryptedMapKeySet[fi];
+ let ele = document.getElementById(api_id_map[config.AWSToSobjectNonEncryptedMap[f]])
if(data.object.hasOwnProperty(f) && ele){
// 澶氶�夌壒娈婂鐞�
@@ -97,6 +109,9 @@
ele.value = data.object[f];
}
+ if(ele.type.indexOf("select")>-1 && ele.value){
+ jQuery(ele).change()
+ }
}
else{
console.log(f + 'is not in data.object');
@@ -117,14 +132,16 @@
}
var staticResources = JSON.parse('{!staticResource}');
+ var staticResourceAWSContact = JSON.parse('{!staticResourceAWSContact}');
+
var requiredFieldAPIList = JSON.parse('{!requiredFieldAPIListStr}');
var fieldAPIToLabelMap = JSON.parse('{!fieldAPIToLabelMapStr}');
console.log('{!staticResource}');
var VLookUpFields = {! VLookUpFieldsJson};
function ProcessPI(sobjJson, payloadForNewPI) {
blockme();
- if ({!isNewMode}) {
- NewPIToAWS(sobjJson, payloadForNewPI)
+ if ({!isNewMode} || {!isCloneMode}) {
+ NewPIToAWS(sobjJson, payloadForNewPI)
}else {
UpdatePIToAWS(sobjJson, payloadForNewPI)
}
@@ -146,8 +163,27 @@
return '';
}
- function IsFormElement(tag_name){
- return ['input','select','textarea'].indexOf(tag_name)>-1;
+ function EditButton(isDisabled){
+ var topele = document.getElementById('topButtonRow');
+ var bottomele = document.getElementById('bottomButtonRow');
+
+ if (isDisabled) {
+ topele.classList.add("disabledbutton");
+ bottomele.classList.add("disabledbutton");
+ }else {
+ topele.classList.remove("disabledbutton");
+ bottomele.classList.remove("disabledbutton");
+ }
+ }
+ function IsFormTag(tag_name){
+ if (!tag_name) {
+ return false;
+ }
+ return ['input','select','textarea'].indexOf(tag_name.toLowerCase())>-1;
+ }
+
+ function IsFormElement(e){
+ return IsFormTag(e.tagName);
}
function getPIPayload(sobjJson) {
@@ -188,13 +224,13 @@
function getSobjectInformation() {
- let nodelist = document.getElementsByClassName(config.ApiPrefix);
+ //let nodelist = document.getElementsByClassName(config.ApiPrefix);
let result = {}
- for (let index = 0; index < nodelist.length; index++) {
- let ele = nodelist[index];
- let field_api_name = GetEleApiName(ele);
+ for (let index in api_id_map) {
+ let ele = document.getElementById(api_id_map[index]);
+ let field_api_name = index;
let tag_name = ele.tagName.toLowerCase();
- if(!IsFormElement(tag_name)){
+ if(!IsFormTag(tag_name)){
console.log('tag_name='+tag_name+',field_api_name'+field_api_name+' is not a form element');
continue;
}
@@ -283,7 +319,9 @@
function checkRequiredFieldMsg(formData) {
let blankRequiredFields = '';
for(i = 0;i<requiredFieldAPIList.length;i++){
- if(formData[requiredFieldAPIList[i]]){
+ if(formData[requiredFieldAPIList[i]] && (VLookUpFields.indexOf(requiredFieldAPIList[i]) == -1)){
+ continue;
+ }else if((VLookUpFields.indexOf(requiredFieldAPIList[i]) != -1) && formData[requiredFieldAPIList[i]] != '000000000000000'){
continue;
}else{
if(blankRequiredFields == ''){
@@ -297,6 +335,7 @@
return blankRequiredFields;
}
function saveSobjectProcess(save_and_new) {
+ EditButton(true);
if(save_and_new){
config.SaveAndNew = true;
}
@@ -305,14 +344,15 @@
//1. Get Sobject Information from Form
let sobjJson = getSobjectInformation();
//2. Validate the Sobject field value formate, for example the email formate or phone formate
-
- let validationResultMessage = validateFieldValueFormate();
- console.log(validationResultMessage);
- if (validationResultMessage) {
- //Popup error message. - To Do After POC
- alertErrorMessage(validationResultMessage);
- return
- }
+ //updated by Lijun0325 Start
+ //let validationResultMessage = validateFieldValueFormate();
+ //console.log(validationResultMessage);
+ // if (validationResultMessage) {
+ // //Popup error message. - To Do After POC
+ // alertErrorMessage(validationResultMessage);
+ // return
+ // }
+ //updated by Lijun0325 End
// Check Required Field
let checkRequiredFieldMsgResult = checkRequiredFieldMsg(sobjJson);
if (checkRequiredFieldMsgResult) {
@@ -333,8 +373,10 @@
function alertErrorMessage(errorMsg) {
let errorMsgNode = document.getElementById("page:form:block:msgContent");
+ errorMsg = '閿欒锛氭棤鏁堟暟鎹��' + '\n' + errorMsg;
errorMsgNode.innerText = errorMsg;
errorMsgNode.className = 'pbError';
+ EditButton(false);
}
function hiddenErrorMsgNode() {
let errorMsgNode = document.getElementById("page:form:block:msgContent");
@@ -405,12 +447,15 @@
let contactsInfo = JSON.parse('{!LookUpOverrideFieldsMapJson}');
let dataId = contactsInfo[sfId];
- AWSService.query(staticResourcesContact.queryUrl,dataId,function(result){
- if(result.object){
- document.querySelector("[data-id='Contact__c']").value = result.object.lastName;
- }
-
- },staticResources.token);
+ if(dataId){
+ AWSService.query(staticResourceAWSContact.queryUrl,dataId,function(result){
+ if(result.object){
+ document.querySelector("[data-id='Contact__c']").value = result.object.lastName;
+ }
+
+ },staticResources.token);
+ }
+
}
</script>
@@ -418,10 +463,10 @@
<div class="ptBody">
<div class="content">
<img src="/img/s.gif" alt="{! SobjectLabel}" class="pageTitleIcon" title="{! SobjectLabel}" />
- <h1 class="pageType">{! SobjectLabel}<apex:outputText rendered="{!isNewMode}">{!$Label.New}</apex:outputText><apex:outputText rendered="{!not(isNewMode)}">{!$Label.Edit}</apex:outputText>
+ <h1 class="pageType">{! SobjectLabel}<apex:outputText rendered="{!isNewMode || isCloneMode}">{!$Label.New}</apex:outputText><apex:outputText rendered="{!not(isNewMode || isCloneMode)}">{!$Label.Edit}</apex:outputText>
<span class="titleSeparatingColon">:</span>
</h1>
- <h2 class="pageDescription"> <apex:outputText rendered="{!isNewMode}">{!$Label.New}</apex:outputText><apex:outputText rendered="{!not(isNewMode)}">{!$Label.Edit}</apex:outputText>{! SobjectLabel}</h2>
+ <h2 class="pageDescription"> <apex:outputText rendered="{!isNewMode || isCloneMode}">{!$Label.New}</apex:outputText><apex:outputText rendered="{!not(isNewMode || isCloneMode)}">{!$Label.Edit}</apex:outputText>{! SobjectLabel}</h2>
<div class="blank"> </div>
</div>
<div class="links">
@@ -443,9 +488,9 @@
<tr>
<td class="pbTitle">
<img src="/img/s.gif" alt="" class="minWidth" title="" width="1" height="1" />
- <h2 class="mainTitle">{! SobjectLabel}<apex:outputText rendered="{!isNewMode}">{!$Label.New}</apex:outputText><apex:outputText rendered="{!not(isNewMode)}">{!$Label.Edit}</apex:outputText></h2>
+ <h2 class="mainTitle">{! SobjectLabel}<apex:outputText rendered="{!isNewMode || isCloneMode}">{!$Label.New}</apex:outputText><apex:outputText rendered="{!not(isNewMode || isCloneMode)}">{!$Label.Edit}</apex:outputText></h2>
</td>
- <td class="pbButton" id="topButtonRow">
+ <td class="pbButton" id="topButtonRow" style="pointer-events: none; opacity: 0.4;">
<input class="btn" type="Button" value="{!$Label.Save}" onclick="saveSobjectProcess()" />
<input class="btn" type="Button" value="{!$Label.SaveAndNew}" onclick="saveSobjectProcess(1)" />
<apex:commandButton action="{!cancel}" value="{!$Label.Cancel}" />
@@ -467,8 +512,10 @@
<!--Each section has layoutFields, let's iterate them as well-->
<apex:repeat value="{!layoutSection.layoutFields}" var="layoutField">
- <apex:inputField styleClass="{!ApiPrefix} {!ApiPrefix}_{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" value="{!Agency_Contact__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)}"
+ <apex:inputField styleClass="{!ApiPrefix} {!ApiPrefix}_{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" value="{!Agency_Contact__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)&&layoutField.fieldAPI!='RecordTypeId'}"
required="{!layoutField.isRequired}" />
+ <apex:outputField styleClass="PIBackApi PIBackApi_{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" value="{!Agency_Contact__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)&&layoutField.fieldAPI=='RecordTypeId'}"
+ />
<apex:pageblocksectionitem rendered="{!layoutField.isPlaceHolder}">
</apex:pageblocksectionitem>
</apex:repeat>
@@ -476,8 +523,24 @@
</apex:pageBlockSection>
</apex:repeat>
<script>
+ var init_nodes = document.getElementsByClassName("PIBackApi");
+ var api_id_map={};
+ for(let ei in init_nodes){
+ let e = init_nodes[ei];
+ if(IsFormElement(e)){
+ if(e.getAttribute("multiple") != 'multiple' || e.style.display == 'none' && e.id.indexOf('selected') < 0){
+ api_id_map[GetEleApiName(e)] = e.id;
+ }
+
+ }
+ }
+ console.log(api_id_map);
sfdcPage.appendToOnloadQueue(function () {
-
+ jQuery('option').each(function(i,e){
+ if(e.value == '_\x01_'){
+ e.value = '';
+ }
+ })
//Replace Vlookup Field
replaceSearchContactLookup();
@@ -503,6 +566,8 @@
}
jQuery('a[data-id="OwnerId"]').remove();
+ document.getElementById('topButtonRow').style = '';
+聽 聽 聽 聽 聽 聽 聽 聽 聽 聽 document.getElementById('bottomButtonRow').style = '';
/*
jQuery(".lookupInput").each(function(i,e){
let je =jQuery(e).find('input');
@@ -571,7 +636,7 @@
<tr>
<td class="pbTitle">
<img src="/img/s.gif" alt="" class="minWidth" title="" width="1" height="1" /> </td>
- <td class="pbButtonb" id="bottomButtonRow">
+ <td class="pbButtonb" id="bottomButtonRow" style="pointer-events: none; opacity: 0.4;">
<input class="btn" type="Button" value="{!$Label.Save}" onclick="saveSobjectProcess()" />
<input class="btn" type="Button" value="{!$Label.SaveAndNew}" onclick="saveSobjectProcess()" />
<apex:commandButton action="{!cancel}" value="{!$Label.Cancel}" />
--
Gitblit v1.9.1