fzq #31

Closed
fanzhiqin wants to merge 215 commits from fzq into test
2 changed files with 97 additions and 42 deletions
Showing only changes of commit 65c4ce9d45 - Show all commits

View File

@ -1,33 +1,41 @@
<template> <template>
<div class="base-table"> <div class="base-table">
<el-table <el-table :data="data" style="width: 100%" fit border :header-cell-style="{ background: '#FAFAFA', color: '#606266', height: '40px' }" :max-height="maxHeight">
:data="data"
style="width: 100%"
fit
border
:header-cell-style="{ background: '#FAFAFA', color: '#606266', height: '40px' }"
:max-height="maxHeight"
>
<!-- 表格头定义 --> <!-- 表格头定义 -->
<template v-for="(head, idx) in tableHeadConfigs">
<!-- 带type的表头 -->
<el-table-column <el-table-column
v-for="(head, idx) in tableHeadConfigs"
:key="idx" :key="idx"
v-if="head.type"
:type="head.type" :type="head.type"
:index="head.index" :label="head.label || head.name || ''"
:header-align="head.align || 'center'"
:align="head.align || 'center'"
:width="head.width || 50"
v-bind="head.more"
></el-table-column>
<!-- 普通的表头 -->
<el-table-column
v-else
:key="idx"
:label="head.label ? head.label : head.name" :label="head.label ? head.label : head.name"
:prop="head.prop" :prop="head.prop"
:width="head.width" :width="head.width"
:min-width="head.minWidth" :min-width="head.minWidth"
:fixed="head.fixed" :fixed="head.fixed"
:show-overflow-tooltip="true" :show-overflow-tooltip="head.showOverflowTooltip || false"
filter-placement="top" filter-placement="top"
:align="head.align" :align="head.align"
v-bind="head.more"
> >
<!-- 子组件 -->
<template v-if="head.prop" slot-scope="scope"> <template v-if="head.prop" slot-scope="scope">
<component v-if="head.subcomponent" :is="head.subcomponent" :key="idx + 'sub'" :inject-data="{ ...scope.row, head }" @emitData="handleSubEmitData" /> <component v-if="head.subcomponent" :is="head.subcomponent" :key="idx + 'sub'" :inject-data="{ ...scope.row, head }" @emitData="handleSubEmitData" />
<!-- 直接展示数据或应用过滤器 -->
<span v-else>{{ scope.row[head.prop] | commonFilter(head.filter) }}</span> <span v-else>{{ scope.row[head.prop] | commonFilter(head.filter) }}</span>
</template> </template>
</el-table-column> </el-table-column>
</template>
</el-table> </el-table>
</div> </div>
</template> </template>

View File

@ -12,6 +12,7 @@
</el-form> </el-form>
<el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;"> <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column type="index" header-align="center" align="center" label="序号"></el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="id"></el-table-column> <el-table-column prop="id" header-align="center" align="center" label="id"></el-table-column>
<el-table-column prop="code" header-align="center" align="center" label="编码"></el-table-column> <el-table-column prop="code" header-align="center" align="center" label="编码"></el-table-column>
<el-table-column prop="name" header-align="center" align="center" label="设备名称"></el-table-column> <el-table-column prop="name" header-align="center" align="center" label="设备名称"></el-table-column>
@ -72,9 +73,54 @@
import BaseTable from '@/components/base-table' import BaseTable from '@/components/base-table'
import AddOrUpdate from './equipment-add-or-update' import AddOrUpdate from './equipment-add-or-update'
const TableOperateComponent = {
name: 'TableOperations',
props: {
injectData: {
type: Object,
default: () => ({})
}
},
data() {
return {
btnTypes: {
add: 'primary',
delete: 'danger',
detail: 'info'
// add more...
},
colors: {
// add more...
},
text: {
// for i18n inject:
'add': '添加'
// add more...
}
}
},
methods: {
//
},
render: function(h) {
let btns = []
for (const optionStr of this.injectData.head?.options) {
btns.push(h('el-button', { props: { type: this.btnTypes[optionStr] } }, optionStr))
}
return h('span', null, btns)
}
}
const tableConfigs = [ const tableConfigs = [
{ type: 'selection' }, {
{ type: 'index', name: 'No' }, type: 'index',
name: '序号',
more: {
index: function(index) {
return (index + 1) * 2
}
}
},
{ prop: 'id', name: 'id' }, { prop: 'id', name: 'id' },
{ prop: 'code', name: '编码' }, { prop: 'code', name: '编码' },
{ prop: 'name', name: '设备名称' }, { prop: 'name', name: '设备名称' },
@ -95,12 +141,13 @@ const tableConfigs = [
{ prop: 'valid', name: '删除标志,是否有效:1 可用 0不可用' }, { prop: 'valid', name: '删除标志,是否有效:1 可用 0不可用' },
{ prop: 'creatorId', name: '创建人' }, { prop: 'creatorId', name: '创建人' },
{ prop: 'creatorName', name: '创建人姓名' }, { prop: 'creatorName', name: '创建人姓名' },
{ prop: 'createTime', name: '创建时间' }, { prop: 'createTime', name: '添加时间' },
{ prop: 'updaterId', name: '更新人' }, { prop: 'updaterId', name: '更新人' },
{ prop: 'updaterName', name: '更新人姓名' }, { prop: 'updaterName', name: '更新人姓名' },
{ prop: 'updateTime', name: '更新时间' }, { prop: 'updateTime', name: '更新时间' },
{ prop: 'version', name: '版本号' }, { prop: 'version', name: '版本号' },
{ prop: 'externalCode', name: '外部系统代码' } { prop: 'externalCode', name: '外部系统代码' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['add', 'detail', 'delete'] }
] ]
export default { export default {