From a09fd97b102771c3605cf0edc25e122d15fb5a70 Mon Sep 17 00:00:00 2001 From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com> Date: Mon, 4 Dec 2023 17:00:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BA=94=E7=94=A8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BA=E6=9C=AC=E5=9C=B0=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E8=BF=87=E6=BB=A4=20(#3168)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Refs https://github.com/1Panel-dev/1Panel/issues/2865 --- backend/app/service/app.go | 2 +- frontend/src/lang/modules/en.ts | 1 + frontend/src/lang/modules/tw.ts | 1 + frontend/src/lang/modules/zh.ts | 1 + frontend/src/views/app-store/apps/index.vue | 6 ++++++ 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/backend/app/service/app.go b/backend/app/service/app.go index ebb5f1db4..a4cb2c8ba 100644 --- a/backend/app/service/app.go +++ b/backend/app/service/app.go @@ -61,7 +61,7 @@ func (a AppService) PageApp(req request.AppSearch) (interface{}, error) { if req.Recommend { opts = append(opts, appRepo.GetRecommend()) } - if req.Resource != "" { + if req.Resource != "" && req.Resource != "all" { opts = append(opts, appRepo.WithResource(req.Resource)) } if len(req.Tags) != 0 { diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 1e1c875ed..c918be9c1 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -1522,6 +1522,7 @@ const message = { syncAllAppHelper: 'All applications are about to be synchronized. Do you want to continue? ', hostModeHelper: 'The current application network mode is host mode. If you need to open the port, please open it manually on the firewall page.', + showLocal: 'Show Local Application', }, website: { website: 'Website', diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts index b8e2f3cfe..1bdc4860e 100644 --- a/frontend/src/lang/modules/tw.ts +++ b/frontend/src/lang/modules/tw.ts @@ -1422,6 +1422,7 @@ const message = { downloadLogHelper2: '即將下載 {0} 應用最近 {1} 條日誌，是否繼續？ ', syncAllAppHelper: '即將同步所有應用，是否繼續？ ', hostModeHelper: '目前應用網路模式為 host 模式，如需放開端口，請在防火牆頁面手動放開', + showLocal: '顯示本機應用程式', }, website: { website: '網站', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index ca2fb8bd5..491dcd08c 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -1422,6 +1422,7 @@ const message = { downloadLogHelper2: '即将下载 {0} 应用最近 {1} 条日志，是否继续？', syncAllAppHelper: '即将同步所有应用，是否继续？', hostModeHelper: '当前应用网络模式为 host 模式，如需放开端口，请在防火墙页面手动放开', + showLocal: '显示本地应用', }, website: { website: '网站', diff --git a/frontend/src/views/app-store/apps/index.vue b/frontend/src/views/app-store/apps/index.vue index 8d31b696a..a0a130e15 100644 --- a/frontend/src/views/app-store/apps/index.vue +++ b/frontend/src/views/app-store/apps/index.vue @@ -65,6 +65,11 @@