test/1Panel
1
0
Fork 0
mirror of https://gitee.com/fit2cloud-feizhiyun/1Panel.git synced 2024-12-05 13:29:11 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

fit: 文件属性显示大小值调整 (#5575)

Browse Source 
Refs #3934
This commit is contained in:
John Bro 2024-06-26 22:38:50 +08:00 committed by GitHub
parent 18719f9112
commit 151f9d58d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
backend/utils/files/fileinfo.go
View File

@ -64,6 +64,20 @@ type FileSearchInfo struct {
fs.FileInfo
}
func getDirSize(fs afero.Fs, path string) (int64, error) {
var size int64
err := afero.Walk(fs, path, func(p string, info os.FileInfo, err error) error {
if err != nil {
return err
}
if !info.IsDir() {
size += info.Size()
}
return nil
})
return size, err
}
func NewFileInfo(op FileOption) (*FileInfo, error) {
var appFs = afero.NewOsFs()
@ -101,6 +115,11 @@ func NewFileInfo(op FileOption) (*FileInfo, error) {
}
if op.Expand {
if file.IsDir {
size, err := getDirSize(appFs, op.Path)
if err != nil {
return nil, err
}
file.Size = size
if err := file.listChildren(op); err != nil {
return nil, err
}

27
frontend/src/views/host/file-management/detail/index.vue
View File

@ -10,7 +10,15 @@
<el-descriptions-item :label="$t('commons.table.type')">{{ data.type }}</el-descriptions-item>
<el-descriptions-item :label="$t('file.path')">{{ data.path }}</el-descriptions-item>
<el-descriptions-item :label="$t('file.size')">
{{ computeSize(data.size) }}
<span v-if="data.isDir">
<el-button type="primary" link small @click="getDirSize(data)">
<span v-if="data.dirSize == undefined">
{{ $t('file.calculate') }}
</span>
<span v-else>{{ computeSize(data.dirSize) }}</span>
</el-button>
</span>
<span v-else>{{ computeSize(data.size) }}</span>
</el-descriptions-item>
<el-descriptions-item :label="$t('file.role')">{{ data.mode }}</el-descriptions-item>
<el-descriptions-item :label="$t('commons.table.user')">{{ data.user }}</el-descriptions-item>
@ -25,7 +33,7 @@
</template>
<script lang="ts" setup>
import { GetFileContent } from '@/api/modules/files';
import { ComputeDirSize, GetFileContent } from '@/api/modules/files';
import { computeSize } from '@/utils/util';
import { ref } from 'vue';
import { dateFormatSimple } from '@/utils/util';
@ -40,6 +48,7 @@ const props = ref<InfoProps>({
let open = ref(false);
let data = ref();
let loading = ref(false);
const handleClose = () => {
open.value = false;
@ -53,6 +62,20 @@ const acceptParams = async (params: InfoProps): Promise<void> => {
});
};
const getDirSize = async (row: any) => {
const req = {
path: row.path,
};
loading.value = true;
await ComputeDirSize(req)
.then(async (res) => {
data.value.dirSize = res.data.size;
})
.finally(() => {
loading.value = false;
});
};
defineExpose({
acceptParams,
});