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

Commit0a96750

Browse files
authored
Merge branch 'dev' into link-oauth-providers-for-existing-users
2 parents95aae3c +2b20d3f commit0a96750

File tree

31 files changed

+308
-2191
lines changed

31 files changed

+308
-2191
lines changed

‎client/.yarnrc.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
nodeLinker:node-modules
2-
nmHoistingLimits:workspaces
32

43
npmRegistryServer:"https://registry.npmjs.org"
54

‎client/jest.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
exportdefault{
22
projects:["<rootDir>/packages/lowcoder","<rootDir>/packages/lowcoder-core"],
33
};
4+
// we use this for testing.

‎client/packages/create-lowcoder-plugin/package.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,8 @@
77
"chalk":"4",
88
"commander":"^9.4.1",
99
"cross-spawn":"^7.0.3",
10-
"fs-extra":"^10.1.0"
11-
},
12-
"peerDependencies": {
13-
"lowcoder-cli":"*",
14-
"lowcoder-dev-utils":"*",
15-
"lowcoder-sdk":"*"
10+
"fs-extra":"^10.1.0",
11+
"lowcoder-dev-utils":"workspace:^"
1612
},
1713
"license":"MIT",
1814
"keywords": [

‎client/packages/lowcoder-cli-template-typescript/package.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,10 @@
1616
}
1717
},
1818
"devDependencies": {
19+
"lowcoder-cli":"workspace:^",
20+
"lowcoder-sdk":"workspace:^",
1921
"typescript":"^4.8.4",
20-
"vite":"^4.5.1"
21-
},
22-
"peerDependencies": {
23-
"lowcoder-cli":"*",
24-
"lowcoder-dev-utils":"*",
25-
"lowcoder-sdk":"*"
22+
"vite":"^4.3.9"
2623
},
2724
"keywords": [
2825
"Lowcoder, Component, Template, Plugin"

‎client/packages/lowcoder-cli/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@
2929
"commander":"^9.4.1",
3030
"cross-spawn":"^7.0.3",
3131
"fs-extra":"^10.1.0",
32+
"lowcoder-dev-utils":"workspace:^",
3233
"react":"^17",
3334
"react-dom":"^17",
3435
"react-json-view":"^1.21.3",
3536
"rollup-plugin-external-globals":"^0.7.1",
36-
"vite":"^4.5.1",
37+
"vite":"^4.3.9",
3738
"vite-plugin-css-injected-by-js":"^2.1.1",
3839
"vite-plugin-svgr":"^2.2.2"
3940
},
@@ -42,7 +43,6 @@
4243
"typescript":"^4.8.4"
4344
},
4445
"peerDependencies": {
45-
"lowcoder-dev-utils":"*",
4646
"lowcoder-sdk":"*"
4747
},
4848
"keywords": [

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
"big.js":"^6.2.1",
1717
"echarts-extension-gmap":"^1.6.0",
1818
"echarts-wordcloud":"^2.1.0",
19+
"lowcoder-cli":"workspace:^",
20+
"lowcoder-sdk":"workspace:^",
1921
"mermaid":"^10.2.4",
2022
"react":"17",
2123
"react-dom":"17",
22-
"react-resize-detector":"^7.0.0",
2324
"typescript":"4.8.4"
2425
},
2526
"lowcoder": {
@@ -69,12 +70,7 @@
6970
"devDependencies": {
7071
"jest":"29.3.0",
7172
"jest-canvas-mock":"^2.5.2",
72-
"vite":"^4.5.1",
73+
"vite":"^4.3.9",
7374
"vite-tsconfig-paths":"^3.6.0"
74-
},
75-
"peerDependencies": {
76-
"lowcoder-cli":"*",
77-
"lowcoder-dev-utils":"*",
78-
"lowcoder-sdk":"*"
7975
}
8076
}

‎client/packages/lowcoder-design/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
},
99
"dependencies": {
1010
"colord":"^2.9.3",
11+
"react-fontawesome":"^0.2.0",
1112
"react-markdown":"^8.0.0",
1213
"react-virtualized":"^9.22.3",
1314
"rehype-raw":"^6.1.1",

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,9 @@ const OptionItem = (props: {
153153
popoverTitle?:string;
154154
draggable?:boolean;
155155
optionExtra?:React.ReactNode;
156+
scrollable?:boolean;
156157
})=>{
157-
const{ content, config, title, popoverTitle, draggable=true, optionExtra}=props;
158+
const{ content, config, title, popoverTitle, draggable=true, optionExtra, scrollable}=props;
158159
const[visible,setVisible]=useState(false);
159160
const{ attributes, listeners, setNodeRef, transform, transition}=useSortable({
160161
id:config.dataIndex,
@@ -182,6 +183,7 @@ const OptionItem = (props: {
182183
setVisible={(vis)=>{
183184
setVisible(vis);
184185
}}
186+
scrollable={scrollable}
185187
>
186188
{optionRow}
187189
</SimplePopover>
@@ -204,6 +206,7 @@ function Option<T extends ConstructorToComp<MultiCompConstructor>>(props: {
204206
optionToolbar?:React.ReactNode;
205207
headerItem?:React.ReactNode;
206208
itemExtra?:(comp:T)=>React.ReactNode;
209+
scrollable?:boolean;
207210
}){
208211
const{ items, uniqVal, headerItem, optionToolbar, itemExtra}=props;
209212
constitemsDistinctValCount=uniqVal
@@ -286,6 +289,7 @@ function Option<T extends ConstructorToComp<MultiCompConstructor>>(props: {
286289
title={props.itemTitle(item)}
287290
config={{dataIndex:dataIndex}}
288291
optionExtra={optionExtra}
292+
scrollable={props.scrollable}
289293
/>
290294
);
291295
})}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,15 @@ const SimplePopover = (props: {
5151
setVisible?:(vis:boolean)=>void;
5252
children:JSX.Element|React.ReactNode;
5353
content:JSX.Element|React.ReactNode;
54+
scrollable?:boolean;
5455
})=>{
5556
const{ visible, setVisible}=props;
5657
constcontentWithBox=(
5758
<SuspensionBox
5859
title={props.title}
5960
onClose={()=>setVisible?.(false)}
6061
content={props.content}
62+
scrollable={props.scrollable}
6163
/>
6264
);
6365
return(
@@ -66,7 +68,7 @@ const SimplePopover = (props: {
6668
align={{
6769
offset:[-12,0,0,0],
6870
}}
69-
destroyTooltipOnHide
71+
//destroyTooltipOnHide
7072
content={contentWithBox}
7173
trigger="click"
7274
open={visible}
Loading

0 commit comments

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