From e1df13e7c43c2b8fd20fb2adc51396588ae4ef72 Mon Sep 17 00:00:00 2001
From: tangtaoit <tangtaoit@githubim.com>
Date: Mon, 9 Oct 2023 16:42:12 +0800
Subject: [PATCH] fix: update

---
 packages/tsdaodaobase/src/App.css             |  1 -
 .../src/Components/Conversation/index.tsx     | 11 +++++-----
 .../src/Components/ListItem/index.tsx         |  2 +-
 .../tsdaodaobase/src/Service/APIClient.ts     |  1 +
 .../tsdaodaobase/src/Service/EmojiService.ts  |  2 +-
 .../src/assets/toolbars/func_image_normal.svg | 20 -------------------
 packages/tsdaodaobase/src/module.tsx          |  3 +--
 7 files changed, 10 insertions(+), 30 deletions(-)
 delete mode 100644 packages/tsdaodaobase/src/assets/toolbars/func_image_normal.svg

diff --git a/packages/tsdaodaobase/src/App.css b/packages/tsdaodaobase/src/App.css
index 9d963ef..b066c25 100644
--- a/packages/tsdaodaobase/src/App.css
+++ b/packages/tsdaodaobase/src/App.css
@@ -24,7 +24,6 @@
 
     --wk-message-item: white;
     --wk-message-color: #0F0F0F;
-    
   }
 
   *, *:before, *:after {
diff --git a/packages/tsdaodaobase/src/Components/Conversation/index.tsx b/packages/tsdaodaobase/src/Components/Conversation/index.tsx
index 69c2799..34c70f9 100644
--- a/packages/tsdaodaobase/src/Components/Conversation/index.tsx
+++ b/packages/tsdaodaobase/src/Components/Conversation/index.tsx
@@ -286,7 +286,7 @@ export class Conversation extends Component<ConversationProps> implements Conver
         const viewport = document.getElementById(this.vm.messageContainerId)
         const visiableMessages = this.allVisiableMessages(viewport)
         if (visiableMessages && visiableMessages.length > 0) {
-            const unreadMessages = []
+            const unreadMessages = new Array<Message>()
             for (const visiableMessage of visiableMessages) {
                 if (!visiableMessage.remoteExtra.readed && visiableMessage.fromUID !== WKApp.loginInfo.uid && visiableMessage.setting.receiptEnabled) {
                     unreadMessages.push(visiableMessage.message)
@@ -411,18 +411,19 @@ export class Conversation extends Component<ConversationProps> implements Conver
         }
     }
     // 所有可见的消息
-    allVisiableMessages(vp: HTMLElement | null) {
+    allVisiableMessages(vp: HTMLElement | null):Array<MessageWrap> {
+        const visiableMessages = new Array<MessageWrap>()
         if (!this.vm.messages || this.vm.messages.length === 0) {
-            return
+            return visiableMessages
         }
         let viewport = vp
         if (!viewport) {
             viewport = document.getElementById(this.vm.messageContainerId)
         }
         if (!viewport) {
-            return
+            return visiableMessages
         }
-        const visiableMessages = []
+        
         const targetScrollTop = viewport.scrollTop;
         for (let index = 0; index < this.vm.messages.length; index++) {
             const message = this.vm.messages[index];
diff --git a/packages/tsdaodaobase/src/Components/ListItem/index.tsx b/packages/tsdaodaobase/src/Components/ListItem/index.tsx
index 80a8dd8..95b4d11 100644
--- a/packages/tsdaodaobase/src/Components/ListItem/index.tsx
+++ b/packages/tsdaodaobase/src/Components/ListItem/index.tsx
@@ -26,7 +26,7 @@ export class ListItem extends Component<ListItemProps>{
                 {subTitle}
             </div>
             {/* <div className="wk-list-item-arrow">
-                <img src={require("./assets/arrow_right.png")}></img>
+                <img src={require("./assets/arrow_right.png)}></img>
             </div> */}
         </div>
     }
diff --git a/packages/tsdaodaobase/src/Service/APIClient.ts b/packages/tsdaodaobase/src/Service/APIClient.ts
index 211a662..174db61 100644
--- a/packages/tsdaodaobase/src/Service/APIClient.ts
+++ b/packages/tsdaodaobase/src/Service/APIClient.ts
@@ -53,6 +53,7 @@ export default class APIClient {
                     if(self.logoutCallback) {
                         self.logoutCallback()
                     }
+                    break;
                 default:
                     msg = "未知错误"
                     break;
diff --git a/packages/tsdaodaobase/src/Service/EmojiService.ts b/packages/tsdaodaobase/src/Service/EmojiService.ts
index 792319f..d26f145 100644
--- a/packages/tsdaodaobase/src/Service/EmojiService.ts
+++ b/packages/tsdaodaobase/src/Service/EmojiService.ts
@@ -179,7 +179,7 @@ export class DefaultEmojiService implements EmojiService {
 
     emojiRegExp() {
         if(!this.emojiKeys) {
-            this.emojiKeys = []
+            this.emojiKeys = new Array<string>()
            const keys = this.emojiMap.keys()
            for (let emojiKey of keys) {
                 this.emojiKeys.push(emojiKey)
diff --git a/packages/tsdaodaobase/src/assets/toolbars/func_image_normal.svg b/packages/tsdaodaobase/src/assets/toolbars/func_image_normal.svg
deleted file mode 100644
index 8335865..0000000
--- a/packages/tsdaodaobase/src/assets/toolbars/func_image_normal.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>pc_picture</title>
-    <defs>
-        <linearGradient x1="100%" y1="86.521053%" x2="0%" y2="13.478947%" id="linearGradient-1">
-            <stop stop-color="#F6603E" offset="0%"></stop>
-            <stop stop-color="#F17C55" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="PC切图" transform="translate(-93.000000, -37.000000)">
-            <g id="pc_picture" transform="translate(93.000000, 37.000000)">
-                <rect id="矩形备份-2" fill="#FFFFFF" opacity="0.01" x="0" y="0" width="20" height="20"></rect>
-                <g id="tupian-2" transform="translate(0.000000, 1.000000)" fill="url(#linearGradient-1)">
-                    <path d="M18.2324639,0 C19.2073943,0 20,0.792605723 20,1.76753609 L20,1.76753609 L20,15.3253988 C20,16.3003292 19.2073943,17.0929349 18.2324639,17.0929349 L18.2324639,17.0929349 L1.76753609,17.0929349 C1.26614333,17.0929349 0.815396303,16.9232717 0.496328184,16.6143327 C0.177260066,16.3028615 0,15.8622436 0,15.3760446 L0,15.3760446 L0,1.81818182 C0,1.32945049 0.182324639,0.871106609 0.511521904,0.531780198 C0.845783743,0.189921499 1.29146619,0 1.76753609,0 L1.76753609,0 Z M18.2299316,1.22815903 L1.7650038,1.22815903 C1.46366169,1.22815903 1.22562674,1.48645227 1.22562674,1.81818182 L1.22562674,1.81818182 L1.22815903,1.81818182 L1.22815903,15.3760446 C1.22815903,15.7786781 1.52190428,15.8647759 1.76753609,15.8647759 L1.76753609,15.8647759 L18.2299316,15.8647759 C18.5262092,15.8647759 18.7693087,15.6242087 18.7693087,15.3253988 L18.7693087,15.3253988 L18.7693087,1.76753609 C18.7693087,1.47125855 18.5287415,1.22815903 18.2299316,1.22815903 L18.2299316,1.22815903 Z M5.96859965,5.60901494 C6.15598886,5.58622436 6.34084578,5.64953153 6.47758926,5.78121043 L6.47758926,5.78121043 L6.48771841,5.79133958 L11.3876931,10.9141555 L13.8389466,8.48569258 C14.0541909,8.27551279 14.3808559,8.24259306 14.6315523,8.40465941 L14.6315523,8.40465941 L14.6594074,8.42238541 L14.6746012,8.43757913 L17.5993923,11.2560142 C17.8703469,11.4560648 17.9412509,11.8308433 17.7589263,12.1195239 C17.6652317,12.261332 17.5234237,12.3600912 17.3562927,12.3955432 C17.1916941,12.4309952 17.0194986,12.4006077 16.8776906,12.3069131 L16.8776906,12.3069131 L16.8473031,12.2866548 L16.8219802,12.261332 L14.3251456,9.79994935 L11.8308433,12.2689288 C11.7118258,12.385414 11.5522917,12.4512535 11.3851608,12.4512535 C11.2205622,12.4512535 11.0635604,12.3879463 10.9445429,12.2739934 L10.9445429,12.2739934 L10.9344138,12.2638643 L6.13573056,7.24487212 L3.01848569,11.970119 C2.82349962,12.2638643 2.42593062,12.3423652 2.13471765,12.1473791 C1.9929096,12.0536845 1.8966827,11.9093441 1.86376298,11.7422132 C1.83084325,11.5750823 1.86629526,11.4054191 1.95998987,11.263611 L1.95998987,11.263611 L5.50772347,5.89009876 C5.61154723,5.7305647 5.78121043,5.62927323 5.96859965,5.60901494 Z M12.1625728,3.99088377 C12.5018992,3.99088377 12.818435,4.12762725 13.0539377,4.37072677 C13.2894404,4.61635857 13.4109901,4.93795898 13.3983287,5.27728539 C13.3730058,5.91795391 12.8513548,6.43960496 12.2106862,6.46239554 L12.2106862,6.46239554 L12.1625728,6.46239554 C11.8409724,6.46239554 11.537098,6.34084578 11.3041276,6.11547227 C11.0610281,5.8825019 10.9268169,5.56596607 10.9268169,5.22663966 C10.9268169,4.54545455 11.4813877,3.99088377 12.1625728,3.99088377 Z" id="形状"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/packages/tsdaodaobase/src/module.tsx b/packages/tsdaodaobase/src/module.tsx
index c6bece3..99efbba 100644
--- a/packages/tsdaodaobase/src/module.tsx
+++ b/packages/tsdaodaobase/src/module.tsx
@@ -341,10 +341,9 @@ export default class BaseModule implements IModule {
                 window.open("https://www.snipaste.com")
             }}></IconClick>
         })
-
         WKApp.endpoints.registerChatToolbar("chattoolbar.image", (ctx) => {
 
-            return <ImageToolbar icon={require("./assets/toolbars/func_image_normal.svg").default} conversationContext={ctx}></ImageToolbar>
+            return <ImageToolbar icon={require("./assets/toolbars/func_screenshot.svg").default} conversationContext={ctx}></ImageToolbar>
         })