From 63f5119bcc714c36fe8db21e5461d73eb5a0eaa0 Mon Sep 17 00:00:00 2001
From: inleft <inleft@qq.com>
Date: Mon, 21 Feb 2022 18:47:52 +0800
Subject: [PATCH] 统计数据添加,文章接口对接

---
 src/components/mini/box10-add.vue |  108 ++++++++++++++++++++----------------------------------
 1 files changed, 40 insertions(+), 68 deletions(-)

diff --git a/src/components/mini/box10-add.vue b/src/components/mini/box10-add.vue
index 437000d..70509ef 100644
--- a/src/components/mini/box10-add.vue
+++ b/src/components/mini/box10-add.vue
@@ -31,9 +31,7 @@
 				</a-upload> -->
 
 				<a-upload :customRequest="customRequest" name="file" :showUploadList="true" @change="handleChange"
-					:default-file-list="form.blogFileList" 
-					:beforeUpload="beforeUpload"
-					>
+					:default-file-list="form.blogFileList" :beforeUpload="beforeUpload">
 
 					<a-button>
 						<a-icon type="upload" />限 markdown/html
@@ -41,7 +39,7 @@
 				</a-upload>
 			</a-form-model-item>
 
-			<a-form-model-item label="日志内容" v-show="form.online" prop="content">
+			<a-form-model-item label="日志内容" v-show="form.online">
 				<a-input v-model="form.content" type="textarea" placeholder="限10k字数" />
 			</a-form-model-item>
 
@@ -187,9 +185,12 @@
 	import {
 		sysFileInfoUpload
 	} from '../../api/fileManage.js';
+
 	import {
 		queryBlogArticleType
 	} from '../../api/blogArticleType.js'
+
+
 	export default {
 		beforeMount() {
 			queryBlogArticleType({}).then((res) => {
@@ -202,25 +203,21 @@
 				if (this.form.online) {
 					console.log("内容未填");
 					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.blogFileList == null || this.form.blogFileList.length == 0) {
+						callback(new Error('文件未传'));
+					}
 				}
 				callback();
 			};
 
 			return {
 				blogArticleType: [],
-				// blogFileList: [],
-				// coverFileList: [
-				// 	// {
-				// 	// uid: '-1',
-				// 	// name: 'xxx.png',
-				// 	// status: 'done',
-				// 	// url: 'https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png',
-				// 	// thumbUrl: 'https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png',
-				// 	// } 
-				// ],
 				tags: [],
 				inputVisible: false,
 				inputValue: '',
@@ -254,7 +251,7 @@
 							trigger: 'blur'
 						},
 						{
-							min: 5,
+							min: 1,
 							max: 50,
 							message: '字数限制1~50',
 							trigger: 'blur'
@@ -269,48 +266,23 @@
 						validator: validateContent,
 						trigger: []
 					}],
-					content: [{
-						max: 10,
-						required: true,
-						message: '至少填一下上传内容',
-						trigger: 'blur'
-					}, ],
-					blogFileList: [{
-						max: 1,
-						required: true,
-						message: '文件未上传',
-					}],
+					// content: [{
+					// 	max: 10,
+					// 	required: true,
+					// 	message: '至少填一下上传内容',
+					// 	trigger: 'blur'
+					// }, ],
+					// blogFileList: [{
+					// 	max: 1,
+					// 	required: true,
+					// 	message: '文件未上传',
+					// }],
 					class: [{
 						required: true,
 						message: '至少选一个分类',
 						trigger: 'blur'
 					}, ],
-					// region: [{
-					// 	required: true,
-					// 	message: 'Please select Activity zone',
-					// 	trigger: 'change'
-					// }],
-					// date1: [{
-					// 	required: true,
-					// 	message: 'Please pick a date',
-					// 	trigger: 'change'
-					// }],
-					// type: [{
-					// 	type: 'array',
-					// 	required: true,
-					// 	message: 'Please select at least one activity type',
-					// 	trigger: 'change',
-					// }, ],
-					// resource: [{
-					// 	required: true,
-					// 	message: 'Please select activity resource',
-					// 	trigger: 'change'
-					// }, ],
-					// desc: [{
-					// 	required: true,
-					// 	message: 'Please input activity form',
-					// 	trigger: 'blur'
-					// }],
+
 				}
 			};
 		},
@@ -319,25 +291,25 @@
 				console.log(333);
 				console.log(this.blogFileList);
 				return new Promise((resolve, reject) => {
-					if(fileList.length>=2){
+					if (fileList.length >= 2) {
 						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);
-				    // }
-					
-				    const isLt2M = file.size / 1024 / 1024 <=2//图片大小不超过2MB
-				    if(!isLt2M) {
-				      this.$message.error('上传文件大小不能超过 2M!');
-				      return reject(false);
-				    }
-				    return resolve(true)
-				  });
-				
+					// 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);
+					// }
+
+					const isLt2M = file.size / 1024 / 1024 <= 2 //图片大小不超过2MB
+					if (!isLt2M) {
+						this.$message.error('上传文件大小不能超过 2M!');
+						return reject(false);
+					}
+					return resolve(true)
+				});
+
 			},
 			handleChange(info) {
 				if (info.file.status !== 'uploading') {

--
Gitblit v1.9.1