Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit42fa208

Browse files
committed
Merge branch 'dev' of github.com:lowcoder-org/lowcoder into environments-translations
2 parentsf4bca62 +b4de9e8 commit42fa208

File tree

3 files changed

+19
-18
lines changed

3 files changed

+19
-18
lines changed

‎client/packages/lowcoder/src/pages/setting/environments/components/UnlicensedEnvironmentView.tsx‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,22 @@ const UnlicensedEnvironmentView: React.FC<UnlicensedEnvironmentViewProps> = ({
9393

9494
return(
9595
<Level1SettingPageContentstyle={{minWidth:"1000px"}}>
96+
97+
{/* Breadcrumbs */}
98+
<ModernBreadcrumbs
99+
items={[
100+
{
101+
key:'environments',
102+
title:trans("enterprise.environments.title"),
103+
onClick:()=>history.push('/setting/environments')
104+
},
105+
{
106+
key:'current',
107+
title:environment.environmentName||trans("enterprise.environments.detail.environmentDetail")
108+
}
109+
]}
110+
/>
111+
96112
{/* Environment Header Component */}
97113
<EnvironmentHeader
98114
environment={environment}
@@ -113,20 +129,7 @@ const UnlicensedEnvironmentView: React.FC<UnlicensedEnvironmentViewProps> = ({
113129
))}
114130
</Row>
115131

116-
{/* Breadcrumbs */}
117-
<ModernBreadcrumbs
118-
items={[
119-
{
120-
key:'environments',
121-
title:trans("enterprise.environments.title"),
122-
onClick:()=>history.push('/setting/environments')
123-
},
124-
{
125-
key:'current',
126-
title:environment.environmentName||trans("enterprise.environments.detail.environmentDetail")
127-
}
128-
]}
129-
/>
132+
130133

131134
{/* License Issue Card */}
132135
<Card
@@ -170,7 +173,6 @@ const UnlicensedEnvironmentView: React.FC<UnlicensedEnvironmentViewProps> = ({
170173
<Button
171174
type="primary"
172175
size="large"
173-
icon={<CustomerServiceOutlined/>}
174176
onClick={()=>setIsContactModalVisible(true)}
175177
style={{
176178
width:'100%',

‎client/packages/lowcoder/src/pages/setting/environments/services/environments.service.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ import {App} from "../types/app.types";
88
import{DataSourceWithMeta}from'../types/datasource.types';
99
import{Query,QueryResponse}from"../types/query.types";
1010
import{checkEnvironmentLicense}from'./license.service';
11-
12-
13-
11+
import{trans}from"i18n";
1412

1513
exportasyncfunctionupdateEnvironment(
1614
environmentId:string,

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiServiceImpl.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ public Mono<FolderInfoView> update(Folder folder) {
173173
newFolder.setDescription(folder.getDescription());
174174
newFolder.setImage(folder.getImage());
175175
returncheckManagePermission(folder.getId())
176+
.flatMap(orgMember ->checkFolderNameUnique(newFolder.getId(),folder.getName(),orgMember.getOrgId()))
176177
.then(folderService.updateById(folder.getId(),newFolder))
177178
.then(folderService.findById(folder.getId()))
178179
.flatMap(f ->buildFolderInfoView(f,true,true));

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp