Commit4f80cae

authored

Merge pull requestlowcoder-org#741 from lowcoder-org/dev

Differentiate App URL Locations

2 parents92f3786 +617365e commit4f80caeCopy full SHA for 4f80cae

File tree

-8

lines changed

-8

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -20,6 +20,7 @@ export const PERMISSION_SETTING_DETAIL = `${PERMISSION_SETTING}/:groupId`;
`20`	`20`	exportconstORGANIZATION_SETTING_DETAIL=`${ORGANIZATION_SETTING}/:orgId`;
`21`	`21`
`22`	`22`	`exportconstALL_APPLICATIONS_URL="/apps";`
	`23`	+exportconstAPPLICATION_MARKETPLACE_URL=`https://app.lowcoder.cloud/apps`;
`23`	`24`	`exportconstMODULE_APPLICATIONS_URL="/apps/module";`
`24`	`25`	exportconstMARKETPLACE_URL=`/marketplace`;
`25`	`26`	exportconstDATASOURCE_URL=`/datasource`;
@@ -48,6 +49,9 @@ export const MARKETPLACE_TYPE_URL = `${MARKETPLACE_URL}/:marketplaceType`;
`48`	`49`	`exportconstAPPLICATION_VIEW_URL=(appId:string,viewMode:AppViewMode)=>`
`49`	`50`	`${ALL_APPLICATIONS_URL}/${appId}/${viewMode}`;
`50`	`51`
	`52`	`+exportconstAPPLICATION_MARKETPLACE_VIEW_URL=(appId:string,viewMode:AppViewMode)=>`
	`53`	+`${APPLICATION_MARKETPLACE_URL}/${appId}/${viewMode}`;
	`54`	`+`
`51`	`55`	`exportconstMARKETPLACE_URL_BY_TYPE=(type:MarketplaceType)=>`
`52`	`56`	`${MARKETPLACE_URL}/${type}`;
`53`	`57`

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -164,12 +164,8 @@ export function MarketplaceResCard(props: { res: HomeRes; }) {`
`164`	`164`	`)}`
`165`	`165`	`<CardInfo`
`166`	`166`	`onClick={(e)=>{`
`167`		`-if(checkIsMobile(window.innerWidth)){`
`168`		`-history.push(APPLICATION_VIEW_URL(res.id,"view"));`
`169`		`-return;`
`170`		`-}`
`171`	`167`	`if(res.isMarketplace){`
`172`		`-handleMarketplaceAppViewClick(res.id);`
	`168`	`+handleMarketplaceAppViewClick(res.id,res.isLocalMarketplace);`
`173`	`169`	`return;`
`174`	`170`	`}`
`175`	`171`	`}}`
`@@ -185,7 +181,7 @@ export function MarketplaceResCard(props: { res: HomeRes; }) {`
`185`	`181`	`}`
`186`	`182`	`</CardInfo>`
`187`	`183`	`<OperationWrapper>`
`188`		`-<ExecButtononClick={()=>handleMarketplaceAppViewClick(res.id)}>`
	`184`	`+<ExecButtononClick={()=>handleMarketplaceAppViewClick(res.id,res.isLocalMarketplace)}>`
`189`	`185`	`{trans("view")}`
`190`	`186`	`</ExecButton>`
`191`	`187`	`</OperationWrapper>`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import {`
`7`	`7`	`NavDocIcon,`
`8`	`8`	`}from"lowcoder-design";`
`9`	`9`	`import{HomeResTypeEnum}from"../types/homeRes";`
`10`		`-import{APPLICATION_VIEW_URL,buildFolderUrl}from"../constants/routesURL";`
	`10`	`+import{APPLICATION_VIEW_URL,APPLICATION_MARKETPLACE_VIEW_URL,buildFolderUrl}from"../constants/routesURL";`
`11`	`11`	`importhistoryfrom"./history";`
`12`	`12`	`import{trans}from"../i18n";`
`13`	`13`	`import{FunctionComponent}from"react";`
`@@ -58,6 +58,6 @@ export const handleAppEditClick = (e: any, id: string): void => {`
`58`	`58`
`59`	`59`	`exportconsthandleAppViewClick=(id:string)=>window.open(APPLICATION_VIEW_URL(id,"view"));`
`60`	`60`
`61`		`-exportconsthandleMarketplaceAppViewClick=(id:string)=>window.open(APPLICATION_VIEW_URL(id,"view_marketplace"));`
	`61`	`+exportconsthandleMarketplaceAppViewClick=(id:string,isLocalMarketplace?:boolean)=>isLocalMarketplace==true ?window.open(APPLICATION_VIEW_URL(id,"view_marketplace")) :window.open(APPLICATION_MARKETPLACE_VIEW_URL(id,"view_marketplace"));`
`62`	`62`
`63`	`63`	`exportconsthandleFolderViewClick=(id:string)=>history.push(buildFolderUrl(id));`

Comments

(0)