From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/components/Table/lims-table.vue | 197 ++++++++++++++++++++++++++++--------------------
1 files changed, 114 insertions(+), 83 deletions(-)
diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index bd77bc9..2df0ddc 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -11,10 +11,10 @@
<el-table-column v-for="(item, index) in column" :key="index" :column-key="item.columnKey"
:filter-method="item.filterHandler" :filter-multiple="item.filterMultiple" :filtered-value="item.filteredValue"
- :filters="item.filters" :fixed="item.fixed" :label="item.label" :min-width="item.minWidth" :prop="item.prop"
- :show-overflow-tooltip="item.dataType === 'action' || item.dataType === 'slot' ? false : true" :sortable="item.sortable ? true : false"
- :type="item.type" :width="item.dataType === 'action' ? getWidth(item.operation) : item.width
- " align="center">
+ :filters="item.filters" :fixed="item.fixed" :label="item.label" :prop="item.prop"
+ :show-overflow-tooltip="item.dataType === 'action' || item.dataType === 'slot' ? false : true"
+ :min-width="item.dataType == 'action' ? btnWidth : item.width"
+ :sortable="item.sortable ? true : false" :type="item.type" :width="item.dataType == 'action' ? btnWidth : item.width" align="center">
<!-- <div class="123" v-if="item.type == ''"> -->
<template v-if="item.hasOwnProperty('colunmTemplate')" :slot="item.colunmTemplate" slot-scope="scope">
<slot v-if="item.theadSlot" :index="index" :name="item.theadSlot" :row="scope.row" />
@@ -31,7 +31,8 @@
</div>
<!-- 鍥剧墖 -->
<div v-else-if="item.dataType == 'image'">
- <img :src="javaApi + '/img/' + item.prop" alt="" style="width: 40px; height: 40px; margin-top: 10px" />
+ <img :src="javaApi + '/img/' + scope.row[item.prop]" alt=""
+ style="width: 40px; height: 40px; margin-top: 10px" />
</div>
<!-- tag -->
@@ -62,32 +63,29 @@
</div>
<!-- 鎸夐挳 -->
- <div v-else-if="item.dataType == 'action'">
+ <div v-else-if="item.dataType == 'action'"
+ :style="`min-width:${getWidth(item.operation, scope.row)}`">
<template v-for="(o, key) in item.operation">
- <el-button v-show="o.type != 'upload'" size="mini"
- v-if="o.showHide ? o.showHide(scope.row) : true"
+ <el-button v-show="o.type != 'upload'" size="mini" v-if="o.showHide ? o.showHide(scope.row) : true"
:disabled="o.disabled ? o.disabled(scope.row) : false" :icon="iconFn(o)" :plain="o.plain"
:style="{ color: o.name === '鍒犻櫎' ? '#f56c6c' : o.color }" :type="o.type | typeFn(scope.row)"
@click="o.clickFun(scope.row)" :key="key">
{{ o.name }}
</el-button>
- <el-upload
- :action="javaApi + o.url +'?id=' +(o.uploadIdFun ? o.uploadIdFun(scope.row): scope.row.id) "
- size="mini"
- ref="upload"
- :multiple="o.multiple ? o.multiple : false"
- :limit="1"
+ <el-upload :action="javaApi + o.url + '?id=' + (o.uploadIdFun ? o.uploadIdFun(scope.row) : scope.row.id)"
+ :key="uploadKeys[scope.$index]"
+ ref="uploadRef"
+ size="mini" :multiple="o.multiple ? o.multiple : false" :limit="1"
:disabled="o.disabled ? o.disabled(scope.row) : false" :accept="o.accept
? o.accept
: '.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'
- "
- v-if="o.type == 'upload'" style="display: inline-block; width: 50px"
- v-show="o.showHide ? o.showHide(scope.row) : true"
- :headers="uploadHeader"
- :on-error="onError"
- :on-exceed="onExceed"
- :on-success="handleSuccessUp"
- :show-file-list="false" :key="key">
+ " v-if="o.type == 'upload'" style="display: inline-block; width: 50px"
+ v-show="o.showHide ? o.showHide(scope.row) : true" :headers="uploadHeader"
+ :before-upload="(file) => beforeUpload(file, scope.$index)"
+ :on-change="(file, fileList) => handleChange(file, fileList, scope.$index)"
+ :on-error="(error, file, fileList) => onError(error, file, fileList, scope.$index)"
+ :on-success="(response, file, fileList) => handleSuccessUp(response, file, fileList, scope.$index)"
+ :on-exceed="onExceed" :show-file-list="false">
<el-button :size="o.size ? o.size : 'small'" type="text"
:disabled="o.disabled ? o.disabled(scope.row) : false">{{ o.name }}</el-button>
</el-upload>
@@ -167,7 +165,6 @@
name: "ZTTable",
filters: {
typeFn(val, row) {
- // console.log(val, row, '11111111');
if (typeof val === "function") {
return val(row);
} else return val;
@@ -240,7 +237,7 @@
},
rowStyle: {
type: Object || Function,
- default: () => { },
+ default: () => null,
},
tableData: {
type: Array,
@@ -267,32 +264,70 @@
data() {
return {
spanList: [],
+ btnWidth: "120px",
+ uploadRefs: [],
+ currentFiles: {}, // 鐢ㄤ簬瀛樺偍姣忚鐨勫綋鍓嶆枃浠�
+ uploadKeys: {} // 鐢ㄤ簬鍔ㄦ�侀噸缃粍浠�
};
},
mounted() {
this.calculateSpanInfo();
+ this.$nextTick(() => {
+ this.$refs.multipleTable.doLayout();
+ this.tableData.forEach((_, index) => {
+ if (this.$refs.uploadRef) {
+ this.$refs.uploadRef[index] = this.$refs.uploadRef[index] || {};
+ }
+ });
+ })
+ },
+ watch: {
+ tableData: {
+ handler() {
+ // 褰撹〃鏍兼暟鎹彉鍖栨椂锛屽垵濮嬪寲 uploadKeys
+ this.tableData.forEach((_, index) => {
+ this.$set(this.uploadKeys, index, Date.now());
+ });
+ },
+ immediate: true
+ }
},
methods: {
- getWidth(row) {
+ getWidth(row, row0) {
let count = 0;
row.forEach((a) => {
- count += a.name.length;
+ if (a.showHide !== undefined && a.showHide(row0)) {
+ count += a.name.length;
+ } else if (!a.showHide) {
+ count += a.name.length;
+ }
});
- return count * 15 + 70 + "px";
+ this.btnWidth = count * 15 + 60 + "px";
+ return count * 15 + 60 + "px";
+ },
+ getTitleWidth(row) {
+ if (row.label.includes('鏃堕棿') || row.label.includes('缂栧彿') || row.label.includes('鏍峰搧鍚嶇О') || row.label.includes('闆朵欢')) {
+ return 160
+ } else if (row.label.includes('鎿嶄綔')) {
+ return row.width
+ } else {
+ const span = document.createElement('span');
+ span.innerText = row.label;
+ document.body.appendChild(span);
+ const width = `${span.offsetWidth + 50}px`;
+ document.body.removeChild(span);
+
+ return width;
+ }
},
iconFn(row) {
if (row.name === "缂栬緫" || row.name === "淇敼") {
return "el-icon-edit";
- } else if (row.name === "鍒犻櫎") {
- return "el-icon-delete";
} else if (row.name === "鏌ョ湅") {
return "el-icon-view";
} else {
return row.icon;
}
- // if (typeof (val) === 'function') {
- // return val(row);
- // } else return val;
},
formatType(val, format) {
if (typeof format === "function") {
@@ -307,21 +342,53 @@
setCurrent(row) {
this.$refs.multipleTable.setCurrentRow();
},
- handleSuccessUp(response, label) {
- if (typeof label === "string") {
- if (response.code == 200) {
- this.upData[label] = response.data.url;
+ handleSuccessUp(response, file, fileList, index) {
+ if (response.code == 200) {
+ // 娓呴櫎鏂囦欢鍒楄〃骞舵洿鏂板綋鍓嶆枃浠�
+ if (this.uploadRefs[index]) {
+ this.uploadRefs[index].clearFiles();
}
+ this.currentFiles[index] = file;
+ this.$message.success("涓婁紶鎴愬姛");
+ // 閲嶇疆缁勪欢鐘舵��
+ this.resetUploadComponent(index);
+
} else {
- if (response.code == 200) {
- this.$message.success("涓婁紶鎴愬姛");
- }
+ this.$message.error(response.message);
}
},
- onError(err, file, fileList) {
- this.$message.error("涓婁紶澶辫触");
- this.$refs.upload.clearFiles();
- this.uploading = false;
+ resetUploadComponent(index) {
+ // 鍔ㄦ�佹敼鍙� key 鏉ュ己鍒堕噸缃粍浠�
+ this.uploadKeys[index] = Date.now(); // 浣跨敤鏃堕棿鎴充綔涓烘柊鐨� key
+ },
+ handleChange(file, fileList, index) {
+ // 濡傛灉鏂囦欢鏁伴噺瓒呰繃闄愬埗锛岀Щ闄ゆ渶鏃╃殑鏂囦欢
+ if (fileList.length > 1) {
+ // 绉婚櫎鏈�鏃╃殑鏂囦欢
+ const earliestFile = fileList[0];
+ this.uploadRefs[index].handleRemove(earliestFile);
+ }
+
+ // 鏇存柊褰撳墠鏂囦欢
+ this.currentFiles[index] = file;
+ },
+ beforeUpload (file, index) {
+ this.currentFiles[index] = {}
+ if (file.size > 1024 * 1024 * 10) {
+ this.$message.error('涓婁紶鏂囦欢涓嶈秴杩�10M');
+ // this.$refs.upload.clearFiles()
+ return false;
+ } else {
+ return true;
+ }
+ },
+ onError(error, file, fileList, index) {
+ this.$message.error('鏂囦欢涓婁紶澶辫触锛岃閲嶈瘯');
+
+ // 娓呴櫎鏂囦欢鍒楄〃
+ if (this.uploadRefs[index]) {
+ this.uploadRefs[index].clearFiles();
+ }
},
onExceed() {
this.$message.warning("瓒呭嚭鏂囦欢涓暟");
@@ -330,7 +397,6 @@
this.$emit("pagination", { page: page, limit: limit });
},
indexMethod(index) {
- // return index * 2;
return (this.page.current - 1) * this.page.size + index + 1;
},
// 鐐瑰嚮鍗曞厓鏍糽ink浜嬩欢
@@ -399,28 +465,6 @@
};
}
}
- // // 鐗规畩鐨勫悎骞惰
- // 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,
- // };
- // }
- // }
},
},
};
@@ -431,10 +475,13 @@
text-align: center;
}
+.link {
+ color: rgb(64, 158, 255);
+ cursor: pointer;
+}
>>>.cell {
padding: 0 !important;
}
-
.cell {
white-space: nowrap;
overflow: hidden;
@@ -443,17 +490,6 @@
padding-left: 10px !important;
}
-.link {
- color: rgb(64, 158, 255);
- cursor: pointer;
-}
-
->>>.el-table__body-wrapper::-webkit-scrollbar {
- height: 14px;
- /* 璁剧疆婊氬姩鏉″搴� */
-}
-</style>
-<style>
.lims-table .highlight-warning-row-border td:first-child {
border-left: 4px solid #ffcd29;
}
@@ -461,11 +497,6 @@
.lims-table .highlight-warning-row-border td:last-child {
border-right: 4px solid #ffcd29;
}
-
-/* .lims-table .highlight-danger-row-border td {
- border-top: 2px solid red;
- border-bottom: 2px solid red;
- } */
.lims-table .highlight-danger-row-border td:first-child {
border-left: 4px solid #f56c6c;
--
Gitblit v1.9.3