From 13cacd62de32c8b17c42ba38820860137a73690e Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Wed, 25 Dec 2024 15:48:41 +0700
Subject: [PATCH] fix(regression): cancel menu now must be set only

---
 src/components/shared/KebabAction.vue          | 3 ++-
 src/pages/08_request-list/TableRequestList.vue | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/shared/KebabAction.vue b/src/components/shared/KebabAction.vue
index bd42d6f5..521c47ea 100644
--- a/src/components/shared/KebabAction.vue
+++ b/src/components/shared/KebabAction.vue
@@ -171,11 +171,12 @@ watch(
         </q-item>
 
         <q-item
+          v-if="useCancel"
           v-close-popup
           dense
           class="row"
           style="white-space: nowrap"
-          :clickable="!disableDelete"
+          :clickable="!disableCancel"
           :id="`btn-kebab-delete-${idName}`"
           :class="{
             'surface-3': disableCancel,
diff --git a/src/pages/08_request-list/TableRequestList.vue b/src/pages/08_request-list/TableRequestList.vue
index 2d978896..93eb6a20 100644
--- a/src/pages/08_request-list/TableRequestList.vue
+++ b/src/pages/08_request-list/TableRequestList.vue
@@ -160,6 +160,7 @@ function getEmployeeName(
             hide-toggle
             hide-view
             hide-delete
+            use-cancel
             :disable-cancel="
               props.row.requestDataStatus === RequestDataStatus.Canceled
             "