Merge branch 'dev' into ee-setup

Author: FalkWolsky

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

@@ -690,6 +690,19 @@ TableTmpComp = withMethodExposing(TableTmpComp, [
       comp.children.selection.children.selectedRowKeys.dispatchChangeValueAction([]);
     },
   },
+  {
+    method: {
+      name: "selectAll",
+      description: "Select all rows in the current filtered view",
+      params: [],
+    },
+    execute: (comp) => {
+      const displayData = comp.filterData ?? [];
+      const allKeys = displayData.map((row) => row[OB_ROW_ORI_INDEX] + "");
+      comp.children.selection.children.selectedRowKey.dispatchChangeValueAction(allKeys[0] || "0");
+      comp.children.selection.children.selectedRowKeys.dispatchChangeValueAction(allKeys);
+    },
+  },  
   {
     method: {
       name: "cancelChanges",

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

@@ -249,7 +249,7 @@ public Mono<UserPermissionOnResourceStatus> checkUserPermissionStatusOnApplicati
         Mono<UserPermissionOnResourceStatus> orgUserPermissionMono = getOrgId(resourceId)
                 .flatMap(orgId -> orgMemberService.getOrgMember(orgId, userId))
                 .flatMap(orgMember -> {
-                    if (orgMember.isAdmin()) {
+                    if (orgMember.isAdmin() || orgMember.isSuperAdmin()) {
                         return Mono.just(UserPermissionOnResourceStatus.success(buildAdminPermission(resourceType, resourceId, userId)));
                     }
                     return getAllMatchingPermissions0(userId, orgMember.getOrgId(), resourceType, Collections.singleton(resourceId), resourceAction)
@@ -308,7 +308,7 @@ public Mono<UserPermissionOnResourceStatus> checkUserPermissionStatusOnBundle(St
         Mono<UserPermissionOnResourceStatus> orgUserPermissionMono = getOrgId(resourceId)
                 .flatMap(orgId -> orgMemberService.getOrgMember(orgId, userId))
                 .flatMap(orgMember -> {
-                    if (orgMember.isAdmin()) {
+                    if (orgMember.isAdmin() || orgMember.isSuperAdmin()) {
                         return Mono.just(UserPermissionOnResourceStatus.success(buildAdminPermission(resourceType, resourceId, userId)));
                     }
                     return getAllMatchingPermissions0(userId, orgMember.getOrgId(), resourceType, Collections.singleton(resourceId), resourceAction)

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/plugin/SharedPluginServices.java

@@ -53,15 +53,11 @@ public void setConfig(String key, Object value) {
 		serverConfigRepository.upsert(key, value).block();
 	}
 
-//	@Override
-//	public Object getConfig(String key) {
-//		return serverConfigRepository.findByKey(key)
-//				.map(ServerConfig::getValue)
-//				.block();
-//	}
-
 	@Override
 	public Object getConfig(String key) {
-		return serverConfigRepository.findByKey(key).block();
+		return serverConfigRepository.findByKey(key)
+				.map(ServerConfig::getValue)
+				.block();
 	}
+
 }

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

@@ -118,7 +118,7 @@ public Mono<GroupMemberAggregateView> getGroupMembers(String groupId, int page,
     private boolean hasReadPermission(Tuple2<GroupMember, OrgMember> tuple) {
         GroupMember groupMember = tuple.getT1();
         OrgMember orgMember = tuple.getT2();
-        return groupMember.isValid() || orgMember.isAdmin();
+        return orgMember.isSuperAdmin() || groupMember.isValid() || orgMember.isAdmin();
     }
 
     private boolean hasManagePermission(Tuple2<GroupMember, OrgMember> tuple) {