From f00fec92878406c0929eacd1df2dd49b92974696 Mon Sep 17 00:00:00 2001 From: xingyu Date: Thu, 8 Jun 2023 11:20:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8E=88=E6=9D=83=E7=B1=BB=E5=9E=8Bbugs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.static | 8 ++++---- src/utils/dict.ts | 2 ++ src/views/system/oauth2/client/client.data.ts | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.env.static b/.env.static index e4bdfca..dca1756 100644 --- a/.env.static +++ b/.env.static @@ -1,5 +1,5 @@ # 资源公共路径,需要以 / 开头和结尾 -VITE_PUBLIC_PATH = /admin-ui-vben/ +VITE_PUBLIC_PATH = / # 是否删除Console.log VITE_DROP_CONSOLE = true @@ -13,12 +13,12 @@ VITE_BUILD_COMPRESS = 'gzip' VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false # 基础页面地址,例如 swagger 等页面 -VITE_GLOB_BASE_URL = "http://localhost:48080" +VITE_GLOB_BASE_URL = "http://api-dashboard.yudao.iocoder.cn" # 接口地址,如果没有跨域问题,直接在这里配置即可 -VITE_GLOB_API_URL = http://localhost:48080/admin-api +VITE_GLOB_API_URL = http://api-dashboard.yudao.iocoder.cn/admin-api # 文件上传地址 可以由nginx做转发或者直接写实际地址 -VITE_GLOB_UPLOAD_URL = http://localhost:48080/admin-api/infra/file/upload +VITE_GLOB_UPLOAD_URL = http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload # 接口地址前缀,有些系统所有接口地址都有前缀,可以在这里统一加,方便切换 VITE_GLOB_API_URL_PREFIX = diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 853d8ba..db3b554 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -15,6 +15,7 @@ export interface DictDataType { dictType: string label: string value: string | number | boolean + key?: any colorType: string cssClass: string } @@ -57,6 +58,7 @@ export function getDictOptions(dictType: string, valueType?: 'string' | 'number' dictOptions.forEach((dict: DictDataType) => { dictOption.push({ ...dict, + key: dict.value, value: valueType === 'string' ? dict.value + '' diff --git a/src/views/system/oauth2/client/client.data.ts b/src/views/system/oauth2/client/client.data.ts index d9d59a5..60e4e18 100644 --- a/src/views/system/oauth2/client/client.data.ts +++ b/src/views/system/oauth2/client/client.data.ts @@ -153,7 +153,7 @@ export const formSchema: FormSchema[] = [ required: true, component: 'Select', componentProps: { - options: getDictOptions(DICT_TYPE.SYSTEM_OAUTH2_GRANT_TYPE), + options: getDictOptions(DICT_TYPE.SYSTEM_OAUTH2_GRANT_TYPE, 'string'), mode: 'multiple' } },