From 2f5d64825dbc81f9732893ee9f3de1a38725ae25 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 10 三月 2025 17:12:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/components/Table/value-table.vue | 45 +++++++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/src/components/Table/value-table.vue b/src/components/Table/value-table.vue
index 34561e0..ec9f177 100644
--- a/src/components/Table/value-table.vue
+++ b/src/components/Table/value-table.vue
@@ -152,8 +152,8 @@
<!-- 鍙搷浣滆杩涜鐐瑰嚮浜嬩欢 -->
<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 v-else-if="showUpload(a.label) && scope.row[a.label]" :src="javaApi + '/img/' + scope.row[a.label]" alt=""
- style="width: 40px;height: 40px;margin-top: 10px;">
+ <img v-else-if="showUpload(a.label) && scope.row[a.label]" :src="javaApi + '/img/' + scope.row[a.label]"
+ alt="" style="width: 40px;height: 40px;margin-top: 10px;">
<span v-else :class="{ red: getRedColor(a.label, scope.row) }">{{ scope.row[a.label] }}</span>
</template>
</el-table-column>
@@ -165,8 +165,9 @@
<span v-if="a.type != 'upload'">{{ a.font }}</span>
<el-upload v-else ref='upload' :accept='a.uploadConfig.accept'
:action="javaApi + a.uploadConfig.url + '?id=' + (a.uploadConfig.uploadIdFun ? a.uploadConfig.uploadIdFun(scope.row) : scope.row.id)"
- :disabled="a.disabled ? a.disabled(scope.row, scope.$index) : false" :headers="token" :on-error="onError"
- :on-success="handleSuccessUp" :show-file-list="false" name="file" style="background: transparent;">
+ :disabled="a.disabled ? a.disabled(scope.row, scope.$index) : false" :headers="uploadHeader"
+ :on-error="onError" :on-success="handleSuccessUp" :show-file-list="false" name="file"
+ style="background: transparent;">
<span>{{ a.font }}</span>
</el-upload>
</el-button>
@@ -189,7 +190,8 @@
<span v-if="showUpReq(a.label)" class="required-span">* </span>{{ a.value }}锛�
</el-col>
<el-col :span="16 / data.row">
- <el-input v-if="showType(a.label, data.selectField) == null && !showUpload(a.label) && !showCascader(a.label)"
+ <el-input
+ v-if="showType(a.label, data.selectField) == null && !showUpload(a.label) && !showCascader(a.label)"
v-model="upData[a.label]" :disabled="isDisabled(a.label)" :placeholder="`璇疯緭鍏�${a.value}`" clearable
size="small"></el-input>
<el-select v-if="showType(a.label, data.selectField) != null" v-model="upData[a.label]"
@@ -201,8 +203,9 @@
</el-option>
</el-select>
<el-upload v-if="showUpload(a.label)" ref='upload' :accept='data.addUploadConfig.accept'
- :action="javaApi + data.addUploadConfig.url" :headers="token" :multiple="false" :on-error="onError"
- :on-success="m => handleSuccessUp(m, a.label)" :show-file-list="false" class="avatar-uploader" name="file"
+ :action="javaApi + data.addUploadConfig.url" :headers="uploadHeader" :multiple="false"
+ :on-error="onError" :on-success="m => handleSuccessUp(m, a.label)" :show-file-list="false"
+ class="avatar-uploader" name="file"
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;">
@@ -221,7 +224,8 @@
<span v-if="showUpReq(a.label)" class="required-span">* </span>{{ a.value }}锛�
</el-col>
<el-col :offset="1" :span="16">
- <el-input v-if="showType(a.label, data.selectField) == null && !showUpload(a.label) && !showCascader(a.label)"
+ <el-input
+ v-if="showType(a.label, data.selectField) == null && !showUpload(a.label) && !showCascader(a.label)"
v-model="upData[a.label]" :disabled="isDisabled(a.label)" :placeholder="`璇疯緭鍏�${a.value}`" clearable
size="small"></el-input>
<el-select v-if="showType(a.label, data.selectField) != null" v-model="upData[a.label]"
@@ -231,8 +235,9 @@
:value="b.value"></el-option>
</el-select>
<el-upload v-if="showUpload(a.label)" ref='upload' :accept='data.addUploadConfig.accept'
- :action="javaApi + data.addUploadConfig.url" :headers="token" :multiple="false" :on-error="onError"
- :on-success="m => handleSuccessUp(m, a.label)" :show-file-list="false" class="avatar-uploader" name="file"
+ :action="javaApi + data.addUploadConfig.url" :headers="uploadHeader" :multiple="false"
+ :on-error="onError" :on-success="m => handleSuccessUp(m, a.label)" :show-file-list="false"
+ class="avatar-uploader" name="file"
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;">
@@ -260,7 +265,8 @@
class="required-span">*
</span>{{ a.value }}锛�</el-col>
<el-col :span="16 / data.row">
- <el-input v-if="showType(a.label, data.selectField) == null && !showUpload(a.label) && !showCascader(a.label)"
+ <el-input
+ v-if="showType(a.label, data.selectField) == null && !showUpload(a.label) && !showCascader(a.label)"
v-model="upData[a.label]" :placeholder="`璇疯緭鍏�${a.value}`" clearable size="small"></el-input>
<el-select v-if="showType(a.label, data.selectField) != null" v-model="upData[a.label]"
:multiple="data.selectField[a.label].choose" :placeholder="`璇烽�夋嫨${a.value}`" clearable filterable
@@ -269,8 +275,9 @@
:value="b.value"></el-option>
</el-select>
<el-upload v-if="showUpload(a.label)" ref='upload' :accept='data.addUploadConfig.accept'
- :action="javaApi + data.addUploadConfig.url" :headers="token" :multiple="false" :on-error="onError"
- :on-success="m => handleSuccessUp(m, a.label)" :show-file-list="false" class="avatar-uploader" name="file"
+ :action="javaApi + data.addUploadConfig.url" :headers="uploadHeader" :multiple="false"
+ :on-error="onError" :on-success="m => handleSuccessUp(m, a.label)" :show-file-list="false"
+ class="avatar-uploader" name="file"
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;">
@@ -287,7 +294,8 @@
<el-col :span="6" style="text-align: right;"><span v-if="showAddReq(a.label)" class="required-span">*
</span>{{ a.value }}锛�</el-col>
<el-col :offset="1" :span="16">
- <el-input v-if="showType(a.label, data.selectField) == null && !showUpload(a.label) && !showCascader(a.label)"
+ <el-input
+ v-if="showType(a.label, data.selectField) == null && !showUpload(a.label) && !showCascader(a.label)"
v-model="upData[a.label]" :placeholder="`璇疯緭鍏�${a.value}`" clearable size="small"></el-input>
<el-select v-if="showType(a.label, data.selectField) != null" v-model="upData[a.label]"
:multiple="data.selectField[a.label].choose" :placeholder="`璇烽�夋嫨${a.value}`" clearable size="small"
@@ -296,8 +304,9 @@
:value="b.value"></el-option>
</el-select>
<el-upload v-if="showUpload(a.label)" ref='upload' :accept='data.addUploadConfig.accept'
- :action="javaApi + data.addUploadConfig.url" :headers="token" :multiple="false" :on-error="onError"
- :on-success="m => handleSuccessUp(m, a.label)" :show-file-list="false" class="avatar-uploader" name="file"
+ :action="javaApi + data.addUploadConfig.url" :headers="uploadHeader" :multiple="false"
+ :on-error="onError" :on-success="m => handleSuccessUp(m, a.label)" :show-file-list="false"
+ class="avatar-uploader" name="file"
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;">
@@ -328,8 +337,8 @@
<el-dialog :visible.sync="uploadDia" title="鏁版嵁瀵煎叆" width="500px">
<div style="margin: 0 auto;">
<el-upload ref="upload" :accept="data.accept === undefined ? '.csv' : data.accept" :action="javaApi + inputUrl"
- :auto-upload="false" :data="{ param: data.uploadStr }" :file-list="fileList" :headers="token" :limit="1"
- :on-change="beforeUpload" :on-error="onError" :on-success="onSuccess" drag name="file">
+ :auto-upload="false" :data="{ param: data.uploadStr }" :file-list="fileList" :headers="uploadHeader"
+ :limit="1" :on-change="beforeUpload" :on-error="onError" :on-success="onSuccess" drag name="file">
<i class="el-icon-upload"></i>
<div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
</el-upload>
--
Gitblit v1.9.3