From 6de98250cc9434d73145e61a70637f16192b5e81 Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: Fri, 19 May 2023 01:32:24 +0800
Subject: [PATCH 1/3] fix issues #I7657W

---
 src/views/demo/tree/index.vue   | 6 +++---
 src/views/system/user/index.vue | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/demo/tree/index.vue b/src/views/demo/tree/index.vue
index ddff2bf..ae1d8c2 100644
--- a/src/views/demo/tree/index.vue
+++ b/src/views/demo/tree/index.vue
@@ -247,13 +247,13 @@ const handleUpdate = (row: TreeVO) => {
 
 /** 提交按钮 */
 const submitForm = () => {
-  treeFormRef.value.validate((valid: boolean) => {
+  treeFormRef.value.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.id) {
-        updateTree(form.value).finally(() => buttonLoading.value = false);
+        await updateTree(form.value).finally(() => buttonLoading.value = false);
       } else {
-        addTree(form.value).finally(() => buttonLoading.value = false);
+        await addTree(form.value).finally(() => buttonLoading.value = false);
       }
       proxy?.$modal.msgSuccess("操作成功");
       dialog.visible = false;
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 63c2adf..bf5a3d3 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -8,6 +8,7 @@
           <el-tree
             class="mt-2"
             ref="deptTreeRef"
+            node-key="id"
             :data="deptOptions"
             :props="{ label: 'label', children: 'children' }"
             :expand-on-click-node="false"
@@ -442,6 +443,8 @@ const resetQuery = () => {
     dateRange.value = ['','']
     queryFormRef.value.resetFields();
     queryParams.value.pageNum = 1;
+    queryParams.value.deptId = undefined;
+    deptTreeRef.value.setCurrentKey(null);
     handleQuery();
 }
 

From 84212c0a1b06054ec31e024c7de2607153b477b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Fri, 19 May 2023 09:45:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E2=9C=A8=E5=8F=91=E5=B8=83=205.0.0=20Sprin?=
 =?UTF-8?q?gBoot3=20=E6=90=BA=E6=89=8B=E5=A4=9A=E7=A7=9F=E6=88=B7=E5=BC=BA?=
 =?UTF-8?q?=E5=8A=BF=E6=9D=A5=E8=A2=AD?=
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 b78f8fe..d9a587d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi-vue-plus",
-  "version": "5.0.0-SNAPSHOT",
+  "version": "5.0.0",
   "description": "RuoYi-Vue-Plus多租户管理系统",
   "author": "LionLi",
   "license": "MIT",

From 21ab064cf708e5dfc6da7f15f1c6a5cf5069e5c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Fri, 19 May 2023 17:40:53 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20oss=20=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20=E9=A2=84=E8=A7=88=E5=BC=80=E5=85=B3=E7=82=B9=C3=97?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/oss/index.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue
index 4dddd37..24d637d 100644
--- a/src/views/system/oss/index.vue
+++ b/src/views/system/oss/index.vue
@@ -316,10 +316,12 @@ const handleDownload = (row: OssVO) => {
 /** 用户状态修改  */
 const handlePreviewListResource = async (preview: boolean) => {
     let text = preview ? "启用" : "停用";
-    await proxy?.$modal.confirm('确认要"' + text + '""预览列表图片"配置吗?');
-    await proxy?.updateConfigByKey("sys.oss.previewListResource", preview);
-    getList()
-    proxy?.$modal.msgSuccess(text + "成功");
+    try {
+      await proxy?.$modal.confirm('确认要"' + text + '""预览列表图片"配置吗?');
+      await proxy?.updateConfigByKey("sys.oss.previewListResource", preview);
+      getList()
+      proxy?.$modal.msgSuccess(text + "成功");
+    } catch { return }
 }
 /** 删除按钮操作 */
 const handleDelete = async (row?: OssVO) => {