Skip to content

Commit 6ecec74

Browse files
author
Thomas
committed
Merge branch 'dev' of https://github.com/th37rose/lowcoder_dev1 into feature/gid
2 parents 4aac42e + 4a4564f commit 6ecec74

File tree

47 files changed

+1008
-139
lines changed

Some content is hidden

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

47 files changed

+1008
-139
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml
1414
server/api-service/lowcoder-server/src/main/resources/application-debug.yaml
1515
.vscode/settings.json
1616
.vscode/launch.json
17+
server/api-service/lowcoder-server/src/main/resources/application-dev-localhost.yaml

‎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.4.6",
3+
"version": "2.4.7",
44
"type": "module",
55
"license": "MIT",
66
"dependencies": {

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

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,13 @@ export const apiFailureResponseInterceptor = (error: any) => {
121121
// Need authorization
122122
if (!notAuthRequiredPath(error.config?.url)) {
123123
if (error.response.status === API_STATUS_CODES.REQUEST_NOT_AUTHORISED) {
124+
// get x-org-id from failed request
125+
const organizationId = error.response.headers['x-org-id'] || undefined;
124126
// Redirect to login and set a redirect url.
125127
StoreRegistry.getStore().dispatch(
126128
logoutAction({
127129
notAuthorised: true,
130+
organizationId,
128131
})
129132
);
130133
return Promise.reject({

‎client/packages/lowcoder/src/comps/comps/layout/mobileTabLayout.tsx

Lines changed: 84 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { MultiCompBuilder, withDefault, withViewFn } from "comps/generators";
22
import { trans } from "i18n";
33
import { Section, sectionNames } from "components/Section";
44
import { manualOptionsControl } from "comps/controls/optionsControl";
5-
import { BoolCodeControl, StringControl, jsonControl } from "comps/controls/codeControl";
5+
import { BoolCodeControl, StringControl, jsonControl, NumberControl } from "comps/controls/codeControl";
66
import { IconControl } from "comps/controls/iconControl";
77
import styled from "styled-components";
88
import React, { Suspense, useContext, useEffect, useMemo, useState } from "react";
@@ -27,6 +27,9 @@ import { check } from "@lowcoder-ee/util/convertUtils";
2727
import { JSONObject } from "@lowcoder-ee/util/jsonTypes";
2828
import { isEmpty } from "lodash";
2929
import { ThemeContext } from "@lowcoder-ee/comps/utils/themeContext";
30+
import { AlignCenter } from "lowcoder-design";
31+
import { AlignLeft } from "lowcoder-design";
32+
import { AlignRight } from "lowcoder-design";
3033

3134
const TabBar = React.lazy(() => import("antd-mobile/es/components/tab-bar"));
3235
const TabBarItem = React.lazy(() =>
@@ -35,8 +38,6 @@ const TabBarItem = React.lazy(() =>
3538
}))
3639
);
3740

38-
const TabBarHeight = 56;
39-
const MaxWidth = 450;
4041
const AppViewContainer = styled.div`
4142
position: absolute;
4243
width: 100%;
@@ -46,16 +47,25 @@ const AppViewContainer = styled.div`
4647
height: 100%;
4748
`;
4849

49-
const TabLayoutViewContainer = styled.div`
50+
const TabLayoutViewContainer = styled.div<{
51+
maxWidth: number;
52+
tabBarHeight: string;
53+
// verticalAlignment: string;
54+
}>`
5055
margin: 0 auto;
51-
max-width: ${MaxWidth}px;
56+
max-width: ${(props) => props.maxWidth}px;
5257
position: relative;
53-
height: calc(100% - ${TabBarHeight}px);
58+
height: calc(100% - ${(props) => props.tabBarHeight});
59+
display: flex;
60+
flex-direction: column;
5461
`;
5562

5663
const TabBarWrapper = styled.div<{
5764
$readOnly: boolean,
5865
$canvasBg: string,
66+
$tabBarHeight: string,
67+
$maxWidth: number,
68+
$verticalAlignment: string;
5969
}>`
6070
max-width: inherit;
6171
background: ${(props) => (props.$canvasBg)};
@@ -64,35 +74,46 @@ const TabBarWrapper = styled.div<{
6474
bottom: 0;
6575
left: 0;
6676
right: 0;
67-
width: ${(props) => (props.$readOnly ? "100%" : "418px")};
77+
width: ${(props) => props.$readOnly ? "100%" : `${props.$maxWidth - 30}px`};
6878
z-index: ${Layers.tabBar};
6979
padding-bottom: env(safe-area-inset-bottom, 0);
7080
7181
.adm-tab-bar-wrap {
7282
overflow: auto;
73-
height: ${TabBarHeight}px;
83+
height: ${(props) => props.$tabBarHeight};
84+
display: flex;
85+
flex-wrap: wrap;
86+
align-content: ${(props) => props.$verticalAlignment };
7487
}
7588
`;
7689

7790
const StyledTabBar = styled(TabBar)<{
91+
$showSeparator: boolean,
7892
$tabStyle: NavLayoutStyleType,
7993
$tabItemStyle: NavLayoutItemStyleType,
8094
$tabItemHoverStyle: NavLayoutItemHoverStyleType,
8195
$tabItemActiveStyle: NavLayoutItemActiveStyleType,
96+
$navIconSize: string;
8297
}>`
8398
width: ${(props) => `calc(100% - ${props.$tabStyle.margin} - ${props.$tabStyle.margin})`};
8499
border: ${(props) => props.$tabStyle.border};
85100
background: ${(props) => props.$tabStyle.background};
86101
border-radius: ${(props) => props.$tabStyle.radius };
87102
margin: ${(props) => props.$tabStyle.margin };
88103
padding: ${(props) => props.$tabStyle.padding };
89-
104+
105+
${(props) => props.$showSeparator ? `
90106
.adm-tab-bar-item:not(:last-child) {
91-
border-right: ${(props) => props.$tabStyle.border};
107+
border-right: ${props.$tabStyle.border};
92108
}
109+
` : ''}
110+
93111
.adm-tab-bar-item-icon, .adm-tab-bar-item-title {
94112
color: ${(props) => props.$tabStyle.text};
95113
}
114+
.adm-tab-bar-item-icon, {
115+
font-size: ${(props) => props.$navIconSize};
116+
}
96117
97118
.adm-tab-bar-item {
98119
background-color: ${(props) => props.$tabItemStyle?.background};
@@ -124,6 +145,22 @@ const defaultStyle = {
124145
padding: '0px',
125146
}
126147

148+
const AlignTop = styled(AlignLeft)`
149+
transform: rotate(90deg);
150+
`;
151+
const AlignBottom = styled(AlignRight)`
152+
transform: rotate(90deg);
153+
`;
154+
const AlignVerticalCenter = styled(AlignCenter)`
155+
transform: rotate(90deg);
156+
`;
157+
158+
const VerticalAlignmentOptions = [
159+
{ label: <AlignTop />, value: "flex-start" },
160+
{ label: <AlignVerticalCenter />, value: "stretch" },
161+
{ label: <AlignBottom />, value: "flex-end" },
162+
] as const;
163+
127164
type MenuItemStyleOptionValue = "normal" | "hover" | "active";
128165

129166
type JsonItemNode = {
@@ -164,7 +201,14 @@ function convertTreeData(data: any) {
164201
return data === "" ? [] : checkDataNodes(data) ?? [];
165202
}
166203

167-
function TabBarView(props: TabBarProps) {
204+
function TabBarView(props: TabBarProps & {
205+
tabBarHeight: string;
206+
maxWidth: number;
207+
verticalAlignment: string;
208+
showSeparator: boolean;
209+
navIconSize: string;
210+
}
211+
) {
168212
const {
169213
canvasBg, tabStyle, tabItemStyle, tabItemHoverStyle, tabItemActiveStyle,
170214
} = props;
@@ -173,6 +217,9 @@ function TabBarView(props: TabBarProps) {
173217
<TabBarWrapper
174218
$readOnly={props.readOnly}
175219
$canvasBg={canvasBg}
220+
$tabBarHeight={props.tabBarHeight}
221+
$maxWidth={props.maxWidth}
222+
$verticalAlignment={props.verticalAlignment}
176223
>
177224
<StyledTabBar
178225
onChange={(key: string) => {
@@ -185,6 +232,8 @@ function TabBarView(props: TabBarProps) {
185232
$tabItemStyle={tabItemStyle}
186233
$tabItemHoverStyle={tabItemHoverStyle}
187234
$tabItemActiveStyle={tabItemActiveStyle}
235+
$showSeparator={props.showSeparator}
236+
$navIconSize={props.navIconSize}
188237
>
189238
{props.tabs.map((tab) => {
190239
return (
@@ -249,6 +298,11 @@ let MobileTabLayoutTmp = (function () {
249298
initOptions: [],
250299
}),
251300
backgroundImage: withDefault(StringControl, ""),
301+
tabBarHeight: withDefault(StringControl, "56px"),
302+
navIconSize: withDefault(StringControl, "32px"),
303+
maxWidth: withDefault(NumberControl, 450),
304+
verticalAlignment: dropdownControl(VerticalAlignmentOptions, "stretch"),
305+
showSeparator: withDefault(BoolCodeControl, true),
252306
navStyle: withDefault(styleControl(NavLayoutStyle), defaultStyle),
253307
navItemStyle: withDefault(styleControl(NavLayoutItemStyle), defaultStyle),
254308
navItemHoverStyle: withDefault(styleControl(NavLayoutItemHoverStyle), {}),
@@ -279,6 +333,13 @@ let MobileTabLayoutTmp = (function () {
279333
label: `Background Image`,
280334
placeholder: 'https://temp.im/350x400',
281335
})}
336+
{ children.showSeparator.propertyView({label: trans("navLayout.mobileNavVerticalShowSeparator")})}
337+
{children.tabBarHeight.propertyView({label: trans("navLayout.mobileNavBarHeight")})}
338+
{children.navIconSize.propertyView({label: trans("navLayout.mobileNavIconSize")})}
339+
{children.maxWidth.propertyView({label: trans("navLayout.mobileNavVerticalMaxWidth")})}
340+
{children.verticalAlignment.propertyView(
341+
{ label: trans("navLayout.mobileNavVerticalOrientation"),radioButton: true }
342+
)}
282343
</Section>
283344
<Section name={trans("navLayout.navStyle")}>
284345
{ children.navStyle.getPropertyView() }
@@ -318,6 +379,11 @@ MobileTabLayoutTmp = withViewFn(MobileTabLayoutTmp, (comp) => {
318379
const backgroundImage = comp.children.backgroundImage.getView();
319380
const jsonItems = comp.children.jsonItems.getView();
320381
const dataOptionType = comp.children.dataOptionType.getView();
382+
const tabBarHeight = comp.children.tabBarHeight.getView();
383+
const navIconSize = comp.children.navIconSize.getView();
384+
const maxWidth = comp.children.maxWidth.getView();
385+
const verticalAlignment = comp.children.verticalAlignment.getView();
386+
const showSeparator = comp.children.showSeparator.getView();
321387
const bgColor = (useContext(ThemeContext)?.theme || defaultTheme).canvas;
322388

323389
useEffect(() => {
@@ -384,20 +450,25 @@ MobileTabLayoutTmp = withViewFn(MobileTabLayoutTmp, (comp) => {
384450
tabItemStyle={navItemStyle}
385451
tabItemHoverStyle={navItemHoverStyle}
386452
tabItemActiveStyle={navItemActiveStyle}
453+
tabBarHeight={tabBarHeight}
454+
navIconSize={navIconSize}
455+
maxWidth={maxWidth}
456+
verticalAlignment={verticalAlignment}
457+
showSeparator={showSeparator}
387458
/>
388459
);
389460

390461
if (readOnly) {
391462
return (
392-
<TabLayoutViewContainer>
463+
<TabLayoutViewContainer maxWidth={maxWidth} tabBarHeight={tabBarHeight}>
393464
<AppViewContainer>{appView}</AppViewContainer>
394465
{tabBarView}
395466
</TabLayoutViewContainer>
396467
);
397468
}
398469

399470
return (
400-
<CanvasContainer $maxWidth={MaxWidth} id={CanvasContainerID}>
471+
<CanvasContainer $maxWidth={maxWidth} id={CanvasContainerID}>
401472
<EditorContainer>{appView}</EditorContainer>
402473
{tabBarView}
403474
</CanvasContainer>

‎client/packages/lowcoder/src/comps/comps/selectInputComp/checkboxComp.tsx

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,20 @@ export const getStyle = (style: CheckboxStyleType) => {
3636
${EllipsisTextCss};
3737
}
3838
39+
.ant-checkbox .ant-checkbox-checked > .ant-checkbox-inner {
40+
border-color: ${style.checkedBorder};
41+
border-width:${!!style.borderWidth ? style.borderWidth : '2px'};
42+
}
43+
44+
.ant-checkbox:not(.ant-checkbox-checked) > .ant-checkbox-inner{
45+
border-color: ${style.uncheckedBorder};
46+
border-width:${!!style.borderWidth ? style.borderWidth : '2px'};
47+
}
48+
3949
.ant-checkbox-checked {
4050
.ant-checkbox-inner {
4151
background-color: ${style.checkedBackground};
42-
border-color: ${style.checkedBackground};
52+
border-color: ${style.checkedBorder};
4353
border-width:${!!style.borderWidth ? style.borderWidth : '2px'};
4454
4555
&::after {
@@ -48,17 +58,17 @@ export const getStyle = (style: CheckboxStyleType) => {
4858
}
4959
5060
&::after {
51-
border-color: ${style.checkedBackground};
61+
border-color: ${style.checkedBorder};
5262
border-width:${!!style.borderWidth ? style.borderWidth : '2px'};
5363
border-radius: ${style.radius};
5464
}
5565
}
5666
5767
.ant-checkbox-inner {
58-
border-radius: ${style.radius};
5968
background-color: ${style.uncheckedBackground};
60-
border-color: ${style.uncheckedBorder};
61-
border-width:${!!style.borderWidth ? style.borderWidth : '2px'};
69+
border-radius: ${style.radius};
70+
border-color: ${style.checkedBorder};
71+
border-width:${style.borderWidth ? style.borderWidth : '2px'};
6272
}
6373
6474
&:hover .ant-checkbox-inner,
@@ -76,7 +86,7 @@ export const getStyle = (style: CheckboxStyleType) => {
7686
&:hover .ant-checkbox-inner,
7787
.ant-checkbox:hover .ant-checkbox-inner,
7888
.ant-checkbox-input:focus + .ant-checkbox-inner {
79-
border-color: ${style.checkedBackground};
89+
border-color: ${style.checkedBorder};
8090
border-width:${!!style.borderWidth ? style.borderWidth : '2px'};
8191
}
8292
}

‎client/packages/lowcoder/src/comps/controls/shapeControl.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ const IconPicker = (props: {
8181
IconType?: "OnlyAntd" | "All" | "default" | undefined;
8282
}) => {
8383
const icon = useShape(props.value);
84-
console.log(props);
84+
// console.log(props);
8585
let shapeDetails = props.value;
86-
console.log("shapeDetails ", shapeDetails);
86+
// console.log("shapeDetails ", shapeDetails);
8787

8888
return (
8989
<ShapeSelect
@@ -173,7 +173,7 @@ type ChangeModeAction = {
173173

174174
function ShapeControlView(props: { value: any }) {
175175
const { value } = props;
176-
console.log("ShapeControlView ", value);
176+
// console.log("ShapeControlView ", value);
177177
const icon = useShape(value);
178178
if (icon) {
179179
return icon.getView();

‎client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,8 +1334,8 @@ export const RadioStyle = [
13341334
{
13351335
name: "checked",
13361336
label: trans("style.checked"),
1337-
depName: "uncheckedBackground",
1338-
depType: DEP_TYPE.SELF,
1337+
depName: "checkedBackground",
1338+
depType: DEP_TYPE.CONTRAST_TEXT,
13391339
transformer: toSelf,
13401340
},
13411341
HOVER_BACKGROUND_COLOR,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ export type ThirdPartyConfigType = {
5757
url: string;
5858
name: string;
5959
logo: string;
60+
icon: string;
6061
// login source
6162
sourceType: string;
6263
// url is react router
@@ -102,7 +103,7 @@ export const AuthRoutes: Array<{ path: string; component: React.ComponentType<an
102103

103104
export type ServerAuthType = "GOOGLE" | "GITHUB" | "FORM" | "KEYCLOAK" | "ORY" | "GENERIC";
104105

105-
export type ServerAuthTypeInfoValueType = { logo?: string; isOAuth2?: boolean };
106+
export type ServerAuthTypeInfoValueType = { logo?: string; sourceIcon?: string; isOAuth2?: boolean };
106107
export const ServerAuthTypeInfo: { [key in ServerAuthType]?: ServerAuthTypeInfoValueType } = {
107108
GOOGLE: {
108109
logo: GoogleLoginIcon,

0 commit comments

Comments
 (0)