1 parent
4e2c419280
commit
2aa7e7f9a9
10 files changed
+117
-11
No files matched your search
@@ -24,8 +24,13 @@ function createRouteAssetRecovery({buildID, getStorage, reload}) {
|
||||
if (!isRouteAssetLoadError(error) || !isReadOnlyRoute(from) || editing || !online) {
|
||||
return false;
|
||||
}
|
||||
if (!RECOVERABLE_ROUTES.has(to?.name) || !to.fullPath
|
||||
|| getSafeLoginRedirect(to.fullPath, '') !== to.fullPath) {
|
||||
let recoveryPath = to?.fullPath;
|
||||
if (to?.name === 'login' && to.path === '/login') {
|
||||
// 旧邮件页登录失效时也可能缺失登录资源,只重建安全的登录目标。
|
||||
const query = new URLSearchParams({redirect: getSafeLoginRedirect(to.query?.redirect)});
|
||||
recoveryPath = `/login?${query}`;
|
||||
} else if (!RECOVERABLE_ROUTES.has(to?.name) || !recoveryPath
|
||||
|| getSafeLoginRedirect(recoveryPath, '') !== recoveryPath) {
|
||||
return false;
|
||||
}
|
||||
if (recovering) {
|
||||
@@ -39,7 +44,7 @@ function createRouteAssetRecovery({buildID, getStorage, reload}) {
|
||||
// 先持久化重试标记;同一标签页的同一构建最多自动恢复一次。
|
||||
storage.setItem(ASSET_RECOVERY_KEY, buildID);
|
||||
recovering = true;
|
||||
reload(to.fullPath);
|
||||
reload(recoveryPath);
|
||||
return true;
|
||||
} catch {
|
||||
// 浏览器禁用存储或导航失败时保留手动恢复入口,不能无限刷新。
|
||||
|
||||
@@ -10,10 +10,13 @@ export function useProfile() {
|
||||
const saving = ref(false)
|
||||
async function save() {
|
||||
if (saving.value) return
|
||||
if (!name.value.trim()) return ElMessage.error('请输入显示名称')
|
||||
const displayName = name.value.trim()
|
||||
if (!displayName || Array.from(displayName).length > 10 || /[\u0000-\u001f\u007f-\u009f]/u.test(displayName)) {
|
||||
return ElMessage.error('显示名称须为 1–10 个字符,且不能包含控制字符')
|
||||
}
|
||||
saving.value = true
|
||||
try {
|
||||
const result = await http.post('/api/v1/user/profile', { name: name.value.trim() })
|
||||
const result = await http.post('/api/v1/user/profile', { name: displayName })
|
||||
if (result?.errorNo !== 0) throw new Error(result?.errorMsg || '个人资料保存失败')
|
||||
store.userInfos.name = result.data.name
|
||||
name.value = result.data.name
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<el-tag :type="roleMeta(store.role).type">{{ roleMeta(store.role).label }}</el-tag>
|
||||
</el-form-item>
|
||||
<el-form-item label="显示名称">
|
||||
<el-input v-model="name" maxlength="10" placeholder="请输入显示名称" />
|
||||
<el-input v-model="name" placeholder="请输入 1–10 个字符" />
|
||||
</el-form-item>
|
||||
<el-button type="primary" native-type="submit" :loading="saving">
|
||||
保存资料
|
||||
|
||||
@@ -235,10 +235,14 @@ export function usePage() {
|
||||
if (submitting.value || !canEditSelectedUser.value) return
|
||||
submitting.value = true
|
||||
try {
|
||||
const name = editUserInfo.name.trim()
|
||||
if (!name || Array.from(name).length > 10 || /[\u0000-\u001f\u007f-\u009f]/u.test(name)) {
|
||||
throw new Error('显示名称须为 1–10 个字符,且不能包含控制字符')
|
||||
}
|
||||
const creating = editModel.value === 'create'
|
||||
const newData = {
|
||||
"account": editUserInfo.account,
|
||||
"username": editUserInfo.name,
|
||||
"username": name,
|
||||
"disabled": editUserInfo.disabled ? 1 : 0
|
||||
}
|
||||
if (creating || roleChanged.value) newData.role = editUserInfo.role
|
||||
|
||||
@@ -188,7 +188,11 @@
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item :label="lang.user_name">
|
||||
<el-input v-model="editUserInfo.name" :disabled="!canEditSelectedUser || submitting" />
|
||||
<el-input
|
||||
v-model="editUserInfo.name"
|
||||
:disabled="!canEditSelectedUser || submitting"
|
||||
placeholder="请输入 1–10 个字符"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item :label="lang.password">
|
||||
|
||||
Reference in new issue
Block a user