Skip to content

Commit 0622301

Browse files
aq-ikhwa-techaq-ikhwa-tech
committed
Merge branch 'dev' into session-timeout-for-oauth
2 parents 3d5ddb5 + f65f85b commit 0622301

File tree

71 files changed

+1312
-802
lines changed

Some content is hidden

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

71 files changed

+1312
-802
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,4 @@ You can access Lowcoder from [cloud-hosted version](https://app.lowcoder.cloud/)
9999
Accelerate the growth of Lowcoder and unleash its potential with your Sponsorship – together, we're shaping the future of Lowcode for everyone!
100100
[Be a Sponsor](https://github.com/sponsors/lowcoder-org)
101101

102-
Like ... @CHSchuepfer & @spacegoats-io. Thank you very much!!
102+
Like ... [@spacegoats-io](https://github.com/spacegoats-io), [@Jomedya](https://github.com/Jomedya), [@CHSchuepfer](https://github.com/CHSchuepfer), Thank you very much!!

‎client/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
},
1212
"scripts": {
1313
"start": "yarn workspace lowcoder start",
14+
"start-win": "LOWCODER_API_SERVICE_URL=http://localhost:3000 yarn start",
1415
"start:ee": "REACT_APP_EDITION=enterprise yarn workspace lowcoder start",
1516
"start:ee-global": "REACT_APP_EDITION=enterprise-global yarn workspace lowcoder start",
1617
"build": "yarn node ./scripts/build.js",

‎client/packages/lowcoder/index.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
<meta name="theme-color" content="#000000" />
88
<meta property="iframely:title" content="Lowcoder" />
99
<meta property="iframely:description" content="Lowcoder | rapid App & VideoMeeting builder for everyone." />
10+
<!-- Added Montserrat google font link to test font family style property for components -->
11+
<link rel="preconnect" href="https://fonts.googleapis.com">
12+
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
13+
<link href="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100..900;1,100..900&display=swap" rel="stylesheet">
1014
<style>
1115
html,
1216
body {

‎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.2.0",
3+
"version": "2.3.1",
44
"private": true,
55
"type": "module",
66
"main": "src/index.sdk.ts",

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,14 @@ export class OrgApi extends Api {
133133
return Api.put(OrgApi.updateOrgURL(request.id), request);
134134
}
135135

136-
static fetchAPIUsage(orgId: string, lastMonthOnly?: boolean): AxiosPromise<ApiResponse> {
137-
return Api.get(OrgApi.fetchUsage(orgId), lastMonthOnly);
136+
static fetchAPIUsage(orgId: string): AxiosPromise<ApiResponse> {
137+
return Api.get(OrgApi.fetchUsage(orgId));
138138
}
139+
140+
static fetchLastMonthAPIUsage(orgId: string): AxiosPromise<ApiResponse> {
141+
return Api.get(OrgApi.fetchUsage(orgId), { lastMonthOnly: true });
142+
}
143+
139144
}
140145

141146
export default OrgApi;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ const childrenMap = {
138138
maxWidth: dropdownInputSimpleControl(OPTIONS, USER_DEFINE, "1920"),
139139
themeId: valueComp<string>(DEFAULT_THEMEID),
140140
customShortcuts: CustomShortcutsComp,
141+
disableCollision: valueComp<boolean>(false),
141142
};
142143
type ChildrenInstance = RecordConstructorToComp<typeof childrenMap> & {
143144
themeList: ThemeType[];

‎client/packages/lowcoder/src/comps/comps/buttonComp/buttonCompConstants.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ export function getButtonStyle(buttonStyle: ButtonStyleType) {
1313
return css`
1414
&&& {
1515
border-radius: ${buttonStyle.radius};
16+
border-width:${buttonStyle.borderWidth};
1617
margin: ${buttonStyle.margin};
1718
padding: ${buttonStyle.padding};
1819
&:not(:disabled) {
@@ -22,6 +23,7 @@ export function getButtonStyle(buttonStyle: ButtonStyleType) {
2223
font-size: ${buttonStyle.textSize};
2324
font-weight: ${buttonStyle.textWeight};
2425
font-family: ${buttonStyle.fontFamily};
26+
font-style: ${buttonStyle.fontStyle};
2527
background-color: ${buttonStyle.background};
2628
border-radius: ${buttonStyle.radius};
2729
margin: ${buttonStyle.margin};

‎client/packages/lowcoder/src/comps/comps/buttonComp/dropdownComp.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ const LeftButtonWrapper = styled.div<{ $buttonStyle: ButtonStyleType }>`
4242
margin: 0 !important;
4343
${(props) => `border-radius: ${props.$buttonStyle.radius} 0 0 ${props.$buttonStyle.radius};`}
4444
}
45+
${(props) => `background-color: ${props.$buttonStyle.background};`}
46+
${(props) => `color: ${props.$buttonStyle.text};`}
47+
${(props) => `padding: ${props.$buttonStyle.padding};`}
48+
${(props) => `font-size: ${props.$buttonStyle.textSize};`}
49+
${(props) => `font-style: ${props.$buttonStyle.fontStyle};`}
4550
width: 100%;
4651
}
4752
`;

‎client/packages/lowcoder/src/comps/comps/buttonComp/linkComp.tsx

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,27 @@ import { RefControl } from "comps/controls/refControl";
2323
import { EditorContext } from "comps/editorState";
2424
import React, { useContext } from "react";
2525

26-
const Link = styled(Button)<{ $style: LinkStyleType }>`
26+
const Link = styled(Button) <{ $style: LinkStyleType }>`
2727
${(props) => `
2828
color: ${props.$style.text};
2929
margin: ${props.$style.margin};
3030
padding: ${props.$style.padding};
3131
font-size: ${props.$style.textSize};
32+
font-style:${props.$style.fontStyle};
33+
font-family:${props.$style.fontFamily};
34+
font-weight:${props.$style.textWeight};
35+
border: ${props.$style.borderWidth} solid ${props.$style.border};
36+
border-radius:${props.$style.radius ? props.$style.radius:'0px'};
37+
background-color: ${props.$style.background};
3238
&:hover {
3339
color: ${props.$style.hoverText} !important;
3440
}
3541
&:active {
3642
color: ${props.$style.activeText} !important;
3743
}
3844
`}
39-
&.ant-btn {
45+
46+
&.ant-btn {
4047
display: inline-flex;
4148
align-items: center;
4249
> span {
@@ -114,15 +121,15 @@ const LinkTmpComp = (function () {
114121
{hiddenPropertyView(children)}
115122
{loadingPropertyView(children)}
116123
</Section>
117-
<Section name={sectionNames.advanced}>
118-
{children.prefixIcon.propertyView({ label: trans("button.prefixIcon") })}
119-
{children.suffixIcon.propertyView({ label: trans("button.suffixIcon") })}
120-
</Section></>
124+
<Section name={sectionNames.advanced}>
125+
{children.prefixIcon.propertyView({ label: trans("button.prefixIcon") })}
126+
{children.suffixIcon.propertyView({ label: trans("button.suffixIcon") })}
127+
</Section></>
121128
)}
122129

123-
{(useContext(EditorContext).editorModeStatus === "layout" || useContext(EditorContext).editorModeStatus === "both") && (
124-
<><Section name={sectionNames.style}>{children.style.getPropertyView()}</Section></>
125-
)}
130+
{(useContext(EditorContext).editorModeStatus === "layout" || useContext(EditorContext).editorModeStatus === "both") && (
131+
<><Section name={sectionNames.style}>{children.style.getPropertyView()}</Section></>
132+
)}
126133
</>
127134
);
128135
})

‎client/packages/lowcoder/src/comps/comps/containerComp/containerView.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,6 @@ export function InnerGrid(props: ViewPropsWithSelect) {
478478
layout={props.layout}
479479
extraLayout={extraLayout}
480480
onDropDragOver={(e) => {
481-
482481
const compType = draggingUtils.getData<UICompType>("compType");
483482
const compLayout = draggingUtils.getData<UICompLayoutInfo>("compLayout");
484483
if (compType) {

0 commit comments

Comments
 (0)