1 parent
7d0e84a381
commit
4ea3a39e41
20 files changed
+486
-66
No files matched your search
@@ -198,7 +198,8 @@ const pluginDefinitions = {
|
||||
}
|
||||
|
||||
export function getFieldGroups(section, config) {
|
||||
if (section !== 'plugins') {
|
||||
const pluginId = Object.hasOwn(pluginDefinitions, section) ? section : ''
|
||||
if (section !== 'plugins' && !pluginId) {
|
||||
return ({ base: baseGroups, smtp: smtpGroups, imap: imapGroups, pop3: pop3Groups, email: emailGroups, ssl: sslGroups }[section] || [])
|
||||
.map(item => ({
|
||||
...item,
|
||||
@@ -208,7 +209,7 @@ export function getFieldGroups(section, config) {
|
||||
}))
|
||||
.filter(item => item.fields.length > 0)
|
||||
}
|
||||
return Object.entries(config.plugins || {}).map(([id, plugin]) => {
|
||||
return Object.entries(config.plugins || {}).filter(([id]) => !pluginId || id === pluginId).map(([id, plugin]) => {
|
||||
const definition = pluginDefinitions[id]
|
||||
const prefix = ['plugins', id]
|
||||
const input = (name, label, type, extra = {}) => ({ path: [...prefix, name], label, type, ...extra })
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<template>
|
||||
<div class="config-form" :data-form-section="section">
|
||||
<p v-if="!groups.length" class="form-empty">当前没有可配置的插件。安装插件后可在这里管理启用状态与运行设置。</p>
|
||||
<p v-if="!groups.length" class="form-empty">当前插件配置不存在,请刷新配置或检查初始化状态。</p>
|
||||
<section v-for="group in groups" :key="group.id" class="form-group" :aria-label="group.title">
|
||||
<p v-if="section === 'plugins'" class="credential-status">{{ group.secretConfigured ? '凭据已配置' : '未配置凭据' }}</p>
|
||||
<p v-if="group.secretConfigured !== undefined" class="credential-status">{{ group.secretConfigured ? '凭据已配置' : '未配置凭据' }}</p>
|
||||
<p v-if="group.note" class="form-group-note" role="note">{{ group.note }}</p>
|
||||
<div class="form-grid">
|
||||
<ConfigField
|
||||
|
||||
@@ -22,7 +22,11 @@ export function useNavigation() {
|
||||
{ value: 'pop3', label: 'POP3 配置', component: Pop3Config },
|
||||
{ value: 'email', label: '邮箱策略', component: EmailConfig },
|
||||
{ value: 'ssl', label: 'SSL 配置', component: SslConfig },
|
||||
{ value: 'plugins', label: '插件配置', component: PluginsConfig }
|
||||
{ value: 'plugins', label: '插件配置', children: [
|
||||
{ value: 'spam_block', label: '垃圾邮件拦截', component: PluginsConfig },
|
||||
{ value: 'telegram_push', label: 'Telegram 推送', component: PluginsConfig },
|
||||
{ value: 'wechat_push', label: '微信推送', component: PluginsConfig }
|
||||
] }
|
||||
]
|
||||
const tools = [
|
||||
{ value: 'migration', label: '数据库迁移', capability: 'database.migrate' },
|
||||
@@ -35,12 +39,15 @@ export function useNavigation() {
|
||||
? tools.filter(item => store.hasCapability(item.capability))
|
||||
.map(item => ({ ...item, component: ConfigMaintenance }))
|
||||
: [])
|
||||
const activePage = computed(() => [...sectionOptions.value, ...maintenanceOptions.value]
|
||||
const visiblePages = () => [...sectionOptions.value.flatMap(item => item.children || [item]), ...maintenanceOptions.value]
|
||||
const activePage = computed(() => visiblePages()
|
||||
.find(item => item.value === selectedSection.value))
|
||||
|
||||
const beforeLeave = () => currentPage.value?.beforeLeave?.() ?? true
|
||||
const selectSection = async value => {
|
||||
const visible = () => [...sectionOptions.value, ...maintenanceOptions.value].some(item => item.value === value)
|
||||
const parent = sectionOptions.value.find(item => item.value === value && item.children)
|
||||
if (parent) value = parent.children.find(item => item.value === selectedSection.value)?.value || parent.children[0].value
|
||||
const visible = () => visiblePages().some(item => item.value === value)
|
||||
if (switching.value || value === selectedSection.value || !visible()) return
|
||||
switching.value = true
|
||||
try {
|
||||
|
||||
@@ -11,7 +11,10 @@ const sections = [
|
||||
{ value: 'pop3', label: 'POP3 配置', description: '管理 POP3 的 STLS 与隐式 TLS 监听;端口变更需应用配置并重启后端。' },
|
||||
{ value: 'email', label: '邮箱策略', description: '自动汇总三个协议的配置端口,管理邮件与账号恢复策略。' },
|
||||
{ value: 'ssl', label: 'SSL 配置', description: '管理证书与加密连接,应用后请留意待重启提示。' },
|
||||
{ value: 'plugins', label: '插件配置', description: '管理插件运行配置,敏感设置仅显示配置状态。' }
|
||||
{ value: 'plugins', label: '插件配置', description: '管理插件运行配置,敏感设置仅显示配置状态。' },
|
||||
{ value: 'spam_block', label: '垃圾邮件拦截', description: '配置垃圾邮件检测服务、超时和拦截阈值,仅编辑当前插件。' },
|
||||
{ value: 'telegram_push', label: 'Telegram 推送', description: '配置 Telegram 推送的运行参数与网络权限,个人绑定在第三方授权中管理。' },
|
||||
{ value: 'wechat_push', label: '微信推送', description: '配置微信推送的应用、模板与接收用户,敏感凭据不回填。' }
|
||||
]
|
||||
|
||||
const serviceLabels = {
|
||||
@@ -51,8 +54,10 @@ export function usePage(pageKey = 'base') {
|
||||
degradedReasons: []
|
||||
})
|
||||
const selectedSection = ref(isConfigPage ? pageKey : 'base')
|
||||
// 页面与存储分区分离,IMAP、POP3 复用邮箱分区的原子保存与候选保护。
|
||||
const apiSection = () => ['imap', 'pop3'].includes(selectedSection.value) ? 'email' : selectedSection.value
|
||||
// 独立页面复用原配置分区的原子保存与候选保护,不丢弃其他页面的字段。
|
||||
const pluginPages = ['spam_block', 'telegram_push', 'wechat_push']
|
||||
const apiSection = () => pluginPages.includes(selectedSection.value) ? 'plugins'
|
||||
: ['imap', 'pop3'].includes(selectedSection.value) ? 'email' : selectedSection.value
|
||||
const currentSection = computed(() => sections.find(item => item.value === selectedSection.value) || sections[0])
|
||||
const sectionLoading = ref(false)
|
||||
let sectionRequestId = 0
|
||||
@@ -85,6 +90,18 @@ export function usePage(pageKey = 'base') {
|
||||
const pendingCandidate = ref(null)
|
||||
const pendingScopeHint = computed(() => {
|
||||
const pending = pendingCandidate.value
|
||||
if (pending?.section === 'plugins' && apiSection() === 'plugins') {
|
||||
const active = readFormConfig(loadedText.value).plugins || {}
|
||||
const candidate = pending.payload?.plugins || {}
|
||||
const changed = Object.keys({ ...active, ...candidate }).filter(id =>
|
||||
['enabled', 'executable', 'permissions', 'settings'].some(key =>
|
||||
JSON.stringify(active[id]?.[key]) !== JSON.stringify(candidate[id]?.[key]))
|
||||
).map(id => sections.find(item => item.value === id)?.label || id)
|
||||
const scope = pending.payload && loadedText.value
|
||||
? (changed.length ? `本次候选涉及:${changed.join('、')}。` : '本次候选的插件运行配置未变化。')
|
||||
: '候选内容尚未完整读取,请刷新后核对。'
|
||||
return `${scope}三个插件共用一个配置分区,请在对应三级菜单核对;应用时整个候选一起生效,其他插件的原有配置会保留。`
|
||||
}
|
||||
if (pending?.section !== 'email' || apiSection() !== 'email') return ''
|
||||
const active = readFormConfig(loadedText.value)
|
||||
const candidate = pending.payload || {}
|
||||
@@ -508,7 +525,7 @@ export function usePage(pageKey = 'base') {
|
||||
if (selectedSection.value === 'smtp') {
|
||||
delete payload.relayPasswordStatus
|
||||
}
|
||||
if (selectedSection.value === 'plugins' && payload.plugins && typeof payload.plugins === 'object') {
|
||||
if (apiSection() === 'plugins' && payload.plugins && typeof payload.plugins === 'object') {
|
||||
Object.values(payload.plugins).forEach(plugin => {
|
||||
if (plugin && typeof plugin === 'object') {
|
||||
delete plugin.settingsConfigured
|
||||
|
||||
@@ -7,7 +7,8 @@ import { provide } from 'vue'
|
||||
import { usePage } from '../ConfigSettings.js'
|
||||
import ConfigEditor from '../ConfigEditor/ConfigEditor.vue'
|
||||
|
||||
const page = usePage('plugins')
|
||||
const props = defineProps({ pageKey: { type: String, required: true } })
|
||||
const page = usePage(props.pageKey)
|
||||
provide('smail-config-page', page)
|
||||
defineExpose({ beforeLeave: page.beforeLeave })
|
||||
</script>
|
||||
@@ -75,6 +75,54 @@
|
||||
outline-offset: -2px;
|
||||
}
|
||||
|
||||
.settings-submenu-count {
|
||||
float: right;
|
||||
min-width: 18px;
|
||||
border-radius: 5px;
|
||||
background: var(--pm-bg-primary);
|
||||
text-align: center;
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
.settings-tertiary-list {
|
||||
display: grid;
|
||||
gap: 4px;
|
||||
margin: 6px 0 8px 12px;
|
||||
padding-left: 8px;
|
||||
border-left: 1px solid var(--pm-border-color);
|
||||
}
|
||||
|
||||
.settings-tertiary-item {
|
||||
min-width: 0;
|
||||
min-height: 36px;
|
||||
padding: 8px;
|
||||
border: 0;
|
||||
border-radius: 6px;
|
||||
background: transparent;
|
||||
color: var(--pm-text-secondary);
|
||||
font: inherit;
|
||||
font-size: 12px;
|
||||
line-height: 1.5;
|
||||
text-align: left;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.settings-tertiary-item.active {
|
||||
color: var(--submenu-accent);
|
||||
background: color-mix(in srgb, var(--submenu-accent) 8%, var(--pm-bg-secondary));
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.settings-tertiary-item:hover:not(.active) {
|
||||
color: var(--pm-text-primary);
|
||||
background: var(--pm-bg-hover);
|
||||
}
|
||||
|
||||
.settings-tertiary-item:focus-visible {
|
||||
outline: 2px solid var(--submenu-accent);
|
||||
outline-offset: -2px;
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
.settings-submenu {
|
||||
--submenu-accent: var(--pm-primary-light-3);
|
||||
@@ -109,6 +157,14 @@
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.settings-submenu-entry {
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
|
||||
.settings-tertiary-list {
|
||||
margin-left: 4px;
|
||||
}
|
||||
|
||||
.settings-submenu-item.active::before {
|
||||
top: auto;
|
||||
bottom: 2px;
|
||||
|
||||
@@ -7,7 +7,8 @@ export const submenuProps = {
|
||||
|
||||
export function useSubmenu(props, emit) {
|
||||
function select(value) {
|
||||
if (value !== props.modelValue && props.items.some(item => item.value === value)) {
|
||||
const visible = props.items.some(item => item.value === value || item.children?.some(child => child.value === value))
|
||||
if (value !== props.modelValue && visible) {
|
||||
emit('select', value)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,17 +5,37 @@
|
||||
<strong>{{ title }}</strong>
|
||||
</div>
|
||||
<div class="settings-submenu-list">
|
||||
<button
|
||||
v-for="item in items"
|
||||
:key="item.value"
|
||||
type="button"
|
||||
class="settings-submenu-item"
|
||||
:class="{ active: modelValue === item.value }"
|
||||
:aria-current="modelValue === item.value ? 'page' : undefined"
|
||||
@click="select(item.value)"
|
||||
>
|
||||
<span>{{ item.label }}</span>
|
||||
</button>
|
||||
<div v-for="item in items" :key="item.value" class="settings-submenu-entry">
|
||||
<button
|
||||
type="button"
|
||||
class="settings-submenu-item"
|
||||
:class="{ active: modelValue === item.value || item.children?.some(child => child.value === modelValue) }"
|
||||
:aria-current="modelValue === item.value ? 'page' : undefined"
|
||||
:aria-expanded="item.children ? item.children.some(child => child.value === modelValue) : undefined"
|
||||
@click="select(item.value)"
|
||||
>
|
||||
<span>{{ item.label }}</span>
|
||||
<span v-if="item.children" class="settings-submenu-count">{{ item.children.length }}</span>
|
||||
</button>
|
||||
<div
|
||||
v-if="item.children?.some(child => child.value === modelValue)"
|
||||
class="settings-tertiary-list"
|
||||
role="group"
|
||||
:aria-label="`${item.label}三级菜单`"
|
||||
>
|
||||
<button
|
||||
v-for="child in item.children"
|
||||
:key="child.value"
|
||||
type="button"
|
||||
class="settings-tertiary-item"
|
||||
:class="{ active: modelValue === child.value }"
|
||||
:aria-current="modelValue === child.value ? 'page' : undefined"
|
||||
@click="select(child.value)"
|
||||
>
|
||||
{{ child.label }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
</template>
|
||||
|
||||
Reference in new issue
Block a user