From c14e3278893b9dd1022aa488cee53a888c2a4c7e Mon Sep 17 00:00:00 2001
From: inleft <inleft@qq.com>
Date: Tue, 16 Aug 2022 19:34:48 +0800
Subject: [PATCH] 表情组件优化

---
 src/components/mini/box13-reply.vue |   71 ++++++++++++++++++++++++++---------
 1 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/src/components/mini/box13-reply.vue b/src/components/mini/box13-reply.vue
index fdb52e5..7809b0b 100644
--- a/src/components/mini/box13-reply.vue
+++ b/src/components/mini/box13-reply.vue
@@ -1,5 +1,4 @@
 <template>
-
 	<div>
 		<div class="visitInfo">
 			<a-form-model ref="myForm" layout="inline" :rules="rules" :model="form" :label-col="labelCol"
@@ -18,25 +17,23 @@
 				</a-form-model-item>
 				<a-form-model-item label="认证"
 					v-show="form.nickName=='inleft'||form.nickName=='笔墨'||form.nickName=='阿墨'">
-					<a-input-password v-model="form.authCode" autocomplete='new-password' type="password"
-						placeholder="我的授权码">
-						<a-icon slot="prefix" type="lock" style="color:rgba(0,0,0,.25)" />
-					</a-input-password>
+					<a-input v-model="form.authCode" autocomplete='new-password' type="password" placeholder="我的授权码">
+					</a-input>
 				</a-form-model-item>
 			</a-form-model>
 		</div>
+
 		<div class="replyMsgInfo" v-if="showReplyMsgInfo">
-			<div>{{msgInfo.useName}} </div>
-			<div style="padding: 0px 3px;"> : </div>
 			<div>
-				<span v-html="msgInfo.userComment.replace(/\n/g, '<br>')"></span>
+				{{msgInfo.useName}}<span style="padding: 0px 3px;"> : </span>
+			</div>
+			<div>
+				<span v-html="parseContent(msgInfo.userComment).replace(/\n/g, '<br>')"></span>
 			</div>
 		</div>
 		<a-comment>
 			<div slot="content">
-				<a-form-item>
-					<a-textarea :rows="4" v-model="form.visitorContent" :placeholder="replyHolder" />
-				</a-form-item>
+				<MyOwO :content.sync="form.visitorContent" :replyHolder="replyHolder"></MyOwO>
 				<div>
 					<a-button html-type="submit" type="primary" @click="send()" v-if="!showReplyMsgInfo"
 						:disabled="isSending || $attrs.isAllowedComment==0">
@@ -53,7 +50,7 @@
 					<a-checkbox v-model="form.isReceiveMail">
 						接收邮件回复通知
 					</a-checkbox>
-					<a-checkbox style=" margin-left: 8px;" v-if="!showReplyMsgInfo" v-model="form.isSecretMsg">
+					<a-checkbox v-if="!showReplyMsgInfo" v-model="form.isSecretMsg">
 						悄悄说..<span class="myTip">(仅登录后可查看)</span>
 					</a-checkbox>
 				</div>
@@ -69,10 +66,23 @@
 	} from '../../api/blogArticleComment.js'
 	import md5 from 'js-md5';
 
-	const VisitorDataKey = "visitorData.inleft.com"
+	import MyOwO from '../common/OwO.vue'
+	import myConstant from "../../config/myConstant.js"
 
 	export default {
+		components: {
+			MyOwO
+		},
+		props: {
+			parseContent: {
+				type: Function,
+				default: null
+			}
+		},
 		methods: {
+			// getTargetArea() {
+			// 	return this.$refs.targetArea;
+			// },
 			getMsgInfo(param) {
 				this.msgInfo = param;
 				this.showReplyMsgInfo = true;
@@ -107,7 +117,7 @@
 
 				if (this.form.nickName == 'inleft' || this.form.nickName == '笔墨' || this.form.nickName == '阿墨') {
 					if (this.form.authCode == null || this.form.authCode == "") {
-						this.$message.info("不要成为我,你就是真的自己..")
+						this.$message.info("此名称在这里使用需要正确的授权码..")
 						return
 					}
 				}
@@ -129,7 +139,7 @@
 					this.form.visitorId = year + (month > 10 ? month : '0' + month) + date + num
 				}
 
-				localStorage.setItem(VisitorDataKey, JSON.stringify(this.form))
+				localStorage.setItem(this.VisitorDataKey, JSON.stringify(this.form))
 
 				this.isSending = true;
 				blogCommentAdd({
@@ -171,12 +181,12 @@
 		},
 
 		data() {
-			let tempVisitorData = localStorage.getItem(VisitorDataKey);
+			let tempVisitorData = localStorage.getItem(this.VisitorDataKey);
 			let vistorData = {
 				nickName: "",
 				eMail: "",
 				homePage: "",
-				isReceiveMail: true,
+				isReceiveMail: false,
 				isSecretMsg: false,
 				visitorContent: "",
 				parentId: 0,
@@ -197,6 +207,7 @@
 			}
 
 			return {
+				VisitorDataKey: myConstant.VisitorDataKey,
 				isSending: false,
 				replyHolder: "",
 				msgInfo: {
@@ -234,8 +245,8 @@
 					}],
 					"homePage": [{
 						trigger: 'blur',
-						pattern: /^((https|http)?:\/\/)[^\s]+/,
-						message: '仅支持 https | http'
+						pattern: /^((https|http)?:\/\/)+/,
+						message: '仅支持 https:// | http://'
 					}, {
 						trigger: 'blur',
 						max: 50,
@@ -248,12 +259,34 @@
 </script>
 
 <style lang="less">
+	.replyMsgInfo img {
+		margin-bottom: -0.125rem;
+		img min-height: 3.5rem;
+		height: 2em;
+	}
+
 	.replyMsgInfo {
 		display: flex;
+		flex-direction: column;
 		border-radius: 4px;
 		box-shadow: 0px 9px 10px 0 rgba(0, 0, 0, 0.24), 1px 3px 15px 0 rgba(0, 0, 0, 0.19);
 		padding: 20px 25px 20px;
 		margin-left: 15px;
 		margin-top: 10px;
 	}
+
+	.OwO {
+		padding: 0px 0px 20px 0px;
+	}
+
+	.OwO .OwO-logo {
+		height: 30px;
+	}
+
+	.OwO .quyin,
+	.OwO img {
+		margin-bottom: -0.125rem;
+		min-height: 3.5rem;
+		height: 1em;
+	}
 </style>

--
Gitblit v1.9.1