xiaozhan
/
tobacco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat：修改目录相关代码

Browse Source
dev-theme
username 1 week ago
parent 736e077dce
commit 681fb3fdb0
3 changed files with 332 additions and 233 deletions
Show Stats Download Patch File Download Diff File

38
bs-admin/src/main/java/com/bs/ct/controller/CtGalleryCataController.java
Unescape View File

@ -1,6 +1,9 @@
package com.bs.ct.controller;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import io.swagger.annotations.Api;
@ -50,7 +53,9 @@ public class CtGalleryCataController extends BaseController {
LambdaQueryWrapper<CtGalleryCata> queryWrapper = new LambdaQueryWrapper();
condition(queryWrapper,ctGalleryCata);
List<CtGalleryCata> list = ctGalleryCataService.list(queryWrapper);
return getDataTable(list);
List<CtGalleryCata> ctGalleryCatas = buildTree(list);
return getDataTable(ctGalleryCatas);
}
/**
@ -62,7 +67,36 @@ public class CtGalleryCataController extends BaseController {
LambdaQueryWrapper<CtGalleryCata> queryWrapper = new LambdaQueryWrapper();
condition(queryWrapper,ctGalleryCata);
List<CtGalleryCata> list = ctGalleryCataService.list(queryWrapper);
return success(list);
List<CtGalleryCata> ctGalleryCatas = buildTree(list);
return success(ctGalleryCatas);
}
public List<CtGalleryCata> buildTree(List<CtGalleryCata> list) {
Map<Long, CtGalleryCata> map = new HashMap<>();
List<CtGalleryCata> tree = new ArrayList<>();
// 先将所有节点放入 map 中
for (CtGalleryCata node : list) {
map.put(node.getId(), node);
}
// 构建树结构
for (CtGalleryCata node : list) {
Long parentId = node.getParentId();
if (parentId == null ||!map.containsKey(parentId)) {
tree.add(node);
} else {
CtGalleryCata parent = map.get(parentId);
// 假设 CtGalleryCata 类中有一个 children 属性来存储子节点
// 你需要在 CtGalleryCata 类中添加相应的属性和方法
// 这里简单模拟添加子节点
List<CtGalleryCata> children = parent.getChildren();
if (children == null) {
children = new ArrayList<>();
parent.setChildren(children);
}
children.add(node);
}
}
return tree;
}
/**

5
bs-admin/src/main/java/com/bs/ct/domain/CtGalleryCata.java
Unescape View File

@ -11,6 +11,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
/**
* 图库目录对象 ct_gallery_cata
*
@ -54,6 +56,7 @@ public class CtGalleryCata extends BaseEntity{
private String remarks;
@TableField(exist = false)
private List<CtGalleryCata> children;
}

522
bs-ui/src/views/gallery/cata/index.vue
Unescape View File

@ -1,28 +1,40 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="目录名称" prop="cataName">
<el-input
v-model="queryParams.cataName"
placeholder="请输入目录名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="父级id" prop="parentId">
<el-input
v-model="queryParams.parentId"
placeholder="请输入父级id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- 搜索条件 -->
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="目录名称" prop="cataName">
<el-input
v-model="queryParams.cataName"
placeholder="请输入目录名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索
</el-button>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery"
>重置
</el-button>
</el-form-item>
</el-form>
<!-- 操作按钮 -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
@ -32,50 +44,52 @@
size="mini"
@click="handleAdd"
v-hasPermi="['gallery:cata:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['gallery:cata:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['gallery:cata:remove']"
>删除</el-button>
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
type="info"
plain
icon="el-icon-download"
icon="el-icon-sort"
size="mini"
@click="handleExport"
v-hasPermi="['gallery:cata:export']"
>导出</el-button>
@click="toggleExpandAll"
>展开/折叠
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="cataList" @sort-change="handleSortChange" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="id" sortable='custom' />
<el-table-column label="目录名称" align="center" prop="cataName" sortable='custom' />
<el-table-column label="父级id" align="center" prop="parentId" sortable='custom' />
<el-table-column label="类型" align="center" prop="type" sortable='custom' />
<el-table-column label="备注" align="center" prop="remarks" sortable='custom' />
<!-- 树状表格 -->
<el-table
v-if="refreshTable"
v-loading="loading"
:data="cataList"
row-key="id"
:default-expand-all="isExpandAll"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
@selection-change="handleSelectionChange"
>
<el-table-column
label="目录名称"
prop="cataName"
sortable="custom"
/>
<el-table-column
label="类型"
align="center"
prop="type"
sortable="custom"
/>
<el-table-column
label="备注"
align="center"
prop="remarks"
sortable="custom"
/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -84,18 +98,21 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['gallery:cata:edit']"
>修改</el-button>
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['gallery:cata:remove']"
>删除</el-button>
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<pagination
hide-on-single-page
:total="total"
@ -104,27 +121,58 @@
@pagination="getList"
/>
<!-- 添加或修改图库目录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="70%" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-col :span="12">
<el-form-item label="目录名称" prop="cataName">
<el-input v-model="form.cataName" placeholder="请输入目录名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="父级id" prop="parentId">
<el-input v-model="form.parentId" placeholder="请输入父级id" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
<!-- 添加/修改对话框 -->
<el-dialog
:title="title"
:visible.sync="open"
width="70%"
append-to-body
:close-on-click-modal="false"
>
<el-form
ref="form"
:model="form"
:rules="rules"
label-width="100px"
>
<!-- 新增条件渲染：只有当parentId存在（非根目录）时显示父级目录选择框 -->
<el-col :span="24" v-if="form.parentId !== undefined && form.parentId !== 0">
<el-form-item label="父级目录" prop="parentId">
<treeselect
v-model="form.parentId"
:options="cataOptions"
:normalizer="normalizer"
placeholder="选择父级目录"
:allow-empty="true"
/>
</el-form-item>
</el-col>
<!-- 其他表单项保持不变 -->
<el-col :span="12">
<el-form-item label="目录名称" prop="cataName">
<el-input
v-model="form.cataName"
placeholder="请输入目录名称"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remarks">
<el-input
v-model="form.remarks"
type="textarea"
placeholder="请输入内容"
/>
</el-form-item>
</el-col>
</el-form>
<!-- 对话框底部按钮保持不变 -->
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button
type="primary"
@click="submitForm"
>确 定
</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
@ -132,166 +180,180 @@
</template>
<script>
import { pageListCata, getCata, delCata, addCata, updateCata } from "@/api/gallery/cata";
import {pageListCata, getCata, delCata, addCata, updateCata} from "@/api/gallery/cata";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import {mapGetters} from "vuex";
export default {
name: "Cata",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 选中名字
names: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 图库目录表格数据
cataList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
cataName: null,
parentId: null,
type: null,
remarks: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
cataName: [
{ required: true, message: "目录名称不能为空", trigger: "blur" }
],
parentId: [
{ required: true, message: "父级id不能为空", trigger: "blur" }
],
type: [
{ required: true, message: "类型不能为空", trigger: "change" }
],
remarks: [
{ required: true, message: "备注不能为空", trigger: "blur" }
],
}
export default {
name: "Cata",
components: {Treeselect},
data() {
return {
// 重新渲染表格状态
refreshTable: true,
// 加载状态
loading: false,
// 搜索条件显示
showSearch: true,
// 树状表格数据
cataList: [],
// 对话框父级目录选项
cataOptions: [],
// 弹出层标题
title: "",
// 弹出层显示状态
open: false,
// 展开/折叠状态
isExpandAll: true,
// 总条数
total: 0,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
cataName: null,
},
// 表单数据
form: {
id: null,
cataName: null,
parentId: null,
remarks: null,
type: null, // 若有类型字段需补充
},
// 表单校验规则
rules: {
cataName: [
{required: true, message: "目录名称不能为空", trigger: "blur"}
],
// 父级目录允许为空（根节点）
remarks: [
{required: false, message: "备注长度不超过500字", trigger: "blur"}
]
},
// 选中项
ids: [],
names: [],
single: true,
multiple: true,
};
},
computed: {
...mapGetters(["getToken"]) // 若需权限控制
},
created() {
this.getList();
},
methods: {
/** 获取目录列表 */
getList() {
this.loading = true;
pageListCata(this.queryParams).then(({rows, total}) => {
this.cataList = rows;
this.cataOptions = rows; // 父级目录选项使用全量数据
this.total = total;
this.loading = false;
}).catch(() => {
this.loading = false;
});
},
/** 展开/折叠所有节点 */
toggleExpandAll() {
this.refreshTable = false;
this.isExpandAll = !this.isExpandAll;
this.$nextTick(() => {
this.refreshTable = true;
});
},
/** 重置表单 */
reset() {
this.form = {
id: null,
cataName: null,
parentId: null,
remarks: null,
type: null,
};
this.resetForm("form");
},
created() {
/** 搜索 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
methods: {
/** 查询图库目录列表 */
getList() {
this.loading = true;
pageListCata(this.queryParams).then(response => {
this.cataList = response.rows;
this.total = response.total;
this.loading = false;
}).catch(e => {
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
cataName: null,
parentId: null,
type: null,
remarks: null,
};
this.resetForm("form");
},
//排序
handleSortChange(col) {
this.$sortBy(col, this.queryParams);
this.getList();
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id);
this.names = selection.map(item => item.id);
this.single = selection.length!==1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
/** 重置搜索 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 处理选中项 */
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.id);
this.names = selection.map((item) => item.cataName);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
/** 新增 */
handleAdd() {
this.reset();
this.open = true;
this.title = "新增目录";
},
/** 修改 */
handleUpdate(row) {
this.reset();
const id = row.id;
getCata(id).then(({data}) => {
this.form = data;
this.open = true;
this.title = "添加图库目录";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
getCata(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改图库目录";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateCata(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addCata(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
const names = row.id || this.names;
this.$modal.confirm('是否确认删除图库目录为"' + names + '"的数据项？').then(function() {
return delCata(ids);
}).then(() => {
this.title = "修改目录";
});
},
/** 提交表单 */
submitForm() {
this.$refs.form.validate((valid) => {
if (valid) {
const api = this.form.id ? updateCata : addCata;
api(this.form).then(() => {
this.$modal.msgSuccess(this.form.id ? "修改成功" : "新增成功");
this.open = false;
this.getList();
});
}
});
},
/** 删除 */
handleDelete(row) {
// 校验是否存在子节点
if (row.children && row.children.length > 0) {
// 使用与成功提示统一的提示方法（假设警告提示为 msgWarning）
this.$modal.msgWarning("该目录存在下级目录，无法直接删除，请先删除下级目录");
return; // 终止删除流程
}
// 无下级目录时执行原删除逻辑
const id = row.id;
const name = row.cataName;
this.$modal.confirm(`是否确认删除“${name}”？`).then(() => {
delCata(id).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('gallery/cata/export', {
...this.queryParams
}, `cata_${new Date().getTime()}.xlsx`)
}
this.$modal.msgSuccess("删除成功"); // 保持原有成功提示
});
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
/** Treeselect 节点格式化（若字段名不一致时使用） */
normalizer(node) {
return {
id: node.id,
label: node.cataName,
children: node.children,
};
}
}
};
};
</script>

Write Preview
Loading…
Cancel
Save