Merge branch 'dev' of github.com:lowcoder-org/lowcoder into feat/1903-editmode-util

Author: iamfaran

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

@@ -45,7 +45,7 @@ function ViewLoading(props: { padding?: number }) {
   );
 }
 
-interface RemoteCompReadyAction {
+export interface RemoteCompReadyAction {
   type: "RemoteCompReady";
   comp: Comp;
 }

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

@@ -26,6 +26,7 @@ import { setFieldsNoTypeCheck } from "util/objectUtils";
 import { map } from "./map";
 import { paramsEqual, withParamsWithDefault } from "./withParams";
 import { LazyCompReadyAction } from "../comps/lazyLoadComp/lazyLoadComp";
+import { RemoteCompReadyAction } from "../comps/remoteComp/remoteComp";
 
 export const COMP_KEY = "__comp__";
 export const MAP_KEY = "__map__";
@@ -171,6 +172,7 @@ export function withMultiContext<TCtor extends MultiCompConstructor>(VariantComp
         && (
           !thisCompMap.hasOwnProperty(action.path[1])
           || isCustomAction<LazyCompReadyAction>(action, "LazyCompReady")
+          || isCustomAction<RemoteCompReadyAction>(action, "RemoteCompReady")
         )
       ) {
         /**

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

@@ -14,6 +14,7 @@ import { COMP_KEY, MAP_KEY, withMultiContext } from "./withMultiContext";
 import { paramsEqual } from "./withParams";
 import { LazyCompReadyAction } from "../comps/lazyLoadComp/lazyLoadComp";
 import { ModuleReadyAction } from "../comps/moduleComp/moduleComp";
+import { RemoteCompReadyAction } from "../comps/remoteComp/remoteComp";
 
 const SELECTED_KEY = "SELECTED";
 
@@ -75,6 +76,7 @@ export function withSelectedMultiContext<TCtor extends MultiCompConstructor>(
       } else if ((
         !action.editDSL
         && !isCustomAction<LazyCompReadyAction>(action, "LazyCompReady")
+        && !isCustomAction<RemoteCompReadyAction>(action, "RemoteCompReady")
         && !isCustomAction<ModuleReadyAction>(action, "moduleReady")
         ) || action.path[0] !== MAP_KEY || _.isNil(action.path[1])
       ) {
@@ -85,6 +87,7 @@ export function withSelectedMultiContext<TCtor extends MultiCompConstructor>(
       } else if ((
         action.editDSL
         || isCustomAction<LazyCompReadyAction>(action, "LazyCompReady")
+        || isCustomAction<RemoteCompReadyAction>(action, "RemoteCompReady")
         || isCustomAction<ModuleReadyAction>(action, "moduleReady")
       ) && (
         action.path[1] === SELECTED_KEY
@@ -104,6 +107,7 @@ export function withSelectedMultiContext<TCtor extends MultiCompConstructor>(
         && (
           isCustomAction<ModuleReadyAction>(action, "moduleReady")
           || isCustomAction<LazyCompReadyAction>(action, "LazyCompReady")
+          || isCustomAction<RemoteCompReadyAction>(action, "RemoteCompReady")
         ) && action.path[0] === MAP_KEY
       ) {
         comp = super.reduce(action);