Skip to content

Commit cfe991d

Browse files
Imiss-U1025Imiss-U1025
committed
Processed immediate activity in Your Apps.
1 parent f51f681 commit cfe991d

File tree

6 files changed

+65
-32
lines changed

6 files changed

+65
-32
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,18 @@ const ApplicationCardsWrapper = styled.div`
1919
}
2020
`;
2121

22-
export function HomeCardView(props: { resources: HomeRes[] }) {
22+
export function HomeCardView(props: { resources: HomeRes[], setModify?: any, modify?: boolean }) {
23+
const {setModify, modify} = props;
2324
const [needMoveRes, setNeedMoveRes] = useState<HomeRes | undefined>(undefined);
2425

2526
return (
2627
<ApplicationCardsWrapper>
2728
{props.resources.map((res) => (
2829
res.isMarketplace ?
2930
<MarketplaceResCard key={res.id} res={res} /> :
30-
<HomeResCard key={res.id} res={res} onMove={setNeedMoveRes} />
31+
<HomeResCard key={res.id} res={res} onMove={setNeedMoveRes} setModify={setModify} modify={modify!} />
3132
))}
32-
<MoveToFolderModal source={needMoveRes} onClose={() => setNeedMoveRes(undefined)} />
33+
<MoveToFolderModal source={needMoveRes} onClose={() => setNeedMoveRes(undefined)} setModify={setModify} modify={modify!} />
3334
</ApplicationCardsWrapper>
3435
);
3536
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -635,9 +635,9 @@ export function HomeLayout(props: HomeLayoutProps) {
635635
{mode !== "marketplace" && (
636636
<>
637637
{layout === "list" ? (
638-
<HomeTableView resources={resList} />
638+
<HomeTableView resources={resList} setModify={setModify} modify={modify!}/>
639639
) : (
640-
<HomeCardView resources={resList} />
640+
<HomeCardView resources={resList} setModify={setModify} modify={modify!} />
641641
)}
642642
</>
643643
)}

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ const OperationWrapper = styled.div`
141141

142142
const MONTH_MILLIS = 30 * 24 * 60 * 60 * 1000;
143143

144-
export function HomeResCard(props: { res: HomeRes; onMove: (res: HomeRes) => void }) {
145-
const { res, onMove } = props;
144+
export function HomeResCard(props: { res: HomeRes; onMove: (res: HomeRes) => void; setModify:any; modify: boolean }) {
145+
const { res, onMove, setModify, modify } = props;
146146
const [appNameEditing, setAppNameEditing] = useState(false);
147147
const dispatch = useDispatch();
148148

@@ -214,10 +214,16 @@ export function HomeResCard(props: { res: HomeRes; onMove: (res: HomeRes) => voi
214214
}
215215
if (res.type === HomeResTypeEnum.Folder) {
216216
dispatch(updateFolder({ id: res.id, name: value }));
217+
setTimeout(() => {
218+
setModify(!modify);
219+
}, 200);
217220
} else {
218221
dispatch(
219222
updateAppMetaAction({ applicationId: res.id, name: value, folderId: folderId })
220223
);
224+
setTimeout(() => {
225+
setModify(!modify);
226+
}, 200);
221227
}
222228
setAppNameEditing(false);
223229
}}
@@ -245,6 +251,8 @@ export function HomeResCard(props: { res: HomeRes; onMove: (res: HomeRes) => voi
245251
res={res}
246252
onRename={() => setAppNameEditing(true)}
247253
onMove={(res) => onMove(res)}
254+
setModify={setModify}
255+
modify={modify}
248256
/>
249257
</OperationWrapper>
250258
</Card>

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

Lines changed: 32 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ export const HomeResOptions = (props: {
3838
onDuplicate?: (res: HomeRes | undefined) => void;
3939
onRename: (res: HomeRes) => void;
4040
onMove: (res: HomeRes) => void;
41+
setModify: any;
42+
modify: boolean;
4143
}) => {
42-
const { res, onDuplicate, onRename, onMove } = props;
44+
const { res, onDuplicate, onRename, onMove, setModify, modify } = props;
4345
const dispatch = useDispatch();
4446
const [showCopyModal, setShowCopyModal] = useState(false);
4547

@@ -78,19 +80,24 @@ export const HomeResOptions = (props: {
7880
type: HomeResInfo[res.type].name,
7981
name: <b>{res.name}</b>,
8082
}),
81-
onConfirm: () =>
83+
onConfirm: () =>{
8284
new Promise((resolve, reject) => {
8385
dispatch(
84-
recycleApplication(
85-
{ applicationId: res.id, folderId: folderId },
86-
() => {
87-
messageInstance.success(trans("success"));
88-
resolve(true);
89-
},
90-
() => reject()
91-
)
86+
recycleApplication(
87+
{ applicationId: res.id, folderId: folderId },
88+
() => {
89+
messageInstance.success(trans("success"));
90+
resolve(true);
91+
},
92+
() => reject()
93+
)
9294
);
93-
}),
95+
setTimeout(() => {
96+
setModify(!modify);
97+
}, 200);
98+
})
99+
100+
},
94101
confirmBtnType: "delete",
95102
okText: trans("home.moveToTrash"),
96103
});
@@ -115,19 +122,23 @@ export const HomeResOptions = (props: {
115122
type: HomeResInfo[res.type].name.toLowerCase(),
116123
name: <b>{res.name}</b>,
117124
}),
118-
onConfirm: () =>
125+
onConfirm: () =>{
119126
new Promise((resolve, reject) => {
120-
dispatch(
127+
dispatch(
121128
deleteFolder(
122-
{ folderId: res.id, parentFolderId: folderId },
123-
() => {
124-
messageInstance.success(trans("home.deleteSuccessMsg"));
125-
resolve(true);
126-
},
127-
() => reject()
129+
{ folderId: res.id, parentFolderId: folderId },
130+
() => {
131+
messageInstance.success(trans("home.deleteSuccessMsg"));
132+
resolve(true);
133+
},
134+
() => reject()
128135
)
129-
);
130-
}),
136+
);
137+
})
138+
setTimeout(() => {
139+
setModify(!modify);
140+
}, 200);
141+
},
131142
confirmBtnType: "delete",
132143
okText: trans("delete"),
133144
});

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ const TypographyText = styled(AntdTypographyText)`
5151
width: 100%;
5252
`;
5353

54-
export const HomeTableView = (props: { resources: HomeRes[] }) => {
54+
export const HomeTableView = (props: { resources: HomeRes[], setModify?: any, modify?: boolean }) => {
55+
const {setModify, modify, resources} = props
5556
const dispatch = useDispatch();
5657

5758
const { folderId } = useParams<{ folderId: string }>();
@@ -122,6 +123,9 @@ export const HomeTableView = (props: { resources: HomeRes[] }) => {
122123
}
123124
if (item.type === HomeResTypeEnum.Folder) {
124125
dispatch(updateFolder({ id: item.id, name: value }));
126+
setTimeout(() => {
127+
setModify(!modify);
128+
}, 200);
125129
} else {
126130
dispatch(
127131
updateAppMetaAction({
@@ -130,6 +134,9 @@ export const HomeTableView = (props: { resources: HomeRes[] }) => {
130134
folderId: folderId,
131135
})
132136
);
137+
setTimeout(() => {
138+
setModify(!modify);
139+
}, 200);
133140
}
134141
setNeedRenameRes(undefined);
135142
},
@@ -225,15 +232,17 @@ export const HomeTableView = (props: { resources: HomeRes[] }) => {
225232
onDuplicate={(res) => setNeedDuplicateRes(res)}
226233
onRename={(res) => setNeedRenameRes(res)}
227234
onMove={(res) => setNeedMoveRes(res)}
235+
setModify={setModify}
236+
modify={modify!}
228237
/>
229238
</OperationWrapper>
230239
);
231240
},
232241
},
233242
]}
234-
dataSource={props.resources}
243+
dataSource={resources}
235244
/>
236-
<MoveToFolderModal source={needMoveRes} onClose={() => setNeedMoveRes(undefined)} />
245+
<MoveToFolderModal source={needMoveRes} onClose={() => setNeedMoveRes(undefined)} setModify={setModify} modify={modify!} />
237246
</>
238247
);
239248
};

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ const MoveModalFooter = styled.div`
4040
gap: 8px;
4141
`;
4242

43-
export const MoveToFolderModal = (props: { source?: HomeRes; onClose: () => void }) => {
43+
export const MoveToFolderModal = (props: { source?: HomeRes; onClose: () => void, setModify: any, modify: boolean }) => {
44+
const {setModify, modify} = props;
4445
const [form] = Form.useForm();
4546

4647
const [loading, setLoading] = useState<boolean>(false);
@@ -83,6 +84,9 @@ export const MoveToFolderModal = (props: { source?: HomeRes; onClose: () => void
8384
() => setLoading(false)
8485
)
8586
);
87+
setTimeout(() => {
88+
setModify(!modify);
89+
}, 200);
8690
});
8791
}}
8892
>

0 commit comments

Comments
 (0)