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

Commit644f382

Browse files
authored
Merge branch 'dev' into main
2 parentseffe7d4 +792c79b commit644f382

File tree

89 files changed

+1878
-388
lines changed

Some content is hidden

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

89 files changed

+1878
-388
lines changed

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

‎client/packages/lowcoder-core/lib/index.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ declare enum CompActionTypes {
454454
* broadcast other actions in comp tree structure.
455455
* used for encapsulate MultiBaseComp
456456
*/
457-
BROADCAST="BROADCAST"
457+
BROADCAST="BROADCAST",
458458
}
459459
typeExtraActionType="layout"|"delete"|"add"|"modify"|"rename"|"recover"|"upgrade";
460460
typeActionExtraInfo={

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

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,9 @@ export { ReactComponent as ClickHouseIcon } from "./icon-query-ClickHouse.svg";
214214
export{ReactComponentasResetIcon}from"./icon-style-reset.svg";
215215
export{ReactComponentasEditIcon}from"./icon-edit.svg";
216216
export{ReactComponentasEditableIcon}from"./icon-editable.svg";
217-
export{ReactComponentasLeftStateIcon}from"./icon-left-state.svg";
218-
export{ReactComponentasLeftSettingIcon}from"./icon-left-setting.svg";
217+
export{ReactComponentasLeftStateIcon}from"./remix/node-tree.svg";
218+
export{ReactComponentasLeftSettingIcon}from"./remix/tools-fill.svg";
219+
export{ReactComponentasLeftLayersIcon}from"./remix/stack-line.svg";
219220
export{ReactComponentasLeftHelpIcon}from"./icon-left-help.svg";
220221
export{ReactComponentasLeftPreloadIcon}from"./icon-left-preload.svg";
221222
export{ReactComponentasCollapsibleContainerCompIcon}from"./icon-collapsible-container.svg";
@@ -277,31 +278,37 @@ export { ReactComponent as SignatureIcon } from "./icon-signature.svg";
277278
export{ReactComponentasManualIcon}from"./icon-manual.svg";
278279
export{ReactComponentasWarnIcon}from"./icon-warn.svg";
279280
export{ReactComponentasSyncManualIcon}from"./icon-sync-manual.svg";
280-
export{ReactComponentasDangerIcon}from"icons/icon-danger.svg";
281-
export{ReactComponentasTableMinusIcon}from"icons/icon-table-minus.svg";
282-
export{ReactComponentasTablePlusIcon}from"icons/icon-table-plus.svg";
283-
export{ReactComponentasMobileAppIcon}from"icons/icon-mobile-app.svg";
284-
export{ReactComponentasMobileNavIcon}from"icons/icon-navigation-mobile.svg";
285-
export{ReactComponentasPcNavIcon}from"icons/icon-navigation-pc.svg";
286-
export{ReactComponentasUnLockIcon}from"icons/icon-unlock.svg";
287-
export{ReactComponentasCalendarDeleteIcon}from"icons/icon-calendar-delete.svg";
288-
export{ReactComponentasTableCheckedIcon}from"icons/icon-table-checked.svg";
289-
export{ReactComponentasTableUnCheckedIcon}from"icons/icon-table-boolean-false.svg";
290-
export{ReactComponentasFileFolderIcon}from"icons/icon-editor-folder.svg";
291-
export{ReactComponentasExpandIcon}from"icons/icon-expand.svg";
292-
export{ReactComponentasCompressIcon}from"icons/icon-compress.svg";
293-
export{ReactComponentasTableCellsIcon}from"icons/icon-table-cells.svg";// Added By Aqib Mirza
294-
export{ReactComponentasTimeLineIcon}from"icons/icon-timeline-comp.svg"
295-
export{ReactComponentasLottieIcon}from"icons/icon-lottie.svg";
296-
export{ReactComponentasCommentIcon}from"icons/icon-comment-comp.svg";
297-
export{ReactComponentasMentionIcon}from"icons/icon-mention-comp.svg";
298-
export{ReactComponentasAutoCompleteCompIcon}from"icons/icon-autocomplete-comp.svg";
299-
export{ReactComponentasWidthIcon}from"icons/icon-width.svg";
300-
export{ReactComponentasResponsiveLayoutCompIcon}from"icons/icon-responsive-layout-comp.svg";
281+
export{ReactComponentasDangerIcon}from"./icon-danger.svg";
282+
export{ReactComponentasTableMinusIcon}from"./icon-table-minus.svg";
283+
export{ReactComponentasTablePlusIcon}from"./icon-table-plus.svg";
284+
export{ReactComponentasMobileAppIcon}from"./icon-mobile-app.svg";
285+
export{ReactComponentasMobileNavIcon}from"./icon-navigation-mobile.svg";
286+
export{ReactComponentasPcNavIcon}from"./icon-navigation-pc.svg";
287+
export{ReactComponentasUnLockIcon}from"./icon-unlock.svg";
288+
export{ReactComponentasCalendarDeleteIcon}from"./icon-calendar-delete.svg";
289+
export{ReactComponentasTableCheckedIcon}from"./icon-table-checked.svg";
290+
export{ReactComponentasTableUnCheckedIcon}from"./icon-table-boolean-false.svg";
291+
export{ReactComponentasFileFolderIcon}from"./icon-editor-folder.svg";
292+
export{ReactComponentasExpandIcon}from"./icon-expand.svg";
293+
export{ReactComponentasCompressIcon}from"./icon-compress.svg";
294+
export{ReactComponentasTableCellsIcon}from"./icon-table-cells.svg";// Added By Aqib Mirza
295+
export{ReactComponentasTimeLineIcon}from"./icon-timeline-comp.svg"
296+
export{ReactComponentasLottieIcon}from"./icon-lottie.svg";
297+
export{ReactComponentasCommentIcon}from"./icon-comment-comp.svg";
298+
export{ReactComponentasMentionIcon}from"./icon-mention-comp.svg";
299+
export{ReactComponentasAutoCompleteCompIcon}from"./icon-autocomplete-comp.svg";
300+
export{ReactComponentasWidthIcon}from"./icon-width.svg";
301+
export{ReactComponentasResponsiveLayoutCompIcon}from"./icon-responsive-layout-comp.svg";
301302
export{ReactComponentasTextSizeIcon}from"./remix/font-size-2.svg";
302303
export{ReactComponentasFontFamilyIcon}from"./remix/font-sans-serif.svg";
303304
export{ReactComponentasTextWeigthIcon}from"./remix/bold.svg";
304305
export{ReactComponentasBorderWidthIcon}from"./remix/expand-width-line.svg";
306+
export{ReactComponentasLeftInfoLine}from"./remix/information-line.svg";
307+
export{ReactComponentasLeftInfoFill}from"./remix/information-fill.svg";
308+
export{ReactComponentasLeftShow}from"./remix/eye-off-line.svg";
309+
export{ReactComponentasLeftHide}from"./remix/eye-line.svg";
310+
export{ReactComponentasLeftLock}from"./remix/lock-line.svg";
311+
export{ReactComponentasLeftUnlock}from"./remix/lock-unlock-line.svg";
305312

306313

307314
// new

‎client/packages/lowcoder/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"agora-access-token":"^2.0.4",
3939
"agora-rtc-sdk-ng":"^4.19.0",
4040
"agora-rtm-sdk":"^1.5.1",
41-
"antd":"^5.12.5",
41+
"antd":"^5.13.2",
4242
"axios":"^1.6.2",
4343
"buffer":"^6.0.3",
4444
"clsx":"^2.0.0",

‎client/packages/lowcoder/src/components/PermissionDialog/Permission.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,10 +369,10 @@ const PermissionSelector = (props: {
369369
width:"fit-content",
370370
}}
371371
$isVisible={roleSelectVisible}
372-
bordered={false}
372+
variant="borderless"
373373
defaultValue={props.supportRoles[0]}
374374
optionLabelProp="label"
375-
onChange={(value)=>setSelectRole(value)}
375+
onChange={(value:string)=>setSelectRole(valueasApplicationRoleType)}
376376
>
377377
{props.supportRoles.map((role)=>(
378378
<CustomSelect.Optionkey={role.value}value={role.value}label={role.label}>

‎client/packages/lowcoder/src/components/PermissionDialog/PermissionList.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ function PermissionLiItem(props: {
119119
width:"100px",
120120
}}
121121
defaultValue={permissionItem.role}
122-
bordered={false}
122+
variant="borderless"
123123
optionLabelProp="label"
124124
onSelect={(value:any,option:any)=>{
125125
if(option.key==="delete"){

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,16 @@ const DropdownTmpComp = (function () {
8383
key:option.label+" - "+index,
8484
disabled:option.disabled,
8585
icon:hasIcon&&<span>{option.prefixIcon}</span>,
86-
onEvent:option.onEvent,
86+
index,
8787
}));
8888

8989
constmenu=(
9090
<Menu
9191
items={items}
92-
onClick={({ key})=>items.find((o)=>o.key===key)?.onEvent("click")}
92+
onClick={({ key})=>{
93+
constitem=items.find((o)=>o.key===key);
94+
item&&props.options[item.index]?.onEvent("click");
95+
}}
9396
/>
9497
);
9598

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export const ContainerBaseComp = (function () {
2424
returnnewContainerCompBuilder(childrenMap,(props,dispatch)=>{
2525
return(
2626
<DisabledContext.Providervalue={props.disabled}>
27-
<TriContainer{...props}/>
27+
<TriContainer{...props}/>
2828
</DisabledContext.Provider>
2929
);
3030
})
@@ -78,6 +78,7 @@ function convertOldContainerParams(params: CompParams<any>) {
7878
// old params
7979
if(container&&(container.hasOwnProperty("layout")||container.hasOwnProperty("items"))){
8080
constautoHeight=tempParams.value.autoHeight;
81+
constscrollbars=tempParams.value.scrollbars;
8182
return{
8283
...tempParams,
8384
value:{
@@ -87,6 +88,7 @@ function convertOldContainerParams(params: CompParams<any>) {
8788
showBody:true,
8889
showFooter:false,
8990
autoHeight:autoHeight,
91+
scrollbars:scrollbars,
9092
},
9193
},
9294
};
@@ -123,7 +125,7 @@ export function defaultContainerData(
123125
layoutItem:{
124126
i:"",
125127
h:5,
126-
w:24,
128+
w:12,
127129
x:0,
128130
y:0,
129131
},

‎client/packages/lowcoder/src/comps/comps/containerComp/containerView.tsx‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { hookCompCategory, HookCompType } from "comps/hooks/hookCompTypes";
55
import{UICompLayoutInfo,uiCompRegistry,UICompType}from"comps/uiCompRegistry";
66
import{genRandomKey}from"comps/utils/idGenerator";
77
import{parseCompType}from"comps/utils/remote";
8+
import{ScrollBar}from"lowcoder-design";
89
import{
910
DEFAULT_POSITION_PARAMS,
1011
draggingUtils,
@@ -102,6 +103,7 @@ type ExtraProps = {
102103
rowCount?:number;
103104
isRowCountLocked?:boolean;
104105
autoHeight?:boolean;
106+
scrollbars?:boolean;
105107
minHeight?:string;
106108
emptyRows?:number;
107109
extraHeight?:string;
@@ -230,14 +232,27 @@ const onDrop = (
230232
};
231233
constkey=genRandomKey();
232234
constlayoutItem=Object.values(items)[0];
235+
// calculate postion of newly added comp
236+
// should have last position in the comps list
237+
letitemPos=0;
238+
if(!Object.keys(layout).length){
239+
itemPos=0;
240+
}else{
241+
itemPos=Math.max(...Object.values(layout).map(l=>l.pos||0))+1;
242+
}
233243
// log.debug("layout: onDrop. widgetValue: ", widgetValue, " layoutItem: ", layoutItem);
234244
dispatch(
235245
wrapActionExtraInfo(
236246
multiChangeAction({
237247
layout:changeValueAction(
238248
{
239249
...layout,
240-
[key]:{ ...layoutItem,i:key,placeholder:undefined},
250+
[key]:{
251+
...layoutItem,
252+
i:key,
253+
placeholder:undefined,
254+
pos:itemPos,
255+
},
241256
},
242257
true
243258
),
@@ -463,6 +478,7 @@ export function InnerGrid(props: ViewPropsWithSelect) {
463478
layout={props.layout}
464479
extraLayout={extraLayout}
465480
onDropDragOver={(e)=>{
481+
466482
constcompType=draggingUtils.getData<UICompType>("compType");
467483
constcompLayout=draggingUtils.getData<UICompLayoutInfo>("compLayout");
468484
if(compType){

‎client/packages/lowcoder/src/comps/comps/dateComp/dateRangeUIView.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { omit } from "lodash";
1313

1414
const{ RangePicker}=DatePicker;
1515

16-
constRangePickerStyled=styled((props:any)=><RangePicker{...props}/>)<{$style:DateTimeStyleType}>`
16+
constRangePickerStyled=styled(RangePicker)<{$style:DateTimeStyleType}>`
1717
width: 100%;
1818
${(props)=>props.$style&&getStyle(props.$style)}
1919
`;

0 commit comments

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