From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/experiences/Consumable1/views/homeFlexible.json | 185 +++++++++++++++++++++++++---------------------
1 files changed, 100 insertions(+), 85 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/views/homeFlexible.json b/force-app/main/default/experiences/Consumable1/views/homeFlexible.json
index 6cfc7e9..ad3378f 100644
--- a/force-app/main/default/experiences/Consumable1/views/homeFlexible.json
+++ b/force-app/main/default/experiences/Consumable1/views/homeFlexible.json
@@ -1,87 +1,102 @@
{
- "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName" : "siteforce:dynamicLayout",
- "dataProviders" : [ ],
- "id" : "0b3166bc-2eec-43fa-8adf-532f629e9392",
- "label" : "Home_Flexible",
- "regions" : [ {
- "components" : [ {
- "componentAttributes" : {
- "background" : "background: rgba(0,0,0,0)",
- "backgroundOverlay" : "rgba(0,0,0,0.5)",
- "contentAreaWidth" : 100,
- "sectionConfig" : {
- "UUID" : "8ae08b67-88c4-492b-98a8-924b20bb1544",
- "columns" : [ {
- "UUID" : "10b668a2-336e-4764-b5b8-303f9939b7e3",
- "columnKey" : "1",
- "columnName" : "Column 1",
- "columnWidth" : "12",
- "seedComponents" : [ ]
- } ]
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName": "siteforce:dynamicLayout",
+ "dataProviders": [],
+ "id": "0b3166bc-2eec-43fa-8adf-532f629e9392",
+ "label": "Home_Flexible",
+ "regions": [
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "background": "background: rgba(0,0,0,0)",
+ "backgroundOverlay": "rgba(0,0,0,0.5)",
+ "contentAreaWidth": 100,
+ "sectionConfig": {
+ "UUID": "8ae08b67-88c4-492b-98a8-924b20bb1544",
+ "columns": [
+ {
+ "UUID": "10b668a2-336e-4764-b5b8-303f9939b7e3",
+ "columnKey": "1",
+ "columnName": "Column 1",
+ "columnWidth": "12",
+ "seedComponents": []
+ }
+ ]
+ },
+ "sectionHeight": 300
+ },
+ "componentName": "forceCommunity:section",
+ "id": "8ae08b67-88c4-492b-98a8-924b20bb1544",
+ "regions": [
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "richTextValue": "<p style=\"text-align: center;\"><span style=\"color: rgb(0, 71, 178); font-family: sans-serif; font-size: 48px;\">娆㈣繋鐧诲綍娑堣�楀搧杩芥函绯荤粺</span></p>"
+ },
+ "componentName": "forceCommunity:richTextInline",
+ "id": "d14e9b8c-a3d9-40cb-8ad0-5161fe285a74",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {},
+ "componentName": "c:lexLicenceReminder",
+ "id": "e0232bc3-f6c4-4671-b26e-160b3d73a0a4",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "height": "800",
+ "recordId": "01Z6D000000EyGYUA0"
+ },
+ "componentName": "forceCommunity:dashboard",
+ "id": "e0024c07-3f6e-4822-9079-47ad41f4c3a8",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "10b668a2-336e-4764-b5b8-303f9939b7e3",
+ "regionLabel": "Column 1",
+ "regionName": "1",
+ "renditionMap": {},
+ "type": "region"
+ }
+ ],
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "1bac6fb4-0163-4896-8cd7-85b1f34df29f",
+ "regionName": "content",
+ "type": "region"
},
- "sectionHeight" : 300
- },
- "componentName" : "forceCommunity:section",
- "id" : "8ae08b67-88c4-492b-98a8-924b20bb1544",
- "regions" : [ {
- "components" : [ {
- "componentAttributes" : {
- "richTextValue" : "<p style=\"text-align: center;\"><span style=\"font-size: 48px; font-family: sans-serif; color: rgb(0, 71, 178);\">娆㈣繋鐧诲綍娑堣�楀搧杩芥函绯荤粺</span></p>"
- },
- "componentName" : "forceCommunity:richTextInline",
- "id" : "d14e9b8c-a3d9-40cb-8ad0-5161fe285a74",
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- }, {
- "componentAttributes" : { },
- "componentName" : "c:lexLicenceReminder",
- "id" : "e0232bc3-f6c4-4671-b26e-160b3d73a0a4",
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- }, {
- "componentAttributes" : {
- "height" : "800",
- "recordId" : "01Z6D000000EyGYUA0"
- },
- "componentName" : "forceCommunity:dashboard",
- "id" : "e0024c07-3f6e-4822-9079-47ad41f4c3a8",
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "10b668a2-336e-4764-b5b8-303f9939b7e3",
- "regionLabel" : "Column 1",
- "regionName" : "1",
- "renditionMap" : { },
- "type" : "region"
- } ],
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "1bac6fb4-0163-4896-8cd7-85b1f34df29f",
- "regionName" : "content",
- "type" : "region"
- }, {
- "components" : [ {
- "componentAttributes" : {
- "customHeadTags" : "",
- "description" : "",
- "title" : "娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName" : "forceCommunity:seoAssistant",
- "id" : "84e91754-c40d-4c64-a0e4-9bfae8320536",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "1c72742c-4f76-41b6-b8f2-7582c4245d05",
- "regionName" : "sfdcHiddenRegion",
- "type" : "region"
- } ],
- "themeLayoutType" : "Inner",
- "type" : "view",
- "viewType" : "home"
-}
\ No newline at end of file
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "84e91754-c40d-4c64-a0e4-9bfae8320536",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "1c72742c-4f76-41b6-b8f2-7582c4245d05",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
+ }
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "home"
+}
--
Gitblit v1.9.1