Skip to content

Commit 10cf573

Browse files
dragonpoodragonpoo
authored
Merge branch 'dev' into fix/myorg
2 parents 5015a71 + 3d063e2 commit 10cf573

File tree

44 files changed

+568
-321
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+568
-321
lines changed

‎client/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.0
1+
2.7.2

‎client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-frontend",
3-
"version": "2.7.0",
3+
"version": "2.7.2",
44
"type": "module",
55
"private": true,
66
"workspaces": [

‎client/packages/lowcoder-comps/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-comps",
3-
"version": "2.7.1",
3+
"version": "2.7.2",
44
"type": "module",
55
"license": "MIT",
66
"dependencies": {

‎client/packages/lowcoder-design/src/icons/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ export { ReactComponent as RecyclerIcon } from "./remix/delete-bin-line.svg";
255255
export { ReactComponent as MarketplaceIcon } from "./v1/icon-application-marketplace.svg";
256256
export { ReactComponent as FavoritesIcon } from "./v1/icon-application-favorites.svg";
257257
export { ReactComponent as HomeSettingIcon } from "./remix/settings-4-line.svg";
258-
export { ReactComponent as EnterpriseIcon } from "./remix/earth-line.svg";
258+
export { ReactComponent as EnterpriseIcon } from "./remix/shield-star-line.svg";
259259
export { ReactComponent as VerticalIcon } from "./remix/vertical.svg";
260260
export { ReactComponent as HorizontalIcon } from "./remix/horizontal.svg";
261261

‎client/packages/lowcoder-sdk-webpack-bundle/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "lowcoder-sdk-webpack-bundle",
33
"description": "",
4-
"version": "2.7.0",
4+
"version": "2.7.2",
55
"main": "index.jsx",
66
"scripts": {
77
"test": "echo \"Error: no test specified\" && exit 1",

‎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": "2.7.0",
3+
"version": "2.7.2",
44
"type": "module",
55
"files": [
66
"src",

‎client/packages/lowcoder/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder",
3-
"version": "2.7.0",
3+
"version": "2.7.2",
44
"private": true,
55
"type": "module",
66
"main": "src/index.sdk.ts",

‎client/packages/lowcoder/src/api/newsApi.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export const getHubspotContent = async () => {
132132
};
133133
try {
134134
const result = await NewsApi.secureRequest(apiBody);
135-
return result?.data[0]?.hubspot?.length > 0 ? result.data[0].hubspot as any[] : [];
135+
return result?.data[0]?.results?.length > 0 ? result.data[0].results as any[] : [];
136136
} catch (error) {
137137
console.error("Error getting news:", error);
138138
throw error;

‎client/packages/lowcoder/src/app.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ import GlobalInstances from 'components/GlobalInstances';
6060
import { fetchHomeData, fetchServerSettingsAction } from "./redux/reduxActions/applicationActions";
6161
import { getNpmPackageMeta } from "./comps/utils/remote";
6262
import { packageMetaReadyAction, setLowcoderCompsLoading } from "./redux/reduxActions/npmPluginActions";
63-
import { fetchBrandingSetting } from "./redux/reduxActions/enterpriseActions";
6463
import { EnterpriseProvider } from "./util/context/EnterpriseContext";
6564
import { SimpleSubscriptionContextProvider } from "./util/context/SimpleSubscriptionContext";
6665
import { getBrandingSetting } from "./redux/selectors/enterpriseSelectors";
@@ -137,7 +136,6 @@ type AppIndexProps = {
137136
defaultHomePage: string | null | undefined;
138137
fetchHomeDataFinished: boolean;
139138
fetchConfig: (orgId?: string) => void;
140-
fetchBrandingSetting: (orgId?: string) => void;
141139
fetchHomeData: (currentUserAnonymous?: boolean | undefined) => void;
142140
fetchLowcoderCompVersions: () => void;
143141
getCurrentUser: () => void;
@@ -167,7 +165,6 @@ class AppIndex extends React.Component<AppIndexProps, any> {
167165
if (!this.props.currentUserAnonymous) {
168166
this.props.fetchHomeData(this.props.currentUserAnonymous);
169167
this.props.fetchLowcoderCompVersions();
170-
this.props.fetchBrandingSetting(this.props.currentOrgId);
171168
}
172169
}
173170
}
@@ -521,7 +518,6 @@ const mapDispatchToProps = (dispatch: any) => ({
521518
fetchHomeData: (currentUserAnonymous: boolean | undefined) => {
522519
dispatch(fetchHomeData({}));
523520
},
524-
fetchBrandingSetting: (orgId?: string) => dispatch(fetchBrandingSetting({ orgId, fallbackToGlobal: true })),
525521
fetchLowcoderCompVersions: async () => {
526522
try {
527523
dispatch(setLowcoderCompsLoading(true));

‎client/packages/lowcoder/src/comps/comps/moduleContainerComp/moduleLayoutComp.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,12 @@ function ModuleLayoutView(props: IProps) {
6565
const defaultGrid = useContext(ThemeContext)?.theme?.gridColumns || "24"; //Added By Aqib Mirza
6666
const { readOnly } = useContext(ExternalEditorContext);
6767

68-
if (readOnly) {
69-
return (
70-
<ModulePreviewWrapper className={CNRootContainer}>{props.containerView}</ModulePreviewWrapper>
71-
);
72-
}
68+
// Removed this so that module load with canvas view and app settings will apply
69+
// if (readOnly) {
70+
// return (
71+
// <ModulePreviewWrapper className={CNRootContainer}>{props.containerView}</ModulePreviewWrapper>
72+
// );
73+
// }
7374

7475
const layout = {
7576
[moduleContainerId]: {

‎client/packages/lowcoder/src/comps/comps/rootComp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ const RootView = React.memo((props: RootViewProps) => {
8282
localDefaultTheme;
8383

8484
const themeId = selectedTheme ? selectedTheme.id : (
85-
previewTheme ? "preview-theme" : 'default-theme-id'
85+
previewTheme?.previewTheme ? "preview-theme" : 'default-theme-id'
8686
);
8787

8888
useEffect(() => {

‎client/packages/lowcoder/src/comps/comps/tableComp/column/simpleColumnTypeComps.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ import { ToViewReturn } from "@lowcoder-ee/comps/generators/multi";
1616
import { clickEvent, eventHandlerControl, doubleClickEvent } from "comps/controls/eventHandlerControl";
1717
import { migrateOldData } from "@lowcoder-ee/comps/generators/simpleGenerators";
1818
import { useCompClickEventHandler } from "@lowcoder-ee/comps/utils/useCompClickEventHandler";
19+
import { isArray } from "lodash";
1920

2021
export const fixOldActionData = (oldData: any) => {
2122
if (!oldData) return oldData;
22-
if (Boolean(oldData.onClick)) {
23+
if (Boolean(oldData.onClick && !isArray(oldData.onClick))) {
2324
return {
2425
...oldData,
2526
onClick: [{

‎client/packages/lowcoder/src/comps/comps/tabs/tabbedContainerComp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ const TabbedContainer = (props: TabbedContainerProps) => {
245245
label,
246246
key: tab.key,
247247
forceRender: !destroyInactiveTab,
248-
destroyInactiveTabPane: destroyInactiveTab,
248+
destroyInactiveTab: destroyInactiveTab,
249249
children: (
250250
<BackgroundColorContext.Provider value={bodyStyle.background}>
251251
<ScrollBar style={{ height: props.autoHeight ? "auto" : "100%", margin: "0px", padding: "0px" }} hideScrollbar={!props.showVerticalScrollbar} overflow={props.autoHeight ? 'hidden':'scroll'}>

‎client/packages/lowcoder/src/constants/applicationConstants.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ export interface ApplicationMeta {
8181
title?: string;
8282
description?: string;
8383
image?: string;
84+
icon?: string;
8485
category?: ApplicationCategoriesEnum;
8586
showheader?: boolean;
8687
orgId: string;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2458,8 +2458,10 @@ export const de = {
24582458
"usageLogDevices": "Gerät/OS Aufschlüsselung",
24592459
"usageLogBrowsers": "Browser/Layout Engine Aufschlüsselung",
24602460
"premiumFeaturesNotice": "Alle Premium Features sind in der Enterprise Edition von Lowcoder verfügbar.",
2461+
"readMoreNotice" : "Erfahren Sie mehr über die Enterprise Edition und wie Sie sie ganz einfach installieren können.",
2462+
"readMoreButton": "Details zur Enterprise Edition",
24612463
"requestLicense": "Lizenzen für die Enterprise Edition anfordern",
2462-
"requestLicensesBtton": "Request Enterprise Access",
2464+
"requestLicensesBtton": "Enterprise Edition anfragen",
24632465
"AuditLogsTitle": "Audit Logs",
24642466
"AuditLogsIntroTitle": "Leistungsstarker Einblick in die Aktivitäten Ihres Arbeitsbereichs",
24652467
"AuditLogsIntro1": "Mithilfe von Audit-Protokollen können Administratoren genau verfolgen, was auf der gesamten Lowcoder-Plattform passiert. Von Benutzeranmeldungen bis hin zu App-Änderungen wird jede relevante Aktion erfasst und gespeichert.",

‎client/packages/lowcoder/src/i18n/locales/en.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2449,8 +2449,10 @@ export const en = {
24492449
"usageLogDevices" : "Device/OS Breakdown",
24502450
"usageLogBrowsers" : "Browser/Layout Engine Breakdown",
24512451
"premiumFeaturesNotice" : "All Premium Features are avilable in the Enterprise Edition of Lowcoder.",
2452+
"readMoreNotice" : "Learn more about the Enterprise Edition and how to install it easily.",
2453+
"readMoreButton" : "Enterprise Edition Details",
24522454
"requestLicense" : "Request Enterprise Edition Licenses",
2453-
"requestLicensesBtton" : "Request Enterprise Access",
2455+
"requestLicensesBtton" : "Unlock Enterprise Features",
24542456
"AuditLogsTitle": "Audit Logs",
24552457
"AuditLogsIntroTitle": "Powerful visibility into your workspace activity",
24562458
"AuditLogsIntro1": "Audit Logs enable administrators to track exactly what happens across the entire Lowcoder platform. From user sign-ins to app modifications, every relevant action is captured and stored.",
@@ -3929,6 +3931,10 @@ export const en = {
39293931
"datasource": "Data Sources",
39303932
"selectDatasourceType": "Select Data Source Type",
39313933
"home": "Home",
3934+
"desc": "Description",
3935+
"renameApp": "Rename app",
3936+
"updateAppName": "Update Application Name",
3937+
"titleUpdateWarning": "The card displays the app title. Changing the app name will not update the card view.",
39323938
"all": "All",
39333939
"app": "App",
39343940
"navigation": "Navigation",

‎client/packages/lowcoder/src/i18n/locales/es.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2458,6 +2458,8 @@ export const es = {
24582458
"usageLogDevices": "Desglose de dispositivos/OS",
24592459
"usageLogBrowsers": "Desglose del navegador/motor de diseño",
24602460
"premiumFeaturesNotice": "Todas las características Premium están disponibles en la Edición Enterprise de Lowcoder.",
2461+
"readMoreNotice" : "Conozca más sobre la edición Enterprise y cómo instalarla fácilmente.",
2462+
"readMoreButton": "Detalles de la edición Enterprise",
24612463
"requestLicense": "Solicitar licencias de Enterprise Edition",
24622464
"requestLicensesBtton": "Solicitar acceso para empresas",
24632465
"AuditLogsTitle": "Registros de auditoría",

‎client/packages/lowcoder/src/i18n/locales/it.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2458,6 +2458,8 @@ export const it = {
24582458
"usageLogDevices": "Ripartizione dispositivi/OS",
24592459
"usageLogBrowsers": "Browser/Motore di layout",
24602460
"premiumFeaturesNotice": "Tutte le funzioni Premium sono disponibili nell'edizione Enterprise di Lowcoder.",
2461+
"readMoreNotice" : "Scopri di più sulla versione Enterprise e su come installarla facilmente.",
2462+
"readMoreButton": "Dettagli dell'edizione Enterprise",
24612463
"requestLicense": "Richiesta di licenze Enterprise Edition",
24622464
"requestLicensesBtton": "Richiesta di accesso aziendale",
24632465
"AuditLogsTitle": "Registri di controllo",

‎client/packages/lowcoder/src/i18n/locales/pt.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2458,6 +2458,8 @@ export const pt = {
24582458
"usageLogDevices": "Discriminação por dispositivo/SO",
24592459
"usageLogBrowsers": "Navegador/motor de apresentação",
24602460
"premiumFeaturesNotice": "Todas as funcionalidades Premium estão disponíveis na Enterprise Edition do Lowcoder.",
2461+
"readMoreNotice" : "Saiba mais sobre a edição Enterprise e como instalá-la com facilidade.",
2462+
"readMoreButton": "Detalhes da edição Enterprise",
24612463
"requestLicense": "Solicitar licenças da Enterprise Edition",
24622464
"requestLicensesBtton": "Pedir acesso à empresa",
24632465
"AuditLogsTitle": "Registos de auditoria",

‎client/packages/lowcoder/src/i18n/locales/ru.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2458,6 +2458,8 @@ export const ru = {
24582458
"usageLogDevices": "Разбивка по устройствам/ОС",
24592459
"usageLogBrowsers": "Разбивка браузера/программного обеспечения",
24602460
"premiumFeaturesNotice": "Все премиум-функции доступны в корпоративной версии Lowcoder.",
2461+
"readMoreNotice" : "Узнайте больше о версии Enterprise и о том, как легко её установить.",
2462+
"readMoreButton": "Подробности о версии Enterprise",
24612463
"requestLicense": "Запрос лицензий Enterprise Edition",
24622464
"requestLicensesBtton": "Запрос доступа к предприятию",
24632465
"AuditLogsTitle": "Журналы аудита",

‎client/packages/lowcoder/src/i18n/locales/zh.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2459,6 +2459,8 @@ export const zh = {
24592459
"usageLogDevices": "设备/操作系统明细",
24602460
"usageLogBrowsers": "浏览器/布局引擎细分",
24612461
"premiumFeaturesNotice": "Lowcoder 企业版可提供所有高级功能。",
2462+
"readMoreNotice" : "了解有关企业版的更多信息，以及如何轻松安装它。",
2463+
"readMoreButton": "企业版详情",
24622464
"requestLicense": "申请企业版许可证",
24632465
"requestLicensesBtton": "申请企业访问权限",
24642466
"AuditLogsTitle": "审计日志",

‎client/packages/lowcoder/src/layout/compSelectionWrapper.tsx

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -242,18 +242,8 @@ const ResizableChildren = React.memo((props: {
242242
children: JSX.Element | React.ReactNode;
243243
}) => {
244244
const { ref: innerRef } = useResizeDetector({
245-
skipOnMount: (
246-
props.compType === 'responsiveLayout'
247-
|| props.compType === 'columnLayout'
248-
|| props.compType === 'pageLayout'
249-
|| props.compType === 'splitLayout'
250-
|| props.compType === 'floatTextContainer'
251-
|| props.compType === 'tabbedContainer'
252-
|| props.compType === 'collapsibleContainer'
253-
|| props.compType === 'container'
254-
),
255245
refreshMode: "debounce",
256-
refreshRate: 0,
246+
refreshRate: 10,
257247
onResize: ({width, height}: ResizePayload) => props.onInnerResize(width ?? undefined, height ?? undefined),
258248
observerOptions: { box: "border-box" }
259249
});

‎client/packages/lowcoder/src/pages/ApplicationV2/HomeLayout.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ export function HomeLayout(props: HomeLayoutProps) {
469469
title: e.title,
470470
description: e.description,
471471
category: e.category,
472-
icon: e.image,
472+
icon: e.icon,
473473
type: HomeResTypeEnum[HomeResTypeEnum[e.applicationType] as HomeResKey],
474474
creator: e?.creatorEmail ?? e.createBy,
475475
lastModifyTime: e.lastModifyTime,
@@ -630,7 +630,7 @@ export function HomeLayout(props: HomeLayoutProps) {
630630

631631
<Divider />
632632

633-
<ContentWrapper>
633+
<ContentWrapper>
634634

635635
{isFetching && resList.length === 0 ? (
636636
<SkeletonStyle active paragraph={{ rows: 8, width: 648 }} title={false} />

0 commit comments

Comments
 (0)