1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-10-09 23:17:21 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Fix the problem of abnormal system version detection (#8487)

Browse source
This commit is contained in:
ssongliu 2025-04-27 17:14:50 +08:00 • committed by GitHub
parent f4038e879e
commit ec1db8b5e9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/components/system-upgrade/index.vue
View file

@ -23,7 +23,7 @@
<el-link :underline="false" class="version" type="primary" @click="copyText(version)">
{{ version }}
</el-link>
<el-badge is-dot class="-mt-0.5" :hidden="version === 'Waiting' && globalStore.hasNewVersion">
<el-badge is-dot class="-mt-0.5" :hidden="version === 'Waiting' || !globalStore.hasNewVersion">
<el-link class="ml-2" :underline="false" type="primary" @click="onLoadUpgradeInfo">
{{ $t('commons.button.update') }}
</el-link>

2
frontend/src/views/setting/license/bind/free.vue
View file

@ -2,7 +2,7 @@
<DrawerPro v-model="drawerVisible" :header="$t('setting.license')" :resource="licenseName" @close="handleClose">
<el-form label-position="top" :model="form" @submit.prevent v-loading="loading">
<el-form-item :label="$t('license.add')" prop="nodeID">
<el-select filterable multiple v-model="form.nodeIDs" class="w-full">
<el-select filterable multiple v-model="form.nodeIDs" clearable class="w-full">
<div v-for="item in unboundOptions" :key="item.id">
<el-option :label="item.name" :value="item.id" />
</div>

2
frontend/src/views/setting/license/bind/xpack.vue
View file

@ -8,7 +8,7 @@
>
<el-form ref="formRef" label-position="top" :model="form" @submit.prevent v-loading="loading">
<el-form-item :label="$t('setting.bindNode')" prop="nodeID" :rules="Rules.requiredSelect">
<el-select filterable v-model="form.nodeID" style="width: 100%">
<el-select filterable v-model="form.nodeID" class="w-full" clearable>
<el-option v-for="item in freeNodes" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>

3
frontend/src/views/setting/snapshot/create/index.vue
View file

@ -153,7 +153,7 @@
<el-button @click="next" v-else>{{ $t('commons.button.next') }}</el-button>
</template>
</DrawerPro>
<TaskLog ref="taskLogRef" width="70%" />
<TaskLog ref="taskLogRef" width="70%" @close="handleClose" />
</template>
<script lang="ts" setup>
import { ref } from 'vue';
@ -226,6 +226,7 @@ const acceptParams = (): void => {
const handleClose = () => {
drawerVisible.value = false;
emit('search');
};
const submitForm = async (formEl: any) => {

3
frontend/src/views/setting/snapshot/recover/index.vue
View file

@ -53,7 +53,7 @@
</span>
</template>
</DialogPro>
<TaskLog ref="taskLogRef" width="70%" />
<TaskLog ref="taskLogRef" width="70%" @close="handleClose" />
</template>
<script setup lang="ts">
@ -103,6 +103,7 @@ let recoverReq = ref({
const handleClose = () => {
open.value = false;
emit('search');
};
const acceptParams = (params: DialogProps): void => {
recoverReq.value = {