diff --git a/src/api/system/dict/data.ts b/src/api/system/dict/data.ts index 87fef0b..f08a95d 100644 --- a/src/api/system/dict/data.ts +++ b/src/api/system/dict/data.ts @@ -1,5 +1,19 @@ import request from '/@/utils/request'; import {ref ,toRefs,ToRefs} from 'vue' +// 根据字典类型查询字典数据信息 +export function getDict(dictType :string,defaultValue?:string):Promise { + let dv = defaultValue??'' + let params ={ + dictType:dictType, + defaultValue:dv + } + return request({ + url: '/api/v1/system/dict/data/getDictData', + method: 'get', + params:params + }) +} + // 根据字典类型查询字典数据信息 export function getDicts(dictType :string,defaultValue?:string):Promise { let dv = defaultValue??'' @@ -14,6 +28,7 @@ export function getDicts(dictType :string,defaultValue?:string):Promise { }) } + /** * 获取字典数据 */ @@ -21,7 +36,7 @@ export function useDict(...args:string[]):ToRefs{ const res:any = ref({}); args.forEach((d:string) => { res.value[d] = []; - getDicts(d).then(resp => { + getDict(d).then(resp => { res.value[d] = resp.data.values.map((p:any) => ({ label: p.value, value: p.key, isDefault: p.isDefault })) }) }) diff --git a/src/views/system/menu/component/editMenu.vue b/src/views/system/menu/component/editMenu.vue index 5600c27..e817728 100644 --- a/src/views/system/menu/component/editMenu.vue +++ b/src/views/system/menu/component/editMenu.vue @@ -85,8 +85,11 @@ - 显示 - 隐藏 + {{ dict.label }} @@ -147,6 +150,10 @@ export default defineComponent({ name: 'systemEditMenu', components: { IconSelector }, props:{ + visibleOptions:{ + type:Array, + default:()=>[], + }, acType:{ type:String, default:()=>'add' diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index fbe7c16..4bddafb 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -76,7 +76,7 @@ - +