Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit33d8210

Browse files
authored
Merge pull request#766 from lowcoder-org/cherry-release
Hotfixes to main
2 parentsffa595a +d602bd4 commit33d8210

File tree

162 files changed

+3421
-1243
lines changed

Some content is hidden

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

162 files changed

+3421
-1243
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ client/node_modules/
99
client/packages/lowcoder-plugin-demo/.yarn/install-state.gz
1010
client/packages/lowcoder-plugin-demo/yarn.lock
1111
client/packages/lowcoder-plugin-demo/.yarn/cache/@types-node-npm-16.18.68-56f72825c0-094ae9ed80.zip
12+
application-dev.yml

‎client/package.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"@types/react-resizable":"^3.0.5",
3636
"@types/react-router-dom":"^5.3.2",
3737
"@types/shelljs":"^0.8.11",
38+
"@types/simplebar":"^5.3.3",
3839
"@types/stylis":"^4.0.2",
3940
"@types/tern":"0.23.4",
4041
"@types/ua-parser-js":"^0.7.36",
@@ -79,6 +80,8 @@
7980
"chalk":"4",
8081
"number-precision":"^1.6.0",
8182
"react-player":"^2.11.0",
83+
"resize-observer-polyfill":"^1.5.1",
84+
"simplebar":"^6.2.5",
8285
"tui-image-editor":"^3.15.3"
8386
}
8487
}

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

‎client/packages/lowcoder-comps/src/comps/chartComp/chartComp.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,9 @@ ChartTmpComp = withViewFn(ChartTmpComp, (comp) => {
120120

121121
consthandleOnMapScriptLoad=()=>{
122122
setMapScriptLoaded(true);
123-
loadGoogleMapData();
123+
setTimeout(()=>{
124+
loadGoogleMapData();
125+
})
124126
}
125127

126128
useEffect(()=>{

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
"react-virtualized":"^9.22.3",
1414
"rehype-raw":"^6.1.1",
1515
"rehype-sanitize":"^5.0.1",
16-
"remark-gfm":"^3.0.1"
16+
"remark-gfm":"^3.0.1",
17+
"simplebar":"^6.2.5",
18+
"simplebar-react":"^3.2.4"
1719
},
1820
"devDependencies": {
1921
"@rollup/plugin-commonjs":"^23.0.2",
@@ -23,6 +25,7 @@
2325
"@rollup/plugin-typescript":"^9.0.2",
2426
"@rollup/plugin-url":"^8.0.1",
2527
"@svgr/rollup":"^6.5.1",
28+
"@types/simplebar":"^5.3.3",
2629
"rollup":"^2",
2730
"rollup-plugin-cleaner":"^1.0.0",
2831
"rollup-plugin-polyfill-node":"^0.11.0",

‎client/packages/lowcoder-design/src/components/ScrollBar.tsx‎

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
importReactfrom"react";
22
importSimpleBarfrom"simplebar-react";
3+
import'simplebar-react/dist/simplebar.min.css';
34
importstyledfrom"styled-components";
5+
import{DebouncedFunc}from'lodash';// Assuming you're using lodash's DebouncedFunc type
46

5-
constScrollBarWrapper=styled.div`
7+
8+
constScrollBarWrapper=styled.div<{hidePlaceholder?:boolean}>`
69
min-height: 0;
710
height: 100%;
811
width: 100%;
@@ -33,19 +36,39 @@ const ScrollBarWrapper = styled.div`
3336
top: 10px;
3437
bottom: 10px;
3538
}
39+
40+
${props=>props.hidePlaceholder&&`
41+
.simplebar-placeholder {
42+
display: none !important;
43+
}
44+
`}
3645
`;
3746

38-
interfaceIPropsextendsSimpleBar.Props{
47+
// .simplebar-placeholder { added by Falk Wolsky to hide the placeholder - as it doubles the vertical space of a Module on a page
48+
49+
interfaceIProps{
3950
children:React.ReactNode;
4051
className?:string;
4152
height?:string;
53+
style?:React.CSSProperties;// Add this line to include a style prop
54+
scrollableNodeProps?:{
55+
onScroll:DebouncedFunc<(e:any)=>void>;
56+
};
57+
hidePlaceholder?:boolean;
58+
hideScrollbar?:boolean;
4259
}
4360

44-
exportconstScrollBar=(props:IProps)=>{
45-
const{ height="100%", className, children, ...otherProps}=props;
46-
return(
61+
exportconstScrollBar=({ height="100%", className, children, style, scrollableNodeProps, hideScrollbar=false, ...otherProps}:IProps)=>{
62+
// You can now use the style prop directly or pass it to SimpleBar
63+
constcombinedStyle={ ...style, height};// Example of combining height with passed style
64+
65+
returnhideScrollbar ?(
66+
<ScrollBarWrapperclassName={className}>
67+
{children}
68+
</ScrollBarWrapper>
69+
) :(
4770
<ScrollBarWrapperclassName={className}>
48-
<SimpleBarforceVisible="y"style={{height:height}}{...otherProps}>
71+
<SimpleBarstyle={combinedStyle}scrollableNodeProps={scrollableNodeProps}{...otherProps}>
4972
{children}
5073
</SimpleBar>
5174
</ScrollBarWrapper>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ export { ReactComponent as WidthIcon } from "./icon-width.svg";
290290
export{ReactComponentasResponsiveLayoutCompIcon}from"./icon-responsive-layout-comp.svg";
291291
export{ReactComponentasTextSizeIcon}from"./remix/font-size-2.svg";
292292
export{ReactComponentasFontFamilyIcon}from"./remix/font-sans-serif.svg";
293-
export{ReactComponentasTextWeigthIcon}from"./remix/bold.svg";
293+
export{ReactComponentasTextWeightIcon}from"./remix/bold.svg";
294294
export{ReactComponentasBorderWidthIcon}from"./remix/expand-width-line.svg";
295295
export{ReactComponentasLeftInfoLine}from"./remix/information-line.svg";
296296
export{ReactComponentasLeftInfoFill}from"./remix/information-fill.svg";

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

‎client/packages/lowcoder/index.html‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@
44
<metacharset="utf-8"/>
55
<metaname="viewport"content="width=device-width, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no viewport-fit=cover"/>
66
<metalang="en"name="description"content="Lowcoder | rapid App & VideoMeeting builder for everyone."/>
7-
<metaname="theme-color"content="#000000"/>
8-
<metaproperty="iframely:title"content="Lowcoder"/>
9-
<metaproperty="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-
<linkrel="preconnect"href="https://fonts.googleapis.com">
12-
<linkrel="preconnect"href="https://fonts.gstatic.com"crossorigin>
13-
<linkhref="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100..900;1,100..900&display=swap"rel="stylesheet">
7+
<metaname="theme-color"content="#000000"/>
148
<style>
159
html,
1610
body {

‎client/packages/lowcoder/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"rehype-sanitize":"^5.0.1",
9494
"remark-gfm":"^3.0.1",
9595
"resize-observer-polyfill":"^1.5.1",
96-
"simplebar-react":"2.3.6",
96+
"simplebar-react":"^3.2.4",
9797
"sql-formatter":"^8.2.0",
9898
"styled-components":"^6.1.6",
9999
"stylis":"^4.1.1",

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp