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

Commit34faa66

Browse files
author
FalkWolsky
committed
Icons and small improvements for SplitLayout
1 parent9a5ce3d commit34faa66

File tree

8 files changed

+1300
-8
lines changed

8 files changed

+1300
-8
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ export { ReactComponent as RadioCompIconSmall } from "./v2/radio-button-s.svg";
317317
export{ReactComponentasRangeSliderCompIconSmall}from"./v2/range-slider-s.svg";// new
318318
export{ReactComponentasRatingCompIconSmall}from"./v2/rating-s.svg";
319319
export{ReactComponentasResponsiveLayoutCompIconSmall}from"./v2/resposive-layout-s.svg";// new
320+
export{ReactComponentasSplitLayoutCompIconSmall}from"./v2/split-layout-s.svg";// new
320321
export{ReactComponentasRichTextEditorCompIconSmall}from"./v2/rich-text-editor-s.svg";// new
321322
export{ReactComponentasScannerCompIconSmall}from"./v2/scanner-s.svg";// new
322323
export{ReactComponentasShapesCompIconSmall}from"./v2/shapes-s.svg";// new
@@ -419,6 +420,7 @@ export { ReactComponent as RadioCompIcon } from "./v2/radio-button-m.svg";
419420
export{ReactComponentasRangeSliderCompIcon}from"./v2/range-slider-m.svg";
420421
export{ReactComponentasRatingCompIcon}from"./v2/rating-m.svg";
421422
export{ReactComponentasResponsiveLayoutCompIcon}from"./v2/resposive-layout-m.svg";
423+
export{ReactComponentasSplitLayoutCompIcon}from"./v2/split-layout-m.svg";
422424
export{ReactComponentasRichTextEditorCompIcon}from"./v2/rich-text-editor-m.svg";
423425
export{ReactComponentasScannerCompIcon}from"./v2/scanner-m.svg";
424426
export{ReactComponentasShapesCompIcon}from"./v2/shapes-m.svg";

‎client/packages/lowcoder-design/src/icons/v2/split-layout-l.svg

Lines changed: 1266 additions & 0 deletions
Loading
Lines changed: 9 additions & 0 deletions
Loading
Lines changed: 9 additions & 0 deletions
Loading

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ const childrenMap = {
114114
1:{view:{},layout:{}},
115115
}),
116116
horizontalGridCells:SliderControl,
117+
verticalGridCells:SliderControl,
117118
autoHeight:AutoHeightControl,
118119
rowBreak:withDefault(BoolControl,true),
119120
useComponentWidth:withDefault(BoolControl,true),
@@ -139,7 +140,6 @@ const ColumnContainer = (props: ColumnContainerProps) => {
139140
return(
140141
<InnerGrid
141142
{...props}
142-
emptyRows={15}
143143
hintPlaceholder={HintPlaceHolder}
144144
radius={props.style.radius}
145145
style={props.style}
@@ -259,6 +259,7 @@ const ResponsiveLayout = (props: ResponsiveLayoutProps) => {
259259
autoHeight={props.autoHeight}
260260
horizontalGridCells={horizontalGridCells}
261261
style={columnStyle}
262+
emptyRows={props.verticalGridCells}
262263
/>
263264
</ColWrapper>
264265
);
@@ -304,6 +305,9 @@ export const ResponsiveLayoutBaseComp = (function () {
304305
{children.horizontalGridCells.propertyView({
305306
label:trans('prop.horizontalGridCells'),
306307
})}
308+
{children.verticalGridCells.propertyView({
309+
label:trans('prop.verticalGridCells'),
310+
})}
307311
</Section>
308312
<Sectionname={trans("responsiveLayout.rowLayout")}>
309313
{children.rowBreak.propertyView({

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -678,8 +678,8 @@ const SplitColumnOption = new MultiCompBuilder(
678678

679679
exportconstSplitColumnOptionControl=manualOptionsControl(SplitColumnOption,{
680680
initOptions:[
681-
{id:0,key:"Area1",label:"Area 1"},
682-
{id:1,key:"Area2",label:"Area 2"},
681+
{id:0,key:"Area1",label:"Area 1",minWidth:"10%",maxWidth:"90%",width:"50%"},
682+
{id:1,key:"Area2",label:"Area 2",minWidth:"10%",maxWidth:"90%",width:"50%",collapsible :true},
683683
],
684684
uniqField:"key",
685685
autoIncField:"id",

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ import {
8686
MentionCompIcon,
8787
AutoCompleteCompIcon,
8888
ResponsiveLayoutCompIcon,
89+
SplitLayoutCompIcon,
8990
MermaidCompIcon,
9091
IconCompIcon,
9192
PageLayoutCompIcon,
@@ -470,12 +471,12 @@ export var uiCompMap: Registry = {
470471
},
471472
},
472473
splitLayout:{
473-
name:trans("uiComp.responsiveLayoutCompName"),
474+
name:trans("uiComp.splitLayoutCompName"),
474475
enName:"Split Layout",
475-
description:trans("uiComp.responsiveLayoutCompDesc"),
476+
description:trans("uiComp.splitLayoutCompDesc"),
476477
categories:["layout"],
477-
icon:ResponsiveLayoutCompIcon,
478-
keywords:trans("uiComp.responsiveLayoutCompKeywords"),
478+
icon:SplitLayoutCompIcon,
479+
keywords:trans("uiComp.splitLayoutCompKeywords"),
479480
lazyLoad:true,
480481
compName:"SplitLayoutComp",
481482
compPath:"comps/splitLayout/index",

‎client/packages/lowcoder/src/pages/editor/editorConstants.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ import {
5353
RangeSliderCompIconSmall,
5454
RatingCompIconSmall,
5555
ResponsiveLayoutCompIconSmall,
56+
SplitLayoutCompIconSmall,
5657
RichTextEditorCompIconSmall,
5758
ScannerCompIconSmall,
5859
SegmentedCompIconSmall,
@@ -162,7 +163,7 @@ export const CompStateIcon: {
162163
rangeSlider:<RangeSliderCompIconSmall/>,
163164
rating:<RatingCompIconSmall/>,
164165
responsiveLayout:<ResponsiveLayoutCompIconSmall/>,
165-
splitLayout:<ResponsiveLayoutCompIconSmall/>,
166+
splitLayout:<SplitLayoutCompIconSmall/>,
166167
richTextEditor:<RichTextEditorCompIconSmall/>,
167168
scanner:<ScannerCompIconSmall/>,
168169
segmentedControl:<SegmentedCompIconSmall/>,

0 commit comments

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