From 1b6f1e454fff0187d4d30dcf0d5819d4f57f1787 Mon Sep 17 00:00:00 2001
From: inleft <inleft@qq.com>
Date: Mon, 29 Aug 2022 01:05:14 +0800
Subject: [PATCH] 新增iframe 播放页 新增日志编辑页
---
src/components/mini/box10-add.vue | 479 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 329 insertions(+), 150 deletions(-)
diff --git a/src/components/mini/box10-add.vue b/src/components/mini/box10-add.vue
index c51dcde..cdab9cb 100644
--- a/src/components/mini/box10-add.vue
+++ b/src/components/mini/box10-add.vue
@@ -1,5 +1,8 @@
<template>
<div>
+ <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel">
+ <img alt="example" style="width: 100%" :src="previewImage" />
+ </a-modal>
<a-form-model ref="myForm" :model="form" :label-col="labelCol" :wrapper-col="wrapperCol" :rules="rules">
<a-form-model-item label="认证" prop="secret">
<a-input v-model="form.secret" autocomplete='new-password' type="password" placeholder="口令">
@@ -13,43 +16,34 @@
<a-form-model-item label="模式切换" prop="common">
<a-switch v-model="form.online" />
- <span class="myTip">
- 本地文件/由系统生成文件
+ <span class="myTip" v-if="form.online">
+ 由系统生成文件
+ </span>
+ <span class="myTip" v-else>
+ 本地文件上传
</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-upload ref="blogFileUpload" :customRequest="customRequest" name="file" :showUploadList="true"
+ @change="handleChange" :default-file-list="form.blogFileList" :beforeUpload="beforeUpload"
+ :data="{'bucketName':bucketName.bucket_article}" accept=".md,.html,.htm,.txt">
<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-button>
- <a-icon type="upload" />限 markdown/html
+ <a-icon type="upload" />限 md/html/txt
</a-button>
</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>
<a-form-model-item label="分类" prop="class">
<a-select v-model="form.class" :allowClear="true" mode="default" placeholder="日志分类"
:getPopupContainer="getCalendarContainer()">
-
<a-select-option v-for="(item,index) in this.blogArticleType" :key="index" :value="item.id">
{{ item.typeName }}
</a-select-option>
-
</a-select>
</a-form-model-item>
@@ -65,18 +59,77 @@
</span>
</a-form-model-item>
- <a-form-model-item label=" 文件类型">
- <a-radio-group v-model="form.blogType">
- <a-radio value="Markdown">
+ <a-form-model-item label=" 主类型">
+ <a-select v-model="form.blogType" mode="default" placeholder=""
+ :getPopupContainer="getCalendarContainer()">
+ <a-select-option value="1">
markdown
- </a-radio>
- <a-radio value="Html">
+ </a-select-option>
+ <a-select-option value="2">
html
- </a-radio>
- </a-radio-group>
+ </a-select-option>
+ <a-select-option value="3">
+ 视频
+ </a-select-option>
+ <a-select-option value="4">
+ 音频
+ </a-select-option>
+ <a-select-option value="5">
+ 图组
+ </a-select-option>
+ <a-select-option value="9">
+ taking
+ </a-select-option>
+ </a-select>
</a-form-model-item>
+ <a-form-model-item label="引言" prop="introduce">
+ <a-input v-model="form.introduce" type="textarea" placeholder="限700字数" />
+ </a-form-model-item>
+
+ <a-form-model-item label="封面">
+ <a-upload :customRequest="customRequest" name="file" :showUploadList="true" list-type="picture"
+ :data="{'bucketName':bucketName.bucket_cover}" @change="handleChangeCoverFile"
+ :default-file-list="form.coverFileList" :beforeUpload="beforeUploadCover"
+ accept=".jpg,.png,.jpeg" @preview="handlePreview">
+ <!-- :disabled="form.coverFileList.length>=1" -->
+ <a-button>
+ <a-icon type="upload" />jpg/png/jpeg..
+ </a-button>
+ </a-upload>
+ <!-- <span class="myTip">
+ 自动转码,可以传高清图
+ </span> -->
+ </a-form-model-item>
+ <a-form-model-item label="图组">
+ <a-upload :customRequest="customRequest" name="file" :showUploadList="true" list-type="picture-card"
+ :data="{'bucketName':bucketName.bucket_picture}" @change="handleChangePictureFile"
+ :default-file-list="form.pictureList" :beforeUpload="beforeUploadPicture"
+ accept=".jpg,.png,.jpeg" :multiple="true" @preview="handlePreview">
+ <a-button>
+ <a-icon type="upload" />jpg/png/jpeg..
+ </a-button>
+ </a-upload>
+ </a-form-model-item>
+
+ <a-form-model-item label="视频组">
+ <a-upload :customRequest="customRequest" name="file" :showUploadList="true" list-type="text"
+ :data="{'bucketName':bucketName.bucket_video}" @change="handleChangeVideoFile"
+ :default-file-list="form.videoList" :beforeUpload="beforeUploadVideo" :multiple="true"
+ accept=".mp4">
+ <a-button>
+ <a-icon type="upload" />mp4
+ </a-button>
+ </a-upload>
+ </a-form-model-item>
+
+ <a-form-model-item label="定时">
+ <a-date-picker v-model="momentDate" show-time type="datetime" placeholder="发布时间"
+ style="width: 100%;" :disabledDate="disabledDate" @change="formatDate"
+ :getCalendarContainer="getCalendarContainer()" />
+ </a-form-model-item>
+
<a-form-model-item label="标签">
<template v-for="(tag, index) in tags">
<a-tooltip v-if="tag.length > 20" :key="tag" :title="tag">
@@ -88,51 +141,24 @@
{{ tag }}
</a-tag>
</template>
-
+
<a-input v-if="inputVisible" ref="input" type="text" size="small" :style="{ width: '78px' }"
:value="inputValue" @change="handleInputChange" @blur="handleInputConfirm"
@keyup.enter="handleInputConfirm" />
-
+
<a-tag v-else style="background: #fff; borderStyle: dashed;" @click="showInput">
<a-icon type="plus" /> New Tag
</a-tag>
-
</a-form-model-item>
-
- <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"
- :default-file-list="form.coverFileList">
- <a-button>
- <a-icon type="upload" />jpg/png/jpeg..
- </a-button>
- </a-upload>
- <!-- <span class="myTip">
- 自动转码,可以传高清图
- </span> -->
- </a-form-model-item>
-
- <a-form-model-item label="定时">
- <a-date-picker v-model="form.publishDate" show-time type="datetime" placeholder="发布时间"
- style="width: 100%;" :disabledDate="disabledDate"
- :getCalendarContainer="getCalendarContainer()" />
- </a-form-model-item>
-
- <div v-bind:class="{'myBorder':form.top}" style="padding: 3px;">
+ <div v-bind:class="{'myBorder':form.top}" style="padding: 3px;margin-bottom: 10px;">
<a-form-model-item label="置顶">
<a-switch v-model="form.top" />
</a-form-model-item>
<div v-show="form.top">
<a-form-model-item label="权重">
- <a-slider v-model="form.sliderValue" :default-value="80" :step="5"
+ <a-slider v-model="form.sliderValue" :default-value="50" :step="5"
:getTooltipPopupContainer="getCalendarContainer()" />
<span class="myTip">
越小越靠前
@@ -154,20 +180,20 @@
<div v-show="form.lock ">
<a-form-model-item label="阅读权限">
<a-radio-group v-model="form.auth">
- <a-radio value="private">
+ <a-radio value="2">
私人
</a-radio>
- <a-radio value="password">
+ <a-radio value="3">
密码授权
</a-radio>
</a-radio-group>
</a-form-model-item>
- <a-form-model-item label="授权密码" v-show="form.auth=='password'">
- <a-input v-model="form.password" autocomplete='new-password' type="password"
+ <a-form-model-item label="授权密码" v-show="form.auth==3">
+ <a-input-password v-model="form.password" autocomplete='new-password' type="password"
placeholder="独立密码">
<a-icon slot="prefix" type="lock" style="color:rgba(0,0,0,.25)" />
- </a-input>
+ </a-input-password>
</a-form-model-item>
</div>
@@ -182,11 +208,26 @@
<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"
+ import md5 from 'js-md5';
+
+ function getBase64(file) {
+ return new Promise((resolve, reject) => {
+ const reader = new FileReader();
+ reader.readAsDataURL(file);
+ reader.onload = () => resolve(reader.result);
+ reader.onerror = error => reject(error);
+ });
+ }
+
export default {
beforeMount() {
queryBlogArticleType({}).then((res) => {
@@ -194,30 +235,28 @@
})
},
data() {
-
+ let _this = this;
let validateContent = (rule, value, callback) => {
- if (this.form.online) {
- console.log("内容未填");
- this.$refs.myForm.validateField('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')
+ //this.$refs.myForm.validateField('blogFileList')
+ if (_this.form.fileId == null) {
+ callback(new Error('文件未传'));
+ }
}
callback();
};
return {
+ previewVisible: false,
+ previewImage: '',
+ bucketName: myConstant.bucketName,
+ momentDate: undefined,
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: '',
@@ -228,21 +267,29 @@
span: 13
},
form: {
+ introduce: '',
secret: '',
- online: false,
- preference: false,
title: '',
content: '',
class: [],
tempSave: false,
- blogType: "Markdown",
+ blogType: "1",
publishDate: "",
lock: false,
top: false,
- auth: "private",
+ sliderValue: 50,
+ auth: 1,
password: "",
+ fileId: null,
+ coverFile: null,
+ pictureIds: null,
+ videoIds: null,
blogFileList: [],
coverFileList: [],
+ pictureList: [],
+ videoList: [],
+ online: false,
+ preference: false,
},
rules: {
title: [{
@@ -251,99 +298,212 @@
trigger: 'blur'
},
{
- min: 5,
+ min: 1,
max: 50,
message: '字数限制1~50',
trigger: 'blur'
},
],
+ introduce: [{
+ max: 5,
+ message: '字数限制700',
+ trigger: 'blur'
+ }, ],
secret: [{
required: true,
- message: '不正经的人..',
+ message: '好像这里错了..',
trigger: 'blur'
}],
common: [{
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'
- // }],
+
}
};
},
methods: {
- beforeUpload(file, fileList) {
- console.log(333);
- console.log(this.blogFileList);
+ handleCancel() {
+ this.previewVisible = false;
+ },
+ async handlePreview(file) {
+ if (!file.url && !file.preview) {
+ file.preview = await getBase64(file.originFileObj);
+ }
+ this.previewImage = file.url || file.preview;
+ this.previewVisible = true;
+ },
+ reset() {
+ // this.form.blogFileList = [];
+ // this.form.coverFileList = [];
+ },
+ formatDate(date, dateString) {
+ this.form.publishDate = dateString;
+ },
+ beforeUploadVideo(file, fileList) {
return new Promise((resolve, reject) => {
- if(fileList.length>=2){
+ if (this.form.secret == null || this.form.secret == "") {
+ this.$message.error('需要正确的授权码');
+ return reject(false);
+ }
+
+ if (this.form.coverFileList.length > 10) {
+ this.$message.error('这里最多上传10个文件');
+ return reject(false);
+ }
+ if (file.size > myConstant.uploadVideoSizeLimit) {
+ this.$message.error('上传文件大小不能超过 200M!');
+ return reject(false);
+ }
+ return resolve(true)
+ });
+ },
+ beforeUploadPicture(file, fileList) {
+ return new Promise((resolve, reject) => {
+ if (this.form.secret == null || this.form.secret == "") {
+ this.$message.error('需要正确的授权码');
+ return reject(false);
+ }
+
+ if (this.form.coverFileList.length > 10) {
+ this.$message.error('这里最多上传10个文件');
+ return reject(false);
+ }
+ if (file.size > myConstant.uploadFileSizeLimit) {
+ this.$message.error('上传文件大小不能超过 2M!');
+ return reject(false);
+ }
+ return resolve(true)
+ });
+ },
+ beforeUploadCover(file, fileList) {
+ return new Promise((resolve, reject) => {
+ if (this.form.secret == null || this.form.secret == "") {
+ this.$message.error('需要正确的授权码');
+ return reject(false);
+ }
+
+ 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);
- // }
-
- const isLt2M = file.size / 1024 / 1024 <=2//图片大小不超过2MB
- if(!isLt2M) {
- this.$message.error('上传文件大小不能超过 2M!');
- return reject(false);
- }
- return resolve(true)
- });
-
+ 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.secret == null || this.form.secret == "") {
+ this.$message.error('需要正确的口令..');
+ return reject(false);
+ }
+
+ if (this.form.blogFileList.length >= 1) {
+ this.$message.error('这里最多上传一个文件');
+ return reject(false);
+ }
+
+ if (file.size > myConstant.uploadFileSizeLimit) {
+ this.$message.error('上传文件大小不能超过 2M!');
+ return reject(false);
+ }
+ return resolve(true)
+ });
+
},
handleChange(info) {
+ this.form.blogFileList = info.fileList;
+
if (info.file.status !== 'uploading') {
console.log(info.file, info.fileList);
}
if (info.file.status === 'done') {
- this.$message.success(`${info.file.name} file uploaded successfully`);
+ this.form.fileId = info.file.response.data;
+ this.$message.success(`${info.file.name} 上传成功`);
} else if (info.file.status === 'error') {
- this.$message.error(`${info.file.name} file upload failed.`);
+ this.$message.error(`${info.file.name} 上传失败`);
+ }
+
+ 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);
+ }
+ if (info.file.status === 'done') {
+ this.form.coverFile = info.file.response.data;
+ this.$message.success(`${info.file.name} 上传成功`);
+ } else if (info.file.status === 'error') {
+ this.$message.error(`${info.file.name} 上传失败`);
+ }
+
+ if (this.form.coverFileList == null || this.form.coverFileList.length == 0) {
+ this.form.coverFile = null
+ }
+ },
+ handleChangePictureFile(info) {
+ this.form.pictureList = info.fileList;
+
+ if (info.file.status !== 'uploading') {
+ console.log(info.file, info.fileList);
+ }
+ if (info.file.status === 'done') {
+ if (this.form.pictureIds == null || this.form.pictureIds == "") {
+ this.form.pictureIds = info.file.response.data;
+ } else {
+ this.form.pictureIds = this.form.pictureIds + "," + info.file.response.data;
+ }
+ this.$message.success(`${info.file.name} 上传成功`);
+ } else if (info.file.status === 'error') {
+ this.$message.error(`${info.file.name} 上传失败`);
+ }
+
+ if (this.form.pictureList == null || this.form.pictureList.length == 0) {
+ this.form.pictureIds = null
+ }
+ },
+ handleChangeVideoFile(info) {
+ this.form.videoList = info.fileList;
+
+ if (info.file.status !== 'uploading') {
+ console.log(info.file, info.fileList);
+ }
+ if (info.file.status === 'done') {
+ if (this.form.videoIds == null || this.form.videoIds == "") {
+ this.form.videoIds = info.file.response.data;
+ } else {
+ this.form.videoIds = this.form.videoIds + "," + info.file.response.data
+ }
+ this.$message.success(`${info.file.name} 上传成功`);
+ } else if (info.file.status === 'error') {
+ this.$message.error(`${info.file.name} 上传失败`);
+ }
+
+ if (this.form.videoList == null || this.form.videoList.length == 0) {
+ this.form.videoIds = null
}
},
/**
@@ -352,14 +512,36 @@
customRequest(option) {
const formData = new FormData()
formData.append('file', option.file)
- sysFileInfoUpload(formData).then((res) => {
+ formData.append('bucketName', option.data.bucketName)
+ formData.append('authCode', this.form.secret == "" ? "" : md5(this.form.secret))
+ let _this = this
+ myFileInfoUpload(formData).then((res) => {
if (res.success) {
- this.$message.success('上传成功')
option.onSuccess(res, option.file)
+ // 在上传成功后进度条显示为99
+ progress.percent = 100
+ // this.$message.success('上传成功')
} else {
this.$message.error('上传失败：' + res.message)
}
})
+
+ let progress = {
+ percent: 1
+ }
+ let speed = 100 / (option.file.size / 65000) //上传速度
+ const intervalId = setInterval(() => {
+ // 控制进度条防止在未上传成功时进度条达到100
+ if (progress.percent < 99 && progress.percent + speed < 100) {
+ progress.percent += speed //控制进度条速度
+ option.onProgress(progress) //onProgress接收一个对象{ percent: 进度 }在进度条上显示
+ } else if ((progress.percent < 100)) {
+ progress.percent++
+ } else if (progress.percent >= 100) {
+ clearInterval(intervalId)
+ }
+ }, 500)
+
},
disabledDate(current) {
return current < moment().subtract(1, "day");
@@ -368,22 +550,19 @@
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() {
this.inputVisible = true;
this.$nextTick(function() {
this.$refs.input.focus();
});
},
-
handleInputChange(e) {
this.inputValue = e.target.value;
},
-
handleInputConfirm() {
const inputValue = this.inputValue;
let tags = this.tags;
--
Gitblit v1.9.1