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

Commit94c674f

Browse files
authored
Merge pull request#1515 from lowcoder-org/dev
Dev -> Main v2.6.2
2 parentse2df7b6 +041aef5 commit94c674f

File tree

53 files changed

+12810
-257
lines changed

Some content is hidden

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

53 files changed

+12810
-257
lines changed

‎client/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.1
1+
2.6.2

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

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

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,13 @@ const DEFAULT_PROPS = {
220220
autoFocusButton:"ok",
221221
}asconst;
222222

223-
functionCustomModalRender(props:CustomModalProps&ModalFuncProps){
223+
functionCustomModalRender(props:Omit<CustomModalProps&ModalFuncProps,"width">&{width?:string|number}){
224224
return(
225225
<Draggablehandle=".handle"disabled={!props.draggable}>
226-
<ModalWrapper$width={props.width}$customStyles={props?.customStyles}>
226+
<ModalWrapper
227+
$width={props.width}
228+
$customStyles={props?.customStyles}
229+
>
227230
<>
228231
<ModalHeaderWrapperclassName="handle"$draggable={props.draggable}>
229232
<ModalHeader
@@ -249,20 +252,21 @@ function CustomModalRender(props: CustomModalProps & ModalFuncProps) {
249252
);
250253
}
251254

255+
252256
/**
253257
* an antd modal capsulation
254258
*/
255-
256259
functionCustomModal(props:CustomModalProps){
257260
return(
258261
<AntdModal
259262
{...props}
260-
width="fit-content"
261-
modalRender={()=><CustomModalRender{...DEFAULT_PROPS}{...props}/>}
263+
width={typeofprops.width==="object" ?undefined :props.width}// Ensure valid type
264+
modalRender={()=><CustomModalRender{...props}width={typeofprops.width==="object" ?undefined :props.width}/>}
262265
/>
263266
);
264267
}
265268

269+
266270
constTitleIcon={
267271
error:<ErrorIcon/>,
268272
warn:<WarningIcon/>,
@@ -285,6 +289,8 @@ CustomModal.confirm = (props: {
285289
customStyles?:React.CSSProperties;
286290
}):any=>{
287291

292+
constfixedWidth=typeofprops.width==="object" ?undefined :props.width;
293+
288294
constdefaultConfirmProps:ModalFuncProps={
289295
...DEFAULT_PROPS,
290296
okText:trans("ok"),
@@ -301,7 +307,7 @@ CustomModal.confirm = (props: {
301307
};
302308
// create model
303309
constmodel=modalInstance.confirm({
304-
width:"fit-content",
310+
width:fixedWidth,
305311
style:props.style,
306312
centered:true,
307313
onCancel:()=>{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export const KeyValueList = (props: {
100100
return(
101101
<>
102102
{props.list.map((item,index)=>(
103-
<IndicatorWrapperkey={index}>
103+
<IndicatorWrapperkey={index}indicatorForAll={props.indicatorForAll}>
104104
<KeyValueListItemkey={index/* FIXME: find a proper key instead of `index` */}>
105105
{item}
106106
{!props.isStatic&&

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

0 commit comments

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