Commit bc5a9237 authored by 杨柠瑞's avatar 杨柠瑞

coding

parent 5687315d
...@@ -111,8 +111,8 @@ ...@@ -111,8 +111,8 @@
<el-table-column type="selection" width="55" v-if="isShowSelection"></el-table-column> <el-table-column type="selection" width="55" v-if="isShowSelection"></el-table-column>
<el-table-column v-for="(column,index) in showColumns" :key="index" align="center" :label="column.name" :prop="column.codeCamel" :sortable="column.isSort"> <el-table-column v-for="(column,index) in showColumns" :key="index" align="center" :label="column.name" :prop="column.codeCamel" :sortable="column.isSort">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row[column.codeCamel] }}</span> <span v-if="scope.row[column.codeCamel] !== false && scope.row[column.codeCamel] !== true">{{ scope.row[column.codeCamel] }}</span>
<!--<el-checkbox v-model="listLoading"></el-checkbox>--> <el-checkbox v-if="scope.row[column.codeCamel] === false || scope.row[column.codeCamel] === true" v-model="scope.row[column.codeCamel]"></el-checkbox>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed="right" label="操作" :width="operationWidth" v-if="isShowEditDataButton || isShowDeleteButton"> <el-table-column fixed="right" label="操作" :width="operationWidth" v-if="isShowEditDataButton || isShowDeleteButton">
...@@ -524,7 +524,7 @@ ...@@ -524,7 +524,7 @@
}, },
// 排序 // 排序
sortChange(row) { sortChange(row) {
this.listQuery.sortItem = row.prop this.listQuery.sortItem = row.prop.replace(/([A-Z])/g, '_$1').toLowerCase()
this.listQuery.sortOrder = row.order === 'descending' ? 'desc' : 'asc' this.listQuery.sortOrder = row.order === 'descending' ? 'desc' : 'asc'
this.getList() this.getList()
}, },
...@@ -551,10 +551,6 @@ ...@@ -551,10 +551,6 @@
request(self.schema.modelUnderscorePlural, { request(self.schema.modelUnderscorePlural, {
params: params params: params
}).then(resp => { }).then(resp => {
// 数据库字段转化显示
if (self.options && self.options.changeValue) {
resp.data = self.changeValue(resp.data)
}
if (resp.data.length !== 0 && resp.data[0].superior !== undefined && resp.data[0].includes !== undefined && if (resp.data.length !== 0 && resp.data[0].superior !== undefined && resp.data[0].includes !== undefined &&
resp.data[0].refers !== undefined && resp.data[0].relates !== undefined) { resp.data[0].refers !== undefined && resp.data[0].relates !== undefined) {
self.list = [] self.list = []
...@@ -564,6 +560,10 @@ ...@@ -564,6 +560,10 @@
} else { } else {
self.list = resp.data self.list = resp.data
} }
// 数据库字段转化显示
if (self.options && self.options.changeValue) {
resp.data = self.changeValue(self.list)
}
// 数据处理 // 数据处理
if (self.options && self.options.dataProcessing) { if (self.options && self.options.dataProcessing) {
...@@ -579,7 +579,7 @@ ...@@ -579,7 +579,7 @@
_.map(data, function(item, index) { _.map(data, function(item, index) {
_.forEach(item, function(listValue, listKey) { _.forEach(item, function(listValue, listKey) {
if (self.options.changeValue[listKey] && self.options.changeValue[listKey][listValue]) { if (self.options.changeValue[listKey] && self.options.changeValue[listKey][listValue]) {
item[listKey] = self.options.changeValue[listKey][listValue] item[listKey] = self.options.changeValue[listKey][listValue] === 'Hm-isChecked' ? true : self.options.changeValue[listKey][listValue] === 'Hm-noChecked' ? false : self.options.changeValue[listKey][listValue]
} }
}) })
}) })
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
}, },
data() { data() {
return { return {
showUserColumns: [{ name: '手机号', codeCamel: 'mobile', isSort: true }, { name: '登录ID', codeCamel: 'loginid', isSort: true }, 'username', 'email', 'createTime'], showUserColumns: [{ name: '手机号', codeCamel: 'mobile', isSort: true }, { name: '登录ID', codeCamel: 'loginid', isSort: true }, 'username', 'email', { name: '创建时间', codeCamel: 'createTime', isSort: true }],
userFilters: [ userFilters: [
{ placeholder: '过滤手机号', 'mobile': { 'like': '' }, isShow: true }, { placeholder: '过滤手机号', 'mobile': { 'like': '' }, isShow: true },
{ placeholder: '过滤用户名', 'username': { 'equalTo': '' }, isShow: true }, { placeholder: '过滤用户名', 'username': { 'equalTo': '' }, isShow: true },
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
sortItem: 'create_time', sortItem: 'create_time',
sortOrder: 'desc', sortOrder: 'desc',
changeValue: { changeValue: {
username: { 1: '是', 0: '否' } username: { 1: 'Hm-isChecked', 0: 'Hm-noChecked' }
}, },
newData: { newData: {
isShow: true, isShow: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment