mirror of
https://github.com/lingble/chatwoot.git
synced 2025-11-02 20:18:08 +00:00
4efeb4eda2
# Pull Request Template ## Description This PR includes fix for, **1**. Incorrect error message translation for search in contact merge modal. <img width="395" alt="image" src="https://github.com/user-attachments/assets/e6592bcc-4656-4a6e-83a9-7124e2c4732a" /> **2**. Z-index issue in chat screen <img width="395" alt="image" src="https://github.com/user-attachments/assets/387a2b47-ea85-49c7-832b-8bc1a4f0ec3f" /> ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) ## How Has This Been Tested? **Screenshots** **1.** <img width="395" alt="image" src="https://github.com/user-attachments/assets/a1f1e36d-0801-4e7b-9ee9-c72728933332" /> **2.** <img width="395" alt="image" src="https://github.com/user-attachments/assets/60a0ddc1-eb8f-4dbc-9028-245e6bb64c33" /> ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [ ] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules
82 lines
2.3 KiB
Vue
82 lines
2.3 KiB
Vue
<script setup>
|
|
import { computed } from 'vue';
|
|
import { useI18n } from 'vue-i18n';
|
|
import BaseBubble from './Base.vue';
|
|
import Icon from 'next/icon/Icon.vue';
|
|
import { useMessageContext } from '../provider.js';
|
|
|
|
defineProps({
|
|
icon: { type: [String, Object], required: true },
|
|
iconBgColor: { type: String, default: 'bg-n-alpha-3' },
|
|
senderTranslationKey: { type: String, required: true },
|
|
content: { type: String, required: true },
|
|
title: { type: String, default: '' }, // Title can be any name, description, etc
|
|
action: {
|
|
type: Object,
|
|
required: true,
|
|
validator: action => {
|
|
return action.label && (action.href || action.onClick);
|
|
},
|
|
},
|
|
});
|
|
|
|
const { sender } = useMessageContext();
|
|
const { t } = useI18n();
|
|
|
|
const senderName = computed(() => {
|
|
return sender?.value?.name || '';
|
|
});
|
|
</script>
|
|
|
|
<template>
|
|
<BaseBubble class="overflow-hidden p-3" data-bubble-name="attachment">
|
|
<div class="grid gap-4 min-w-64">
|
|
<div class="grid gap-3">
|
|
<div
|
|
class="size-8 rounded-lg grid place-content-center"
|
|
:class="iconBgColor"
|
|
>
|
|
<slot name="icon">
|
|
<Icon :icon="icon" class="text-white size-4" />
|
|
</slot>
|
|
</div>
|
|
<div class="space-y-1">
|
|
<div v-if="senderName" class="text-n-slate-12 text-sm truncate">
|
|
{{
|
|
t(senderTranslationKey, {
|
|
sender: senderName,
|
|
})
|
|
}}
|
|
</div>
|
|
<slot>
|
|
<div v-if="title" class="truncate text-sm text-n-slate-12">
|
|
{{ title }}
|
|
</div>
|
|
<div v-if="content" class="truncate text-sm text-n-slate-11">
|
|
{{ content }}
|
|
</div>
|
|
</slot>
|
|
</div>
|
|
</div>
|
|
<div v-if="action" class="mb-2">
|
|
<a
|
|
v-if="action.href"
|
|
:href="action.href"
|
|
rel="noreferrer noopener nofollow"
|
|
target="_blank"
|
|
class="w-full block bg-n-solid-3 px-4 py-2 rounded-lg text-sm text-center border border-n-container"
|
|
>
|
|
{{ action.label }}
|
|
</a>
|
|
<button
|
|
v-else
|
|
class="w-full bg-n-solid-3 px-4 py-2 rounded-lg text-sm text-center border border-n-container"
|
|
@click="action.onClick"
|
|
>
|
|
{{ action.label }}
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</BaseBubble>
|
|
</template>
|