Skip to content

Commit 7c0aace

Browse files
authored
Merge branch 'lowcoder-org:main' into patch-2
2 parents 19de66c + 4968773 commit 7c0aace

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed

client/packages/lowcoder-sdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-sdk",
3-
"version": "0.0.41",
3+
"version": "2.1.0",
44
"type": "module",
55
"files": [
66
"src",

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

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,29 @@ async function npmLoader(remoteInfo: RemoteCompInfo): Promise<CompConstructor |
77
// log.info("load npm plugin:", remoteInfo);
88
const { packageName, packageVersion = "latest", compName } = remoteInfo;
99
const entry = `${NPM_PLUGIN_ASSETS_BASE_URL}/${packageName}@${packageVersion}/index.js`;
10-
const module = await import(/* @vite-ignore */ entry);
11-
const comp = module.default?.[compName];
12-
if (!comp) {
10+
console.log("Entry", entry);
11+
try {
12+
const module = await import(/* webpackIgnore: true */ entry);
13+
// let module = moduleGlobe;
14+
// if (packageName !== "openblocks-comps-workmeet") {
15+
// module = await import(entry);
16+
// }
17+
console.log("Entry 1", module);
18+
const comp = module.default?.[compName];
19+
if (!comp) {
20+
throw new Error(trans("npm.compNotFound", { compName }));
21+
}
22+
return comp;
23+
} catch (e) {
24+
console.log("eeeee", e);
1325
throw new Error(trans("npm.compNotFound", { compName }));
1426
}
15-
return comp;
1627
}
1728

1829
async function bundleLoader(remoteInfo: RemoteCompInfo): Promise<CompConstructor | null> {
1930
const { packageName, packageVersion = "latest", compName } = remoteInfo;
2031
const entry = `/${packageName}/${packageVersion}/index.js?v=${REACT_APP_COMMIT_ID}`;
21-
const module = await import(/* @vite-ignore */ entry);
32+
const module = await import(/* webpackIgnore: true */ entry);
2233
const comp = module.default?.[compName];
2334
if (!comp) {
2435
throw new Error(trans("npm.compNotFound", { compName }));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export type NewChildren<ChildrenCompMap extends Record<string, Comp<unknown>>> =
2626
export function HidableView(props: { children: JSX.Element | React.ReactNode; hidden: boolean }) {
2727
const { readOnly } = useContext(ExternalEditorContext);
2828
if (readOnly) {
29-
return <>{!props.hidden && props.children}</>;
29+
return <>{props.children}</>;
3030
} else {
3131
return (
3232
<>

0 commit comments

Comments
 (0)