1024-lab/smart-admin
1
0
Fork 0
mirror of https://github.com/1024-lab/smart-admin.git synced 2025-09-01 18:34:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
zhuoda
2023-06-13 20:36:59 +08:00
parent 86cae060b7
commit 42d9fdd8d3
11 changed files with 32 additions and 32 deletions
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 胡克")
@PostMapping("/goods/query")
@PreAuthorize("@saAuth.checkPermission('goods:query ')")
@PreAuthorize("@saAuth.checkPermission('goods:query')")
public ResponseDTO<PageResult<GoodsVO>> query(@RequestBody @Valid GoodsQueryForm queryForm) {
return goodsService.query(queryForm);
}

5
smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java
View File

@@ -205,7 +205,10 @@ public class EmployeeService {
if (null == employeeEntity) {
return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
}
employeeDao.updateDisableFlag(employeeId, !employeeEntity.getDisabledFlag());
boolean disableFlag=!employeeEntity.getDisabledFlag();
employeeEntity.setDisabledFlag(disableFlag);
employeeDao.updateDisableFlag(employeeId, disableFlag);
if (employeeEntity.getDisabledFlag()) {
tokenService.batchRemoveRedisToken(employeeId, UserTypeEnum.ADMIN_EMPLOYEE);

7
smart-admin-api/sa-common/src/main/resources/code-generator-template/js/list.vue.vm
View File

@@ -64,7 +64,7 @@
<a-row class="smart-table-btn-block">
<div class="smart-table-operate-block">
#if($insertAndUpdate.isSupportInsertAndUpdate)
<a-button @click="showForm" type="primary" size="small">
<a-button @click="showForm()" type="primary" size="small">
<template #icon>
<PlusOutlined />
</template>
@@ -245,7 +245,7 @@
function onDelete(data){
Modal.confirm({
title: '提示',
content: '确定要删除选吗?',
content: '确定要删除吗?',
okText: '删除',
okType: 'danger',
onOk() {
@@ -260,9 +260,6 @@
async function requestDelete(data){
SmartLoading.show();
try {
let deleteForm = {
goodsIdList: selectedRowKeyList.value,
};
await $!{name.lowerCamel}Api.delete(data.$!{primaryKeyFieldName});
message.success('删除成功');
queryData();

22
smart-admin-web/javascript-ant-design-vue3/src/components/framework/icon-select/index.vue
View File

@@ -1,26 +1,26 @@
<!--
* 图标 选择
*
* @Author: 1024创新实验室-主任：卓大
* @Date: 2022-09-01 23:14:49
* @Wechat: zhuda1024
* @Email: lab1024@163.com
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
* 图标 选择
*
* @Author: 1024创新实验室-主任：卓大
* @Date: 2022-09-01 23:14:49
* @Wechat: zhuda1024
* @Email: lab1024@163.com
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
-->
<template>
<div>
<a-popover v-model:visible="visible" placement="bottomLeft" trigger="click">
<template #title>
<a-form-item-rest>
<a-form-item>
<a-radio-group @change="updateSelectIconArray" v-model:value="iconStyle" style="margin: 8px">
<a-radio-button value="outlined">线框风格</a-radio-button>
<a-radio-button value="filled">实底风格</a-radio-button>
<a-radio-button value="twoTone">双色风格</a-radio-button>
</a-radio-group>
</a-form-item-rest>
<a-form-item-rest>
</a-form-item>
<a-form-item>
<a-input-search v-model:value="searchValue" placeholder="输入英文关键词进行搜索" @change="updateSelectIconArray" />
</a-form-item-rest>
</a-form-item>
</template>
<template #content>

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="top-menu">
<span class="ant-menu">{{ props.selectedMenu?.menuName }}</span>
<span class="ant-menu">{{ props.selectedMenu.menuName }}</span>
</div>
<!-- 次级菜单展示 -->
<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="$lodash.isEmpty(item.children)">
<a-menu-item :key="item.menuId.toString()" @click="turnToPage(item)">
@@ -60,14 +60,14 @@
return [];
}
let menuParentIdListMap = useUserStore().getMenuParentIdListMap;
return menuParentIdListMap?.get(currentName) || [];
return menuParentIdListMap.get(currentName) || [];
});
const openKeys = computed(() => {
// // 仅展开当前页面
// return parentMenuList.value.map((e) => e.name);
// 展开所有
let children = props.selectedMenu?.children;
let children = props.selectedMenu.children;
if (!children || _.isEmpty(children)) {
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
-->
<template>
<a-sub-menu :key="props.menuInfo?.menuId.toString()">
<a-sub-menu :key="props.menuInfo.menuId.toString()">
<template #icon>
<component :is="$antIcons[props.menuInfo?.icon]" />
<component :is="$antIcons[props.menuInfo.icon]" />
</template>
<template #title>{{ props.menuInfo?.menuName }}</template>
<template v-for="item in props.menuInfo?.children" :key="item.menuId">
<template #title>{{ props.menuInfo.menuName }}</template>
<template v-for="item in props.menuInfo.children" :key="item.menuId">
<template v-if="item.visibleFlag">
<template v-if="!item.children">
<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;
}
// 选中父级
let parentIndex = this.checkedData.findIndex((e) => parentModule?.menuId === e);
let parentIndex = this.checkedData.findIndex((e) => parentModule.menuId === e);
if (parentModule.menuId && parentIndex == -1) {
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) {
if (!val || !this.keepAliveIncludes?.includes(val)) {
if (!val || !this.keepAliveIncludes.includes(val)) {
this.keepAliveIncludes = [];
return;
}

2
smart-admin-web/javascript-ant-design-vue3/src/views/support/operate-log/operate-log-detail-modal.vue
View File

@@ -22,7 +22,7 @@
<a-row class="detail-info">
<a-col :span="12"> 用户id：{{ detail.operateUserId }}</a-col>
<a-col :span="12"> 用户名称： {{ detail.operateUserName }}</a-col>
<a-col :span="12"> 请求内容： {{ detail.module }} - {{ detail.content }}</a-col>
<a-col :span="24"> 请求内容： {{ detail.module }} - {{ detail.content }}</a-col>
</a-row>
</a-col>
<a-col :span="8">

2
smart-admin-web/javascript-ant-design-vue3/src/views/system/40X/403.vue
View File

@@ -8,7 +8,7 @@
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
-->
<template>
<a-result status="404" title="对不起，您没有权限访问此内容">
<a-result status="403" title="对不起，您没有权限访问此内容">
<template #extra>
<a-button type="primary" @click="goHome">返回首页</a-button>
</template>

4
smart-admin-web/javascript-ant-design-vue3/src/views/system/40X/404.vue
View File

@@ -1,5 +1,5 @@
<!--
* 403 不存在 页面
* 404 不存在 页面
*
* @Author: 1024创新实验室-主任：卓大
* @Date: 2022-08-08 20:46:18
@@ -8,7 +8,7 @@
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
-->
<template>
<a-result status="403" title="对不起，您访问的内容不存在！">
<a-result status="404 title="对不起，您访问的内容不存在！">
<template #extra>
<a-button type="primary" @click="goHome">返回首页</a-button>
</template>