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/NewAndEditCase.page | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/pages/NewAndEditCase.page b/force-app/main/default/pages/NewAndEditCase.page
index 5724483..3646fcf 100644
--- a/force-app/main/default/pages/NewAndEditCase.page
+++ b/force-app/main/default/pages/NewAndEditCase.page
@@ -3,7 +3,7 @@
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
- <script src="../../soap/ajax/53.0/connection.js" type="text/javascript"></script>
+ <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<style>
.disabledbutton {
pointer-events: none;
@@ -20,7 +20,7 @@
var requiredAPIToChangedLabelMap = new Map();
requiredAPIToChangedLabelMap.set('LastName', '{!PIPL_Name_Label}');
console.log('{!contactsInfo}');
- var VLookUpFields = new Set(['Account__c', 'ContactId', 'Asset__c', 'prod__c', 'Competitor_info__c', 'AccountId', 'Field1_staff__c']);
+ var VLookUpFields = new Set(['Account__c', 'ContactId', 'Asset__c', 'prod__c', 'Competitor_info__c', 'AccountId', 'Field1_staff__c','OwnerId']);
//鍒ゆ柇insert or update
function ProcessPI(caseJson, payloadForNewPI) {
blockme();
@@ -30,6 +30,20 @@
UpdatePIToAWS(caseJson, payloadForNewPI)
}
}
+
+ 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 enableButton(obj){
obj.classList.remove("btnDisabled");
@@ -109,7 +123,7 @@
for (let idx = 0; idx < describedbyAll.length; idx++) {
let describedby = describedbyAll[idx];
if (describedby.title.indexOf('Text_attachement__c') > 0){
- result.Text_attachement__c = describedby.contentWindow.document.getElementsByTagName('body')[0].innerHTML;
+ result.Text_attachement__c = describedby.contentWindow.document.getElementsByTagName('body')[0].innerHTML;
if (result.Text_attachement__c == '<br>') {
result.Text_attachement__c = '';
}
@@ -121,7 +135,7 @@
console.log(nodelist[index].id.indexOf('lkwgt'));
if (nodelist[index].id.indexOf('lkwgt') == -1) {
let vlookUpNodeId = nodelist[index].id + '_lkid';
- if (nodelist[index].getAttribute("data-id") == 'Field1_staff__c') {
+ if (nodelist[index].tagName.toLowerCase() == 'div') {
vlookUpNodeId = nodelist[index].id.substring(0,nodelist[index].id.length-4) + '_lkid';
}
let vlookUpNodeValue = document.getElementById(vlookUpNodeId).value;
@@ -183,6 +197,9 @@
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
}
+ if('{!rtTypeId}'){
+ payloadJson.RecordTypeId = '{!rtTypeId}';//Add by zhj for Record Type Issue 20220421
+ }
return payloadJson;
}
//鍥炶皟鍑芥暟锛岀偣鍑诲悗浜嬩欢
@@ -216,7 +233,9 @@
function checkRequiredFieldMsg(formData) {
let blankRequiredFields = '';
for (i = 0; i < requiredFieldAPIList.length; i++) {
- if (formData[requiredFieldAPIList[i]]) {
+ if (formData[requiredFieldAPIList[i]] && !VLookUpFields.has(requiredFieldAPIList[i])) {
+ continue;
+ }else if(VLookUpFields.has(requiredFieldAPIList[i]) && formData[requiredFieldAPIList[i]] != '000000000000000'){
continue;
} else {
let fieldAPIValue = requiredFieldAPIList[i]
@@ -236,6 +255,8 @@
}
//鎸夐挳鐐瑰嚮浜嬩欢
function saveCaseProcess(saveMode) {
+ EditButton(true);
+
disableButtonStatus();
redirectMode = saveMode;
console.log('redirectMode'+redirectMode);
@@ -273,6 +294,7 @@
errorMsgNode.innerText = errorMsg;
errorMsgNode.className = 'pbError';
unblockUI();
+ EditButton(false);
}
function hiddenErrorMsgNode() {
let errorMsgNode = document.getElementById("page:form:block:msgContent");
@@ -511,10 +533,10 @@
// let id = jQuery("input[data-id='"+jQuery(this).attr("data-id")+ "']").attr("id");
// let input = document.getElementById(id);
// if(input){
- // input.value = '';
- // let hidden = document.getElementById(id+'_lkid');
+ // input.value = '';
+ // let hidden = document.getElementById(id+'_lkid');
// if(hidden){
- // hidden.value = '';
+ // hidden.value = '';
// }
// }
// });
--
Gitblit v1.9.1