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

Commite2a9ad0

Browse files
authored
Merge branch 'dev' into fix/table-row-selection
2 parents35b044a +18be56b commite2a9ad0

File tree

46 files changed

+1102
-254
lines changed

Some content is hidden

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

46 files changed

+1102
-254
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ application-dev-localhost.yaml
1818
server/api-service/lowcoder-server/src/main/resources/application-local-dev.yaml
1919
translations/locales/node_modules/
2020
.vscode/settings.json
21+
server/api-service/lowcoder-server/src/main/resources/application-local-dev-ee.yaml

‎client/packages/lowcoder/index.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
display: flex;
2929
pointer-events: none;
3030
flex-direction: column;
31+
top:0;
32+
z-index:10000;
3133
}
3234
#loadingsvg {
3335
animation: breath1s linear infinite;

‎client/packages/lowcoder/src/components/DraggableTree/DraggableItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const Wrapper = styled.div<{
1515
$itemHeight?:number;
1616
}>`
1717
position: relative;
18-
width:100%;
18+
width:auto;
1919
height:${(props)=>props.$itemHeight??30}px;
2020
/* border: 1px solid #d7d9e0; */
2121
border-radius: 4px;

‎client/packages/lowcoder/src/components/DraggableTree/DroppableMenuItem.tsx

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { DraggableTreeContext } from "./DraggableTreeContext";
66
importDroppablePlaceholderfrom"./DroppablePlaceHolder";
77
import{DraggableTreeNode,DraggableTreeNodeItemRenderProps,IDragData,IDropData}from"./types";
88
import{checkDroppableFlag}from"./util";
9+
import{Flex}from"antd";
910

1011
constDraggableMenuItemWrapper=styled.div`
1112
position: relative;
@@ -88,29 +89,34 @@ export default function DraggableMenuItem(props: IDraggableMenuItemProps) {
8889
disabled={isDragging||disabled}
8990
/>
9091
)}
91-
<DraggableItem
92-
path={path}
93-
id={id}
94-
dropInAsSub={dropInAsSub&&canDropIn!==false}
95-
isOver={isOver}
96-
ref={(node)=>{
97-
setDragNodeRef(node);
98-
setDropNodeRef(node);
99-
}}
100-
{...dragListeners}
101-
>
102-
{renderContent?.({
103-
node:item,
104-
isOver,
105-
path,
106-
isOverlay,
107-
hasChildren:items.length>0,
108-
dragging:!!(isDragging||parentDragging),
109-
isFolded:isFold,
110-
onDelete:()=>onDelete?.(path),
111-
onToggleFold:()=>context.toggleFold(id),
112-
})||null}
113-
</DraggableItem>
92+
<Flexstyle={{paddingLeft:'15px'}}align="center">
93+
<DraggableItem
94+
path={path}
95+
id={id}
96+
dropInAsSub={dropInAsSub&&canDropIn!==false}
97+
isOver={isOver}
98+
ref={(node)=>{
99+
setDragNodeRef(node);
100+
setDropNodeRef(node);
101+
}}
102+
{...dragListeners}
103+
>
104+
<spanstyle={{cursor:"default"}}>⣿</span>
105+
</DraggableItem>
106+
<divstyle={{flex:1,maxWidth:"calc(100% - 12px)"}}>
107+
{renderContent?.({
108+
node:item,
109+
isOver,
110+
path,
111+
isOverlay,
112+
hasChildren:items.length>0,
113+
dragging:!!(isDragging||parentDragging),
114+
isFolded:isFold,
115+
onDelete:()=>onDelete?.(path),
116+
onToggleFold:()=>context.toggleFold(id),
117+
})||null}
118+
</div>
119+
</Flex>
114120
</DraggableMenuItemWrapper>
115121
{items.length>0&&!isFold&&(
116122
<divclassName="sub-menu-list">

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import { ExternalEditorContext } from "util/context/ExternalEditorContext";
3434
import{useUserViewMode}from"util/hooks";
3535
importReactfrom"react";
3636
import{isEqual}from"lodash";
37-
37+
import{LoadingBarHideTrigger}from"@lowcoder-ee/util/hideLoading";
3838
constEditorView=lazy(
3939
()=>import("pages/editor/editorView"),
4040
);
@@ -138,6 +138,7 @@ const RootView = React.memo((props: RootViewProps) => {
138138
<divkey={key}>{comp.children.queries.children[key].getView()}</div>
139139
))}
140140
<Suspensefallback={!readOnly||isUserViewMode ?SuspenseFallback :null}>
141+
<LoadingBarHideTrigger/>
141142
<EditorViewuiComp={comp.children.ui}preloadComp={comp.children.preload}/>
142143
</Suspense>
143144
</EditorContext.Provider>

‎client/packages/lowcoder/src/constants/reduxActionConstants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export const ReduxActionTypes = {
99
FETCH_RAW_CURRENT_USER_SUCCESS:"FETCH_RAW_CURRENT_USER_SUCCESS",
1010
FETCH_API_KEYS:"FETCH_API_KEYS",
1111
FETCH_API_KEYS_SUCCESS:"FETCH_API_KEYS_SUCCESS",
12-
12+
MOVE_TO_FOLDER2_SUCCESS:"MOVE_TO_FOLDER2_SUCCESS",
1313

1414
/* plugin RELATED */
1515
FETCH_DATA_SOURCE_TYPES:"FETCH_DATA_SOURCE_TYPES",

‎client/packages/lowcoder/src/i18n/locales/en.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2785,6 +2785,7 @@ export const en = {
27852785
"switch":"Switch Component: "
27862786
},
27872787
"module":{
2788+
"folderNotEmpty":"Folder is not empty",
27882789
"emptyText":"No Data",
27892790
"docLink":"Read More About Modules...",
27902791
"documentationText" :"Modules are complete Applications, that can get included and repeated in other Applications and it functions just like a single component. As modules can get embedded, they need to be able to interact with your outside apps or websites. This four settings help to support communication with a Module.",

‎client/packages/lowcoder/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if (!window.ResizeObserver) {
2424
window.ResizeObserver=ResizeObserver;
2525
}
2626

27-
functionhideLoading(){
27+
exportfunctionhideLoading(){
2828
// hide loading
2929
constnode=document.getElementById("loading");
3030
if(node){
@@ -42,7 +42,7 @@ debug(`REACT_APP_LOG_LEVEL:, ${REACT_APP_LOG_LEVEL}`);
4242

4343
try{
4444
bootstrap();
45-
hideLoading();
45+
//hideLoading();
4646
}catch(e){
4747
log.error(e);
4848
}

‎client/packages/lowcoder/src/pages/ApplicationV2/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ import AppEditor from "../editor/AppEditor";
7373
import{fetchDeploymentIdAction}from"@lowcoder-ee/redux/reduxActions/configActions";
7474
import{getDeploymentId}from"@lowcoder-ee/redux/selectors/configSelectors";
7575
import{SimpleSubscriptionContextProvider}from'@lowcoder-ee/util/context/SimpleSubscriptionContext';
76-
76+
import{LoadingBarHideTrigger}from"@lowcoder-ee/util/hideLoading";
7777
constTabLabel=styled.div`
7878
font-weight: 500;
7979
`;
@@ -222,6 +222,7 @@ export default function ApplicationHome() {
222222

223223
return(
224224
<DivStyled>
225+
<LoadingBarHideTrigger/>
225226
<SimpleSubscriptionContextProvider>
226227
<Layout
227228
sections={[

‎client/packages/lowcoder/src/pages/editor/bottom/BottomSidebar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ const HighlightBorder = styled.div<{ $active: boolean; $foldable: boolean; $leve
323323
max-width: 100%;
324324
flex: 1;
325325
display: flex;
326-
padding-left:${(props)=>props.$level*20+(props.$foldable ?0 :14)}px;
326+
padding-left:${(props)=>props.$level*10+(props.$foldable ?0 :14)}px;
327327
border-radius: 4px;
328328
border: 1px solid${(props)=>(props.$active ?BorderActiveColor :"transparent")};
329329
align-items: center;

0 commit comments

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