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 | 198 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 160 insertions(+), 38 deletions(-)
diff --git a/force-app/main/default/pages/NewAndEditCase.page b/force-app/main/default/pages/NewAndEditCase.page
index 092954e..3646fcf 100644
--- a/force-app/main/default/pages/NewAndEditCase.page
+++ b/force-app/main/default/pages/NewAndEditCase.page
@@ -2,7 +2,8 @@
<apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
- <script src="../../soap/ajax/53.0/connection.js" type="text/javascript"></script>
+ <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+ <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<style>
.disabledbutton {
pointer-events: none;
@@ -19,16 +20,30 @@
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();
- if ({!isNewMode}) {
+ if ({!isNewMode} || {!isCloneMode}) {
NewPIToAWS(caseJson, payloadForNewPI)
}else {
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");
@@ -102,11 +117,27 @@
let nodelist = document.querySelectorAll("[data-id]");
let result = {}
result.RecordTypeId = '{!rtTypeId}'
+ //瀵屾枃鏈�
+ var describedbyAll = document.querySelectorAll("[aria-describedby = 'cke_34']");
+ if(describedbyAll){
+ 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;
+ if (result.Text_attachement__c == '<br>') {
+ result.Text_attachement__c = '';
+ }
+ }
+ }
+ }
for (let index = 0; index < nodelist.length; index++) {
if (VLookUpFields.has(nodelist[index].getAttribute("data-id"))) {
console.log(nodelist[index].id.indexOf('lkwgt'));
if (nodelist[index].id.indexOf('lkwgt') == -1) {
let vlookUpNodeId = nodelist[index].id + '_lkid';
+ if (nodelist[index].tagName.toLowerCase() == 'div') {
+ vlookUpNodeId = nodelist[index].id.substring(0,nodelist[index].id.length-4) + '_lkid';
+ }
let vlookUpNodeValue = document.getElementById(vlookUpNodeId).value;
result[nodelist[index].getAttribute("data-id")] = vlookUpNodeValue;
}
@@ -127,12 +158,6 @@
index++;
}
}
- //閽堝id鐨勬墜鍔ㄦ坊鍔�
- if (document.getElementById("page:form:block:j_id31:0:j_id32:j_id33:1:j_id34_lkid") && (!result.hasOwnProperty("Field1_staff__c") || !result["Field1_staff__c"])){
- if(document.getElementById("page:form:block:j_id31:0:j_id32:j_id33:1:j_id34_lkid").value != '000000000000000'){
- result["Field1_staff__c"] = document.getElementById("page:form:block:j_id31:0:j_id32:j_id33:1:j_id34_lkid").value;
- }
- }
return result;
}
@@ -143,9 +168,15 @@
//闇�瑕佽В瀵嗗瓧娈�
var queryBack = function queryBack(data) {
console.log('data = ' + data);
- document.querySelector("[data-id='cic_telephone__c']").value = data.object.cicTelephone;
- document.querySelector("[data-id='CASE_CUSTOMER__c']").value = data.object.caseCustomer;
- document.querySelector("[data-id='Customer_manual__c']").value = data.object.customerManual;
+ if (document.querySelector("[data-id='cic_telephone__c']")) {
+ document.querySelector("[data-id='cic_telephone__c']").value = data.object.cicTelephone;
+ }
+ if (document.querySelector("[data-id='CASE_CUSTOMER__c']")) {
+ document.querySelector("[data-id='CASE_CUSTOMER__c']").value = data.object.caseCustomer;
+ }
+ if (document.querySelector("[data-id='Customer_manual__c']")) {
+ document.querySelector("[data-id='Customer_manual__c']").value = data.object.customerManual;
+ }
};
var insertOrUpdateBack = function insertOrUpdateBack(payloadJson, result, isNewMode) {
@@ -161,10 +192,13 @@
payloadJson.Customer_manual_Encrypted__c = r.object[0].customerManualEncrypt;
//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;
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
+ }
+ if('{!rtTypeId}'){
+ payloadJson.RecordTypeId = '{!rtTypeId}';//Add by zhj for Record Type Issue 20220421
}
return payloadJson;
}
@@ -199,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]
@@ -219,6 +255,8 @@
}
//鎸夐挳鐐瑰嚮浜嬩欢
function saveCaseProcess(saveMode) {
+ EditButton(true);
+
disableButtonStatus();
redirectMode = saveMode;
console.log('redirectMode'+redirectMode);
@@ -226,6 +264,7 @@
//1. Get Case Information from Form
let caseJson = getCaseInformation();
//2. Validate the Case field value formate, for example the email formate or phone formate
+ /*
let validationResultMessage = validateFieldValueFormate();
console.log(validationResultMessage);
if (!validationResultMessage) {
@@ -234,6 +273,7 @@
alertErrorMessage('鎵嬫満鏍煎紡杈撳叆鏈夎锛岃閲嶆柊杈撳叆锛�');
return
}
+ */
// Check Required Field
let checkRequiredFieldMsgResult = checkRequiredFieldMsg(caseJson);
if (checkRequiredFieldMsgResult) {
@@ -254,6 +294,7 @@
errorMsgNode.innerText = errorMsg;
errorMsgNode.className = 'pbError';
unblockUI();
+ EditButton(false);
}
function hiddenErrorMsgNode() {
let errorMsgNode = document.getElementById("page:form:block:msgContent");
@@ -276,9 +317,14 @@
accountValue = document.getElementById(accountNodeId).value;
}
console.log(accountValue);
- if(accountValue !='000000000000000'){
+ if(accountValue !='000000000000000' || true){
+ if (accountValue == '000000000000000') {
+ accountValue = '';
+ }
+
let baseUrl = "/apex/SearchContactPage";
- let suffixUrl = "?contactId="+contactNodeId+"&accountId="+accountValue;
+ let searchContactKeyWord = document.querySelector("[data-id='ContactId']").value;
+ let suffixUrl = "?contactId=" + contactNodeId + "&accountId=" + accountValue+"&searchContactKeyWord=" + searchContactKeyWord;
let newSearchContactParam = 'height=600,width=800,left=100,top=100,dialogHide=true,resizable=no,scrollbars=yes,toolbar=no,status=no';
newSearchContactWindow = window.open(baseUrl+suffixUrl, 'Popup', newSearchContactParam);
if (window.focus) {
@@ -319,25 +365,25 @@
let sfId = document.getElementById(document.querySelector("[data-id='ContactId']").id + '_lkid').value;
let contactsInfo = JSON.parse('{!contactsInfo}');
let dataId = contactsInfo[sfId];
- // let queryContactBack = function(data){
- // //To Do later
- // console.log('ContactData = ' + data.object);
+ let queryContactBack = function(data){
+ //To Do later
+ console.log('ContactData = ' + data.object);
- // document.querySelector("[data-id='ContactId']").value = data.object.lastName;
- // }
- // AWSService.query(staticResourcesContact.queryUrl, dataId, queryContactBack, staticResources.token);
- let url = staticResourcesContact.queryUrl + '?dataId=' + dataId;
- fetch(url, {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'pi-token': staticResources.token
- }
- }).then((data) => {
- return data.json();
- }).then((result) => {
- document.querySelector("[data-id='ContactId']").value = result.object.lastName;
- })
+ document.querySelector("[data-id='ContactId']").value = data.object.lastName;
+ }
+ AWSService.query(staticResourcesContact.queryUrl, dataId, queryContactBack, staticResources.token);
+ // let url = staticResourcesContact.queryUrl + '?dataId=' + dataId;
+ // fetch(url, {
+ // method: 'GET',
+ // headers: {
+ // 'Content-Type': 'application/json',
+ // 'pi-token': staticResources.token
+ // }
+ // }).then((data) => {
+ // return data.json();
+ // }).then((result) => {
+ // document.querySelector("[data-id='ContactId']").value = result.object.lastName;
+ // })
}
</script>
<div class="bPageTitle">
@@ -371,7 +417,7 @@
<img src="/img/s.gif" alt="" class="minWidth" title="" width="1" height="1" />
<h2 class="mainTitle">CIC缂栬緫</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="淇濆瓨" onclick="saveCaseProcess('Save')" />
<input class="btn" type="Button" value="淇濆瓨骞跺叧闂�" onclick="saveCaseProcess('SaveAndClose')" />
<input class="btn" type="Button" value="淇濆瓨骞舵柊寤�" onclick="saveCaseProcess('SaveAndNew')" />
@@ -393,8 +439,10 @@
<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:inputField html-data-id="{!layoutField.fieldAPI}" value="{!Case[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)}"
- required="{!layoutField.isRequired}" />
+ <apex:inputField html-data-id="{!layoutField.fieldAPI}" value="{!Case[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)&&isNewMode}" required="{!layoutField.isRequired}" />
+ <apex:inputField html-data-id="{!layoutField.fieldAPI}" value="{!Case[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)&¬(isNewMode)&&layoutField.fieldAPI!='RecordTypeId'}" required="{!layoutField.isRequired}" />
+ <apex:outputField html-data-id="{!layoutField.fieldAPI}" value="{!Case[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)&¬(isNewMode)&&layoutField.fieldAPI=='RecordTypeId'}" />
+
<apex:pageblocksectionitem rendered="{!layoutField.isPlaceHolder}">
</apex:pageblocksectionitem>
</apex:repeat>
@@ -402,6 +450,28 @@
</apex:repeat>
<script>
sfdcPage.appendToOnloadQueue(function () {
+ var layoutSections = JSON.parse('{!layoutSectionsStr}');
+ for (let m = 0; m < layoutSections.length; m++) {
+ let layoutSection = layoutSections[m].layoutFields;
+ for (let n = 0; n < layoutSection.length; n++) {
+ let layoutField = layoutSection[n];
+ if (layoutField.fieldAPI != '' && document.querySelector("[data-id='"+layoutField.fieldAPI+"']") != null) {
+ let e = document.querySelector("[data-id='"+layoutField.fieldAPI+"']");
+ e.disabled = !(layoutField.editableField);
+ /*
+ if (!(layoutField.editableField)) {
+ if (e.getAttribute("multiple") && e.getAttribute("multiple") == 'multiple') {
+ e.parentNode.classList.add("disabledbutton");
+ }else if (e.tagName == 'DIV') {
+ e.classList.add("disabledbutton");
+ }else if (VLookUpFields.indexOf(layoutField.fieldAPI) >= 0) {
+ e.parentNode.classList.add("disabledbutton");
+ }
+ }
+ */
+ }
+ }
+ }
//1. Set Last Name label
//document.querySelector("[data-id='LastName']").parentNode.parentNode.parentNode.children[2].children[0].innerText = '濮撳悕';
//2. Query AWS Data by dataId
@@ -416,8 +486,60 @@
//3. Set Readonly Attribute
document.querySelector("[data-id='OwnerId']").classList.add("disabledbutton");
document.querySelector("[data-id='RecordTypeId']").classList.add("disabledbutton");
+
+ document.getElementById('topButtonRow').style = '';
+ document.getElementById('bottomButtonRow').style = '';
//闇�瑕侀殣钘�
// document.querySelector("[data-id='SuppliedEmail']").classList.add("displayblock");
+
+ jQuery('a[data-id="OwnerId"]').remove();
+
+ let previous_value = {};
+ jQuery(".lookupInput input").each(function(i,e){
+ let je =jQuery(e);
+
+ let dataid = je.attr('data-id');
+ if(['ContactId'].indexOf(dataid) < 0) return;
+
+ jQuery(e).focus(function(){
+ previous_value[this.id] = this.value;
+ })
+
+ jQuery(e).change(function(){
+ if (previous_value[this.id] != jQuery(this).val()) {
+ document.getElementById(this.id+'_lkid').value = '';
+ }
+ })
+ })
+ // jQuery(".lookupInput").each(function(i,e){
+ // let je =jQuery(e).find('input');
+ // je.attr("readonly","");
+ // je.css("background","unset");
+
+ // let dataid = je.attr('data-id');
+ // if(['Hospital_Name__c','Department_Class__c','OwnerId'].indexOf(dataid) > -1) return;
+ // jQuery(e).children(":last-child").before('<img class="closeIcon" data-id="'+dataid+'" generate="" alt="Clear" src="/s.gif" style="display: inline-block;">');
+ // })
+
+ // jQuery(".lookupInput").on("mouseenter","img[generate]",function(e){
+ // this.className = "closeIconOn";
+ // });
+
+ // jQuery(".lookupInput").on("mouseleave","img[generate]",function(e){
+ // this.className = "closeIcon"
+ // });
+
+ // jQuery(".lookupInput").on("click","img[generate]",function(e){
+ // 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');
+ // if(hidden){
+ // hidden.value = '';
+ // }
+ // }
+ // });
});
</script>
<div class="pbBottomButtons">
@@ -426,7 +548,7 @@
<tr>
<td class="pbTitle">
<img src="/img/s.gif" alt="" class="minWidth" title="" width="1" height="1" /> </td>
- <td class="pbButton" id="bottomButtonRow">
+ <td class="pbButton" id="bottomButtonRow" style="pointer-events: none; opacity: 0.4;">
<input class="btn" type="Button" value="淇濆瓨" onclick="saveCaseProcess('Save')" />
<input class="btn" type="Button" value="淇濆瓨骞跺叧闂�" onclick="saveCaseProcess('SaveAndClose')" />
<input class="btn" type="Button" value="淇濆瓨骞舵柊寤�" onclick="saveCaseProcess('SaveAndNew')" />
--
Gitblit v1.9.1