From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/experiences/Consumable1/views/error.json | 103 ++++++++++++++++++++++++++++-----------------------
1 files changed, 56 insertions(+), 47 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/views/error.json b/force-app/main/default/experiences/Consumable1/views/error.json
index 5a61280..f9fe99b 100644
--- a/force-app/main/default/experiences/Consumable1/views/error.json
+++ b/force-app/main/default/experiences/Consumable1/views/error.json
@@ -1,48 +1,57 @@
{
- "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName" : "siteforce:sldsOneColLayout",
- "dataProviders" : [ ],
- "id" : "f02c5a75-f64e-4716-b209-f9f1ef46d49a",
- "label" : "Error",
- "regions" : [ {
- "id" : "04daa4a0-4d2d-46f9-bc70-f4ef28375c2d",
- "regionName" : "header",
- "type" : "region"
- }, {
- "components" : [ {
- "componentAttributes" : {
- "richTextValue" : "<div class='slds-grid slds-grid--vertical slds-align--absolute-center slds-container--large'> <div class='slds-align-middle slds-m-bottom--xx-large slds-m-top--xx-large' alt='Page not available'> <img src='/sfsites/c/img/community/slds/messaging/illustration-page-not-found.png' class='slds-p-horizontal--large'/> </div> <h4 class='slds-text-align--center slds-text-heading--large slds-text-color--weak slds-m-bottom--small'>Page not available</h4> <p class='slds-text-align--center slds-text-heading--medium slds-text-color--weak'>Maybe the page was deleted, the URL is incorrect, or something else went wrong. If you know the page exists but you still can鈥檛 get to it, please ask the community administrator for help.</p> </div>"
- },
- "componentName" : "forceCommunity:htmlBlock",
- "id" : "8f1aad62-6fd8-4a0a-bf73-603d03724841",
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "a801a07b-dbc3-4650-9e01-934eabb7a789",
- "regionName" : "content",
- "type" : "region"
- }, {
- "id" : "e59b2192-4edb-4144-8f08-755e9e111518",
- "regionName" : "footer",
- "type" : "region"
- }, {
- "components" : [ {
- "componentAttributes" : {
- "customHeadTags" : "",
- "description" : "",
- "title" : "Error"
- },
- "componentName" : "forceCommunity:seoAssistant",
- "id" : "f322e8e2-b32f-471c-a992-fdb40e009539",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "ac65174b-2219-479b-8ca4-6f679e28f7d4",
- "regionName" : "sfdcHiddenRegion",
- "type" : "region"
- } ],
- "themeLayoutType" : "Inner",
- "type" : "view",
- "viewType" : "error"
-}
\ No newline at end of file
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "f02c5a75-f64e-4716-b209-f9f1ef46d49a",
+ "label": "Error",
+ "regions": [
+ {
+ "id": "04daa4a0-4d2d-46f9-bc70-f4ef28375c2d",
+ "regionName": "header",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "richTextValue": "<div class='slds-grid slds-grid--vertical slds-align--absolute-center slds-container--large'> <div class='slds-align-middle slds-m-bottom--xx-large slds-m-top--xx-large' alt='Page not available'> <img src='/sfsites/c/img/community/slds/messaging/illustration-page-not-found.png' class='slds-p-horizontal--large'/> </div> <h4 class='slds-text-align--center slds-text-heading--large slds-text-color--weak slds-m-bottom--small'>Page not available</h4> <p class='slds-text-align--center slds-text-heading--medium slds-text-color--weak'>Maybe the page was deleted, the URL is incorrect, or something else went wrong. If you know the page exists but you still can鈥檛 get to it, please ask the community administrator for help.</p> </div>"
+ },
+ "componentName": "forceCommunity:htmlBlock",
+ "id": "8f1aad62-6fd8-4a0a-bf73-603d03724841",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "a801a07b-dbc3-4650-9e01-934eabb7a789",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "e59b2192-4edb-4144-8f08-755e9e111518",
+ "regionName": "footer",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "Error"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "f322e8e2-b32f-471c-a992-fdb40e009539",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "ac65174b-2219-479b-8ca4-6f679e28f7d4",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
+ }
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "error"
+}
--
Gitblit v1.9.1