fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 force-app/main/default/experiences/Consumable1/views/login.json

@@ -1,65 +1,74 @@
{
  "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
  "componentName" : "siteforce:sldsOneColLayout",
  "dataProviders" : [ ],
  "id" : "7c2dd152-d6d3-4652-bbfe-cb8e11d83c43",
  "label" : "Login",
  "regions" : [ {
    "components" : [ {
      "componentAttributes" : { },
      "componentName" : "salesforceIdentity:communityLogo2",
      "id" : "a96beff8-2727-4f74-b08a-e908ab6e72be",
      "renderPriority" : "NEUTRAL",
      "renditionMap" : { },
      "type" : "component"
    }, {
      "componentAttributes" : {
        "forgotPasswordLabel" : "忘记密码？",
        "forgotPasswordUrl" : "/ForgotPassword",
        "loginButtonLabel" : "登录",
        "passwordLabel" : "密码",
        "selfRegisterLabel" : "Not a member?",
        "selfRegisterUrl" : "/SelfRegister",
        "startUrl" : "",
        "usernameLabel" : "用户名"
      },
      "componentName" : "salesforceIdentity:loginForm2",
      "id" : "2de8135d-cb57-4614-9afe-2453f1cbe676",
      "renderPriority" : "NEUTRAL",
      "renditionMap" : { },
      "type" : "component"
    }, {
      "componentAttributes" : {
        "headerText" : "",
        "showHeader" : false,
        "useCommunityDomainSso" : true
      },
      "componentName" : "salesforceIdentity:socialLogin2",
      "id" : "f4d72a64-5e5f-48d8-8bb7-4253a8309b40",
      "renderPriority" : "NEUTRAL",
      "renditionMap" : { },
      "type" : "component"
    } ],
    "id" : "11b4798e-fa84-4594-beea-500d991e23f2",
    "regionName" : "content",
    "type" : "region"
  }, {
    "components" : [ {
      "componentAttributes" : {
        "customHeadTags" : "",
        "description" : "",
        "title" : "Login"
      },
      "componentName" : "forceCommunity:seoAssistant",
      "id" : "c72bcc7d-29ea-40e6-969c-c818f267f8f4",
      "renditionMap" : { },
      "type" : "component"
    } ],
    "id" : "02d41dc1-9a37-47cf-90c8-438d40bba670",
    "regionName" : "sfdcHiddenRegion",
    "type" : "region"
  } ],
  "themeLayoutType" : "Login",
  "type" : "view",
  "viewType" : "login-home"
}
    "appPageId": "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
    "componentName": "siteforce:sldsOneColLayout",
    "dataProviders": [],
    "id": "7c2dd152-d6d3-4652-bbfe-cb8e11d83c43",
    "label": "Login",
    "regions": [
        {
            "components": [
                {
                    "componentAttributes": {},
                    "componentName": "salesforceIdentity:communityLogo2",
                    "id": "a96beff8-2727-4f74-b08a-e908ab6e72be",
                    "renderPriority": "NEUTRAL",
                    "renditionMap": {},
                    "type": "component"
                },
                {
                    "componentAttributes": {
                        "forgotPasswordLabel": "忘记密码？",
                        "forgotPasswordUrl": "/ForgotPassword",
                        "loginButtonLabel": "登录",
                        "passwordLabel": "密码",
                        "selfRegisterLabel": "Not a member?",
                        "selfRegisterUrl": "/SelfRegister",
                        "startUrl": "",
                        "usernameLabel": "用户名"
                    },
                    "componentName": "salesforceIdentity:loginForm2",
                    "id": "2de8135d-cb57-4614-9afe-2453f1cbe676",
                    "renderPriority": "NEUTRAL",
                    "renditionMap": {},
                    "type": "component"
                },
                {
                    "componentAttributes": {
                        "headerText": "",
                        "showHeader": false,
                        "useCommunityDomainSso": true
                    },
                    "componentName": "salesforceIdentity:socialLogin2",
                    "id": "f4d72a64-5e5f-48d8-8bb7-4253a8309b40",
                    "renderPriority": "NEUTRAL",
                    "renditionMap": {},
                    "type": "component"
                }
            ],
            "id": "11b4798e-fa84-4594-beea-500d991e23f2",
            "regionName": "content",
            "type": "region"
        },
        {
            "components": [
                {
                    "componentAttributes": {
                        "customHeadTags": "",
                        "description": "",
                        "title": "Login"
                    },
                    "componentName": "forceCommunity:seoAssistant",
                    "id": "c72bcc7d-29ea-40e6-969c-c818f267f8f4",
                    "renditionMap": {},
                    "type": "component"
                }
            ],
            "id": "02d41dc1-9a37-47cf-90c8-438d40bba670",
            "regionName": "sfdcHiddenRegion",
            "type": "region"
        }
    ],
    "themeLayoutType": "Login",
    "type": "view",
    "viewType": "login-home"
}