diff --git a/app/appearance/langs/ar_SA.json b/app/appearance/langs/ar_SA.json index bcd1edfc4..fc5701bb7 100644 --- a/app/appearance/langs/ar_SA.json +++ b/app/appearance/langs/ar_SA.json @@ -636,7 +636,6 @@ "dataRepoPurgeConfirm": "سيؤدي مسح مستودع البيانات إلى حذف جميع اللقطات غير المرجعية وعناصر البيانات ذات الصلة، هل أنت متأكد من المسح؟", "purge": "مسح", "plsChoose": "الرجاء الاختيار أولاً", - "clearMessage": "مقروء", "freeSub": "الاشتراك التجريبي المجاني", "sortByUpdateTimeDesc": "تنازلياً بوقت التحديث", "sortByUpdateTimeAsc": "تصاعدياً بوقت التحديث", diff --git a/app/appearance/langs/de_DE.json b/app/appearance/langs/de_DE.json index 07a3a1c5e..4363cba1e 100644 --- a/app/appearance/langs/de_DE.json +++ b/app/appearance/langs/de_DE.json @@ -636,7 +636,6 @@ "dataRepoPurgeConfirm": "Das Bereinigen des Daten-Repo löscht alle nicht referenzierten Schnappschüsse und zugehörigen Datenobjekte vollständig. Sind Sie sicher, dass Sie bereinigen möchten?", "purge": "Bereinigen", "plsChoose": "Bitte zuerst auswählen", - "clearMessage": "Lesen", "freeSub": "Kostenlose Testversion", "sortByUpdateTimeDesc": "Absteigend nach Aktualisierungszeit", "sortByUpdateTimeAsc": "Aufsteigend nach Aktualisierungszeit", diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 61fbd4071..36bed8e4a 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -636,7 +636,6 @@ "dataRepoPurgeConfirm": "Purging the data repo will completely delete all unreferenced snapshots and related data objects, are you sure to purge?", "purge": "Purge", "plsChoose": "Please choose first", - "clearMessage": "Read", "freeSub": "Free Trial Subscription", "sortByUpdateTimeDesc": "Descending by update time", "sortByUpdateTimeAsc": "Ascending by update time", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 9e33a5d54..2ab94cfa4 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -636,7 +636,6 @@ "purge": "Purgar", "dataRepoPurgeTip": "Purga todas las instantáneas sin referencia y los objetos de datos relacionados", "plsChoose": "Por favor, elija primero", - "clearMessage": "Leer", "freeSub": "Suscripción de prueba gratuita", "sortByUpdateTimeDesc": "Descendente por tiempo de actualización", "sortByUpdateTimeAsc": "Ascendente por tiempo de actualización", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 9f1ee5ff6..825f9d9d6 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -636,7 +636,6 @@ "dataRepoPurgeConfirm": "La purge du référentiel de données supprimera complètement tous les instantanés non référencés et les objets de données associés, êtes-vous sûr de purger ?", "purge": "Purger", "plsChoose": "Veuillez d'abord choisir", - "clearMessage": "Lire", "freeSub": "Abonnement d'essai gratuit", "sortByUpdateTimeDesc": "Descendant par heure de mise à jour", "sortByUpdateTimeAsc": "Croissant par heure de mise à jour", diff --git a/app/appearance/langs/he_IL.json b/app/appearance/langs/he_IL.json index d4ebbe7c9..b2b140bf4 100644 --- a/app/appearance/langs/he_IL.json +++ b/app/appearance/langs/he_IL.json @@ -636,7 +636,6 @@ "dataRepoPurgeConfirm": "ניקוי מאגר הנתונים ימחק לחלוטין את כל הצילומים הלא מתייחסים ואת האוביקטים הנתונים הקשורים, האם אתה בטוח לבצע ניקוי?", "purge": "נקה", "plsChoose": "אנא בחר קודם", - "clearMessage": "קרא", "freeSub": "מנוי ניסיון חינם", "sortByUpdateTimeDesc": "יורד לפי זמן עדכון", "sortByUpdateTimeAsc": "עולה לפי זמן עדכון", diff --git a/app/appearance/langs/it_IT.json b/app/appearance/langs/it_IT.json index 41683f622..6c1715158 100644 --- a/app/appearance/langs/it_IT.json +++ b/app/appearance/langs/it_IT.json @@ -636,7 +636,6 @@ "dataRepoPurgeConfirm": "La pulizia del repository dei dati eliminerà completamente tutti gli snapshot non referenziati e gli oggetti dati correlati, sei sicuro di voler pulire?", "purge": "Pulisci", "plsChoose": "Si prega di scegliere prima", - "clearMessage": "Segna come letto", "freeSub": "Prova gratuita", "sortByUpdateTimeDesc": "Discendente per ora di aggiornamento", "sortByUpdateTimeAsc": "Ascendente per ora di aggiornamento", diff --git a/app/appearance/langs/ja_JP.json b/app/appearance/langs/ja_JP.json index efe37d3d9..8c69ce540 100644 --- a/app/appearance/langs/ja_JP.json +++ b/app/appearance/langs/ja_JP.json @@ -636,7 +636,6 @@ "dataRepoPurgeConfirm": "データリポジトリを消去すると、参照されていないすべてのスナップショットと関連するデータオブジェクトが完全に削除されます。消去してもよろしいですか?", "purge": "消去", "plsChoose": "最初にノートを選択してください", - "clearMessage": "既読", "freeSub": "無料体験版", "sortByUpdateTimeDesc": "更新時間 (降順)", "sortByUpdateTimeAsc": "更新時間 (昇順)", diff --git a/app/appearance/langs/pl_PL.json b/app/appearance/langs/pl_PL.json index 0968048d0..1d975c2de 100644 --- a/app/appearance/langs/pl_PL.json +++ b/app/appearance/langs/pl_PL.json @@ -636,7 +636,6 @@ "dataRepoPurgeConfirm": "Oczyszczenie repozytorium danych całkowicie usunie wszystkie nieodwołane zrzuty i powiązane obiekty danych, czy na pewno chcesz przeprowadzić oczyszczenie?", "purge": "Oczyść", "plsChoose": "Proszę najpierw wybrać", - "clearMessage": "Przeczytaj", "freeSub": "Bezpłatna subskrypcja próbna", "sortByUpdateTimeDesc": "Malejąco wg czasu aktualizacji", "sortByUpdateTimeAsc": "Rosnąco wg czasu aktualizacji", diff --git a/app/appearance/langs/pt_BR.json b/app/appearance/langs/pt_BR.json index 09364cd13..18e4edc6e 100644 --- a/app/appearance/langs/pt_BR.json +++ b/app/appearance/langs/pt_BR.json @@ -636,7 +636,6 @@ "dataRepoPurgeConfirm": "Limpar o repositório de dados excluirá completamente todos os instantâneos não referenciados e objetos de dados relacionados, tem certeza que deseja limpar?", "purge": "Limpar", "plsChoose": "Por favor, escolha primeiro", - "clearMessage": "Ler", "freeSub": "Assinatura de Teste Gratuita", "sortByUpdateTimeDesc": "Decrescente por hora de atualização", "sortByUpdateTimeAsc": "Crescente por hora de atualização", diff --git a/app/appearance/langs/ru_RU.json b/app/appearance/langs/ru_RU.json index 07eeb1a20..f8395b534 100644 --- a/app/appearance/langs/ru_RU.json +++ b/app/appearance/langs/ru_RU.json @@ -636,7 +636,6 @@ "dataRepoPurgeConfirm": "Очистка репозитория данных полностью удалит все нереференсированные снимки и связанные объекты данных, вы уверены, что хотите очистить?", "purge": "Очистить", "plsChoose": "Пожалуйста, выберите сначала", - "clearMessage": "Читать", "freeSub": "Бесплатная пробная подписка", "sortByUpdateTimeDesc": "По убыванию времени обновления", "sortByUpdateTimeAsc": "По возрастанию времени обновления", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index b575614db..7fc1f78dd 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -636,7 +636,6 @@ "dataRepoPurgeConfirm": "清理資料倉庫會徹底刪除所有未引用的快照和相關資料對象,確定進行清理嗎?", "purge": "清理", "plsChoose": "請先進行選擇", - "clearMessage": "已讀", "freeSub": "免費試用訂閱", "sortByUpdateTimeDesc": "更新時間降序", "sortByUpdateTimeAsc": "更新時間升序", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index a4a9329df..2f7bb5e81 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -636,7 +636,6 @@ "dataRepoPurgeConfirm": "清理数据仓库会彻底删除所有未引用的快照和相关数据对象,确定进行清理吗?", "purge": "清理", "plsChoose": "请先进行选择", - "clearMessage": "已读", "freeSub": "免费试用订阅", "sortByUpdateTimeDesc": "更新时间降序", "sortByUpdateTimeAsc": "更新时间升序", diff --git a/app/src/assets/scss/component/_snackbar.scss b/app/src/assets/scss/component/_snackbar.scss index 38168d328..db7128c1e 100644 --- a/app/src/assets/scss/component/_snackbar.scss +++ b/app/src/assets/scss/component/_snackbar.scss @@ -4,6 +4,7 @@ text-align: right; justify-self: end; font-size: var(--b3-font-size); + pointer-events: auto; &:not(:first-child) { margin-top: 16px; @@ -15,30 +16,20 @@ &s { position: fixed; - right: 12px; + right: 30px; top: 22px; // 不能设置死,否则右键菜单会被遮盖 z-index: 999999; max-height: calc(100vh - 32px); - margin: 0 18px; display: flex; flex-direction: column; transform: translate3d(calc(20vw + 48px), 0, 0); transition: transform .15s cubic-bezier(.4, 0, 1, 1) 0ms; pointer-events: none; - * { - pointer-events: auto; - } - &--show { transform: translate3d(0, 0, 0) !important; } - & > .b3-button { - align-self: flex-end; - margin-top: 16px; - } - & > .fn__flex-1::-webkit-scrollbar { display: none; } diff --git a/app/src/dialog/message.ts b/app/src/dialog/message.ts index a6faa0779..1cb5223a2 100644 --- a/app/src/dialog/message.ts +++ b/app/src/dialog/message.ts @@ -3,8 +3,7 @@ import {Constants} from "../constants"; export const initMessage = () => { const messageElement = document.getElementById("message"); - messageElement.innerHTML = `
-`; + messageElement.innerHTML = ''; messageElement.addEventListener("click", (event) => { let target = event.target as HTMLElement; while (target && !target.isEqualNode(messageElement)) { @@ -12,13 +11,6 @@ export const initMessage = () => { hideMessage(target.parentElement.getAttribute("data-id")); event.preventDefault(); break; - } else if (target === messageElement.lastElementChild) { - target.parentElement.classList.remove("b3-snackbars--show"); - setTimeout(() => { - target.parentElement.firstElementChild.innerHTML = ""; - }, Constants.TIMEOUT_INPUT); - event.preventDefault(); - break; } else if (target.tagName === "A" || target.tagName === "BUTTON") { break; } else if (target.classList.contains("b3-snackbar")) { @@ -45,7 +37,7 @@ export const showMessage = (message: string, timeout = 6000, type = "info", mess if (!messagesElement) { let tempMessages = document.getElementById("tempMessage"); if (!tempMessages) { - document.body.insertAdjacentHTML("beforeend", ``); tempMessages = document.getElementById("tempMessage"); }