Skip to content

Commit cc632b0

Browse files
author
th37rose
authored
Merge branch 'dev' into feature/bundle
2 parents 1a72537 + ccfa44b commit cc632b0

File tree

20 files changed

+2486
-73
lines changed

20 files changed

+2486
-73
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ export { ReactComponent as InviteUserIcon } from "./icon-application-invite-user
125125
export { ReactComponent as HomeEmptyIcon } from "./icon-application-empty.svg";
126126
export { ReactComponent as HomeListIcon } from "./icon-application-list.svg";
127127
export { ReactComponent as HomeCardIcon } from "./icon-application-card.svg";
128+
export { ReactComponent as APIDocsIcon } from "./remix/instance-line.svg";
128129
// export { ReactComponent as AllAppIcon } from "./icon-all-app.svg";
129130

130131

‎client/packages/lowcoder/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"@rjsf/core": "^5.15.1",
3030
"@rjsf/utils": "^5.15.1",
3131
"@rjsf/validator-ajv8": "^5.15.1",
32+
"@stoplight/elements": "^8.1.3",
3233
"@types/lodash": "^4.14.194",
3334
"@types/node": "^16.7.13",
3435
"@types/react": "^18.2.45",
@@ -128,6 +129,7 @@
128129
"vite-plugin-checker": "^0.5.1",
129130
"vite-plugin-dynamic-import": "^1.5.0",
130131
"vite-plugin-html": "^3.2.0",
132+
"vite-plugin-node-polyfills": "^0.22.0",
131133
"vite-plugin-svgr": "^2.2.2",
132134
"vite-tsconfig-paths": "^3.6.0"
133135
}

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

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import {
2727
ADMIN_APP_URL,
2828
ORG_AUTH_FORGOT_PASSWORD_URL,
2929
ORG_AUTH_RESET_PASSWORD_URL,
30+
API_DOCS_URL,
3031
} from "constants/routesURL";
31-
3232
import React from "react";
3333
import { createRoot } from "react-dom/client";
3434
import { Helmet } from "react-helmet";
@@ -123,10 +123,43 @@ class AppIndex extends React.Component<AppIndexProps, any> {
123123
{<title>{this.props.brandName}</title>}
124124
{<link rel="icon" href={this.props.favicon} />}
125125
<meta name="description" content={trans("productDesc")} />
126+
<meta name="keywords" content="Lowcoder, Applications, App Builder, Internal Applications, Websites, Dashboards, Data Visualization, Customer Applications, CRM, ERP, eCommerce, VideoMeeting, Rapid Development" />
127+
<meta name="author" content="Lowcoder Software LTD" />
128+
<meta name="robots" content="index, follow" />
129+
130+
131+
<meta key="og:title" property="og:title" content={this.props.brandName} />
132+
<meta key="og:description" property="og:description" content={trans("productDesc")} />
133+
<meta key="og:image" property="og:image" content="https://raw.githubusercontent.com/lowcoder-org/lowcoder-media-assets/main/images/App%20Editor%20%7C%20Main%20Screeen%20clean%20v2.4.0.png" />
134+
<meta key="og:url" property="og:url" content={window.location.href} />
135+
<meta key="og:type" property="og:type" content="website" />
136+
137+
<meta key="twitter:card" name="twitter:card" content="summary_large_image" />
138+
<meta key="twitter:title" name="twitter:title" content={this.props.brandName} />
139+
<meta key="twitter:description" name="twitter:description" content={trans("productDesc")} />
140+
<meta key="twitter:image" name="twitter:image" content="https://raw.githubusercontent.com/lowcoder-org/lowcoder-media-assets/main/images/App%20Editor%20%7C%20Main%20Screeen%20clean%20v2.4.0.png" />
141+
142+
<meta key="viewport" name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
143+
<meta key="mobile-web-app-capable" name="mobile-web-app-capable" content="yes" />
144+
<meta key="theme-color" name="theme-color" content="#b480de" />
145+
146+
<meta key="apple-mobile-web-app-capable" name="apple-mobile-web-app-capable" content="yes" />
147+
<meta key="apple-mobile-web-app-status-bar-style" name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
148+
<meta key="apple-mobile-web-app-title" name="apple-mobile-web-app-title" content={this.props.brandName} />
149+
<link key="apple-touch-icon" rel="apple-touch-icon" href="https://raw.githubusercontent.com/lowcoder-org/lowcoder-media-assets/main/images/Lowcoder%20Logo%20512.png" />
150+
<link key="apple-touch-startup-image" rel="apple-touch-startup-image" href="https://raw.githubusercontent.com/lowcoder-org/lowcoder-media-assets/main/images/Lowcoder%20Logo%20512.png" />
151+
152+
<meta key="application-name" name="application-name" content={this.props.brandName} />
153+
<meta key="msapplication-TileColor" name="msapplication-TileColor" content="#b480de" />
154+
<meta key="msapplication-TileImage" name="msapplication-TileImage" content="https://raw.githubusercontent.com/lowcoder-org/lowcoder-media-assets/main/images/Lowcoder%20Logo%20150.png" />
155+
{/* }<meta key="msapplication-config" name="msapplication-config" content="https://www.yourdomain.com/path/to/browserconfig.xml" />, */}
156+
157+
<link rel="canonical" href={window.location.href} />
126158
{isLowCoderDomain && [
127159
// Adding Support for iframely to be able to embedd the component explorer in the docu
128-
<meta key="iframely:title" property="iframely:title" content="Lowcoder" />,
129-
<meta key="iframely:description" property="iframely:description" content="Lowcoder | rapid App & VideoMeeting builder for everyone." />,
160+
<meta key="iframely:title" property="iframely:title" content={this.props.brandName} />,
161+
<meta key="iframely:description" property="iframely:description" content={trans("productDesc")} />,
162+
130163
<link key="preconnect-googleapis" rel="preconnect" href="https://fonts.googleapis.com" />,
131164
<link key="preconnect-gstatic" rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="anonymous" />,
132165
<link key="font-ubuntu" href="https://fonts.googleapis.com/css2?family=Ubuntu:ital,wght@0,300;0,400;0,700;1,400&display=swap" rel="stylesheet" />,
@@ -176,6 +209,7 @@ class AppIndex extends React.Component<AppIndexProps, any> {
176209
SETTING,
177210
MARKETPLACE_URL,
178211
ADMIN_APP_URL,
212+
API_DOCS_URL,
179213
]}
180214
// component={ApplicationListPage}
181215
component={LazyApplicationHome}
@@ -189,7 +223,6 @@ class AppIndex extends React.Component<AppIndexProps, any> {
189223
<LazyRoute path={`${COMPONENT_DOC_URL}/:name`} component={LazyComponentDoc} />
190224
<LazyRoute path={`/playground/:name/:dsl`} component={LazyComponentPlayground} />
191225
<Redirect to={`${COMPONENT_DOC_URL}/input`} path="/components" />
192-
193226
{developEnv() && (
194227
<>
195228
<LazyRoute path="/debug_comp/:name" component={LazyDebugComp} />

‎client/packages/lowcoder/src/assets/images/marketplaceHeaderImage.jpg

-78.6 KB
Binary file not shown.

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,6 @@ function UIView(props: {
219219
viewFn: any;
220220
}) {
221221
const comp = props.comp;
222-
223222
const childrenProps = childrenToProps(comp.children);
224223
const parentDisabled = useContext(DisabledContext);
225224
const disabled = childrenProps["disabled"];
@@ -236,6 +235,17 @@ function UIView(props: {
236235
}
237236
//END ADD BY FRED
238237

238+
if (comp.children.hasOwnProperty('showMask') && comp.children.hasOwnProperty('maskClosable')) {
239+
return (
240+
<HidableView hidden={childrenProps.hidden as boolean}>
241+
{props.viewFn(
242+
childrenProps,
243+
comp.dispatch
244+
)}
245+
</HidableView>
246+
);
247+
}
248+
239249
return (
240250
<div
241251
ref={props.innerRef}

‎client/packages/lowcoder/src/comps/hooks/drawerComp.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,8 @@ let TmpDrawerComp = (function () {
167167
zIndex={Layers.drawer}
168168
maskClosable={props.maskClosable}
169169
mask={props.showMask}
170+
className={props.className as string}
171+
data-testid={props.dataTestId as string}
170172
>
171173
<ButtonStyle
172174
$closePosition={props.closePosition}

‎client/packages/lowcoder/src/comps/hooks/hookComp.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { trans } from "i18n";
2626
import _ from "lodash";
2727
import dayjs from "dayjs";
2828
import { ConstructorToComp } from "lowcoder-core";
29-
import { Section, sectionNames } from "lowcoder-design";
29+
import { ScrollBar, Section, sectionNames } from "lowcoder-design";
3030
import React, { useContext, useEffect, useMemo } from "react";
3131
import { useInterval, useTitle, useWindowSize } from "react-use";
3232
import { useCurrentUser } from "util/currentUser";
@@ -204,7 +204,9 @@ export class HookComp extends HookTmpComp {
204204
return (
205205
<>
206206
<CompName name={this.children.name.getView()} />
207-
{this.children.comp.getPropertyView()}
207+
<ScrollBar>
208+
{this.children.comp.getPropertyView()}
209+
</ScrollBar>
208210
</>
209211
);
210212
}

‎client/packages/lowcoder/src/comps/hooks/modalComp.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ let TmpModalComp = (function () {
155155
zIndex={Layers.modal}
156156
modalRender={(node) => <ModalStyled $style={props.style}>{node}</ModalStyled>}
157157
mask={props.showMask}
158+
className={props.className as string}
159+
data-testid={props.dataTestId as string}
158160
>
159161
<InnerGrid
160162
{...otherContainerProps}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ export const DATASOURCE_URL = `/datasource`;
3131
export const DATASOURCE_CREATE_URL = `${DATASOURCE_URL}/new/:datasourceType`;
3232
export const DATASOURCE_EDIT_URL = `${DATASOURCE_URL}/:datasourceId`;
3333
export const QUERY_LIBRARY_URL = `/query-library`;
34+
export const API_DOCS_URL = `/lowcoder-api`;
3435
export const FOLDER_URL_PREFIX = `/folder`;
3536
export const FOLDER_URL = `${FOLDER_URL_PREFIX}/:folderId`;
3637
export const FOLDERS_URL = `/folders`;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2199,6 +2199,7 @@ export const en = {
21992199
"theme": "Themes",
22002200
"plugin": "Plugins",
22012201
"advanced": "Advanced",
2202+
"apiDocs": "API Docs",
22022203
"lab": "Lab",
22032204
"branding": "Branding",
22042205
"oauthProviders": "User Authentication",
@@ -2936,6 +2937,7 @@ export const en = {
29362937
"yourFolders" : "Your Folders",
29372938
"modules": "Modules",
29382939
"module": "Module",
2940+
"api" : "Lowcoder API",
29392941
"trash": "Trash",
29402942
"marketplace": "Marketplace",
29412943
"allCategories": "All Categories",

0 commit comments

Comments
 (0)