From d54853f6ffdcbd6bde2aead4dc503b492034fe2c Mon Sep 17 00:00:00 2001 From: Natsumi Date: Thu, 23 Dec 2021 18:27:25 +1300 Subject: [PATCH] Search and previous lobby photon logging feed --- html/src/app.js | 39 +++++++++++++++++++++++++++++++++++++- html/src/index.pug | 47 +++++++++++++++++++++++++++++++++++----------- 2 files changed, 74 insertions(+), 12 deletions(-) diff --git a/html/src/app.js b/html/src/app.js index ea2825e9..382bd2bd 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -7555,7 +7555,10 @@ speechSynthesis.getVoices(); this.lastPortalId = ''; this.lastPortalList = new Map(); this.portalQueue = ''; - this.photonEventTable.data = []; + if (this.photonEventTable.data.length > 0) { + this.photonEventTablePrevious.data = this.photonEventTable.data; + this.photonEventTable.data = []; + } this.updateCurrentInstanceWorld(); var playerList = Array.from(this.lastLocation.playerList.values()); for (var ref of playerList) { @@ -8285,8 +8288,42 @@ speechSynthesis.getVoices(); AppApi.ExecuteVrFeedFunction('updatePhotonLobbyBotSize', `${size}`); }; + $app.data.photonEventTableFilter = ''; + + $app.methods.photonEventTableFilterChange = function () { + this.photonEventTable.filters[0].value = this.photonEventTableFilter; + this.photonEventTablePrevious.filters[0].value = + this.photonEventTableFilter; + }; + $app.data.photonEventTable = { data: [], + filters: [ + { + prop: ['displayName', 'text'], + value: '' + } + ], + tableProps: { + stripe: true, + size: 'mini' + }, + pageSize: 10, + paginationProps: { + small: true, + layout: 'sizes,prev,pager,next,total', + pageSizes: [5, 10, 15, 25, 50] + } + }; + + $app.data.photonEventTablePrevious = { + data: [], + filters: [ + { + prop: ['displayName', 'text'], + value: '' + } + ], tableProps: { stripe: true, size: 'mini' diff --git a/html/src/index.pug b/html/src/index.pug index 3ae43b46..1179b500 100644 --- a/html/src/index.pug +++ b/html/src/index.pug @@ -158,20 +158,45 @@ html template(#content) span(v-text="link") img(:src="getFaviconUrl(link)" style="width:16px;height:16px;vertical-align:middle;margin-right:5px;cursor:pointer" @click.stop="openExternalLink(link)") - div.photon-event-table(v-if="photonEventTable.data.length > 0") - data-tables(v-bind="photonEventTable" style="margin-bottom:10px") - el-table-column(label="Date" prop="created_at" width="90") - template(v-once #default="scope") + div.photon-event-table(v-if="photonLoggingEnabled") + el-input(v-model="photonEventTableFilter" @input="photonEventTableFilterChange" placeholder="Search" clearable style="width:150px;position:absolute;margin-left:195px;z-index:1") + el-tabs(type="card") + el-tab-pane(label="Current") + data-tables(v-bind="photonEventTable" style="margin-bottom:10px") + el-table-column(label="Date" prop="created_at" width="90") + template(v-once #default="scope") el-tooltip(placement="right") template(#content) span {{ scope.row.created_at | formatDate('YYYY-MM-DD HH24:MI:SS') }} - span {{ scope.row.created_at | formatDate('MM-DD HH24:MI') }} - el-table-column(label="Name" prop="photonId" width="160") - template(v-once #default="scope") - span.x-link(v-text="getDisplayNameFromPhotonId(scope.row.photonId)" @click="showUserFromPhotonId(scope.row.photonId)" style="padding-right:10px") - el-table-column(label="Event" prop="text") - template(v-once #default="scope") - span(v-if="scope.row.avatar") + span {{ scope.row.created_at | formatDate('MM-DD HH24:MI') }} + el-table-column(label="Name" prop="photonId" width="160") + template(v-once #default="scope") + span.x-link(v-text="scope.row.displayName" @click="showUserFromPhotonId(scope.row.photonId)" style="padding-right:10px") + el-table-column(label="Event" prop="text") + template(v-once #default="scope") + span(v-if="scope.row.avatar") + span ChangeAvatar + span.x-link(v-text="scope.row.avatar.name" @click="showAvatarDialog(scope.row.avatar.id)") + |   + span.avatar-info-public(v-if="scope.row.avatar.releaseStatus === 'public'") (Public) + span.avatar-info-own(v-else-if="scope.row.avatar.releaseStatus === 'private'") (Private) + template(v-if="scope.row.avatar.description && scope.row.avatar.name !== scope.row.avatar.description") + | - {{ scope.row.avatar.description }} + span(v-else v-text="scope.row.text") + el-tab-pane(label="Previous") + data-tables(v-bind="photonEventTablePrevious" style="margin-bottom:10px") + el-table-column(label="Date" prop="created_at" width="90") + template(v-once #default="scope") + el-tooltip(placement="right") + template(#content) + span {{ scope.row.created_at | formatDate('YYYY-MM-DD HH24:MI:SS') }} + span {{ scope.row.created_at | formatDate('MM-DD HH24:MI') }} + el-table-column(label="Name" prop="photonId" width="160") + template(v-once #default="scope") + span.x-link(v-text="scope.row.displayName" @click="lookupUser(scope.row)" style="padding-right:10px") + el-table-column(label="Event" prop="text") + template(v-once #default="scope") + span(v-if="scope.row.avatar") span ChangeAvatar span.x-link(v-text="scope.row.avatar.name" @click="showAvatarDialog(scope.row.avatar.id)") |