修复重复弹msg的bug
deploy-userbase-front / build-and-deploy (push) Successful in 2m27s

This commit is contained in:
chenxing
2026-08-18 23:31:27 +08:00
parent 8fd5a21fcc
commit 02f1fd2b14
32 changed files with 4843 additions and 2530 deletions
@@ -91,7 +91,7 @@ async function loadUserGroups(userId: number) {
pendingGroupIds.value = groupIds || [];
}
} catch (e: any) {
Message.error(e?.message || '加载用户所在组失败');
console.warn(e?.message || '加载用户所在组失败');
}
}
@@ -128,7 +128,7 @@ async function handleSubmit() {
visible.value = false;
onSuccessCallback?.();
} catch (e: any) {
Message.error(e?.message || '调整失败');
console.warn(e?.message || '调整失败');
} finally {
submitting.value = false;
}
+1 -1
View File
@@ -85,7 +85,7 @@ async function submit() {
emit('success');
visible.value = false;
} catch (e: any) {
Message.error(e?.message || '添加失败');
console.warn(e?.message || '添加失败');
} finally {
loading.value = false;
}
+1 -1
View File
@@ -83,7 +83,7 @@ async function confirmMove() {
emit('saved', { movedId: props.moveId, newPid: targetPid.value });
visible.value = false;
} catch (e: any) {
Message.error(e?.message || '移动失败');
console.warn(e?.message || '移动失败');
} finally {
loading.value = false;
}
+1 -1
View File
@@ -73,7 +73,7 @@ async function saveSort() {
emit('saved')
visible.value = false
} catch (e: any) {
Message.error(e?.message || '保存失败')
console.warn(e?.message || '保存失败')
} finally {
saving.value = false
}
+2 -2
View File
@@ -295,7 +295,7 @@ function showDeleteNode() {
Message.success('删除成功!');
refTreePanel.value?.removeNode(node?.id);
} catch (e: any) {
Message.error(e?.message || '删除失败');
console.warn(e?.message || '删除失败');
}
},
});
@@ -323,7 +323,7 @@ async function saveEditNode() {
}
editNodeModal.modal = false;
} catch (e: any) {
Message.error(e?.message || '保存失败');
console.warn(e?.message || '保存失败');
} finally {
editNodeModal.loading = false;
}
+3 -3
View File
@@ -297,7 +297,7 @@ async function handleDelete(row: any) {
Message.success('删除成功!');
tableRef.value?.reloadData(OperatorEnum.del);
} catch (e: any) {
Message.error(e?.message || '删除失败');
console.warn(e?.message || '删除失败');
}
},
});
@@ -329,7 +329,7 @@ async function openBatchDelete(checkList: number[]) {
Message.success('删除成功!');
tableRef.value?.reloadData(OperatorEnum.del);
} catch (e: any) {
Message.error(e?.message || '删除失败');
console.warn(e?.message || '删除失败');
}
},
});
@@ -365,7 +365,7 @@ async function confirmBatchStatus() {
statusModal.value = false;
tableRef.value?.reloadData(OperatorEnum.sel);
} catch (e: any) {
Message.error(e?.message || '设置失败');
console.warn(e?.message || '设置失败');
} finally {
statusSubmitting.value = false;
}
+4 -11
View File
@@ -36,8 +36,8 @@ onSuccess(() => {
onSuccessCallback?.();
});
onError((event) => {
const msg = event?.error?.message || '新增失败';
Message.error(normalizeAccountError(msg, form.value.account));
// 错误提示已由全局 alova 拦截器统一弹出,这里仅记录日志避免二次弹窗
console.warn('[AddUserContainer] 新增失败:', event?.error?.message || '新增失败');
});
/* ---------- 打开弹窗 ---------- */
@@ -73,7 +73,8 @@ async function handleSubmit(formData: Record<string, any>) {
try {
await Apis.AppRole.saveUserRoles({ data: { userId: newId, roleIds: appRolesToSave } });
} catch (e: any) {
Message.error('用户已创建,但角色属性保存失败:' + (e?.message || '未知错误'));
// 全局拦截器已弹窗,这里仅记录日志避免二次弹窗
console.warn('[AddUserContainer] 用户已创建,但角色属性保存失败:', e?.message || '未知错误');
}
}
}
@@ -98,13 +99,5 @@ function buildPayload(formData: Record<string, any>) {
};
}
/* ---------- 工具:账号重复提示标准化 ---------- */
function normalizeAccountError(msg: string, account: string): string {
if (account && /账号/.test(msg) && /(已存在|重复|已被其他用户使用)/.test(msg)) {
return `账号${account}已存在`;
}
return msg;
}
defineExpose({ open, visible });
</script>
@@ -42,8 +42,8 @@ onSuccess(() => {
onSuccessCallback?.();
});
onError((event) => {
const msg = event?.error?.message || '编辑失败';
Message.error(normalizeAccountError(msg, form.value.account));
// 错误提示已由全局 alova 拦截器统一弹出,这里仅记录日志避免二次弹窗
console.warn('[EditUserContainer] 编辑失败:', event?.error?.message || '编辑失败');
});
/* ---------- 打开编辑弹窗 ---------- */
@@ -100,7 +100,8 @@ async function open(row: any, groups: any[], curGroupId?: number | null, onSucce
roleOptions.value = list.map((r: any) => ({ id: r.id, name: r.name }));
roleOptionsLoaded.value = true;
} catch (e: any) {
Message.error('加载角色列表失败:' + (e?.message || '未知错误'));
// 全局拦截器已弹窗,这里仅记录日志避免二次弹窗
console.warn('[EditUserContainer] 加载角色列表失败:', e?.message || '未知错误');
}
// 3) 已绑定角色 -> appRoles 回填(相互独立)
@@ -118,7 +119,8 @@ async function open(row: any, groups: any[], curGroupId?: number | null, onSucce
} catch (e: any) {
// 已绑定角色加载失败:仍回填其它字段,但标记未加载成功(提交时不回写,避免误清空)
detailData.value = buildInitForm(row, [], defaultGroupId);
Message.error('加载用户已绑定角色失败:' + (e?.message || '未知错误'));
// 全局拦截器已弹窗,这里仅记录日志避免二次弹窗
console.warn('[EditUserContainer] 加载用户已绑定角色失败:', e?.message || '未知错误');
}
}
@@ -159,7 +161,8 @@ async function handleSubmit(formData: Record<string, any>) {
try {
await Apis.AppRole.saveUserRoles({ data: { userId: currentId.value as number, roleIds: appRolesToSave } });
} catch (e: any) {
Message.error('用户已更新,但角色属性保存失败:' + (e?.message || '未知错误'));
// 全局拦截器已弹窗,这里仅记录日志避免二次弹窗
console.warn('[EditUserContainer] 用户已更新,但角色属性保存失败:', e?.message || '未知错误');
}
}
}
@@ -190,13 +193,5 @@ function buildPayload(formData: Record<string, any>, id: number) {
return payload;
}
/* ---------- 工具:账号重复提示标准化 ---------- */
function normalizeAccountError(msg: string, account: string): string {
if (account && /账号/.test(msg) && /(已存在|重复|已被其他用户使用)/.test(msg)) {
return `账号${account}已存在`;
}
return msg;
}
defineExpose({ open, visible });
</script>
+1 -1
View File
@@ -80,7 +80,7 @@ async function handleSubmit() {
emit('update:visible', false);
emit('saved');
} catch (e: any) {
Message.error(e?.message || '排序设置失败');
console.warn(e?.message || '排序设置失败');
} finally {
submitting.value = false;
}