chamomind/jws-frontend
chamomind/jws-frontend
7
0
Fork 0
Code Issues Projects Releases Packages 1 Wiki Activity Actions

fix(04): work name => name being use (delete), re select

Browse source
This commit is contained in:
puriphatt 2024-09-20 11:45:34 +07:00
parent 1dd7873fce
commit b53ec8e91c
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/04_product-service/WorkManagementComponent.vue
View file

@ -66,8 +66,9 @@ watch(
const oldList = o.map((v: { name: string }) => v.name);
const index = oldList.indexOf(workName.value);
if (list[index] !== oldList[index]) {
workName.value = list[index];
if (list[index] !== oldList[index] && !list.includes(workName.value)) {
if (list.length - 1 === index - 1) workName.value = list[index - 1];
else workName.value = list[index];
}
},
);

14
src/pages/04_product-service/MainPage.vue
View file

@ -1155,19 +1155,29 @@ async function submitGroup() {
function confirmDeleteWork(id: string, noDialog?: boolean) {
if (noDialog) {
deleteWork(id);
} else
} else {
const currUseName =
service.value?.map((v) => v.work.map((x) => x.name)).flat() || [];
const deleteTarget = workNameItems.value.find(
(v: { id: string }) => v.id === id,
).name;
const isNameInUse = currUseName.includes(deleteTarget);
dialog({
color: 'negative',
icon: 'mdi-alert',
title: t('dialog.title.confirmDelete'),
actionText: t('general.delete'),
message: t('dialog.message.confirmDelete'),
message: isNameInUse
? `${t('dialog.message.beingUse', { msg: deleteTarget })} ${t('dialog.message.confirmDelete')}`
: t('dialog.message.confirmDelete'),
action: async () => {
deleteWork(id);
flowStore.rotate();
},
cancel: () => {},
});
}
}
function triggerConfirmCloseWork() {