Merge branch 'dev' into json-schema-form-layouts

Author: FalkWolsky

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

@@ -62,6 +62,7 @@ import { selectCompModifierKeyPressed } from "util/keyUtils";
 import { defaultLayout, GridItemComp, GridItemDataType } from "../gridItemComp";
 import { ThemeContext } from "comps/utils/themeContext";
 import { defaultTheme } from "@lowcoder-ee/constants/themeConstants";
+import { ExpandViewContext } from "../tableComp/expansionControl";
 
 const childrenMap = {
   layout: valueComp<Layout>({}),
@@ -357,11 +358,12 @@ export const InnerGrid = React.memo((props: ViewPropsWithSelect) => {
       || String(DEFAULT_GRID_COLUMNS);
   }, [horizontalGridCells, positionParams.cols]);
 
+  const isExpandView = useContext(ExpandViewContext);
   const isDroppable =
-    useContext(IsDroppable) && (_.isNil(props.isDroppable) || props.isDroppable) && !readOnly;
-  const isDraggable = !readOnly && (_.isNil(props.isDraggable) || props.isDraggable);
-  const isResizable = !readOnly && (_.isNil(props.isResizable) || props.isResizable);
-  const isSelectable = !readOnly && (_.isNil(props.isSelectable) || props.isSelectable);
+    useContext(IsDroppable) && (_.isNil(props.isDroppable) || props.isDroppable) && !readOnly && !isExpandView;
+  const isDraggable = !readOnly  && !isExpandView && (_.isNil(props.isDraggable) || props.isDraggable);
+  const isResizable = !readOnly  && !isExpandView && (_.isNil(props.isResizable) || props.isResizable);
+  const isSelectable = !readOnly  && !isExpandView && (_.isNil(props.isSelectable) || props.isSelectable);
   const extraLayout = useMemo(
     () =>
       getExtraLayout(

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

@@ -119,4 +119,4 @@ const ArrayFieldTemplate = (props: ArrayFieldTemplateProps) => {
   );
 };
 
-export default ArrayFieldTemplate;
+export default ArrayFieldTemplate;

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

@@ -24,9 +24,6 @@ const ObjectFieldTemplate = (props: ObjectFieldTemplateProps) => {
     registry,
   } = props;
   const containerWidth = useContainerWidth();
-
-  // console.log("ObjectFieldTemplate Props", props);
-
   const uiOptions = getUiOptions(uiSchema);
   const TitleFieldTemplate = getTemplate('TitleFieldTemplate', registry, uiOptions);
   const DescriptionFieldTemplate = getTemplate('DescriptionFieldTemplate', registry, uiOptions);
@@ -279,4 +276,4 @@ const ObjectFieldTemplate = (props: ObjectFieldTemplateProps) => {
   );
 };
 
-export default ObjectFieldTemplate;
+export default ObjectFieldTemplate;

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

@@ -26,7 +26,6 @@ import { useContext, useEffect, useRef, useState, createContext } from "react";
 import { EditorContext } from "comps/editorState";
 import ObjectFieldTemplate from './ObjectFieldTemplate';
 import ArrayFieldTemplate from './ArrayFieldTemplate';
-// import { LayoutFieldTemplate } from "./LayoutFieldTemplate";
 import { Select } from 'antd';
 import Title from 'antd/es/typography/Title';
 
@@ -90,8 +89,6 @@ const Container = styled.div<{
   .help-block {
     margin-bottom: 0px;
   }
-
-
 `;
 
 function convertData(schema?: JSONSchema7, data?: any) {
@@ -324,6 +321,7 @@ let FormBasicComp = (function () {
           </ScrollBar>
         </Container>
       </ContainerWidthContext.Provider>
+
     );
   })
     .setPropertyViewFn((children) => {
@@ -482,6 +480,5 @@ FormTmpComp = withMethodExposing(FormTmpComp, [
       }),
   },
 ]);
-
 export const JsonSchemaFormComp = FormTmpComp;
 export { FormTmpComp, useContainerWidth };

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

@@ -11,14 +11,15 @@ import { BackgroundColorContext } from "comps/utils/backgroundColorContext";
 import { trans } from "i18n";
 import _ from "lodash";
 import { ConstructorToView, wrapChildAction } from "lowcoder-core";
-import { useContext } from "react";
+import { createContext, useContext } from "react";
 import { tryToNumber } from "util/convertUtils";
 import { SimpleContainerComp } from "../containerBase/simpleContainerComp";
 import { OB_ROW_ORI_INDEX, RecordType } from "./tableUtils";
 import { NameGenerator } from "comps/utils";
 import { JSONValue } from "util/jsonTypes";
 
 const ContextSlotControl = withSelectedMultiContext(SlotControl);
+export const ExpandViewContext = createContext(false);
 
 const ContainerView = (props: ContainerBaseProps) => {
   return <InnerGrid {...props} emptyRows={15} autoHeight />;
@@ -85,7 +86,11 @@ export class ExpansionControl extends ExpansionControlTmp {
             String(record[OB_ROW_ORI_INDEX])
           );
           const containerProps = slotControl.children.container.getView();
-          return <ExpandView key={record[OB_ROW_ORI_INDEX]} containerProps={containerProps} />;
+          return (
+            <ExpandViewContext.Provider value={true}>
+              <ExpandView key={record[OB_ROW_ORI_INDEX]} containerProps={containerProps} />
+            </ExpandViewContext.Provider>
+          );
         },
       },
       expandModalView: selectedContainer.getView(),

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

@@ -124,11 +124,14 @@ export function withMultiContext<TCtor extends MultiCompConstructor>(VariantComp
         const mapComps = this.getMap();
         if (mapComps.hasOwnProperty(key) && !paramsEqual(params, mapComps[key].getParams())) {
           // refresh the item, since params changed
-          this.dispatch(deferAction(wrapChildAction(MAP_KEY, MapCtor.batchDeleteAction([key]))));
+          // this.dispatch(deferAction(wrapChildAction(MAP_KEY, MapCtor.batchDeleteAction([key]))));
+          this.dispatch(wrapChildAction(MAP_KEY, MapCtor.batchDeleteAction([key])));
+          comp = this.getOriginalComp();
+        } else {
+          comp = this.getOriginalComp()
+            .setParams(params)
+            .changeDispatch(wrapDispatch(wrapDispatch(this.dispatch, MAP_KEY), key));
         }
-        comp = this.getOriginalComp()
-          .setParams(params)
-          .changeDispatch(wrapDispatch(wrapDispatch(this.dispatch, MAP_KEY), key));
       }
       return comp;
     }

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

@@ -35,7 +35,7 @@ const SupaDemoDisplay = ({ url, modalWidth = '75%', modalTop = '6%', showText =
         style={{ top: modalTop }}
         okButtonProps={{ style: { display: 'none' } }}
         cancelButtonProps={{ style: { display: 'none' } }}
-        bodyStyle={{ padding: 0 }}
+        styles={{ body: {padding: 0} }}
       >
         <div style={{ position: 'relative', boxSizing: 'content-box', maxHeight: '80vh', width: '100%', aspectRatio: '1.7712177121771218', padding: '40px 0' }}>
           <iframe

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

@@ -12,7 +12,7 @@
 
 public interface GroupMemberService {
 
-    Mono<List<GroupMember>> getGroupMembers(String groupId, int page, int count);
+    Mono<List<GroupMember>> getGroupMembers(String groupId);
 
     Mono<Boolean> addMember(String orgId, String groupId, String userId, MemberRole memberRole);
 

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

@@ -29,7 +29,7 @@ public class GroupMemberServiceImpl implements GroupMemberService {
     private final MongoUpsertHelper mongoUpsertHelper;
 
     @Override
-    public Mono<List<GroupMember>> getGroupMembers(String groupId, int page, int count) {
+    public Mono<List<GroupMember>> getGroupMembers(String groupId) {
         return biRelationService.getBySourceId(GROUP_MEMBER, groupId)
                 .map(GroupMember::from)
                 .collectList();

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

@@ -63,7 +63,7 @@ private Mono<List<String>> getSuggestAdminIds(int limit, List<ResourcePermission
 
         Set<String> adminUserIdSet = newHashSet(adminUserIds);
         return Flux.fromIterable(adminGroupIds)
-                .flatMap(groupId -> groupMemberService.getGroupMembers(groupId, 1, 100))
+                .flatMap(groupMemberService::getGroupMembers)
                 .flatMapIterable(list -> list)
                 .map(GroupMember::getUserId)
                 .filter(it -> !adminUserIdSet.contains(it))