zayac/zayac-admin
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: 优化枚举字典处理，增加颜色类型

Browse Source 
1.重构 useDict 方法，同时支持枚举和查询字典，对应后端接口增加缓存处理
2.优化 BaseEnum 处理，增加 color 字段可用于设置对应枚举背景颜色（同字典背景颜色）
This commit is contained in:
Charles7c 2023-09-17 18:03:14 +08:00
parent 3a3a5d6b71
commit 1f73aa732d
33 changed files with 234 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseEnum.java
View File

@ -30,12 +30,21 @@ import com.baomidou.mybatisplus.annotation.IEnum;
* @author Charles7c
* @since 2023/2/5 20:44
*/
public interface BaseEnum<V extends Serializable, D extends Serializable> extends IEnum<V> {
public interface BaseEnum<V extends Serializable> extends IEnum<V> {
/**
* 枚举描述
*
* @return 枚举描述
*/
D getDescription();
String getDescription();
/**
* 颜色
*
* @return 颜色
*/
default String getColor() {
return null;
}
}

10
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/easyexcel/ExcelBaseEnumConverter.java
View File

@ -35,7 +35,7 @@ import top.charles7c.cnadmin.common.constant.StringConsts;
* @author Charles7c
* @since 2023/2/5 19:29
*/
public class ExcelBaseEnumConverter implements Converter<BaseEnum<Integer, String>> {
public class ExcelBaseEnumConverter implements Converter<BaseEnum<Integer>> {
@Override
public Class<BaseEnum> supportJavaTypeKey() {
@ -60,8 +60,8 @@ public class ExcelBaseEnumConverter implements Converter<BaseEnum<Integer, Strin
* 转换为 Excel 数据（写入 Excel）
*/
@Override
public WriteCellData<String> convertToExcelData(BaseEnum<Integer, String> value,
ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
public WriteCellData<String> convertToExcelData(BaseEnum<Integer> value, ExcelContentProperty contentProperty,
GlobalConfiguration globalConfiguration) {
if (null == value) {
return new WriteCellData<>(StringConsts.EMPTY);
}
@ -77,11 +77,11 @@ public class ExcelBaseEnumConverter implements Converter<BaseEnum<Integer, Strin
* 描述
* @return 对应枚举 ，获取不到时为 {@code null}
*/
private BaseEnum<Integer, String> getEnum(Class<?> enumType, String description) {
private BaseEnum<Integer> getEnum(Class<?> enumType, String description) {
Object[] enumConstants = enumType.getEnumConstants();
for (Object enumConstant : enumConstants) {
if (ClassUtil.isAssignable(BaseEnum.class, enumType)) {
BaseEnum<Integer, String> baseEnum = (BaseEnum<Integer, String>)enumConstant;
BaseEnum<Integer> baseEnum = (BaseEnum<Integer>)enumConstant;
if (baseEnum.getDescription().equals(description)) {
return baseEnum;
}

5
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CacheConsts.java
View File

@ -53,6 +53,11 @@ public class CacheConsts {
*/
public static final String MENU_KEY_PREFIX = "MENU";
/**
* 字典缓存键前缀
*/
public static final String DICT_KEY_PREFIX = "DICT";
/**
* 仪表盘缓存键前缀
*/

55
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/UIConsts.java Normal file
View File

@ -0,0 +1,55 @@
/*
* Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package top.charles7c.cnadmin.common.constant;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
/**
* UI 相关常量
*
* @author Charles7c
* @since 2023/9/17 14:12
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class UIConsts {
/**
* 主色（极致蓝）
*/
public static final String COLOR_PRIMARY = "arcoblue";
/**
* 成功色（仙野绿）
*/
public static final String COLOR_SUCCESS = "green";
/**
* 警告色（活力橙）
*/
public static final String COLOR_WARNING = "orangered";
/**
* 错误色（浪漫红）
*/
public static final String COLOR_ERROR = "red";
/**
* 默认色（中性灰）
*/
public static final String COLOR_DEFAULT = "gray";
}

6
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DataScopeEnum.java
View File

@ -29,7 +29,7 @@ import top.charles7c.cnadmin.common.base.BaseEnum;
*/
@Getter
@RequiredArgsConstructor
public enum DataScopeEnum implements BaseEnum<Integer, String> {
public enum DataScopeEnum implements BaseEnum<Integer> {
/** 全部数据权限 */
ALL(1, "全部数据权限"),
@ -43,8 +43,8 @@ public enum DataScopeEnum implements BaseEnum<Integer, String> {
/** 仅本人数据权限 */
SELF(4, "仅本人数据权限"),
/** 自定数据权限 */
CUSTOM(5, "自定数据权限"),;
/** 自定义数据权限 */
CUSTOM(5, "自定义数据权限"),;
private final Integer value;
private final String description;

8
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DataTypeEnum.java
View File

@ -20,6 +20,7 @@ import lombok.Getter;
import lombok.RequiredArgsConstructor;
import top.charles7c.cnadmin.common.base.BaseEnum;
import top.charles7c.cnadmin.common.constant.UIConsts;
/**
* 数据类型枚举
@ -29,14 +30,15 @@ import top.charles7c.cnadmin.common.base.BaseEnum;
*/
@Getter
@RequiredArgsConstructor
public enum DataTypeEnum implements BaseEnum<Integer, String> {
public enum DataTypeEnum implements BaseEnum<Integer> {
/** 系统内置 */
SYSTEM(1, "系统内置"),
SYSTEM(1, "系统内置", UIConsts.COLOR_ERROR),
/** 自定义 */
CUSTOM(2, "自定义"),;
CUSTOM(2, "自定义", UIConsts.COLOR_PRIMARY),;
private final Integer value;
private final String description;
private final String color;
}

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DisEnableStatusEnum.java
View File

@ -29,7 +29,7 @@ import top.charles7c.cnadmin.common.base.BaseEnum;
*/
@Getter
@RequiredArgsConstructor
public enum DisEnableStatusEnum implements BaseEnum<Integer, String> {
public enum DisEnableStatusEnum implements BaseEnum<Integer> {
/** 启用 */
ENABLE(1, "启用"),

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/GenderEnum.java
View File

@ -29,7 +29,7 @@ import top.charles7c.cnadmin.common.base.BaseEnum;
*/
@Getter
@RequiredArgsConstructor
public enum GenderEnum implements BaseEnum<Integer, String> {
public enum GenderEnum implements BaseEnum<Integer> {
/** 未知 */
UNKNOWN(0, "未知"),

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/MenuTypeEnum.java
View File

@ -29,7 +29,7 @@ import top.charles7c.cnadmin.common.base.BaseEnum;
*/
@Getter
@RequiredArgsConstructor
public enum MenuTypeEnum implements BaseEnum<Integer, String> {
public enum MenuTypeEnum implements BaseEnum<Integer> {
/** 目录 */
DIR(1, "目录"),

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/QueryTypeEnum.java
View File

@ -29,7 +29,7 @@ import top.charles7c.cnadmin.common.base.BaseEnum;
*/
@Getter
@RequiredArgsConstructor
public enum QueryTypeEnum implements BaseEnum<Integer, String> {
public enum QueryTypeEnum implements BaseEnum<Integer> {
/**
* 等值查询，例如：WHERE `age` = 18

8
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/SuccessFailureStatusEnum.java
View File

@ -20,6 +20,7 @@ import lombok.Getter;
import lombok.RequiredArgsConstructor;
import top.charles7c.cnadmin.common.base.BaseEnum;
import top.charles7c.cnadmin.common.constant.UIConsts;
/**
* 成功/失败状态枚举
@ -29,14 +30,15 @@ import top.charles7c.cnadmin.common.base.BaseEnum;
*/
@Getter
@RequiredArgsConstructor
public enum SuccessFailureStatusEnum implements BaseEnum<Integer, String> {
public enum SuccessFailureStatusEnum implements BaseEnum<Integer> {
/** 成功 */
SUCCESS(1, "成功"),
SUCCESS(1, "成功", UIConsts.COLOR_SUCCESS),
/** 失败 */
FAILURE(2, "失败"),;
FAILURE(2, "失败", UIConsts.COLOR_ERROR),;
private final Integer value;
private final String description;
private final String color;
}

2
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/enums/LogStatusEnum.java
View File

@ -29,7 +29,7 @@ import top.charles7c.cnadmin.common.base.BaseEnum;
*/
@Getter
@RequiredArgsConstructor
public enum LogStatusEnum implements BaseEnum<Integer, String> {
public enum LogStatusEnum implements BaseEnum<Integer> {
/** 成功 */
SUCCESS(1, "成功"),

18
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/enums/AnnouncementTypeEnum.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/enums/AnnouncementStatusEnum.java
View File

@ -20,26 +20,28 @@ import lombok.Getter;
import lombok.RequiredArgsConstructor;
import top.charles7c.cnadmin.common.base.BaseEnum;
import top.charles7c.cnadmin.common.constant.UIConsts;
/**
* 公告类型枚举（计划 v1.2.0 增加字典管理，用于维护此类信息）
* 公告状态枚举
*
* @author Charles7c
* @since 2023/8/20 10:55
*/
@Getter
@RequiredArgsConstructor
public enum AnnouncementTypeEnum implements BaseEnum<Integer, String> {
public enum AnnouncementStatusEnum implements BaseEnum<Integer> {
/** 活动 */
ACTIVITY(1, "活动"),
/** 待发布 */
PENDING_RELEASE(1, "待发布", UIConsts.COLOR_PRIMARY),
/** 消息 */
MESSAGE(2, "消息"),
/** 已发布 */
PUBLISHED(2, "已发布", UIConsts.COLOR_SUCCESS),
/** 通知 */
NOTICE(3, "通知"),;
/** 已过期 */
EXPIRED(3, "已过期", UIConsts.COLOR_ERROR),;
private final Integer value;
private final String description;
private final String color;
}

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/AnnouncementQuery.java
View File

@ -45,9 +45,9 @@ public class AnnouncementQuery implements Serializable {
private String title;
/**
* 类型（1：活动，2：消息，3：通知）
* 类型
*/
@Schema(description = "类型（1：活动，2：消息，3：通知）", example = "1")
@Schema(description = "类型", example = "1")
@Query(type = QueryTypeEnum.EQUAL)
private Integer type;
private String type;
}

12
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java
View File

@ -23,6 +23,7 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.charles7c.cnadmin.common.base.BaseVO;
import top.charles7c.cnadmin.system.enums.AnnouncementStatusEnum;
/**
* 公告信息
@ -65,15 +66,14 @@ public class AnnouncementVO extends BaseVO {
*
* @return 公告状态
*/
@Schema(description = "状态（1：待发布，2：已发布，3：已过期）", example = "1")
public Integer getStatus() {
int status = 2;
@Schema(description = "状态（1：待发布，2：已发布，3：已过期）", type = "Integer", allowableValues = {"1", "2", "3"}, example = "1")
public AnnouncementStatusEnum getStatus() {
if (null != this.effectiveTime && this.effectiveTime.isAfter(LocalDateTime.now())) {
status = 1;
return AnnouncementStatusEnum.PENDING_RELEASE;
}
if (null != this.terminateTime && this.terminateTime.isBefore(LocalDateTime.now())) {
status = 3;
return AnnouncementStatusEnum.EXPIRED;
}
return status;
return AnnouncementStatusEnum.PUBLISHED;
}
}

8
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DashboardAnnouncementVO.java
View File

@ -22,8 +22,6 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.charles7c.cnadmin.system.enums.AnnouncementTypeEnum;
/**
* 仪表盘-公告信息
*
@ -49,8 +47,8 @@ public class DashboardAnnouncementVO implements Serializable {
private String title;
/**
* 类型
* 类型（取值于字典 announcement_type）
*/
@Schema(description = "类型", type = "Integer", allowableValues = {"1", "2", "3"}, example = "1")
private AnnouncementTypeEnum type;
@Schema(description = "类型（取值于字典 announcement_type）", example = "1")
private String type;
}

7
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DictItemServiceImpl.java
View File

@ -20,10 +20,13 @@ import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import top.charles7c.cnadmin.common.base.BaseServiceImpl;
import top.charles7c.cnadmin.common.constant.CacheConsts;
import top.charles7c.cnadmin.common.model.query.SortQuery;
import top.charles7c.cnadmin.common.model.vo.LabelValueVO;
import top.charles7c.cnadmin.common.util.validate.CheckUtils;
@ -43,11 +46,13 @@ import top.charles7c.cnadmin.system.service.DictItemService;
*/
@Service
@RequiredArgsConstructor
@CacheConfig(cacheNames = CacheConsts.DICT_KEY_PREFIX)
public class DictItemServiceImpl
extends BaseServiceImpl<DictItemMapper, DictItemDO, DictItemVO, DictItemDetailVO, DictItemQuery, DictItemRequest>
implements DictItemService {
@Override
@CacheEvict(allEntries = true)
@Transactional(rollbackFor = Exception.class)
public Long add(DictItemRequest request) {
String value = request.getValue();
@ -56,6 +61,7 @@ public class DictItemServiceImpl
}
@Override
@CacheEvict(allEntries = true)
@Transactional(rollbackFor = Exception.class)
public void update(DictItemRequest request, Long id) {
String value = request.getValue();
@ -80,6 +86,7 @@ public class DictItemServiceImpl
}
@Override
@CacheEvict(allEntries = true)
public void deleteByDictIds(List<Long> dictIds) {
baseMapper.lambdaUpdate().in(DictItemDO::getDictId, dictIds).remove();
}

2
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/enums/FormTypeEnum.java
View File

@ -29,7 +29,7 @@ import top.charles7c.cnadmin.common.base.BaseEnum;
*/
@Getter
@RequiredArgsConstructor
public enum FormTypeEnum implements BaseEnum<Integer, String> {
public enum FormTypeEnum implements BaseEnum<Integer> {
/**
* 文本框

4
continew-admin-ui/src/api/common/index.ts
View File

@ -35,10 +35,6 @@ export function listRoleDict(params: RoleParam) {
});
}
export function listEnumDict(enumTypeName: string) {
return axios.get<LabelValueState[]>(`${BASE_URL}/dict/enum/${enumTypeName}`);
}
export function listDict(code: string) {
return axios.get<LabelValueState[]>(`${BASE_URL}/dict/${code}`);
}

20
continew-admin-ui/src/store/modules/dict/index.ts
View File

@ -5,32 +5,32 @@ const useDictStore = defineStore('dict', {
state: () => ({ dict: [] as Array<DictState> }),
actions: {
// 获取字典
getDict(_name: string) {
if (_name == null || _name === '') {
getDict(_code: string) {
if (_code == null || _code === '') {
return null;
}
for (let i = 0; i < this.dict.length; i += 1) {
if (this.dict[i].name === _name) {
return this.dict[i].detail;
if (this.dict[i].code === _code) {
return this.dict[i].items;
}
}
return null;
},
// 设置字典
setDict(_name: string, detail: Array<LabelValueState>) {
if (_name !== null && _name !== '') {
setDict(_code: string, items: Array<LabelValueState>) {
if (_code !== null && _code !== '') {
this.dict.push({
name: _name,
detail,
code: _code,
items,
});
}
},
// 删除字典
deleteDict(_name: string) {
deleteDict(_code: string) {
let bln = false;
try {
for (let i = 0; i < this.dict.length; i += 1) {
if (this.dict[i].name === _name) {
if (this.dict[i].code === _code) {
this.dict.splice(i, 1);
return true;
}

4
continew-admin-ui/src/store/modules/dict/types.ts
View File

@ -5,6 +5,6 @@ export interface LabelValueState {
}
export interface DictState {
name: string;
detail: Array<LabelValueState>;
code: string;
items: Array<LabelValueState>;
}

28
continew-admin-ui/src/utils/dict.ts
View File

@ -1,32 +1,24 @@
import { ref, toRefs } from 'vue';
import { listEnumDict, listDict } from '@/api/common';
import { listDict } from '@/api/common';
import { useDictStore } from '@/store';
/**
* 获取字典数据
*
* @param dicts 字典列表
* @param codes 字典编码列表
*/
export default function useDict(
...dicts: Array<{ name: string; isEnum: boolean }>
) {
export default function useDict(...codes: Array<string>) {
const res = ref<any>({});
return (() => {
dicts.forEach((d) => {
const { name } = d;
res.value[name] = [];
const dict = useDictStore().getDict(name);
codes.forEach((code) => {
res.value[code] = [];
const dict = useDictStore().getDict(code);
if (dict) {
res.value[name] = dict;
} else if (d.isEnum) {
listEnumDict(name).then((resp) => {
res.value[name] = resp.data;
useDictStore().setDict(name, res.value[name]);
});
res.value[code] = dict;
} else {
listDict(name).then((resp) => {
res.value[name] = resp.data;
useDictStore().setDict(name, res.value[name]);
listDict(code).then((resp) => {
res.value[code] = resp.data;
useDictStore().setDict(code, res.value[code]);
});
}
});

7
continew-admin-ui/src/views/dashboard/workplace/components/announcement.vue
View File

@ -13,7 +13,7 @@
<div>
<a-empty v-if="dataList.length === 0">暂无公告</a-empty>
<div v-for="(item, idx) in dataList" :key="idx" class="item">
<dict-tag :dict="announcement_type" :value="item.type" />
<dict-tag :value="item.type" :dict="announcement_type" />
<span class="item-content">
<a-link @click="toDetail(item.id)">{{ item.title }}</a-link>
</span>
@ -88,10 +88,7 @@
import { DataRecord, get } from '@/api/system/announcement';
const { proxy } = getCurrentInstance() as any;
const { announcement_type } = proxy.useDict({
name: 'announcement_type',
isEnum: false,
});
const { announcement_type } = proxy.useDict('announcement_type');
const dataList = ref<DashboardAnnouncementRecord[]>([]);
const dataDetail = ref<DataRecord>({});

9
continew-admin-ui/src/views/monitor/log/login/index.vue
View File

@ -10,7 +10,7 @@
<a-form-item field="status" hide-label>
<a-select
v-model="queryParams.status"
:options="SuccessFailureStatusEnum"
:options="success_failure_status_enum"
placeholder="登录状态搜索"
allow-clear
style="width: 150px"
@ -91,10 +91,9 @@
} from '@/api/monitor/log';
const { proxy } = getCurrentInstance() as any;
const { SuccessFailureStatusEnum } = proxy.useDict({
name: 'SuccessFailureStatusEnum',
isEnum: true,
});
const { success_failure_status_enum } = proxy.useDict(
'success_failure_status_enum'
);
const loginLogList = ref<LoginLogRecord[]>([]);
const total = ref(0);

9
continew-admin-ui/src/views/monitor/log/operation/index.vue
View File

@ -19,7 +19,7 @@
<a-form-item field="status" hide-label>
<a-select
v-model="queryParams.status"
:options="SuccessFailureStatusEnum"
:options="success_failure_status_enum"
placeholder="操作状态搜索"
allow-clear
style="width: 150px"
@ -101,10 +101,9 @@
} from '@/api/monitor/log';
const { proxy } = getCurrentInstance() as any;
const { SuccessFailureStatusEnum } = proxy.useDict({
name: 'SuccessFailureStatusEnum',
isEnum: true,
});
const { success_failure_status_enum } = proxy.useDict(
'success_failure_status_enum'
);
const operationLogList = ref<OperationLogRecord[]>([]);
const total = ref(0);

19
continew-admin-ui/src/views/system/announcement/index.vue
View File

@ -128,16 +128,15 @@
</a-table-column>
<a-table-column title="类型" align="center">
<template #cell="{ record }">
<dict-tag :dict="announcement_type" :value="record.type" />
<dict-tag :value="record.type" :dict="announcement_type" />
</template>
</a-table-column>
<a-table-column title="状态" align="center">
<template #cell="{ record }">
<a-tag v-if="record.status === 1" color="blue">待发布</a-tag>
<a-tag v-else-if="record.status === 2" color="green"
>已发布</a-tag
>
<a-tag v-else color="red">已过期</a-tag>
<dict-tag
:value="record.status"
:dict="announcement_status_enum"
/>
</template>
</a-table-column>
<a-table-column title="生效时间">
@ -354,10 +353,10 @@
import checkPermission from '@/utils/permission';
const { proxy } = getCurrentInstance() as any;
const { announcement_type } = proxy.useDict({
name: 'announcement_type',
isEnum: false,
});
const { announcement_type, announcement_status_enum } = proxy.useDict(
'announcement_type',
'announcement_status_enum'
);
const dataList = ref<DataRecord[]>([]);
const dataDetail = ref<DataRecord>({

7
continew-admin-ui/src/views/system/dept/index.vue
View File

@ -19,7 +19,7 @@
<a-form-item field="status" hide-label>
<a-select
v-model="queryParams.status"
:options="DisEnableStatusEnum"
:options="dis_enable_status_enum"
placeholder="状态搜索"
allow-clear
style="width: 150px"
@ -316,10 +316,7 @@
import checkPermission from '@/utils/permission';
const { proxy } = getCurrentInstance() as any;
const { DisEnableStatusEnum } = proxy.useDict({
name: 'DisEnableStatusEnum',
isEnum: true,
});
const { dis_enable_status_enum } = proxy.useDict('dis_enable_status_enum');
const dataList = ref<DataRecord[]>([]);
const dataDetail = ref<DataRecord>({

22
continew-admin-ui/src/views/system/dict/item.vue
View File

@ -44,7 +44,7 @@
<template #columns>
<a-table-column title="字典标签" align="center">
<template #cell="{ record }">
<dict-tag :dict="dataList" :value="record.value" />
<dict-tag :value="record.value" :dict="dataList" />
</template>
</a-table-column>
<a-table-column title="字典值" align="center" data-index="value" />
@ -115,20 +115,20 @@
placeholder="请选择或输入背景颜色"
allow-clear
>
<template #option="{ record }">
<a-tag v-if="record.value === 'primary'" color="arcoblue">{{
record.value
<template #option="{ data }">
<a-tag v-if="data.value === 'primary'" color="arcoblue">{{
data.value
}}</a-tag>
<a-tag v-else-if="record.value === 'success'" color="green">{{
record.value
<a-tag v-else-if="data.value === 'success'" color="green">{{
data.value
}}</a-tag>
<a-tag v-else-if="record.value === 'warning'" color="orangered">{{
record.value
<a-tag v-else-if="data.value === 'warning'" color="orangered">{{
data.value
}}</a-tag>
<a-tag v-else-if="record.value === 'error'" color="red">{{
record.value
<a-tag v-else-if="data.value === 'error'" color="red">{{
data.value
}}</a-tag>
<a-tag v-else color="gray">{{ record.value }}</a-tag>
<a-tag v-else color="gray">{{ data.value }}</a-tag>
</template>
<template #suffix>
<color-picker v-model:pureColor="form.color" shape="circle" />

7
continew-admin-ui/src/views/system/menu/index.vue
View File

@ -19,7 +19,7 @@
<a-form-item field="status" hide-label>
<a-select
v-model="queryParams.status"
:options="DisEnableStatusEnum"
:options="dis_enable_status_enum"
placeholder="状态搜索"
allow-clear
style="width: 150px"
@ -355,10 +355,7 @@
import checkPermission from '@/utils/permission';
const { proxy } = getCurrentInstance() as any;
const { DisEnableStatusEnum } = proxy.useDict({
name: 'DisEnableStatusEnum',
isEnum: true,
});
const { dis_enable_status_enum } = proxy.useDict('dis_enable_status_enum');
const dataList = ref<DataRecord[]>([]);
const ids = ref<Array<string>>([]);

39
continew-admin-ui/src/views/system/role/index.vue
View File

@ -19,7 +19,7 @@
<a-form-item field="status" hide-label>
<a-select
v-model="queryParams.status"
:options="DisEnableStatusEnum"
:options="dis_enable_status_enum"
placeholder="状态搜索"
allow-clear
style="width: 150px"
@ -125,13 +125,7 @@
<a-table-column title="角色编码" data-index="code" />
<a-table-column title="数据权限" :width="130">
<template #cell="{ record }">
<span v-if="record.dataScope === 1">全部数据权限</span>
<span v-else-if="record.dataScope === 2"
>本部门及以下数据权限</span
>
<span v-else-if="record.dataScope === 3">本部门数据权限</span>
<span v-else-if="record.dataScope === 4">仅本人数据权限</span>
<span v-else>自定义数据权限</span>
<dict-tag :value="record.dataScope" :dict="data_scope_enum" />
</template>
</a-table-column>
<a-table-column title="角色排序" align="center" data-index="sort" />
@ -282,7 +276,7 @@
>
<a-select
v-model="form.dataScope"
:options="DataScopeEnum"
:options="data_scope_enum"
placeholder="请选择数据权限"
/>
</a-form-item>
@ -359,17 +353,10 @@
<a-skeleton-line :rows="1" />
</a-skeleton>
<span v-else>
<span v-if="dataDetail.dataScope === 1">全部数据权限</span>
<span v-else-if="dataDetail.dataScope === 2"
>本部门及以下数据权限</span
>
<span v-else-if="dataDetail.dataScope === 3"
>本部门数据权限</span
>
<span v-else-if="dataDetail.dataScope === 4"
>仅本人数据权限</span
>
<span v-else>自定义数据权限</span>
<dict-tag
:value="dataDetail.dataScope"
:dict="data_scope_enum"
/>
</span>
</a-descriptions-item>
<a-descriptions-item label="创建人">
@ -448,15 +435,9 @@
import checkPermission from '@/utils/permission';
const { proxy } = getCurrentInstance() as any;
const { DataScopeEnum, DisEnableStatusEnum } = proxy.useDict(
{
name: 'DataScopeEnum',
isEnum: true,
},
{
name: 'DisEnableStatusEnum',
isEnum: true,
}
const { data_scope_enum, dis_enable_status_enum } = proxy.useDict(
'data_scope_enum',
'dis_enable_status_enum'
);
const dataList = ref<DataRecord[]>([]);

7
continew-admin-ui/src/views/system/user/index.vue
View File

@ -43,7 +43,7 @@
<a-form-item field="status" hide-label>
<a-select
v-model="queryParams.status"
:options="DisEnableStatusEnum"
:options="dis_enable_status_enum"
placeholder="状态搜索"
allow-clear
style="width: 150px"
@ -523,10 +523,7 @@
import checkPermission from '@/utils/permission';
const { proxy } = getCurrentInstance() as any;
const { DisEnableStatusEnum } = proxy.useDict({
name: 'DisEnableStatusEnum',
isEnum: true,
});
const { dis_enable_status_enum } = proxy.useDict('dis_enable_status_enum');
const dataList = ref<DataRecord[]>([]);
const dataDetail = ref<DataRecord>({

16
continew-admin-ui/src/views/tool/generator/index.vue
View File

@ -211,7 +211,7 @@
<a-select
v-if="record.showInForm || record.showInQuery"
v-model="record.formType"
:options="FormTypeEnum"
:options="form_type_enum"
placeholder="请选择表单类型"
/>
<span v-else>无需设置</span>
@ -222,7 +222,7 @@
<a-select
v-if="record.showInQuery"
v-model="record.queryType"
:options="QueryTypeEnum"
:options="query_type_Enum"
placeholder="请选择查询方式"
/>
<span v-else>无需设置</span>
@ -301,15 +301,9 @@
} from '@/api/tool/generator';
const { proxy } = getCurrentInstance() as any;
const { FormTypeEnum, QueryTypeEnum } = proxy.useDict(
{
name: 'DisEnableStatusEnum',
isEnum: true,
},
{
name: 'QueryTypeEnum',
isEnum: true,
}
const { form_type_enum, query_type_Enum } = proxy.useDict(
'form_type_enum',
'query_type_Enum'
);
const tableList = ref<TableRecord[]>([]);

59
continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java
View File

@ -29,6 +29,7 @@ import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.enums.ParameterIn;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@ -37,9 +38,11 @@ import org.springframework.web.bind.annotation.RestController;
import cn.hutool.core.lang.tree.Tree;
import cn.hutool.core.util.ClassUtil;
import cn.hutool.core.util.StrUtil;
import top.charles7c.cnadmin.common.base.BaseEnum;
import top.charles7c.cnadmin.common.config.properties.ProjectProperties;
import top.charles7c.cnadmin.common.constant.CacheConsts;
import top.charles7c.cnadmin.common.model.query.SortQuery;
import top.charles7c.cnadmin.common.model.vo.LabelValueVO;
import top.charles7c.cnadmin.common.model.vo.R;
@ -92,31 +95,43 @@ public class CommonController {
return R.ok(labelValueVOList);
}
@Operation(summary = "查询枚举字典", description = "查询枚举字典列表")
@Parameter(name = "enumTypeName", description = "枚举类型名称", example = "DataScopeEnum", in = ParameterIn.PATH)
@GetMapping("/dict/enum/{enumTypeName}")
public R<List<LabelValueVO>> listEnumDict(@PathVariable String enumTypeName) {
// 扫描所有 BaseEnum 枚举基类的子类
Set<Class<?>> classSet = ClassUtil.scanPackageBySuper(projectProperties.getBasePackage(), BaseEnum.class);
Optional<Class<?>> first =
classSet.stream().filter(c -> c.getSimpleName().equalsIgnoreCase(enumTypeName)).findFirst();
if (!first.isPresent()) {
return R.fail("枚举字典不存在");
}
// 转换枚举为字典列表
Class<?> enumClass = first.get();
Object[] enumConstants = enumClass.getEnumConstants();
List<LabelValueVO> labelValueVOList = Arrays.stream(enumConstants).map(e -> {
BaseEnum<Integer, String> baseEnum = (BaseEnum<Integer, String>)e;
return new LabelValueVO<>(baseEnum.getDescription(), baseEnum.getValue());
}).collect(Collectors.toList());
return R.ok(labelValueVOList);
}
@Operation(summary = "查询字典", description = "查询字典列表")
@Parameter(name = "code", description = "字典编码", example = "announcement_type", in = ParameterIn.PATH)
@GetMapping("/dict/{code}")
@Cacheable(key = "#code", cacheNames = CacheConsts.DICT_KEY_PREFIX)
public R<List<LabelValueVO>> listDict(@PathVariable String code) {
return R.ok(dictItemService.listByDictCode(code));
Optional<Class<?>> enumClass = this.getEnumClassByName(code);
return enumClass.map(this::listEnumDict).orElseGet(() -> R.ok(dictItemService.listByDictCode(code)));
}
/**
* 根据枚举类名查询
*
* @param enumClassName
* 枚举类名
* @return 枚举类型
*/
private Optional<Class<?>> getEnumClassByName(String enumClassName) {
Set<Class<?>> classSet = ClassUtil.scanPackageBySuper(projectProperties.getBasePackage(), BaseEnum.class);
return classSet.stream()
.filter(
c -> StrUtil.equalsAnyIgnoreCase(c.getSimpleName(), enumClassName, StrUtil.toCamelCase(enumClassName)))
.findFirst();
}
/**
* 查询枚举字典
*
* @param enumClass
* 枚举类型
* @return 枚举字典
*/
private R<List<LabelValueVO>> listEnumDict(Class<?> enumClass) {
Object[] enumConstants = enumClass.getEnumConstants();
List<LabelValueVO> labelValueList = Arrays.stream(enumConstants).map(e -> {
BaseEnum<Integer> baseEnum = (BaseEnum<Integer>)e;
return new LabelValueVO<>(baseEnum.getDescription(), baseEnum.getValue(), baseEnum.getColor());
}).collect(Collectors.toList());
return R.ok(labelValueList);
}
}