admin/lx-admin-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ts' into dev

Browse Source
This commit is contained in:
LiuHao 2023-05-24 11:20:52 +08:00
commit 0ede92a2e5
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "ruoyi-vue-plus", "name": "ruoyi-vue-plus",
"version": "5.0.0-SNAPSHOT", "version": "5.0.0",
"description": "RuoYi-Vue-Plus多租户管理系统", "description": "RuoYi-Vue-Plus多租户管理系统",
"author": "LionLi", "author": "LionLi",
"license": "MIT", "license": "MIT",

6
src/views/demo/tree/index.vue
View File

@ -249,13 +249,13 @@ const handleUpdate = (row: TreeVO) => {
/** 提交按钮 */ /** 提交按钮 */
const submitForm = () => { const submitForm = () => {
treeFormRef.value.validate((valid: boolean) => { treeFormRef.value.validate(async (valid: boolean) => {
if (valid) { if (valid) {
buttonLoading.value = true; buttonLoading.value = true;
if (form.value.id) { if (form.value.id) {
updateTree(form.value).finally(() => buttonLoading.value = false); await updateTree(form.value).finally(() => buttonLoading.value = false);
} else { } else {
addTree(form.value).finally(() => buttonLoading.value = false); await addTree(form.value).finally(() => buttonLoading.value = false);
} }
proxy?.$modal.msgSuccess("操作成功"); proxy?.$modal.msgSuccess("操作成功");
dialog.visible = false; dialog.visible = false;

10
src/views/system/oss/index.vue
View File

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

3
src/views/system/user/index.vue
View File

@ -8,6 +8,7 @@
<el-tree <el-tree
class="mt-2" class="mt-2"
ref="deptTreeRef" ref="deptTreeRef"
node-key="id"
:data="deptOptions" :data="deptOptions"
:props="{ label: 'label', children: 'children' }" :props="{ label: 'label', children: 'children' }"
:expand-on-click-node="false" :expand-on-click-node="false"
@ -450,6 +451,8 @@ const resetQuery = () => {
dateRange.value = ['',''] dateRange.value = ['','']
queryFormRef.value.resetFields(); queryFormRef.value.resetFields();
queryParams.value.pageNum = 1; queryParams.value.pageNum = 1;
queryParams.value.deptId = undefined;
deptTreeRef.value.setCurrentKey(null);
handleQuery(); handleQuery();
} }