wenyongda/ZRAdmin-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "文件存储恢复表格存储类型列的显示，修复字典标签组件无法取值数字类型的问题"

Browse Source 
This reverts commit 9022d1d85e06a1407ce96c2919edbf39b6e5d65f.
This commit is contained in:
文永达 2023-06-12 09:06:19 +08:00
parent d98940b5fa
commit 959e8976e0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/DictTag/index.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<template v-for="(item, index) in props.options"> <template v-for="(item, index) in props.options">
<template v-if="values.includes(item.dictValue.toString())"> <template v-if="values.includes(item.dictValue)">
<span v-if="item.listClass == 'default' || item.listClass == ''" :key="item.dictValue" :index="index" :class="item.cssClass"> <span v-if="item.listClass == 'default' || item.listClass == ''" :key="item.dictValue" :index="index" :class="item.cssClass">
{{ item.dictLabel }} <i v-if="showValue">#{{ item.dictValue }}</i> {{ item.dictLabel }} <i v-if="showValue">#{{ item.dictValue }}</i>
</span> </span>
@ -23,11 +23,11 @@ const props = defineProps({
// 数据 // 数据
options: { options: {
type: Array, type: Array,
default: null default: null,
}, },
// 当前的值 // 当前的值
value: [Number, String, Array, Boolean], value: [Number, String, Array, Boolean],
showValue: false showValue: false,
}) })
const values = computed(() => { const values = computed(() => {

4
src/views/tool/file/index.vue
View File

@ -66,11 +66,11 @@
</el-table-column> </el-table-column>
<el-table-column prop="fileSize" label="文件大小" align="center" :show-overflow-tooltip="true" /> <el-table-column prop="fileSize" label="文件大小" align="center" :show-overflow-tooltip="true" />
<el-table-column prop="fileExt" label="扩展名" align="center" :show-overflow-tooltip="true" width="80px" /> <el-table-column prop="fileExt" label="扩展名" align="center" :show-overflow-tooltip="true" width="80px" />
<el-table-column prop="storeType" label="存储类型" align="center"> <!-- <el-table-column prop="storeType" label="存储类型" align="center">
<template #default="scope"> <template #default="scope">
<dict-tag :options="storeTypeOptions" :value="parseInt(scope.row.storeType)" /> <dict-tag :options="storeTypeOptions" :value="parseInt(scope.row.storeType)" />
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column prop="storePath" label="存储目录"></el-table-column> <el-table-column prop="storePath" label="存储目录"></el-table-column>
<el-table-column prop="create_by" label="操作人" align="center" /> <el-table-column prop="create_by" label="操作人" align="center" />
<el-table-column prop="create_time" label="创建日期" align="center" width="150" /> <el-table-column prop="create_time" label="创建日期" align="center" width="150" />