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

fix: dialog types error

Browse Source
This commit is contained in:
pa
2025-07-16 14:58:23 +09:00
committed by Natsumi
parent b23687430e
commit 6b84d7444b
17 changed files with 156 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/dialogs/UserDialog/PreviousInstancesUserDialog.vue
View File

@@ -1,6 +1,6 @@
<template>
<safe-dialog
ref="previousInstancesUserDialog"
ref="previousInstancesUserDialogRef"
:visible.sync="isVisible"
:title="$t('dialog.previous_instances.header')"
width="1000px"
@@ -14,12 +14,12 @@
</div>
<data-tables v-loading="loading" v-bind="previousInstancesUserDialogTable" style="margin-top: 10px">
<el-table-column :label="$t('table.previous_instances.date')" prop="created_at" sortable width="170">
<template slot-scope="scope">
<template #default="scope">
<span>{{ formatDateFilter(scope.row.created_at, 'long') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('table.previous_instances.world')" prop="name" sortable>
<template slot-scope="scope">
<template #default="scope">
<Location
:location="scope.row.location"
:hint="scope.row.worldName"
@@ -27,17 +27,17 @@
</template>
</el-table-column>
<el-table-column :label="$t('table.previous_instances.instance_creator')" prop="location" width="170">
<template slot-scope="scope">
<template #default="scope">
<DisplayName :userid="scope.row.$location.userId" :location="scope.row.$location.tag" />
</template>
</el-table-column>
<el-table-column :label="$t('table.previous_instances.time')" prop="time" width="100" sortable>
<template slot-scope="scope">
<template #default="scope">
<span v-text="scope.row.timer"></span>
</template>
</el-table-column>
<el-table-column :label="$t('table.previous_instances.action')" width="90" align="right">
<template slot-scope="scope">
<template #default="scope">
<el-button
type="text"
icon="el-icon-switch-button"
@@ -123,6 +123,8 @@
const { showPreviousInstancesInfoDialog } = useInstanceStore();
const { shiftHeld } = storeToRefs(useUiStore());
const previousInstancesUserDialogRef = ref(null);
const isVisible = computed({
get: () => props.previousInstancesUserDialog.visible,
set: (value) => {
@@ -152,7 +154,7 @@
() => {
if (props.previousInstancesUserDialog.visible) {
nextTick(() => {
adjustDialogZ(proxy.$refs.previousInstancesUserDialog.$el);
adjustDialogZ(previousInstancesUserDialogRef.value.$el);
});
refreshPreviousInstancesUserTable();
}

18
src/components/dialogs/UserDialog/UserDialog.vue
View File

@@ -901,7 +901,9 @@
<div class="x-friend-item" style="cursor: default">
<el-tooltip :placement="currentUser.id !== userDialog.id ? 'bottom' : 'top'">
<template #content>
<span>{{ formatDateFilter(userOnlineForTimestamp(userDialog), 'short') }}</span>
<span>{{
formatDateFilter(String(userOnlineForTimestamp(userDialog)), 'short')
}}</span>
</template>
<div class="detail">
<span
@@ -1845,7 +1847,8 @@
useLocationStore,
useModerationStore,
useUserStore,
useWorldStore
useWorldStore,
useUiStore
} from '../../../stores';
import SendInviteDialog from '../InviteDialog/SendInviteDialog.vue';
import InviteGroupDialog from '../InviteGroupDialog.vue';
@@ -1895,6 +1898,7 @@
const { logout } = useAuthStore();
const { cachedConfig } = storeToRefs(useAuthStore());
const { handlePlayerModerationAtSend, handlePlayerModeration, handlePlayerModerationDelete } = useModerationStore();
const { shiftHeld } = storeToRefs(useUiStore());
watch(
() => userDialog.value.loading,
@@ -2066,7 +2070,7 @@
const data = await lookupAvatars('authorId', userId);
const avatars = new Set();
userDialogAvatars.value.forEach((avatar) => {
avatars.add(avatar.id, avatar);
avatars.add(avatar.id);
});
if (data && typeof data === 'object') {
data.forEach((avatar) => {
@@ -2598,7 +2602,7 @@
async function sortCurrentUserGroups() {
const D = userDialog.value;
let sortMethod = function () {};
let sortMethod = (a, b) => 0;
switch (D.groupSorting.value) {
case 'alphabetical':
@@ -2621,7 +2625,7 @@
function setUserDialogAvatars(userId) {
const avatars = new Set();
userDialogAvatars.value.forEach((avatar) => {
avatars.add(avatar.id, avatar);
avatars.add(avatar.id);
});
for (const ref of cachedAvatars.value.values()) {
if (ref.authorId === userId && !avatars.has(ref.id)) {
@@ -2696,7 +2700,8 @@
const worldLists = [];
let params = {
ownerId: userId,
n: 100
n: 100,
offset: 0
};
const json = await request('favorite/groups', {
method: 'GET',
@@ -2708,6 +2713,7 @@
continue;
}
params = {
ownerId: userId,
n: 100,
offset: 0,
userId,