From 2f183a6b0a83ec3f7d35375d5d25d200efc2a3e1 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期二, 19 四月 2022 18:46:18 +0800
Subject: [PATCH] 20220419FixIssue
---
force-app/main/default/pages/NewAndEditInspectionReport.page | 70 ++++++++++++++++++++++++++---------
1 files changed, 52 insertions(+), 18 deletions(-)
diff --git a/force-app/main/default/pages/NewAndEditInspectionReport.page b/force-app/main/default/pages/NewAndEditInspectionReport.page
index 0f6e105..788eab5 100644
--- a/force-app/main/default/pages/NewAndEditInspectionReport.page
+++ b/force-app/main/default/pages/NewAndEditInspectionReport.page
@@ -57,8 +57,9 @@
//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}';
}
@@ -120,7 +121,7 @@
var VLookUpFields = {! VLookUpFieldsJson};
function ProcessPI(sobjJson, payloadForNewPI) {
blockme();
- if ({!isNewMode}) {
+ if ({!isNewMode} || {!isCloneMode}) {
NewPIToAWS(sobjJson, payloadForNewPI)
}else {
UpdatePIToAWS(sobjJson, payloadForNewPI)
@@ -142,8 +143,15 @@
return '';
}
- function IsFormElement(tag_name){
- return ['input','select','textarea'].indexOf(tag_name)>-1;
+ 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) {
@@ -179,7 +187,14 @@
return error_msg;
}
-
+ function getCKEinstance(api_name){
+ let t = jQuery("label[for$='textAreaDelegate_"+api_name+"']").parent().next().find("textarea")[0];
+ if(t && t.id){
+ return CKEDITOR.instances[t.id]
+
+ }
+ return null;
+ }
function getSobjectInformation() {
let nodelist = document.getElementsByClassName(config.ApiPrefix);
@@ -190,7 +205,7 @@
let field_api_name = GetEleApiName(ele);
console.log('field_api_name:'+field_api_name)
let tag_name = ele.tagName.toLowerCase();
- if(!IsFormElement(tag_name)){
+ if(!IsFormElement(ele)){
console.log('tag_name='+tag_name+',field_api_name'+field_api_name+' is not a form element');
continue;
}
@@ -228,10 +243,14 @@
}
//璧嬪�煎瘜鏂囨湰鍖哄煙
//绉戝璐熻矗浜虹瀛�
- if(document.querySelector("[title = 'RTF 绶ㄨ集鍣�, page:form:block:j_id51:0:j_id52:j_id53:5:j_id54:textAreaDelegate_ResponsiblePerson_Sign__c']")){
- result.ResponsiblePerson_Sign__c = document.querySelector("[title = 'RTF 绶ㄨ集鍣�, page:form:block:j_id51:0:j_id52:j_id53:5:j_id54:textAreaDelegate_ResponsiblePerson_Sign__c']").contentWindow.document.getElementsByTagName('body')[0].innerHTML
+
+ if(getCKEinstance('ResponsiblePerson_Sign__c')){
+ result.ResponsiblePerson_Sign__c = getCKEinstance('ResponsiblePerson_Sign__c').getData()
}
- result['Reporter__c'] = document.getElementById('page:form:block:j_id51:0:j_id52:j_id53:4:j_id54_lkid').value;
+ if(document.querySelector("[data-id='Reporter__c']")){
+ result['Reporter__c'] = document.getElementById(document.querySelector("[data-id='Reporter__c']").children[7].children[0].id + '_lkid').value;
+ }
+
return result;
}
function QuerySobjectFromAWS() {
@@ -351,10 +370,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">
@@ -378,7 +397,7 @@
<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>
</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}" />
@@ -409,6 +428,18 @@
</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 () {
var layoutSections = JSON.parse('{!layoutSectionsStr}');
for (let m = 0; m < layoutSections.length; m++) {
@@ -442,11 +473,13 @@
}
//Replace Contact Vlookup Field
- replaceSearchContactLookup();
+ //replaceSearchContactLookup();
//Replace Lead Vlookup Field
- replaceSearchLeadLookup();
- document.querySelectorAll("[data-id='OwnerId']")[0].classList.add("disabledbutton");
+ //replaceSearchLeadLookup();
+ //document.querySelectorAll("[data-id='OwnerId']")[0].classList.add("disabledbutton");
// document.querySelectorAll("[data-id='OwnerId']")[1].classList.add("disabledbutton");
+ document.getElementById('topButtonRow').style = '';
+聽 聽 聽 聽 聽 聽 聽document.getElementById('bottomButtonRow').style = '';
jQuery('a[data-id="OwnerId"]').remove();
@@ -474,7 +507,7 @@
// clearVlookup('Hospital__c');
// }
// });
-
+ /*
jQuery("body").on("change","input[data-id='Hospital_Name__c']",function(){
setTimeout(() => {
console.log(document.getElementById(this.id+'_lkid').value);
@@ -489,7 +522,8 @@
clearVlookup('Hospital__c');
}
}, 50);
- });
+ });
+ */
});
</script>
@@ -499,7 +533,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