From ef2230a331e690fbcf990054ed581c394a158ce6 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Tue, 5 Nov 2024 15:13:40 +0800
Subject: [PATCH] no message

---
 package.json                                         |  1 -
 .../js/pages/manage/components/ChatInput/emoji.vue   |  2 --
 .../js/pages/manage/components/ChatInput/index.vue   | 12 +++++++-----
 .../DialogView/template/approve-notifier.vue         |  2 +-
 .../DialogView/template/approve-reviewer.vue         |  2 +-
 .../DialogView/template/approve-submitter.vue        |  2 +-
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index ec9fe90aa..d4cee641f 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,6 @@
         "vite-plugin-vue2": "^2.0.3",
         "vue": "~2.6.14",
         "vue-clipboard2": "^0.3.3",
-        "vue-jsonp": "^2.0.0",
         "vue-kityminder-ggg": "^1.3.10",
         "vue-loader": "^15.10.1",
         "vue-resize-observer": "^2.0.16",
diff --git a/resources/assets/js/pages/manage/components/ChatInput/emoji.vue b/resources/assets/js/pages/manage/components/ChatInput/emoji.vue
index 6cbb1c175..6edb8d64b 100644
--- a/resources/assets/js/pages/manage/components/ChatInput/emoji.vue
+++ b/resources/assets/js/pages/manage/components/ChatInput/emoji.vue
@@ -40,8 +40,6 @@
 </template>
 
 <script>
-import { jsonp } from 'vue-jsonp'
-
 export default {
     name: 'ChatEmoji',
     props: {
diff --git a/resources/assets/js/pages/manage/components/ChatInput/index.vue b/resources/assets/js/pages/manage/components/ChatInput/index.vue
index 4e0c4db2b..f30958a95 100755
--- a/resources/assets/js/pages/manage/components/ChatInput/index.vue
+++ b/resources/assets/js/pages/manage/components/ChatInput/index.vue
@@ -815,11 +815,13 @@ export default {
 
             // Update model if text changes
             this.quill.on('text-change', _ => {
-                const {index} = this.quill.getSelection(true);
-                if (this.quill.getText(index - 1, 1) === "\r") {
-                    this.quill.insertText(index, "\n");
-                    this.quill.deleteText(index - 1, 1);
-                    return;
+                if (this.isFocus) {
+                    const {index} = this.quill.getSelection();
+                    if (this.quill.getText(index - 1, 1) === "\r") {
+                        this.quill.insertText(index, "\n");
+                        this.quill.deleteText(index - 1, 1);
+                        return;
+                    }
                 }
                 if (this.textTimer) {
                     clearTimeout(this.textTimer)
diff --git a/resources/assets/js/pages/manage/components/DialogView/template/approve-notifier.vue b/resources/assets/js/pages/manage/components/DialogView/template/approve-notifier.vue
index 06987b7ea..af177f8f0 100644
--- a/resources/assets/js/pages/manage/components/DialogView/template/approve-notifier.vue
+++ b/resources/assets/js/pages/manage/components/DialogView/template/approve-notifier.vue
@@ -4,7 +4,7 @@
         <div class="cause">
             <p>{{$L("申请人")}}：<span class="mark-color">@{{ msg.data.nickname }}</span> {{ msg.data.department }}</p>
             <b>{{$L("详情")}}</b>
-            <p v-if="msg.data.type">{{$L("假期类型")}}：{{ msg.data.type }}</p>
+            <p v-if="msg.data.type">{{$L("假期类型")}}：{{ $L(msg.data.type) }}</p>
             <p>{{$L("开始时间")}}：{{ msg.data.start_time }} ({{ msg.data.start_day_of_week }})</p>
             <p>{{$L("结束时间")}}：{{ msg.data.end_time }} ({{ msg.data.end_day_of_week }})</p>
             <p>{{$L("事由")}}：{{ msg.data.description }}</p>
diff --git a/resources/assets/js/pages/manage/components/DialogView/template/approve-reviewer.vue b/resources/assets/js/pages/manage/components/DialogView/template/approve-reviewer.vue
index 922cfcb0d..90a83b121 100644
--- a/resources/assets/js/pages/manage/components/DialogView/template/approve-reviewer.vue
+++ b/resources/assets/js/pages/manage/components/DialogView/template/approve-reviewer.vue
@@ -4,7 +4,7 @@
         <div class="cause">
             <p>{{$L("申请人")}}：<span class="mark-color">@{{ msg.data.nickname }}</span> {{ msg.data.department }}</p>
             <b>{{$L("详情")}}</b>
-            <p v-if="msg.data.type">{{$L("假期类型")}}：{{ msg.data.type }}</p>
+            <p v-if="msg.data.type">{{$L("假期类型")}}：{{ $L(msg.data.type) }}</p>
             <p>{{$L("开始时间")}}：{{ msg.data.start_time }} ({{ msg.data.start_day_of_week }})</p>
             <p>{{$L("结束时间")}}：{{ msg.data.end_time }} ({{ msg.data.end_day_of_week }})</p>
             <p>{{$L("事由")}}：{{ msg.data.description }}</p>
diff --git a/resources/assets/js/pages/manage/components/DialogView/template/approve-submitter.vue b/resources/assets/js/pages/manage/components/DialogView/template/approve-submitter.vue
index 9e0f6bf86..2656a1a22 100644
--- a/resources/assets/js/pages/manage/components/DialogView/template/approve-submitter.vue
+++ b/resources/assets/js/pages/manage/components/DialogView/template/approve-submitter.vue
@@ -4,7 +4,7 @@
         <div class="cause">
             <p>{{$L("申请人")}}：<span class="mark-color">@{{ msg.data.start_nickname }}</span> {{ msg.data.department }}</p>
             <b>{{$L("详情")}}</b>
-            <p v-if="msg.data.type">{{$L("假期类型")}}：{{ msg.data.type }}</p>
+            <p v-if="msg.data.type">{{$L("假期类型")}}：{{ $L(msg.data.type) }}</p>
             <p>{{$L("开始时间")}}：{{ msg.data.start_time }} ({{ msg.data.start_day_of_week }})</p>
             <p>{{$L("结束时间")}}：{{ msg.data.end_time }} ({{ msg.data.end_day_of_week }})</p>
             <p>{{$L("事由")}}：{{ msg.data.description }}</p>