1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2026-01-15 11:34:10 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: Retain historical settings when toggling watermark

Browse source
This commit is contained in:
ssongliu 2025-12-22 15:09:19 +08:00
parent 955d9db699
commit f893f306fa
7 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frontend/src/global/use-logo.ts
View file

@ -14,6 +14,7 @@ export const useLogo = async () => {
globalStore.themeConfig.loginBackground = res.data?.loginBackground;
globalStore.themeConfig.loginBtnLinkColor = res.data?.loginBtnLinkColor;
globalStore.themeConfig.favicon = res.data.favicon;
globalStore.watermarkShow = res.data.watermarkShow === 'Enable';
try {
globalStore.watermark = JSON.parse(res.data.watermark);
} catch {

2
frontend/src/layout/index.vue
View file

@ -24,7 +24,7 @@
</div>
<el-watermark
v-if="globalStore.isMasterProductPro && globalStore.watermark"
v-if="globalStore.isMasterProductPro && globalStore.watermarkShow && globalStore.watermark"
:content="loadContent()"
:font="{
fontSize: globalStore.watermark.fontSize,

1
frontend/src/store/interface/index.ts
View file

@ -36,6 +36,7 @@ export interface GlobalState {
isFullScreen: boolean;
openMenuTabs: boolean;
watermark: Watermark;
watermarkShow: boolean;
isOnRestart: boolean;
agreeLicense: boolean;
hasNewVersion: boolean;

1
frontend/src/store/modules/global.ts
View file

@ -28,6 +28,7 @@ const GlobalStore = defineStore({
loginBtnLinkColor: '',
},
watermark: null,
watermarkShow: false,
openMenuTabs: false,
isFullScreen: false,
isOnRestart: false,

2
frontend/src/utils/xpack.ts
View file

@ -11,6 +11,7 @@ export function resetXSetting() {
globalStore.themeConfig.logoWithText = '';
globalStore.themeConfig.favicon = '';
globalStore.watermark = null;
globalStore.watermarkShow = false;
globalStore.masterAlias = '';
}
@ -116,6 +117,7 @@ export async function getXpackSettingForTheme() {
if (res2.data?.theme) {
globalStore.themeConfig.theme = res2.data.theme;
}
globalStore.watermarkShow = res2.data.watermarkShow === 'Enable';
try {
globalStore.watermark = JSON.parse(res2.data.watermark);
} catch {

15
frontend/src/views/setting/panel/index.vue
View file

@ -79,7 +79,7 @@
</el-form-item>
<el-form-item :label="$t('setting.watermark')" v-if="isMasterProductPro" prop="watermark">
<el-radio-group class="w-full" @change="onChangeWatermark" v-model="form.watermarkItem">
<el-radio-group class="w-full" @change="onChangeWatermark" v-model="form.watermarkShow">
<el-radio-button value="Enable">
<span>{{ $t('commons.button.enable') }}</span>
</el-radio-button>
@ -87,7 +87,7 @@
<span>{{ $t('commons.button.disable') }}</span>
</el-radio-button>
</el-radio-group>
<div v-if="form.watermarkItem === 'Enable'">
<div v-if="form.watermarkShow === 'Enable'">
<div>
<el-button link type="primary" @click="onChangeWatermark">
{{ $t('commons.button.view') }}
@ -274,7 +274,7 @@ const form = reactive({
panelName: '',
theme: '',
watermark: '',
watermarkItem: '',
watermarkShow: '',
themeColor: {} as ThemeColor,
menuTabs: '',
language: '',
@ -372,12 +372,12 @@ const search = async () => {
globalStore.themeConfig.theme = form.theme;
form.proxyDocker = xpackRes.data.proxyDocker;
form.watermark = xpackRes.data.watermark;
form.watermarkShow = xpackRes.data.watermarkShow;
try {
globalStore.watermark = JSON.parse(xpackRes.data.watermark);
} catch {
globalStore.watermark = null;
}
form.watermarkItem = xpackRes.data.watermark ? 'Enable' : 'Disable';
}
} else {
globalStore.themeConfig.theme = form.theme;
@ -421,7 +421,7 @@ const onChangeThemeColor = () => {
};
const onChangeWatermark = async () => {
if (form.watermarkItem === 'Enable') {
if (form.watermarkShow === 'Enable') {
watermarkRef.value.acceptParams(form.watermark);
return;
}
@ -431,10 +431,11 @@ const onChangeWatermark = async () => {
})
.then(async () => {
loading.value = true;
await updateXpackSettingByKey('Watermark', '')
await updateXpackSettingByKey('WatermarkShow', 'Disable')
.then(() => {
loading.value = false;
globalStore.watermark = null;
globalStore.watermarkShow = false;
search();
MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
})
@ -443,7 +444,7 @@ const onChangeWatermark = async () => {
});
})
.catch(() => {
form.watermarkItem = 'Enable';
form.watermarkShow = 'Enable';
});
};

1
frontend/src/views/setting/panel/watermark/index.vue
View file

@ -127,6 +127,7 @@ const onSave = async (formEl: FormInstance | undefined) => {
rotate: form.rotate,
gap: form.gap,
};
globalStore.watermarkShow = true;
handleClose();
return;
})