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

Commit5e6cf42

Browse files
authored
Merge pull request#1268 from lowcoder-org/dev
Dev -> Main for 2.4.11 hotfix - /latest
2 parents9d8ab7b +bdd356b commit5e6cf42

File tree

13 files changed

+37
-17
lines changed

13 files changed

+37
-17
lines changed

‎client/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.11
1+
2.4.12

‎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.4.11",
3+
"version":"2.4.12",
44
"type":"module",
55
"private":true,
66
"workspaces": [

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ const ButtonTmpComp = (function () {
136136
};
137137
returnnewUICompBuilder(childrenMap,(props)=>{
138138
return(
139-
<ButtonCompWrapperdisabled={props.disabled}>
139+
<ButtonCompWrapper$disabled={props.disabled}>
140140
<EditorContext.Consumer>
141141
{(editorState)=>(
142142
<Button100

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,12 @@ export const Button100 = styled(Button)<{ $buttonStyle?: ButtonStyleType }>`
6868
line-height:${(props)=>props.$buttonStyle?.lineHeight};
6969
`;
7070

71-
exportconstButtonCompWrapper=styled.div<{disabled:boolean}>`
71+
exportconstButtonCompWrapper=styled.div<{$disabled:boolean}>`
72+
display: flex;
73+
7274
// The button component is disabled but can respond to drag & select events
7375
${(props)=>
74-
props.disabled&&
76+
props.$disabled&&
7577
`
7678
cursor: not-allowed;
7779
button:disabled {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ const DropdownTmpComp = (function () {
116116
);
117117

118118
return(
119-
<ButtonCompWrapperdisabled={props.disabled}>
119+
<ButtonCompWrapper$disabled={props.disabled}>
120120
{props.onlyMenu ?(
121121
<Dropdown
122122
disabled={props.disabled}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ const LinkTmpComp = (function () {
9595
// chrome86 bug: button children should not contain only empty span
9696
consthasChildren=hasIcon(props.prefixIcon)||!!props.text||hasIcon(props.suffixIcon);
9797
return(
98-
<ButtonCompWrapperdisabled={props.disabled}>
98+
<ButtonCompWrapper$disabled={props.disabled}>
9999
<Link
100100
$animationStyle={props.animationStyle}
101101
ref={props.viewRef}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ const ScannerTmpComp = (function () {
134134
};
135135

136136
return(
137-
<ButtonCompWrapperdisabled={props.disabled}>
137+
<ButtonCompWrapper$disabled={props.disabled}>
138138
<Button100
139139
ref={props.viewRef}
140140
$buttonStyle={props.style}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const ToggleTmpComp = (function () {
7272

7373
return(
7474
<ButtonCompWrapperStyled
75-
disabled={props.disabled}
75+
$disabled={props.disabled}
7676
$align={props.alignment}
7777
$showBorder={props.showBorder}
7878
$animationStyle={props.animationStyle}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,15 +213,15 @@ class GridLayout extends React.Component<GridLayoutProps, GridLayoutState> {
213213
*@return {String} Container height in pixels.
214214
*/
215215
containerHeight():string{
216-
const{ margin, rowHeight, fixedRowCount}=this.propsasRequired<GridLayoutProps>;
216+
const{ margin, rowHeight, fixedRowCount, isCanvas}=this.propsasRequired<GridLayoutProps>;
217217
const{ extraHeight, emptyRows}=this.props;
218218
constpositionParams=genPositionParams(this.props);
219-
220219
const{ containerPadding}=positionParams;
221220
constlayout=this.getUILayout(undefined,true);
221+
222222
letnbRow=bottom(layout);
223-
if(!_.isNil(emptyRows)&&(_.size(layout)===0||fixedRowCount)){
224-
nbRow=emptyRows;// === Infinity ? 0 : emptyRows;
223+
if(!_.isNil(emptyRows)&&(_.size(layout)===0||(fixedRowCount&&isCanvas))){
224+
nbRow=emptyRows;
225225
}
226226
constcontainerHeight=Math.max(
227227
nbRow*rowHeight+(nbRow-1)*margin[1]+containerPadding[1]*2

‎client/packages/lowcoder/src/util/styleUtils.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const getBackgroundStyle = (style: Record<string, string | undefined>) => {
55
returncss`
66
${isValidColor(style.background)&&`background-color:${style.background}`};
77
${isValidGradient(style.background)&&!Boolean(style.backgroundImage)&&`background-image:${style.background}`};
8-
${!isValidGradient(style.background)&&Boolean(style.backgroundImage)&&`background-image:${style.backgroundImage}`};
8+
${!isValidGradient(style.background)&&Boolean(style.backgroundImage)&&`background-image:url(${style.backgroundImage})`};
99
${isValidGradient(style.background)&&Boolean(style.backgroundImage)&&`background-image: url(${style.backgroundImage}),${style.background}`};
1010
1111
${style.backgroundImageRepeat&&`background-repeat:${style.backgroundImageRepeat};`};

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp