diff --git a/agent/go.mod b/agent/go.mod index 7a7bcdc7a..e362e4b50 100644 --- a/agent/go.mod +++ b/agent/go.mod @@ -24,7 +24,6 @@ require ( github.com/go-redis/redis v6.15.9+incompatible github.com/go-resty/resty/v2 v2.16.5 github.com/go-sql-driver/mysql v1.8.1 - github.com/goccy/go-yaml v1.9.8 github.com/goh-chunlin/go-onedrive v1.1.1 github.com/google/uuid v1.6.0 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 @@ -141,6 +140,7 @@ require ( github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-viper/mapstructure/v2 v2.4.0 // indirect github.com/goccy/go-json v0.10.5 // indirect + github.com/goccy/go-yaml v1.9.8 // indirect github.com/gofrs/flock v0.13.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.4 // indirect diff --git a/agent/utils/compose/compose.go b/agent/utils/compose/compose.go index fd733541a..e0dfc6af2 100644 --- a/agent/utils/compose/compose.go +++ b/agent/utils/compose/compose.go @@ -15,7 +15,7 @@ import ( "github.com/1Panel-dev/1Panel/agent/utils/cmd" "github.com/1Panel-dev/1Panel/agent/utils/common" "github.com/1Panel-dev/1Panel/agent/utils/docker" - "github.com/goccy/go-yaml" + "gopkg.in/yaml.v3" ) func checkCmd() error { diff --git a/frontend/src/views/container/compose/index.vue b/frontend/src/views/container/compose/index.vue index 2c31ed5b3..6d4f91913 100644 --- a/frontend/src/views/container/compose/index.vue +++ b/frontend/src/views/container/compose/index.vue @@ -337,7 +337,12 @@ - + + + @@ -581,6 +586,13 @@ const changePath = async () => { const loadDir = async (path: string) => { form.path = path; }; +const handleClose = () => { + search(true); + taskLogRef.value?.handleClose(); +}; +const closeTask = () => { + taskLogRef.value?.handleClose(); +}; const onDelete = (row: any) => { dialogDelRef.value.acceptParams({