From 7f1479ffda0ec8a0cdeda2175a20e3b2dd098936 Mon Sep 17 00:00:00 2001
From: MoonLeeeaf <150461955+MoonLeeeaf@users.noreply.github.com>
Date: Fri, 28 Jun 2024 21:42:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20Tab=E8=8F=9C=E5=8D=95=E7=9A=84=E5=8F=B3?=
 =?UTF-8?q?=E9=94=AE=E8=8F=9C=E5=8D=95=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 如题
2. CachedString 重命名为 CachedData
---
 ling_chair_http/handler.js | 31 ++++++++++++++++++-------------
 ling_chair_http/utils.js   | 18 +++++++++---------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/ling_chair_http/handler.js b/ling_chair_http/handler.js
index f236f5f..31e4127 100644
--- a/ling_chair_http/handler.js
+++ b/ling_chair_http/handler.js
@@ -274,7 +274,7 @@ class ChatTabManager {
      */
     static add(title, target) {
         if (this.tabs[target]) return
-        let tabElement = $($.parseHTML(`<a onclick="ChatMsgAdapter.switchTo('${target}');" tag="chatTab" id="chatTab_${target}" class="mdui-ripple" style="text-transform: none;">${title}</a>`))
+        let tabElement = $($.parseHTML(`<a onclick="ChatMsgAdapter.switchTo('${target}');" tag="chatTab" id="chatTab_${target}" target="${target}" class="mdui-ripple" style="text-transform: none;">${title}</a>`))
         tabElement.appendTo(viewBinding.chatTab)
         // 就你MDUI的B事最多 加Tab还多一个下划线 删掉就解决了
         $(".mdui-tab-indicator").remove()
@@ -309,17 +309,14 @@ class ChatTabManager {
         let menu
         let callback = (e) => {
             if (menu) menu.close()
-            // 切到 div.message-content
+            // 切到 chatTab
             let ele = e.get(0)
             let menuHtml = $.parseHTML(`<ul class="mdui-menu">
             <li class="mdui-menu-item">
-              <a onclick="copyText(\`${e.find("#msg-content").text()}\`)" class="mdui-ripple">复制</a>
-            </li>
-            <li class="mdui-menu-item">
-              <a onclick="mdui.alert(\`${e.find("#raw-msg-content").text()}\`, '消息原文', () => { }, { confirmText: '关闭' })" class="mdui-ripple">原文</a>
-            </li>
-            <li class="mdui-menu-item">
-              <a onclick="mdui.alert('未制作功能', '提示', () => { }, { confirmText: '关闭' })" class="mdui-ripple">转发</a>
+              <a onclick="CachedData.getAndRecycle('${CachedData.addToList(() => {
+                $(ele.previousElementSibling).click()
+                ChatPage.getChatSeesion($(ele).attr('target')).remove()
+              })}')()" class="mdui-ripple">关闭</a>
             </li>
             </ul>`)
             let $menu = $(menuHtml)
@@ -364,6 +361,14 @@ class ChatPage {
         this.chatPageElement.appendTo(viewBinding.pageChatSeesion)
         ;(async () => await this.loadMore())()
     }
+    /**
+     * 获取某个聊天栏
+     * @param { String } target
+     * @returns { jQuery }
+     */
+     static getChatSeesion(target) {
+        return ChatPage.cached[target]
+    }
     /**
      * 获取当前的聊天栏
      * @returns { jQuery }
@@ -376,7 +381,7 @@ class ChatPage {
      * @returns { ChatPage }
      */
     static getCurrentChatPage() {
-        return ChatPage.cached[$(".chat-seesion[actived=true]").attr("target")]
+        return this.getChatSeesion($(".chat-seesion[actived=true]").attr("target"))
     }
     /**
      * 切换选择的聊天对象
@@ -387,7 +392,7 @@ class ChatPage {
         this.minMsgId = null
 
         for (let k of Object.keys(ChatPage.cached)) {
-            let cpe = ChatPage.cached[k].chatPageElement
+            let cpe = ChatPage.getChatSeesion(k).chatPageElement
             cpe.attr("actived", null)
             cpe.hide()
         }
@@ -644,10 +649,10 @@ class ChatMsgAdapter {
 
             let menuHtml = $.parseHTML(`<ul class="mdui-menu menu-on-message">
             <li class="mdui-menu-item">
-              <a onclick="copyText(CachedString.getAndRecycle('${CachedString.addToList(text)}'))" class="mdui-ripple">复制</a>
+              <a onclick="copyText(CachedString.getAndRecycle('${CachedData.addToList(text)}'))" class="mdui-ripple">复制</a>
             </li>
             <li class="mdui-menu-item">
-              <a onclick="mdui.alert(CachedString.getAndRecycle('${CachedString.addToList(rawText)}'), '消息原文', () => { }, { confirmText: '关闭' })" class="mdui-ripple">原文</a>
+              <a onclick="mdui.alert(CachedString.getAndRecycle('${CachedData.addToList(rawText)}'), '消息原文', () => { }, { confirmText: '关闭' })" class="mdui-ripple">原文</a>
             </li>
             <li class="mdui-menu-item">
               <a onclick="mdui.alert('未制作功能', '提示', () => { }, { confirmText: '关闭' })" class="mdui-ripple">转发</a>
diff --git a/ling_chair_http/utils.js b/ling_chair_http/utils.js
index 5ce191e..a4e052f 100644
--- a/ling_chair_http/utils.js
+++ b/ling_chair_http/utils.js
@@ -208,12 +208,12 @@ class Hash {
     }
 }
 
-class CachedString {
+class CachedData {
     static cache = {}
     /**
-     * 添加缓存文本
-     * @param {String} 欲缓存的文本 
-     * @returns {String} 该文本的ID
+     * 添加缓存对象
+     * @param {Object} 欲缓存的对象
+     * @returns {String} 该对象的ID
      */
     static addToList(str) {
         let id = Hash.sha256(str)
@@ -222,15 +222,15 @@ class CachedString {
     }
     /**
      * 回收字符
-     * @param {String} 该文本的ID 
+     * @param {String} 该对象的ID 
      */
     static recycle(id) {
         this.cache[id] = null
     }
     /**
      * 根据ID获取文本
-     * @param {String} 该文本的ID 
-     * @returns {String} 文本
+     * @param {String} 该对象的ID 
+     * @returns {Object} 对象
      */
     static get(id) {
         return this.cache[id]
@@ -238,7 +238,7 @@ class CachedString {
     /**
      * 根据ID获取文本并回收
      * @param {String} 该文本的ID 
-     * @returns {String} 文本
+     * @returns {Object} 对象
      */
      static getAndRecycle(id) {
         let t = this.get(id)
@@ -255,4 +255,4 @@ window.checkEmpty = checkEmpty
 window.sleep = sleep 
 window.Hash = Hash
 window.通知 = 通知
-window.CachedString = CachedString
+window.CachedString = CachedData