github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-02-18 22:37:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2022-05-25 15:54:34 +08:00
parent 0911bc2dc9
commit 0476bdea13
10 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,9 +203,13 @@
</ul> </ul>
<div <div
v-if="projectTotal > 20" v-if="projectTotal > 20"
class="manage-project-search" class="manage-project-search">
:class="{loading:projectKeyLoading > 0}"> <Input v-model="projectKeyValue" :placeholder="$L('共' + projectTotal + '个项目，搜索...')" clearable>
<Input prefix="ios-search" v-model="projectKeyValue" :placeholder="$L('共' + projectTotal + '个项目，搜索...')" clearable /> <div class="search-pre" slot="prefix">
<Loading v-if="projectKeyLoading > 0"/>
<Icon v-else type="ios-search" />
</div>
</Input>
</div> </div>
<ButtonGroup class="manage-box-new-group"> <ButtonGroup class="manage-box-new-group">
<Button class="manage-box-new" type="primary" icon="md-add" @click="onAddShow">{{$L('新建项目')}}</Button> <Button class="manage-box-new" type="primary" icon="md-add" @click="onAddShow">{{$L('新建项目')}}</Button>
@ -424,7 +428,6 @@ export default {
dialogMsgSubscribe: null, dialogMsgSubscribe: null,
projectKeyValue: '', projectKeyValue: '',
projectKeyAlready: {},
projectKeyLoading: 0, projectKeyLoading: 0,
openMenu: {}, openMenu: {},
@ -621,7 +624,7 @@ export default {
return b.id - a.id; return b.id - a.id;
}); });
if (projectKeyValue) { if (projectKeyValue) {
return data.filter(({name}) => name.toLowerCase().indexOf(projectKeyValue.toLowerCase()) > -1); return data.filter(item => $A.strExists(`${item.name}||${item.desc}`, projectKeyValue));
} }
return data; return data;
}, },
@ -846,11 +849,6 @@ export default {
}, },
searchProject() { searchProject() {
if (this.projectKeyAlready[this.projectKeyValue] === true) {
return;
}
this.projectKeyAlready[this.projectKeyValue] = true;
//
setTimeout(() => { setTimeout(() => {
this.projectKeyLoading++; this.projectKeyLoading++;
}, 1000) }, 1000)
@ -858,9 +856,7 @@ export default {
keys: { keys: {
name: this.projectKeyValue name: this.projectKeyValue
} }
}).then(() => { }).finally(_ => {
this.projectKeyLoading--;
}).catch(() => {
this.projectKeyLoading--; this.projectKeyLoading--;
}); });
}, },

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

@ -91,7 +91,7 @@ export default {
enterSend: { enterSend: {
type: Boolean, type: Boolean,
default: () => { default: () => {
return $A.$isDesktop return $A.isDesktop
} }
}, },
options: { options: {
@ -317,6 +317,7 @@ export default {
} }
if (!range) { if (!range) {
this.$emit('on-blur', this.quill) this.$emit('on-blur', this.quill)
this.inputCache(this.dialogId, this.value)
} else { } else {
this.$emit('on-focus', this.quill) this.$emit('on-focus', this.quill)
this.showEmoji = false this.showEmoji = false
@ -411,6 +412,7 @@ export default {
return; return;
} }
this.$emit('on-send') this.$emit('on-send')
this.inputCache(this.dialogId, null)
}, },
onSelectEmoji(item) { onSelectEmoji(item) {

1
resources/assets/js/pages/manage/components/DialogView.vue
View File

@ -211,6 +211,7 @@ export default {
text = text.trim().replace(/(\n\x20*){3,}/g, "\n\n"); text = text.trim().replace(/(\n\x20*){3,}/g, "\n\n");
text = text.replace(/\{\{RemoteURL\}\}/g, $A.apiUrl('../')) text = text.replace(/\{\{RemoteURL\}\}/g, $A.apiUrl('../'))
text = text.replace(/<p><\/p>/g, '<p><br/></p>') text = text.replace(/<p><\/p>/g, '<p><br/></p>')
text = text.replace(/(https*:\/\/)((\w|=|\?|\.|\/|&|-|:|\+|%|;)+)/g, "<a href=\"$1$2\" target=\"_blank\">$1$2</a>");
text = text.replace(this.atUserReg, `<span class="mention me" data-id="${this.userId}">`) text = text.replace(this.atUserReg, `<span class="mention me" data-id="${this.userId}">`)
const array = text.match(/<img\s+[^>]*?>/g); const array = text.match(/<img\s+[^>]*?>/g);
if (array) { if (array) {

4
resources/assets/js/pages/manage/components/ProjectList.vue
View File

@ -15,7 +15,7 @@
<template v-if="projectLists.length === 0"> <template v-if="projectLists.length === 0">
<li v-if="projectKeyLoading > 0" class="loading"><Loading/></li> <li v-if="projectKeyLoading > 0" class="loading"><Loading/></li>
<li v-else class="nothing"> <li v-else class="nothing">
{{$L(projectLists ? `没有任何与"${projectKeyValue}"相关的项目` : `没有任何项目`)}} {{$L(projectKeyValue ? `没有任何与"${projectKeyValue}"相关的项目` : `没有任何项目`)}}
</li> </li>
</template> </template>
<li <li
@ -71,7 +71,7 @@ export default {
return b.id - a.id; return b.id - a.id;
}); });
if (projectKeyValue) { if (projectKeyValue) {
return data.filter(({name}) => name.toLowerCase().indexOf(projectKeyValue.toLowerCase()) > -1); return data.filter(item => $A.strExists(`${item.name}||${item.desc}`, projectKeyValue));
} }
return data.map(item => { return data.map(item => {
if (!$A.isArray(item.user_simple)) { if (!$A.isArray(item.user_simple)) {

6
resources/assets/js/pages/manage/components/ProjectPanel.vue
View File

@ -606,9 +606,7 @@ export default {
list = list.filter(({flow_item_id}) => flow_item_id === flowInfo.value); list = list.filter(({flow_item_id}) => flow_item_id === flowInfo.value);
} }
if (searchText) { if (searchText) {
list = list.filter(({name, desc}) => { list = list.filter(({name, desc}) => $A.strExists(`${name}||${desc}`, searchText));
return $A.strExists(name, searchText) || $A.strExists(desc, searchText);
});
} }
return list; return list;
} }
@ -1268,7 +1266,7 @@ export default {
return true; return true;
} }
if (searchText) { if (searchText) {
if (!($A.strExists(name, searchText) || $A.strExists(desc, searchText))) { if (!$A.strExists(`${name}||${desc}`, searchText)) {
return true; return true;
} }
} }

2
resources/assets/js/pages/manage/messenger.vue
View File

@ -248,7 +248,7 @@ export default {
return []; return [];
} }
if (contactsKey) { if (contactsKey) {
return contactsData.filter(item => $A.strExists(item.email, contactsKey) || $A.strExists(item.nickname, contactsKey)) return contactsData.filter(item => $A.strExists(`${item.email}||${item.nickname}`, contactsKey))
} }
return contactsData; return contactsData;
}, },

9
resources/assets/js/store/actions.js vendored
View File

@ -711,15 +711,16 @@ export default {
reject({msg: 'Parameter error'}); reject({msg: 'Parameter error'});
return; return;
} }
let request = data || {};
let showLoad = true; let showLoad = true;
if (data.hideLoad !== undefined) { if (typeof request.hideLoad !== "undefined") {
showLoad = !data.hideLoad; showLoad = !request.hideLoad;
delete data.hideLoad; delete request.hideLoad;
} }
showLoad && state.loadProjects++; showLoad && state.loadProjects++;
dispatch("call", { dispatch("call", {
url: 'project/lists', url: 'project/lists',
data: data || {} data: request
}).then(({data}) => { }).then(({data}) => {
state.projectTotal = data.total_all; state.projectTotal = data.total_all;
dispatch("saveProject", data.data); dispatch("saveProject", data.data);

10
resources/assets/sass/dark.scss vendored
View File

@ -184,13 +184,6 @@ body.dark-mode-reverse {
background-color: #e1e1e1; background-color: #e1e1e1;
.content-text { .content-text {
color: #ffffff; color: #ffffff;
.content-text {
> pre {
.mention {
color: #000000;
}
}
}
} }
} }
} }
@ -202,6 +195,9 @@ body.dark-mode-reverse {
background-color: #8bcf70; background-color: #8bcf70;
.content-text { .content-text {
> pre { > pre {
a {
color: #0027a1;
}
.mention { .mention {
color: #000000; color: #000000;
} }

4
resources/assets/sass/pages/components/dialog-wrapper.scss vendored
View File

@ -285,6 +285,10 @@
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
font-size: 14px; font-size: 14px;
a {
color: #436FF6;
}
ol, ol,
ul { ul {
li { li {

16
resources/assets/sass/pages/page-manage.scss vendored
View File

@ -207,12 +207,16 @@
box-shadow: none; box-shadow: none;
} }
} }
&.loading { .search-pre {
.ivu-icon-ios-search { width: 100%;
animation: icon-loading-load 0.6s infinite linear; height: 100%;
&:before { display: flex;
content: "\F45B"; align-items: center;
} justify-content: center;
.common-loading {
width: 14px;
height: 14px;
margin: 0;
} }
} }
} }