From 28f355c8d4708aa64262aa9be3be5dc72c22b16e Mon Sep 17 00:00:00 2001 From: Crunchy <3114200645@qq.com> Date: 星期五, 26 四月 2024 11:43:29 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/components/tool/value-table.vue | 376 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 343 insertions(+), 33 deletions(-) diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue index c8bce0f..8bedd05 100644 --- a/src/components/tool/value-table.vue +++ b/src/components/tool/value-table.vue @@ -34,32 +34,47 @@ .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 { + /* .value-table .highlight-warning-row-border td { border-top: 2px solid #ffcd29; border-bottom: 2px solid #ffcd29; - } + } */ .value-table .highlight-warning-row-border td:first-child { - border-left: 2px solid #ffcd29; + border-left: 4px solid #ffcd29; } .value-table .highlight-warning-row-border td:last-child { - border-right: 2px solid #ffcd29; + border-right: 4px solid #ffcd29; } - .value-table .highlight-danger-row-border td { + /* .value-table .highlight-danger-row-border td { border-top: 2px solid red; border-bottom: 2px solid red; - } + } */ .value-table .highlight-danger-row-border td:first-child { - border-left: 2px solid red; + border-left: 4px solid #f56c6c; } .value-table .highlight-danger-row-border td:last-child { - border-right: 2px solid red; + border-right: 4px solid #f56c6c; } .value-table .el-upload { @@ -69,21 +84,34 @@ .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> <div class="value-table"> - <div class="table"> + <div class="table" :style="data.isPage!=undefined&&data.isPage!=true?'height:100%':''"> <el-table ref="eltable" :data="tableData" style="width: 100%;" height="100%" tooltip-effect="dark" border @selection-change="selectChange" @select="select" v-loading="loading" @sort-change="sortChange" @row-click="rowClick" :show-summary="data.countFleid!=undefined && data.countFleid.length > 0" - :summary-method="getSummaries" :row-class-name="tableRowClassName"> + :summary-method="getSummaries" :row-class-name="tableRowClassName" :row-key="record=>record.id" + :current-row-key="data.currentId" :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'"> @@ -100,25 +128,35 @@ <!-- 鍙搷浣滆杩涜鐐瑰嚮浜嬩欢 --> <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> - <span v-else>{{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> <el-table-column fixed="right" align="center" label="鎿嶄綔" :width="getWidth()" v-if="data.do.length > 0"> <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> + :disabled="a.disabFun ? a.disabFun(scope.row,scope.$index) : false" @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> </div> - <div class="page"> + <div class="page" v-if="data.isPage==undefined||data.isPage"> <el-pagination @size-change="sizeChange" @current-change="currentChange" :current-page="page.current" :page-sizes="[10, 20, 30, 50, 100]" :page-size="page.size" layout="total, sizes, prev, pager, next, jumper" :total="total"> </el-pagination> </div> - <el-dialog title="缂栬緫" :visible.sync="upDia" :width="data.row==1?'500px':500+data.row * 200 + 'px'"> + <el-dialog title="缂栬緫" :visible.sync="upDia" :width="data.row==1?'500px':500+data.row * 200 + 'px'" append-to-body> <div class="body" v-if="upDia" style="max-height: 550px;overflow-y: auto;padding: 5px 10px 5px 0;"> <div v-if="data.row > 1"> <div v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;"> @@ -127,14 +165,28 @@ </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)&&!showCascader(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> + clearable filterable> <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-cascader :value="upData[a.label]" :options="data.cascaderField[a.label].tree" + v-if="showCascader(a.label)" :placeholder="`璇烽�夋嫨${a.value}`" clearable + :props="data.cascaderField.props" size="small" style="width: 100%;" + @change="m=>handleCascader(m,a.label)" filterable></el-cascader> </el-col> </div> </div> @@ -145,13 +197,25 @@ </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)&&!showCascader(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> + clearable filterable> <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-cascader :value="upData[a.label]" :options="data.cascaderField[a.label].tree" :show-all-levels="false" + :placeholder="`璇烽�夋嫨${a.value}`" v-if="showCascader(a.label)" clearable :props="data.cascaderField.props" + size="small" style="width: 100%;" @change="m=>handleCascader(m,a.label)" filterable></el-cascader> </el-col> </el-row> </div> @@ -161,8 +225,8 @@ <el-button type="primary" @click="saveUpData" :loading="upLoad">纭� 瀹�</el-button> </span> </el-dialog> - <el-dialog title="鏂板" :visible.sync="addDia" :width="data.row==1?'500px':500+data.row * 200 + 'px'"> - <div class="body" v-if="addDia" style="max-height: 550px;overflow-y: auto;padding: 5px 0;"> + <el-dialog title="鏂板" :visible.sync="addDia" :width="data.row==1?'500px':500+data.row * 200 + 'px'" append-to-body> + <div class="body" v-if="addDia" style="max-height: 550px;overflow-y: auto;padding: 5px 10px 5px 0;"> <div v-if="data.row > 1"> <div v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;"> <el-col :span="6/data.row" style="text-align: right;"><span class="required-span" @@ -170,12 +234,24 @@ </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)&&!showCascader(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> + style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`" clearable filterable> <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-cascader :options="data.cascaderField[a.label].tree" v-if="showCascader(a.label)" clearable + :placeholder="`璇烽�夋嫨${a.value}`" :props="data.cascaderField.props" size="small" style="width: 100%;" + @change="m=>handleCascader(m,a.label)" filterable></el-cascader> </el-col> </div> </div> @@ -185,12 +261,24 @@ </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)&&!showCascader(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-cascader :options="data.cascaderField[a.label].tree" v-if="showCascader(a.label)" clearable + :placeholder="`璇烽�夋嫨${a.value}`" :props="data.cascaderField.props" size="small" style="width: 100%;" + @change="m=>handleCascader(m,a.label)" filterable></el-cascader> </el-col> </el-row> </div> @@ -231,6 +319,9 @@ import { Page } from 'iview'; +import { + data + } from 'jquery'; export default { props: { tableRowClassName: { @@ -311,12 +402,14 @@ showSelect: false, select: true, row: 1, + isPage:true,// do: [{ font: '鍒犻櫎', type: 'text' }], type: [], - uploadStr: "" + uploadStr: "", + currentId: '', //褰撳墠楂樹寒鐨処D }, tableHead: [], tableData: [], @@ -340,6 +433,20 @@ uploadDia: false, token: null, fileList: [], + init: true, + spanList: [ + // { + // arr:[], + // position:0 + // } + ], + specialSpanList: [ + // { + // arr:[], + // position:0 + // } + ], +param: {} } }, watch: { @@ -350,23 +457,96 @@ this.$refs.eltable.doLayout() }) } - } + }, }, +beforeUpdate() { + this.$nextTick(() => { + this.$refs.eltable.doLayout() + }) + }, mounted() { this.data = this.componentData this.dataCopy = this.HaveJson(this.componentData) - this.selectList() + if (this.data.init === undefined || this.data.init === true) { + this.selectList() + } this.token = { 'token': sessionStorage.getItem('token') } }, methods: { + rowspan(spanArr, position, spanName) { + this.tableData.forEach((item, index) => { + if (index === 0) { + spanArr.push(1); + position = 0; + } else { + if ( + this.tableData[index][spanName] === + this.tableData[index - 1][spanName] + ) { + spanArr[position] += 1; + spanArr.push(0); + } else { + spanArr.push(1); + position = index; + } + } + }); + }, + spanMethod({ + row, + column, + rowIndex, + columnIndex + }) { + // 涓�鑸殑鍚堝苟琛� + 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, + colspan: _col, + }; + } + } + }, selectChange(val) { if (this.data.select) { this.multipleSelection = val; } else { this.multipleSelection = val[val.length - 1]; } + if (this.data.selectMethod != undefined) { + if (this.$parent.$el.className.indexOf('el-') == 0) { + this.$parent.$parent[this.data.selectMethod](val) + } else { + this.$parent[this.data.selectMethod](val) + } + } }, select(val, row) { if (!this.data.select) { @@ -392,6 +572,12 @@ }, selectList() { this.loading = true + if (this.data.isPage != undefined && this.data.isPage != true) { + this.page = { + current: -1, + size: -1, + } + } this.$axios.post(this.url, { page: this.page, entity: this.data.entity @@ -416,6 +602,31 @@ }) } } + // 涓�鑸殑鍚堝苟琛� + 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 => { this.loading = false @@ -466,13 +677,48 @@ } return false }, + showUpload(label){ + if(this.data.addUpload&&this.data.addUpload.find(m=>m==label)){ + return true; + } else { + return false; + } + }, + showCascader(label) { + if (this.data.cascaderField && this.data.cascaderField[label]) { + return true; + } else { + return false; + } + }, + handleTree(arr, value) { + let label = '' + for (let i = 0; i < arr.length; i++) { + if (arr[i].id == value) { + label = arr[i].name + return label + } else if (arr[i].children) { + label = this.handleTree(arr[i].children, value) + } + } + return label + }, main(row, val) { if (val.method == undefined) return else if (val.method == 'doDiy') { if (val.id == 'update') { this.upDia = true, - this.upData = this.HaveJson(row) + this.upData = this.HaveJson(row) this.upHead = this.HaveJson(this.tableHead) + this.upHead.forEach((item, index) => { + if (this.data.cascaderField && this.data.cascaderField[item.label]) { + if (this.upData[item.label]) { + this.upData[item.label] = JSON.parse(this.upData[item.label]) + } else { + this.upData[item.label] = [] + } + } + }) this.upHead = this.upHead.filter(a => a.label != 'createTime' && a.label != 'updateTime') delete this.upData.orderBy delete this.upData.createTime @@ -545,6 +791,15 @@ this.upData[a] = JSON.stringify(this.upData[a]) } } + this.upHead.forEach((item, index) => { + if (this.data.cascaderField && this.data.cascaderField[item.label]) { + if (this.upData[item.label]) { + this.upData[item.label] = JSON.stringify(this.upData[item.label]) + } else { + this.upData[item.label] = '' + } + } + }) this.$axios.post(this.upUrl, this.upData, { headers: { 'Content-Type': 'application/json' @@ -557,6 +812,7 @@ this.$message.success('淇敼鎴愬姛') this.upDia = false this.selectList() + this.$refs.eltable.doLayout(); this.upLoad = false }).catch(e => { this.$message.error('淇敼澶辫触') @@ -564,9 +820,10 @@ this.upLoad = false }) }, - openAddDia(addUrl) { + openAddDia(addUrl, param) { this.addDia = true this.addUrl = addUrl +this.param = param this.upData = {} this.tableHead.forEach((k, v) => { if (k.label != 'orderBy' && k.label != 'createTime' && k.label != 'updateTime' && k.label != @@ -583,7 +840,7 @@ } } val.field.forEach(a => { - if (JSON.stringify(this.upData[a]) == undefined) { + if (JSON.stringify(this.upData[a]) === undefined) { this.upHead.push({ value: a.split('=')[0], label: a.split('=')[1] @@ -616,6 +873,20 @@ } } this.addLoad = true + this.upHead.forEach((item, index) => { + if (this.data.cascaderField && this.data.cascaderField[item.label]) { + if (this.upData[item.label]) { + this.upData[item.label] = JSON.stringify(this.upData[item.label]) + } else { + this.upData[item.label] = '' + } + } + }) +if (this.param !== undefined && this.param !== null) { + for (let i in this.param) { + this.upData[i] = this.param[i] + } + } this.$axios.post(this.addUrl, this.upData, { headers: { 'Content-Type': 'application/json' @@ -772,7 +1043,46 @@ count += a.font.length }) return count * 15 + 60 + 'px' - } + }, + handleSuccessUp(response, label) { + if (typeof label === 'string') { + if (response.code == 200) { + this.upData[label] = response.data.url; + } + } else { + if (response.code == 200) { + this.$message.success('涓婁紶鎴愬姛') + this.selectList() + } + } + }, + handleCascader(e, label) { + this.upData[label] = e; + }, + // 鎵归噺鍒犻櫎 + batchDelete() { + if (this.multipleSelection && this.multipleSelection.length > 0) { + this.$confirm('鏄惁鍒犻櫎閫変腑鐨勬暟鎹�?', "璀﹀憡", { + confirmButtonText: "纭畾", + cancelButtonText: "鍙栨秷", + type: "warning" + }).then(() => { + this.$axios.post(this.delUrl, { + ids: JSON.stringify(this.multipleSelection.map(item => item.id)) + }).then(res => { + if (res.code === 201) { + return + } + this.$message.success('鍒犻櫎鎴愬姛') + this.selectList() + }).catch(e => { + this.$message.error('鍒犻櫎澶辫触') + }) + }).catch(() => {}) + } else { + this.$message.error('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁') + } + }, } } </script> -- Gitblit v1.9.3