diff --git a/frontend/src/components/system-upgrade/index.vue b/frontend/src/components/system-upgrade/index.vue index 7665bdd4c..59d9b3001 100644 --- a/frontend/src/components/system-upgrade/index.vue +++ b/frontend/src/components/system-upgrade/index.vue @@ -93,7 +93,7 @@ import { ElMessageBox } from 'element-plus'; import { storeToRefs } from 'pinia'; const globalStore = GlobalStore(); -const { isDarkTheme } = storeToRefs(globalStore); +const { isDarkTheme, docsUrl } = storeToRefs(globalStore); const mobile = computed(() => { return globalStore.isMobile(); @@ -129,7 +129,7 @@ const toLxware = () => { }; const toDoc = () => { - window.open('https://1panel.cn/docs/', '_blank', 'noopener,noreferrer'); + window.open(docsUrl.value, '_blank', 'noopener,noreferrer'); }; const toForum = () => { diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 24c1ddda6..3043b1ca2 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -1798,7 +1798,7 @@ const message = { all: 'All', version: 'Version', detail: 'Details', - params: 'Edit parameters', + params: 'Edit', install: 'Install', author: 'Author', source: 'Source', @@ -1855,7 +1855,7 @@ const message = { installPrompt: 'No apps installed yet', updateHelper: 'Editing parameters may cause the application to fail to start. Please proceed with caution.', updateWarn: 'Update parameters need to rebuild the application, Do you want to continue? ', - busPort: 'Service Port', + busPort: 'Port', syncStart: 'Start syncing! Please refresh the app store later', advanced: 'Advanced Settings', cpuCore: 'core(s)', diff --git a/frontend/src/store/modules/global.ts b/frontend/src/store/modules/global.ts index 7d8cf00d4..e4fb6596e 100644 --- a/frontend/src/store/modules/global.ts +++ b/frontend/src/store/modules/global.ts @@ -48,6 +48,7 @@ const GlobalStore = defineStore({ state.themeConfig.theme === 'dark' || (state.themeConfig.theme === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches), isDarkGoldTheme: (state) => state.themeConfig.primary === '#F0BE96' && state.isProductPro, + docsUrl: (state) => (state.isIntl ? 'https://docs.1panel.hk' : 'https://1panel.cn/docs'), }, actions: { setOpenMenuTabs(openMenuTabs: boolean) { diff --git a/frontend/src/styles/moblie.scss b/frontend/src/styles/moblie.scss index c1ba283fd..1f5c98808 100644 --- a/frontend/src/styles/moblie.scss +++ b/frontend/src/styles/moblie.scss @@ -30,7 +30,6 @@ min-width: auto !important; } .d-description { - display: block !important; overflow: inherit !important; } } diff --git a/frontend/src/views/app-store/index.scss b/frontend/src/views/app-store/index.scss index af3880519..4a859a129 100644 --- a/frontend/src/views/app-store/index.scss +++ b/frontend/src/views/app-store/index.scss @@ -13,36 +13,40 @@ .d-name { height: 20%; .name { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + max-width: 120px; font-weight: 500; font-size: 18px; color: var(--panel-text-color); } .status { - margin-left: 10px; + margin-left: 5px; } .h-button { float: right; - margin-right: 10px; + margin-right: 5px; } .msg { - margin-left: 10px; + margin-left: 5px; + } + .el-button + .el-button { + margin-left: 6px; } } .d-description { margin-top: 10px; overflow: hidden; - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; .el-tag { margin-right: 5px; } - .description { - margin-top: 10px; - font-size: 14px; - color: var(--el-text-color-regular); - } + } + .description { + margin-top: 10px; + font-size: 14px; + color: var(--el-text-color-regular); } .d-button { margin-top: 10px; diff --git a/frontend/src/views/app-store/installed/index.vue b/frontend/src/views/app-store/installed/index.vue index 65804946f..ca76162fb 100644 --- a/frontend/src/views/app-store/installed/index.vue +++ b/frontend/src/views/app-store/installed/index.vue @@ -94,11 +94,11 @@ :md="24" :lg="12" :xl="12" - class="install-card-col-12" + :class="mode === 'upgrade' ? 'upgrade-card-col-12' : 'install-card-col-12'" >
- +
- {{ installed.name }} + + {{ installed.name }} + - @@ -210,7 +211,7 @@ {{ $t('commons.button.upgrade') }}
-
+
{{ $t('app.version') }}{{ $t('commons.colon') }}{{ installed.version }} @@ -237,17 +238,16 @@ {{ $t('app.busPort') }}{{ $t('commons.colon') }}{{ installed.httpsPort }} - -
- - {{ $t('app.alreadyRun') }}{{ $t('commons.colon') }} - {{ getAge(installed.createdAt) }} - -
+
+
+ + {{ $t('app.alreadyRun') }}{{ $t('commons.colon') }} + {{ getAge(installed.createdAt) }} +
{ try { await SyncInstalledApp(); MsgSuccess(i18n.global.t('app.syncSuccess')); - search(); + await search(); } finally { syncLoading.value = false; } @@ -631,10 +631,31 @@ onUnmounted(() => { diff --git a/frontend/src/views/setting/about/index.vue b/frontend/src/views/setting/about/index.vue index 22a037036..598c79a0c 100644 --- a/frontend/src/views/setting/about/index.vue +++ b/frontend/src/views/setting/about/index.vue @@ -45,7 +45,9 @@ import { onMounted, ref } from 'vue'; import SystemUpgrade from '@/components/system-upgrade/index.vue'; import { GlobalStore } from '@/store'; import PrimaryLogo from '@/assets/images/1panel-logo.svg?component'; +import { storeToRefs } from 'pinia'; const globalStore = GlobalStore(); +const { docsUrl } = storeToRefs(globalStore); const version = ref(); const loading = ref(); @@ -55,7 +57,7 @@ const search = async () => { }; const toDoc = () => { - window.open('https://1panel.cn/docs/', '_blank', 'noopener,noreferrer'); + window.open(docsUrl.value, '_blank', 'noopener,noreferrer'); }; const toGithub = () => { window.open('https://github.com/1Panel-dev/1Panel', '_blank', 'noopener,noreferrer');