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 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/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 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) => { 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 @@ { dateRange.value = ['',''] queryFormRef.value.resetFields(); queryParams.value.pageNum = 1; + queryParams.value.deptId = undefined; + deptTreeRef.value.setCurrentKey(null); handleQuery(); }