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

Commit4a6f4c5

Browse files
authored
Merge branch 'dev' into feature/bundle
2 parents0d59fe0 +1493cf9 commit4a6f4c5

File tree

526 files changed

+19452
-194
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

526 files changed

+19452
-194
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml
1414
server/api-service/lowcoder-server/src/main/resources/application-debug.yaml
1515
.vscode/settings.json
1616
.vscode/launch.json
17-
server/api-service/lowcoder-server/src/main/resources/application-debug.yaml
17+
server/api-service/lowcoder-server/src/main/resources/application-dev-localhost.yaml

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

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

‎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.3",
3+
"version":"2.4.4",
44
"type":"module",
55
"files": [
66
"src",

‎client/packages/lowcoder/src/api/apiUtils.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,13 @@ export const apiFailureResponseInterceptor = (error: any) => {
121121
// Need authorization
122122
if(!notAuthRequiredPath(error.config?.url)){
123123
if(error.response.status===API_STATUS_CODES.REQUEST_NOT_AUTHORISED){
124+
// get x-org-id from failed request
125+
constorganizationId=error.response.headers['x-org-id']||undefined;
124126
// Redirect to login and set a redirect url.
125127
StoreRegistry.getStore().dispatch(
126128
logoutAction({
127129
notAuthorised:true,
130+
organizationId,
128131
})
129132
);
130133
returnPromise.reject({

‎client/packages/lowcoder/src/appView/AppViewInstance.tsx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ import { saveAuthSearchParams } from "pages/userAuth/authUtils";
1414
import{Suspense,lazy}from"react";
1515
importFlexfrom"antd/es/flex";
1616
import{TacoButton}from"components/button";
17+
import{DatasourceApi}from"@lowcoder-ee/api/datasourceApi";
18+
import{registryDataSourcePlugin}from"@lowcoder-ee/constants/queryConstants";
1719

1820
constAppView=lazy(
1921
()=>import('./AppView')
@@ -101,6 +103,12 @@ export class AppViewInstance<I = any, O = any> {
101103
};
102104
}
103105
});
106+
107+
awaitDatasourceApi.fetchJsDatasourceByApp(this.appId).then((res)=>{
108+
res.data.data.forEach((i)=>{
109+
registryDataSourcePlugin(i.type,i.id,i.pluginDefinition);
110+
});
111+
});
104112

105113
setGlobalSettings({
106114
orgCommonSettings:data.data.orgCommonSettings,

‎client/packages/lowcoder/src/comps/comps/buttonComp/linkComp.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const Link = styled(Button)<{
3737
font-style:${props.$style.fontStyle};
3838
font-family:${props.$style.fontFamily};
3939
font-weight:${props.$style.textWeight};
40-
border:${props.$style.borderWidth}solid${props.$style.border};
40+
border:${props.$style.borderWidth}${props.$style.borderStyle}${props.$style.border};
4141
border-radius:${props.$style.radius ?props.$style.radius:'0px'};
4242
text-transform:${props.$style.textTransform ?props.$style.textTransform:''};
4343
text-decoration:${props.$style.textDecoration ?props.$style.textDecoration:''} !important;

‎client/packages/lowcoder/src/comps/comps/containerComp/cardComp.tsx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ const Wrapper = styled.div<{
4949
margin:${props=>props.$headerStyle?.margin};
5050
padding:${props=>props.$headerStyle?.padding};
5151
}
52+
.ant-card-head-title{
53+
font-size:${props=>props.$headerStyle?.textSize};
54+
font-family:${props=>props.$headerStyle?.fontFamily};
55+
}
5256
.ant-card .ant-card-actions {
5357
border-top: 1px solid${props=>props.$style?.border};
5458
}
@@ -72,6 +76,8 @@ const Wrapper = styled.div<{
7276
display: flex;
7377
flex-direction: column;
7478
justify-content: space-between;
79+
margin:${props=>props.$style?.margin};
80+
padding:${props=>props.$style?.padding};
7581
background-color:${props=>props.$style?.background};
7682
border:${props=>props.$style?.border};
7783
rotate:${props=>props.$style?.rotation};

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

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ export type DateCompViewProps = Pick<
166166
};
167167

168168
exportconstdatePickerControl=newUICompBuilder(childrenMap,(props)=>{
169-
lettime=dayjs(null);
169+
lettime=null;
170170
if(props.value.value!==''){
171171
time=dayjs(props.value.value,DateParser);
172172
}
@@ -187,7 +187,7 @@ export const datePickerControl = new UICompBuilder(childrenMap, (props) => {
187187
minDate={props.minDate}
188188
maxDate={props.maxDate}
189189
placeholder={props.placeholder}
190-
value={time.isValid() ?time :null}
190+
value={time?.isValid() ?time :null}
191191
onChange={(time)=>{
192192
handleDateChange(
193193
time&&time.isValid()
@@ -285,11 +285,12 @@ export const dateRangeControl = (function () {
285285
};
286286

287287
returnnewUICompBuilder(childrenMap,(props)=>{
288-
letstart=dayjs(null);
289-
letend=dayjs(null);
288+
letstart=null;
289+
letend=null;
290290
if(props.start.value!==''){
291291
start=dayjs(props.start.value,DateParser);
292292
}
293+
293294
if(props.end.value!==''){
294295
end=dayjs(props.end.value,DateParser);
295296
}
@@ -300,8 +301,8 @@ export const dateRangeControl = (function () {
300301
$style={props.inputFieldStyle}
301302
disabled={props.disabled}
302303
{...datePickerProps(props)}
303-
start={start.isValid() ?start :null}
304-
end={end.isValid() ?end :null}
304+
start={start?.isValid() ?start :null}
305+
end={end?.isValid() ?end :null}
305306
minDate={props.minDate}
306307
maxDate={props.maxDate}
307308
placeholder={[props.placeholder,props.placeholder]}
@@ -418,26 +419,26 @@ export const DatePickerComp = withExposingConfigs(datePickerControl, [
418419
desc:trans("export.datePickerValueDesc"),
419420
depKeys:["value","showTime"],
420421
func:(input)=>{
421-
constmom=dayjs(input.value,DateParser);
422-
returnmom.isValid() ?mom.format(input.showTime ?DATE_TIME_FORMAT :DATE_FORMAT) :"";
422+
constmom=Boolean(input.value) ?dayjs(input.value,DateParser) :null;
423+
returnmom?.isValid() ?mom.format(input.showTime ?DATE_TIME_FORMAT :DATE_FORMAT) :null;
423424
},
424425
}),
425426
depsConfig({
426427
name:"formattedValue",
427428
desc:trans("export.datePickerFormattedValueDesc"),
428429
depKeys:["value","format"],
429430
func:(input)=>{
430-
constmom=dayjs(input.value,DateParser);
431-
returnmom.isValid() ?mom.format(input.format) :"";
431+
constmom=Boolean(input.value) ?dayjs(input.value,DateParser) :null;
432+
returnmom?.isValid() ?mom.format(input.format) :"";
432433
},
433434
}),
434435
depsConfig({
435436
name:"timestamp",
436437
desc:trans("export.datePickerTimestampDesc"),
437438
depKeys:["value"],
438439
func:(input)=>{
439-
constmom=dayjs(input.value,DateParser);
440-
returnmom.isValid() ?mom.unix() :"";
440+
constmom=Boolean(input.value) ?dayjs(input.value,DateParser) :null;
441+
returnmom?.isValid() ?mom.unix() :"";
441442
},
442443
}),
443444
depsConfig({
@@ -459,47 +460,47 @@ export let DateRangeComp = withExposingConfigs(dateRangeControl, [
459460
desc:trans("export.dateRangeStartDesc"),
460461
depKeys:["start","showTime"],
461462
func:(input)=>{
462-
constmom=dayjs(input.start,DateParser);
463-
returnmom.isValid() ?mom.format(input.showTime ?DATE_TIME_FORMAT :DATE_FORMAT) :"";
463+
constmom=Boolean(input.start) ?dayjs(input.start,DateParser):null;
464+
returnmom?.isValid() ?mom.format(input.showTime ?DATE_TIME_FORMAT :DATE_FORMAT) :null;
464465
},
465466
}),
466467
depsConfig({
467468
name:"end",
468469
desc:trans("export.dateRangeEndDesc"),
469470
depKeys:["end","showTime"],
470471
func:(input)=>{
471-
constmom=dayjs(input.end,DateParser);
472-
returnmom.isValid() ?mom.format(input.showTime ?DATE_TIME_FORMAT :DATE_FORMAT) :"";
472+
constmom=Boolean(input.end) ?dayjs(input.end,DateParser):null;
473+
returnmom?.isValid() ?mom.format(input.showTime ?DATE_TIME_FORMAT :DATE_FORMAT) :null;
473474
},
474475
}),
475476
depsConfig({
476477
name:"startTimestamp",
477478
desc:trans("export.dateRangeStartTimestampDesc"),
478479
depKeys:["start"],
479480
func:(input)=>{
480-
constmom=dayjs(input.start,DateParser);
481-
returnmom.isValid() ?mom.unix() :"";
481+
constmom=Boolean(input.start) ?dayjs(input.start,DateParser) :null;
482+
returnmom?.isValid() ?mom.unix() :"";
482483
},
483484
}),
484485
depsConfig({
485486
name:"endTimestamp",
486487
desc:trans("export.dateRangeEndTimestampDesc"),
487488
depKeys:["end"],
488489
func:(input)=>{
489-
constmom=dayjs(input.end,DateParser);
490-
returnmom.isValid() ?mom.unix() :"";
490+
constmom=Boolean(input.end) ?dayjs(input.end,DateParser) :null;
491+
returnmom?.isValid() ?mom.unix() :"";
491492
},
492493
}),
493494
depsConfig({
494495
name:"formattedValue",
495496
desc:trans("export.dateRangeFormattedValueDesc"),
496497
depKeys:["start","end","format"],
497498
func:(input)=>{
498-
conststart=dayjs(input.start,DateParser);
499-
constend=dayjs(input.end,DateParser);
499+
conststart=Boolean(input.start) ?dayjs(input.start,DateParser):null;
500+
constend=Boolean(input.end) ?dayjs(input.end,DateParser):null;
500501
return[
501-
start.isValid()&&start.format(input.format),
502-
end.isValid()&&end.format(input.format),
502+
start?.isValid()&&start.format(input.format),
503+
end?.isValid()&&end.format(input.format),
503504
]
504505
.filter((item)=>item)
505506
.join(" - ");
@@ -510,17 +511,17 @@ export let DateRangeComp = withExposingConfigs(dateRangeControl, [
510511
desc:trans("export.dateRangeFormattedStartValueDesc"),
511512
depKeys:["start","format"],
512513
func:(input)=>{
513-
conststart=dayjs(input.start,DateParser);
514-
returnstart.isValid()&&start.format(input.format);
514+
conststart=Boolean(input.start) ?dayjs(input.start,DateParser):null;
515+
returnstart?.isValid()&&start.format(input.format);
515516
},
516517
}),
517518
depsConfig({
518519
name:"formattedEndValue",
519520
desc:trans("export.dateRangeFormattedEndValueDesc"),
520521
depKeys:["end","format"],
521522
func:(input)=>{
522-
constend=dayjs(input.end,DateParser);
523-
returnend.isValid()&&end.format(input.format);
523+
constend=Boolean(input.end) ?dayjs(input.end,DateParser):null;
524+
returnend?.isValid()&&end.format(input.format);
524525
},
525526
}),
526527
depsConfig({

‎client/packages/lowcoder/src/comps/comps/dateComp/timeComp.tsx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ export type TimeCompViewProps = Pick<
137137
};
138138

139139
exportconsttimePickerControl=newUICompBuilder(childrenMap,(props)=>{
140-
lettime=dayjs(null);
140+
lettime=null;
141141
if(props.value.value!==''){
142142
time=dayjs(props.value.value,TimeParser);
143143
}
@@ -150,7 +150,7 @@ export const timePickerControl = new UICompBuilder(childrenMap, (props) => {
150150
viewRef={props.viewRef}
151151
$style={props.style}
152152
disabled={props.disabled}
153-
value={time.isValid() ?time :null}
153+
value={time?.isValid() ?time :null}
154154
disabledTime={()=>disabledTime(props.minTime,props.maxTime)}
155155
{...timePickerComps(props)}
156156
hourStep={props.hourStepashourStepType}
@@ -339,8 +339,8 @@ export const TimePickerComp = withExposingConfigs(timePickerControl, [
339339
desc:trans("export.timePickerFormattedValueDesc"),
340340
depKeys:["value","format"],
341341
func:(input)=>{
342-
constmom=dayjs(input.value,TimeParser);
343-
returnmom.isValid() ?mom.format(input.format) :"";
342+
constmom=Boolean(input.value) ?dayjs(input.value,TimeParser) :null;
343+
returnmom?.isValid() ?mom.format(input.format) :'';
344344
},
345345
}),
346346
depsConfig({
@@ -364,11 +364,11 @@ export let TimeRangeComp = withExposingConfigs(timeRangeControl, [
364364
desc:trans("export.timeRangeFormattedValueDesc"),
365365
depKeys:["start","end","format"],
366366
func:(input)=>{
367-
conststart=dayjs(input.start,TimeParser);
368-
constend=dayjs(input.end,TimeParser);
367+
conststart=Boolean(input.start) ?dayjs(input.start,TimeParser) :null;
368+
constend=Boolean(input.end) ?dayjs(input.end,TimeParser) :null;
369369
return[
370-
start.isValid()&&start.format(input.format),
371-
end.isValid()&&end.format(input.format),
370+
start?.isValid()&&start.format(input.format),
371+
end?.isValid()&&end.format(input.format),
372372
]
373373
.filter((item)=>item)
374374
.join(" - ");
@@ -379,17 +379,17 @@ export let TimeRangeComp = withExposingConfigs(timeRangeControl, [
379379
desc:trans("export.timeRangeFormattedStartValueDesc"),
380380
depKeys:["start","format"],
381381
func:(input)=>{
382-
conststart=dayjs(input.start,TimeParser);
383-
returnstart.isValid()&&start.format(input.format);
382+
conststart=Boolean(input.start) ?dayjs(input.start,TimeParser) :null;
383+
returnstart?.isValid()&&start.format(input.format);
384384
},
385385
}),
386386
depsConfig({
387387
name:"formattedEndValue",
388388
desc:trans("export.timeRangeFormattedEndValueDesc"),
389389
depKeys:["end","format"],
390390
func:(input)=>{
391-
constend=dayjs(input.end,TimeParser);
392-
returnend.isValid()&&end.format(input.format);
391+
constend=Boolean(input.end) ?dayjs(input.end,TimeParser) :null;
392+
returnend?.isValid()&&end.format(input.format);
393393
},
394394
}),
395395
depsConfig({

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ type IProps = DividerProps & {
2727

2828
constStyledDivider=styled(Divider)<IProps>`
2929
margin-top: 3.5px;
30+
rotate:${props=>props.$style.rotation};
3031
.ant-divider-inner-text {
3132
height: 32px;
3233
display: flex;
@@ -50,8 +51,8 @@ const StyledDivider = styled(Divider) <IProps>`
5051
returnprops.$style.margin;
5152
}};
5253
padding:${(props)=>props.$style.padding};
53-
54-
border-top:${(props)=>(props.$style.borderWidth&&props.$style.borderWidth!="0px" ?props.$style.borderWidth :"1px")}${(props)=>(props.dashed ?"dashed" :"solid")}${(props)=>props.$style.border};
54+
border-radius:${props=>props.$style.radius};
55+
border-top:${(props)=>(props.$style.borderWidth&&props.$style.borderWidth!="0px" ?props.$style.borderWidth :"1px")}${(props)=>props.$style.borderStyle}${(props)=>props.$style.border};
5556
""
5657
.ant-divider-inner-text::before, .ant-divider-inner-text::after {
5758
border-block-start:${(props)=>(props.$style.borderWidth&&props.$style.borderWidth!="0px" ?props.$style.borderWidth :"1px")}${(props)=>(props.dashed ?"dashed" :"solid")}${(props)=>props.$style.border} !important;

0 commit comments

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