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/Consumable_21/views/myAccount.json | 204 +++++++++++++++++++++++++-------------------------
1 files changed, 102 insertions(+), 102 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/views/myAccount.json b/force-app/main/default/experiences/Consumable_21/views/myAccount.json
index e5b12f2..50bdd2f 100644
--- a/force-app/main/default/experiences/Consumable_21/views/myAccount.json
+++ b/force-app/main/default/experiences/Consumable_21/views/myAccount.json
@@ -1,109 +1,109 @@
{
- "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
- "componentName": "siteforce:dynamicLayout",
- "dataProviders": [],
- "id": "aad67d03-498d-4caa-899f-c4876e7361b8",
- "label": "My Account",
- "regions": [
- {
- "id": "0e502abc-a1cf-4bf6-a377-b1d46fc201a7",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
+ "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
+ "componentName": "siteforce:dynamicLayout",
+ "dataProviders": [],
+ "id": "aad67d03-498d-4caa-899f-c4876e7361b8",
+ "label": "My Account",
+ "regions": [
{
- "componentAttributes": {
- "background": "background: rgba(0,0,0,0)",
- "backgroundOverlay": "rgba(0,0,0,0.5)",
- "contentAreaWidth": 100,
- "sectionConfig": {
- "UUID": "d3c93280-e94b-4efb-9f19-54d139ea03a6",
- "columns": [
+ "id": "0e502abc-a1cf-4bf6-a377-b1d46fc201a7",
+ "regionName": "header",
+ "type": "region"
+ },
+ {
+ "components": [
{
- "UUID": "2351fbff-96a6-46bf-8fc8-2bdf71e7fef6",
- "columnKey": "col1",
- "columnName": "column 1",
- "columnWidth": "12",
- "seedComponents": [
- {
- "attributes": {
- "recordId": "{!CurrentUser.accountId}",
- "sfdc:identifier": "forceCommunity_recordHeadline"
- },
- "fqn": "forceCommunity:recordHeadline"
+ "componentAttributes": {
+ "background": "background: rgba(0,0,0,0)",
+ "backgroundOverlay": "rgba(0,0,0,0.5)",
+ "contentAreaWidth": 100,
+ "sectionConfig": {
+ "UUID": "d3c93280-e94b-4efb-9f19-54d139ea03a6",
+ "columns": [
+ {
+ "UUID": "2351fbff-96a6-46bf-8fc8-2bdf71e7fef6",
+ "columnKey": "col1",
+ "columnName": "column 1",
+ "columnWidth": "12",
+ "seedComponents": [
+ {
+ "attributes": {
+ "recordId": "{!CurrentUser.accountId}",
+ "sfdc:identifier": "forceCommunity_recordHeadline"
+ },
+ "fqn": "forceCommunity:recordHeadline"
+ },
+ {
+ "attributes": {
+ "recordId": "{!CurrentUser.accountId}",
+ "sfdc:identifier": "forceCommunity_recordHomeTabs"
+ },
+ "fqn": "forceCommunity:recordHomeTabs"
+ }
+ ]
+ }
+ ]
+ },
+ "sectionHeight": 32
},
- {
- "attributes": {
- "recordId": "{!CurrentUser.accountId}",
- "sfdc:identifier": "forceCommunity_recordHomeTabs"
- },
- "fqn": "forceCommunity:recordHomeTabs"
- }
- ]
+ "componentName": "forceCommunity:section",
+ "id": "d3c93280-e94b-4efb-9f19-54d139ea03a6",
+ "regions": [
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "recordId": "{!CurrentUser.accountId}"
+ },
+ "componentName": "forceCommunity:recordHeadline",
+ "id": "07793973-937e-430c-8acf-859dbbeb8c04",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "detailsTabLabel": "Details",
+ "discussionsTabLabel": "Feed",
+ "recordId": "{!CurrentUser.accountId}",
+ "relatedTabLabel": "Related",
+ "showLegacyActivityComposer": false,
+ "tab1Type": "details",
+ "tab2Type": "related",
+ "tab3Type": "chatter",
+ "tab4Type": "none",
+ "timelineTabLabel": "Activity"
+ },
+ "componentName": "forceCommunity:recordHomeTabs",
+ "id": "b88fcbd7-d143-43eb-800b-81b98e424c6f",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "2351fbff-96a6-46bf-8fc8-2bdf71e7fef6",
+ "regionLabel": "column 1",
+ "regionName": "col1",
+ "renditionMap": {},
+ "type": "region"
+ }
+ ],
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
}
- ]
- },
- "sectionHeight": 32
- },
- "componentName": "forceCommunity:section",
- "id": "d3c93280-e94b-4efb-9f19-54d139ea03a6",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "recordId": "{!CurrentUser.accountId}"
- },
- "componentName": "forceCommunity:recordHeadline",
- "id": "07793973-937e-430c-8acf-859dbbeb8c04",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- },
- {
- "componentAttributes": {
- "detailsTabLabel": "Details",
- "discussionsTabLabel": "Feed",
- "recordId": "{!CurrentUser.accountId}",
- "relatedTabLabel": "Related",
- "showLegacyActivityComposer": false,
- "tab1Type": "details",
- "tab2Type": "related",
- "tab3Type": "chatter",
- "tab4Type": "none",
- "timelineTabLabel": "Activity"
- },
- "componentName": "forceCommunity:recordHomeTabs",
- "id": "b88fcbd7-d143-43eb-800b-81b98e424c6f",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "2351fbff-96a6-46bf-8fc8-2bdf71e7fef6",
- "regionLabel": "column 1",
- "regionName": "col1",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ ],
+ "id": "ffaa45b5-953e-49f2-8b6a-a8580f8e1a20",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "e0f9bc9b-14dc-41d3-b619-1f5b27c8ee34",
+ "regionName": "footer",
+ "type": "region"
}
- ],
- "id": "ffaa45b5-953e-49f2-8b6a-a8580f8e1a20",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "e0f9bc9b-14dc-41d3-b619-1f5b27c8ee34",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "my-account"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "my-account"
}
--
Gitblit v1.9.1