mirror of
https://github.com/1Panel-dev/1Panel.git
synced 2025-12-18 21:38:57 +08:00
feat: 网站密码访问限制没有用户的情况下启用 (#1120)
Refs https://github.com/1Panel-dev/1Panel/issues/1113
This commit is contained in:
parent
f7c76c012f
commit
b979c2574c
3 changed files with 12 additions and 8 deletions
|
|
@ -836,7 +836,7 @@ func (a AppService) SyncAppListFromRemote() error {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if len(deleteDetails) > 0 {
|
if len(deleteDetails) > 0 {
|
||||||
if err := appDetailRepo.BatchDelete(ctx, addDetails); err != nil {
|
if err := appDetailRepo.BatchDelete(ctx, deleteDetails); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
14
frontend/components.d.ts
vendored
14
frontend/components.d.ts
vendored
|
|
@ -17,6 +17,7 @@ declare module 'vue' {
|
||||||
ContainerLog: typeof import('./src/components/container-log/index.vue')['default']
|
ContainerLog: typeof import('./src/components/container-log/index.vue')['default']
|
||||||
DrawerHeader: typeof import('./src/components/drawer-header/index.vue')['default']
|
DrawerHeader: typeof import('./src/components/drawer-header/index.vue')['default']
|
||||||
ElAlert: typeof import('element-plus/es')['ElAlert']
|
ElAlert: typeof import('element-plus/es')['ElAlert']
|
||||||
|
ElAside: typeof import('element-plus/es')['ElAside'];
|
||||||
ElAvatar: typeof import('element-plus/es')['ElAvatar']
|
ElAvatar: typeof import('element-plus/es')['ElAvatar']
|
||||||
ElBadge: typeof import('element-plus/es')['ElBadge']
|
ElBadge: typeof import('element-plus/es')['ElBadge']
|
||||||
ElButton: typeof import('element-plus/es')['ElButton']
|
ElButton: typeof import('element-plus/es')['ElButton']
|
||||||
|
|
@ -26,6 +27,7 @@ declare module 'vue' {
|
||||||
ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
|
ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
|
||||||
ElCol: typeof import('element-plus/es')['ElCol']
|
ElCol: typeof import('element-plus/es')['ElCol']
|
||||||
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
|
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
|
||||||
|
ElContainer: typeof import('element-plus/es')['ElContainer'];
|
||||||
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
|
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
|
||||||
ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
|
ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
|
||||||
ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
|
ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
|
||||||
|
|
@ -35,14 +37,16 @@ declare module 'vue' {
|
||||||
ElDropdown: typeof import('element-plus/es')['ElDropdown']
|
ElDropdown: typeof import('element-plus/es')['ElDropdown']
|
||||||
ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
|
ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
|
||||||
ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
|
ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
|
||||||
ElEmpty: typeof import('element-plus/es')['ElEmpty']
|
ElEmpty: typeof import('element-plus/es')['ElEmpty'];
|
||||||
|
ElFooter: typeof import('element-plus/es')['ElFooter'];
|
||||||
ElForm: typeof import('element-plus/es')['ElForm']
|
ElForm: typeof import('element-plus/es')['ElForm']
|
||||||
ElFormItem: typeof import('element-plus/es')['ElFormItem']
|
ElFormItem: typeof import('element-plus/es')['ElFormItem']
|
||||||
ElIcon: typeof import('element-plus/es')['ElIcon']
|
ElIcon: typeof import('element-plus/es')['ElIcon']
|
||||||
ElImage: typeof import('element-plus/es')['ElImage']
|
ElImage: typeof import('element-plus/es')['ElImage'];
|
||||||
ElInput: typeof import('element-plus/es')['ElInput']
|
ElInput: typeof import('element-plus/es')['ElInput']
|
||||||
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
|
ElInputNumber: typeof import('element-plus/es')['ElInputNumber'];
|
||||||
ElLink: typeof import('element-plus/es')['ElLink']
|
ElLink: typeof import('element-plus/es')['ElLink']
|
||||||
|
ElMain: typeof import('element-plus/es')['ElMain'];
|
||||||
ElMenu: typeof import('element-plus/es')['ElMenu']
|
ElMenu: typeof import('element-plus/es')['ElMenu']
|
||||||
ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
|
ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
|
||||||
ElOption: typeof import('element-plus/es')['ElOption']
|
ElOption: typeof import('element-plus/es')['ElOption']
|
||||||
|
|
@ -72,12 +76,12 @@ declare module 'vue' {
|
||||||
FileRole: typeof import('./src/components/file-role/index.vue')['default']
|
FileRole: typeof import('./src/components/file-role/index.vue')['default']
|
||||||
FormButton: typeof import('./src/components/layout-content/form-button.vue')['default']
|
FormButton: typeof import('./src/components/layout-content/form-button.vue')['default']
|
||||||
Group: typeof import('./src/components/group/index.vue')['default']
|
Group: typeof import('./src/components/group/index.vue')['default']
|
||||||
InfiniteScroll: typeof import('element-plus/es')['ElInfiniteScroll']
|
InfiniteScroll: typeof import('element-plus/es')['ElInfiniteScroll'];
|
||||||
LayoutContent: typeof import('./src/components/layout-content/index.vue')['default']
|
LayoutContent: typeof import('./src/components/layout-content/index.vue')['default']
|
||||||
Line: typeof import('./src/components/v-charts/components/Line.vue')['default']
|
Line: typeof import('./src/components/v-charts/components/Line.vue')['default']
|
||||||
Loading: typeof import('element-plus/es')['ElLoadingDirective']
|
Loading: typeof import('element-plus/es')['ElLoadingDirective']
|
||||||
MsgInfo: typeof import('./src/components/msg-info/index.vue')['default']
|
MsgInfo: typeof import('./src/components/msg-info/index.vue')['default']
|
||||||
Popover: typeof import('element-plus/es')['ElPopoverDirective']
|
Popover: typeof import('element-plus/es')['ElPopoverDirective'];
|
||||||
RouterButton: typeof import('./src/components/router-button/index.vue')['default']
|
RouterButton: typeof import('./src/components/router-button/index.vue')['default']
|
||||||
Status: typeof import('./src/components/status/index.vue')['default']
|
Status: typeof import('./src/components/status/index.vue')['default']
|
||||||
SvgIcon: typeof import('./src/components/svg-icon/svg-icon.vue')['default']
|
SvgIcon: typeof import('./src/components/svg-icon/svg-icon.vue')['default']
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<template>
|
<template>
|
||||||
<el-form-item prop="enable" :label="$t('website.enableOrNot')">
|
<el-form-item prop="enable" :label="$t('website.enableOrNot')">
|
||||||
<el-switch v-model="enable" @change="changeEnable"></el-switch>
|
<el-switch v-model="enable" @change="changeEnable" :disabled="data.length === 0"></el-switch>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<ComplexTable :data="data" @search="search" v-loading="loading">
|
<ComplexTable :data="data" @search="search" v-loading="loading">
|
||||||
<template #toolbar>
|
<template #toolbar>
|
||||||
|
|
@ -41,7 +41,7 @@ const id = computed(() => {
|
||||||
return props.id;
|
return props.id;
|
||||||
});
|
});
|
||||||
const loading = ref(false);
|
const loading = ref(false);
|
||||||
const data = ref();
|
const data = ref([]);
|
||||||
const createRef = ref();
|
const createRef = ref();
|
||||||
const enable = ref(false);
|
const enable = ref(false);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue