Compare commits

...

8 Commits

Author SHA1 Message Date
Tim
b0eef220a6 feat: add message float components 2025-08-25 17:12:21 +08:00
Tim
0ee58df868 Merge pull request #716 from 4twocc/fix/safari-copy
fix(frontend): 修复 Safari 浏览器下邀请链接复制问题
2025-08-25 14:01:39 +08:00
Tim
6fed8131f6 Merge pull request #717 from WoJiaoFuXiaoYun/main
feat: 编辑器支持引用站内帖子
2025-08-25 14:00:25 +08:00
Tim
d75c08396a Merge pull request #714 from nagisa77/feature/daily_bugfix_0825
Feature/daily bugfix 0825
2025-08-25 14:00:02 +08:00
浮小云
9c2b1f6e98 Merge branch 'nagisa77:main' into main 2025-08-25 11:40:01 +08:00
WangHe
28b33d8c44 opt: 优化仅支持文章标题搜索 2025-08-25 11:38:18 +08:00
jiahaosheng
1f99a10322 fix(frontend): 修复 Safari 浏览器下邀请链接复制问题
- 在 Safari 浏览器中,直接使用 navigator.clipboard.writeText 可能导致权限问题
- 通过在 setTimeout 中调用 clipboard API,规避了 Safari 的权限限制
2025-08-25 11:04:32 +08:00
WangHe
809a78fee3 feat: 编辑器支持引用站内帖子
Related #683
2025-08-22 19:27:33 +08:00
8 changed files with 215 additions and 13 deletions

View File

@@ -1,6 +1,6 @@
<template>
<div id="app">
<div class="header-container">
<div class="header-container" v-if="!isFloatMode">
<HeaderComponent
ref="header"
@toggle-menu="menuVisible = !menuVisible"
@@ -9,19 +9,28 @@
</div>
<div class="main-container">
<div class="menu-container" v-click-outside="handleMenuOutside">
<div v-if="!isFloatMode" class="menu-container" v-click-outside="handleMenuOutside">
<MenuComponent :visible="!hideMenu && menuVisible" @item-click="menuVisible = false" />
</div>
<div class="content" :class="{ 'menu-open': menuVisible && !hideMenu }">
<div
class="content"
:class="{ 'menu-open': menuVisible && !hideMenu }"
:style="isFloatMode ? 'padding-top:0; min-height:100vh;' : ''"
>
<NuxtPage keepalive />
</div>
<div v-if="showNewPostIcon && isMobile" class="app-new-post-icon" @click="goToNewPost">
<div
v-if="showNewPostIcon && isMobile && !isFloatMode"
class="app-new-post-icon"
@click="goToNewPost"
>
<i class="fas fa-edit"></i>
</div>
</div>
<GlobalPopups />
<ConfirmDialog />
<GlobalPopups v-if="!isFloatMode" />
<ConfirmDialog v-if="!isFloatMode" />
<MessageFloat />
</div>
</template>
@@ -30,6 +39,7 @@ import HeaderComponent from '~/components/HeaderComponent.vue'
import MenuComponent from '~/components/MenuComponent.vue'
import GlobalPopups from '~/components/GlobalPopups.vue'
import ConfirmDialog from '~/components/ConfirmDialog.vue'
import MessageFloat from '~/components/MessageFloat.vue'
import { useIsMobile } from '~/utils/screen'
const isMobile = useIsMobile()
@@ -37,6 +47,8 @@ const menuVisible = ref(!isMobile.value)
const showNewPostIcon = computed(() => useRoute().path === '/')
const isFloatMode = computed(() => useRoute().query.float === '1')
const hideMenu = computed(() => {
return [
'/login',

View File

@@ -149,8 +149,20 @@ const copyInviteLink = async () => {
if (res.ok) {
const data = await res.json()
const inviteLink = data.token ? `${WEBSITE_BASE_URL}/signup?invite_token=${data.token}` : ''
await navigator.clipboard.writeText(inviteLink)
toast.success('邀请链接已复制')
/**
* navigator.clipboard在webkit中有点奇怪的行为
* https://stackoverflow.com/questions/62327358/javascript-clipboard-api-safari-ios-notallowederror-message
* https://webkit.org/blog/10247/new-webkit-features-in-safari-13-1/
*/
setTimeout(() => {
navigator.clipboard.writeText(inviteLink)
.then(() => {
toast.success('邀请链接已复制')
})
.catch(() => {
toast.error('邀请链接复制失败')
})
}, 0)
} else {
const data = await res.json().catch(() => ({}))
toast.error(data.error || '生成邀请链接失败')

View File

@@ -0,0 +1,44 @@
<template>
<div v-if="state.open" class="message-float">
<iframe :src="frameSrc" class="message-frame" />
</div>
</template>
<script setup>
import { computed } from 'vue'
import { useMessageFloat } from '~/composables/useMessageFloat'
const state = useMessageFloat()
const frameSrc = computed(() => {
const base = state.value.path || '/message-box'
return base + (base.includes('?') ? '&' : '?') + 'float=1'
})
</script>
<style scoped>
.message-float {
position: fixed;
bottom: 0;
right: 0;
width: 380px;
height: 500px;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
z-index: 2000;
background: var(--background-color);
}
.message-frame {
width: 100%;
height: 100%;
border: none;
}
@media (max-width: 600px) {
.message-float {
width: 100%;
height: 100%;
right: 0;
}
}
</style>

View File

@@ -0,0 +1,15 @@
export const useMessageFloat = () =>
useState<{ open: boolean; path: string }>('message-float', () => ({
open: false,
path: '/message-box',
}))
export const openMessageFloat = (path: string) => {
const state = useMessageFloat()
state.value.open = true
state.value.path = path
}
export const closeMessageFloat = () => {
const state = useMessageFloat()
state.value.open = false
}

View File

@@ -1,5 +1,13 @@
<template>
<div class="chat-container">
<div class="window-controls">
<button v-if="!isFloat" @click="shrink" class="control-btn">
<i class="fas fa-window-minimize"></i>
</button>
<button v-else @click="expand" class="control-btn">
<i class="fas fa-expand"></i>
</button>
</div>
<div v-if="!loading" class="chat-header">
<NuxtLink to="/message-box" class="back-button">
<i class="fas fa-arrow-left"></i>
@@ -73,9 +81,11 @@ import { useChannelsUnreadCount } from '~/composables/useChannelsUnreadCount'
import TimeManager from '~/utils/time'
import BaseTimeline from '~/components/BaseTimeline.vue'
import BasePlaceholder from '~/components/BasePlaceholder.vue'
import { openMessageFloat } from '~/composables/useMessageFloat'
const config = useRuntimeConfig()
const route = useRoute()
const router = useRouter()
const API_BASE_URL = config.public.apiBaseUrl
const { connect, disconnect, subscribe, isConnected } = useWebSocket()
const { fetchUnreadCount: refreshGlobalUnreadCount } = useUnreadCount()
@@ -97,6 +107,7 @@ const loadingMore = ref(false)
let scrollInterval = null
const conversationName = ref('')
const isChannel = ref(false)
const isFloat = computed(() => route.query.float === '1')
const hasMoreMessages = computed(() => currentPage.value < totalPages.value - 1)
@@ -115,6 +126,24 @@ function handleAvatarError(event) {
event.target.src = '/default-avatar.svg'
}
function shrink() {
openMessageFloat(route.fullPath)
router.push('/')
}
function expand() {
const base = route.fullPath.replace(/(\?|&)float=1/, '')
window.top.location.href = base
}
function openUser(id) {
if (isFloat.value) {
window.top.location.href = `/users/${id}`
} else {
navigateTo(`/users/${id}`, { replace: true })
}
}
// No changes needed here, as renderMarkdown is now imported.
// The old function is removed.
@@ -156,7 +185,7 @@ async function fetchMessages(page = 0) {
...item,
src: item.sender.avatar,
iconClick: () => {
navigateTo(`/users/${item.sender.id}`, { replace: true })
openUser(item.sender.id)
},
}))
@@ -236,7 +265,7 @@ async function sendMessage(content, clearInput) {
...newMessage,
src: newMessage.sender.avatar,
iconClick: () => {
navigateTo(`/users/${newMessage.sender.id}`, { replace: true })
openUser(newMessage.sender.id)
},
})
clearInput()
@@ -322,7 +351,7 @@ watch(isConnected, (newValue) => {
...message,
src: message.sender.avatar,
iconClick: () => {
navigateTo(`/users/${message.sender.id}`, { replace: true })
openUser(message.sender.id)
},
})
// 实时收到消息时自动标记为已读
@@ -388,6 +417,21 @@ onUnmounted(() => {
position: relative;
}
.window-controls {
position: absolute;
top: 10px;
right: 10px;
z-index: 10;
}
.control-btn {
background: transparent;
border: none;
cursor: pointer;
color: var(--text-color-primary);
margin-left: 4px;
}
.chat-header {
display: flex;
position: sticky;

View File

@@ -1,5 +1,13 @@
<template>
<div class="messages-container">
<div class="window-controls">
<button v-if="!isFloat" @click="shrink" class="control-btn">
<i class="fas fa-window-minimize"></i>
</button>
<button v-else @click="expand" class="control-btn">
<i class="fas fa-expand"></i>
</button>
</div>
<div class="tabs">
<div :class="['tab', { active: activeTab === 'messages' }]" @click="activeTab = 'messages'">
站内信
@@ -114,8 +122,8 @@
</template>
<script setup>
import { ref, onUnmounted, watch, onActivated } from 'vue'
import { useRouter } from 'vue-router'
import { ref, onUnmounted, watch, onActivated, computed } from 'vue'
import { useRouter, useRoute } from 'vue-router'
import { getToken, fetchCurrentUser } from '~/utils/auth'
import { toast } from '~/main'
import { useWebSocket } from '~/composables/useWebSocket'
@@ -125,12 +133,15 @@ import TimeManager from '~/utils/time'
import { stripMarkdownLength } from '~/utils/markdown'
import SearchPersonDropdown from '~/components/SearchPersonDropdown.vue'
import BasePlaceholder from '~/components/BasePlaceholder.vue'
import { openMessageFloat } from '~/composables/useMessageFloat'
const config = useRuntimeConfig()
const conversations = ref([])
const loading = ref(true)
const error = ref(null)
const router = useRouter()
const route = useRoute()
const isFloat = computed(() => route.query.float === '1')
const currentUser = ref(null)
const API_BASE_URL = config.public.apiBaseUrl
const { connect, disconnect, subscribe, isConnected } = useWebSocket()
@@ -143,6 +154,16 @@ const activeTab = ref('messages')
const channels = ref([])
const loadingChannels = ref(false)
function shrink() {
openMessageFloat(route.fullPath)
router.push('/')
}
function expand() {
const base = route.fullPath.replace(/(\?|&)float=1/, '')
window.top.location.href = base
}
async function fetchConversations() {
const token = getToken()
if (!token) {
@@ -278,6 +299,21 @@ function goToConversation(id) {
<style scoped>
.messages-container {
position: relative;
}
.window-controls {
position: absolute;
top: 10px;
right: 10px;
z-index: 10;
}
.control-btn {
background: transparent;
border: none;
cursor: pointer;
color: var(--text-color-primary);
margin-left: 4px;
}
.tabs {

View File

@@ -2,6 +2,7 @@ import Vditor from 'vditor'
import { getToken, authState } from './auth'
import { searchUsers, fetchFollowings, fetchAdmins } from './user'
import { tiebaEmoji } from './tiebaEmoji'
import vditorPostCitation from './vditorPostCitation.js'
export function getEditorTheme() {
return document.documentElement.dataset.theme === 'dark' ? 'dark' : 'classic'
@@ -79,6 +80,7 @@ export function createVditor(editorId, options = {}) {
}))
},
},
vditorPostCitation(API_BASE_URL),
],
},
cdn: 'https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/vditor',

View File

@@ -0,0 +1,37 @@
import { authState, getToken } from '~/utils/auth'
async function searchPost(apiBaseUrl, keyword) {
return await fetch(`${apiBaseUrl}/api/search/posts/title?keyword=${keyword}`, {
method: 'GET',
headers: {
'Content-Type': 'application/json',
Authorization: `Bearer ${getToken()}`,
},
})
}
export default (apiBaseUrl) => {
return {
key: '#',
hint: async (keyword) => {
if (!keyword.trim()) return []
try {
const response = await searchPost(apiBaseUrl, keyword)
if (response.ok) {
const body = await response.json()
let value = ''
return (
body.map((item) => ({
value: `[${item.title}](/posts/${item.id})`,
html: `<div>${item.title}</div>`,
})) ?? []
)
} else {
return []
}
} catch {
return []
}
},
}
}