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

Commitda29782

Browse files
authored
Merge branch 'dev' into feature-pagelayout-comp
2 parentsb06e325 +80b006a commitda29782

File tree

215 files changed

+15034
-3034
lines changed

Some content is hidden

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

215 files changed

+15034
-3034
lines changed

‎client/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
"mq-polyfill":"^1.1.8",
5252
"prettier":"^3.1.0",
5353
"rimraf":"^3.0.2",
54-
"rollup":"^2.79.0",
5554
"shelljs":"^0.8.5",
5655
"svgo":"^3.0.0",
5756
"typescript":"^4.8.4",
@@ -75,11 +74,12 @@
7574
"@testing-library/react":"^14.1.2",
7675
"@testing-library/user-event":"^14.5.1",
7776
"@types/styled-components":"^5.1.34",
78-
"antd-mobile":"^5.28.0",
77+
"antd-mobile":"^5.34.0",
7978
"chalk":"4",
8079
"number-precision":"^1.6.0",
8180
"react-player":"^2.11.0",
8281
"resize-observer-polyfill":"^1.5.1",
82+
"rollup":"^4.13.0",
8383
"simplebar":"^6.2.5",
8484
"tui-image-editor":"^3.15.3"
8585
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/lib
22
/node_modules
3+
/package
34
*.tgz

‎client/packages/lowcoder-comps/tsconfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"compilerOptions": {
3-
"target":"es5",
3+
"target":"ESNext",
44
"experimentalDecorators":true,
55
"lib": ["dom","dom.iterable","esnext"],
66
"allowJs":true,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import{App}from'antd';
2-
importtype{MessageInstance}from'antd/es/message/interface';
3-
importtype{ModalStaticFunctions}from'antd/es/modal/confirm';
4-
importtype{NotificationInstance}from'antd/es/notification/interface';
1+
import{defaultasApp}from"antd/es/app";
2+
importtype{MessageInstance}from"antd/es/message/interface";
3+
importtype{ModalStaticFunctions}from"antd/es/modal/confirm";
4+
importtype{NotificationInstance}from"antd/es/notification/interface";
55

66
letmessageInstance:MessageInstance;
77
letnotificationInstance:NotificationInstance;

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import styled from "styled-components";
55
import{DebouncedFunc}from'lodash';// Assuming you're using lodash's DebouncedFunc type
66

77

8-
constScrollBarWrapper=styled.div<{hidePlaceholder?:boolean}>`
8+
constScrollBarWrapper=styled.div<{$hideplaceholder?:boolean}>`
99
min-height: 0;
1010
height: 100%;
1111
width: 100%;
@@ -37,7 +37,7 @@ const ScrollBarWrapper = styled.div<{ hidePlaceholder?: boolean }>`
3737
bottom: 10px;
3838
}
3939
40-
${props=>props.hidePlaceholder&&`
40+
${props=>Boolean(props.$hideplaceholder)&&`
4141
.simplebar-placeholder {
4242
display: none !important;
4343
}
@@ -54,11 +54,20 @@ interface IProps {
5454
scrollableNodeProps?:{
5555
onScroll:DebouncedFunc<(e:any)=>void>;
5656
};
57-
hidePlaceholder?:boolean;
57+
$hideplaceholder?:boolean;
5858
hideScrollbar?:boolean;
5959
}
6060

61-
exportconstScrollBar=({ height="100%", className, children, style, scrollableNodeProps, hideScrollbar=false, ...otherProps}:IProps)=>{
61+
exportconstScrollBar=({
62+
height="100%",
63+
className,
64+
children,
65+
style,
66+
scrollableNodeProps,
67+
hideScrollbar=false,
68+
$hideplaceholder=false,
69+
...otherProps
70+
}:IProps)=>{
6271
// You can now use the style prop directly or pass it to SimpleBar
6372
constcombinedStyle={ ...style, height};// Example of combining height with passed style
6473

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export const BaseSection = (props: ISectionConfig<ReactNode>) => {
106106
const{ compName, state, toggle}=useContext(PropertySectionContext);
107107
constopen=props.open!==undefined ?props.open :name ?state[compName]?.[name]!==false :true;
108108

109-
console.log("open",open,props.open);
109+
//console.log("open", open, props.open);
110110

111111
consthandleToggle=()=>{
112112
if(!name){

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
importstyled,{css}from"styled-components";
22
import{ReactComponentasFolded}from"icons/icon-folded.svg";
3-
import{DataNode,TreeProps}from"antd/lib/tree";
4-
importDirectoryTreefrom"antd/lib/tree/DirectoryTree";
3+
import{DataNode,TreeProps}from"antd/es/tree";
4+
importDirectoryTreefrom"antd/es/tree/DirectoryTree";
55

66
exportconstTreediv=styled.div<{$height?:number}>`
77
padding-left: 24px;

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import{CSSProperties}from"react";
2-
import{Ref}from"react";
3-
importReactPlayerfrom"react-player";
2+
import{lazy,Ref}from"react";
3+
importtype{defaultasReactPlayerType}from"react-player";
44
importstyledfrom"styled-components";
55

6+
constReactPlayer=lazy(()=>import("react-player"));
7+
68
constAudio=styled(ReactPlayer)`
79
height: 32px !important;
810
`;
@@ -14,7 +16,7 @@ export function TacoAudio(props: {
1416
onEnded?:()=>void;
1517
className?:string;
1618
style?:CSSProperties;
17-
audioRef?:Ref<ReactPlayer>;
19+
audioRef?:Ref<ReactPlayerType>;
1820
autoPlay?:boolean;
1921
loop?:boolean;
2022
}){

‎client/packages/lowcoder-design/src/components/colorSelect/colorUtils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{colord,extend}from"colord";
22
importnamesPluginfrom"colord/plugins/names";
3-
import{generate}from"@ant-design/colors";
3+
import{generate}from"@ant-design/colors/es";
44

55
extend([namesPlugin]);
66

‎client/packages/lowcoder-design/src/components/iconSelect/index.tsx‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
import{FontAwesomeIcon}from"@fortawesome/react-fontawesome";
22
importtype{IconDefinition}from"@fortawesome/free-regular-svg-icons";
33
// import type { IconDefinition as IconDefinitionBrands } from "@fortawesome/free-brands-svg-icons";
4-
import{Popover}from"antd";
5-
import{ActionType}from"@rc-component/trigger/lib/interface";
4+
import{defaultasPopover}from"antd/lib/popover";
5+
importtype{ActionType}from"@rc-component/trigger/lib/interface";
66
import{TacoInput}from"components/tacoInput";
77
import{Tooltip}from"components/toolTip";
88
import{trans}from"i18n/design";
9-
import_from"lodash";
9+
import{upperFirst,sortBy}from"lodash";
1010
import{
1111
ReactNode,
1212
useEffect,
1313
useCallback,
1414
useMemo,
1515
useRef,
1616
useState,
17+
Suspense
1718
}from"react";
1819
importDraggablefrom"react-draggable";
19-
import{defaultasList,ListRowProps}from"react-virtualized/dist/es/List";
20+
import{defaultasList,typeListRowProps}from"react-virtualized/dist/es/List";
2021
importstyledfrom"styled-components";
2122
import{CloseIcon,SearchIcon}from"icons";
2223
import{ANTDICON}from"icons/antIcon";
23-
import{Divider}from"antd-mobile";
2424

2525
constPopupContainer=styled.div`
2626
width: 580px;
@@ -141,7 +141,7 @@ class Icon {
141141
readonlytitle:string;
142142
constructor(readonlydef:IconDefinition|any,readonlynames:string[]){
143143
if(def?.iconName){
144-
this.title=def.iconName.split("-").map(_.upperFirst).join(" ");
144+
this.title=def.iconName.split("-").map(upperFirst).join(" ");
145145
}else{
146146
this.title=names[0].slice(5);
147147
this.def=def;
@@ -231,7 +231,7 @@ function search(
231231
.toLowerCase()
232232
.split(/\s+/g)
233233
.filter((t)=>t);
234-
return_.sortBy(
234+
returnsortBy(
235235
Object.entries(allIcons).filter(([key,icon])=>{
236236
if(icon.names.length===0){
237237
returnfalse;
@@ -297,7 +297,11 @@ const IconPopup = (props: {
297297
onChangeIcon(key);
298298
}}
299299
>
300-
<IconWrapper>{icon.getView()}</IconWrapper>
300+
<IconWrapper>
301+
<Suspensefallback={null}>
302+
{icon.getView()}
303+
</Suspense>
304+
</IconWrapper>
301305
<IconKeyDisplay>{key}</IconKeyDisplay>
302306
</IconItemContainer>
303307
</Tooltip>

0 commit comments

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