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

Commit 36709ac

Browse files
Merge branch 'dev' into json-schema-form-layouts
2 parents fd94adc + 9c8900b commit 36709ac

39 files changed

+226
-125
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ import { selectCompModifierKeyPressed } from "util/keyUtils";
6262
import { defaultLayout, GridItemComp, GridItemDataType } from "../gridItemComp";
6363
import { ThemeContext } from "comps/utils/themeContext";
6464
import { defaultTheme } from "@lowcoder-ee/constants/themeConstants";
65+
import { ExpandViewContext } from "../tableComp/expansionControl";
6566

6667
const childrenMap = {
6768
layout: valueComp<Layout>({}),
@@ -357,11 +358,12 @@ export const InnerGrid = React.memo((props: ViewPropsWithSelect) => {
357358
|| String(DEFAULT_GRID_COLUMNS);
358359
}, [horizontalGridCells, positionParams.cols]);
359360

361+
const isExpandView = useContext(ExpandViewContext);
360362
const isDroppable =
361-
useContext(IsDroppable) && (_.isNil(props.isDroppable) || props.isDroppable) && !readOnly;
362-
const isDraggable = !readOnly && (_.isNil(props.isDraggable) || props.isDraggable);
363-
const isResizable = !readOnly && (_.isNil(props.isResizable) || props.isResizable);
364-
const isSelectable = !readOnly && (_.isNil(props.isSelectable) || props.isSelectable);
363+
useContext(IsDroppable) && (_.isNil(props.isDroppable) || props.isDroppable) && !readOnly&&!isExpandView;
364+
const isDraggable = !readOnly &&!isExpandView&& (_.isNil(props.isDraggable) || props.isDraggable);
365+
const isResizable = !readOnly &&!isExpandView&& (_.isNil(props.isResizable) || props.isResizable);
366+
const isSelectable = !readOnly &&!isExpandView&& (_.isNil(props.isSelectable) || props.isSelectable);
365367
const extraLayout = useMemo(
366368
() =>
367369
getExtraLayout(

‎client/packages/lowcoder/src/comps/comps/jsonSchemaFormComp/ArrayFieldTemplate.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,4 +119,4 @@ const ArrayFieldTemplate = (props: ArrayFieldTemplateProps) => {
119119
);
120120
};
121121

122-
export default ArrayFieldTemplate;
122+
export default ArrayFieldTemplate;

‎client/packages/lowcoder/src/comps/comps/jsonSchemaFormComp/ObjectFieldTemplate.tsx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ const ObjectFieldTemplate = (props: ObjectFieldTemplateProps) => {
2424
registry,
2525
} = props;
2626
const containerWidth = useContainerWidth();
27-
28-
// console.log("ObjectFieldTemplate Props", props);
29-
3027
const uiOptions = getUiOptions(uiSchema);
3128
const TitleFieldTemplate = getTemplate('TitleFieldTemplate', registry, uiOptions);
3229
const DescriptionFieldTemplate = getTemplate('DescriptionFieldTemplate', registry, uiOptions);
@@ -279,4 +276,4 @@ const ObjectFieldTemplate = (props: ObjectFieldTemplateProps) => {
279276
);
280277
};
281278

282-
export default ObjectFieldTemplate;
279+
export default ObjectFieldTemplate;

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import { useContext, useEffect, useRef, useState, createContext } from "react";
2626
import { EditorContext } from "comps/editorState";
2727
import ObjectFieldTemplate from './ObjectFieldTemplate';
2828
import ArrayFieldTemplate from './ArrayFieldTemplate';
29-
// import { LayoutFieldTemplate } from "./LayoutFieldTemplate";
3029
import { Select } from 'antd';
3130
import Title from 'antd/es/typography/Title';
3231

@@ -90,8 +89,6 @@ const Container = styled.div<{
9089
.help-block {
9190
margin-bottom: 0px;
9291
}
93-
94-
9592
`;
9693

9794
function convertData(schema?: JSONSchema7, data?: any) {
@@ -324,6 +321,7 @@ let FormBasicComp = (function () {
324321
</ScrollBar>
325322
</Container>
326323
</ContainerWidthContext.Provider>
324+
327325
);
328326
})
329327
.setPropertyViewFn((children) => {
@@ -482,6 +480,5 @@ FormTmpComp = withMethodExposing(FormTmpComp, [
482480
}),
483481
},
484482
]);
485-
486483
export const JsonSchemaFormComp = FormTmpComp;
487484
export { FormTmpComp, useContainerWidth };

‎client/packages/lowcoder/src/comps/comps/tableComp/expansionControl.tsx‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ import { BackgroundColorContext } from "comps/utils/backgroundColorContext";
1111
import { trans } from "i18n";
1212
import _ from "lodash";
1313
import { ConstructorToView, wrapChildAction } from "lowcoder-core";
14-
import { useContext } from "react";
14+
import { createContext,useContext } from "react";
1515
import { tryToNumber } from "util/convertUtils";
1616
import { SimpleContainerComp } from "../containerBase/simpleContainerComp";
1717
import { OB_ROW_ORI_INDEX, RecordType } from "./tableUtils";
1818
import { NameGenerator } from "comps/utils";
1919
import { JSONValue } from "util/jsonTypes";
2020

2121
const ContextSlotControl = withSelectedMultiContext(SlotControl);
22+
export const ExpandViewContext = createContext(false);
2223

2324
const ContainerView = (props: ContainerBaseProps) => {
2425
return <InnerGrid {...props} emptyRows={15} autoHeight />;
@@ -85,7 +86,11 @@ export class ExpansionControl extends ExpansionControlTmp {
8586
String(record[OB_ROW_ORI_INDEX])
8687
);
8788
const containerProps = slotControl.children.container.getView();
88-
return <ExpandView key={record[OB_ROW_ORI_INDEX]} containerProps={containerProps} />;
89+
return (
90+
<ExpandViewContext.Provider value={true}>
91+
<ExpandView key={record[OB_ROW_ORI_INDEX]} containerProps={containerProps} />
92+
</ExpandViewContext.Provider>
93+
);
8994
},
9095
},
9196
expandModalView: selectedContainer.getView(),

‎client/packages/lowcoder/src/comps/generators/withMultiContext.tsx‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,14 @@ export function withMultiContext<TCtor extends MultiCompConstructor>(VariantComp
124124
const mapComps = this.getMap();
125125
if (mapComps.hasOwnProperty(key) && !paramsEqual(params, mapComps[key].getParams())) {
126126
// refresh the item, since params changed
127-
this.dispatch(deferAction(wrapChildAction(MAP_KEY, MapCtor.batchDeleteAction([key]))));
127+
// this.dispatch(deferAction(wrapChildAction(MAP_KEY, MapCtor.batchDeleteAction([key]))));
128+
this.dispatch(wrapChildAction(MAP_KEY, MapCtor.batchDeleteAction([key])));
129+
comp = this.getOriginalComp();
130+
} else {
131+
comp = this.getOriginalComp()
132+
.setParams(params)
133+
.changeDispatch(wrapDispatch(wrapDispatch(this.dispatch, MAP_KEY), key));
128134
}
129-
comp = this.getOriginalComp()
130-
.setParams(params)
131-
.changeDispatch(wrapDispatch(wrapDispatch(this.dispatch, MAP_KEY), key));
132135
}
133136
return comp;
134137
}

‎client/packages/lowcoder/src/comps/utils/supademoDisplay.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const SupaDemoDisplay = ({ url, modalWidth = '75%', modalTop = '6%', showText =
3535
style={{ top: modalTop }}
3636
okButtonProps={{ style: { display: 'none' } }}
3737
cancelButtonProps={{ style: { display: 'none' } }}
38-
bodyStyle={{ padding: 0 }}
38+
styles={{ body: {padding: 0} }}
3939
>
4040
<div style={{ position: 'relative', boxSizing: 'content-box', maxHeight: '80vh', width: '100%', aspectRatio: '1.7712177121771218', padding: '40px 0' }}>
4141
<iframe

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/service/GroupMemberService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
public interface GroupMemberService {
1414

15-
Mono<List<GroupMember>> getGroupMembers(String groupId, intpage, intcount);
15+
Mono<List<GroupMember>> getGroupMembers(String groupId);
1616

1717
Mono<Boolean> addMember(String orgId, String groupId, String userId, MemberRole memberRole);
1818

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/service/GroupMemberServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class GroupMemberServiceImpl implements GroupMemberService {
2929
private final MongoUpsertHelper mongoUpsertHelper;
3030

3131
@Override
32-
public Mono<List<GroupMember>> getGroupMembers(String groupId, intpage, intcount) {
32+
public Mono<List<GroupMember>> getGroupMembers(String groupId) {
3333
return biRelationService.getBySourceId(GROUP_MEMBER, groupId)
3434
.map(GroupMember::from)
3535
.collectList();

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/solution/SuggestAppAdminSolutionServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ private Mono<List<String>> getSuggestAdminIds(int limit, List<ResourcePermission
6363

6464
Set<String> adminUserIdSet = newHashSet(adminUserIds);
6565
return Flux.fromIterable(adminGroupIds)
66-
.flatMap(groupId -> groupMemberService.getGroupMembers(groupId, 1, 100))
66+
.flatMap(groupMemberService::getGroupMembers)
6767
.flatMapIterable(list -> list)
6868
.map(GroupMember::getUserId)
6969
.filter(it -> !adminUserIdSet.contains(it))

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /