github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-01-27 13:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2024-11-05 15:13:40 +08:00
parent 2ecd0584aa
commit ef2230a331
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -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",

2
resources/assets/js/pages/manage/components/ChatInput/emoji.vue
View File

@ -40,8 +40,6 @@
</template>
<script>
import { jsonp } from 'vue-jsonp'
export default {
name: 'ChatEmoji',
props: {

12
resources/assets/js/pages/manage/components/ChatInput/index.vue
View File

@ -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)

2
resources/assets/js/pages/manage/components/DialogView/template/approve-notifier.vue
View File

@ -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>

2
resources/assets/js/pages/manage/components/DialogView/template/approve-reviewer.vue
View File

@ -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>

2
resources/assets/js/pages/manage/components/DialogView/template/approve-submitter.vue
View File

@ -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>