diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a649f4..04b037e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,10 @@ -# Change Log +# 更新日志 / Change Log -- Add more network options for users to choose from +1. 优化大量任务时,软件卡顿的问题 + Optimized the issue of software lag when handling a large number of tasks -## Improvements +2. 优化用户操作反馈 + Improved user operation feedback -- Support more network for usdt payment - - Arbitrum One - - Avalanche C-Chain - - Optimism - - Polygon - - Solana - - TON - - X Layer +3. 修复OTG和USB混合连接模式下,设备无法连接的问题 + Fixed the issue of devices unable to connect in mixed OTG and USB connection mode diff --git a/scripts/send-msg.js b/scripts/send-msg.js index 3bdbc7b..4e2792b 100644 --- a/scripts/send-msg.js +++ b/scripts/send-msg.js @@ -1,3 +1,4 @@ +process.env.URL = 'https://api.tikmatrix.com/download' const chatId = process.env.CHAT_ID const token = process.env.TOKEN const tag = process.env.TAG @@ -7,7 +8,7 @@ import TelegramBot from 'node-telegram-bot-api'; // 从CHANGELOG.md中读取版本更新说明 import fs from 'fs'; const changelog = fs.readFileSync('CHANGELOG.md', 'utf8'); -const message = `A new release: ${tag} is available:\n ${changelog} Check it out at ${url}` +const message = `A new release: ${tag} is available:\n ${changelog}\n Check it out at ${url}` // 创建一个机器人实例 diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 94572c8..2966797 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -7,7 +7,7 @@ }, "package": { "productName": "TikMatrix", - "version": "1.7.3" + "version": "1.7.4" }, "tauri": { "allowlist": { diff --git a/src/App.vue b/src/App.vue index 8ecad44..4c27672 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,7 +2,7 @@
- +
@@ -103,11 +103,11 @@ import TrainSettings from './components/group/TrainSettings.vue' import PublishSettings from './components/group/PublishSettings.vue' import { inject } from 'vue' import * as util from './utils' -import Toast from './components/Toast.vue' +// import Toast from './components/Toast.vue' import { invoke } from "@tauri-apps/api/tauri"; import { window as tauriWindow } from "@tauri-apps/api" import { TauriEvent } from "@tauri-apps/api/event" -import { ask } from '@tauri-apps/api/dialog'; +import { ask, message } from '@tauri-apps/api/dialog'; import BuyLicense from './components/settings/BuyLicense.vue' import { listen } from '@tauri-apps/api/event'; import axios from 'axios' @@ -147,7 +147,7 @@ export default { ManagePostBots, ManageEditBots, Miniremote, - Toast, + // Toast, BuyLicense, TrainSettings, PublishSettings @@ -367,6 +367,9 @@ export default { tauriWindow.getCurrent().close(); } }); + this.$emitter.on('showToast', async (text) => { + await message(text); + }); this.check_update(); this.$emitter.on('openDevice', (device) => { this.device = device diff --git a/src/components/Pagination.vue b/src/components/Pagination.vue index 9d5ac3c..28a354c 100644 --- a/src/components/Pagination.vue +++ b/src/components/Pagination.vue @@ -2,7 +2,8 @@
{{ $t('total') }}: {{ filteredItems.length }} -
+ +
@@ -14,7 +15,7 @@ --> -
+
@@ -55,12 +56,15 @@ export default { searchKeys: { type: Array, required: true + }, + pageSize: { + type: Number, + default: 10 } }, data() { return { currentPage: 1, - pageSize: 10, searchTerm: '', searchGroup: '', } diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue index e7c7b21..1567dc7 100644 --- a/src/components/Sidebar.vue +++ b/src/components/Sidebar.vue @@ -577,6 +577,14 @@ export default { }) }, async initDevice() { + const yes = await ask(this.$t('initDeviceConfirm'), this.$t('confirm')); + if (!yes) { + return + } + if (this.selection.length == 0) { + this.$emitter.emit('showToast', this.$t('noDevicesSelected')) + return + } let work_path = await appDataDir(); this.$emitter.emit('showToast', this.$t('initStart')) this.adb_command(['uninstall', 'com.github.tikmatrix']) diff --git a/src/components/device/ManageDevices.vue b/src/components/device/ManageDevices.vue index 77512ce..06712ec 100644 --- a/src/components/device/ManageDevices.vue +++ b/src/components/device/ManageDevices.vue @@ -1,6 +1,6 @@