fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 force-app/main/default/experiences/Consumable_21/views/ÏûºÄÆ·¶©µ¥Detail.json

@@ -1,76 +1,76 @@
{
  "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "1691b1e6-3801-4345-8e26-61efe24a1221",
  "label": "消耗品订单 Detail",
  "regions": [
    {
      "id": "4dfafba4-ebb9-421b-84d5-1dd47087b3d6",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
    "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
    "componentName": "siteforce:sldsOneColLayout",
    "dataProviders": [],
    "id": "1691b1e6-3801-4345-8e26-61efe24a1221",
    "label": "消耗品订单 Detail",
    "regions": [
        {
          "componentAttributes": {
            "recordId": "{!recordId}"
          },
          "componentName": "forceCommunity:recordHeadline",
          "id": "9a16b291-bb52-4fbe-82bd-afb0596a71a1",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
            "id": "4dfafba4-ebb9-421b-84d5-1dd47087b3d6",
            "regionName": "header",
            "type": "region"
        },
        {
          "componentAttributes": {
            "detailsTabLabel": "Details",
            "discussionsTabLabel": "Feed",
            "recordId": "{!recordId}",
            "relatedTabLabel": "Related",
            "showLegacyActivityComposer": false,
            "tab1Type": "details",
            "tab2Type": "related",
            "tab3Type": "chatter",
            "tab4Type": "none",
            "timelineTabLabel": "Activity"
          },
          "componentName": "forceCommunity:recordHomeTabs",
          "id": "c9ce8c2d-a67f-49b7-b5b7-10eda3f11221",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "e9ba4418-9650-4cbb-95c8-48d950f36b96",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "edc5392e-c836-4e2e-876b-ddadb2938087",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
            "components": [
                {
                    "componentAttributes": {
                        "recordId": "{!recordId}"
                    },
                    "componentName": "forceCommunity:recordHeadline",
                    "id": "9a16b291-bb52-4fbe-82bd-afb0596a71a1",
                    "renderPriority": "NEUTRAL",
                    "renditionMap": {},
                    "type": "component"
                },
                {
                    "componentAttributes": {
                        "detailsTabLabel": "Details",
                        "discussionsTabLabel": "Feed",
                        "recordId": "{!recordId}",
                        "relatedTabLabel": "Related",
                        "showLegacyActivityComposer": false,
                        "tab1Type": "details",
                        "tab2Type": "related",
                        "tab3Type": "chatter",
                        "tab4Type": "none",
                        "timelineTabLabel": "Activity"
                    },
                    "componentName": "forceCommunity:recordHomeTabs",
                    "id": "c9ce8c2d-a67f-49b7-b5b7-10eda3f11221",
                    "renderPriority": "NEUTRAL",
                    "renditionMap": {},
                    "type": "component"
                }
            ],
            "id": "e9ba4418-9650-4cbb-95c8-48d950f36b96",
            "regionName": "content",
            "type": "region"
        },
        {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "{!Record._Object}: {!Record._Title}"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "af55a81d-0722-4809-9ebc-fe919fafc20d",
          "renditionMap": {},
          "type": "component"
            "id": "edc5392e-c836-4e2e-876b-ddadb2938087",
            "regionName": "footer",
            "type": "region"
        },
        {
            "components": [
                {
                    "componentAttributes": {
                        "customHeadTags": "",
                        "description": "",
                        "title": "{!Record._Object}: {!Record._Title}"
                    },
                    "componentName": "forceCommunity:seoAssistant",
                    "id": "af55a81d-0722-4809-9ebc-fe919fafc20d",
                    "renditionMap": {},
                    "type": "component"
                }
            ],
            "id": "c5d8d626-e408-4614-98ba-c5d7f05b4dc5",
            "regionName": "sfdcHiddenRegion",
            "type": "region"
        }
      ],
      "id": "c5d8d626-e408-4614-98ba-c5d7f05b4dc5",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "detail-a2K"
    ],
    "themeLayoutType": "Inner",
    "type": "view",
    "viewType": "detail-a2K"
}