diff --git a/.gitignore b/.gitignore
index 2aa84fb31cd0..b9787bf79278 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,6 @@ quick_start.sh
cmd/server/fileList.txt
.fileList.txt
1Panel.code-workspace
+
+core/.golangci.yml
+agent/.golangci.yml
\ No newline at end of file
diff --git a/agent/app/service/app_install.go b/agent/app/service/app_install.go
index 4468e5581dd3..86eaa9baaba5 100644
--- a/agent/app/service/app_install.go
+++ b/agent/app/service/app_install.go
@@ -746,22 +746,6 @@ func (a *AppInstallService) GetParams(id uint) (*response.AppConfig, error) {
}
}
}
- } else if form.Type == "apps" {
- if m, ok := form.Child.(map[string]interface{}); ok {
- result := make(map[string]string)
- for key, value := range m {
- if strVal, ok := value.(string); ok {
- result[key] = strVal
- }
- }
- if envKey, ok := result["envKey"]; ok {
- serviceName := envs[envKey]
- if serviceName != nil {
- appInstall, _ := appInstallRepo.GetFirst(appInstallRepo.WithServiceName(serviceName.(string)))
- appParam.ShowValue = appInstall.Name
- }
- }
- }
}
params = append(params, appParam)
diff --git a/core/constant/common.go b/core/constant/common.go
index c049899f3e19..19154d166049 100644
--- a/core/constant/common.go
+++ b/core/constant/common.go
@@ -45,6 +45,7 @@ var WebUrlMap = map[string]struct{}{
"/apps/all": {},
"/apps/installed": {},
"/apps/upgrade": {},
+ "apps/setting": {},
"/containers": {},
"/containers/container": {},
@@ -55,6 +56,7 @@ var WebUrlMap = map[string]struct{}{
"/containers/compose": {},
"/containers/template": {},
"/containers/setting": {},
+ "containers/dashboard": {},
"/cronjobs": {},
@@ -133,6 +135,7 @@ var WebUrlMap = map[string]struct{}{
"/xpack/alert/setting": {},
"/xpack/setting": {},
"xpack/node": {},
+ "xpack/waf/stat": {},
}
var DynamicRoutes = []string{
diff --git a/frontend/src/styles/common.scss b/frontend/src/styles/common.scss
index bce1bac660a4..d78d30d874bf 100644
--- a/frontend/src/styles/common.scss
+++ b/frontend/src/styles/common.scss
@@ -123,11 +123,11 @@ html {
.input-help {
font-size: 12px;
- word-break: break-all;
- color: #8f959e;
+ word-break: keep-all;
+ color: #adb0bc;
width: 100%;
display: inline-block;
- height: 12px;
+ white-space: normal;
}
.input-error {
@@ -431,7 +431,7 @@ html {
cursor: pointer;
}
-.dialog-footer{
+.dialog-footer {
display: flex;
align-items: center;
justify-content: flex-end;
diff --git a/frontend/src/views/website/website/create/index.vue b/frontend/src/views/website/website/create/index.vue
index 37ddfe63d79f..3fa991ecf4d9 100644
--- a/frontend/src/views/website/website/create/index.vue
+++ b/frontend/src/views/website/website/create/index.vue
@@ -193,6 +193,8 @@
+
+