Commit 1f36af8e6a3c8a3b5f274df7180b075bb268254f

Authored by YunaiV
1 parent b6cb6469

文件上传组件 FileUpload 上传报错的问题

yudao-ui-admin/src/components/FileUpload/index.vue
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 <!-- 文件列表 --> 28 <!-- 文件列表 -->
29 <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul"> 29 <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
30 <li :key="file.url" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList"> 30 <li :key="file.url" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
31 - <el-link :href="`${baseUrl}${file.url}`" :underline="false" target="_blank"> 31 + <el-link :href="`${file.url}`" :underline="false" target="_blank">
32 <span class="el-icon-document"> {{ getFileName(file.name) }} </span> 32 <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
33 </el-link> 33 </el-link>
34 <div class="ele-upload-list__item-content-action"> 34 <div class="ele-upload-list__item-content-action">
@@ -72,11 +72,8 @@ export default { @@ -72,11 +72,8 @@ export default {
72 return { 72 return {
73 number: 0, 73 number: 0,
74 uploadList: [], 74 uploadList: [],
75 - baseUrl: process.env.VUE_APP_BASE_API,  
76 - uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址  
77 - headers: {  
78 - Authorization: "Bearer " + getAccessToken(),  
79 - }, 75 + uploadFileUrl: process.env.VUE_APP_BASE_API + "/admin-api/infra/file/upload", // 请求地址
  76 + headers: { Authorization: "Bearer " + getAccessToken() }, // 设置上传的请求头部
80 fileList: [], 77 fileList: [],
81 }; 78 };
82 }, 79 },
@@ -121,8 +118,7 @@ export default { @@ -121,8 +118,7 @@ export default {
121 } 118 }
122 const isTypeOk = this.fileType.some((type) => { 119 const isTypeOk = this.fileType.some((type) => {
123 if (file.type.indexOf(type) > -1) return true; 120 if (file.type.indexOf(type) > -1) return true;
124 - if (fileExtension && fileExtension.indexOf(type) > -1) return true;  
125 - return false; 121 + return !!(fileExtension && fileExtension.indexOf(type) > -1);
126 }); 122 });
127 if (!isTypeOk) { 123 if (!isTypeOk) {
128 this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`); 124 this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
@@ -152,7 +148,8 @@ export default { @@ -152,7 +148,8 @@ export default {
152 }, 148 },
153 // 上传成功回调 149 // 上传成功回调
154 handleUploadSuccess(res) { 150 handleUploadSuccess(res) {
155 - this.uploadList.push({ name: res.fileName, url: res.fileName }); 151 + // edit by 芋道源码
  152 + this.uploadList.push({ name: res.data, url: res.data });
156 if (this.uploadList.length === this.number) { 153 if (this.uploadList.length === this.number) {
157 this.fileList = this.fileList.concat(this.uploadList); 154 this.fileList = this.fileList.concat(this.uploadList);
158 this.uploadList = []; 155 this.uploadList = [];
@@ -181,7 +178,7 @@ export default { @@ -181,7 +178,7 @@ export default {
181 for (let i in list) { 178 for (let i in list) {
182 strs += list[i].url + separator; 179 strs += list[i].url + separator;
183 } 180 }
184 - return strs != '' ? strs.substr(0, strs.length - 1) : ''; 181 + return strs !== '' ? strs.substr(0, strs.length - 1) : '';
185 } 182 }
186 } 183 }
187 }; 184 };
yudao-ui-admin/src/views/system/oauth2/client/index.vue
@@ -70,7 +70,8 @@ @@ -70,7 +70,8 @@
70 <el-input v-model="form.name" placeholder="请输入应用名" /> 70 <el-input v-model="form.name" placeholder="请输入应用名" />
71 </el-form-item> 71 </el-form-item>
72 <el-form-item label="应用图标"> 72 <el-form-item label="应用图标">
73 - <imageUpload v-model="form.logo" :limit="1"/> 73 +<!-- <imageUpload v-model="form.logo" :limit="1"/>-->
  74 + <file-upload v-model="form.logo" :limit="1"/>
74 </el-form-item> 75 </el-form-item>
75 <el-form-item label="应用描述"> 76 <el-form-item label="应用描述">
76 <el-input type="textarea" v-model="form.description" placeholder="请输入应用名" /> 77 <el-input type="textarea" v-model="form.description" placeholder="请输入应用名" />
@@ -104,10 +105,12 @@ import { createOAuth2Client, updateOAuth2Client, deleteOAuth2Client, getOAuth2Cl @@ -104,10 +105,12 @@ import { createOAuth2Client, updateOAuth2Client, deleteOAuth2Client, getOAuth2Cl
104 import ImageUpload from '@/components/ImageUpload'; 105 import ImageUpload from '@/components/ImageUpload';
105 import Editor from '@/components/Editor'; 106 import Editor from '@/components/Editor';
106 import {CommonStatusEnum} from "@/utils/constants"; 107 import {CommonStatusEnum} from "@/utils/constants";
  108 +import FileUpload from "@/components/FileUpload";
107 109
108 export default { 110 export default {
109 name: "OAuth2Client", 111 name: "OAuth2Client",
110 components: { 112 components: {
  113 + FileUpload,
111 ImageUpload, 114 ImageUpload,
112 Editor, 115 Editor,
113 }, 116 },