MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-24 09:13:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix invite response, small fixes

Browse Source
This commit is contained in:
Natsumi
2025-09-16 16:21:32 +12:00
parent 4c0b2c3299
commit 9a99b37fea
22 changed files with 137 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/dialogs/InviteDialog/InviteDialog.vue
View File

@@ -1,7 +1,7 @@
<template>
<el-dialog
class="x-dialog"
v-model="inviteDialog.visible"
:model-value="inviteDialog.visible"
:title="t('dialog.invite.header')"
width="500px"
append-to-body>
@@ -163,8 +163,8 @@
>
</template>
<SendInviteDialog
:send-invite-dialog-visible="sendInviteDialogVisible"
:send-invite-dialog="sendInviteDialog"
v-model:sendInviteDialogVisible="sendInviteDialogVisible"
v-model:sendInviteDialog="sendInviteDialog"
:invite-dialog="inviteDialog"
@closeInviteDialog="closeInviteDialog" />
</el-dialog>

15
src/components/dialogs/InviteDialog/SendInviteConfirmDialog.vue
View File

@@ -1,7 +1,7 @@
<template>
<el-dialog
class="x-dialog"
:model-value="visible"
:model-value="isSendInviteConfirmDialogVisible"
:title="t('dialog.invite_message.header')"
width="400px"
append-to-body
@@ -11,10 +11,10 @@
</div>
<template #footer>
<el-button type="small" @click="cancelInviteConfirm">
<el-button type="default" @click="cancelInviteConfirm">
{{ t('dialog.invite_message.cancel') }}
</el-button>
<el-button type="primary" size="small" @click="sendInviteConfirm">
<el-button type="primary" @click="sendInviteConfirm">
{{ t('dialog.invite_message.confirm') }}
</el-button>
</template>
@@ -36,7 +36,7 @@
const { currentUser } = storeToRefs(useUserStore());
const props = defineProps({
visible: {
isSendInviteConfirmDialogVisible: {
type: Boolean,
required: true
},
@@ -51,10 +51,10 @@
}
});
const emit = defineEmits(['update:model-value', 'closeInviteDialog']);
const emit = defineEmits(['update:isSendInviteConfirmDialogVisible', 'closeInviteDialog']);
function cancelInviteConfirm() {
emit('update:model-value', false);
emit('update:isSendInviteConfirmDialogVisible', false);
}
function sendInviteConfirm() {
@@ -110,7 +110,8 @@
}
};
inviteLoop();
} else if (messageType === 'invite') {
} else if (messageType === 'message') {
// invite message
D.params.messageSlot = slot;
if (uploadImage.value) {
notificationRequest

14
src/components/dialogs/InviteDialog/SendInviteDialog.vue
View File

@@ -75,13 +75,15 @@
</el-button>
</template>
<SendInviteConfirmDialog
v-model="isSendInviteConfirmDialogVisible"
:send-invite-dialog="sendInviteDialog"
v-model:isSendInviteConfirmDialogVisible="isSendInviteConfirmDialogVisible"
:sendInviteDialog="sendInviteDialog"
@update:sendInviteDialog="emit('update:sendInviteDialog', $event)"
:invite-dialog="inviteDialog"
@closeInviteDialog="closeInviteDialog" />
<EditAndSendInviteDialog
:edit-and-send-invite-dialog="editAndSendInviteDialog"
:send-invite-dialog="sendInviteDialog"
:sendInviteDialog="sendInviteDialog"
@update:sendInviteDialog="emit('update:sendInviteDialog', $event)"
:invite-dialog="inviteDialog"
@closeInviteDialog="closeInviteDialog" />
</el-dialog>
@@ -120,7 +122,7 @@
}
});
const emit = defineEmits(['closeInviteDialog', 'update:sendInviteDialogVisible']);
const emit = defineEmits(['closeInviteDialog', 'update:sendInviteDialogVisible', 'update:sendInviteDialog']);
const isSendInviteConfirmDialogVisible = ref(false);
@@ -130,12 +132,12 @@
});
function showSendInviteConfirmDialog(row) {
props.sendInviteDialog.messageSlot = row;
emit('update:sendInviteDialog', { ...props.sendInviteDialog, messageSlot: row });
isSendInviteConfirmDialogVisible.value = true;
}
function showEditAndSendInviteDialog(row) {
props.sendInviteDialog.messageSlot = row;
emit('update:sendInviteDialog', { ...props.sendInviteDialog, messageSlot: row });
editAndSendInviteDialog.value = {
newMessage: row.message,
visible: true