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

Commit77a30e6

Browse files
authored
Merge pull request#1034 from lowcoder-org/dev
Dev > Main for v2.4.3
2 parentsf27dbc4 +adfb07d commit77a30e6

File tree

6 files changed

+13
-8
lines changed

6 files changed

+13
-8
lines changed

‎client/packages/lowcoder-sdk/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"lowcoder-sdk",
3-
"version":"2.4.6",
3+
"version":"2.4.7",
44
"type":"module",
55
"files": [
66
"src",

‎client/packages/lowcoder/src/app.tsx‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,16 @@ class AppIndex extends React.Component<AppIndexProps, any> {
130130
// make sure all users in this app have checked login info
131131
if(!this.props.isFetchUserFinished||(this.props.currentUserId&&!this.props.fetchHomeDataFinished)){
132132
consthideLoadingHeader=isTemplate||isAuthUnRequired(pathname);
133+
return<ProductLoadinghideHeader={hideLoadingHeader}/>;
134+
}
135+
else{
133136
// if the user just logged in, we send the event to posthog
134-
if(sessionStorage.getItem('_just_logged_in_')){
135-
posthog.identify(this.props.currentUserId);
136-
sessionStorage.removeItem('_just_logged_in_');
137+
if(isLocalhost||isLowCoderDomain){
138+
if(sessionStorage.getItem('_just_logged_in_')){
139+
posthog.identify(this.props.currentUserId);
140+
sessionStorage.removeItem('_just_logged_in_');
141+
}
137142
}
138-
return<ProductLoadinghideHeader={hideLoadingHeader}/>;
139143
}
140144

141145
// persisting the language in local storage

‎client/packages/lowcoder/src/comps/comps/appSettingsComp.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ const childrenMap = {
186186
showHeaderInPublic:withDefault(BoolControl,true),
187187
maxWidth:dropdownInputSimpleControl(OPTIONS,USER_DEFINE,"1920"),
188188
themeId:valueComp<string>(DEFAULT_THEMEID),
189-
preventAppStylesOverwriting:withDefault(BoolControl,false),
189+
preventAppStylesOverwriting:withDefault(BoolControl,true),
190190
customShortcuts:CustomShortcutsComp,
191191
disableCollision:valueComp<boolean>(false),
192192
};

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/repository/UserRepository.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ public interface UserRepository extends ReactiveMongoRepository<User, String> {
2121
Mono<User>findByName(StringrawUuid);
2222

2323
//email1 and email2 should be equal
24-
Mono<User>findByEmailOrConnections_Email(Stringemail1,Stringemail2);
24+
Flux<User>findByEmailOrConnections_Email(Stringemail1,Stringemail2);
2525
}

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public Mono<User> findByName(String rawUuid) {
113113
}
114114

115115
publicMono<User>findByEmailDeep(Stringemail) {
116-
returnrepository.findByEmailOrConnections_Email(email,email);
116+
returnrepository.findByEmailOrConnections_Email(email,email).next();
117117
}
118118

119119
@Override

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/AddSuperAdminUserImpl.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ private AuthUser formulateAuthUser() {
4545
returnAuthUser.builder()
4646
.uid(username)
4747
.username(username)
48+
.email(username)
4849
.authContext(authRequestContext)
4950
.build();
5051
}

0 commit comments

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