From 0ede92a2e555d6ff51a0026bc1ee843329b83933 Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: 星期三, 24 五月 2023 11:20:52 +0800
Subject: [PATCH] Merge branch 'ts' into dev
---
src/views/system/user/index.vue | 3 +++
package.json | 2 +-
src/views/demo/tree/index.vue | 6 +++---
src/views/system/oss/index.vue | 10 ++++++----
4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/package.json b/package.json
index b629327..71f62a2 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",
diff --git a/src/views/demo/tree/index.vue b/src/views/demo/tree/index.vue
index b00ae69..da5f98a 100644
--- a/src/views/demo/tree/index.vue
+++ b/src/views/demo/tree/index.vue
@@ -249,13 +249,13 @@
/** 鎻愪氦鎸夐挳 */
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/oss/index.vue b/src/views/system/oss/index.vue
index 3ee9673..4cf6484 100644
--- a/src/views/system/oss/index.vue
+++ b/src/views/system/oss/index.vue
@@ -318,10 +318,12 @@
/** 鐢ㄦ埛鐘舵�佷慨鏀� */
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) => {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index f7b3a35..66de09d 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"
@@ -450,6 +451,8 @@
dateRange.value = ['','']
queryFormRef.value.resetFields();
queryParams.value.pageNum = 1;
+ queryParams.value.deptId = undefined;
+ deptTreeRef.value.setCurrentKey(null);
handleQuery();
}
--
Gitblit v1.9.3