gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '😝优化报表分组，风格与机构分组一致' (#368) from KaneLeung/Admin.NET.Pro:v2 into v2

Browse Source 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/368
This commit is contained in:
zuohuaijun 2025-07-07 16:53:46 +08:00
commit 57db9373ae
1 changed files with 145 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
Web/src/views/system/reportConfig/component/reportGroupPanel/index.vue
View File

@ -1,47 +1,70 @@
<template> <template>
<div class="group-panel" v-loading="state.isLoading"> <el-card class="box-card" shadow="hover" body-style="height:100%;overflow:auto;padding:5px;width:100%;" v-loading="state.isLoading">
<el-button-group class="group-panel-buttonGroup"> <template #header>
<el-button icon="ele-CirclePlus" size="small" @click="createFormShow">{{ $t('新增分组') }}</el-button> <div class="card-header">
<el-dropdown split-button @command="handleCommand" size="small" :icon="Delete" @click="editFormShow"> <div class="tree-h-flex">
{{ $t('编辑分组') }} <div class="tree-h-left">
<template v-slot:dropdown> <el-input :prefix-icon="Search" v-model.lazy="filterText" clearable :placeholder="$t('查询')" />
</div>
<div class="tree-h-right">
<el-dropdown @command="handleCommand">
<el-button style="margin-left: 8px; width: 34px">
<el-icon class="el-icon--center">
<more-filled />
</el-icon>
</el-button>
<template #dropdown>
<el-dropdown-menu> <el-dropdown-menu>
<el-dropdown-item command="del" :icon="Delete">{{ $t('删除分组') }}</el-dropdown-item> <el-dropdown-item command="expandAll">{{ $t('message.list.allExpand') }}</el-dropdown-item>
<el-dropdown-item command="refresh" :icon="RefreshRight">{{ $t('刷新分组') }}</el-dropdown-item> <el-dropdown-item command="collapseAll">{{ $t('message.list.allFold') }}</el-dropdown-item>
<el-dropdown-item command="create">{{ $t('新增分组') }}</el-dropdown-item>
<el-dropdown-item command="edit">{{ $t('编辑分组') }}</el-dropdown-item>
<el-dropdown-item command="delete">{{ $t('删除分组') }}</el-dropdown-item>
<el-dropdown-item command="refresh">{{ $t('message.list.refresh') }}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</template> </template>
</el-dropdown> </el-dropdown>
</el-button-group> </div>
<el-card :loading="true" class="group-panel-tree" shadow="never"> </div>
</div>
</template>
<div style="margin-bottom: 45px" v-loading="state.loading">
<el-scrollbar> <el-scrollbar>
<div v-if="state.groupTree">
<el-tree <el-tree
ref="groupTree" v-if="state.treeData"
:data="state.groupTree" ref="treeRef"
:props="state.defaultProps" class="filter-tree"
:default-expand-all="true" :data="state.treeData"
:expand-on-click-node="false" node-key="id"
:highlight-current="true" :props="{ children: 'children', label: 'label' }"
:filter-node-method="filterNode"
@node-click="(group: SysReportGroup) => emit('nodeClick', group)" @node-click="(group: SysReportGroup) => emit('nodeClick', group)"
/> :default-expanded-keys="state.treeData[0] && [state.treeData[0].id]"
</div> highlight-current
<div v-else> >
<el-empty /> <template #default="{ node }">
</div> <el-icon v-if="node.level == 1" size="16" style="margin-right: 3px; display: inline; vertical-align: middle"><ele-School /></el-icon>
<el-icon v-else-if="node.level == 2" size="16" style="margin-right: 3px; display: inline; vertical-align: middle"><ele-Refrigerator /></el-icon>
<el-icon v-else size="16" style="margin-right: 3px; display: inline; vertical-align: middle"><ele-CollectionTag /></el-icon>
<highLightKeyword v-if="filterText" :text="node.label" :keyword="filterText" />
<span v-else>{{ node.label }}</span>
</template>
</el-tree>
<el-empty v-else :image-size="100" />
</el-scrollbar> </el-scrollbar>
</el-card>
<EditReportGroup ref="editReportGroup" :title="state.title" @handleQuery="handleQuery"></EditReportGroup>
</div> </div>
</el-card>
<EditReportGroup ref="editReportGroup" :title="state.title" @handleQuery="fetchTreeData"></EditReportGroup>
</template> </template>
<script setup lang="ts" name="sysReportGroup"> <script setup lang="ts" name="sysReportGroup">
import { onMounted, reactive, ref } from 'vue'; import { onMounted, reactive, ref, watch } from 'vue';
import { ElMessage, ElMessageBox, ElTree } from 'element-plus'; import { ElMessage, ElMessageBox, ElTree } from 'element-plus';
import { Delete, RefreshRight } from '@element-plus/icons-vue'; import { Search, Delete, RefreshRight, MoreFilled } from '@element-plus/icons-vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import EditReportGroup from './editReportGroup.vue'; import EditReportGroup from './editReportGroup.vue';
import highLightKeyword from '/@/components/highLightKeyword/index.vue';
import { getAPI } from '/@/utils/axios-utils'; import { getAPI } from '/@/utils/axios-utils';
import { SysReportGroup, SysReportGroupApi } from '/@/api-services'; import { SysReportGroup, SysReportGroupApi } from '/@/api-services';
@ -51,25 +74,23 @@ const { t } = useI18n();
// 定义子组件向父组件传值/事件 // 定义子组件向父组件传值/事件
const emit = defineEmits(['nodeClick']); const emit = defineEmits(['nodeClick']);
const groupTree = ref<InstanceType<typeof ElTree>>(); const treeRef = ref<InstanceType<typeof ElTree>>();
const editReportGroup = ref<InstanceType<typeof EditReportGroup>>(); const editReportGroup = ref<InstanceType<typeof EditReportGroup>>();
const filterText = ref('');
const state = reactive({ const state = reactive({
/** 是否加载中 */ isLoading: false, //是否加载中
isLoading: false,
title: '', title: '',
groupTree: [], treeData: [],
defaultProps: {
children: 'children',
label: 'label',
},
}); });
// 页面初始化
onMounted(() => { onMounted(() => {
getGroupTree(); fetchTreeData();
}); });
const getGroupTree = () => { // 获取树数据
const fetchTreeData = () => {
state.isLoading = true; state.isLoading = true;
getAPI(SysReportGroupApi) getAPI(SysReportGroupApi)
.apiSysReportGroupListGet() .apiSysReportGroupListGet()
@ -77,13 +98,14 @@ const getGroupTree = () => {
getTree(res.data.result ?? []); getTree(res.data.result ?? []);
let rootGroup = [{ id: 0, label: t('全部'), value: 0, children: [] }]; let rootGroup = [{ id: 0, label: t('全部'), value: 0, children: [] }];
rootGroup[0].children = res.data.result as []; rootGroup[0].children = res.data.result as [];
state.groupTree = rootGroup as []; state.treeData = rootGroup as [];
}) })
.finally(() => { .finally(() => {
state.isLoading = false; state.isLoading = false;
}); });
}; };
// 处理树数据
const getTree = (tree: SysReportGroup[]): [] => { const getTree = (tree: SysReportGroup[]): [] => {
tree.forEach((r: any) => { tree.forEach((r: any) => {
r.label = `${r.number}[${r.name}]`; r.label = `${r.number}[${r.name}]`;
@ -92,29 +114,36 @@ const getTree = (tree: SysReportGroup[]): [] => {
return []; return [];
}; };
const handleCommand = (cmd: string) => { // 查询监听
switch (cmd) { watch(filterText, (val) => {
//刷新 treeRef.value!.filter(val);
case 'refresh': });
getGroupTree();
break; // 节点过滤
//删除分组 const filterNode = (value: string, data: any) => {
case 'del': if (!value) return true;
const currData = groupTree.value!.getCurrentNode(); return data.label.includes(value);
if (currData) {
reportGroupDelete(currData.id, currData.label);
}
break;
}
}; };
const createFormShow = () => { // 节点操作
const handleCommand = async (command: string | number | object) => {
if ('expandAll' == command) {
//展开分组
for (let i = 0; i < treeRef.value!.store._getAllNodes().length; i++) {
treeRef.value!.store._getAllNodes()[i].expanded = true;
}
} else if ('collapseAll' == command) {
//折叠分组
for (let i = 0; i < treeRef.value!.store._getAllNodes().length; i++) {
treeRef.value!.store._getAllNodes()[i].expanded = false;
}
} else if ('create' == command) {
//新增分组
state.title = t('新增分组'); state.title = t('新增分组');
editReportGroup.value?.openDialog({}); editReportGroup.value?.openDialog({});
}; } else if ('edit' == command) {
//编辑分组
const editFormShow = () => { const currData = treeRef.value!.getCurrentNode();
const currData = groupTree.value!.getCurrentNode();
if (!currData) { if (!currData) {
ElMessage.error(t('请选择分组后编辑')); ElMessage.error(t('请选择分组后编辑'));
return; return;
@ -125,15 +154,14 @@ const editFormShow = () => {
} }
state.title = t('编辑分组'); state.title = t('编辑分组');
editReportGroup.value?.openDialog(currData); editReportGroup.value?.openDialog(currData);
}; } else if ('delete' == command) {
//删除分组
const reportGroupDelete = (recordId: number, label: string) => { const currData = treeRef.value!.getCurrentNode();
if (recordId == 0) { if (currData.id == 0) {
ElMessage.error(t('请选择有效的分组节点')); ElMessage.error(t('请选择有效的分组节点'));
return; return;
} }
ElMessageBox.confirm(t('确认删除？', { label: currData.label }), t('提示'), {
ElMessageBox.confirm(t('确认删除？', { label: label }), t('提示'), {
confirmButtonText: t('确定'), confirmButtonText: t('确定'),
cancelButtonText: t('取消'), cancelButtonText: t('取消'),
type: 'warning', type: 'warning',
@ -142,35 +170,34 @@ const reportGroupDelete = (recordId: number, label: string) => {
.apiSysReportGroupDeletePost({ id: recordId }) .apiSysReportGroupDeletePost({ id: recordId })
.then((res) => { .then((res) => {
ElMessage.success(t('删除成功')); ElMessage.success(t('删除成功'));
getGroupTree(); fetchTreeData();
}); });
}); });
}; } else if ('refresh' == command) {
//刷新
const handleQuery = () => { fetchTreeData();
getGroupTree(); }
}; };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.group-panel { .box-card {
background-color: var(--el-fill-color-blank);
display: flex;
flex-direction: column;
height: 100%;
.group-panel-buttonGroup {
width: 100%;
padding: 5px 0 10px 0;
}
.group-panel-tree {
flex: 1; flex: 1;
> :deep(.el-card__header) {
padding: 5px;
}
}
.tree-h-flex {
display: flex;
}
:deep(.el-card__body) { .tree-h-left {
padding: 0px; flex: 1;
height: 100%; width: 100%;
}
} }
.tree-h-right {
width: 42px;
min-width: 42px;
} }
</style> </style>