From f7d9aabb6e5d8f86579d942e42cc11785b096623 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 15 四月 2024 14:41:15 +0800
Subject: [PATCH] 完成用户管理优化
---
src/components/tool/value-table.vue | 211 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 193 insertions(+), 18 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 9efd2dd..0c7ee99 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -34,6 +34,22 @@
.body {
overflow-x: hidden;
}
+
+ .handleBtn{
+ border: none;
+ padding: 0;
+ color: #409EFF;
+ background: transparent;
+ }
+
+ .handleBtn:hover{
+ background: transparent;
+ }
+
+ .handleBtn.is-disabled{
+ color: #C0C4CC;
+ }
+
</style>
<style>
/* .value-table .highlight-warning-row-border td {
@@ -69,6 +85,16 @@
.value-table .el-upload-dragger {
width: 100%;
}
+
+ .handleBtn.is-disabled .el-upload:focus{
+ color: #C0C4CC !important;
+ }
+ .avatar-uploader .el-upload{
+ height: 80px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
</style>
<template>
@@ -80,14 +106,14 @@
@row-click="rowClick" :show-summary="data.countFleid!=undefined && data.countFleid.length > 0"
:summary-method="getSummaries" :row-class-name="tableRowClassName"
:row-key="record=>record.id" :current-row-key="data.currentId"
- highlight-current-row
+ :highlight-current-row="data.highlight===undefined||data.highlight"
:span-method="spanMethod">
<el-table-column type="selection" width="65" v-if="data.showSelect" :key="Math.random()">
</el-table-column>
- <el-table-column type="index" align="center" label="搴忓彿" width="70" v-if="data.isIndex" :key="Math.random()">
+ <el-table-column type="index" align="center" label="搴忓彿" width="65" v-if="data.isIndex" :key="Math.random()">
</el-table-column>
<el-table-column :prop="a.label" :label="a.value" :sortable="data.sort==false?false:'custom'"
- v-for="(a, ai) in tableHead" :key="ai" show-overflow-tooltip min-width="160">
+ v-for="(a, ai) in tableHead" :key="ai" show-overflow-tooltip min-width="155">
<template slot-scope="scope">
<div v-if="showType(a.label, data.tagField) != null">
<template v-if="typeof(scope.row[a.label]) == 'object'">
@@ -104,6 +130,7 @@
<!-- 鍙搷浣滆杩涜鐐瑰嚮浜嬩欢 -->
<span v-else-if="data.linkEvent&&showLink(a.label, data.linkEvent)" style="color:#409EFF;cursor: pointer;"
@click="handleLinkEvent(scope.row,data.linkEvent[a.label])">{{scope.row[a.label]}}</span>
+ <img style="width: 40px;height: 40px;margin-top: 10px;" :src="javaApi+'/img/'+scope.row[a.label]" v-else-if="showUpload(a.label)&&scope.row[a.label]" alt="">
<span v-else>{{scope.row[a.label]}}</span>
</template>
</el-table-column>
@@ -111,7 +138,23 @@
<template slot-scope="scope">
<el-button v-for="(a, ai) in data.do" :key="ai" :type="a.type"
:disabled="a.disabFun ? a.disabFun(scope.row,scope.$index) : false"
- @click="main(scope.row, a)">{{a.font}}</el-button>
+ @click="main(scope.row, a)" class="handleBtn">
+ <span v-if="a.type!='upload'">{{a.font}}</span>
+ <el-upload
+ :action="javaApi+a.uploadConfig.url+'?id='+scope.row.id"
+ v-else
+ :disabled="a.disabFun ? a.disabFun(scope.row,scope.$index) : false"
+ :on-success="handleSuccessUp"
+ :show-file-list="false"
+ :headers="token"
+ name="file"
+ :accept='a.uploadConfig.accept'
+ :on-error="onError"
+ ref='upload'
+ style="background: transparent;">
+ <span>{{a.font}}</span>
+ </el-upload>
+ </el-button>
</template>
</el-table-column>
</el-table>
@@ -131,7 +174,7 @@
</el-col>
<el-col :span="16/data.row">
<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
- v-if="showType(a.label, data.selectField) == null" :disabled="isDisabled(a.label)"></el-input>
+ v-if="showType(a.label, data.selectField) == null&&!showUpload(a.label)" :disabled="isDisabled(a.label)"></el-input>
<el-select v-model="upData[a.label]" :multiple="data.selectField[a.label].choose" size="small"
v-if="showType(a.label, data.selectField) != null" style="width: 100%;" :disabled="isDisabled(a.label)"
clearable>
@@ -139,6 +182,22 @@
:label="b.label">
</el-option>
</el-select>
+ <el-upload
+ :action="javaApi+data.addUploadConfig.url"
+ v-if="showUpload(a.label)"
+ :on-success="m=>handleSuccessUp(m, a.label)"
+ :show-file-list="false"
+ :headers="token"
+ name="file"
+ :multiple="false"
+ :accept='data.addUploadConfig.accept'
+ :on-error="onError"
+ ref='upload'
+ class="avatar-uploader"
+ style="background: transparent;width: 80px;height: 80px;border: 1px solid #DCDFE6;border-radius: 6px;margin: 10px 0;">
+ <img v-if="upData[a.label]" :src="javaApi+'/img/'+upData[a.label]" class="avatar" style="width: 80px;height: 80px;border-radius: 6px;">
+ <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+ </el-upload>
</el-col>
</div>
</div>
@@ -149,13 +208,29 @@
</el-col>
<el-col :span="16" :offset="1">
<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
- v-if="showType(a.label, data.selectField) == null" :disabled="isDisabled(a.label)"></el-input>
+ v-if="showType(a.label, data.selectField) == null&&!showUpload(a.label)" :disabled="isDisabled(a.label)"></el-input>
<el-select v-model="upData[a.label]" :multiple="data.selectField[a.label].choose" size="small"
v-if="showType(a.label, data.selectField) != null" style="width: 100%;" :disabled="isDisabled(a.label)"
clearable>
<el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
:label="b.label"></el-option>
</el-select>
+ <el-upload
+ :action="javaApi+data.addUploadConfig.url"
+ v-if="showUpload(a.label)"
+ :multiple="false"
+ :on-success="m=>handleSuccessUp(m, a.label)"
+ :show-file-list="false"
+ :headers="token"
+ name="file"
+ :accept='data.addUploadConfig.accept'
+ :on-error="onError"
+ ref='upload'
+ class="avatar-uploader"
+ style="background: transparent;width: 80px;height: 80px;border: 1px solid #DCDFE6;border-radius: 6px;margin: 10px 0;">
+ <img v-if="upData[a.label]" :src="javaApi+'/img/'+upData[a.label]" class="avatar" style="width: 80px;height: 80px;border-radius: 6px;">
+ <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+ </el-upload>
</el-col>
</el-row>
</div>
@@ -174,12 +249,28 @@
</span>{{a.value}}锛�</el-col>
<el-col :span="16/data.row" :offset="1">
<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
- v-if="showType(a.label, data.selectField) == null"></el-input>
+ v-if="showType(a.label, data.selectField) == null&&!showUpload(a.label)"></el-input>
<el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`" clearable>
<el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
:label="b.label"></el-option>
</el-select>
+ <el-upload
+ :action="javaApi+data.addUploadConfig.url"
+ v-if="showUpload(a.label)"
+ :on-success="m=>handleSuccessUp(m, a.label)"
+ :show-file-list="false"
+ :headers="token"
+ :multiple="false"
+ name="file"
+ :accept='data.addUploadConfig.accept'
+ :on-error="onError"
+ ref='upload'
+ class="avatar-uploader"
+ style="background: transparent;width: 80px;height: 80px;border: 1px solid #DCDFE6;border-radius: 6px;margin: 10px 0;">
+ <img v-if="upData[a.label]" :src="javaApi+'/img/'+upData[a.label]" class="avatar" style="width: 80px;height: 80px;border-radius: 6px;">
+ <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+ </el-upload>
</el-col>
</div>
</div>
@@ -189,12 +280,28 @@
</span>{{a.value}}锛�</el-col>
<el-col :span="16" :offset="1">
<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
- v-if="showType(a.label, data.selectField) == null"></el-input>
+ v-if="showType(a.label, data.selectField) == null&&!showUpload(a.label)"></el-input>
<el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`" clearable>
<el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
:label="b.label"></el-option>
</el-select>
+ <el-upload
+ :action="javaApi+data.addUploadConfig.url"
+ v-if="showUpload(a.label)"
+ :on-success="m=>handleSuccessUp(m, a.label)"
+ :show-file-list="false"
+ :headers="token"
+ name="file"
+ :multiple="false"
+ :accept='data.addUploadConfig.accept'
+ :on-error="onError"
+ ref='upload'
+ class="avatar-uploader"
+ style="background: transparent;width: 80px;height: 80px;border: 1px solid #DCDFE6;border-radius: 6px;margin: 10px 0;">
+ <img v-if="upData[a.label]" :src="javaApi+'/img/'+upData[a.label]" class="avatar" style="width: 80px;height: 80px;border-radius: 6px;">
+ <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+ </el-upload>
</el-col>
</el-row>
</div>
@@ -348,8 +455,18 @@
token: null,
fileList: [],
init: true,
- testArr: [],
- testPosition: 0,
+ spanList:[
+ // {
+ // arr:[],
+ // position:0
+ // }
+ ],
+ specialSpanList:[
+ // {
+ // arr:[],
+ // position:0
+ // }
+ ],
}
},
watch: {
@@ -393,9 +510,31 @@
});
},
spanMethod({ row, column, rowIndex, columnIndex }){
- if(this.data.spanConfig!=undefined&&this.data.spanConfig.rows){
- if (columnIndex === this.data.spanConfig.rows.index) {
- const _row = this.testArr[rowIndex];
+ // 涓�鑸殑鍚堝苟琛�
+ if(this.data.spanConfig!=undefined&&this.data.spanConfig.rows&&this.data.spanConfig.rows.length>0){
+ let i = null;
+ let obj = this.data.spanConfig.rows.find((item,index)=>{
+ i = index;
+ return item.index==columnIndex
+ })
+ if(obj){
+ const _row = this.spanList[i].arr[rowIndex];
+ const _col = _row > 0 ? 1 : 0;
+ return {
+ rowspan: _row,
+ colspan: _col,
+ };
+ }
+ }
+ // 鐗规畩鐨勫悎骞惰
+ if(this.data.spanConfig!=undefined&&this.data.spanConfig.special&&this.data.spanConfig.special.main&&this.data.spanConfig.special.rows&&this.data.spanConfig.special.rows.length>0){
+ let i = null;
+ let obj = this.data.spanConfig.special.rows.find((item,index)=>{
+ i = index;
+ return item.index==columnIndex
+ })
+ if(obj){
+ const _row = this.specialSpanList[i].arr[rowIndex];
const _col = _row > 0 ? 1 : 0;
return {
rowspan: _row,
@@ -472,10 +611,27 @@
})
}
}
- if(this.data.spanConfig!=undefined&&this.data.spanConfig.rows){
- this.testArr = []
- this.testPosition = 0
- this.rowspan(this.testArr, this.testPosition, this.data.spanConfig.rows.name);
+ // 涓�鑸殑鍚堝苟琛�
+ if(this.data.spanConfig!=undefined&&this.data.spanConfig.rows&&this.data.spanConfig.rows.length>0){
+ this.spanList = [];
+ this.data.spanConfig.rows.forEach((item,index)=>{
+ this.spanList.push({
+ arr:[],
+ position:0
+ })
+ this.rowspan(this.spanList[index].arr, this.spanList[index].position, item.name);
+ })
+ }
+ // 鐗规畩鐨勫悎骞惰
+ if(this.data.spanConfig!=undefined&&this.data.spanConfig.special&&this.data.spanConfig.special.main&&this.data.spanConfig.special.rows&&this.data.spanConfig.special.rows.length>0){
+ this.specialSpanList = []
+ this.data.spanConfig.special.rows.forEach((item,index)=>{
+ this.specialSpanList.push({
+ arr:[],
+ position:0
+ })
+ this.rowspan(this.specialSpanList[index].arr, this.specialSpanList[index].position, this.data.spanConfig.special.main);
+ })
}
this.loading = false
}).catch(e => {
@@ -527,6 +683,13 @@
}
return false
},
+ showUpload(label){
+ if(this.data.addUpload.find(m=>m==label)){
+ return true;
+ }else{
+ return false;
+ }
+ },
main(row, val) {
if (val.method == undefined) return
else if (val.method == 'doDiy') {
@@ -833,7 +996,19 @@
count += a.font.length
})
return count * 15 + 60 + 'px'
- }
+ },
+ handleSuccessUp(response,label){
+ if(label){
+ if(response.code==200){
+ this.upData[label] = response.data.url;
+ }
+ }else{
+ if(response.code==200){
+ this.$message.success('涓婁紶鎴愬姛')
+ this.selectList()
+ }
+ }
+ }
}
}
</script>
--
Gitblit v1.9.3