Merge branch 'dev' of https://github.com/MenamAfzal/lowcoder into calendar-modal

Author: MenamAfzal

client/VERSION

@@ -1 +1 @@
-2.4.6
+2.4.7

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-frontend",
-  "version": "2.4.6",
+  "version": "2.4.7",
   "type": "module",
   "private": true,
   "workspaces": [
@@ -24,7 +24,7 @@
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-typescript": "^7.18.6",
-    "@rollup/plugin-typescript": "^8.5.0",
+    "@rollup/plugin-typescript": "^12.1.0",
     "@testing-library/jest-dom": "^5.16.5",
     "@types/file-saver": "^2.0.5",
     "@types/jest": "^29.2.2",
@@ -84,7 +84,7 @@
     "react-countup": "^6.5.3",
     "react-player": "^2.11.0",
     "resize-observer-polyfill": "^1.5.1",
-    "rollup": "^4.13.0",
+    "rollup": "^4.22.5",
     "simplebar": "^6.2.5",
     "tui-image-editor": "^3.15.3"
   }

client/packages/lowcoder-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-sdk",
-  "version": "2.4.13",
+  "version": "2.4.14",
   "type": "module",
   "files": [
     "src",

client/packages/lowcoder/src/components/ThemeSettingsSelector.tsx

@@ -428,7 +428,6 @@ export default function ThemeSettingsSelector(props: ColorConfigProps) {
             size="small"
             checked={showComponentLoaders}
             onChange={(value) => {
-              debugger;
               setComponentLoaders(value)
               configChange({ themeSettingKey, showComponentLoadingIndicators: value});
             }}

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

@@ -234,7 +234,7 @@ function AppSettingsModal(props: ChildrenInstance) {
   useEffect(() => {
     setLowcoderCompVersions([
       'latest',
-      ...Object.keys(lowcoderCompsMeta.versions).reverse()
+      ...Object.keys(lowcoderCompsMeta?.versions || []).reverse()
     ])
   }, [lowcoderCompsMeta])
 

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

@@ -8,7 +8,7 @@ import { WhiteLoading } from "lowcoder-design";
 import { useContext, useState } from "react";
 import { useMount } from "react-use";
 import styled from "styled-components";
-import { RemoteCompInfo, RemoteCompLoader } from "types/remoteComp";
+import { RemoteCompInfo, RemoteCompLoader, RemoteCompSource } from "types/remoteComp";
 import { loaders } from "./loaders"; 
 import { withErrorBoundary } from "comps/generators/withErrorBoundary";
 import { EditorContext } from "@lowcoder-ee/comps/editorState";
@@ -54,10 +54,11 @@ interface RemoteCompViewProps {
   loadComp: (packageVersion?: string) => Promise<void>;
   loadingElement?: () => React.ReactNode;
   errorElement?: (error: any) => React.ReactNode;
+  source?: RemoteCompSource;
 }
 
 const RemoteCompView = React.memo((props: React.PropsWithChildren<RemoteCompViewProps>) => {
-  const { loadComp, loadingElement, errorElement, isLowcoderComp } = props;
+  const { loadComp, loadingElement, errorElement, isLowcoderComp, source } = props;
   const [error, setError] = useState<any>("");
   const editorState = useContext(EditorContext);
   const compState = useContext(CompContext);
@@ -66,7 +67,7 @@ const RemoteCompView = React.memo((props: React.PropsWithChildren<RemoteCompView
 
   let packageVersion = 'latest';
   // lowcoder-comps's package version
-  if (isLowcoderComp) {
+  if (isLowcoderComp && source !== 'bundle') {
     packageVersion = lowcoderCompPackageVersion === 'latest' && Boolean(latestLowcoderCompsVersion)
       ? latestLowcoderCompsVersion
       : lowcoderCompPackageVersion;
@@ -160,6 +161,7 @@ export function remoteComp<T extends RemoteCompInfo = RemoteCompInfo>(
           isLowcoderComp={remoteInfo?.packageName === 'lowcoder-comps'}
           loadComp={(packageVersion?: string) => this.load(packageVersion)}
           loadingElement={loadingElement}
+          source={remoteInfo?.source}
         />
       );
     }

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

@@ -465,8 +465,8 @@ export function genSelectionParams(
   filterData: RecordType[],
   selection: string
 ): Record<string, unknown> | undefined {
-  const idx = filterData.findIndex((row) => row[OB_ROW_ORI_INDEX] === selection);
-  if (idx < 0) {
+  const idx = filterData?.findIndex((row) => row[OB_ROW_ORI_INDEX] === selection);
+  if (!Boolean(filterData) || idx < 0) {
     return undefined;
   }
   const currentRow = filterData[idx];

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

@@ -87,10 +87,6 @@ export function withSelectedMultiContext<TCtor extends MultiCompConstructor>(
         || isCustomAction<LazyCompReadyAction>(action, "LazyCompReady")
         || isCustomAction<ModuleReadyAction>(action, "moduleReady")
       ) && action.path[1] === SELECTED_KEY) {
-        if (action.path[0] === MAP_KEY && action.path[1] === SELECTED_KEY) {
-          action.path[1] = this.selection;
-          comp = super.reduce(action);
-        }
         // broadcast
         const newAction = {
           ...action,

client/packages/lowcoder/src/constants/orgConstants.ts

@@ -1,21 +1,24 @@
 import { CommonSettingResponseData } from "api/commonSettingApi";
 import { trans } from "i18n";
 
-export const ADMIN_ROLE = "admin" || "super_admin";
+export const ADMIN_ROLE = "admin";
+export const SUPER_ADMIN_ROLE = "super_admin";
 export const MEMBER_ROLE = "member";
 
 export const NEW_ORG_PREFIX = trans("orgSettings.newOrg");
 
 export const TacoRoles = [ADMIN_ROLE, MEMBER_ROLE] as const;
-export type RoleIdType = typeof TacoRoles[number];
+export type RoleIdType = typeof TacoRoles[number] | "super_admin";
 type RoleInfoType = Record<RoleIdType, { name: string; desc: string }>;
 
 export const GroupRoleInfo: RoleInfoType = {
+  super_admin: { name: trans("memberSettings.superAdmin"), desc: trans("memberSettings.adminGroupRoleInfo") },
   admin: { name: trans("memberSettings.admin"), desc: trans("memberSettings.adminGroupRoleInfo") },
   member: { name: trans("memberSettings.member"), desc: trans("memberSettings.memberGroupRoleInfo"), },
 };
 
 export const OrgRoleInfo: RoleInfoType = {
+  super_admin: { name: trans("memberSettings.superAdmin"), desc: trans("memberSettings.adminGroupRoleInfo") },
   admin: { name: trans("memberSettings.admin"), desc: trans("memberSettings.adminOrgRoleInfo") },
   member: { name: trans("memberSettings.member"), desc: trans("memberSettings.memberOrgRoleInfo") },
 };

client/packages/lowcoder/src/i18n/locales/de.ts

@@ -2270,6 +2270,7 @@ export const de = {
     ...en.memberSettings,
 
   "admin": "Verwaltung",
+  "superAdmin": "Super Admin",
   "adminGroupRoleInfo": "Admin kann Gruppenmitglieder und Ressourcen verwalten",
   "adminOrgRoleInfo": "Admins besitzen alle Ressourcen und können Gruppen verwalten.",
   "member": "Mitglied",