From 10a53bf8c7f042aaefac843740f61746dc90482a Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Wed, 5 Jul 2023 11:24:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0WangEditor=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC=EF=BC=8C=E6=94=AF=E6=8C=81v-model=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/WangEditor/index.vue | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue index 994a7b5..9da6b8b 100644 --- a/src/components/WangEditor/index.vue +++ b/src/components/WangEditor/index.vue @@ -25,17 +25,17 @@ export default { name: 'WangEditor', components: { Toolbar, Editor }, props: { - value: [String], + value: { + type: String, + required: false, + default: '' + }, editorHeight: { - type: Number + type: Number, + required: false, + default: 420 } }, - computed: { - ...mapGetters([ - 'imagesUploadApi', - 'baseApi' - ]) - }, data() { const _this = this return { @@ -55,6 +55,12 @@ export default { } } }}, + computed: { + ...mapGetters([ + 'imagesUploadApi', + 'baseApi' + ]) + }, editMode: 'simple', editor: null, editValue: null From e353708dee7fda2821b04a4ba3660ddbcb358875 Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Wed, 5 Jul 2023 11:29:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mnt/app/index.vue | 2 +- src/views/mnt/database/index.vue | 2 +- src/views/mnt/deploy/index.vue | 2 +- src/views/mnt/server/index.vue | 2 +- src/views/system/dept/index.vue | 2 +- src/views/system/menu/index.vue | 2 +- src/views/system/role/index.vue | 2 +- src/views/system/timing/index.vue | 2 +- src/views/system/user/index.vue | 2 +- src/views/tools/storage/local/index.vue | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/views/mnt/app/index.vue b/src/views/mnt/app/index.vue index 62739b7..ddb8fb8 100644 --- a/src/views/mnt/app/index.vue +++ b/src/views/mnt/app/index.vue @@ -22,7 +22,7 @@ - + diff --git a/src/views/mnt/database/index.vue b/src/views/mnt/database/index.vue index 6301f3a..03d44a6 100644 --- a/src/views/mnt/database/index.vue +++ b/src/views/mnt/database/index.vue @@ -24,7 +24,7 @@ - + diff --git a/src/views/mnt/deploy/index.vue b/src/views/mnt/deploy/index.vue index 3e46a6a..e2ab8a7 100644 --- a/src/views/mnt/deploy/index.vue +++ b/src/views/mnt/deploy/index.vue @@ -64,7 +64,7 @@ - + diff --git a/src/views/mnt/server/index.vue b/src/views/mnt/server/index.vue index 62468d9..7cb6a95 100644 --- a/src/views/mnt/server/index.vue +++ b/src/views/mnt/server/index.vue @@ -11,7 +11,7 @@ - + diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index af27cec..d02b846 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -14,7 +14,7 @@ - + diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index c33ee9c..e4800e1 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -11,7 +11,7 @@ - + diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index f3ac81d..bea269d 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -11,7 +11,7 @@ - + diff --git a/src/views/system/timing/index.vue b/src/views/system/timing/index.vue index 17646c2..bb3bf77 100644 --- a/src/views/system/timing/index.vue +++ b/src/views/system/timing/index.vue @@ -22,7 +22,7 @@ - + diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index b180c39..9017069 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -60,7 +60,7 @@ - + diff --git a/src/views/tools/storage/local/index.vue b/src/views/tools/storage/local/index.vue index c4b13f5..3adf8a0 100644 --- a/src/views/tools/storage/local/index.vue +++ b/src/views/tools/storage/local/index.vue @@ -23,7 +23,7 @@ - + From ba64fcba1128ba4efbaafa1e70709dbb431ead8e Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Wed, 5 Jul 2023 14:00:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?v2.7=20=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4a75964..4744c52 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "eladmin-web", - "version": "2.6.0", + "version": "2.7.0", "description": "ELADMIN 前端源码", "author": "Zheng Jie", "license": "Apache-2.0", From 1f09f74e61e04d183433f9b78b8fbbd3d343d2bc Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Thu, 6 Jul 2023 14:24:44 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/user.js | 10 +++++++++- src/views/system/user/index.vue | 31 ++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/src/api/system/user.js b/src/api/system/user.js index 6cd91a5..c14df11 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -45,6 +45,14 @@ export function updatePass(user) { }) } +export function resetPwd(ids) { + return request({ + url: 'api/users/resetPwd', + method: 'put', + data: ids + }) +} + export function updateEmail(form) { const data = { password: encrypt(form.pass), @@ -57,5 +65,5 @@ export function updateEmail(form) { }) } -export default { add, edit, del } +export default { add, edit, del, resetPwd } diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 9017069..60233d7 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -57,7 +57,19 @@ - + + 重置密码 + + @@ -471,6 +483,23 @@ export default { }, checkboxT(row, rowIndex) { return row.id !== this.user.id + }, + resetPwd(datas) { + this.$confirm(`你选中了 ${datas.length} 位用户，确认重置用户的密码吗?`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + const ids = [] + datas.forEach(val => { + ids.push(val.id) + }) + console.log(ids) + crudUser.resetPwd(ids).then(() => { + this.crud.notify('重置成功, 用户新密码:123456', CRUD.NOTIFICATION_TYPE.SUCCESS) + }).catch(() => {}) + }).catch(() => { + }) } } }