From a1790e65f5a4f81c09fd103b557139d63dc6575e Mon Sep 17 00:00:00 2001
From: icssoa <2570063477@qq.com>
Date: Thu, 25 Mar 2021 22:49:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   2 +-
 .../modules/base/components/avatar/index.vue  |  20 ++--
 src/cool/modules/chat/components/input.vue    | 106 +++++++++++-------
 src/cool/modules/chat/store/message.js        |  52 ++++-----
 src/cool/modules/task/views/task.vue          |   1 -
 5 files changed, 94 insertions(+), 87 deletions(-)

diff --git a/package.json b/package.json
index e2f77b4..5072911 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"@vue/composition-api": "^1.0.0-rc.5",
 		"axios": "^0.21.1",
 		"cl-admin": "^1.5.3",
-		"cl-admin-crud": "^1.6.4",
+		"cl-admin-crud": "^1.6.5",
 		"cl-admin-theme": "^0.0.5",
 		"clipboard": "^2.0.7",
 		"codemirror": "^5.59.4",
diff --git a/src/cool/modules/base/components/avatar/index.vue b/src/cool/modules/base/components/avatar/index.vue
index 77bb3a6..1d8a7df 100644
--- a/src/cool/modules/base/components/avatar/index.vue
+++ b/src/cool/modules/base/components/avatar/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="cl-avatar" :class="[size, shape]" :style="[style2]">
+	<div class="cl-avatar" :class="[size, shape]" :style="[style]">
 		<el-image :src="src" alt="">
 			<div slot="error" class="image-slot">
 				<i class="el-icon-picture-outline"></i>
@@ -9,6 +9,8 @@
 </template>
 
 <script>
+import { isNumber } from "cl-admin/utils";
+
 export default {
 	name: "cl-avatar",
 
@@ -24,17 +26,13 @@ export default {
 		}
 	},
 
-	data() {
-		return {
-			style2: {}
-		};
-	},
+	computed: {
+		style() {
+			const size = isNumber(this.size) ? this.size + "px" : this.size;
 
-	mounted() {
-		if (typeof this.size == "number") {
-			this.style2 = {
-				height: this.size + "px",
-				width: this.size + "px"
+			return {
+				height: size,
+				width: size
 			};
 		}
 	}
diff --git a/src/cool/modules/chat/components/input.vue b/src/cool/modules/chat/components/input.vue
index d59e872..2e50bdf 100644
--- a/src/cool/modules/chat/components/input.vue
+++ b/src/cool/modules/chat/components/input.vue
@@ -13,14 +13,14 @@
 						accept="image/*"
 						list-type
 						:before-upload="
-							f => {
-								onBeforeUpload(f, 'image');
+							file => {
+								onBeforeUpload(file, 'image');
 							}
 						"
 						:on-progress="onUploadProgress"
 						:on-success="
-							(r, f) => {
-								onUploadSuccess(r, f, 'image');
+							(res, file) => {
+								onUploadSuccess(res, file, 'image');
 							}
 						"
 					>
@@ -33,14 +33,14 @@
 						accept="video/*"
 						list-type
 						:before-upload="
-							f => {
-								onBeforeUpload(f, 'video');
+							file => {
+								onBeforeUpload(file, 'video');
 							}
 						"
 						:on-progress="onUploadProgress"
 						:on-success="
-							(r, f) => {
-								onUploadSuccess(r, f, 'video');
+							(res, file) => {
+								onUploadSuccess(res, file, 'video');
 							}
 						"
 					>
@@ -53,7 +53,7 @@
 		<!-- 输入框，发送按钮 -->
 		<div class="cl-chat-input__content">
 			<el-input
-				v-model="value"
+				v-model="text"
 				placeholder="请描述您想咨询的问题"
 				type="textarea"
 				resize="none"
@@ -61,7 +61,7 @@
 				@keyup.enter.native="onTextSend"
 			></el-input>
 
-			<el-button type="primary" size="mini" :disabled="!value" @click="onTextSend"
+			<el-button type="primary" size="mini" :disabled="!text" @click="onTextSend"
 				>发送</el-button
 			>
 		</div>
@@ -69,7 +69,7 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
+import { mapMutations } from "vuex";
 import Emoji from "./emoji";
 
 export default {
@@ -81,20 +81,19 @@ export default {
 
 	data() {
 		return {
-			value: "",
+			text: "",
 			emoji: {
 				visible: false
 			}
 		};
 	},
 
-	computed: {
-		...mapGetters(["session", "messageList"])
-	},
-
 	methods: {
+		...mapMutations(["UPDATE_SESSION", "UPDATE_MESSAGE", "APPEND_MESSAGE_LIST"]),
+
 		// 上传前，获取图片预览地址
 		onBeforeUpload(file, key) {
+			// 先添加到列表中，等待上传
 			const next = (options = {}) => {
 				const data = {
 					content: {
@@ -111,15 +110,35 @@ export default {
 				this.append(data);
 			};
 
+			// 图片预览
 			if (key == "image") {
 				const fileReader = new FileReader();
 
 				fileReader.onload = e => {
-					next({
-						content: {
-							imageUrl: e.target.result
+					const imageUrl = e.target.result;
+					const image = new Image();
+
+					image.onload = () => {
+						let height = 0;
+						let width = 0;
+
+						if (image.width > 200) {
+							width = 200;
+							height = (image.height * 200) / image.width;
 						}
-					});
+
+						next({
+							content: {
+								imageUrl
+							},
+							style: {
+								height: height + "px",
+								width: width + "px"
+							}
+						});
+					};
+
+					image.src = imageUrl;
 				};
 
 				fileReader.readAsDataURL(file);
@@ -130,41 +149,44 @@ export default {
 
 		// 上传中
 		onUploadProgress(e, file) {
-			const item = this.messageList.find(e => e.uid == file.uid);
-
-			if (item) {
-				item.progress = e.percent + "%";
-			}
+			this.UPDATE_MESSAGE({
+				file,
+				data: {
+					progress: e.percent + "%"
+				}
+			});
 		},
 
 		// 上传成功
 		onUploadSuccess(res, file, key) {
-			const item = this.messageList.find(e => e.uid == file.uid);
-
-			if (item) {
-				item.loading = false;
-				item.content[`${key}Url`] = res.data;
-
-				this.send(item);
-			}
+			this.UPDATE_MESSAGE({
+				file,
+				data: {
+					loading: false,
+					content: {
+						[`${key}Url`]: res.data
+					}
+				},
+				callback: this.send
+			});
 		},
 
 		// 发送文本内容
 		onTextSend() {
-			if (this.value) {
-				if (this.value.replace(/\n/g, "") !== "") {
+			if (this.text) {
+				if (this.text.replace(/\n/g, "") !== "") {
 					const data = {
 						type: 0,
 						contentType: 0,
 						content: {
-							text: this.value
+							text: this.text
 						}
 					};
 
 					this.send(data, true);
 
 					this.$nextTick(() => {
-						this.value = "";
+						this.text = "";
 					});
 				}
 			}
@@ -215,11 +237,12 @@ export default {
 
 		// 发送消息
 		send(data, isAppend) {
-			const { id, userId } = this.session;
+			const { id, userId } = this.$store.getters.session;
 
-			// 更新消息
-			this.$store.commit("UPDATE_SESSION", data);
+			// 更新会话消息
+			this.UPDATE_SESSION(data);
 
+			// 发送消息
 			if (this.chat.socket) {
 				this.chat.socket.emit(`user@${userId}`, {
 					contentType: data.contentType,
@@ -229,6 +252,7 @@ export default {
 				});
 			}
 
+			// 是否添加到列表中
 			if (isAppend) {
 				this.append(data);
 			}
@@ -236,7 +260,7 @@ export default {
 
 		// 追加消息
 		append(data) {
-			this.$store.commit("APPEND_MESSAGE_LIST", data);
+			this.APPEND_MESSAGE_LIST(data);
 		}
 	}
 };
diff --git a/src/cool/modules/chat/store/message.js b/src/cool/modules/chat/store/message.js
index a43a44d..bc8bbdc 100644
--- a/src/cool/modules/chat/store/message.js
+++ b/src/cool/modules/chat/store/message.js
@@ -18,39 +18,8 @@ export default {
 
 		// 追加数据
 		APPEND_MESSAGE_LIST(state, data) {
-			const next = options => {
-				state.list.push({
-					...data,
-					...options
-				});
-				eventBus.$emit("message.scrollToBottom");
-			};
-
-			// 图片预览、大小处理
-			if (data.contentType === 1) {
-				const image = new Image();
-
-				image.onload = () => {
-					let height = 0;
-					let width = 0;
-
-					if (image.width > 200) {
-						width = 200;
-						height = (image.height * 200) / image.width;
-					}
-
-					next({
-						style: {
-							height: height + "px",
-							width: width + "px"
-						}
-					});
-				};
-
-				image.src = data.content.imageUrl;
-			} else {
-				next();
-			}
+			state.list.push(data);
+			eventBus.$emit("message.scrollToBottom");
 		},
 
 		// 追加数据到头部
@@ -62,6 +31,23 @@ export default {
 		// 清空列表
 		CLEAR_MESSAGE_LIST(state) {
 			state.list = [];
+		},
+
+		// 更新消息数据
+		UPDATE_MESSAGE(state, { file, data, callback }) {
+			let item = null;
+
+			if (file) {
+				item = state.list.find(e => e.uid === file.uid);
+			}
+
+			if (item) {
+				if (data) {
+					Object.assign(item, data);
+				}
+
+				if (callback) callback(item);
+			}
 		}
 	}
 };
diff --git a/src/cool/modules/task/views/task.vue b/src/cool/modules/task/views/task.vue
index 96cee4f..eaad4f0 100644
--- a/src/cool/modules/task/views/task.vue
+++ b/src/cool/modules/task/views/task.vue
@@ -853,7 +853,6 @@ export default {
 			margin-bottom: 5px;
 			z-index: 2;
 			position: relative;
-			background-color: #f7f7f7;
 
 			ul {
 				li {