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

refactor: add id close btn & delete work name

Browse source
This commit is contained in:
puriphatt 2024-09-25 11:22:23 +07:00
parent 1a27674928
commit fdc5781434
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/dialog/DialogHeader.vue
View file

@ -15,7 +15,7 @@ defineProps<{
<slot name="title-after" /> <slot name="title-after" />
</div> </div>
<slot name="after"> <slot name="after">
<CancelButton icon-only v-close-popup /> <CancelButton id="btn-form-close" icon-only v-close-popup />
</slot> </slot>
</div> </div>
</template> </template>

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

@ -1156,12 +1156,12 @@ function confirmDeleteWork(id: string, noDialog?: boolean) {
if (noDialog) { if (noDialog) {
deleteWork(id); deleteWork(id);
} else { } else {
const currUseName = const currUseName = workItems.value?.map((v) => v.name) || [];
service.value?.map((v) => v.work.map((x) => x.name)).flat() || [];
const deleteTarget = workNameItems.value.find( const deleteTarget = workNameItems.value.find(
(v: { id: string }) => v.id === id, (v: { id: string }) => v.id === id,
).name; );
const isNameInUse = currUseName.includes(deleteTarget); if (!deleteTarget) return;
const isNameInUse = currUseName.includes(deleteTarget.name);
dialog({ dialog({
color: 'negative', color: 'negative',
@ -1169,7 +1169,7 @@ function confirmDeleteWork(id: string, noDialog?: boolean) {
title: t('dialog.title.confirmDelete'), title: t('dialog.title.confirmDelete'),
actionText: t('general.delete'), actionText: t('general.delete'),
message: isNameInUse message: isNameInUse
? `${t('dialog.message.beingUse', { msg: deleteTarget })} ${t('dialog.message.confirmDelete')}` ? `${t('dialog.message.beingUse', { msg: deleteTarget.name })} ${t('dialog.message.confirmDelete')}`
: t('dialog.message.confirmDelete'), : t('dialog.message.confirmDelete'),
action: async () => { action: async () => {
deleteWork(id); deleteWork(id);