Skip to content

Commit

Permalink
✨ 帖子搜索集成
Browse files Browse the repository at this point in the history
fix #103
  • Loading branch information
BTMuli committed Apr 4, 2024
1 parent 623d137 commit 6bf24bd
Show file tree
Hide file tree
Showing 10 changed files with 290 additions and 36 deletions.
8 changes: 6 additions & 2 deletions src/components/main/t-postcard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</div>
</div>
</div>
<div class="tpc-forum" :title="`频道: ${card.forum.name}`">
<div class="tpc-forum" v-if="card.forum.icon !== ''" :title="`频道: ${card.forum.name}`">
<img :src="card.forum.icon" :alt="card.forum.name" />
<span>{{ card.forum.name }}</span>
</div>
Expand Down Expand Up @@ -179,7 +179,11 @@ function getCommonCard(item: TGApp.Plugins.Mys.Post.FullData): TGApp.Plugins.Mys
function getPostCard(item: TGApp.Plugins.Mys.Post.FullData): TGApp.Plugins.Mys.News.RenderCard {
const commonCard = getCommonCard(item);
if (item.news_meta !== null && item.news_meta.start_at_sec !== "0") {
if (
item.news_meta !== undefined &&
item.news_meta !== null &&
item.news_meta.start_at_sec !== "0"
) {
isAct.value = true;
const startTime = new Date(Number(item.news_meta.start_at_sec) * 1000).toLocaleDateString();
const endTime = new Date(Number(item.news_meta.end_at_sec) * 1000).toLocaleDateString();
Expand Down
17 changes: 11 additions & 6 deletions src/components/overlay/to-achiInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
<slot name="left"></slot>
<div class="toai-box">
<div class="toai-top">
<span class="toai-click" @click="search(props.data.name)">{{ props.data.name }}</span>
<span class="toai-click" @click="searchDirect(props.data.name)">{{
props.data.name
}}</span>
<span>{{ props.data.description }}</span>
</div>
<div v-if="achiLC">
Expand All @@ -24,7 +26,7 @@
</div>
<div class="toai-mid-item" v-for="item in achiLC.trigger.task" :key="item.questId">
<v-icon>mdi-alert-decagram</v-icon>
<span class="toai-click" @click="search(item.name)">{{ item.name }}</span>
<span class="toai-click" @click="searchDirect(item.name)">{{ item.name }}</span>
<span>({{ item.type }})</span>
</div>
</div>
Expand All @@ -49,13 +51,15 @@
<slot name="right"></slot>
</div>
</TOverlay>
<ToPostSearch gid="2" v-model="showSearch" :keyword="search" />
</template>
<script lang="ts" setup>
import { computed, onMounted, ref, watch } from "vue";
import { AppAchievementsData, AppAchievementSeriesData } from "../../data";
import TGLogger from "../../utils/TGLogger";
import TOverlay from "../main/t-overlay.vue";
import ToPostSearch from "../post/to-postSearch.vue";
interface ToAchiInfoProps {
modelValue: boolean;
Expand All @@ -70,6 +74,8 @@ interface ToAchiInfoEmits {
const props = defineProps<ToAchiInfoProps>();
const emits = defineEmits<ToAchiInfoEmits>();
const showSearch = ref(false);
const search = ref("");
const visible = computed({
get: () => props.modelValue,
Expand Down Expand Up @@ -98,11 +104,10 @@ function onCancel() {
}
// 查找
async function search(word: string): Promise<void> {
async function searchDirect(word: string): Promise<void> {
await TGLogger.Info(`[ToAchiInfo][${props.data?.id}][Search] 查询 ${word}`);
const str = encodeURIComponent(word);
const url = `https://www.miyoushe.com/ys/search?keyword=${str}`;
window.open(url, "_blank");
search.value = word;
showSearch.value = true;
}
</script>
<style lang="css" scoped>
Expand Down
161 changes: 161 additions & 0 deletions src/components/post/to-postSearch.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
<template>
<TOverlay v-model="visible" hide :to-click="onCancel" blur-val="20px">
<div class="tops-box">
<div class="tops-top">查找:{{ search }}</div>
<div class="tops-act">
<span>分区:{{ getGidLabel() }}</span>
<v-btn size="small" class="tops-btn" @click="searchPosts()" rounded>
加载更多({{ results.length }})
</v-btn>
</div>
<div class="tops-list">
<div v-for="item in results" :key="item.post.post_id">
<TPostCard :model-value="item" />
</div>
</div>
</div>
</TOverlay>
</template>
<script lang="ts" setup>
import { computed, onMounted, ref, watch } from "vue";
import Mys from "../../plugins/Mys";
import TOverlay from "../main/t-overlay.vue";
import TPostCard from "../main/t-postcard.vue";
// data
const search = ref("");
const game = ref("2");
const lastId = ref("");
const isLast = ref(false);
const results = ref<TGApp.Plugins.Mys.Post.FullData[]>([]);
interface ToPostSearchProps {
modelValue: boolean;
gid: string;
keyword: string;
}
interface ToPostSearchEmits {
(e: "update:modelValue", value: boolean): void;
(e: "cancel"): void;
}
const props = defineProps<ToPostSearchProps>();
const emits = defineEmits<ToPostSearchEmits>();
const gameList: Record<string, string> = {
"1": "崩坏3",
"2": "原神",
"3": "崩坏2",
"4": "未定事件簿",
"5": "大别野",
"6": "崩坏:星穹铁道",
"8": "绝区零",
};
// overlay
const visible = computed({
get: () => props.modelValue,
set: (value) => {
emits("update:modelValue", value);
},
});
function onCancel() {
visible.value = false;
}
onMounted(async () => {
search.value = props.keyword;
game.value = props.gid;
});
watch(
() => props.modelValue,
async (value) => {
if (value && results.value.length === 0) {
await searchPosts();
} else {
visible.value = value;
}
},
);
watch(
() => props.keyword,
async (value) => {
search.value = value;
results.value = [];
lastId.value = "";
isLast.value = false;
},
);
async function searchPosts() {
if (!props.gid || !props.keyword) {
return;
}
if (isLast.value) {
return;
}
const res = await Mys.Posts.search(game.value, search.value, lastId.value);
if (lastId.value === "") {
results.value = res.posts;
} else {
results.value = results.value.concat(res.posts);
}
lastId.value = res.last_id;
isLast.value = res.is_last;
}
function getGidLabel(): string {
if (gameList[game.value]) {
return gameList[game.value];
}
return "未知";
}
</script>
<style lang="css" scoped>
.tops-box {
padding: 10px;
border-radius: 5px;
background-color: var(--box-bg-1);
}
.tops-top {
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: flex-start;
color: var(--common-text-title);
font-family: var(--font-title);
font-size: 20px;
word-break: break-all;
}
.tops-act {
display: flex;
align-items: center;
justify-content: space-between;
padding-bottom: 5px;
border-bottom: 1px solid var(--common-shadow-2);
margin-bottom: 10px;
}
.tops-list {
display: flex;
width: 400px;
max-height: 400px;
flex-direction: column;
padding-right: 10px;
overflow-y: auto;
row-gap: 10px;
}
.tops-btn {
width: fit-content;
background: var(--tgc-btn-1);
color: var(--btn-text);
}
</style>
8 changes: 1 addition & 7 deletions src/components/post/tp-avatar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div>{{ props.data.nickname }}</div>
<div :title="getAuthorDesc()">{{ getAuthorDesc() }}</div>
</div>
<div class="tpa-img" @click="toAuthor()" title="点击前往用户主页">
<div class="tpa-img">
<img :src="props.data.avatar_url" alt="avatar" class="tpa-icon" />
<img
:src="props.data.pendant"
Expand Down Expand Up @@ -34,11 +34,6 @@ function getAuthorDesc(): string {
return props.data.introduce;
}
async function toAuthor(): Promise<void> {
const url = `https://www.miyoushe.com/ys/#/accountCenter/0?id=${props.data.uid}`;
window.open(url, "_blank");
}
const flexAlign = props.position === "left" ? "flex-start" : "flex-end";
const textAlign = props.position;
</script>
Expand Down Expand Up @@ -83,7 +78,6 @@ const textAlign = props.position;
position: relative;
width: 50px;
height: 50px;
cursor: pointer;
}
.tpa-icon {
Expand Down
15 changes: 8 additions & 7 deletions src/pages/common/News.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
v-model="search"
class="news-search"
append-icon="mdi-magnify"
label="请输入米游社帖子 ID"
label="请输入帖子 ID 或搜索词"
:single-line="true"
hide-details
@click:append="searchPost"
Expand Down Expand Up @@ -40,6 +40,7 @@
</v-window-item>
</v-window>
<ToChannel v-model="showList" :gid="gid" />
<ToPostSearch :gid="gid" v-model="showSearch" :keyword="search" />
</template>

<script lang="ts" setup>
Expand All @@ -50,6 +51,7 @@ import showSnackbar from "../../components/func/snackbar";
import TPostCard from "../../components/main/t-postcard.vue";
import ToChannel from "../../components/overlay/to-channel.vue";
import ToLoading from "../../components/overlay/to-loading.vue";
import ToPostSearch from "../../components/post/to-postSearch.vue";
import Mys from "../../plugins/Mys";
import { useAppStore } from "../../store/modules/app";
import TGLogger from "../../utils/TGLogger";
Expand Down Expand Up @@ -87,6 +89,7 @@ const loadingSub = ref<boolean>(false);
const appStore = useAppStore();
const tab = ref<NewsKey>("notice");
const showList = ref<boolean>(false);
const showSearch = ref<boolean>(false);
const tabValues = ref<Array<NewsKey>>(["notice", "activity", "news"]);
// 渲染数据
Expand Down Expand Up @@ -193,13 +196,11 @@ function searchPost(): void {
});
return;
}
if (!isNaN(Number(search.value))) {
createPost(search.value);
const numCheck = Number(search.value);
if (isNaN(numCheck)) {
showSearch.value = true;
} else {
showSnackbar({
text: "请输入搜索内容",
color: "error",
});
createPost(search.value);
}
}
</script>
Expand Down
21 changes: 11 additions & 10 deletions src/pages/common/Posts.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
v-model="search"
class="post-switch-item"
append-inner-icon="mdi-magnify"
label="请输入帖子 ID"
label="请输入帖子 ID 或搜索词"
variant="outlined"
:single-line="true"
hide-details
Expand All @@ -51,6 +51,7 @@
</div>
</div>
</div>
<ToPostSearch :gid="curGid.toString()" v-model="showSearch" :keyword="search" />
</template>
<script setup lang="ts">
import { nextTick, onMounted, ref, watch } from "vue";
Expand All @@ -59,6 +60,7 @@ import showConfirm from "../../components/func/confirm";
import showSnackbar from "../../components/func/snackbar";
import TPostCard from "../../components/main/t-postcard.vue";
import ToLoading from "../../components/overlay/to-loading.vue";
import ToPostSearch from "../../components/post/to-postSearch.vue";
import Mys from "../../plugins/Mys";
import TGClient from "../../utils/TGClient";
import TGLogger from "../../utils/TGLogger";
Expand Down Expand Up @@ -162,7 +164,8 @@ const curSortType = ref<number>(0);
// 渲染数据
const posts = ref<TGApp.Plugins.Mys.Post.FullData[]>([]);
const nav = ref<TGApp.BBS.Navigator.Navigator[]>([]);
const search = ref<string>();
const search = ref<string>("");
const showSearch = ref<boolean>(false);
onMounted(async () => {
await TGLogger.Info(
Expand Down Expand Up @@ -281,20 +284,18 @@ function freshCurForum(newVal: string): void {
// 查询帖子
function searchPost(): void {
if (search.value === undefined || search.value === "") {
if (search.value === "") {
showSnackbar({
text: "请输入搜索内容",
color: "error",
});
return;
}
if (!isNaN(Number(search.value))) {
createPost(search.value);
const numCheck = Number(search.value);
if (isNaN(numCheck)) {
showSearch.value = true;
} else {
showSnackbar({
text: "请输入搜索内容",
color: "error",
});
createPost(search.value);
}
}
</script>
Expand Down Expand Up @@ -351,7 +352,7 @@ function searchPost(): void {
}
.post-switch-item {
max-width: 200px;
width: fit-content;
height: 50px;
}
Expand Down
Loading

0 comments on commit 6bf24bd

Please sign in to comment.