gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-03-14 01:34:47 +08:00
Code

fix: 解决文件复制到原路径导致文件内容清空的 BUG (#798)

Browse Source
This commit is contained in:
zhengkunwang223 2023-04-26 20:30:14 +08:00 committed by GitHub
parent 936b0e59ab
commit db2aa35b2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backend/utils/files/file_op.go
View File

@ -322,17 +322,21 @@ func (f FileOp) CopyFile(src, dst string) error {
} }
defer srcFile.Close() defer srcFile.Close()
srcInfo, err := f.Fs.Stat(src)
if err != nil {
return err
}
dstPath := path.Join(dst, srcInfo.Name())
if src == dstPath {
return nil
}
err = f.Fs.MkdirAll(filepath.Dir(dst), 0666) err = f.Fs.MkdirAll(filepath.Dir(dst), 0666)
if err != nil { if err != nil {
return err return err
} }
srcInfo, err := f.Fs.Stat(src) dstFile, err := f.Fs.OpenFile(dstPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0775)
if err != nil {
return err
}
dstFile, err := f.Fs.OpenFile(path.Join(dst, srcInfo.Name()), os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0775)
if err != nil { if err != nil {
return err return err
} }

8
frontend/src/views/host/file-management/code-editor/index.vue
View File

@ -82,10 +82,10 @@ interface EditorConfig {
eol: number; eol: number;
} }
let open = ref(false); const open = ref(false);
let loading = ref(false); const loading = ref(false);
let config = reactive<EditorConfig>({ const config = reactive<EditorConfig>({
theme: 'vs-dark', theme: 'vs-dark',
language: 'plaintext', language: 'plaintext',
eol: monaco.editor.EndOfLineSequence.LF, eol: monaco.editor.EndOfLineSequence.LF,
@ -129,7 +129,7 @@ const handleClose = () => {
if (editor) { if (editor) {
editor.dispose(); editor.dispose();
} }
em('close', false); em('close', open.value);
}; };
const changeLanguage = () => { const changeLanguage = () => {
monaco.editor.setModelLanguage(editor.getModel(), config.language); monaco.editor.setModelLanguage(editor.getModel(), config.language);