mirror of
https://github.com/kuaifan/dootask.git
synced 2026-01-12 08:58:11 +00:00
no message
This commit is contained in:
kuaifan
parent
0911bc2dc9
commit
0476bdea13
@ -203,9 +203,13 @@
|
||||
</ul>
|
||||
<div
|
||||
v-if="projectTotal > 20"
|
||||
class="manage-project-search"
|
||||
:class="{loading:projectKeyLoading > 0}">
|
||||
<Input prefix="ios-search" v-model="projectKeyValue" :placeholder="$L('共' + projectTotal + '个项目，搜索...')" clearable />
|
||||
class="manage-project-search">
|
||||
<Input 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>
|
||||
<ButtonGroup class="manage-box-new-group">
|
||||
<Button class="manage-box-new" type="primary" icon="md-add" @click="onAddShow">{{$L('新建项目')}}</Button>
|
||||
@ -424,7 +428,6 @@ export default {
|
||||
dialogMsgSubscribe: null,
|
||||
|
||||
projectKeyValue: '',
|
||||
projectKeyAlready: {},
|
||||
projectKeyLoading: 0,
|
||||
|
||||
openMenu: {},
|
||||
@ -621,7 +624,7 @@ export default {
|
||||
return b.id - a.id;
|
||||
});
|
||||
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;
|
||||
},
|
||||
@ -846,11 +849,6 @@ export default {
|
||||
},
|
||||
|
||||
searchProject() {
|
||||
if (this.projectKeyAlready[this.projectKeyValue] === true) {
|
||||
return;
|
||||
}
|
||||
this.projectKeyAlready[this.projectKeyValue] = true;
|
||||
//
|
||||
setTimeout(() => {
|
||||
this.projectKeyLoading++;
|
||||
}, 1000)
|
||||
@ -858,9 +856,7 @@ export default {
|
||||
keys: {
|
||||
name: this.projectKeyValue
|
||||
}
|
||||
}).then(() => {
|
||||
this.projectKeyLoading--;
|
||||
}).catch(() => {
|
||||
}).finally(_ => {
|
||||
this.projectKeyLoading--;
|
||||
});
|
||||
},
|
||||
|
||||
@ -91,7 +91,7 @@ export default {
|
||||
enterSend: {
|
||||
type: Boolean,
|
||||
default: () => {
|
||||
return $A.$isDesktop
|
||||
return $A.isDesktop
|
||||
}
|
||||
},
|
||||
options: {
|
||||
@ -317,6 +317,7 @@ export default {
|
||||
}
|
||||
if (!range) {
|
||||
this.$emit('on-blur', this.quill)
|
||||
this.inputCache(this.dialogId, this.value)
|
||||
} else {
|
||||
this.$emit('on-focus', this.quill)
|
||||
this.showEmoji = false
|
||||
@ -411,6 +412,7 @@ export default {
|
||||
return;
|
||||
}
|
||||
this.$emit('on-send')
|
||||
this.inputCache(this.dialogId, null)
|
||||
},
|
||||
|
||||
onSelectEmoji(item) {
|
||||
|
||||
@ -211,6 +211,7 @@ export default {
|
||||
text = text.trim().replace(/(\n\x20*){3,}/g, "\n\n");
|
||||
text = text.replace(/\{\{RemoteURL\}\}/g, $A.apiUrl('../'))
|
||||
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}">`)
|
||||
const array = text.match(/<img\s+[^>]*?>/g);
|
||||
if (array) {
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
<template v-if="projectLists.length === 0">
|
||||
<li v-if="projectKeyLoading > 0" class="loading"><Loading/></li>
|
||||
<li v-else class="nothing">
|
||||
{{$L(projectLists ? `没有任何与"${projectKeyValue}"相关的项目` : `没有任何项目`)}}
|
||||
{{$L(projectKeyValue ? `没有任何与"${projectKeyValue}"相关的项目` : `没有任何项目`)}}
|
||||
</li>
|
||||
</template>
|
||||
<li
|
||||
@ -71,7 +71,7 @@ export default {
|
||||
return b.id - a.id;
|
||||
});
|
||||
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 => {
|
||||
if (!$A.isArray(item.user_simple)) {
|
||||
|
||||
@ -606,9 +606,7 @@ export default {
|
||||
list = list.filter(({flow_item_id}) => flow_item_id === flowInfo.value);
|
||||
}
|
||||
if (searchText) {
|
||||
list = list.filter(({name, desc}) => {
|
||||
return $A.strExists(name, searchText) || $A.strExists(desc, searchText);
|
||||
});
|
||||
list = list.filter(({name, desc}) => $A.strExists(`${name}||${desc}`, searchText));
|
||||
}
|
||||
return list;
|
||||
}
|
||||
@ -1268,7 +1266,7 @@ export default {
|
||||
return true;
|
||||
}
|
||||
if (searchText) {
|
||||
if (!($A.strExists(name, searchText) || $A.strExists(desc, searchText))) {
|
||||
if (!$A.strExists(`${name}||${desc}`, searchText)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -248,7 +248,7 @@ export default {
|
||||
return [];
|
||||
}
|
||||
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;
|
||||
},
|
||||
|
||||
9
resources/assets/js/store/actions.js
vendored
9
resources/assets/js/store/actions.js
vendored
@ -711,15 +711,16 @@ export default {
|
||||
reject({msg: 'Parameter error'});
|
||||
return;
|
||||
}
|
||||
let request = data || {};
|
||||
let showLoad = true;
|
||||
if (data.hideLoad !== undefined) {
|
||||
showLoad = !data.hideLoad;
|
||||
delete data.hideLoad;
|
||||
if (typeof request.hideLoad !== "undefined") {
|
||||
showLoad = !request.hideLoad;
|
||||
delete request.hideLoad;
|
||||
}
|
||||
showLoad && state.loadProjects++;
|
||||
dispatch("call", {
|
||||
url: 'project/lists',
|
||||
data: data || {}
|
||||
data: request
|
||||
}).then(({data}) => {
|
||||
state.projectTotal = data.total_all;
|
||||
dispatch("saveProject", data.data);
|
||||
|
||||
10
resources/assets/sass/dark.scss
vendored
10
resources/assets/sass/dark.scss
vendored
@ -184,13 +184,6 @@ body.dark-mode-reverse {
|
||||
background-color: #e1e1e1;
|
||||
.content-text {
|
||||
color: #ffffff;
|
||||
.content-text {
|
||||
> pre {
|
||||
.mention {
|
||||
color: #000000;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -202,6 +195,9 @@ body.dark-mode-reverse {
|
||||
background-color: #8bcf70;
|
||||
.content-text {
|
||||
> pre {
|
||||
a {
|
||||
color: #0027a1;
|
||||
}
|
||||
.mention {
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
@ -285,6 +285,10 @@
|
||||
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
|
||||
font-size: 14px;
|
||||
|
||||
a {
|
||||
color: #436FF6;
|
||||
}
|
||||
|
||||
ol,
|
||||
ul {
|
||||
li {
|
||||
|
||||
16
resources/assets/sass/pages/page-manage.scss
vendored
16
resources/assets/sass/pages/page-manage.scss
vendored
@ -207,12 +207,16 @@
|
||||
box-shadow: none;
|
||||
}
|
||||
}
|
||||
&.loading {
|
||||
.ivu-icon-ios-search {
|
||||
animation: icon-loading-load 0.6s infinite linear;
|
||||
&:before {
|
||||
content: "\F45B";
|
||||
}
|
||||
.search-pre {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
.common-loading {
|
||||
width: 14px;
|
||||
height: 14px;
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user