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

Commit4193961

Browse files
committed
Merge branch 'dev' of github.com:lowcoder-org/lowcoder into fix/1634-step-control
2 parentsf02d33f +adacf37 commit4193961

File tree

8 files changed

+70
-39
lines changed

8 files changed

+70
-39
lines changed

‎client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnSwitchComp.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,13 @@ const childrenMap = {
6969

7070
constgetBaseValue:ColumnTypeViewFn<typeofchildrenMap,boolean,boolean>=(props)=>props.switchState;
7171

72+
letonEvent:(eventName:string)=>Promise<unknown[]>;
73+
7274
exportconstSwitchComp=(function(){
7375
returnnewColumnTypeCompBuilder(
7476
childrenMap,
7577
(props,dispatch)=>{
78+
onEvent=props.onEvent;
7679
constvalue=props.changeValue??getBaseValue(props,dispatch);
7780
constCheckBoxComp=()=>{
7881
return(
@@ -106,6 +109,8 @@ export const SwitchComp = (function () {
106109
disabled={false}
107110
onChange={(checked,e)=>{
108111
props.onChange(checked);
112+
onEvent?.("change");
113+
onEvent?.(checked ?"true" :"false");
109114
}}
110115
/>
111116
</Wrapper>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,15 @@ const TimelineComp = (
142142
dispatch(changeChildAction("clickedIndex",index,false));
143143
onEvent("click");
144144
}}
145+
// for responsiveness
145146
style={{
146147
cursor:"pointer",
147148
color:value?.titleColor||style?.titleColor,
149+
whiteSpace:"normal",
150+
wordWrap:"break-word",
151+
textAlign:"left",
152+
height:"auto",
153+
padding:"0"
148154
}}
149155
>
150156
<b>{value?.title}</b>

‎client/packages/lowcoder/src/comps/hooks/localStorageComp.ts

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,28 @@ const APP_STORE_NAMESPACE = "lowcoder_app_local_storage";
1313
constLocalStorageCompBase=withViewFn(
1414
simpleMultiComp({values:stateComp<JSONObject>({})}),
1515
(comp)=>{
16-
constoriginStore=localStorage.getItem(APP_STORE_NAMESPACE)||"{}";
17-
letparseStore={};
18-
try{
19-
parseStore=JSON.parse(originStore);
20-
}catch(e){
21-
log.error("application local storage invalid");
22-
}
23-
16+
// add custom event listener to update values reactively
2417
useEffect(()=>{
25-
constvalue=comp.children.values.value;
26-
if(!isEqual(value,parseStore)){
27-
log.info(value,parseStore);
28-
comp.children.values.dispatchChangeValueAction(parseStore);
29-
}
30-
},[parseStore]);
18+
consthandler=()=>{
19+
try{
20+
constraw=localStorage.getItem(APP_STORE_NAMESPACE)||"{}";
21+
constparsed=JSON.parse(raw);
22+
comp.children.values.dispatchChangeValueAction(parsed);
23+
}catch(e){
24+
log.error("Failed to parse localStorage:",e);
25+
}
26+
};
27+
28+
// Add listener on mount
29+
window.addEventListener("lowcoder-localstorage-updated",handler);
30+
31+
// Run once on mount to initialize
32+
handler();
33+
34+
return()=>{
35+
window.removeEventListener("lowcoder-localstorage-updated",handler);
36+
};
37+
},[]);
3138

3239
returnnull;
3340
}
@@ -62,6 +69,8 @@ LocalStorageComp = withMethodExposing(LocalStorageComp, [
6269
parseStore[key]=value;
6370
localStorage.setItem(APP_STORE_NAMESPACE,JSON.stringify(parseStore));
6471
comp.children.values.dispatchChangeValueAction(parseStore);
72+
73+
window.dispatchEvent(newCustomEvent("lowcoder-localstorage-updated"));
6574
}catch(e){
6675
localStorage.setItem(APP_STORE_NAMESPACE,"{}");
6776
}
@@ -83,6 +92,9 @@ LocalStorageComp = withMethodExposing(LocalStorageComp, [
8392
deleteparseStore[key];
8493
localStorage.setItem(APP_STORE_NAMESPACE,JSON.stringify(parseStore));
8594
comp.children.values.dispatchChangeValueAction(parseStore);
95+
96+
// Trigger update
97+
window.dispatchEvent(newCustomEvent("lowcoder-localstorage-updated"));
8698
}catch(e){
8799
localStorage.setItem(APP_STORE_NAMESPACE,"{}");
88100
}
@@ -98,6 +110,9 @@ LocalStorageComp = withMethodExposing(LocalStorageComp, [
98110
execute:(comp)=>{
99111
localStorage.removeItem(APP_STORE_NAMESPACE);
100112
comp.children.values.dispatchChangeValueAction({});
113+
114+
// Trigger update
115+
window.dispatchEvent(newCustomEvent("lowcoder-localstorage-updated"));
101116
},
102117
},
103118
]);

‎client/packages/lowcoder/src/pages/userAuth/register.tsx

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -95,25 +95,28 @@ function UserRegister() {
9595
setSigninEnabled(LOWCODER_EMAIL_AUTH_ENABLED==='true');
9696
},[serverSettings]);
9797

98+
constfetchOrgsByEmail=()=>{
99+
fetchOrgPaginationByEmail({
100+
email:' ',
101+
pageNum:1,
102+
pageSize:10,
103+
})
104+
.then((resp)=>{
105+
if(resp.success){
106+
constorgList=resp.data||[];
107+
if(orgList.length){
108+
// in Enterprise mode, we will get org data in different format
109+
constselectedOrgId=orgList[0]?.id||orgList[0]?.orgId;
110+
setDefaultOrgId(selectedOrgId);
111+
dispatch(fetchConfigAction(selectedOrgId));
112+
}
113+
}
114+
})
115+
}
116+
98117
useEffect(()=>{
99118
if(isEnterpriseMode){
100-
// dispatch(fetchConfigAction());
101-
fetchOrgPaginationByEmail({
102-
email:' ',
103-
pageNum:1,
104-
pageSize:10,
105-
})
106-
.then((resp)=>{
107-
if(resp.success){
108-
constorgList=resp.data||[];
109-
if(orgList.length){
110-
// in Enterprise mode, we will get org data in different format
111-
constselectedOrgId=orgList[0]?.id||orgList[0]?.orgId;
112-
setDefaultOrgId(selectedOrgId);
113-
dispatch(fetchConfigAction(selectedOrgId));
114-
}
115-
}
116-
})
119+
fetchOrgsByEmail();
117120
}
118121
},[isEnterpriseMode]);
119122

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public Mono<Void> onUserRegister(User user, boolean isSuperAdmin) {
245245
returnorganizationService.createDefault(user,isSuperAdmin).then();
246246
}
247247

248-
protectedMono<Void>onUserLogin(StringorgId,Useruser,Stringsource,StringgroupId) {
248+
protectedMono<Void>onUserLogin(StringorgId,Useruser,Stringsource,StringgroupIdToJoin) {
249249
Mono<String>orgMono;
250250
if(commonConfig.getWorkspace().getMode() ==WorkspaceMode.ENTERPRISE) {
251251
orgMono =organizationService.getOrganizationInEnterpriseMode().map(HasIdAndAuditing::getId);
@@ -255,12 +255,12 @@ protected Mono<Void> onUserLogin(String orgId, User user, String source, String
255255
}
256256
orgMono =Mono.just(orgId);
257257
}
258-
Mono<GroupMember>groupMember =groupMemberService.getGroupMember(groupId,user.getId()).switchIfEmpty(Mono.defer(() -> {
258+
Mono<GroupMember>groupMember =groupIdToJoin ==null ?Mono.empty() :groupMemberService.getGroupMember(groupIdToJoin,user.getId()).switchIfEmpty(Mono.defer(() -> {
259259
GroupMembergroupMember1 =GroupMember.builder()
260-
.groupId(groupId)
260+
.groupId(groupIdToJoin)
261261
.userId(user.getId())
262262
.build();
263-
returngroupMemberService.addMember(orgId,groupId,user.getId(),MemberRole.MEMBER).thenReturn(groupMember1);
263+
returngroupMemberService.addMember(orgId,groupIdToJoin,user.getId(),MemberRole.MEMBER).thenReturn(groupMember1);
264264
}));
265265
returnorgMono.flatMap(orgId2 ->orgApiService.tryAddUserToOrgAndSwitchOrg(orgId2,user.getId())).then(groupMember).then();
266266
}

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,11 @@ public Mono<PageResponseView<?>> getOrganizationByUser(@PathVariable String emai
6262
@RequestParam(required =false,defaultValue ="0")IntegerpageSize) {
6363
Flux<OrgView>flux;
6464
if (commonConfig.getWorkspace().getMode() ==WorkspaceMode.SAAS) {
65-
flux =userService.findByEmailDeep(email).flux().flatMap(user ->orgMemberService.getAllActiveOrgs(user.getId()))
65+
flux =userService.findByEmailDeep(email).flux()
66+
.flatMap(user ->orgMemberService.getAllActiveOrgs(user.getId()))
6667
.flatMap(orgMember ->organizationService.getById(orgMember.getOrgId()))
67-
.map(OrgView::new).cache();
68+
.map(OrgView::new)
69+
.cache();
6870
}else {
6971
flux =organizationService.getOrganizationInEnterpriseMode().flux().map(OrgView::new).cache();
7072
}

‎server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/GenericAuthenticateTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public void testGoogleLoginSuccess(WireMockRuntimeInfo wmRuntimeInfo) {
182182
})
183183
.verifyComplete();
184184

185-
Mockito.framework().clearInlineMocks();
185+
//Mockito.framework().clearInlineMocks();
186186
}
187187

188188
privateStringgetEmailAuthConfigId() {

‎server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/TestRedisConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
importjava.util.concurrent.atomic.AtomicInteger;
1111

1212
@SuppressWarnings("UnstableApiUsage")
13-
//@TestConfiguration
13+
@TestConfiguration
1414
publicclassTestRedisConfiguration {
1515

1616
privatestaticfinalAtomicIntegerSTATE =newAtomicInteger(0);

0 commit comments

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