Merge branch 'develop'
This commit is contained in:
commit
1f9eab41ac
2 changed files with 8 additions and 1 deletions
|
|
@ -23,6 +23,7 @@ defineProps<{
|
|||
hideKebabDelete?: boolean;
|
||||
hideAction?: boolean;
|
||||
useCancel?: boolean;
|
||||
disableCancel?: boolean;
|
||||
|
||||
customData?: {
|
||||
label: string;
|
||||
|
|
@ -95,6 +96,7 @@ const rand = Math.random();
|
|||
status="ACTIVE"
|
||||
hide-toggle
|
||||
:use-cancel
|
||||
:disable-cancel
|
||||
:hide-delete="hideKebabDelete"
|
||||
:hide-view="hideKebabView"
|
||||
:hide-edit="hideKebabEdit"
|
||||
|
|
|
|||
|
|
@ -203,7 +203,8 @@ function getEmployeeName(
|
|||
hide-delete
|
||||
use-cancel
|
||||
:disable-cancel="
|
||||
props.row.requestDataStatus === RequestDataStatus.Canceled
|
||||
props.row.requestDataStatus === RequestDataStatus.Canceled ||
|
||||
props.row.requestDataStatus === RequestDataStatus.Completed
|
||||
"
|
||||
@cancel="$emit('delete', props.row)"
|
||||
/>
|
||||
|
|
@ -223,6 +224,10 @@ function getEmployeeName(
|
|||
hide-kebab-edit
|
||||
hide-kebab-delete
|
||||
use-cancel
|
||||
:disable-cancel="
|
||||
props.row.requestDataStatus === RequestDataStatus.Canceled ||
|
||||
props.row.requestDataStatus === RequestDataStatus.Completed
|
||||
"
|
||||
:badge-color="
|
||||
{
|
||||
[RequestDataStatus.Pending]: '--orange-5-hsl',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue