From 197714e8456f30dc1c36d90c0f0c8024b273a6ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Fri, 1 Dec 2023 17:31:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.修复settings中上传文件的bug;
2.优化字典展示
---
 web/src/settings.ts         |  1 +
 web/src/utils/dictionary.ts | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

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]
+  }
+}