diff --git a/web/src/settings.ts b/web/src/settings.ts index b43526e..7426ad1 100644 --- a/web/src/settings.ts +++ b/web/src/settings.ts @@ -3,6 +3,7 @@ import { FastCrud, useTypes } from '@fast-crud/fast-crud'; const { getType } = useTypes(); import '@fast-crud/fast-crud/dist/style.css'; import { setLogger } from '@fast-crud/fast-crud'; +import { getBaseURL } from '/@/utils/baseUrl'; // element import ui from '@fast-crud/ui-element'; import { request } from '/@/utils/service'; diff --git a/web/src/utils/dictionary.ts b/web/src/utils/dictionary.ts index e35a205..bdf9826 100644 --- a/web/src/utils/dictionary.ts +++ b/web/src/utils/dictionary.ts @@ -1,11 +1,16 @@ import { toRaw } from 'vue'; import { DictionaryStore } from '/@/stores/dictionary'; -/** - * @method 获取指定name字典 +/** + * @method 获取指定name字典 */ -export const dictionary = (name: string) => { +export const dictionary = (name: string,key:string|number|undefined) => { const dict = DictionaryStore() const dictionary = toRaw(dict.data) - return dictionary[name] -} \ No newline at end of file + if(key!=undefined){ + const obj = dictionary[name].find((item:any) => item.value === key) + return obj?obj.label:'' + }else{ + return dictionary[name] + } +}