From f7061d1a8dadfe162034e4e8e7d10647a46383a5 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Tue, 19 Jul 2022 16:16:22 +0800
Subject: [PATCH] no message

---
 app/Models/WebSocketDialog.php                              | 2 +-
 resources/assets/js/pages/manage.vue                        | 2 +-
 resources/assets/js/pages/manage/components/ProjectList.vue | 2 +-
 .../assets/js/pages/manage/components/ProjectPanel.vue      | 4 ++--
 resources/assets/js/pages/manage/messenger.vue              | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Models/WebSocketDialog.php b/app/Models/WebSocketDialog.php
index f03e61cda..dfff82b21 100644
--- a/app/Models/WebSocketDialog.php
+++ b/app/Models/WebSocketDialog.php
@@ -136,7 +136,7 @@ class WebSocketDialog extends AbstractModel
             $this->has_file = $msgBuilder->clone()->whereMtype('file')->exists();
             $this->has_link = $msgBuilder->clone()->whereLink(1)->exists();
         }
-        $this->name_py = Base::cn2pinyin($this->name);
+        $this->pinyin = Base::cn2pinyin($this->name);
         return $this;
     }
 
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index b27fc42d3..423c815c7 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -631,7 +631,7 @@ export default {
                 return b.id - a.id;
             });
             if (projectKeyValue) {
-                return data.filter(item => $A.strExists(`${item.name}||${item.desc}`, projectKeyValue));
+                return data.filter(item => $A.strExists(`${item.name} ${item.desc}`, projectKeyValue));
             }
             return data;
         },
diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue
index 132b84825..69d88efdf 100644
--- a/resources/assets/js/pages/manage/components/ProjectList.vue
+++ b/resources/assets/js/pages/manage/components/ProjectList.vue
@@ -100,7 +100,7 @@ export default {
                 return b.id - a.id;
             });
             if (projectKeyValue) {
-                return data.filter(item => $A.strExists(`${item.name}||${item.desc}`, projectKeyValue));
+                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 dec8b0fbe..ba9188479 100644
--- a/resources/assets/js/pages/manage/components/ProjectPanel.vue
+++ b/resources/assets/js/pages/manage/components/ProjectPanel.vue
@@ -602,7 +602,7 @@ export default {
                     list = list.filter(({flow_item_id}) => flow_item_id === flowInfo.value);
                 }
                 if (searchText) {
-                    list = list.filter(({name, desc}) => $A.strExists(`${name}||${desc}`, searchText));
+                    list = list.filter(({name, desc}) => $A.strExists(`${name} ${desc}`, searchText));
                 }
                 return list;
             }
@@ -1267,7 +1267,7 @@ export default {
                 return true;
             }
             if (searchText) {
-                if (!$A.strExists(`${name}||${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 7082eeb14..d7ed722a5 100644
--- a/resources/assets/js/pages/manage/messenger.vue
+++ b/resources/assets/js/pages/manage/messenger.vue
@@ -227,8 +227,8 @@ export default {
                     return false;
                 }
                 if (dialogKey) {
-                    const {name, name_py, last_msg} = dialog;
-                    let searchString = `${name} ${name_py}`
+                    const {name, pinyin, last_msg} = dialog;
+                    let searchString = `${name} ${pinyin}`
                     if (last_msg) {
                         switch (last_msg.type) {
                             case 'text':
@@ -292,7 +292,7 @@ export default {
                 return [];
             }
             if (contactsKey) {
-                return contactsData.filter(item => $A.strExists(`${item.email}||${item.nickname}||${item.profession}||${item.pinyin}`, contactsKey))
+                return contactsData.filter(item => $A.strExists(`${item.email} ${item.nickname} ${item.profession} ${item.pinyin}`, contactsKey))
             }
             return contactsData;
         },