diff --git a/web/src/store/index.js b/web/src/store/index.js index 65948b5..03ab8be 100644 --- a/web/src/store/index.js +++ b/web/src/store/index.js @@ -85,7 +85,7 @@ const useStore = defineStore('global', { let { data: newHostList } = await $api.getHostList() newHostList = newHostList.map(newHostObj => { let { expired = null } = newHostObj - newHostObj.expired = (isValidDate(expired)) ? dayjs(expired).format('YYYY-MM-DD') : null + newHostObj.expired = (isValidDate(expired)) ? dayjs(expired).format('YYYY-MM-DD') : '--' const oldHostObj = this.hostList.find(({ id }) => id === newHostObj.id) return oldHostObj ? Object.assign({}, { ...oldHostObj }, { ...newHostObj }) : newHostObj }) diff --git a/web/src/utils/index.js b/web/src/utils/index.js index cafb33a..a17b05b 100644 --- a/web/src/utils/index.js +++ b/web/src/utils/index.js @@ -172,6 +172,7 @@ export const isDockerComposeYml = (str) => { } export const isValidDate = (dateString) => { + if (!dateString) return false const date = new Date(dateString) return !isNaN(date.getTime()) && date instanceof Date } \ No newline at end of file diff --git a/web/src/views/server/components/host-form.vue b/web/src/views/server/components/host-form.vue index ef0f89d..2e0b44b 100644 --- a/web/src/views/server/components/host-form.vue +++ b/web/src/views/server/components/host-form.vue @@ -251,36 +251,6 @@ - diff --git a/web/src/views/server/components/host-table.vue b/web/src/views/server/components/host-table.vue index 5200ed9..489d2d2 100644 --- a/web/src/views/server/components/host-table.vue +++ b/web/src/views/server/components/host-table.vue @@ -8,34 +8,16 @@ @sort-change="handleSortChange" @selection-change="handleSelectionChange" > - - - - + - - + + - - + + + + + + + + + + + + - 清空 + 清空
!Boolean(terminalTabs.length)) let hostList = computed(() => $store.hostList) let recentHostList = ref(JSON.parse(localStorage.getItem('recentHostList')) || []) +const displayHostList = computed(() => { + return recentHostList.value.filter(item => hostList.value.some(host => host.id === item.id)) +}) function updateRecentHostList(targetHost) { if (!targetHost) return