xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-09-17 19:06:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
zhuoda 2023-06-13 20:33:33 +08:00
parent c7501c7f36
commit 793115e2e7
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java
View File

@ -38,7 +38,7 @@ public class GoodsController extends AdminBaseController {
@ApiOperation("分页查询 @author 胡克") @ApiOperation("分页查询 @author 胡克")
@PostMapping("/goods/query") @PostMapping("/goods/query")
@PreAuthorize("@saAuth.checkPermission('goods:query ')") @PreAuthorize("@saAuth.checkPermission('goods:query')")
public ResponseDTO<PageResult<GoodsVO>> query(@RequestBody @Valid GoodsQueryForm queryForm) { public ResponseDTO<PageResult<GoodsVO>> query(@RequestBody @Valid GoodsQueryForm queryForm) {
return goodsService.query(queryForm); return goodsService.query(queryForm);
} }

8
smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/recursion-menu.vue
View File

@ -11,11 +11,11 @@
<div class="resursion-container"> <div class="resursion-container">
<!-- 顶部顶级菜单名称 --> <!-- 顶部顶级菜单名称 -->
<div class="top-menu"> <div class="top-menu">
<span class="ant-menu">{{ props.selectedMenu?.menuName }}</span> <span class="ant-menu">{{ props.selectedMenu.menuName }}</span>
</div> </div>
<!-- 次级菜单展示 --> <!-- 次级菜单展示 -->
<a-menu :selectedKeys="selectedKeys" :openKeys="openKeys" mode="inline"> <a-menu :selectedKeys="selectedKeys" :openKeys="openKeys" mode="inline">
<template v-for="item in props.selectedMenu?.children" :key="item.menuId"> <template v-for="item in props.selectedMenu.children" :key="item.menuId">
<template v-if="item.visibleFlag"> <template v-if="item.visibleFlag">
<template v-if="$lodash.isEmpty(item.children)"> <template v-if="$lodash.isEmpty(item.children)">
<a-menu-item :key="item.menuId.toString()" @click="turnToPage(item)"> <a-menu-item :key="item.menuId.toString()" @click="turnToPage(item)">
@ -60,14 +60,14 @@
return []; return [];
} }
let menuParentIdListMap = useUserStore().getMenuParentIdListMap; let menuParentIdListMap = useUserStore().getMenuParentIdListMap;
return menuParentIdListMap?.get(currentName) || []; return menuParentIdListMap.get(currentName) || [];
}); });
const openKeys = computed(() => { const openKeys = computed(() => {
// // 仅展开当前页面 // // 仅展开当前页面
// return parentMenuList.value.map((e) => e.name); // return parentMenuList.value.map((e) => e.name);
// 展开所有 // 展开所有
let children = props.selectedMenu?.children; let children = props.selectedMenu.children;
if (!children || _.isEmpty(children)) { if (!children || _.isEmpty(children)) {
return []; return [];
} }

8
smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/sub-menu.vue
View File

@ -8,12 +8,12 @@
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012 * @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
--> -->
<template> <template>
<a-sub-menu :key="props.menuInfo?.menuId.toString()"> <a-sub-menu :key="props.menuInfo.menuId.toString()">
<template #icon> <template #icon>
<component :is="$antIcons[props.menuInfo?.icon]" /> <component :is="$antIcons[props.menuInfo.icon]" />
</template> </template>
<template #title>{{ props.menuInfo?.menuName }}</template> <template #title>{{ props.menuInfo.menuName }}</template>
<template v-for="item in props.menuInfo?.children" :key="item.menuId"> <template v-for="item in props.menuInfo.children" :key="item.menuId">
<template v-if="item.visibleFlag"> <template v-if="item.visibleFlag">
<template v-if="!item.children"> <template v-if="!item.children">
<a-menu-item :key="item.menuId.toString()" @click="turnToPage(item)"> <a-menu-item :key="item.menuId.toString()" @click="turnToPage(item)">

2
smart-admin-web/javascript-ant-design-vue3/src/store/modules/system/role.js
View File

@ -82,7 +82,7 @@ export const useRoleStore = defineStore({
return; return;
} }
// 选中父级 // 选中父级
let parentIndex = this.checkedData.findIndex((e) => parentModule?.menuId === e); let parentIndex = this.checkedData.findIndex((e) => parentModule.menuId === e);
if (parentModule.menuId && parentIndex == -1) { if (parentModule.menuId && parentIndex == -1) {
this.addCheckedData(parentModule.menuId); this.addCheckedData(parentModule.menuId);
} }

2
smart-admin-web/javascript-ant-design-vue3/src/store/modules/system/user.js
View File

@ -240,7 +240,7 @@ export const useUserStore = defineStore({
}, },
// 清空缓存 // 清空缓存
clearKeepAliveIncludes(val) { clearKeepAliveIncludes(val) {
if (!val || !this.keepAliveIncludes?.includes(val)) { if (!val || !this.keepAliveIncludes.includes(val)) {
this.keepAliveIncludes = []; this.keepAliveIncludes = [];
return; return;
} }