diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index 5da229ed0..b6cc4b93c 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -203,9 +203,13 @@
@@ -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--;
});
},
diff --git a/resources/assets/js/pages/manage/components/ChatInput/index.vue b/resources/assets/js/pages/manage/components/ChatInput/index.vue
index 6baf38d8b..9994cb8a1 100755
--- a/resources/assets/js/pages/manage/components/ChatInput/index.vue
+++ b/resources/assets/js/pages/manage/components/ChatInput/index.vue
@@ -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) {
diff --git a/resources/assets/js/pages/manage/components/DialogView.vue b/resources/assets/js/pages/manage/components/DialogView.vue
index 302043f0f..71c06fd80 100644
--- a/resources/assets/js/pages/manage/components/DialogView.vue
+++ b/resources/assets/js/pages/manage/components/DialogView.vue
@@ -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>/g, '
')
+ text = text.replace(/(https*:\/\/)((\w|=|\?|\.|\/|&|-|:|\+|%|;)+)/g, "$1$2");
text = text.replace(this.atUserReg, ``)
const array = text.match(/
]*?>/g);
if (array) {
diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue
index 4de25e675..dca196739 100644
--- a/resources/assets/js/pages/manage/components/ProjectList.vue
+++ b/resources/assets/js/pages/manage/components/ProjectList.vue
@@ -15,7 +15,7 @@
- {{$L(projectLists ? `没有任何与"${projectKeyValue}"相关的项目` : `没有任何项目`)}}
+ {{$L(projectKeyValue ? `没有任何与"${projectKeyValue}"相关的项目` : `没有任何项目`)}}
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)) {
diff --git a/resources/assets/js/pages/manage/components/ProjectPanel.vue b/resources/assets/js/pages/manage/components/ProjectPanel.vue
index 51464eb01..4224ca71e 100644
--- a/resources/assets/js/pages/manage/components/ProjectPanel.vue
+++ b/resources/assets/js/pages/manage/components/ProjectPanel.vue
@@ -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;
}
}
diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue
index 21d641ea8..7fea76e8d 100644
--- a/resources/assets/js/pages/manage/messenger.vue
+++ b/resources/assets/js/pages/manage/messenger.vue
@@ -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;
},
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 22f73420d..f97f25083 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -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);
diff --git a/resources/assets/sass/dark.scss b/resources/assets/sass/dark.scss
index 8e9117f8b..15e492723 100644
--- a/resources/assets/sass/dark.scss
+++ b/resources/assets/sass/dark.scss
@@ -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;
}
diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss
index d27b23c28..68d5ec816 100644
--- a/resources/assets/sass/pages/components/dialog-wrapper.scss
+++ b/resources/assets/sass/pages/components/dialog-wrapper.scss
@@ -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 {
diff --git a/resources/assets/sass/pages/page-manage.scss b/resources/assets/sass/pages/page-manage.scss
index 786e51e90..7a65a4cf9 100644
--- a/resources/assets/sass/pages/page-manage.scss
+++ b/resources/assets/sass/pages/page-manage.scss
@@ -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;
}
}
}