Commit17f3c7d

committed

Merge branch 'dev' of github.com:lowcoder-org/lowcoder into ui/environments-breadcrumbs

2 parents51e2a54 +d0f42b0 commit17f3c7dCopy full SHA for 17f3c7d

File tree

+22

-21

lines changed

+22

-21

lines changed

Lines changed: 14 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -188,6 +188,19 @@ const EnvironmentDetail: React.FC = () => {`
`188`	`188`	`<Level1SettingPageContentstyle={{minWidth:"1000px"}}>`
`189`	`189`	`{/* Breadcrumbs */}`
`190`	`190`
	`191`	`+<ModernBreadcrumbs`
	`192`	`+items={[`
	`193`	`+{`
	`194`	`+key:'environments',`
	`195`	`+title:'Environments',`
	`196`	`+onClick:()=>history.push('/setting/environments')`
	`197`	`+},`
	`198`	`+{`
	`199`	`+key:'current',`
	`200`	`+title:environment.environmentName\|\|"Environment Detail"`
	`201`	`+}`
	`202`	`+]}`
	`203`	`+/>`
`191`	`204`
`192`	`205`	`{/* Environment Header Component */}`
`193`	`206`	`<EnvironmentHeader`
`@@ -265,19 +278,7 @@ const EnvironmentDetail: React.FC = () => {`
`265`	`278`	`</Descriptions>`
`266`	`279`	`</Card>`
`267`	`280`
`268`		`-<ModernBreadcrumbs`
`269`		`-items={[`
`270`		`-{`
`271`		`-key:'environments',`
`272`		`-title:'Environments',`
`273`		`-onClick:()=>history.push('/setting/environments')`
`274`		`-},`
`275`		`-{`
`276`		`-key:'current',`
`277`		`-title:environment.environmentName\|\|"Environment Detail"`
`278`		`-}`
`279`		`-]}`
`280`		`-/>`
	`281`	`+`
`281`	`282`	`{/* Detailed License Information Card - only show for licensed environments with details */}`
`282`	`283`	`{environment.isLicensed&&environment.licenseDetails&&(`
`283`	`284`	`<Card`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ const WorkspaceDetail: React.FC = () => {`
`91`	`91`	`key:'environments',`
`92`	`92`	`title:(`
`93`	`93`	`<span>`
`94`		`-<HomeOutlined/> Environments`
	`94`	`+ Environments`
`95`	`95`	`</span>`
`96`	`96`	`),`
`97`	`97`	`onClick:()=>history.push("/setting/environments")`
`@@ -100,7 +100,7 @@ const WorkspaceDetail: React.FC = () => {`
`100`	`100`	`key:'environment',`
`101`	`101`	`title:(`
`102`	`102`	`<span>`
`103`		`-<TeamOutlined/>{environment.environmentName}`
	`103`	`+{environment.environmentName}`
`104`	`104`	`</span>`
`105`	`105`	`),`
`106`	`106`	onClick:()=>history.push(`/setting/environments/${environment.environmentId}`)
`@@ -159,6 +159,10 @@ const WorkspaceDetail: React.FC = () => {`
`159`	`159`	`return(`
`160`	`160`	`<Level1SettingPageContentstyle={{minWidth:"1000px"}}>`
`161`	`161`	`{/* New Workspace Header */}`
	`162`	`+`
	`163`	`+{/* Modern Breadcrumbs navigation */}`
	`164`	`+<ModernBreadcrumbsitems={breadcrumbItems}/>`
	`165`	`+`
`162`	`166`	`<WorkspaceHeader`
`163`	`167`	`workspace={workspace}`
`164`	`168`	`environment={environment}`
`@@ -203,8 +207,7 @@ const WorkspaceDetail: React.FC = () => {`
`203`	`207`	`</Col>`
`204`	`208`	`</Row>`
`205`	`209`
`206`		`-{/* Modern Breadcrumbs navigation */}`
`207`		`-<ModernBreadcrumbsitems={breadcrumbItems}/>`
	`210`	`+`
`208`	`211`
`209`	`212`	`{/* Tabs for Apps, Data Sources, and Queries */}`
`210`	`213`	`<Tabs`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ const EnvironmentHeader: React.FC<EnvironmentHeaderProps> = ({`
`28`	`28`	`padding:'20px 24px',`
`29`	`29`	`borderRadius:'8px',`
`30`	`30`	`border:'1px solid #f0f0f0',`
`31`		`-boxShadow:'0 2px 8px rgba(0,0,0,0.06)'`
`32`	`31`	`}}`
`33`	`32`	`>`
`34`	`33`	`<Rowjustify="space-between"align="middle"gutter={[16,16]}>`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,8 @@ interface ModernBreadcrumbsProps extends Omit<BreadcrumbProps, 'items'> {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	constBreadcrumb=styled(AntdBreadcrumb)`
`19`		`- font-size: 16px;`
`20`	`19`	`margin-bottom: 10px;`
`21`		`-`
	`20`	`+ font-size: 20px;`
`22`	`21`	`li:not(:last-child) {`
`23`	`22`	`color: #8b8fa3;`
`24`	`23`	`}`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,6 @@ const WorkspaceHeader: React.FC<WorkspaceHeaderProps> = ({`
`66`	`66`	`padding:'20px 24px',`
`67`	`67`	`borderRadius:'8px',`
`68`	`68`	`border:'1px solid #f0f0f0',`
`69`		`-boxShadow:'0 2px 8px rgba(0,0,0,0.06)'`
`70`	`69`	`}}`
`71`	`70`	`>`
`72`	`71`	`<Rowjustify="space-between"align="middle"gutter={[16,16]}>`

Comments

(0)