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/accountManagement.json | 278 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 151 insertions(+), 127 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/views/accountManagement.json b/force-app/main/default/experiences/Consumable1/views/accountManagement.json
index f2ab795..0f705c5 100644
--- a/force-app/main/default/experiences/Consumable1/views/accountManagement.json
+++ b/force-app/main/default/experiences/Consumable1/views/accountManagement.json
@@ -1,129 +1,153 @@
{
- "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName" : "siteforce:sldsOneColLayout",
- "dataProviders" : [ ],
- "id" : "198e4bed-7a3a-4a56-a15a-d354e55d5624",
- "label" : "Account Management",
- "regions" : [ {
- "id" : "202c6d5b-0e3e-4ee4-9327-bb9e056f5ccd",
- "regionName" : "header",
- "type" : "region"
- }, {
- "components" : [ {
- "componentAttributes" : {
- "richTextValue" : " <h1 style=\"text-align: center;\"> <b style=\"font-size: 20px; color: #1e2443;\">Account Management</b> </h1> "
- },
- "componentName" : "forceCommunity:richTextInline",
- "id" : "23086da8-7c2e-4db2-9d92-e2cb300415db",
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- }, {
- "componentAttributes" : {
- "tabsetConfig" : {
- "UUID" : "65ec293d-c556-4ebb-a718-1d2091eebe82",
- "activeTab" : "tab1",
- "tabs" : [ {
- "UUID" : "507fb429-2282-49b5-8878-f05f01f9861a",
- "allowGuestUser" : false,
- "locked" : false,
- "seedComponents" : [ {
- "attributes" : {
- "customTitle" : "Members",
- "parentRecordId" : "{!CurrentUser.accountId}",
- "relatedListName" : "Users",
- "showBreadCrumbs" : "false",
- "showCustomTitle" : "true",
- "showManualRefreshButton" : "false",
- "showRowNumbers" : "false"
- },
- "fqn" : "forceCommunity:relatedList"
- } ],
- "tabKey" : "tab1",
- "tabName" : "Members"
- }, {
- "UUID" : "c61e3f16-c77e-49f2-b596-d89451128362",
- "allowGuestUser" : false,
- "locked" : false,
- "seedComponents" : [ {
- "attributes" : {
- "recordId" : "{!CurrentUser.accountId}"
- },
- "fqn" : "forceCommunity:accountBrandRecord"
- } ],
- "tabKey" : "tab2",
- "tabName" : "Branding"
- } ],
- "useOverflowMenu" : false
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "198e4bed-7a3a-4a56-a15a-d354e55d5624",
+ "label": "Account Management",
+ "regions": [
+ {
+ "id": "202c6d5b-0e3e-4ee4-9327-bb9e056f5ccd",
+ "regionName": "header",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "richTextValue": " <h1 style=\"text-align: center;\"> <b style=\"font-size: 20px; color: #1e2443;\">Account Management</b> </h1> "
+ },
+ "componentName": "forceCommunity:richTextInline",
+ "id": "23086da8-7c2e-4db2-9d92-e2cb300415db",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "tabsetConfig": {
+ "UUID": "65ec293d-c556-4ebb-a718-1d2091eebe82",
+ "activeTab": "tab1",
+ "tabs": [
+ {
+ "UUID": "507fb429-2282-49b5-8878-f05f01f9861a",
+ "allowGuestUser": false,
+ "locked": false,
+ "seedComponents": [
+ {
+ "attributes": {
+ "customTitle": "Members",
+ "parentRecordId": "{!CurrentUser.accountId}",
+ "relatedListName": "Users",
+ "showBreadCrumbs": "false",
+ "showCustomTitle": "true",
+ "showManualRefreshButton": "false",
+ "showRowNumbers": "false"
+ },
+ "fqn": "forceCommunity:relatedList"
+ }
+ ],
+ "tabKey": "tab1",
+ "tabName": "Members"
+ },
+ {
+ "UUID": "c61e3f16-c77e-49f2-b596-d89451128362",
+ "allowGuestUser": false,
+ "locked": false,
+ "seedComponents": [
+ {
+ "attributes": {
+ "recordId": "{!CurrentUser.accountId}"
+ },
+ "fqn": "forceCommunity:accountBrandRecord"
+ }
+ ],
+ "tabKey": "tab2",
+ "tabName": "Branding"
+ }
+ ],
+ "useOverflowMenu": false
+ }
+ },
+ "componentName": "forceCommunity:tabset",
+ "id": "65ec293d-c556-4ebb-a718-1d2091eebe82",
+ "regions": [
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "customTitle": "Members",
+ "parentRecordId": "{!CurrentUser.accountId}",
+ "relatedListName": "Users",
+ "showBreadCrumbs": false,
+ "showCustomTitle": true,
+ "showManualRefreshButton": false,
+ "showRowNumbers": false
+ },
+ "componentName": "forceCommunity:relatedList",
+ "id": "1054405a-fda1-450b-a9ec-67e9be3839fb",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "507fb429-2282-49b5-8878-f05f01f9861a",
+ "regionLabel": "Members",
+ "regionName": "tab1",
+ "renditionMap": {},
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "recordId": "{!CurrentUser.accountId}"
+ },
+ "componentName": "forceCommunity:accountBrandRecord",
+ "id": "7b84436c-612b-4042-b9c4-411d9fbe0957",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "c61e3f16-c77e-49f2-b596-d89451128362",
+ "regionLabel": "Branding",
+ "regionName": "tab2",
+ "renditionMap": {},
+ "type": "region"
+ }
+ ],
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "9d9976f8-dd44-4d6f-91c8-06440b957386",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "3583c796-50b6-4943-86ba-e0f908a892d2",
+ "regionName": "footer",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "Account Management"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "e6b1c498-01fb-4b0d-b21f-55bfa86e605b",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "786a718c-93c1-484e-8839-716d2b615d06",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
}
- },
- "componentName" : "forceCommunity:tabset",
- "id" : "65ec293d-c556-4ebb-a718-1d2091eebe82",
- "regions" : [ {
- "components" : [ {
- "componentAttributes" : {
- "customTitle" : "Members",
- "parentRecordId" : "{!CurrentUser.accountId}",
- "relatedListName" : "Users",
- "showBreadCrumbs" : false,
- "showCustomTitle" : true,
- "showManualRefreshButton" : false,
- "showRowNumbers" : false
- },
- "componentName" : "forceCommunity:relatedList",
- "id" : "1054405a-fda1-450b-a9ec-67e9be3839fb",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "507fb429-2282-49b5-8878-f05f01f9861a",
- "regionLabel" : "Members",
- "regionName" : "tab1",
- "renditionMap" : { },
- "type" : "region"
- }, {
- "components" : [ {
- "componentAttributes" : {
- "recordId" : "{!CurrentUser.accountId}"
- },
- "componentName" : "forceCommunity:accountBrandRecord",
- "id" : "7b84436c-612b-4042-b9c4-411d9fbe0957",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "c61e3f16-c77e-49f2-b596-d89451128362",
- "regionLabel" : "Branding",
- "regionName" : "tab2",
- "renditionMap" : { },
- "type" : "region"
- } ],
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "9d9976f8-dd44-4d6f-91c8-06440b957386",
- "regionName" : "content",
- "type" : "region"
- }, {
- "id" : "3583c796-50b6-4943-86ba-e0f908a892d2",
- "regionName" : "footer",
- "type" : "region"
- }, {
- "components" : [ {
- "componentAttributes" : {
- "customHeadTags" : "",
- "description" : "",
- "title" : "Account Management"
- },
- "componentName" : "forceCommunity:seoAssistant",
- "id" : "e6b1c498-01fb-4b0d-b21f-55bfa86e605b",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "786a718c-93c1-484e-8839-716d2b615d06",
- "regionName" : "sfdcHiddenRegion",
- "type" : "region"
- } ],
- "themeLayoutType" : "Inner",
- "type" : "view",
- "viewType" : "account-management"
-}
\ No newline at end of file
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "account-management"
+}
--
Gitblit v1.9.1