diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseEnum.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseEnum.java index 06f7bcc5..4fa14427 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseEnum.java @@ -30,12 +30,21 @@ import com.baomidou.mybatisplus.annotation.IEnum; * @author Charles7c * @since 2023/2/5 20:44 */ -public interface BaseEnum extends IEnum { +public interface BaseEnum extends IEnum { /** * 枚举描述 * * @return 枚举描述 */ - D getDescription(); + String getDescription(); + + /** + * 颜色 + * + * @return 颜色 + */ + default String getColor() { + return null; + } } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/easyexcel/ExcelBaseEnumConverter.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/easyexcel/ExcelBaseEnumConverter.java index e000622b..a73dff63 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/easyexcel/ExcelBaseEnumConverter.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/easyexcel/ExcelBaseEnumConverter.java @@ -35,7 +35,7 @@ import top.charles7c.cnadmin.common.constant.StringConsts; * @author Charles7c * @since 2023/2/5 19:29 */ -public class ExcelBaseEnumConverter implements Converter> { +public class ExcelBaseEnumConverter implements Converter> { @Override public Class supportJavaTypeKey() { @@ -60,8 +60,8 @@ public class ExcelBaseEnumConverter implements Converter convertToExcelData(BaseEnum value, - ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { + public WriteCellData convertToExcelData(BaseEnum value, ExcelContentProperty contentProperty, + GlobalConfiguration globalConfiguration) { if (null == value) { return new WriteCellData<>(StringConsts.EMPTY); } @@ -77,11 +77,11 @@ public class ExcelBaseEnumConverter implements Converter getEnum(Class enumType, String description) { + private BaseEnum getEnum(Class enumType, String description) { Object[] enumConstants = enumType.getEnumConstants(); for (Object enumConstant : enumConstants) { if (ClassUtil.isAssignable(BaseEnum.class, enumType)) { - BaseEnum baseEnum = (BaseEnum)enumConstant; + BaseEnum baseEnum = (BaseEnum)enumConstant; if (baseEnum.getDescription().equals(description)) { return baseEnum; } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CacheConsts.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CacheConsts.java index b5ad4459..a49a34e2 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CacheConsts.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CacheConsts.java @@ -53,6 +53,11 @@ public class CacheConsts { */ public static final String MENU_KEY_PREFIX = "MENU"; + /** + * 字典缓存键前缀 + */ + public static final String DICT_KEY_PREFIX = "DICT"; + /** * 仪表盘缓存键前缀 */ diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/UIConsts.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/UIConsts.java new file mode 100644 index 00000000..e72e6d4c --- /dev/null +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/UIConsts.java @@ -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"; +} \ No newline at end of file diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DataScopeEnum.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DataScopeEnum.java index 37d210d5..88077dcc 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DataScopeEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DataScopeEnum.java @@ -29,7 +29,7 @@ import top.charles7c.cnadmin.common.base.BaseEnum; */ @Getter @RequiredArgsConstructor -public enum DataScopeEnum implements BaseEnum { +public enum DataScopeEnum implements BaseEnum { /** 全部数据权限 */ ALL(1, "全部数据权限"), @@ -43,8 +43,8 @@ public enum DataScopeEnum implements BaseEnum { /** 仅本人数据权限 */ SELF(4, "仅本人数据权限"), - /** 自定数据权限 */ - CUSTOM(5, "自定数据权限"),; + /** 自定义数据权限 */ + CUSTOM(5, "自定义数据权限"),; private final Integer value; private final String description; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DataTypeEnum.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DataTypeEnum.java index e5eadaa1..591e277e 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DataTypeEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DataTypeEnum.java @@ -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 { +public enum DataTypeEnum implements BaseEnum { /** 系统内置 */ - 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; } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DisEnableStatusEnum.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DisEnableStatusEnum.java index aadf9355..f1cbdf0c 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DisEnableStatusEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DisEnableStatusEnum.java @@ -29,7 +29,7 @@ import top.charles7c.cnadmin.common.base.BaseEnum; */ @Getter @RequiredArgsConstructor -public enum DisEnableStatusEnum implements BaseEnum { +public enum DisEnableStatusEnum implements BaseEnum { /** 启用 */ ENABLE(1, "启用"), diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/GenderEnum.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/GenderEnum.java index 86839d6a..2faed158 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/GenderEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/GenderEnum.java @@ -29,7 +29,7 @@ import top.charles7c.cnadmin.common.base.BaseEnum; */ @Getter @RequiredArgsConstructor -public enum GenderEnum implements BaseEnum { +public enum GenderEnum implements BaseEnum { /** 未知 */ UNKNOWN(0, "未知"), diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/MenuTypeEnum.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/MenuTypeEnum.java index d72207e8..634f9b24 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/MenuTypeEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/MenuTypeEnum.java @@ -29,7 +29,7 @@ import top.charles7c.cnadmin.common.base.BaseEnum; */ @Getter @RequiredArgsConstructor -public enum MenuTypeEnum implements BaseEnum { +public enum MenuTypeEnum implements BaseEnum { /** 目录 */ DIR(1, "目录"), diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/QueryTypeEnum.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/QueryTypeEnum.java index 03048843..5a69c1cc 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/QueryTypeEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/QueryTypeEnum.java @@ -29,7 +29,7 @@ import top.charles7c.cnadmin.common.base.BaseEnum; */ @Getter @RequiredArgsConstructor -public enum QueryTypeEnum implements BaseEnum { +public enum QueryTypeEnum implements BaseEnum { /** * 等值查询，例如：WHERE `age` = 18 diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/SuccessFailureStatusEnum.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/SuccessFailureStatusEnum.java index fcd31236..5f12a913 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/SuccessFailureStatusEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/SuccessFailureStatusEnum.java @@ -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 { +public enum SuccessFailureStatusEnum implements BaseEnum { /** 成功 */ - 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; } diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/enums/LogStatusEnum.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/enums/LogStatusEnum.java index 13bc1147..eb6a9448 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/enums/LogStatusEnum.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/enums/LogStatusEnum.java @@ -29,7 +29,7 @@ import top.charles7c.cnadmin.common.base.BaseEnum; */ @Getter @RequiredArgsConstructor -public enum LogStatusEnum implements BaseEnum { +public enum LogStatusEnum implements BaseEnum { /** 成功 */ SUCCESS(1, "成功"), diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/enums/AnnouncementTypeEnum.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/enums/AnnouncementStatusEnum.java similarity index 70% rename from continew-admin-system/src/main/java/top/charles7c/cnadmin/system/enums/AnnouncementTypeEnum.java rename to continew-admin-system/src/main/java/top/charles7c/cnadmin/system/enums/AnnouncementStatusEnum.java index 13876519..1dad2fd1 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/enums/AnnouncementTypeEnum.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/enums/AnnouncementStatusEnum.java @@ -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 { +public enum AnnouncementStatusEnum implements BaseEnum { - /** 活动 */ - 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; } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/AnnouncementQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/AnnouncementQuery.java index 582cea78..43ffc1ec 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/AnnouncementQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/AnnouncementQuery.java @@ -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; } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java index 560ddcfd..69e0f6bd 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java @@ -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; } } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DashboardAnnouncementVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DashboardAnnouncementVO.java index 583b38b2..5be7272f 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DashboardAnnouncementVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DashboardAnnouncementVO.java @@ -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; } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DictItemServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DictItemServiceImpl.java index 93117f1c..0c7fadc9 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DictItemServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DictItemServiceImpl.java @@ -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 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 dictIds) { baseMapper.lambdaUpdate().in(DictItemDO::getDictId, dictIds).remove(); } diff --git a/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/enums/FormTypeEnum.java b/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/enums/FormTypeEnum.java index 2bf9439b..72880642 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/enums/FormTypeEnum.java +++ b/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/enums/FormTypeEnum.java @@ -29,7 +29,7 @@ import top.charles7c.cnadmin.common.base.BaseEnum; */ @Getter @RequiredArgsConstructor -public enum FormTypeEnum implements BaseEnum { +public enum FormTypeEnum implements BaseEnum { /** * 文本框 diff --git a/continew-admin-ui/src/api/common/index.ts b/continew-admin-ui/src/api/common/index.ts index 30a8ab1d..9c721b3c 100644 --- a/continew-admin-ui/src/api/common/index.ts +++ b/continew-admin-ui/src/api/common/index.ts @@ -35,10 +35,6 @@ export function listRoleDict(params: RoleParam) { }); } -export function listEnumDict(enumTypeName: string) { - return axios.get(`${BASE_URL}/dict/enum/${enumTypeName}`); -} - export function listDict(code: string) { return axios.get(`${BASE_URL}/dict/${code}`); } diff --git a/continew-admin-ui/src/store/modules/dict/index.ts b/continew-admin-ui/src/store/modules/dict/index.ts index 4efb50fb..dd22445a 100644 --- a/continew-admin-ui/src/store/modules/dict/index.ts +++ b/continew-admin-ui/src/store/modules/dict/index.ts @@ -5,32 +5,32 @@ const useDictStore = defineStore('dict', { state: () => ({ dict: [] as Array }), 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) { - if (_name !== null && _name !== '') { + setDict(_code: string, items: Array) { + 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; } diff --git a/continew-admin-ui/src/store/modules/dict/types.ts b/continew-admin-ui/src/store/modules/dict/types.ts index d2cf5c44..ba4357cc 100644 --- a/continew-admin-ui/src/store/modules/dict/types.ts +++ b/continew-admin-ui/src/store/modules/dict/types.ts @@ -5,6 +5,6 @@ export interface LabelValueState { } export interface DictState { - name: string; - detail: Array; + code: string; + items: Array; } diff --git a/continew-admin-ui/src/utils/dict.ts b/continew-admin-ui/src/utils/dict.ts index cbd1754e..f652d0db 100644 --- a/continew-admin-ui/src/utils/dict.ts +++ b/continew-admin-ui/src/utils/dict.ts @@ -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) { const res = ref({}); 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]); }); } }); diff --git a/continew-admin-ui/src/views/dashboard/workplace/components/announcement.vue b/continew-admin-ui/src/views/dashboard/workplace/components/announcement.vue index c750f264..cd8e9275 100644 --- a/continew-admin-ui/src/views/dashboard/workplace/components/announcement.vue +++ b/continew-admin-ui/src/views/dashboard/workplace/components/announcement.vue @@ -13,7 +13,7 @@
暂无公告
- + {{ item.title }} @@ -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([]); const dataDetail = ref({}); diff --git a/continew-admin-ui/src/views/monitor/log/login/index.vue b/continew-admin-ui/src/views/monitor/log/login/index.vue index 729db5e5..1c365aab 100644 --- a/continew-admin-ui/src/views/monitor/log/login/index.vue +++ b/continew-admin-ui/src/views/monitor/log/login/index.vue @@ -10,7 +10,7 @@ ([]); const total = ref(0); diff --git a/continew-admin-ui/src/views/monitor/log/operation/index.vue b/continew-admin-ui/src/views/monitor/log/operation/index.vue index ee108d86..df9e27ae 100644 --- a/continew-admin-ui/src/views/monitor/log/operation/index.vue +++ b/continew-admin-ui/src/views/monitor/log/operation/index.vue @@ -19,7 +19,7 @@ ([]); const total = ref(0); diff --git a/continew-admin-ui/src/views/system/announcement/index.vue b/continew-admin-ui/src/views/system/announcement/index.vue index e2dec7b1..46b2ff12 100644 --- a/continew-admin-ui/src/views/system/announcement/index.vue +++ b/continew-admin-ui/src/views/system/announcement/index.vue @@ -128,16 +128,15 @@ @@ -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([]); const dataDetail = ref({ diff --git a/continew-admin-ui/src/views/system/dept/index.vue b/continew-admin-ui/src/views/system/dept/index.vue index cae21e69..c8b7bb9a 100644 --- a/continew-admin-ui/src/views/system/dept/index.vue +++ b/continew-admin-ui/src/views/system/dept/index.vue @@ -19,7 +19,7 @@ ([]); const dataDetail = ref({ diff --git a/continew-admin-ui/src/views/system/dict/item.vue b/continew-admin-ui/src/views/system/dict/item.vue index c97dacdf..ea74f64d 100644 --- a/continew-admin-ui/src/views/system/dict/item.vue +++ b/continew-admin-ui/src/views/system/dict/item.vue @@ -44,7 +44,7 @@