File tree Expand file tree Collapse file tree 3 files changed +15
-3
lines changed
frontend/src/views/container/compose Expand file tree Collapse file tree 3 files changed +15
-3
lines changed Original file line number Diff line number Diff line change @@ -24,7 +24,6 @@ require (
2424 github.com/go-redis/redis v6.15.9+incompatible
2525 github.com/go-resty/resty/v2 v2.16.5
2626 github.com/go-sql-driver/mysql v1.8.1
27- github.com/goccy/go-yaml v1.9.8
2827 github.com/goh-chunlin/go-onedrive v1.1.1
2928 github.com/google/uuid v1.6.0
3029 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674
@@ -141,6 +140,7 @@ require (
141140 github.com/go-playground/universal-translator v0.18.1 // indirect
142141 github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
143142 github.com/goccy/go-json v0.10.5 // indirect
143+ github.com/goccy/go-yaml v1.9.8 // indirect
144144 github.com/gofrs/flock v0.13.0 // indirect
145145 github.com/gogo/protobuf v1.3.2 // indirect
146146 github.com/golang/protobuf v1.5.4 // indirect
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ import (
1515 "github.com/1Panel-dev/1Panel/agent/utils/cmd"
1616 "github.com/1Panel-dev/1Panel/agent/utils/common"
1717 "github.com/1Panel-dev/1Panel/agent/utils/docker"
18- "github.com/goccy/go- yaml"
18+ "gopkg.in/ yaml.v3 "
1919)
2020
2121func checkCmd () error {
Original file line number Diff line number Diff line change 337337 </template >
338338 </LayoutContent >
339339
340- <TaskLog ref =" taskLogRef" width =" 70%" @close =" search(true)" />
340+ <TaskLog ref =" taskLogRef" width =" 70%" >
341+ <template #task-footer >
342+ <el-button @click =" handleClose" >{{ $t('commons.table.backToList') }}</el-button >
343+ <el-button type =" primary" @click =" closeTask" >{{ $t('commons.table.keepEdit') }}</el-button >
344+ </template >
345+ </TaskLog >
341346 <FileList ref =" fileRef" @choose =" loadDir" />
342347 <DeleteDialog @search =" search(true)" ref =" dialogDelRef" />
343348 <ContainerInspectDialog ref =" containerInspectRef" />
@@ -581,6 +586,13 @@ const changePath = async () => {
581586const loadDir = async (path : string ) => {
582587 form .path = path ;
583588};
589+ const handleClose = () => {
590+ search (true );
591+ taskLogRef .value ?.handleClose ();
592+ };
593+ const closeTask = () => {
594+ taskLogRef .value ?.handleClose ();
595+ };
584596
585597const onDelete = (row : any ) => {
586598 dialogDelRef .value .acceptParams ({
You can’t perform that action at this time.
0 commit comments