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

iamfaran · iamfaran · commit 17f3c7d0c8ad · 2025-05-30T16:57:11.000+05:00
diff --git a/client/packages/lowcoder/src/pages/setting/environments/EnvironmentDetail.tsx b/client/packages/lowcoder/src/pages/setting/environments/EnvironmentDetail.tsx
@@ -188,6 +188,19 @@ const EnvironmentDetail: React.FC = () => {
     <Level1SettingPageContent style={{ minWidth: "1000px" }}>
       {/* Breadcrumbs */}
    
+      <ModernBreadcrumbs 
+        items={[
+          {
+            key: 'environments',
+            title: 'Environments',
+            onClick: () => history.push('/setting/environments')
+          },
+          {
+            key: 'current',
+            title: environment.environmentName || "Environment Detail"
+          }
+        ]}
+      />
 
       {/* Environment Header Component */}
       <EnvironmentHeader 
@@ -265,19 +278,7 @@ const EnvironmentDetail: React.FC = () => {
         </Descriptions>
       </Card>
 
-      <ModernBreadcrumbs 
-        items={[
-          {
-            key: 'environments',
-            title: 'Environments',
-            onClick: () => history.push('/setting/environments')
-          },
-          {
-            key: 'current',
-            title: environment.environmentName || "Environment Detail"
-          }
-        ]}
-      />
+      
       {/* Detailed License Information Card - only show for licensed environments with details */}
       {environment.isLicensed && environment.licenseDetails && (
         <Card
diff --git a/client/packages/lowcoder/src/pages/setting/environments/WorkspaceDetail.tsx b/client/packages/lowcoder/src/pages/setting/environments/WorkspaceDetail.tsx
@@ -91,7 +91,7 @@ const WorkspaceDetail: React.FC = () => {
       key: 'environments',
       title: (
         <span>
-          <HomeOutlined /> Environments
+           Environments
         </span>
       ),
       onClick: () => history.push("/setting/environments")
@@ -100,7 +100,7 @@ const WorkspaceDetail: React.FC = () => {
       key: 'environment',
       title: (
         <span>
-          <TeamOutlined /> {environment.environmentName}
+          {environment.environmentName}
         </span>
       ),
       onClick: () => history.push(`/setting/environments/${environment.environmentId}`)
@@ -159,6 +159,10 @@ const WorkspaceDetail: React.FC = () => {
   return (
     <Level1SettingPageContent style={{ minWidth: "1000px" }}>
       {/* New Workspace Header */}
+
+      {/* Modern Breadcrumbs navigation */}
+      <ModernBreadcrumbs items={breadcrumbItems} />
+
       <WorkspaceHeader
         workspace={workspace}
         environment={environment}
@@ -203,8 +207,7 @@ const WorkspaceDetail: React.FC = () => {
         </Col>
       </Row>
 
-      {/* Modern Breadcrumbs navigation */}
-      <ModernBreadcrumbs items={breadcrumbItems} />
+      
 
       {/* Tabs for Apps, Data Sources, and Queries */}
       <Tabs 
diff --git a/client/packages/lowcoder/src/pages/setting/environments/components/EnvironmentHeader.tsx b/client/packages/lowcoder/src/pages/setting/environments/components/EnvironmentHeader.tsx
@@ -28,7 +28,6 @@ const EnvironmentHeader: React.FC<EnvironmentHeaderProps> = ({
         padding: '20px 24px',
         borderRadius: '8px',
         border: '1px solid #f0f0f0',
-        boxShadow: '0 2px 8px rgba(0,0,0,0.06)'
       }}
     >
       <Row justify="space-between" align="middle" gutter={[16, 16]}>
diff --git a/client/packages/lowcoder/src/pages/setting/environments/components/ModernBreadcrumbs.tsx b/client/packages/lowcoder/src/pages/setting/environments/components/ModernBreadcrumbs.tsx
@@ -16,9 +16,8 @@ interface ModernBreadcrumbsProps extends Omit<BreadcrumbProps, 'items'> {
 }
 
 const Breadcrumb = styled(AntdBreadcrumb)`
-  font-size: 16px;
   margin-bottom: 10px;
-
+  font-size: 20px;
   li:not(:last-child) {
     color: #8b8fa3;
   }
diff --git a/client/packages/lowcoder/src/pages/setting/environments/components/WorkspaceHeader.tsx b/client/packages/lowcoder/src/pages/setting/environments/components/WorkspaceHeader.tsx
@@ -66,7 +66,6 @@ const WorkspaceHeader: React.FC<WorkspaceHeaderProps> = ({
         padding: '20px 24px',
         borderRadius: '8px',
         border: '1px solid #f0f0f0',
-        boxShadow: '0 2px 8px rgba(0,0,0,0.06)'
       }}
     >
       <Row justify="space-between" align="middle" gutter={[16, 16]}>

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`	`<Row justify="space-between" align="middle" gutter={[16, 16]}>`
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`	const Breadcrumb = 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`	`}`
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`	`<Row justify="space-between" align="middle" gutter={[16, 16]}>`