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/campaignList.json | 274 +++++++++++++++++++++++++++++-------------------------
1 files changed, 148 insertions(+), 126 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/views/campaignList.json b/force-app/main/default/experiences/Consumable1/views/campaignList.json
index 1427787..6c1b500 100644
--- a/force-app/main/default/experiences/Consumable1/views/campaignList.json
+++ b/force-app/main/default/experiences/Consumable1/views/campaignList.json
@@ -1,128 +1,150 @@
{
- "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName" : "siteforce:sldsOneColLayout",
- "dataProviders" : [ ],
- "id" : "f83414cc-cd96-4d24-94d6-1d6fdad65b83",
- "label" : "Campaign List",
- "regions" : [ {
- "id" : "8cd141df-47bb-44e7-88e8-d6cf2dcb60e0",
- "regionName" : "header",
- "type" : "region"
- }, {
- "components" : [ {
- "componentAttributes" : {
- "tabsetConfig" : {
- "UUID" : "8eb696d0-116a-43bd-aacf-3dcb9d42f82a",
- "activeTab" : "tab1",
- "tabs" : [ {
- "UUID" : "295af927-269e-4ae3-89c6-1065c44b9479",
- "allowGuestUser" : true,
- "locked" : false,
- "seedComponents" : [ {
- "attributes" : {
- "richTextValue" : " <p><br/></p> <p style="text-align:left;"> Use these campaigns to generate leads and grow your business </p> "
- },
- "fqn" : "forceCommunity:richTextInline"
- }, {
- "attributes" : { },
- "fqn" : "forceCommunity:campaignTileList"
- } ],
- "tabKey" : "tab1",
- "tabName" : "Campaign Marketplace"
- }, {
- "UUID" : "41da809c-e1f0-44f4-b742-c33cfecac7ff",
- "allowGuestUser" : true,
- "locked" : false,
- "seedComponents" : [ {
- "attributes" : {
- "filterName" : "Recent",
- "scope" : "Campaign"
- },
- "fqn" : "forceCommunity:objectHome"
- } ],
- "tabKey" : "tab2",
- "tabName" : "All Campaigns"
- } ],
- "useOverflowMenu" : false
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "f83414cc-cd96-4d24-94d6-1d6fdad65b83",
+ "label": "Campaign List",
+ "regions": [
+ {
+ "id": "8cd141df-47bb-44e7-88e8-d6cf2dcb60e0",
+ "regionName": "header",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "tabsetConfig": {
+ "UUID": "8eb696d0-116a-43bd-aacf-3dcb9d42f82a",
+ "activeTab": "tab1",
+ "tabs": [
+ {
+ "UUID": "295af927-269e-4ae3-89c6-1065c44b9479",
+ "allowGuestUser": true,
+ "locked": false,
+ "seedComponents": [
+ {
+ "attributes": {
+ "richTextValue": " <p><br/></p> <p style="text-align:left;"> Use these campaigns to generate leads and grow your business </p> "
+ },
+ "fqn": "forceCommunity:richTextInline"
+ },
+ {
+ "attributes": {},
+ "fqn": "forceCommunity:campaignTileList"
+ }
+ ],
+ "tabKey": "tab1",
+ "tabName": "Campaign Marketplace"
+ },
+ {
+ "UUID": "41da809c-e1f0-44f4-b742-c33cfecac7ff",
+ "allowGuestUser": true,
+ "locked": false,
+ "seedComponents": [
+ {
+ "attributes": {
+ "filterName": "Recent",
+ "scope": "Campaign"
+ },
+ "fqn": "forceCommunity:objectHome"
+ }
+ ],
+ "tabKey": "tab2",
+ "tabName": "All Campaigns"
+ }
+ ],
+ "useOverflowMenu": false
+ }
+ },
+ "componentName": "forceCommunity:tabset",
+ "id": "8eb696d0-116a-43bd-aacf-3dcb9d42f82a",
+ "regions": [
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "richTextValue": " <p><br/></p> <p style="text-align:left;"> Use these campaigns to generate leads and grow your business </p> "
+ },
+ "componentName": "forceCommunity:richTextInline",
+ "id": "ffe2df03-ba7f-4a7f-a8a2-c3e393c9cfaa",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "bodyField": "Description",
+ "categoryField": "__",
+ "dataFieldsConfig": "",
+ "highlight": "__",
+ "highlightColor": "#007DB8",
+ "listLabel": "",
+ "listViewName": "GIRctiveCampaignsR",
+ "showImage": true,
+ "sortBy": "Num__c",
+ "sortOrder": "Ascending",
+ "titleField": "Name"
+ },
+ "componentName": "forceCommunity:campaignTileList",
+ "id": "b697c485-7d58-4403-a0ca-3ad0490ca174",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "295af927-269e-4ae3-89c6-1065c44b9479",
+ "regionLabel": "Campaign Marketplace",
+ "regionName": "tab1",
+ "renditionMap": {},
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "enableInlineEdit": true,
+ "filterName": "Recent",
+ "layout": "FULL",
+ "pageSize": 25,
+ "scope": "Campaign",
+ "showActionBar": true,
+ "showChartsPanel": true,
+ "showDisplay": "showall",
+ "showFilterPanel": true,
+ "showImageIcon": true,
+ "showManualRefreshButton": true,
+ "showObjectName": true,
+ "showPinnedList": true,
+ "showSearchBar": true
+ },
+ "componentName": "forceCommunity:objectHome",
+ "id": "468384df-73f0-459b-8b3b-99cb260ace82",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "41da809c-e1f0-44f4-b742-c33cfecac7ff",
+ "regionLabel": "All Campaigns",
+ "regionName": "tab2",
+ "renditionMap": {},
+ "type": "region"
+ }
+ ],
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "f05e4448-347d-4264-ba99-7d8afeb75c23",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "7627cbac-8224-4c40-ac93-186f3a47f991",
+ "regionName": "footer",
+ "type": "region"
}
- },
- "componentName" : "forceCommunity:tabset",
- "id" : "8eb696d0-116a-43bd-aacf-3dcb9d42f82a",
- "regions" : [ {
- "components" : [ {
- "componentAttributes" : {
- "richTextValue" : " <p><br/></p> <p style="text-align:left;"> Use these campaigns to generate leads and grow your business </p> "
- },
- "componentName" : "forceCommunity:richTextInline",
- "id" : "ffe2df03-ba7f-4a7f-a8a2-c3e393c9cfaa",
- "renditionMap" : { },
- "type" : "component"
- }, {
- "componentAttributes" : {
- "bodyField" : "Description",
- "categoryField" : "__",
- "dataFieldsConfig" : "",
- "highlight" : "__",
- "highlightColor" : "#007DB8",
- "listLabel" : "",
- "listViewName" : "GIRctiveCampaignsR",
- "showImage" : true,
- "sortBy" : "Num__c",
- "sortOrder" : "Ascending",
- "titleField" : "Name"
- },
- "componentName" : "forceCommunity:campaignTileList",
- "id" : "b697c485-7d58-4403-a0ca-3ad0490ca174",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "295af927-269e-4ae3-89c6-1065c44b9479",
- "regionLabel" : "Campaign Marketplace",
- "regionName" : "tab1",
- "renditionMap" : { },
- "type" : "region"
- }, {
- "components" : [ {
- "componentAttributes" : {
- "enableInlineEdit" : true,
- "filterName" : "Recent",
- "layout" : "FULL",
- "pageSize" : 25,
- "scope" : "Campaign",
- "showActionBar" : true,
- "showChartsPanel" : true,
- "showDisplay" : "showall",
- "showFilterPanel" : true,
- "showImageIcon" : true,
- "showManualRefreshButton" : true,
- "showObjectName" : true,
- "showPinnedList" : true,
- "showSearchBar" : true
- },
- "componentName" : "forceCommunity:objectHome",
- "id" : "468384df-73f0-459b-8b3b-99cb260ace82",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "41da809c-e1f0-44f4-b742-c33cfecac7ff",
- "regionLabel" : "All Campaigns",
- "regionName" : "tab2",
- "renditionMap" : { },
- "type" : "region"
- } ],
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "f05e4448-347d-4264-ba99-7d8afeb75c23",
- "regionName" : "content",
- "type" : "region"
- }, {
- "id" : "7627cbac-8224-4c40-ac93-186f3a47f991",
- "regionName" : "footer",
- "type" : "region"
- } ],
- "themeLayoutType" : "Inner",
- "type" : "view",
- "viewType" : "list-701"
-}
\ No newline at end of file
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "list-701"
+}
--
Gitblit v1.9.1