From fc621495bc5a887b2654cc18d0ab7511f9a8d36a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 08 五月 2025 17:45:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/components/PIMTable/PIMTable.vue | 149 ++++++++++++++++++++-----------------------------
1 files changed, 62 insertions(+), 87 deletions(-)
diff --git a/src/components/PIMTable/PIMTable.vue b/src/components/PIMTable/PIMTable.vue
index 747ef53..2378c5e 100644
--- a/src/components/PIMTable/PIMTable.vue
+++ b/src/components/PIMTable/PIMTable.vue
@@ -1,22 +1,20 @@
<template>
<el-table ref="multipleTable" v-loading="tableLoading" :border="border" :data="tableData"
- :header-cell-style="{ background: '#F0F1F5', color: '#333333' }" :height="height"
- :highlight-current-row="highlightCurrentRow" :row-class-name="rowClassName" :row-style="rowStyle"
- :row-key="rowKey" :span-method="spanMethod" stripe style="width: 100%" tooltip-effect="dark" @row-click="rowClick"
- @current-change="currentChange" @selection-change="handleSelectionChange" class="lims-table">
- <el-table-column align="center" type="selection" width="55" v-if="isSelection" />
- <el-table-column align="center" label="搴忓彿" type="index" width="60" :index="indexMethod" />
-
+ :header-cell-style="{ background: '#F0F1F5', color: '#333333' }" height="calc(100vh - 18.5em)"
+ :highlight-current-row="highlightCurrentRow" :row-class-name="rowClassName" :row-style="rowStyle" :row-key="rowKey"
+ style="width: 100%" tooltip-effect="dark" @row-click="rowClick" @current-change="currentChange"
+ @selection-change="handleSelectionChange" class="lims-table">
+ <el-table-column align="center" type="selection" width="55" />
+ <el-table-column align="center" label="搴忓彿" type="index" width="60" />
+
<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" :prop="item.prop"
- :show-overflow-tooltip="!(item.dataType === 'action' || item.dataType === 'slot')"
- :min-width="item.dataType == 'action' ? btnWidth : item.width"
- :sortable="!!item.sortable" :type="item.type" :width="item.dataType == 'action' ? btnWidth : item.width" align="center">
+ :filter-method="item.filterHandler" :filter-multiple="item.filterMultiple" :filtered-value="item.filteredValue"
+ :filters="item.filters" :fixed="item.fixed" :label="item.label" :prop="item.prop" show-overflow-tooltip
+ :align="item.align" :sortable="!!item.sortable" :type="item.type" :width="item.width">
<template v-if="item.hasOwnProperty('colunmTemplate')" #[item.colunmTemplate]="scope">
<slot v-if="item.theadSlot" :name="item.theadSlot" :index="scope.$index" :row="scope.row" />
</template>
-
+
<template #default="scope">
<!-- 鎻掓Ы -->
<div v-if="item.dataType == 'slot'">
@@ -28,57 +26,58 @@
</div>
<!-- 鍥剧墖 -->
<div v-else-if="item.dataType == 'image'">
- <img :src="javaApi + '/img/' + scope.row[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 -->
<div v-else-if="item.dataType == 'tag'">
<el-tag v-if="typeof dataTypeFn(scope.row[item.prop], item.formatData) === 'string'"
- :title="formatters(scope.row[item.prop], item.formatData)"
- :type="formatType(scope.row[item.prop], item.formatType)">
+ :title="formatters(scope.row[item.prop], item.formatData)"
+ :type="formatType(scope.row[item.prop], item.formatType)">
{{ formatters(scope.row[item.prop], item.formatData) }}
</el-tag>
-
+
<el-tag v-for="(tag, index) in dataTypeFn(scope.row[item.prop], item.formatData)"
- v-else-if="typeof dataTypeFn(scope.row[item.prop], item.formatData) === 'object'"
- :key="index" :title="formatters(scope.row[item.prop], item.formatData)" :type="formatType(tag, item.formatType)">
+ v-else-if="typeof dataTypeFn(scope.row[item.prop], item.formatData) === 'object'" :key="index"
+ :title="formatters(scope.row[item.prop], item.formatData)" :type="formatType(tag, item.formatType)">
{{ item.tagGroup ? tag[item.tagGroup.label] ?? tag : tag }}
</el-tag>
-
- <el-tag v-else :title="formatters(scope.row[item.prop], item.formatData)" :type="formatType(scope.row[item.prop], item.formatType)">
+
+ <el-tag v-else :title="formatters(scope.row[item.prop], item.formatData)"
+ :type="formatType(scope.row[item.prop], item.formatType)">
{{ formatters(scope.row[item.prop], item.formatData) }}
</el-tag>
</div>
-
+
<!-- 鎸夐挳 -->
- <div v-else-if="item.dataType == 'action'"
- :style="`min-width:${getWidth(item.operation, scope.row)}`">
+ <div v-else-if="item.dataType == 'action'">
<template v-for="(o, key) in item.operation" :key="key">
<el-button v-show="o.type != 'upload'" size="small" v-if="o.showHide ? o.showHide(scope.row) : true"
- :disabled="o.disabled ? o.disabled(scope.row) : false" :plain="o.plain"
- :style="{ color: (o.name === '鍒犻櫎' || o.name === 'delete') ? '#f56c6c' : o.color }" :type="typeFn(o.type, scope.row)"
- @click="o.clickFun(scope.row)" :key="key">
+ :disabled="o.disabled ? o.disabled(scope.row) : false" :plain="o.plain" type="primary"
+ :style="{ color: (o.name === '鍒犻櫎' || o.name === 'delete') ? '#f56c6c' : o.color }" link
+ @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)"
- ref="uploadRef" size="small" :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"
- :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>
+ ref="uploadRef" size="small" :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"
+ :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'" link type="primary"
+ :disabled="o.disabled ? o.disabled(scope.row) : false">{{ o.name }}</el-button>
</el-upload>
</template>
</div>
<!-- 鍙偣鍑荤殑鏂囧瓧 -->
<div v-else-if="item.dataType == 'link'" class="cell link" style="width: 100%"
- @click="goLink(scope.row, item.linkMethod)">
+ @click="goLink(scope.row, item.linkMethod)">
<span v-if="!item.formatData">{{ scope.row[item.prop] }}</span>
</div>
<!-- 榛樿绾睍绀烘暟鎹� -->
@@ -89,8 +88,8 @@
</template>
</el-table-column>
</el-table>
- <pagination v-show="page.total > 0" :total="page.total" :layout="page.layout" :page="page.current"
- :limit="page.size" @pagination="paginationSearch" />
+ <pagination v-show="total > 0" :total="total" :layout="page.layout" :page="page.current" :limit="page.size"
+ @pagination="paginationSearch" />
</template>
<script setup>
@@ -103,6 +102,8 @@
const uploadHeader = proxy.uploadHeader
const javaApi = proxy.javaApi
+const emit = defineEmits(["pagination"]);
+
// Filters
const typeFn = (val, row) => {
return typeof val === 'function' ? val(row) : val
@@ -114,29 +115,21 @@
// Props锛堜娇鐢� defineProps 鐨勯潪 TS 褰㈠紡锛�
const props = defineProps({
- isSelection: {
- type: Boolean,
- default: false
- },
- height: {
- type: [String, null],
- default: null
- },
tableLoading: {
type: Boolean,
default: false
},
handleSelectionChange: {
type: Function,
- default: () => {}
+ default: () => { }
},
rowClick: {
type: Function,
- default: () => {}
+ default: () => { }
},
currentChange: {
type: Function,
- default: () => {}
+ default: () => { }
},
border: {
type: Boolean,
@@ -178,50 +171,21 @@
size: 10,
layout: 'total, sizes, prev, pager, next, jumper'
})
+ },
+ total: {
+ type: Number,
+ default: 0
}
})
// Data
-const spanList = ref([])
const btnWidth = ref('120px')
const uploadRefs = ref([])
const currentFiles = ref({})
const uploadKeys = ref({})
-// 鍚堝苟鍗曞厓鏍兼柟娉�
-const spanMethod = ({ row, column, rowIndex, columnIndex }) => {
- if (column.find((m) => m.mergeCol)) {
- let i = Number(rowIndex)
- const obj = spanList.value.find((item, index) => {
- i = index
- return item.index == columnIndex
- })
- if (obj) {
- const _row = spanList[i].arr[rowIndex]
- const _col = _row > 0 ? 1 : 0
- return {
- rowspan: _row,
- colspan: _col
- }
- }
- }
-}
-
const indexMethod = (index) => {
return (props.page.current - 1) * props.page.size + index + 1
-}
-
-const getWidth = (row, row0) => {
- let count = 0
- row.forEach((a) => {
- if (a.showHide !== undefined && a.showHide(row0)) {
- count += a.name.length
- } else if (!a.showHide) {
- count += a.name.length
- }
- })
- btnWidth.value = count * 15 + 60 + "px"
- return count * 15 + 60 + "px"
}
// 鐐瑰嚮 link 浜嬩欢
@@ -311,4 +275,15 @@
</script>
<style scoped lang="scss">
+:deep(.cell) {
+ padding: 0 !important;
+}
+
+.cell {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ padding-right: 0 !important;
+ padding-left: 0 !important;
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3