diff --git a/agent/app/service/website.go b/agent/app/service/website.go index 3ff623aaa..bf1386f9b 100644 --- a/agent/app/service/website.go +++ b/agent/app/service/website.go @@ -626,10 +626,10 @@ func (w WebsiteService) GetWebsite(id uint) (response.WebsiteDTO, error) { dName := d.GetName() if _, ok := dto.LBAlgorithms[dName]; ok { res.Algorithm = dName + break } } res.Servers = getNginxUpstreamServers(up.UpstreamServers) - break } } return res, nil diff --git a/frontend/src/api/interface/app.ts b/frontend/src/api/interface/app.ts index a722f7eb9..77d436194 100644 --- a/frontend/src/api/interface/app.ts +++ b/frontend/src/api/interface/app.ts @@ -165,6 +165,9 @@ export namespace App { webUI: string; appKey?: string; serviceName: string; + appStatus?: string; + appType?: string; + version?: string; } export interface AppInstalledInfo { diff --git a/frontend/src/api/interface/index.ts b/frontend/src/api/interface/index.ts index 411be2e67..26edf4d53 100644 --- a/frontend/src/api/interface/index.ts +++ b/frontend/src/api/interface/index.ts @@ -28,8 +28,8 @@ export interface SearchWithPage { } export interface CommonModel { id: number; - CreatedAt?: string; - UpdatedAt?: string; + createdAt?: string; + updatedAt?: string; } export interface DescriptionUpdate { id: number; diff --git a/frontend/src/views/app-store/detail/index.vue b/frontend/src/views/app-store/detail/index.vue index 7a167b834..83d0265df 100644 --- a/frontend/src/views/app-store/detail/index.vue +++ b/frontend/src/views/app-store/detail/index.vue @@ -110,7 +110,6 @@ const getApp = async () => { try { const res = await getAppByKey(appKey.value); app.value = res.data; - app.value.icon = 'data:image/png;base64,' + res.data.icon; version.value = app.value.versions[0]; getDetail(app.value.id, version.value); } finally { diff --git a/frontend/src/views/app-store/installed/app/card.vue b/frontend/src/views/app-store/installed/app/card.vue new file mode 100644 index 000000000..4f472abed --- /dev/null +++ b/frontend/src/views/app-store/installed/app/card.vue @@ -0,0 +1,78 @@ + + + + + diff --git a/frontend/src/views/app-store/installed/app/header.vue b/frontend/src/views/app-store/installed/app/header.vue new file mode 100644 index 000000000..2b4ce6abd --- /dev/null +++ b/frontend/src/views/app-store/installed/app/header.vue @@ -0,0 +1,193 @@ + + + + diff --git a/frontend/src/views/app-store/installed/app/icon.vue b/frontend/src/views/app-store/installed/app/icon.vue new file mode 100644 index 000000000..8155412c9 --- /dev/null +++ b/frontend/src/views/app-store/installed/app/icon.vue @@ -0,0 +1,17 @@ + + + diff --git a/frontend/src/views/app-store/installed/app/info.vue b/frontend/src/views/app-store/installed/app/info.vue new file mode 100644 index 000000000..685d9c135 --- /dev/null +++ b/frontend/src/views/app-store/installed/app/info.vue @@ -0,0 +1,98 @@ + + + + + diff --git a/frontend/src/views/app-store/installed/index.vue b/frontend/src/views/app-store/installed/index.vue index e36e67fcf..c63c123f5 100644 --- a/frontend/src/views/app-store/installed/index.vue +++ b/frontend/src/views/app-store/installed/index.vue @@ -29,7 +29,6 @@ > {{ $t('firewall.quickJump') }} -   @@ -49,343 +48,46 @@ :lg="12" :xl="12" > -
- - - -
- -
-
- -
-
-
-
- - - {{ installed.name }} - - - - - - - - -
- {{ installed.message }} -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - {{ $t('database.loadBackup') }} - - - {{ $t('commons.button.backup') }} - - - {{ $t('commons.button.ignore') }} - - - {{ $t('commons.button.upgrade') }} - -
-
-
-
- - {{ $t('app.version') }}{{ $t('commons.colon') - }}{{ installed.version }} - - - {{ $t('commons.table.port') }}{{ $t('commons.colon') - }}{{ installed.httpPort }} - - - {{ $t('commons.table.port') }}:{{ installed.httpsPort }} - - - - - - - - - - - - - - - - -
- - {{ - 'http://' + - defaultLink + - ':' + - installed.httpPort - }} - -
- - {{ - 'https://' + - defaultLink + - ':' + - installed.httpsPort - }} - -
- - {{ installed.webUI }} - -
- - {{ $t('app.webUIConfig') }} - - {{ $t('firewall.quickJump') }} - - -
-
-
- - {{ $t('app.alreadyRun') }}{{ $t('commons.colon') }} - {{ getAge(installed.createdAt) }} - -
-
-
- - {{ button.label }} - -
-
- - - -
+ + +
@@ -407,7 +109,6 @@ - @@ -417,30 +118,28 @@