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/mDFAndCoop.json | 376 ++++++++++++++++++++++++++--------------------------
1 files changed, 188 insertions(+), 188 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/views/mDFAndCoop.json b/force-app/main/default/experiences/Consumable_21/views/mDFAndCoop.json
index 83301aa..103d4f9 100644
--- a/force-app/main/default/experiences/Consumable_21/views/mDFAndCoop.json
+++ b/force-app/main/default/experiences/Consumable_21/views/mDFAndCoop.json
@@ -1,198 +1,198 @@
{
- "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "8cdc8a97-c168-4bdf-ad37-0b57212fe2d1",
- "label": "MDF and Coop",
- "regions": [
- {
- "id": "c39df155-40cb-4525-8bd2-cb09ec4454f5",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
+ "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "8cdc8a97-c168-4bdf-ad37-0b57212fe2d1",
+ "label": "MDF and Coop",
+ "regions": [
{
- "componentAttributes": {
- "richTextValue": " <p> <span style=\"font-size: 20px;\">Request and Manage your Market Developments Funds.</span> </p> "
- },
- "componentName": "forceCommunity:richTextInline",
- "id": "9eb0bf5e-180c-4b73-85c2-f399a0b4d029",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "id": "c39df155-40cb-4525-8bd2-cb09ec4454f5",
+ "regionName": "header",
+ "type": "region"
},
{
- "componentAttributes": {
- "tabsetConfig": {
- "UUID": "cb082463-749a-4434-940f-d2bb4d9c7895",
- "activeTab": "tab1",
- "tabs": [
+ "components": [
{
- "UUID": "2a0a312e-5eb7-47d9-a335-0a8060cee89b",
- "allowGuestUser": false,
- "locked": false,
- "seedComponents": [
- {
- "attributes": {
- "filterName": "Recent",
- "scope": "PartnerFundAllocation"
- },
- "fqn": "forceCommunity:objectHome"
- }
- ],
- "tabKey": "tab1",
- "tabName": "Fund Allocations"
+ "componentAttributes": {
+ "richTextValue": " <p> <span style=\"font-size: 20px;\">Request and Manage your Market Developments Funds.</span> </p> "
+ },
+ "componentName": "forceCommunity:richTextInline",
+ "id": "9eb0bf5e-180c-4b73-85c2-f399a0b4d029",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
},
{
- "UUID": "77abe2ef-9eea-467a-afd7-169ddefc094d",
- "allowGuestUser": false,
- "locked": false,
- "seedComponents": [
- {
- "attributes": {
- "filterName": "Recent",
- "scope": "PartnerFundRequest"
- },
- "fqn": "forceCommunity:objectHome"
- }
- ],
- "tabKey": "tab2",
- "tabName": "Fund Requests"
- },
- {
- "UUID": "bdf6af67-9a69-4a20-a1dc-00e6dc9062c8",
- "allowGuestUser": false,
- "locked": false,
- "seedComponents": [
- {
- "attributes": {
- "filterName": "Recent",
- "scope": "PartnerFundClaim"
- },
- "fqn": "forceCommunity:objectHome"
- }
- ],
- "tabKey": "tab3",
- "tabName": "Fund Claims"
+ "componentAttributes": {
+ "tabsetConfig": {
+ "UUID": "cb082463-749a-4434-940f-d2bb4d9c7895",
+ "activeTab": "tab1",
+ "tabs": [
+ {
+ "UUID": "2a0a312e-5eb7-47d9-a335-0a8060cee89b",
+ "allowGuestUser": false,
+ "locked": false,
+ "seedComponents": [
+ {
+ "attributes": {
+ "filterName": "Recent",
+ "scope": "PartnerFundAllocation"
+ },
+ "fqn": "forceCommunity:objectHome"
+ }
+ ],
+ "tabKey": "tab1",
+ "tabName": "Fund Allocations"
+ },
+ {
+ "UUID": "77abe2ef-9eea-467a-afd7-169ddefc094d",
+ "allowGuestUser": false,
+ "locked": false,
+ "seedComponents": [
+ {
+ "attributes": {
+ "filterName": "Recent",
+ "scope": "PartnerFundRequest"
+ },
+ "fqn": "forceCommunity:objectHome"
+ }
+ ],
+ "tabKey": "tab2",
+ "tabName": "Fund Requests"
+ },
+ {
+ "UUID": "bdf6af67-9a69-4a20-a1dc-00e6dc9062c8",
+ "allowGuestUser": false,
+ "locked": false,
+ "seedComponents": [
+ {
+ "attributes": {
+ "filterName": "Recent",
+ "scope": "PartnerFundClaim"
+ },
+ "fqn": "forceCommunity:objectHome"
+ }
+ ],
+ "tabKey": "tab3",
+ "tabName": "Fund Claims"
+ }
+ ],
+ "useOverflowMenu": false
+ }
+ },
+ "componentName": "forceCommunity:tabset",
+ "id": "cb082463-749a-4434-940f-d2bb4d9c7895",
+ "regions": [
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "enableInlineEdit": true,
+ "filterName": "Recent",
+ "layout": "FULL",
+ "pageSize": 25,
+ "scope": "PartnerFundAllocation",
+ "showActionBar": true,
+ "showChartsPanel": true,
+ "showDisplay": "showall",
+ "showFilterPanel": true,
+ "showImageIcon": true,
+ "showManualRefreshButton": true,
+ "showObjectName": true,
+ "showPinnedList": true,
+ "showSearchBar": true
+ },
+ "componentName": "forceCommunity:objectHome",
+ "id": "00e0b085-2e87-4a1b-ab91-45db0bf14162",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "2a0a312e-5eb7-47d9-a335-0a8060cee89b",
+ "regionLabel": "Fund Allocations",
+ "regionName": "tab1",
+ "renditionMap": {},
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "enableInlineEdit": true,
+ "filterName": "Recent",
+ "layout": "FULL",
+ "pageSize": 25,
+ "scope": "PartnerFundRequest",
+ "showActionBar": true,
+ "showChartsPanel": true,
+ "showDisplay": "showall",
+ "showFilterPanel": true,
+ "showImageIcon": true,
+ "showManualRefreshButton": true,
+ "showObjectName": true,
+ "showPinnedList": true,
+ "showSearchBar": true
+ },
+ "componentName": "forceCommunity:objectHome",
+ "id": "4a64756b-bbe6-42aa-8716-493fcb035c2a",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "77abe2ef-9eea-467a-afd7-169ddefc094d",
+ "regionLabel": "Fund Requests",
+ "regionName": "tab2",
+ "renditionMap": {},
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "enableInlineEdit": true,
+ "filterName": "Recent",
+ "layout": "FULL",
+ "pageSize": 25,
+ "scope": "PartnerFundClaim",
+ "showActionBar": true,
+ "showChartsPanel": true,
+ "showDisplay": "showall",
+ "showFilterPanel": true,
+ "showImageIcon": true,
+ "showManualRefreshButton": true,
+ "showObjectName": true,
+ "showPinnedList": true,
+ "showSearchBar": true
+ },
+ "componentName": "forceCommunity:objectHome",
+ "id": "86ebb406-d33d-44b0-a137-7d007d88fa08",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "bdf6af67-9a69-4a20-a1dc-00e6dc9062c8",
+ "regionLabel": "Fund Claims",
+ "regionName": "tab3",
+ "renditionMap": {},
+ "type": "region"
+ }
+ ],
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
}
- ],
- "useOverflowMenu": false
- }
- },
- "componentName": "forceCommunity:tabset",
- "id": "cb082463-749a-4434-940f-d2bb4d9c7895",
- "regions": [
- {
- "components": [
- {
- "componentAttributes": {
- "enableInlineEdit": true,
- "filterName": "Recent",
- "layout": "FULL",
- "pageSize": 25,
- "scope": "PartnerFundAllocation",
- "showActionBar": true,
- "showChartsPanel": true,
- "showDisplay": "showall",
- "showFilterPanel": true,
- "showImageIcon": true,
- "showManualRefreshButton": true,
- "showObjectName": true,
- "showPinnedList": true,
- "showSearchBar": true
- },
- "componentName": "forceCommunity:objectHome",
- "id": "00e0b085-2e87-4a1b-ab91-45db0bf14162",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "2a0a312e-5eb7-47d9-a335-0a8060cee89b",
- "regionLabel": "Fund Allocations",
- "regionName": "tab1",
- "renditionMap": {},
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "enableInlineEdit": true,
- "filterName": "Recent",
- "layout": "FULL",
- "pageSize": 25,
- "scope": "PartnerFundRequest",
- "showActionBar": true,
- "showChartsPanel": true,
- "showDisplay": "showall",
- "showFilterPanel": true,
- "showImageIcon": true,
- "showManualRefreshButton": true,
- "showObjectName": true,
- "showPinnedList": true,
- "showSearchBar": true
- },
- "componentName": "forceCommunity:objectHome",
- "id": "4a64756b-bbe6-42aa-8716-493fcb035c2a",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "77abe2ef-9eea-467a-afd7-169ddefc094d",
- "regionLabel": "Fund Requests",
- "regionName": "tab2",
- "renditionMap": {},
- "type": "region"
- },
- {
- "components": [
- {
- "componentAttributes": {
- "enableInlineEdit": true,
- "filterName": "Recent",
- "layout": "FULL",
- "pageSize": 25,
- "scope": "PartnerFundClaim",
- "showActionBar": true,
- "showChartsPanel": true,
- "showDisplay": "showall",
- "showFilterPanel": true,
- "showImageIcon": true,
- "showManualRefreshButton": true,
- "showObjectName": true,
- "showPinnedList": true,
- "showSearchBar": true
- },
- "componentName": "forceCommunity:objectHome",
- "id": "86ebb406-d33d-44b0-a137-7d007d88fa08",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "bdf6af67-9a69-4a20-a1dc-00e6dc9062c8",
- "regionLabel": "Fund Claims",
- "regionName": "tab3",
- "renditionMap": {},
- "type": "region"
- }
- ],
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ ],
+ "id": "dc60e26e-8f85-40dc-88b1-1afdeef90994",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "32d8dbea-0b80-4fa3-bbde-7c9b77ebc1f4",
+ "regionName": "footer",
+ "type": "region"
}
- ],
- "id": "dc60e26e-8f85-40dc-88b1-1afdeef90994",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "32d8dbea-0b80-4fa3-bbde-7c9b77ebc1f4",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "mdf"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "mdf"
}
--
Gitblit v1.9.1