chore: 完善细节问题
This commit is contained in:
parent
7d8929257e
commit
925c0f22e5
@ -1,6 +1,3 @@
|
|||||||
# backend service base url, test environment
|
|
||||||
VITE_SERVICE_BASE_URL=http://127.0.0.1:8080
|
|
||||||
|
|
||||||
VITE_APP_BASE_API=/prod-api
|
VITE_APP_BASE_API=/prod-api
|
||||||
|
|
||||||
# 是否开启 SSE 功能
|
# 是否开启 SSE 功能
|
||||||
|
@ -1,6 +1,3 @@
|
|||||||
# backend service base url, test environment
|
|
||||||
VITE_SERVICE_BASE_URL=http://127.0.0.1:8080
|
|
||||||
|
|
||||||
VITE_APP_BASE_API=/test-api
|
VITE_APP_BASE_API=/test-api
|
||||||
|
|
||||||
# 是否开启 SSE 功能
|
# 是否开启 SSE 功能
|
||||||
|
@ -42,7 +42,8 @@ export function useDownload() {
|
|||||||
body: searchParams,
|
body: searchParams,
|
||||||
headers: {
|
headers: {
|
||||||
Authorization: `Bearer ${token}`,
|
Authorization: `Bearer ${token}`,
|
||||||
Clientid: clientId!
|
Clientid: clientId!,
|
||||||
|
'Content-Type': 'application/octet-stream'
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(async response => {
|
.then(async response => {
|
||||||
@ -69,7 +70,8 @@ export function useDownload() {
|
|||||||
method: 'get',
|
method: 'get',
|
||||||
headers: {
|
headers: {
|
||||||
Authorization: `Bearer ${token}`,
|
Authorization: `Bearer ${token}`,
|
||||||
Clientid: clientId!
|
Clientid: clientId!,
|
||||||
|
'Content-Type': 'application/octet-stream'
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(async response => {
|
.then(async response => {
|
||||||
@ -90,7 +92,8 @@ export function useDownload() {
|
|||||||
method: 'get',
|
method: 'get',
|
||||||
headers: {
|
headers: {
|
||||||
Authorization: `Bearer ${token}`,
|
Authorization: `Bearer ${token}`,
|
||||||
Clientid: clientId!
|
Clientid: clientId!,
|
||||||
|
'Content-Type': 'application/octet-stream'
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(async response => {
|
.then(async response => {
|
||||||
|
@ -55,7 +55,7 @@ export const themeSettings: App.Theme.ThemeSetting = {
|
|||||||
},
|
},
|
||||||
watermark: {
|
watermark: {
|
||||||
visible: false,
|
visible: false,
|
||||||
text: 'SoybeanAdmin'
|
text: 'RuoYi-Vue-Plus'
|
||||||
},
|
},
|
||||||
tokens: {
|
tokens: {
|
||||||
light: {
|
light: {
|
||||||
|
22
src/typings/components.d.ts
vendored
22
src/typings/components.d.ts
vendored
@ -12,12 +12,8 @@ declare module 'vue' {
|
|||||||
BetterScroll: typeof import('./../components/custom/better-scroll.vue')['default']
|
BetterScroll: typeof import('./../components/custom/better-scroll.vue')['default']
|
||||||
BooleanTag: typeof import('./../components/custom/boolean-tag.vue')['default']
|
BooleanTag: typeof import('./../components/custom/boolean-tag.vue')['default']
|
||||||
ButtonIcon: typeof import('./../components/custom/button-icon.vue')['default']
|
ButtonIcon: typeof import('./../components/custom/button-icon.vue')['default']
|
||||||
ButtonPopconfirm: typeof import('./../components/custom/button-popconfirm.vue')['default']
|
|
||||||
CodeMirror: typeof import('./../components/custom/code-mirror.vue')['default']
|
|
||||||
copy: typeof import('./../components/custom/role-select copy.vue')['default']
|
|
||||||
CountTo: typeof import('./../components/custom/count-to.vue')['default']
|
CountTo: typeof import('./../components/custom/count-to.vue')['default']
|
||||||
DarkModeContainer: typeof import('./../components/common/dark-mode-container.vue')['default']
|
DarkModeContainer: typeof import('./../components/common/dark-mode-container.vue')['default']
|
||||||
DeptTreeSelect: typeof import('./../components/custom/dept-tree-select.vue')['default']
|
|
||||||
DictRadio: typeof import('./../components/custom/dict-radio.vue')['default']
|
DictRadio: typeof import('./../components/custom/dict-radio.vue')['default']
|
||||||
DictSelect: typeof import('./../components/custom/dict-select.vue')['default']
|
DictSelect: typeof import('./../components/custom/dict-select.vue')['default']
|
||||||
DictTag: typeof import('./../components/custom/dict-tag.vue')['default']
|
DictTag: typeof import('./../components/custom/dict-tag.vue')['default']
|
||||||
@ -32,7 +28,6 @@ declare module 'vue' {
|
|||||||
IconGridiconsFullscreen: typeof import('~icons/gridicons/fullscreen')['default']
|
IconGridiconsFullscreen: typeof import('~icons/gridicons/fullscreen')['default']
|
||||||
IconGridiconsFullscreenExit: typeof import('~icons/gridicons/fullscreen-exit')['default']
|
IconGridiconsFullscreenExit: typeof import('~icons/gridicons/fullscreen-exit')['default']
|
||||||
'IconHugeicons:configuration01': typeof import('~icons/hugeicons/configuration01')['default']
|
'IconHugeicons:configuration01': typeof import('~icons/hugeicons/configuration01')['default']
|
||||||
'IconIc:roundPlus': typeof import('~icons/ic/round-plus')['default']
|
|
||||||
IconIcRoundDelete: typeof import('~icons/ic/round-delete')['default']
|
IconIcRoundDelete: typeof import('~icons/ic/round-delete')['default']
|
||||||
IconIcRoundDownload: typeof import('~icons/ic/round-download')['default']
|
IconIcRoundDownload: typeof import('~icons/ic/round-download')['default']
|
||||||
IconIcRoundEdit: typeof import('~icons/ic/round-edit')['default']
|
IconIcRoundEdit: typeof import('~icons/ic/round-edit')['default']
|
||||||
@ -40,24 +35,17 @@ declare module 'vue' {
|
|||||||
IconIcRoundImage: typeof import('~icons/ic/round-image')['default']
|
IconIcRoundImage: typeof import('~icons/ic/round-image')['default']
|
||||||
IconIcRoundPlus: typeof import('~icons/ic/round-plus')['default']
|
IconIcRoundPlus: typeof import('~icons/ic/round-plus')['default']
|
||||||
IconIcRoundRefresh: typeof import('~icons/ic/round-refresh')['default']
|
IconIcRoundRefresh: typeof import('~icons/ic/round-refresh')['default']
|
||||||
IconIcRoundRemove: typeof import('~icons/ic/round-remove')['default']
|
|
||||||
IconIcRoundRoundDownload: typeof import('~icons/ic/round-round-download')['default']
|
|
||||||
IconIcRoundSave: typeof import('~icons/ic/round-save')['default']
|
|
||||||
IconIcRoundSearch: typeof import('~icons/ic/round-search')['default']
|
IconIcRoundSearch: typeof import('~icons/ic/round-search')['default']
|
||||||
IconIcRoundUpload: typeof import('~icons/ic/round-upload')['default']
|
IconIcRoundUpload: typeof import('~icons/ic/round-upload')['default']
|
||||||
IconLocalBanner: typeof import('~icons/local/banner')['default']
|
IconLocalBanner: typeof import('~icons/local/banner')['default']
|
||||||
IconLocalLogo: typeof import('~icons/local/logo')['default']
|
|
||||||
'IconMaterialSymbols:download2Rounded': typeof import('~icons/material-symbols/download2-rounded')['default']
|
'IconMaterialSymbols:download2Rounded': typeof import('~icons/material-symbols/download2-rounded')['default']
|
||||||
'IconMaterialSymbols:syncRounded': typeof import('~icons/material-symbols/sync-rounded')['default']
|
|
||||||
'IconMaterialSymbols:upload2Rounded': typeof import('~icons/material-symbols/upload2-rounded')['default']
|
'IconMaterialSymbols:upload2Rounded': typeof import('~icons/material-symbols/upload2-rounded')['default']
|
||||||
IconMaterialSymbolsHelpOutline: typeof import('~icons/material-symbols/help-outline')['default']
|
|
||||||
IconMdiArrowDownThin: typeof import('~icons/mdi/arrow-down-thin')['default']
|
IconMdiArrowDownThin: typeof import('~icons/mdi/arrow-down-thin')['default']
|
||||||
IconMdiArrowUpThin: typeof import('~icons/mdi/arrow-up-thin')['default']
|
IconMdiArrowUpThin: typeof import('~icons/mdi/arrow-up-thin')['default']
|
||||||
IconMdiDrag: typeof import('~icons/mdi/drag')['default']
|
IconMdiDrag: typeof import('~icons/mdi/drag')['default']
|
||||||
IconMdiKeyboardEsc: typeof import('~icons/mdi/keyboard-esc')['default']
|
IconMdiKeyboardEsc: typeof import('~icons/mdi/keyboard-esc')['default']
|
||||||
IconMdiKeyboardReturn: typeof import('~icons/mdi/keyboard-return')['default']
|
IconMdiKeyboardReturn: typeof import('~icons/mdi/keyboard-return')['default']
|
||||||
IconMdiRefresh: typeof import('~icons/mdi/refresh')['default']
|
IconMdiRefresh: typeof import('~icons/mdi/refresh')['default']
|
||||||
'IconMingcute:questionLine': typeof import('~icons/mingcute/question-line')['default']
|
|
||||||
IconUilSearch: typeof import('~icons/uil/search')['default']
|
IconUilSearch: typeof import('~icons/uil/search')['default']
|
||||||
JsonPreview: typeof import('./../components/custom/json-preview.vue')['default']
|
JsonPreview: typeof import('./../components/custom/json-preview.vue')['default']
|
||||||
LangSwitch: typeof import('./../components/common/lang-switch.vue')['default']
|
LangSwitch: typeof import('./../components/common/lang-switch.vue')['default']
|
||||||
@ -65,7 +53,6 @@ declare module 'vue' {
|
|||||||
MenuToggler: typeof import('./../components/common/menu-toggler.vue')['default']
|
MenuToggler: typeof import('./../components/common/menu-toggler.vue')['default']
|
||||||
MenuTreeSelect: typeof import('./../components/custom/menu-tree-select.vue')['default']
|
MenuTreeSelect: typeof import('./../components/custom/menu-tree-select.vue')['default']
|
||||||
MonacoEditor: typeof import('./../components/common/monaco-editor.vue')['default']
|
MonacoEditor: typeof import('./../components/common/monaco-editor.vue')['default']
|
||||||
NA: typeof import('naive-ui')['NA']
|
|
||||||
NAlert: typeof import('naive-ui')['NAlert']
|
NAlert: typeof import('naive-ui')['NAlert']
|
||||||
NAvatar: typeof import('naive-ui')['NAvatar']
|
NAvatar: typeof import('naive-ui')['NAvatar']
|
||||||
NBreadcrumb: typeof import('naive-ui')['NBreadcrumb']
|
NBreadcrumb: typeof import('naive-ui')['NBreadcrumb']
|
||||||
@ -94,7 +81,6 @@ declare module 'vue' {
|
|||||||
NGi: typeof import('naive-ui')['NGi']
|
NGi: typeof import('naive-ui')['NGi']
|
||||||
NGrid: typeof import('naive-ui')['NGrid']
|
NGrid: typeof import('naive-ui')['NGrid']
|
||||||
NGridItem: typeof import('naive-ui')['NGridItem']
|
NGridItem: typeof import('naive-ui')['NGridItem']
|
||||||
NImage: typeof import('naive-ui')['NImage']
|
|
||||||
NInput: typeof import('naive-ui')['NInput']
|
NInput: typeof import('naive-ui')['NInput']
|
||||||
NInputGroup: typeof import('naive-ui')['NInputGroup']
|
NInputGroup: typeof import('naive-ui')['NInputGroup']
|
||||||
NInputGroupLabel: typeof import('naive-ui')['NInputGroupLabel']
|
NInputGroupLabel: typeof import('naive-ui')['NInputGroupLabel']
|
||||||
@ -115,15 +101,11 @@ declare module 'vue' {
|
|||||||
NRadio: typeof import('naive-ui')['NRadio']
|
NRadio: typeof import('naive-ui')['NRadio']
|
||||||
NRadioButton: typeof import('naive-ui')['NRadioButton']
|
NRadioButton: typeof import('naive-ui')['NRadioButton']
|
||||||
NRadioGroup: typeof import('naive-ui')['NRadioGroup']
|
NRadioGroup: typeof import('naive-ui')['NRadioGroup']
|
||||||
NS: typeof import('naive-ui')['NS']
|
|
||||||
NScrollbar: typeof import('naive-ui')['NScrollbar']
|
NScrollbar: typeof import('naive-ui')['NScrollbar']
|
||||||
NSe: typeof import('naive-ui')['NSe']
|
|
||||||
NSelect: typeof import('naive-ui')['NSelect']
|
NSelect: typeof import('naive-ui')['NSelect']
|
||||||
NSpace: typeof import('naive-ui')['NSpace']
|
NSpace: typeof import('naive-ui')['NSpace']
|
||||||
NSpin: typeof import('naive-ui')['NSpin']
|
NSpin: typeof import('naive-ui')['NSpin']
|
||||||
NSplit: typeof import('naive-ui')['NSplit']
|
|
||||||
NStatistic: typeof import('naive-ui')['NStatistic']
|
NStatistic: typeof import('naive-ui')['NStatistic']
|
||||||
NSvgIcon: typeof import('naive-ui')['NSvgIcon']
|
|
||||||
NSwitch: typeof import('naive-ui')['NSwitch']
|
NSwitch: typeof import('naive-ui')['NSwitch']
|
||||||
NTab: typeof import('naive-ui')['NTab']
|
NTab: typeof import('naive-ui')['NTab']
|
||||||
NTabPane: typeof import('naive-ui')['NTabPane']
|
NTabPane: typeof import('naive-ui')['NTabPane']
|
||||||
@ -131,7 +113,6 @@ declare module 'vue' {
|
|||||||
NTag: typeof import('naive-ui')['NTag']
|
NTag: typeof import('naive-ui')['NTag']
|
||||||
NText: typeof import('naive-ui')['NText']
|
NText: typeof import('naive-ui')['NText']
|
||||||
NThing: typeof import('naive-ui')['NThing']
|
NThing: typeof import('naive-ui')['NThing']
|
||||||
NTime: typeof import('naive-ui')['NTime']
|
|
||||||
NTooltip: typeof import('naive-ui')['NTooltip']
|
NTooltip: typeof import('naive-ui')['NTooltip']
|
||||||
NTree: typeof import('naive-ui')['NTree']
|
NTree: typeof import('naive-ui')['NTree']
|
||||||
NTreeSelect: typeof import('naive-ui')['NTreeSelect']
|
NTreeSelect: typeof import('naive-ui')['NTreeSelect']
|
||||||
@ -146,11 +127,8 @@ declare module 'vue' {
|
|||||||
RouterView: typeof import('vue-router')['RouterView']
|
RouterView: typeof import('vue-router')['RouterView']
|
||||||
SoybeanAvatar: typeof import('./../components/custom/soybean-avatar.vue')['default']
|
SoybeanAvatar: typeof import('./../components/custom/soybean-avatar.vue')['default']
|
||||||
StatusSwitch: typeof import('./../components/custom/status-switch.vue')['default']
|
StatusSwitch: typeof import('./../components/custom/status-switch.vue')['default']
|
||||||
StatusTag: typeof import('./../components/custom/status-tag.vue')['default']
|
|
||||||
SvgIcon: typeof import('./../components/custom/svg-icon.vue')['default']
|
SvgIcon: typeof import('./../components/custom/svg-icon.vue')['default']
|
||||||
SystemLogo: typeof import('./../components/common/system-logo.vue')['default']
|
SystemLogo: typeof import('./../components/common/system-logo.vue')['default']
|
||||||
TableCheckAlert: typeof import('./../components/common/table-check-alert.vue')['default']
|
|
||||||
TableColumnCheckAlert: typeof import('./../components/advanced/table-column-check-alert.vue')['default']
|
|
||||||
TableColumnSetting: typeof import('./../components/advanced/table-column-setting.vue')['default']
|
TableColumnSetting: typeof import('./../components/advanced/table-column-setting.vue')['default']
|
||||||
TableHeaderOperation: typeof import('./../components/advanced/table-header-operation.vue')['default']
|
TableHeaderOperation: typeof import('./../components/advanced/table-header-operation.vue')['default']
|
||||||
TableRowCheckAlert: typeof import('./../components/advanced/table-row-check-alert.vue')['default']
|
TableRowCheckAlert: typeof import('./../components/advanced/table-row-check-alert.vue')['default']
|
||||||
|
@ -20,11 +20,11 @@ const { loading: codeLoading, startLoading: startCodeLoading, endLoading: endCod
|
|||||||
const { loading: tenantLoading, startLoading: startTenantLoading, endLoading: endTenantLoading } = useLoading();
|
const { loading: tenantLoading, startLoading: startTenantLoading, endLoading: endTenantLoading } = useLoading();
|
||||||
|
|
||||||
const codeUrl = ref<string>();
|
const codeUrl = ref<string>();
|
||||||
const captchaEnabled = ref<boolean>(false);
|
const captchaEnabled = ref<boolean>(true);
|
||||||
const registerEnabled = ref<boolean>(false);
|
const registerEnabled = ref<boolean>(false);
|
||||||
const remberMe = ref<boolean>(false);
|
const remberMe = ref<boolean>(false);
|
||||||
|
|
||||||
const tenantEnabled = ref<boolean>(false);
|
const tenantEnabled = ref<boolean>(true);
|
||||||
|
|
||||||
const tenantOption = ref<SelectOption[]>([]);
|
const tenantOption = ref<SelectOption[]>([]);
|
||||||
|
|
||||||
@ -122,9 +122,8 @@ async function handleSocialLogin(type: Api.System.SocialSource) {
|
|||||||
|
|
||||||
<template>
|
<template>
|
||||||
<NForm ref="formRef" :model="model" :rules="rules" size="large" :show-label="false" @keyup.enter="handleSubmit">
|
<NForm ref="formRef" :model="model" :rules="rules" size="large" :show-label="false" @keyup.enter="handleSubmit">
|
||||||
<NFormItem path="tenantId">
|
<NFormItem v-if="tenantEnabled" path="tenantId">
|
||||||
<NSelect
|
<NSelect
|
||||||
v-if="tenantEnabled"
|
|
||||||
v-model:value="model.tenantId"
|
v-model:value="model.tenantId"
|
||||||
placeholder="请选择租户"
|
placeholder="请选择租户"
|
||||||
:options="tenantOption"
|
:options="tenantOption"
|
||||||
|
Loading…
Reference in New Issue
Block a user