From 516bdc214c7d6dc5f858407d96c806a1107b28cd Mon Sep 17 00:00:00 2001 From: hxr <1490493387@qq.com> Date: Mon, 9 Oct 2023 21:27:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20:hammer:=20vSCode=20=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E6=99=BA=E8=83=BD=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 8682667..1e824bf 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,7 +4,11 @@ "editor.tabSize": 2, "editor.formatOnSave": true, "editor.defaultFormatter": "esbenp.prettier-vscode", - + "editor.quickSuggestions": { + "other": true, + "comments": true, + "strings": true + }, "editor.codeActionsOnSave": { "source.fixAll": true, "source.fixAll.eslint": true, From 399197e759cda099bd9e1198a147fdb2c94896ea Mon Sep 17 00:00:00 2001 From: hxr <1490493387@qq.com> Date: Mon, 9 Oct 2023 21:29:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20:hammer:=20=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/user/index.vue | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 43dd1a6..899d1fd 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -28,7 +28,7 @@ const queryFormRef = ref(ElForm); // 查询表单 const userFormRef = ref(ElForm); // 用户表单 const uploadRef = ref(); // 上传组件 -const loading = ref(false); // 加载状态 用于分页 +const loading = ref(false); // 加载状态 const removeIds = ref([]); // 删除用户ID集合 用于批量删除 const queryParams = reactive({ pageNum: 1, @@ -64,9 +64,7 @@ const rules = reactive({ username: [{ required: true, message: "用户名不能为空", trigger: "blur" }], nickname: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }], deptId: [{ required: true, message: "所属部门不能为空", trigger: "blur" }], - roleIds: [ - { required: true, message: "用户角色不能为空", trigger: "blur" }, - ], + roleIds: [{ required: true, message: "用户角色不能为空", trigger: "blur" }], email: [ { pattern: /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/, @@ -577,11 +575,7 @@ onMounted(() => { - +