轻提示铺开到全部页面；内核状态悬停变重启；GEO 支持单文件下载
侧栏动作排撤掉重启图标，内核状态（圆点加版本号）本身变成按钮：悬停 换层显示「重启内核」，不在线时只当状态看。行高压成 1 修掉圆点和等宽 字体不居中的问题。 四个页面的一次性反馈（保存、删除、更新订阅、断开连接、测延迟结论） 全部改走 toast，commit() 改返回成败给「失败不关对话框」用；持续状态 （连接页轮询失败、请求页日志流失败）留在页内，会自动消失的提示装不下 需要一直可见的信息。toast 加 info 类别给中性结论用。 GEO 每行的更新改成单独下载那一个文件：内核只有全量更新的口子，单文件 只能服务端自己下（POST /api/geo/sync），代价是只有形状校验（MaxMind 末尾标记、geodata 首字节，shared/geo.ts 带测试）且内核重启后才换用新 文件；「更新全部」文字按钮保留内核的全量口子，有完整校验和热加载。 上传两行的按钮改「选择或拖放文件」，投放区拖入高亮，恢复策略挪到 恢复行下方。
This commit is contained in:
+19
-86
@@ -22,6 +22,7 @@ import type { Subscription } from '@shared/providers.ts'
|
||||
import { providerCachePath } from '@shared/inbound-groups.ts'
|
||||
import type { ConfigObject } from '../../vendor/config-editor/index.ts'
|
||||
import { ApiError, api } from '../api'
|
||||
import { toast, toastError } from '../toast'
|
||||
import type { ProviderInfo } from '../api'
|
||||
import { kernel, providerLines, reloadRuntime } from '../runtime'
|
||||
import ConfirmDialog from '../components/ConfirmDialog.vue'
|
||||
@@ -30,7 +31,6 @@ import SubscriptionDetail from './SubscriptionDetail.vue'
|
||||
import SubscriptionForm from './SubscriptionForm.vue'
|
||||
import IconAdd from '~icons/ri/add-line'
|
||||
import IconRefresh from '~icons/ri/refresh-line'
|
||||
import IconClose from '~icons/ri/close-line'
|
||||
|
||||
const props = defineProps<{ data: ConfigObject; revision: string }>()
|
||||
|
||||
@@ -41,9 +41,6 @@ const subscriptions = computed(() => listSubscriptions(props.data))
|
||||
|
||||
const selectedName = ref<string | null>(null)
|
||||
const saving = ref(false)
|
||||
const failure = ref<{ message: string; hint: string } | null>(null)
|
||||
/** 成功的结果，绿色 */
|
||||
const done = ref('')
|
||||
const formOpen = ref(false)
|
||||
const formEditing = ref<Subscription | null>(null)
|
||||
/** 待确认删除的那个订阅。非 null 时确认对话框打开着 */
|
||||
@@ -112,24 +109,21 @@ const rows = computed(() =>
|
||||
|
||||
const clone = () => JSON.parse(JSON.stringify(props.data)) as ConfigObject
|
||||
|
||||
/** 所有改配置文件的动作都从这里走。 */
|
||||
async function commit(raw: ConfigObject, success: string) {
|
||||
/** 所有改配置文件的动作都从这里走。反馈走右上角轻提示，返回值告知成败。 */
|
||||
async function commit(raw: ConfigObject, success: string): Promise<boolean> {
|
||||
// 先把生成的东西按当前规则重建一遍，再清掉没人再引用的。订阅副本的来源被改地址时
|
||||
// 靠这一步保持和原订阅一致，删订阅前已由 subscriptionReferences 挡住有引用的情形。
|
||||
const next = pruneGenerated(syncGenerated(raw, collectInbounds(raw)))
|
||||
saving.value = true
|
||||
failure.value = null
|
||||
done.value = ''
|
||||
try {
|
||||
const result = await api.applyConfig(next, props.revision)
|
||||
// 没重载有两种情况（内容没有变化、内核不在线只写了文件），都要如实说，不能只报成功
|
||||
done.value = result.reloaded ? success : `${success}（${result.reloadMessage}）`
|
||||
toast(result.reloaded ? success : `${success}（${result.reloadMessage}）`)
|
||||
emit('saved')
|
||||
return true
|
||||
} catch (error) {
|
||||
failure.value =
|
||||
error instanceof ApiError
|
||||
? { message: error.message, hint: error.hint }
|
||||
: { message: String(error), hint: '' }
|
||||
toastError(error)
|
||||
return false
|
||||
} finally {
|
||||
saving.value = false
|
||||
}
|
||||
@@ -160,10 +154,7 @@ async function submitForm(draft: {
|
||||
try {
|
||||
await api.uploadProviderFile(providerCachePath(draft.name), draft.file.content)
|
||||
} catch (error) {
|
||||
failure.value =
|
||||
error instanceof ApiError
|
||||
? { message: error.message, hint: error.hint }
|
||||
: { message: String(error), hint: '' }
|
||||
toastError(error)
|
||||
return
|
||||
}
|
||||
}
|
||||
@@ -173,9 +164,9 @@ async function submitForm(draft: {
|
||||
: draft.file
|
||||
? addFileSubscription(clone(), draft.name)
|
||||
: addSubscription(clone(), draft.name, draft.url, draft.interval)
|
||||
await commit(next, editing ? '已保存' : `已新增 ${draft.name}`)
|
||||
const ok = await commit(next, editing ? '已保存' : `已新增 ${draft.name}`)
|
||||
// 失败时不能关对话框——关了再打开就是空表单，填的名称、地址、间隔全没了
|
||||
if (failure.value) return
|
||||
if (!ok) return
|
||||
formOpen.value = false
|
||||
if (!editing) selectedName.value = draft.name
|
||||
}
|
||||
@@ -186,7 +177,7 @@ function askRemove() {
|
||||
// 被引用的订阅不能删：那些组的 use: 一空，指向它们的入站就无路可走
|
||||
const refs = subscriptionReferences(props.data, target.name)
|
||||
if (refs.length > 0) {
|
||||
failure.value = { message: `无法删除 ${target.name}：${refs.join('、')} 在引用它`, hint: '' }
|
||||
toast(`无法删除 ${target.name}：${refs.join('、')} 在引用它`, { kind: 'error' })
|
||||
return
|
||||
}
|
||||
removing.value = target
|
||||
@@ -205,17 +196,15 @@ async function refresh() {
|
||||
const target = selected.value
|
||||
if (!target || refreshing.value !== null) return
|
||||
refreshing.value = target.name
|
||||
failure.value = null
|
||||
done.value = ''
|
||||
try {
|
||||
await api.refreshProvider(target.name)
|
||||
await Promise.all([reloadRuntime(), reloadProviders()])
|
||||
done.value = `已更新 ${target.name}`
|
||||
toast(`已更新 ${target.name}`)
|
||||
} catch (error) {
|
||||
failure.value = {
|
||||
message: error instanceof ApiError ? error.message : String(error),
|
||||
toast(error instanceof ApiError ? error.message : String(error), {
|
||||
kind: 'error',
|
||||
hint: '该操作仅修改内核运行状态，配置文件未被修改。',
|
||||
}
|
||||
})
|
||||
} finally {
|
||||
refreshing.value = null
|
||||
}
|
||||
@@ -227,19 +216,17 @@ const refreshingAll = ref(false)
|
||||
async function refreshAll() {
|
||||
if (refreshingAll.value || !kernel.value.online || subscriptions.value.length === 0) return
|
||||
refreshingAll.value = true
|
||||
failure.value = null
|
||||
done.value = ''
|
||||
const names = subscriptions.value.map((s) => s.name)
|
||||
const results = await Promise.allSettled(names.map((n) => api.refreshProvider(n)))
|
||||
await Promise.all([reloadRuntime(), reloadProviders()])
|
||||
const failed = names.filter((_, i) => results[i]?.status === 'rejected')
|
||||
if (failed.length > 0) {
|
||||
failure.value = {
|
||||
message: `${failed.join('、')} 更新失败`,
|
||||
toast(`${failed.join('、')} 更新失败`, {
|
||||
kind: 'error',
|
||||
hint: '其余订阅已更新。该操作仅修改内核运行状态，配置文件未被修改。',
|
||||
}
|
||||
})
|
||||
} else {
|
||||
done.value = `已更新全部 ${names.length} 个订阅`
|
||||
toast(`已更新全部 ${names.length} 个订阅`)
|
||||
}
|
||||
refreshingAll.value = false
|
||||
}
|
||||
@@ -276,17 +263,6 @@ async function refreshAll() {
|
||||
</div>
|
||||
</header>
|
||||
|
||||
<div v-if="failure" class="failure">
|
||||
<div class="failure-text">
|
||||
<strong>{{ failure.message }}</strong>
|
||||
<span v-if="failure.hint">{{ failure.hint }}</span>
|
||||
</div>
|
||||
<button type="button" class="failure-x" title="关闭提示" @click="failure = null">
|
||||
<IconClose />
|
||||
</button>
|
||||
</div>
|
||||
<p v-else-if="done" class="done">{{ done }}</p>
|
||||
|
||||
<div class="split">
|
||||
<ProviderList v-model:selected="selectedName" :rows="rows" />
|
||||
|
||||
@@ -380,49 +356,6 @@ async function refreshAll() {
|
||||
gap: var(--s-2);
|
||||
}
|
||||
|
||||
.failure {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: var(--s-3);
|
||||
border: 1px solid color-mix(in srgb, var(--c-danger) 35%, var(--c-border));
|
||||
border-radius: var(--r-md);
|
||||
background: var(--c-danger-soft);
|
||||
padding: var(--s-3) var(--s-4);
|
||||
margin-bottom: var(--s-4);
|
||||
font-size: var(--t-sm);
|
||||
}
|
||||
|
||||
.failure-text {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: var(--s-1);
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.failure-x {
|
||||
flex: none;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
border: none;
|
||||
border-radius: var(--r-sm);
|
||||
background: none;
|
||||
color: var(--c-danger);
|
||||
cursor: pointer;
|
||||
}
|
||||
.failure-x:hover {
|
||||
background: color-mix(in srgb, var(--c-danger) 12%, transparent);
|
||||
}
|
||||
|
||||
.done {
|
||||
color: var(--c-ok);
|
||||
font-size: var(--t-sm);
|
||||
margin-bottom: var(--s-4);
|
||||
}
|
||||
|
||||
/* 左列表右详情。窄时改成上下，详情不再吸顶 */
|
||||
.split {
|
||||
display: grid;
|
||||
|
||||
Reference in New Issue
Block a user