From af029bdfb645bd2b75fbab687c1a5f45b428d801 Mon Sep 17 00:00:00 2001
From: inleft <inleft@qq.com>
Date: Thu, 11 Aug 2022 18:53:48 +0800
Subject: [PATCH] 优化上传逻辑,月台添加mini播放弹窗

---
 src/components/mini/box10-add.vue |  118 ++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 69 insertions(+), 49 deletions(-)

diff --git a/src/components/mini/box10-add.vue b/src/components/mini/box10-add.vue
index ab7f4ba..ef07260 100644
--- a/src/components/mini/box10-add.vue
+++ b/src/components/mini/box10-add.vue
@@ -21,18 +21,10 @@
 				</span>
 			</a-form-model-item>
 
-
 			<a-form-model-item label="日志文件" v-show="!form.online">
-				<!-- <a-upload action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
-					:default-file-list="form.blogFileList">
-					<a-button>
-						<a-icon type="upload" /> 限 markdown/html
-					</a-button>
-				</a-upload> -->
-
-				<a-upload :customRequest="customRequest" name="file" :showUploadList="true" @change="handleChange"
-					:default-file-list="form.blogFileList" :beforeUpload="beforeUpload">
-
+				<a-upload ref="blogFileUpload" :customRequest="customRequest" name="file" :showUploadList="true"
+					@change="handleChange" :default-file-list="form.blogFileList" :beforeUpload="beforeUpload"
+					:data="{'fileType':fileTypeMarkDown}" accept=".md,.html,.htm,.txt">
 					<a-button>
 						<a-icon type="upload" />限 markdown/html
 					</a-button>
@@ -67,14 +59,21 @@
 				</a-form-model-item>
 
 				<a-form-model-item label=" 日志类型">
-					<a-radio-group v-model="form.blogType">
-						<a-radio value="1">
+					<a-select v-model="form.blogType" mode="default" placeholder=""
+						:getPopupContainer="getCalendarContainer()">
+						<a-select-option value="1">
 							markdown
-						</a-radio>
-						<a-radio value="2">
+						</a-select-option>
+						<a-select-option value="2">
 							html
-						</a-radio>
-					</a-radio-group>
+						</a-select-option>
+						<a-select-option value="3">
+							video
+						</a-select-option>
+						<a-select-option value="5">
+							fast(闪念)
+						</a-select-option>
+					</a-select>
 				</a-form-model-item>
 
 
@@ -102,16 +101,11 @@
 
 
 				<a-form-model-item label="封面">
-					<!-- <a-upload action="https://www.mocky.io/v2/5cc8019d300000980a055e76" list-type="picture"
-						:default-file-list="form.coverFileList" class="upload-list-inline">
-						<a-button>
-							<a-icon type="upload" /> jpg/png/jpeg..
-						</a-button>
-					</a-upload> -->
-
 					<a-upload :customRequest="customRequest" name="file" :showUploadList="true" list-type="picture"
-						@change="handleChangeCoverFile"
-						:default-file-list="form.coverFileList">
+						:data="{'fileType':fileTypeCover}" @change="handleChangeCoverFile"
+						:default-file-list="form.coverFileList" :beforeUpload="beforeUploadCover"
+						accept=".jpg,.png,.jpeg">
+						<!-- :disabled="form.coverFileList.length>=1" -->
 						<a-button>
 							<a-icon type="upload" />jpg/png/jpeg..
 						</a-button>
@@ -184,13 +178,15 @@
 <script>
 	import moment from "moment";
 	import {
-		sysFileInfoUpload
+		sysFileInfoUpload,
+		myFileInfoUpload
 	} from '../../api/fileManage.js';
 
 	import {
 		queryBlogArticleType
 	} from '../../api/blogArticleType.js'
 
+	import myConstant from "../../config/myConstant.js"
 
 	export default {
 		beforeMount() {
@@ -199,18 +195,16 @@
 			})
 		},
 		data() {
-
+			let _this = this;
 			let validateContent = (rule, value, callback) => {
-				if (this.form.online) {
-					console.log("内容未填");
-					this.$refs.myForm.validateField('content')
-					if (this.form.content == null || this.form.content == "") {
+				if (_this.form.online) {
+					//this.$refs.myForm.validateField('content')
+					if (_this.form.content == null || _this.form.content == "") {
 						callback(new Error('内容未填'));
 					}
 				} else {
-					console.log("文件未传");
-					this.$refs.myForm.validateField('blogFileList')
-					if (this.form.fileId == null) {
+					//this.$refs.myForm.validateField('blogFileList')
+					if (_this.form.fileId == null) {
 						callback(new Error('文件未传'));
 					}
 				}
@@ -218,6 +212,8 @@
 			};
 
 			return {
+				fileTypeMarkDown: myConstant.fileTypeMarkDown,
+				fileTypeCover: myConstant.fileTypeCover,
 				blogArticleType: [],
 				tags: [],
 				inputVisible: false,
@@ -240,7 +236,7 @@
 					publishDate: "",
 					lock: false,
 					top: false,
-					sliderValue:50,
+					sliderValue: 50,
 					auth: 1,
 					password: "",
 					fileId: null,
@@ -291,21 +287,31 @@
 			};
 		},
 		methods: {
-			beforeUpload(file, fileList) {
+			reset() {
+				// this.form.blogFileList = [];
+				// this.form.coverFileList = [];
+			},
+			beforeUploadCover(file, fileList) {
 				return new Promise((resolve, reject) => {
-					if (this.form.fileId != null) {
+					if (this.form.coverFileList.length >= 1) {
 						this.$message.error('这里最多上传一个文件');
 						return reject(false);
 					}
-					// var testmsg=/^image\/(jpeg|png|jpg)$/.test(file.type)
-					// // var testmsg=/^image\/(md|html|markdown)$/.test(file.type)
-					// if (!testmsg) {
-					//   this.$message.error('上传文件格式不对!');
-					//   return reject(false);
-					// }
+					if (file.size > myConstant.uploadFileSizeLimit) {
+						this.$message.error('上传文件大小不能超过 2M!');
+						return reject(false);
+					}
+					return resolve(true)
+				});
+			},
+			beforeUpload(file, fileList) {
+				return new Promise((resolve, reject) => {
+					if (this.form.blogFileList.length >= 1) {
+						this.$message.error('这里最多上传一个文件');
+						return reject(false);
+					}
 
-					const isLt2M = file.size / 1024 / 1024 <= 2 //图片大小不超过2MB
-					if (!isLt2M) {
+					if (file.size > myConstant.uploadFileSizeLimit) {
 						this.$message.error('上传文件大小不能超过 2M!');
 						return reject(false);
 					}
@@ -314,6 +320,8 @@
 
 			},
 			handleChange(info) {
+				this.form.blogFileList = info.fileList;
+
 				if (info.file.status !== 'uploading') {
 					console.log(info.file, info.fileList);
 				}
@@ -323,8 +331,14 @@
 				} else if (info.file.status === 'error') {
 					this.$message.error(`${info.file.name} file upload failed.`);
 				}
+
+				if (this.form.blogFileList == null || this.form.blogFileList.length == 0) {
+					this.form.fileId = null
+				}
 			},
 			handleChangeCoverFile(info) {
+				this.form.coverFileList = info.fileList;
+
 				if (info.file.status !== 'uploading') {
 					console.log(info.file, info.fileList);
 				}
@@ -334,6 +348,10 @@
 				} else if (info.file.status === 'error') {
 					this.$message.error(`${info.file.name} file upload failed.`);
 				}
+
+				if (this.form.coverFileList == null || this.form.coverFileList.length == 0) {
+					this.form.coverFile = null
+				}
 			},
 			/**
 			 * 上传文件
@@ -341,7 +359,9 @@
 			customRequest(option) {
 				const formData = new FormData()
 				formData.append('file', option.file)
-				sysFileInfoUpload(formData).then((res) => {
+				formData.append('fileType', option.data.fileType)
+				formData.append('authCode', this.form.secret)
+				myFileInfoUpload(formData).then((res) => {
 					if (res.success) {
 						this.$message.success('上传成功')
 
@@ -358,9 +378,9 @@
 				return trigger => trigger.parentNode;
 			},
 			handleClose(removedTag) {
-				const tags = this.tags.filter(tag => tag !== removedTag);
+				// const tags = this.tags.filter(tag => tag !== removedTag);
 				//console.log(tags);
-				this.tags = tags;
+				this.tags = this.tags.filter(tag => tag !== removedTag);
 			},
 
 			showInput() {

--
Gitblit v1.9.1