github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-02-03 19:58:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix：修复合并错误

Browse Source
This commit is contained in:
weifashi 2023-08-17 09:34:48 +08:00
parent 9eec44249c
commit 9ff7160870
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
resources/assets/js/pages/manage.vue
View File

@ -578,21 +578,10 @@ export default {
{path: 'archivedProject', name: '已归档的项目'}, {path: 'archivedProject', name: '已归档的项目'},
{path: 'team', name: '团队管理', divided: true}, {path: 'team', name: '团队管理', divided: true},
<<<<<<< HEAD
{path: 'approve', name: '审批中心'},
{path: 'okrManage', name: 'OKR管理'},
{path: 'okrAnalyze', name: 'OKR结果分析'},
=======
>>>>>>> pro
]) ])
} else { } else {
array.push(...[ array.push(...[
{path: 'personal', name: '个人设置', divided: true}, {path: 'personal', name: '个人设置', divided: true},
<<<<<<< HEAD
{path: 'approve', name: '审批中心'},
{path: 'okrManage', name: 'OKR管理'},
=======
>>>>>>> pro
{path: 'version', name: '更新版本', divided: true, visible: !!this.clientNewVersion}, {path: 'version', name: '更新版本', divided: true, visible: !!this.clientNewVersion},
{path: 'workReport', name: '工作报告', divided: true}, {path: 'workReport', name: '工作报告', divided: true},

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

@ -728,10 +728,7 @@ export default {
this.changeLoad++ this.changeLoad++
this.textTimer && clearTimeout(this.textTimer) this.textTimer && clearTimeout(this.textTimer)
this.textTimer = setTimeout(_ => { this.textTimer = setTimeout(_ => {
<<<<<<< HEAD
=======
this.changeLoad-- this.changeLoad--
>>>>>>> pro
if (this.maxlength > 0 && this.quill.getLength() > this.maxlength) { if (this.maxlength > 0 && this.quill.getLength() > this.maxlength) {
this.quill.deleteText(this.maxlength, this.quill.getLength()); this.quill.deleteText(this.maxlength, this.quill.getLength());
} }