From db9e3e791e3a168c2f3cdef75d5cf1f834bce484 Mon Sep 17 00:00:00 2001
From: viarotel <viarotel@qq.com>
Date: Thu, 11 Jul 2024 17:18:27 +0800
Subject: [PATCH 1/7] =?UTF-8?q?perf:=20=E2=9C=85=20Support=20batch=20scree?=
 =?UTF-8?q?nshot=20and=20other=20performance=20optimization?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json                         |  3 +-
 CHANGELOG.md                                  | 19 +++++++
 README-CN.md                                  |  2 +-
 README.md                                     |  2 +-
 components.d.ts                               | 32 ------------
 electron/main.js                              |  2 -
 package.json                                  |  2 +-
 src/App.vue                                   |  2 +-
 .../{AppInstall => Application}/index.vue     |  8 +--
 .../BatchActions/Screenshot/index.vue         | 34 +++++++++++++
 .../Device/components/BatchActions/index.vue  | 17 +++++--
 .../{AppInstall => Application}/index.vue     | 13 +++--
 .../ControlBar/Screenshot/index.vue           | 50 ++++++-------------
 .../Device/components/ControlBar/index.vue    |  6 +--
 .../MoreDropdown/components/Record/index.vue  | 24 ++-------
 src/components/Device/index.vue               |  7 +--
 src/components/Preference/index.vue           |  7 +--
 .../{AppSearch => Search}/index.vue           |  0
 src/plugins/auto.js                           |  1 +
 .../components/EleIconLoading}/index.vue      |  2 +-
 src/plugins/element-plus/index.js             | 10 ++++
 src/styles/css/desktop.css                    |  1 +
 22 files changed, 123 insertions(+), 121 deletions(-)
 rename src/components/Device/components/BatchActions/{AppInstall => Application}/index.vue (67%)
 create mode 100644 src/components/Device/components/BatchActions/Screenshot/index.vue
 rename src/components/Device/components/ControlBar/{AppInstall => Application}/index.vue (89%)
 rename src/components/{AppSearch => Search}/index.vue (100%)
 rename src/{components/Device/components/LoadingIcon => plugins/element-plus/components/EleIconLoading}/index.vue (84%)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0b9f2b6..ffb9835 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -49,5 +49,6 @@
   ],
   "cSpell.words": [
     "bhsn"
-  ]
+  ],
+  "common-intellisense.ui": []
 }
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cce69ed..52ba658 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## [1.20.1](https://github.com/viarotel-org/escrcpy/compare/v1.20.0...v1.20.1) (2024-07-04)
+
+
+### Bug Fixes
+
+* 🐛 Fix batch text spelling errors ([062c689](https://github.com/viarotel-org/escrcpy/commit/062c689755df5bcc5f8e38605c7f101762d7ada0))
+
+## [1.20.0](https://github.com/viarotel-org/escrcpy/compare/v1.19.4...v1.20.0) (2024-07-04)
+
+
+### Features
+
+* ✨ Add batch installation application function ([37ce245](https://github.com/viarotel-org/escrcpy/commit/37ce2457bce9a1b661c6db7162023f53268833f5))
+
+
+### Performance Improvements
+
+* 🚀 Add mouse binding options ([7ee4ba4](https://github.com/viarotel-org/escrcpy/commit/7ee4ba4f2b177e6dbfce85036425b51bfa35ecff))
+
 ## [1.19.4](https://github.com/viarotel-org/escrcpy/compare/v1.19.3...v1.19.4) (2024-07-02)
 
 
diff --git a/README-CN.md b/README-CN.md
index 84fcafa..03ff1cb 100644
--- a/README-CN.md
+++ b/README-CN.md
@@ -203,7 +203,7 @@ Windows 及 Linux 端内部集成了 Gnirehtet， 用于提供 PC 到安卓设
 15. 支持批量连接历史设备功能 ✅
 16. 支持使用内置终端执行自定义命令 ✅
 17. 支持设备自动执行镜像 ✅
-18. 添加批量安装应用功能 ✅
+18. 支持常用批量功能 ✅
 19. 支持更多批量处理功能 🚧
 20. 支持对设备进行分组 🚧
 21. 添加文件传输助手功能 🚧
diff --git a/README.md b/README.md
index 518fe32..17b766c 100644
--- a/README.md
+++ b/README.md
@@ -201,7 +201,7 @@ Refer to [scrcpy/doc/shortcuts](https://github.com/Genymobile/scrcpy/blob/master
 15. Support bulk connecting to historical devices ✅
 16. Support to use built-in terminals to execute custom commands ✅
 17. Supports automatic execution of mirror on devices ✅
-18. Add batch installation application function ✅
+18. Support common batch processing function ✅
 19. Support more batch processing functions 🚧
 20. Support the device to group 🚧
 21. Add file transmission assistant function 🚧
diff --git a/components.d.ts b/components.d.ts
index c6282ce..ab50cdb 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -7,21 +7,11 @@ export {}
 /* prettier-ignore */
 declare module 'vue' {
   export interface GlobalComponents {
-    About: typeof import('./src/components/About/index.vue')['default']
-    AppInstall: typeof import('./src/components/Device/components/BatchActions/AppInstall/index.vue')['default']
-    AppSearch: typeof import('./src/components/AppSearch/index.vue')['default']
-    AudioCodecSelect: typeof import('./src/components/Preference/components/AudioCodecSelect/index.vue')['default']
-    BatchActions: typeof import('./src/components/Device/components/BatchActions/index.vue')['default']
-    Camera: typeof import('./src/components/Device/components/MoreDropdown/components/Camera/index.vue')['default']
-    ControlBar: typeof import('./src/components/Device/components/ControlBar/index.vue')['default']
-    Device: typeof import('./src/components/Device/index.vue')['default']
-    DisplaySelect: typeof import('./src/components/Preference/components/DisplaySelect/index.vue')['default']
     ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElCollapse: typeof import('element-plus/es')['ElCollapse']
     ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
-    ElCollapseTransition: typeof import('element-plus/es')['ElCollapseTransition']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
     ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
@@ -44,28 +34,6 @@ declare module 'vue' {
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
-    FileManage: typeof import('./src/components/Device/components/ControlBar/FileManage/index.vue')['default']
-    Gnirehtet: typeof import('./src/components/Device/components/ControlBar/Gnirehtet/index.vue')['default']
-    KeyboardInjectSelect: typeof import('./src/components/Preference/components/KeyboardInjectSelect/index.vue')['default']
-    LanguageSelect: typeof import('./src/components/Preference/components/LanguageSelect/index.vue')['default']
-    LoadingIcon: typeof import('./src/components/Device/components/LoadingIcon/index.vue')['default']
-    MirrorAction: typeof import('./src/components/Device/components/MirrorAction/index.vue')['default']
-    MirrorGroup: typeof import('./src/components/Device/components/ControlBar/MirrorGroup/index.vue')['default']
-    MoreDropdown: typeof import('./src/components/Device/components/MoreDropdown/index.vue')['default']
-    Otg: typeof import('./src/components/Device/components/MoreDropdown/components/Otg/index.vue')['default']
-    PairDialog: typeof import('./src/components/Device/components/Wireless/PairDialog/index.vue')['default']
-    PathInput: typeof import('./src/components/Preference/components/PathInput/index.vue')['default']
-    Preference: typeof import('./src/components/Preference/index.vue')['default']
-    Record: typeof import('./src/components/Device/components/MoreDropdown/components/Record/index.vue')['default']
-    Remark: typeof import('./src/components/Device/components/Remark/index.vue')['default']
-    Rotation: typeof import('./src/components/Device/components/ControlBar/Rotation/index.vue')['default']
-    Screenshot: typeof import('./src/components/Device/components/ControlBar/Screenshot/index.vue')['default']
-    TerminalAction: typeof import('./src/components/Device/components/TerminalAction/index.vue')['default']
-    TerminalDialog: typeof import('./src/components/Device/components/TerminalAction/components/TerminalDialog/index.vue')['default']
-    VideoCodecSelect: typeof import('./src/components/Preference/components/VideoCodecSelect/index.vue')['default']
-    Volume: typeof import('./src/components/Device/components/ControlBar/Volume/index.vue')['default']
-    Wireless: typeof import('./src/components/Device/components/Wireless/index.vue')['default']
-    WirelessAction: typeof import('./src/components/Device/components/WirelessAction/index.vue')['default']
   }
   export interface ComponentCustomProperties {
     vLoading: typeof import('element-plus/es')['ElLoadingDirective']
diff --git a/electron/main.js b/electron/main.js
index 76b0e9a..f037f6d 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -27,8 +27,6 @@ log.initialize({ preload: true })
 
 const debug = !!appStore.get('common.debug')
 
-log.info('Debug Status:', debug)
-
 if (!debug) {
   log.warn(
     'Debug Tips:',
diff --git a/package.json b/package.json
index 56f04b1..cdfb6fb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "escrcpy",
   "type": "module",
-  "version": "1.19.4",
+  "version": "1.20.1",
   "private": true,
   "description": "Scrcpy Powered by Electron",
   "author": "viarotel",
diff --git a/src/App.vue b/src/App.vue
index 16fc657..746ac26 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -33,7 +33,7 @@ import { ElMessageBox } from 'element-plus'
 import Device from './components/Device/index.vue'
 import Preference from './components/Preference/index.vue'
 import About from './components/About/index.vue'
-import AppSearch from './components/AppSearch/index.vue'
+import AppSearch from './components/Search/index.vue'
 
 import { useThemeStore } from '$/store/theme/index.js'
 import { usePreferenceStore } from '$/store/preference/index.js'
diff --git a/src/components/Device/components/BatchActions/AppInstall/index.vue b/src/components/Device/components/BatchActions/Application/index.vue
similarity index 67%
rename from src/components/Device/components/BatchActions/AppInstall/index.vue
rename to src/components/Device/components/BatchActions/Application/index.vue
index 7aeef33..5482a82 100644
--- a/src/components/Device/components/BatchActions/AppInstall/index.vue
+++ b/src/components/Device/components/BatchActions/Application/index.vue
@@ -1,17 +1,17 @@
 <template>
   <div class="" @click="handleClick">
     <slot />
-    <AppInstallProxy ref="appInstallProxyRef" />
+    <ApplicationProxy ref="applicationProxyRef" />
   </div>
 </template>
 
 <script>
-import AppInstallProxy from '$/components/Device/components/ControlBar/AppInstall/index.vue'
+import ApplicationProxy from '$/components/Device/components/ControlBar/Application/index.vue'
 import { sleep } from '$/utils'
 
 export default {
   components: {
-    AppInstallProxy,
+    ApplicationProxy,
   },
   props: {
     devices: {
@@ -23,7 +23,7 @@ export default {
     async handleClick() {
       for (let index = 0; index < this.devices.length; index++) {
         const item = this.devices[index]
-        await this.$refs.appInstallProxyRef.handleInstall(item)
+        await this.$refs.applicationProxyRef.invoke(item)
         await sleep(2 * 1000)
       }
     },
diff --git a/src/components/Device/components/BatchActions/Screenshot/index.vue b/src/components/Device/components/BatchActions/Screenshot/index.vue
new file mode 100644
index 0000000..5d91b48
--- /dev/null
+++ b/src/components/Device/components/BatchActions/Screenshot/index.vue
@@ -0,0 +1,34 @@
+<template>
+  <div class="" @click="handleClick">
+    <slot />
+    <ScreenshotProxy ref="screenshotProxyRef" />
+  </div>
+</template>
+
+<script>
+import ScreenshotProxy from '$/components/Device/components/ControlBar/Screenshot/index.vue'
+import { sleep } from '$/utils'
+
+export default {
+  components: {
+    ScreenshotProxy,
+  },
+  props: {
+    devices: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  methods: {
+    async handleClick() {
+      for (let index = 0; index < this.devices.length; index++) {
+        const item = this.devices[index]
+        await this.$refs.screenshotProxyRef.invoke(item)
+        await sleep(2 * 1000)
+      }
+    },
+  },
+}
+</script>
+
+<style></style>
diff --git a/src/components/Device/components/BatchActions/index.vue b/src/components/Device/components/BatchActions/index.vue
index 8073157..33468c0 100644
--- a/src/components/Device/components/BatchActions/index.vue
+++ b/src/components/Device/components/BatchActions/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex items-center">
+  <div class="flex items-center space-x-2">
     <component
       :is="item.component || 'div'"
       v-for="(item, index) in actionModel"
@@ -31,7 +31,7 @@
               <component :is="item.elIcon" />
             </el-icon>
           </template>
-          {{ $t('common.batch') }}{{ $t(item.label) }}
+          {{ $t('common.batch') }}-{{ $t(item.label) }}
         </el-button>
       </template>
     </component>
@@ -39,11 +39,13 @@
 </template>
 
 <script>
-import AppInstall from './AppInstall/index.vue'
+import Application from './Application/index.vue'
+import Screenshot from './Screenshot/index.vue'
 
 export default {
   components: {
-    AppInstall,
+    Application,
+    Screenshot,
   },
   props: {
     devices: {
@@ -54,10 +56,15 @@ export default {
   data() {
     return {
       actionModel: [
+        {
+          label: 'device.control.capture',
+          elIcon: 'Crop',
+          component: 'Screenshot',
+        },
         {
           label: 'device.control.install',
           svgIcon: 'install',
-          component: 'AppInstall',
+          component: 'Application',
         },
       ],
     }
diff --git a/src/components/Device/components/ControlBar/AppInstall/index.vue b/src/components/Device/components/ControlBar/Application/index.vue
similarity index 89%
rename from src/components/Device/components/ControlBar/AppInstall/index.vue
rename to src/components/Device/components/ControlBar/Application/index.vue
index b08b706..c4559db 100644
--- a/src/components/Device/components/ControlBar/AppInstall/index.vue
+++ b/src/components/Device/components/ControlBar/Application/index.vue
@@ -5,8 +5,6 @@
 </template>
 
 <script>
-import LoadingIcon from '$/components/Device/components/LoadingIcon/index.vue'
-
 export default {
   props: {
     device: {
@@ -18,6 +16,9 @@ export default {
     return {}
   },
   methods: {
+    invoke(...args) {
+      return this.handleInstall(...args)
+    },
     preferenceData(...args) {
       return this.$store.preference.getData(...args)
     },
@@ -46,13 +47,11 @@ export default {
         return false
       }
 
-      const messageEl = this.$message({
-        message: this.$t('device.control.install.progress', {
+      const messageEl = this.$message.loading(
+        this.$t('device.control.install.progress', {
           deviceName: this.$store.device.getLabel(device),
         }),
-        icon: LoadingIcon,
-        duration: 0,
-      })
+      )
 
       let failCount = 0
 
diff --git a/src/components/Device/components/ControlBar/Screenshot/index.vue b/src/components/Device/components/ControlBar/Screenshot/index.vue
index 1353f20..09bcb72 100644
--- a/src/components/Device/components/ControlBar/Screenshot/index.vue
+++ b/src/components/Device/components/ControlBar/Screenshot/index.vue
@@ -1,12 +1,10 @@
 <template>
-  <div class="" @click="handleScreenCap(device)">
+  <div class="" @click="handleCapture(device)">
     <slot />
   </div>
 </template>
 
 <script>
-import LoadingIcon from '$/components/Device/components/LoadingIcon/index.vue'
-
 export default {
   props: {
     device: {
@@ -18,21 +16,22 @@ export default {
     return {}
   },
   methods: {
+    invoke(...args) {
+      return this.handleCapture(...args)
+    },
     preferenceData(...args) {
       return this.$store.preference.getData(...args)
     },
-    async handleScreenCap(device) {
-      const messageEl = this.$message({
-        message: this.$t('device.control.capture.progress', {
+    async handleCapture(device) {
+      const messageEl = this.$message.loading(
+        this.$t('device.control.capture.progress', {
           deviceName: this.$store.device.getLabel(device),
         }),
-        icon: LoadingIcon,
-        duration: 0,
-      })
+      )
 
       const fileName = this.$store.device.getLabel(
         device,
-        ({ time }) => `screenshot-${time}.png`,
+        ({ time }) => `screenshot-${time}.jpg`,
       )
 
       const deviceConfig = this.preferenceData(device.id)
@@ -40,7 +39,7 @@ export default {
 
       try {
         await this.$adb.screencap(device.id, { savePath })
-        this.handleScreencapSuccess(savePath)
+        await this.handleSuccess(savePath)
       }
       catch (error) {
         if (error.message) {
@@ -50,29 +49,12 @@ export default {
 
       messageEl.close()
     },
-    async handleScreencapSuccess(savePath) {
-      try {
-        await this.$confirm(
-          this.$t('device.control.capture.success.message'),
-          this.$t('device.control.capture.success.message.title'),
-          {
-            confirmButtonText: this.$t('common.confirm'),
-            cancelButtonText: this.$t('common.cancel'),
-            closeOnClickModal: false,
-            type: 'success',
-          },
-        )
-
-        await this.$electron.ipcRenderer.invoke(
-          'show-item-in-folder',
-          savePath,
-        )
-      }
-      catch (error) {
-        if (error.message) {
-          this.$message.warning(error.message)
-        }
-      }
+    async handleSuccess(savePath) {
+      return this.$message.success(
+        `${this.$t(
+          'device.control.capture.success.message.title',
+        )}: ${savePath}`,
+      )
     },
   },
 }
diff --git a/src/components/Device/components/ControlBar/index.vue b/src/components/Device/components/ControlBar/index.vue
index fd250ae..2718789 100644
--- a/src/components/Device/components/ControlBar/index.vue
+++ b/src/components/Device/components/ControlBar/index.vue
@@ -66,7 +66,7 @@
 
 <script>
 import Screenshot from './Screenshot/index.vue'
-import AppInstall from './AppInstall/index.vue'
+import Application from './Application/index.vue'
 import Gnirehtet from './Gnirehtet/index.vue'
 import MirrorGroup from './MirrorGroup/index.vue'
 import Rotation from './Rotation/index.vue'
@@ -76,7 +76,7 @@ import FileManage from './FileManage/index.vue'
 export default {
   components: {
     Screenshot,
-    AppInstall,
+    Application,
     Gnirehtet,
     MirrorGroup,
     Rotation,
@@ -142,7 +142,7 @@ export default {
         {
           label: 'device.control.install',
           svgIcon: 'install',
-          component: 'AppInstall',
+          component: 'Application',
         },
         {
           label: 'device.control.file.name',
diff --git a/src/components/Device/components/MoreDropdown/components/Record/index.vue b/src/components/Device/components/MoreDropdown/components/Record/index.vue
index 28ef644..7392554 100644
--- a/src/components/Device/components/MoreDropdown/components/Record/index.vue
+++ b/src/components/Device/components/MoreDropdown/components/Record/index.vue
@@ -51,7 +51,7 @@ export default {
 
         await recording
 
-        this.onRecordSuccess(savePath)
+        await this.handleSuccess(savePath)
       }
       catch (error) {
         console.error('record.args', args)
@@ -79,24 +79,10 @@ export default {
 
       return value
     },
-    async onRecordSuccess(savePath) {
-      try {
-        await this.$confirm(
-          this.$t('device.record.success.message'),
-          this.$t('device.record.success.title'),
-          {
-            confirmButtonText: this.$t('common.confirm'),
-            cancelButtonText: this.$t('common.cancel'),
-            closeOnClickModal: false,
-            type: 'success',
-          },
-        )
-
-        await this.$electron.ipcRenderer.invoke('show-item-in-folder', savePath)
-      }
-      catch (error) {
-        console.warn(error)
-      }
+    async handleSuccess(savePath) {
+      return this.$message.success(
+        `${this.$t('device.record.success.title')}: ${savePath}`,
+      )
     },
   },
 }
diff --git a/src/components/Device/index.vue b/src/components/Device/index.vue
index 308af98..b10128e 100644
--- a/src/components/Device/index.vue
+++ b/src/components/Device/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="h-full flex flex-col">
-    <div class="flex items-center flex-none space-x-2 pt-1">
+    <div class="flex items-center flex-none space-x-2 py-1 overflow-x-auto">
       <Wireless ref="wireless" :reload="getDeviceData" />
 
       <div class="w-px h-7 !ml-4 !mr-2 bg-gray-200"></div>
@@ -33,7 +33,7 @@
 
     <BatchActions
       class="overflow-hidden transition-all"
-      :class="isMultipleRow ? 'h-12 opacity-100 mt-4' : 'h-0 opacity-0 mt-0'"
+      :class="isMultipleRow ? 'h-12 opacity-100 mt-3' : 'h-0 opacity-0 mt-0'"
       :devices="selectionRows"
     />
 
@@ -68,6 +68,7 @@
           sortable
           show-overflow-tooltip
           align="left"
+          min-width="200"
         >
           <template #default="{ row }">
             <div class="flex items-center">
@@ -96,7 +97,7 @@
         <el-table-column
           v-slot="{ row, $index }"
           :label="$t('device.control.name')"
-          width="450"
+          width="400"
           align="left"
         >
           <MirrorAction
diff --git a/src/components/Preference/index.vue b/src/components/Preference/index.vue
index f5b7a8c..e10035d 100644
--- a/src/components/Preference/index.vue
+++ b/src/components/Preference/index.vue
@@ -208,7 +208,6 @@ import DisplaySelect from './components/DisplaySelect/index.vue'
 import KeyboardInjectSelect from './components/KeyboardInjectSelect/index.vue'
 
 import { usePreferenceStore } from '$/store/index.js'
-import LoadingIcon from '$/components/Device/components/LoadingIcon/index.vue'
 
 export default {
   components: {
@@ -349,11 +348,7 @@ export default {
     },
 
     async handleExport() {
-      const messageEl = this.$message({
-        message: this.$t('preferences.config.export.message'),
-        icon: LoadingIcon,
-        duration: 0,
-      })
+      const messageEl = this.$message.loading(this.$t('preferences.config.export.message'))
 
       try {
         await this.$electron.ipcRenderer.invoke('show-save-dialog', {
diff --git a/src/components/AppSearch/index.vue b/src/components/Search/index.vue
similarity index 100%
rename from src/components/AppSearch/index.vue
rename to src/components/Search/index.vue
diff --git a/src/plugins/auto.js b/src/plugins/auto.js
index 0e9c6c2..4e63297 100644
--- a/src/plugins/auto.js
+++ b/src/plugins/auto.js
@@ -16,6 +16,7 @@ export default () => {
     }),
     useAutoComponents({
       resolvers,
+      dirs: 'none',
     }),
   ]
 }
diff --git a/src/components/Device/components/LoadingIcon/index.vue b/src/plugins/element-plus/components/EleIconLoading/index.vue
similarity index 84%
rename from src/components/Device/components/LoadingIcon/index.vue
rename to src/plugins/element-plus/components/EleIconLoading/index.vue
index 074ba74..1388dfd 100644
--- a/src/components/Device/components/LoadingIcon/index.vue
+++ b/src/plugins/element-plus/components/EleIconLoading/index.vue
@@ -6,7 +6,7 @@
 
 <script>
 export default {
-  name: 'LoadingIcon',
+  name: 'EleIconLoading',
 }
 </script>
 
diff --git a/src/plugins/element-plus/index.js b/src/plugins/element-plus/index.js
index 7874d74..0e07347 100644
--- a/src/plugins/element-plus/index.js
+++ b/src/plugins/element-plus/index.js
@@ -8,12 +8,22 @@ import 'element-plus/theme-chalk/el-message-box.css'
 import 'element-plus/theme-chalk/dark/css-vars.css'
 import './restyle.css'
 
+import EleIconLoading from './components/EleIconLoading/index.vue'
+
 export default {
   install(app) {
     for (const [key, component] of Object.entries(ElementPlusIcons)) {
       app.component(key, component)
     }
 
+    ElMessage.loading = (message, options = {}) =>
+      ElMessage({
+        duration: 0,
+        ...options,
+        message,
+        icon: EleIconLoading,
+      })
+
     app.use(ElMessage)
     app.use(ElMessageBox)
     app.use(ElLoading)
diff --git a/src/styles/css/desktop.css b/src/styles/css/desktop.css
index 0ef191f..4b44d67 100644
--- a/src/styles/css/desktop.css
+++ b/src/styles/css/desktop.css
@@ -7,6 +7,7 @@ html {
 @screen sm {
   ::-webkit-scrollbar {
     width: 8px;
+    height: 8px;
   }
 
   ::-webkit-scrollbar-track {

From 677f30cdc2ab87aef1cf2c3ec1b1d3bc066342c6 Mon Sep 17 00:00:00 2001
From: viarotel <viarotel@qq.com>
Date: Fri, 12 Jul 2024 01:53:09 +0800
Subject: [PATCH 2/7] =?UTF-8?q?perf:=20=E2=9C=A8=20Support=20for=20custom?=
 =?UTF-8?q?=20startup=20mirroring?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json                         |   2 +-
 README-CN.md                                  |  12 +-
 README.md                                     |  12 +-
 .../MoreDropdown/components/Camera/index.vue  |   2 +
 .../Custom/components/DeployDialog/index.vue  |  94 +++++++++
 .../MoreDropdown/components/Custom/index.vue  |  84 ++++++++
 .../Device/components/MoreDropdown/index.vue  |   7 +
 .../PreferenceForm/components/Input/index.vue |  26 +++
 .../components/InputNumber/index.vue          |  27 +++
 .../components/InputPath}/index.vue           |   8 +-
 .../components/Select/index.vue               |  31 +++
 .../components/SelectAudioCodec}/index.vue    |   4 +-
 .../components/SelectDisplay}/index.vue       |   6 +-
 .../SelectKeyboardInject}/index.vue           |   5 +-
 .../components/SelectLanguage}/index.vue      |   4 +-
 .../components/SelectVideoCodec}/index.vue    |   4 +-
 .../components/Switch/index.vue               |  16 ++
 .../PreferenceForm/components/index.js        |  30 +++
 .../components/PreferenceForm/index.vue       | 195 ++++++++++++++++++
 src/components/Preference/index.vue           | 169 ++-------------
 src/locales/languages/en-US.json              |   1 +
 src/locales/languages/zh-CN.json              |   1 +
 src/locales/languages/zh-TW.json              |   1 +
 src/plugins/element-plus/restyle.css          |  13 ++
 src/store/preference/helpers/index.js         |   6 +-
 src/store/preference/index.js                 |  25 +--
 src/store/preference/model/audio/index.js     |   4 +-
 src/store/preference/model/camera/index.js    |   2 +-
 src/store/preference/model/common/index.js    |   3 +
 src/store/preference/model/record/index.js    |   2 +-
 src/store/preference/model/video/index.js     |   8 +-
 src/store/preference/model/window/index.js    |   8 +-
 32 files changed, 602 insertions(+), 210 deletions(-)
 create mode 100644 src/components/Device/components/MoreDropdown/components/Custom/components/DeployDialog/index.vue
 create mode 100644 src/components/Device/components/MoreDropdown/components/Custom/index.vue
 create mode 100644 src/components/Preference/components/PreferenceForm/components/Input/index.vue
 create mode 100644 src/components/Preference/components/PreferenceForm/components/InputNumber/index.vue
 rename src/components/Preference/components/{PathInput => PreferenceForm/components/InputPath}/index.vue (92%)
 create mode 100644 src/components/Preference/components/PreferenceForm/components/Select/index.vue
 rename src/components/Preference/components/{AudioCodecSelect => PreferenceForm/components/SelectAudioCodec}/index.vue (94%)
 rename src/components/Preference/components/{DisplaySelect => PreferenceForm/components/SelectDisplay}/index.vue (93%)
 rename src/components/Preference/components/{KeyboardInjectSelect => PreferenceForm/components/SelectKeyboardInject}/index.vue (89%)
 rename src/components/Preference/components/{LanguageSelect => PreferenceForm/components/SelectLanguage}/index.vue (91%)
 rename src/components/Preference/components/{VideoCodecSelect => PreferenceForm/components/SelectVideoCodec}/index.vue (94%)
 create mode 100644 src/components/Preference/components/PreferenceForm/components/Switch/index.vue
 create mode 100644 src/components/Preference/components/PreferenceForm/components/index.js
 create mode 100644 src/components/Preference/components/PreferenceForm/index.vue

diff --git a/.vscode/settings.json b/.vscode/settings.json
index ffb9835..6c650fc 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -30,7 +30,7 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "i18n-ally.localesPaths": ["src/locales/index.js", "src/locales/languages"],
-  "i18n-ally.sourceLanguage": "en",
+  "i18n-ally.sourceLanguage": "zh-CN",
   "i18n-ally.keystyle": "nested",
   "i18n-ally.extract.ignored": [
     "Switch",
diff --git a/README-CN.md b/README-CN.md
index 03ff1cb..c5e4adf 100644
--- a/README-CN.md
+++ b/README-CN.md
@@ -84,6 +84,7 @@ Windows 及 Linux 端内部集成了 Gnirehtet， 用于提供 PC 到安卓设
 - 录制
 - OTG
 - 摄像
+- 灵活启动
 
 ### 设备交互栏
 
@@ -204,11 +205,12 @@ Windows 及 Linux 端内部集成了 Gnirehtet， 用于提供 PC 到安卓设
 16. 支持使用内置终端执行自定义命令 ✅
 17. 支持设备自动执行镜像 ✅
 18. 支持常用批量功能 ✅
-19. 支持更多批量处理功能 🚧
-20. 支持对设备进行分组 🚧
-21. 添加文件传输助手功能 🚧
-22. 支持通过界面从设备下载选中的文件 🚧
-23. 添加对游戏的增强功能，如游戏键位映射 🚧
+19. 支持灵活启动镜像 ✅
+20. 支持更多批量处理功能 🚧
+21. 支持对设备进行分组 🚧
+22. 添加文件传输助手功能 🚧
+23. 支持通过界面从设备下载选中的文件 🚧
+24. 添加对游戏的增强功能，如游戏键位映射 🚧
 
 ## 常见问题
 
diff --git a/README.md b/README.md
index 17b766c..a5f8335 100644
--- a/README.md
+++ b/README.md
@@ -82,6 +82,7 @@ Refer to [scrcpy/doc/shortcuts](https://github.com/Genymobile/scrcpy/blob/master
 - Recording
 - OTG
 - Camera
+- Custom
 
 ### Device Interaction Bar
 
@@ -202,11 +203,12 @@ Refer to [scrcpy/doc/shortcuts](https://github.com/Genymobile/scrcpy/blob/master
 16. Support to use built-in terminals to execute custom commands ✅
 17. Supports automatic execution of mirror on devices ✅
 18. Support common batch processing function ✅
-19. Support more batch processing functions 🚧
-20. Support the device to group 🚧
-21. Add file transmission assistant function 🚧
-22. Support GUI-based selective file downloads from devices 🚧
-23. Add game enhancement features such as game keyboard mapping 🚧
+19. Support for custom startup mirroring ✅
+20. Support more batch processing functions 🚧
+21. Support the device to group 🚧
+22. Add file transmission assistant function 🚧
+23. Support GUI-based selective file downloads from devices 🚧
+24. Add game enhancement features such as game keyboard mapping 🚧
 
 ## FAQ
 
diff --git a/src/components/Device/components/MoreDropdown/components/Camera/index.vue b/src/components/Device/components/MoreDropdown/components/Camera/index.vue
index b206722..e7cf886 100644
--- a/src/components/Device/components/MoreDropdown/components/Camera/index.vue
+++ b/src/components/Device/components/MoreDropdown/components/Camera/index.vue
@@ -45,6 +45,8 @@ export default {
         },
       )}`
 
+      console.log('args', args)
+
       try {
         const mirroring = this.$scrcpy.mirror(row.id, {
           title: this.$store.device.getLabel(row),
diff --git a/src/components/Device/components/MoreDropdown/components/Custom/components/DeployDialog/index.vue b/src/components/Device/components/MoreDropdown/components/Custom/components/DeployDialog/index.vue
new file mode 100644
index 0000000..3d707d6
--- /dev/null
+++ b/src/components/Device/components/MoreDropdown/components/Custom/components/DeployDialog/index.vue
@@ -0,0 +1,94 @@
+<template>
+  <TemplatePromise v-slot="{ resolve, reject }">
+    <el-dialog
+      v-model="visible"
+      :title="$t('device.actions.more.custom.name')"
+      class="w-11/12 el-dialog-flex el-dialog-beautify"
+      append-to-body
+      destroy-on-close
+      @close="close(reject)"
+    >
+      <div class="h-full overflow-auto -mx-2 pr-2">
+        <PreferenceForm
+          ref="preferenceFormRef"
+          v-model="preferenceData"
+          tag="el-collapse-item"
+          v-bind="{
+            collapseProps: { accordion: true },
+            excludes: ['common'],
+          }"
+        />
+      </div>
+
+      <template #footer>
+        <el-button @click="close(reject)">
+          取消
+        </el-button>
+        <el-button type="primary" @click="submit(resolve)">
+          确定
+        </el-button>
+      </template>
+    </el-dialog>
+  </TemplatePromise>
+</template>
+
+<script setup>
+import { createTemplatePromise } from '@vueuse/core'
+
+import { nextTick } from 'vue'
+import { usePreferenceStore } from '$/store/index.js'
+
+import PreferenceForm from '$/components/Preference/components/PreferenceForm/index.vue'
+
+const TemplatePromise = createTemplatePromise()
+
+const preferenceStore = usePreferenceStore()
+
+const visible = ref(false)
+
+const preferenceFormRef = ref(null)
+
+const preferenceData = ref({
+  ...getDefaultData(),
+})
+
+const collapseValue = ref([])
+
+const device = ref(null)
+
+async function open(row) {
+  device.value = row
+  visible.value = true
+
+  return TemplatePromise.start()
+}
+
+async function submit(resolve) {
+  const data = await preferenceFormRef.value.generateCommand()
+
+  visible.value = false
+
+  resolve(data)
+}
+
+async function close(reject) {
+  visible.value = false
+
+  await nextTick()
+
+  preferenceData.value = { ...getDefaultData() }
+
+  reject(new Error('User cancel operation'))
+}
+
+function getDefaultData() {
+  return preferenceStore.getDefaultData('global', () => void 0)
+}
+
+defineExpose({
+  open,
+  close,
+})
+</script>
+
+<style></style>
diff --git a/src/components/Device/components/MoreDropdown/components/Custom/index.vue b/src/components/Device/components/MoreDropdown/components/Custom/index.vue
new file mode 100644
index 0000000..a92bc14
--- /dev/null
+++ b/src/components/Device/components/MoreDropdown/components/Custom/index.vue
@@ -0,0 +1,84 @@
+<template>
+  <slot :loading="loading" :trigger="handleClick" />
+
+  <DeployDialog ref="deployDialogRef" />
+</template>
+
+<script>
+import DeployDialog from './components/DeployDialog/index.vue'
+import { sleep } from '$/utils'
+
+export default {
+  components: {
+    DeployDialog,
+  },
+  props: {
+    row: {
+      type: Object,
+      default: () => ({}),
+    },
+    toggleRowExpansion: {
+      type: Function,
+      default: () => () => false,
+    },
+  },
+  data() {
+    return {
+      loading: false,
+    }
+  },
+  methods: {
+    async handleClick() {
+      const row = this.row
+
+      this.loading = true
+
+      let args = ''
+
+      try {
+        args = await this.$refs.deployDialogRef.open(row)
+      }
+      catch (error) {
+        this.loading = false
+        this.$message.warning(error.message)
+        return false
+      }
+
+      /** TODO */
+      const isCamera = ['--camera-facing'].some(key => args.includes(key))
+      if (isCamera) {
+        args += ' --video-source=camera'
+      }
+
+      this.toggleRowExpansion(row, true)
+
+      try {
+        const mirroring = this.$scrcpy.mirror(row.id, {
+          title: this.$store.device.getLabel(row),
+          args,
+          stdout: this.onStdout,
+          stderr: this.onStderr,
+        })
+
+        await sleep(1 * 1000)
+
+        this.loading = false
+
+        await mirroring
+      }
+      catch (error) {
+        console.error('mirror.args', args)
+        console.error('mirror.error', error)
+
+        if (error.message) {
+          this.$message.warning(error.message)
+        }
+      }
+    },
+    onStdout() {},
+    onStderr() {},
+  },
+}
+</script>
+
+<style></style>
diff --git a/src/components/Device/components/MoreDropdown/index.vue b/src/components/Device/components/MoreDropdown/index.vue
index 9197deb..d5be13a 100644
--- a/src/components/Device/components/MoreDropdown/index.vue
+++ b/src/components/Device/components/MoreDropdown/index.vue
@@ -41,17 +41,20 @@
 import Record from './components/Record/index.vue'
 import Otg from './components/Otg/index.vue'
 import Camera from './components/Camera/index.vue'
+import Custom from './components/Custom/index.vue'
 
 export default {
   components: {
     Record,
     Otg,
     Camera,
+    Custom,
   },
   props: {
     ...Record.props,
     ...Otg.props,
     ...Camera.props,
+    ...Custom.props,
   },
   data() {
     return {
@@ -68,6 +71,10 @@ export default {
           label: 'device.actions.more.camera.name',
           component: 'Camera',
         },
+        {
+          label: 'device.actions.more.custom.name',
+          component: 'Custom',
+        },
       ],
     }
   },
diff --git a/src/components/Preference/components/PreferenceForm/components/Input/index.vue b/src/components/Preference/components/PreferenceForm/components/Input/index.vue
new file mode 100644
index 0000000..b6858ef
--- /dev/null
+++ b/src/components/Preference/components/PreferenceForm/components/Input/index.vue
@@ -0,0 +1,26 @@
+<template>
+  <el-input
+    class="!w-full"
+    v-bind="{
+      clearable: true,
+      ...(data.props || {}),
+    }"
+  >
+    <template v-if="data.append" #append>
+      {{ data.append }}
+    </template>
+  </el-input>
+</template>
+
+<script>
+export default {
+  props: {
+    data: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+}
+</script>
+
+<style></style>
diff --git a/src/components/Preference/components/PreferenceForm/components/InputNumber/index.vue b/src/components/Preference/components/PreferenceForm/components/InputNumber/index.vue
new file mode 100644
index 0000000..713d270
--- /dev/null
+++ b/src/components/Preference/components/PreferenceForm/components/InputNumber/index.vue
@@ -0,0 +1,27 @@
+<template>
+  <el-input
+    class="!w-full"
+    v-bind="{
+      type: 'number',
+      clearable: true,
+      ...(data.props || {}),
+    }"
+  >
+    <template v-if="data.append" #append>
+      {{ data.append }}
+    </template>
+  </el-input>
+</template>
+
+<script>
+export default {
+  props: {
+    data: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+}
+</script>
+
+<style></style>
diff --git a/src/components/Preference/components/PathInput/index.vue b/src/components/Preference/components/PreferenceForm/components/InputPath/index.vue
similarity index 92%
rename from src/components/Preference/components/PathInput/index.vue
rename to src/components/Preference/components/PreferenceForm/components/InputPath/index.vue
index 1039224..abe3404 100644
--- a/src/components/Preference/components/PathInput/index.vue
+++ b/src/components/Preference/components/PreferenceForm/components/InputPath/index.vue
@@ -1,11 +1,11 @@
 <template>
   <el-input
-    v-bind="data.props || {}"
+    v-bind="{
+      clearable: true,
+      ...(data.props || {}),
+    }"
     v-model="pathValue"
-    clearable
     class="!w-full"
-    :title="$t(data.placeholder)"
-    :placeholder="$t(data.placeholder)"
   >
     <template #append>
       <el-button
diff --git a/src/components/Preference/components/PreferenceForm/components/Select/index.vue b/src/components/Preference/components/PreferenceForm/components/Select/index.vue
new file mode 100644
index 0000000..fd50440
--- /dev/null
+++ b/src/components/Preference/components/PreferenceForm/components/Select/index.vue
@@ -0,0 +1,31 @@
+<template>
+  <el-select
+    v-bind="{
+      clearable: true,
+      ...(data.props || {}),
+    }"
+    class="!w-full"
+  >
+    <el-option
+      v-for="(item, index) in data.options"
+      :key="index"
+      :label="$t(item.label)"
+      :value="item.value"
+      :title="$t(item.placeholder || item.label)"
+    >
+    </el-option>
+  </el-select>
+</template>
+
+<script>
+export default {
+  props: {
+    data: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+}
+</script>
+
+<style></style>
diff --git a/src/components/Preference/components/AudioCodecSelect/index.vue b/src/components/Preference/components/PreferenceForm/components/SelectAudioCodec/index.vue
similarity index 94%
rename from src/components/Preference/components/AudioCodecSelect/index.vue
rename to src/components/Preference/components/PreferenceForm/components/SelectAudioCodec/index.vue
index 88d995e..cbea474 100644
--- a/src/components/Preference/components/AudioCodecSelect/index.vue
+++ b/src/components/Preference/components/PreferenceForm/components/SelectAudioCodec/index.vue
@@ -1,10 +1,8 @@
 <template>
   <el-select
-    v-bind="data.props || {}"
+    v-bind="{ ...(data.props || {}) }"
     v-model="selectValue"
     class="!w-full"
-    :title="$t(data.placeholder)"
-    :placeholder="$t(data.placeholder)"
   >
     <el-option
       v-for="(item, index) in options"
diff --git a/src/components/Preference/components/DisplaySelect/index.vue b/src/components/Preference/components/PreferenceForm/components/SelectDisplay/index.vue
similarity index 93%
rename from src/components/Preference/components/DisplaySelect/index.vue
rename to src/components/Preference/components/PreferenceForm/components/SelectDisplay/index.vue
index 20c2609..af08916 100644
--- a/src/components/Preference/components/DisplaySelect/index.vue
+++ b/src/components/Preference/components/PreferenceForm/components/SelectDisplay/index.vue
@@ -1,10 +1,10 @@
 <template>
   <el-select
-    v-bind="data.props || {}"
+    v-bind="{
+      ...(data.props || {}),
+    }"
     v-model="selectValue"
     class="!w-full"
-    :title="$t(data.placeholder)"
-    :placeholder="$t(data.placeholder)"
   >
     <el-option
       v-for="(item, index) in options"
diff --git a/src/components/Preference/components/KeyboardInjectSelect/index.vue b/src/components/Preference/components/PreferenceForm/components/SelectKeyboardInject/index.vue
similarity index 89%
rename from src/components/Preference/components/KeyboardInjectSelect/index.vue
rename to src/components/Preference/components/PreferenceForm/components/SelectKeyboardInject/index.vue
index c87f803..f808a1c 100644
--- a/src/components/Preference/components/KeyboardInjectSelect/index.vue
+++ b/src/components/Preference/components/PreferenceForm/components/SelectKeyboardInject/index.vue
@@ -1,11 +1,8 @@
 <template>
   <el-select
-    v-bind="data.props || {}"
+    v-bind="{ clearable: true, ...(data.props || {}) }"
     v-model="selectValue"
     class="!w-full"
-    clearable
-    :title="$t(data.placeholder)"
-    :placeholder="$t(data.placeholder)"
   >
     <el-option
       v-for="(item, index) in options"
diff --git a/src/components/Preference/components/LanguageSelect/index.vue b/src/components/Preference/components/PreferenceForm/components/SelectLanguage/index.vue
similarity index 91%
rename from src/components/Preference/components/LanguageSelect/index.vue
rename to src/components/Preference/components/PreferenceForm/components/SelectLanguage/index.vue
index 442b56c..5c3221d 100644
--- a/src/components/Preference/components/LanguageSelect/index.vue
+++ b/src/components/Preference/components/PreferenceForm/components/SelectLanguage/index.vue
@@ -1,10 +1,8 @@
 <template>
   <el-select
-    v-bind="data.props || {}"
+    v-bind="{ ...(data.props || {}) }"
     v-model="inputValue"
     class="!w-full"
-    :title="$t(data.placeholder)"
-    :placeholder="$t(data.placeholder)"
   >
     <el-option
       v-for="(item, index) in data.options"
diff --git a/src/components/Preference/components/VideoCodecSelect/index.vue b/src/components/Preference/components/PreferenceForm/components/SelectVideoCodec/index.vue
similarity index 94%
rename from src/components/Preference/components/VideoCodecSelect/index.vue
rename to src/components/Preference/components/PreferenceForm/components/SelectVideoCodec/index.vue
index 0a0d7d7..8dd5dcb 100644
--- a/src/components/Preference/components/VideoCodecSelect/index.vue
+++ b/src/components/Preference/components/PreferenceForm/components/SelectVideoCodec/index.vue
@@ -1,10 +1,8 @@
 <template>
   <el-select
-    v-bind="data.props || {}"
+    v-bind="{ ...(data.props || {}) }"
     v-model="selectValue"
     class="!w-full"
-    :title="$t(data.placeholder)"
-    :placeholder="$t(data.placeholder)"
   >
     <el-option
       v-for="(item, index) in options"
diff --git a/src/components/Preference/components/PreferenceForm/components/Switch/index.vue b/src/components/Preference/components/PreferenceForm/components/Switch/index.vue
new file mode 100644
index 0000000..b83baa9
--- /dev/null
+++ b/src/components/Preference/components/PreferenceForm/components/Switch/index.vue
@@ -0,0 +1,16 @@
+<template>
+  <el-switch class="!w-full" v-bind="{ ...(data.props || {}) }"></el-switch>
+</template>
+
+<script>
+export default {
+  props: {
+    data: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+}
+</script>
+
+<style></style>
diff --git a/src/components/Preference/components/PreferenceForm/components/index.js b/src/components/Preference/components/PreferenceForm/components/index.js
new file mode 100644
index 0000000..cf7ce2e
--- /dev/null
+++ b/src/components/Preference/components/PreferenceForm/components/index.js
@@ -0,0 +1,30 @@
+import Input from './Input/index.vue'
+import InputNumber from './InputNumber/index.vue'
+import InputPath from './InputPath/index.vue'
+import Select from './Select/index.vue'
+import SelectAudioCodec from './SelectAudioCodec/index.vue'
+import SelectDisplay from './SelectDisplay/index.vue'
+import SelectKeyboardInject from './SelectKeyboardInject/index.vue'
+import SelectLanguage from './SelectLanguage/index.vue'
+import SelectVideoCodec from './SelectVideoCodec/index.vue'
+import Switch from './Switch/index.vue'
+
+export const inputModel = {
+  PathInput: InputPath,
+  AudioCodecSelect: SelectAudioCodec,
+  VideoCodecSelect: SelectVideoCodec,
+  DisplaySelect: SelectDisplay,
+  KeyboardInjectSelect: SelectKeyboardInject,
+  LanguageSelect: SelectLanguage,
+
+  Input,
+  InputNumber,
+  InputPath,
+  Select,
+  SelectAudioCodec,
+  SelectDisplay,
+  SelectKeyboardInject,
+  SelectLanguage,
+  SelectVideoCodec,
+  Switch,
+}
diff --git a/src/components/Preference/components/PreferenceForm/index.vue b/src/components/Preference/components/PreferenceForm/index.vue
new file mode 100644
index 0000000..fb58e5f
--- /dev/null
+++ b/src/components/Preference/components/PreferenceForm/index.vue
@@ -0,0 +1,195 @@
+<template>
+  <el-form ref="elForm" :model="preferenceData" label-width="225px" class="">
+    <el-collapse
+      v-model="collapseValue"
+      v-bind="{
+        accordion: false,
+        ...collapseProps,
+      }"
+      class="space-y-4 borderless"
+    >
+      <el-collapse-item
+        v-for="(item, name) of preferenceModel"
+        :key="name"
+        :name="name"
+        class="!border dark:border-gray-700 rounded-[5px] overflow-hidden shadow-el-lighter"
+      >
+        <template #title>
+          <div
+            class="flex items-center w-full text-left -mr-10 overflow-hidden dark:border-gray-700"
+            :class="{
+              '!border-b': collapseValue.includes(name),
+            }"
+          >
+            <div class="flex-1 w-0 truncate pl-4 text-base">
+              {{ $t(item.label) }}
+            </div>
+            <div class="flex-none pl-4 pr-12" @click.stop>
+              <el-button type="primary" text @click="handleReset(name)">
+                {{ $t('preferences.reset') }}
+              </el-button>
+            </div>
+          </div>
+        </template>
+        <div class="pt-4">
+          <el-form
+            ref="elForm"
+            :model="preferenceData"
+            label-width="225px"
+            class="pr-8 pt-4"
+          >
+            <el-row :gutter="20">
+              <el-col
+                v-for="(item_1, name_1) of subModel(item)"
+                :key="name_1"
+                :span="item_1.span || 12"
+                :offset="item_1.offset || 0"
+              >
+                <el-form-item :label="$t(item_1.label)" :prop="item_1.field">
+                  <template #label>
+                    <div class="flex items-center">
+                      <el-tooltip
+                        v-if="item_1.tips"
+                        popper-class="max-w-96"
+                        effect="dark"
+                        :content="$t(item_1.tips)"
+                        placement="bottom"
+                      >
+                        <el-link
+                          class="mr-1 !text-base"
+                          icon="InfoFilled"
+                          type="warning"
+                          :underline="false"
+                        >
+                        </el-link>
+                      </el-tooltip>
+                      <span class="" :title="$t(item_1.placeholder)">{{
+                        $t(item_1.label)
+                      }}</span>
+                    </div>
+                  </template>
+
+                  <component
+                    :is="inputModel[item_1.type]"
+                    v-model="preferenceData[item_1.field]"
+                    v-bind="{
+                      preferenceData,
+                      deviceScope,
+                      title: $t(item_1.placeholder),
+                      placeholder: $t(item_1.placeholder),
+                      data: item_1,
+                    }"
+                  ></component>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </el-collapse-item>
+    </el-collapse>
+  </el-form>
+</template>
+
+<script setup>
+import { omit } from 'lodash-es'
+
+import { inputModel } from './components/index.js'
+
+import { usePreferenceStore } from '$/store/index.js'
+
+const props = defineProps({
+  deviceScope: {
+    type: String,
+    default: '',
+  },
+  collapseProps: {
+    type: Object,
+    default: () => ({}),
+  },
+  excludes: {
+    type: Array,
+    default: () => [],
+  },
+})
+
+const preferenceData = defineModel('modelValue', {
+  type: Object,
+  default: () => ({}),
+})
+
+const preferenceStore = usePreferenceStore()
+
+const collapseValue = ref([])
+
+const preferenceModel = computed(() =>
+  omit(preferenceStore.model, props.excludes),
+)
+
+const preferenceModelKeys = Object.keys(preferenceModel.value ?? {})
+
+if (preferenceModelKeys.length) {
+  if (props.collapseProps.accordion) {
+    collapseValue.value = preferenceModelKeys[0]
+  }
+  else {
+    collapseValue.value = preferenceModelKeys
+  }
+}
+
+watch(
+  () => props.deviceScope,
+  (value) => {
+    if (!value) {
+      return false
+    }
+
+    preferenceData.value = preferenceStore.getData(value)
+  },
+  { immediate: true },
+)
+
+function subModel(item) {
+  const children = item?.children || {}
+
+  const value = {}
+
+  Object.entries(children).forEach(([key, data]) => {
+    if (!data.hidden) {
+      value[key] = data
+    }
+  })
+
+  return value
+}
+
+function handleReset(type) {
+  preferenceData.value = {
+    ...preferenceData.value,
+    ...preferenceStore.getDefaultData(type),
+  }
+}
+
+async function generateCommand() {
+  const value = await preferenceStore.getScrcpyArgs(preferenceData.value, {
+    isRecord: true,
+    isCamera: true,
+    isOtg: true,
+  })
+
+  return value
+}
+
+defineExpose({
+  generateCommand,
+})
+</script>
+
+<style scoped lang="postcss">
+:deep(.el-collapse-item__header) {
+  @apply h-13 leading-13;
+}
+
+:deep(.el-collapse-item__arrow) {
+  @apply w-2em;
+}
+</style>
diff --git a/src/components/Preference/index.vue b/src/components/Preference/index.vue
index e10035d..d53baf6 100644
--- a/src/components/Preference/index.vue
+++ b/src/components/Preference/index.vue
@@ -58,165 +58,28 @@
       </div>
     </div>
 
-    <div class="grid gap-6 pr-2 pt-4 flex-1 h-0 overflow-auto">
-      <el-collapse v-model="collapseValues" class="space-y-4 borderless">
-        <el-collapse-item
-          v-for="(item, name) of preferenceModel"
-          :key="name"
-          :name="name"
-          class="!border dark:border-gray-700 rounded-[5px] overflow-hidden shadow-el-lighter"
-        >
-          <template #title>
-            <div
-              class="flex items-center w-full text-left -mr-10 overflow-hidden dark:border-gray-700"
-              :class="{
-                '!border-b': collapseValues.includes(name),
-              }"
-            >
-              <div class="flex-1 w-0 truncate pl-4 text-base">
-                {{ $t(item.label) }}
-              </div>
-              <div class="flex-none pl-4 pr-12" @click.stop>
-                <el-button type="primary" text @click="handleReset(name)">
-                  {{ $t('preferences.reset') }}
-                </el-button>
-              </div>
-            </div>
-          </template>
-          <div class="pt-4">
-            <el-form
-              ref="elForm"
-              :model="preferenceData"
-              label-width="225px"
-              class="pr-8 pt-4"
-            >
-              <el-row :gutter="20">
-                <el-col
-                  v-for="(item_1, name_1) of subModel(item)"
-                  :key="name_1"
-                  :span="item_1.span || 12"
-                  :offset="item_1.offset || 0"
-                >
-                  <el-form-item :label="$t(item_1.label)" :prop="item_1.field">
-                    <template #label>
-                      <div class="flex items-center">
-                        <el-tooltip
-                          v-if="item_1.tips"
-                          popper-class="max-w-96"
-                          effect="dark"
-                          :content="$t(item_1.tips)"
-                          placement="bottom"
-                        >
-                          <el-link
-                            class="mr-1 !text-base"
-                            icon="InfoFilled"
-                            type="warning"
-                            :underline="false"
-                          >
-                          </el-link>
-                        </el-tooltip>
-                        <span class="" :title="$t(item_1.placeholder)">{{
-                          $t(item_1.label)
-                        }}</span>
-                      </div>
-                    </template>
-
-                    <el-input
-                      v-if="item_1.type === 'Input'"
-                      v-bind="item_1.props || {}"
-                      v-model="preferenceData[item_1.field]"
-                      class="!w-full"
-                      :title="$t(item_1.placeholder)"
-                      :placeholder="$t(item_1.placeholder)"
-                      clearable
-                    >
-                      <template v-if="item_1.append" #append>
-                        {{ item_1.append }}
-                      </template>
-                    </el-input>
-
-                    <el-input
-                      v-else-if="item_1.type === 'Input.number'"
-                      v-bind="item_1.props || {}"
-                      v-model.number="preferenceData[item_1.field]"
-                      class="!w-full"
-                      :title="$t(item_1.placeholder)"
-                      :placeholder="$t(item_1.placeholder)"
-                      clearable
-                    >
-                      <template v-if="item_1.append" #append>
-                        {{ item_1.append }}
-                      </template>
-                    </el-input>
-
-                    <el-switch
-                      v-else-if="item_1.type === 'Switch'"
-                      v-bind="item_1.props || {}"
-                      v-model="preferenceData[item_1.field]"
-                      class="!w-full"
-                      :title="$t(item_1.placeholder)"
-                    ></el-switch>
-
-                    <el-select
-                      v-else-if="item_1.type === 'Select'"
-                      v-bind="item_1.props || {}"
-                      v-model="preferenceData[item_1.field]"
-                      class="!w-full"
-                      :title="$t(item_1.placeholder)"
-                      :placeholder="$t(item_1.placeholder)"
-                    >
-                      <el-option
-                        v-for="(item_2, index_2) in item_1.options"
-                        :key="index_2"
-                        :label="$t(item_2.label)"
-                        :value="item_2.value"
-                        :title="$t(item_2.placeholder || item_2.label)"
-                      >
-                      </el-option>
-                    </el-select>
-
-                    <component
-                      :is="item_1.type"
-                      v-else
-                      v-model="preferenceData[item_1.field]"
-                      :data="item_1"
-                      :device-scope="deviceScope"
-                      :preference-data="preferenceData"
-                    ></component>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </div>
-        </el-collapse-item>
-      </el-collapse>
+    <div class="pr-2 pt-4 flex-1 h-0 overflow-auto">
+      <PreferenceForm
+        v-model="preferenceData"
+        v-bind="{
+          deviceScope,
+        }"
+      >
+      </PreferenceForm>
     </div>
   </div>
 </template>
 
 <script>
 import { debounce } from 'lodash-es'
-import { ref } from 'vue'
 
-import { useOtg } from './composables/otg/index.js'
-
-import LanguageSelect from './components/LanguageSelect/index.vue'
-import PathInput from './components/PathInput/index.vue'
-import VideoCodecSelect from './components/VideoCodecSelect/index.vue'
-import AudioCodecSelect from './components/AudioCodecSelect/index.vue'
-import DisplaySelect from './components/DisplaySelect/index.vue'
-import KeyboardInjectSelect from './components/KeyboardInjectSelect/index.vue'
+import PreferenceForm from './components/PreferenceForm/index.vue'
 
 import { usePreferenceStore } from '$/store/index.js'
 
 export default {
   components: {
-    LanguageSelect,
-    PathInput,
-    VideoCodecSelect,
-    AudioCodecSelect,
-    DisplaySelect,
-    KeyboardInjectSelect,
+    PreferenceForm,
   },
   setup() {
     const preferenceStore = usePreferenceStore()
@@ -224,17 +87,15 @@ export default {
     const preferenceData = ref(preferenceStore.data)
     const deviceScope = ref(preferenceStore.deviceScope)
 
-    const collapseValues = ref(Object.keys(preferenceStore.model))
-
-    useOtg(preferenceData)
-
     return {
       preferenceData,
       deviceScope,
-      collapseValues,
     }
   },
   computed: {
+    commonPreferenceModel() {
+      return this.$store.preference.model?.common || {}
+    },
     preferenceModel() {
       return this.$store.preference.model || {}
     },
@@ -348,7 +209,9 @@ export default {
     },
 
     async handleExport() {
-      const messageEl = this.$message.loading(this.$t('preferences.config.export.message'))
+      const messageEl = this.$message.loading(
+        this.$t('preferences.config.export.message'),
+      )
 
       try {
         await this.$electron.ipcRenderer.invoke('show-save-dialog', {
diff --git a/src/locales/languages/en-US.json b/src/locales/languages/en-US.json
index 3301185..f076f73 100644
--- a/src/locales/languages/en-US.json
+++ b/src/locales/languages/en-US.json
@@ -86,6 +86,7 @@
   "device.actions.more.record.name": "Start Recording",
   "device.actions.more.otg.name": "Startup OTG",
   "device.actions.more.camera.name": "Startup Camera",
+  "device.actions.more.custom.name": "Custom Startup",
 
   "device.control.name": "Control",
   "device.control.more": "More Controls",
diff --git a/src/locales/languages/zh-CN.json b/src/locales/languages/zh-CN.json
index 5058636..a16fa11 100644
--- a/src/locales/languages/zh-CN.json
+++ b/src/locales/languages/zh-CN.json
@@ -86,6 +86,7 @@
   "device.actions.more.record.name": "开始录制",
   "device.actions.more.otg.name": "启动OTG",
   "device.actions.more.camera.name": "启动摄像",
+  "device.actions.more.custom.name": "灵活启动",
 
   "device.control.name": "操作",
   "device.control.more": "设备交互",
diff --git a/src/locales/languages/zh-TW.json b/src/locales/languages/zh-TW.json
index 6cb4f7d..46a6f13 100644
--- a/src/locales/languages/zh-TW.json
+++ b/src/locales/languages/zh-TW.json
@@ -86,6 +86,7 @@
   "device.actions.more.record.name": "開始錄製",
   "device.actions.more.otg.name": "啟動 OTG",
   "device.actions.more.camera.name": "啟動鏡頭",
+  "device.actions.more.custom.name": "靈活啟動",
 
   "device.control.name": "操作",
   "device.control.more": "裝置互動",
diff --git a/src/plugins/element-plus/restyle.css b/src/plugins/element-plus/restyle.css
index 9c5f54f..0ccfe4f 100644
--- a/src/plugins/element-plus/restyle.css
+++ b/src/plugins/element-plus/restyle.css
@@ -59,3 +59,16 @@
     @apply !p-0;
   }
 }
+
+.el-dialog-beautify {
+  @apply !rounded-lg;
+
+  .el-dialog__title {
+    @apply relative;
+
+    &::before {
+      content: '';
+      @apply absolute inset-x-0 bottom-0 h-2 bg-primary-500/30;
+    }
+  }
+}
diff --git a/src/store/preference/helpers/index.js b/src/store/preference/helpers/index.js
index 3568847..3f7f2a1 100644
--- a/src/store/preference/helpers/index.js
+++ b/src/store/preference/helpers/index.js
@@ -30,12 +30,14 @@ export function getModelMap(data = model) {
   return value
 }
 
-export function getDefaultData(parentId) {
+export function getDefaultData(parentId, iteratee) {
   const modelMap = getModelMap()
 
+  iteratee = iteratee ?? (value => value)
+
   const value = Object.entries(modelMap).reduce((obj, [key, data]) => {
     if (!parentId || data.parentId === parentId) {
-      obj[key] = data.value
+      obj[key] = iteratee(data.value)
     }
     return obj
   }, {})
diff --git a/src/store/preference/index.js b/src/store/preference/index.js
index c7fcd73..5d4d8b3 100644
--- a/src/store/preference/index.js
+++ b/src/store/preference/index.js
@@ -54,15 +54,9 @@ export const usePreferenceStore = defineStore({
   getters: {},
   actions: {
     getDefaultData,
+
     init(scope = this.deviceScope) {
-      let data = mergeConfig(getDefaultData(), getStoreData())
-
-      if (scope !== 'global') {
-        data = mergeConfig(data, getStoreData(replaceIP(scope)))
-      }
-
-      this.data = data
-
+      this.data = this.getData(scope)
       return this.data
     },
     setScope(value) {
@@ -127,7 +121,12 @@ export const usePreferenceStore = defineStore({
       this.init()
     },
     getData(scope = this.deviceScope) {
-      const value = this.init(scope)
+      let value = mergeConfig(getDefaultData(), getStoreData())
+
+      if (scope !== 'global') {
+        value = mergeConfig(value, getStoreData(replaceIP(scope)))
+      }
+
       return value
     },
 
@@ -135,7 +134,7 @@ export const usePreferenceStore = defineStore({
       scope = this.deviceScope,
       { isRecord = false, isCamera = false, isOtg = false, excludes = [] } = {},
     ) {
-      const data = this.getData(scope)
+      const data = typeof scope === 'object' ? scope : this.getData(scope)
 
       if (!data) {
         return ''
@@ -182,12 +181,14 @@ export const usePreferenceStore = defineStore({
         return arr
       }, [])
 
-      if (this.data.scrcpyAppend) {
-        valueList.push(...this.data.scrcpyAppend.split(' '))
+      if (data.scrcpyAppend) {
+        valueList.push(...data.scrcpyAppend.split(' '))
       }
 
       const value = valueList.join(' ')
 
+      // console.log('value', value)
+
       return value
     },
     getModel(path) {
diff --git a/src/store/preference/model/audio/index.js b/src/store/preference/model/audio/index.js
index d853bb1..8ea85c1 100644
--- a/src/store/preference/model/audio/index.js
+++ b/src/store/preference/model/audio/index.js
@@ -66,7 +66,7 @@ export default {
     audioBuffer: {
       label: 'preferences.audio.audio-buffer.name',
       field: '--audio-buffer',
-      type: 'Input.number',
+      type: 'InputNumber',
       value: undefined,
       placeholder: 'preferences.audio.audio-buffer.placeholder',
       append: 'ms',
@@ -74,7 +74,7 @@ export default {
     audioOutputBuffer: {
       label: 'preferences.audio.audio-output-buffer.name',
       field: '--audio-output-buffer',
-      type: 'Input.number',
+      type: 'InputNumber',
       value: undefined,
       placeholder: 'preferences.audio.audio-output-buffer.placeholder',
       append: 'ms',
diff --git a/src/store/preference/model/camera/index.js b/src/store/preference/model/camera/index.js
index 247e536..090154b 100644
--- a/src/store/preference/model/camera/index.js
+++ b/src/store/preference/model/camera/index.js
@@ -34,7 +34,7 @@ export default {
     cameraFps: {
       label: 'preferences.camera.camera-fps.name',
       field: '--camera-fps',
-      type: 'Input.number',
+      type: 'InputNumber',
       value: undefined,
       placeholder: 'preferences.camera.camera-fps.placeholder',
       append: 'fps',
diff --git a/src/store/preference/model/common/index.js b/src/store/preference/model/common/index.js
index 15426fc..b299b7c 100644
--- a/src/store/preference/model/common/index.js
+++ b/src/store/preference/model/common/index.js
@@ -28,6 +28,9 @@ export default {
           value: 'system',
         },
       ],
+      props: {
+        clearable: false,
+      },
     },
     language: {
       label: 'common.language.name',
diff --git a/src/store/preference/model/record/index.js b/src/store/preference/model/record/index.js
index 4a4568d..441471b 100644
--- a/src/store/preference/model/record/index.js
+++ b/src/store/preference/model/record/index.js
@@ -35,7 +35,7 @@ export default {
     timeLimit: {
       label: 'preferences.record.time-limit.name',
       field: '--time-limit',
-      type: 'Input.number',
+      type: 'InputNumber',
       value: undefined,
       placeholder: 'preferences.record.time-limit.placeholder',
       append: 's',
diff --git a/src/store/preference/model/video/index.js b/src/store/preference/model/video/index.js
index dbc91ed..c471c92 100644
--- a/src/store/preference/model/video/index.js
+++ b/src/store/preference/model/video/index.js
@@ -31,7 +31,7 @@ export default {
     maxSize: {
       label: 'preferences.video.resolution.name',
       field: '--max-size',
-      type: 'Input.number',
+      type: 'InputNumber',
       value: undefined,
       placeholder: 'preferences.video.resolution.placeholder',
     },
@@ -46,7 +46,7 @@ export default {
     maxFps: {
       label: 'preferences.video.refresh-rate.name',
       field: '--max-fps',
-      type: 'Input.number',
+      type: 'InputNumber',
       value: undefined,
       placeholder: 'preferences.video.refresh-rate.placeholder',
       append: 'fps',
@@ -133,7 +133,7 @@ export default {
     displayBuffer: {
       label: 'preferences.video.video-buffer.name',
       field: '--display-buffer',
-      type: 'Input.number',
+      type: 'InputNumber',
       value: undefined,
       placeholder: 'preferences.video.video-buffer.placeholder',
       append: 'ms',
@@ -141,7 +141,7 @@ export default {
     v4l2Buffer: {
       label: 'preferences.video.receiver-buffer.name',
       field: '--v4l2-buffer',
-      type: 'Input.number',
+      type: 'InputNumber',
       value: undefined,
       placeholder: 'preferences.video.receiver-buffer.placeholder',
       append: 'ms',
diff --git a/src/store/preference/model/window/index.js b/src/store/preference/model/window/index.js
index ef8a705..6e1c7f8 100644
--- a/src/store/preference/model/window/index.js
+++ b/src/store/preference/model/window/index.js
@@ -6,7 +6,7 @@ export default {
     windowWidth: {
       label: 'preferences.window.size.width',
       field: '--window-width',
-      type: 'Input.number',
+      type: 'InputNumber',
       value: undefined,
       placeholder: 'preferences.window.size.width.placeholder',
       tips: 'preferences.window.size.width.tips',
@@ -14,7 +14,7 @@ export default {
     windowHeight: {
       label: 'preferences.window.size.height',
       field: '--window-height',
-      type: 'Input.number',
+      type: 'InputNumber',
       value: undefined,
       placeholder: 'preferences.window.size.height.placeholder',
       tips: 'preferences.window.size.height.tips',
@@ -22,14 +22,14 @@ export default {
     windowX: {
       label: 'preferences.window.position.x',
       field: '--window-x',
-      type: 'Input.number',
+      type: 'InputNumber',
       value: undefined,
       placeholder: 'preferences.window.position.x.placeholder',
     },
     windowY: {
       label: 'preferences.window.position.y',
       field: '--window-y',
-      type: 'Input.number',
+      type: 'InputNumber',
       value: undefined,
       placeholder: 'preferences.window.position.y.placeholder',
     },

From 826191617215db3cf027f0ec22530052c8dd97fe Mon Sep 17 00:00:00 2001
From: viarotel <viarotel@qq.com>
Date: Fri, 12 Jul 2024 11:57:43 +0800
Subject: [PATCH 3/7] =?UTF-8?q?perf:=20=F0=9F=90=9B=20Fix=20the=20problem?=
 =?UTF-8?q?=20of=20frequently=20trigger=20preservation=20of=20preferences?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BatchActions/Application/index.vue        |   2 +-
 .../BatchActions/Screenshot/index.vue         |   2 +-
 .../components/PreferenceForm/index.vue       |  16 +--
 .../components/ScopeSelect/index.vue          |  70 ++++++++++
 src/components/Preference/index.vue           | 127 ++++--------------
 5 files changed, 103 insertions(+), 114 deletions(-)
 create mode 100644 src/components/Preference/components/ScopeSelect/index.vue

diff --git a/src/components/Device/components/BatchActions/Application/index.vue b/src/components/Device/components/BatchActions/Application/index.vue
index 5482a82..e785c4d 100644
--- a/src/components/Device/components/BatchActions/Application/index.vue
+++ b/src/components/Device/components/BatchActions/Application/index.vue
@@ -24,7 +24,7 @@ export default {
       for (let index = 0; index < this.devices.length; index++) {
         const item = this.devices[index]
         await this.$refs.applicationProxyRef.invoke(item)
-        await sleep(2 * 1000)
+        await sleep(1 * 1000)
       }
     },
   },
diff --git a/src/components/Device/components/BatchActions/Screenshot/index.vue b/src/components/Device/components/BatchActions/Screenshot/index.vue
index 5d91b48..4adeb46 100644
--- a/src/components/Device/components/BatchActions/Screenshot/index.vue
+++ b/src/components/Device/components/BatchActions/Screenshot/index.vue
@@ -24,7 +24,7 @@ export default {
       for (let index = 0; index < this.devices.length; index++) {
         const item = this.devices[index]
         await this.$refs.screenshotProxyRef.invoke(item)
-        await sleep(2 * 1000)
+        await sleep(1 * 1000)
       }
     },
   },
diff --git a/src/components/Preference/components/PreferenceForm/index.vue b/src/components/Preference/components/PreferenceForm/index.vue
index fb58e5f..601e7e6 100644
--- a/src/components/Preference/components/PreferenceForm/index.vue
+++ b/src/components/Preference/components/PreferenceForm/index.vue
@@ -119,14 +119,14 @@ const preferenceData = defineModel('modelValue', {
 
 const preferenceStore = usePreferenceStore()
 
-const collapseValue = ref([])
-
 const preferenceModel = computed(() =>
   omit(preferenceStore.model, props.excludes),
 )
 
 const preferenceModelKeys = Object.keys(preferenceModel.value ?? {})
 
+const collapseValue = ref([])
+
 if (preferenceModelKeys.length) {
   if (props.collapseProps.accordion) {
     collapseValue.value = preferenceModelKeys[0]
@@ -136,18 +136,6 @@ if (preferenceModelKeys.length) {
   }
 }
 
-watch(
-  () => props.deviceScope,
-  (value) => {
-    if (!value) {
-      return false
-    }
-
-    preferenceData.value = preferenceStore.getData(value)
-  },
-  { immediate: true },
-)
-
 function subModel(item) {
   const children = item?.children || {}
 
diff --git a/src/components/Preference/components/ScopeSelect/index.vue b/src/components/Preference/components/ScopeSelect/index.vue
new file mode 100644
index 0000000..5206d0a
--- /dev/null
+++ b/src/components/Preference/components/ScopeSelect/index.vue
@@ -0,0 +1,70 @@
+<template>
+  <el-select
+    :placeholder="$t('preferences.scope.placeholder')"
+    :no-data-text="$t('preferences.scope.no-data')"
+    filterable
+    class="!w-90"
+  >
+    <template #prefix>
+      <el-tooltip class="" effect="dark" placement="bottom-start">
+        <el-icon class="text-primary-300 hover:text-primary-500">
+          <QuestionFilled />
+        </el-icon>
+        <template #content>
+          <div class="space-y-1">
+            <div class="pb-1">
+              {{ $t('preferences.scope.details[0]') }}
+            </div>
+            <div class="">
+              {{ $t('preferences.scope.details[1]') }}
+            </div>
+            <div class="">
+              {{ $t('preferences.scope.details[2]') }}
+            </div>
+          </div>
+        </template>
+      </el-tooltip>
+    </template>
+    <el-option
+      v-for="item in options"
+      :key="item.id"
+      :label="item.label"
+      :value="item.value"
+    >
+    </el-option>
+  </el-select>
+</template>
+
+<script setup>
+import { useDeviceStore } from '$/store/index.js'
+
+const emit = defineEmits(['device-change'])
+
+const deviceStore = useDeviceStore()
+
+const options = computed(() => {
+  const value = deviceStore.list.map(item => ({
+    ...item,
+    label: `${item.id}（${item.$name}${
+      item.$remark ? `，${item.$remark}` : ''
+    }）`,
+    value: item.id,
+  }))
+
+  value.unshift({
+    label: `Global（${window.t('preferences.scope.global')}）`,
+    value: 'global',
+  })
+
+  return value
+})
+
+watch(
+  () => deviceStore.list.length,
+  () => {
+    emit('device-change', options.value)
+  },
+)
+</script>
+
+<style></style>
diff --git a/src/components/Preference/index.vue b/src/components/Preference/index.vue
index d53baf6..9a2d061 100644
--- a/src/components/Preference/index.vue
+++ b/src/components/Preference/index.vue
@@ -4,43 +4,11 @@
       class="mr-4 pb-4 flex items-center justify-between flex-none border-b border-gray-200 dark:border-gray-700"
     >
       <div class="">
-        <el-select
+        <ScopeSelect
           v-model="deviceScope"
-          value-key=""
-          :placeholder="$t('preferences.scope.placeholder')"
-          filterable
-          :no-data-text="$t('preferences.scope.no-data')"
-          class="!w-90"
           @change="onScopeChange"
-        >
-          <template #prefix>
-            <el-tooltip class="" effect="dark" placement="bottom-start">
-              <el-icon class="text-primary-300 hover:text-primary-500">
-                <QuestionFilled />
-              </el-icon>
-              <template #content>
-                <div class="space-y-1">
-                  <div class="pb-1">
-                    {{ $t('preferences.scope.details[0]') }}
-                  </div>
-                  <div class="">
-                    {{ $t('preferences.scope.details[1]') }}
-                  </div>
-                  <div class="">
-                    {{ $t('preferences.scope.details[2]') }}
-                  </div>
-                </div>
-              </template>
-            </el-tooltip>
-          </template>
-          <el-option
-            v-for="item in scopeList"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
+          @device-change="onDeviceChange"
+        />
       </div>
       <div class="">
         <el-button type="" icon="Upload" plain @click="handleImport">
@@ -52,7 +20,7 @@
         <el-button type="" icon="Edit" plain @click="handleEdit">
           {{ $t('preferences.config.edit.name') }}
         </el-button>
-        <el-button type="" icon="RefreshRight" plain @click="handleResetAll">
+        <el-button type="" icon="RefreshRight" plain @click="handleReset">
           {{ $t('preferences.config.reset.name') }}
         </el-button>
       </div>
@@ -73,47 +41,32 @@
 <script>
 import { debounce } from 'lodash-es'
 
+import ScopeSelect from './components/ScopeSelect/index.vue'
 import PreferenceForm from './components/PreferenceForm/index.vue'
 
 import { usePreferenceStore } from '$/store/index.js'
 
 export default {
   components: {
+    ScopeSelect,
     PreferenceForm,
   },
   setup() {
     const preferenceStore = usePreferenceStore()
 
     const preferenceData = ref(preferenceStore.data)
+
     const deviceScope = ref(preferenceStore.deviceScope)
 
     return {
+      preferenceStore,
       preferenceData,
       deviceScope,
     }
   },
   computed: {
-    commonPreferenceModel() {
-      return this.$store.preference.model?.common || {}
-    },
     preferenceModel() {
-      return this.$store.preference.model || {}
-    },
-    scopeList() {
-      const value = this.$store.device.list.map(item => ({
-        ...item,
-        label: `${item.id}（${item.$name}${
-          item.$remark ? `，${item.$remark}` : ''
-        }）`,
-        value: item.id,
-      }))
-
-      value.unshift({
-        label: `Global（${this.$t('preferences.scope.global')}）`,
-        value: 'global',
-      })
-
-      return value
+      return this.preferenceStore.model || {}
     },
   },
   watch: {
@@ -133,50 +86,36 @@ export default {
         this.handleDevices()
       },
     },
-    // 列表设备发生变化后如果没有匹配到则默认选中 global
-    'scopeList': {
-      handler(value) {
-        const someValue = value.some(
-          item => this.$replaceIP(item.value) === this.deviceScope,
-        )
-
-        if (someValue) {
-          return
-        }
-
-        this.deviceScope = 'global'
-        this.$store.preference.setScope(this.deviceScope)
-        this.preferenceData = this.$store.preference.data
-      },
-      immediate: true,
-    },
   },
   created() {
     this.handleSave = debounce(this.handleSave, 1000)
     this.handleDevices = debounce(this.handleDevices, 1000)
   },
   methods: {
+    onDeviceChange(options) {
+      const device = options.some(
+        item => this.$replaceIP(item.value) === this.deviceScope,
+      )
+
+      if (device) {
+        return false
+      }
+
+      this.deviceScope = 'global'
+      this.preferenceStore.setScope(this.deviceScope)
+      this.preferenceData = this.preferenceStore.data
+    },
     handleDevices() {
       this.$root.reRenderPost()
     },
-    subModel(item) {
-      const children = item?.children || {}
-      const value = {}
-      Object.entries(children).forEach(([key, data]) => {
-        if (!data.hidden) {
-          value[key] = data
-        }
-      })
-      return value
-    },
-    handleResetAll() {
-      this.$store.preference.reset(this.deviceScope)
-      this.preferenceData = this.$store.preference.data
+    handleReset() {
+      this.preferenceStore.reset(this.deviceScope)
+      this.preferenceData = this.preferenceStore.data
     },
 
     onScopeChange(value) {
-      this.$store.preference.setScope(value)
-      this.preferenceData = this.$store.preference.data
+      this.preferenceStore.setScope(value)
+      this.preferenceData = this.preferenceStore.data
     },
 
     async handleImport() {
@@ -194,7 +133,7 @@ export default {
 
         this.$message.success(this.$t('preferences.config.import.success'))
 
-        this.preferenceData = this.$store.preference.init()
+        this.preferenceData = this.preferenceStore.init()
       }
       catch (error) {
         if (error.message) {
@@ -237,17 +176,9 @@ export default {
     },
 
     handleSave() {
-      this.$store.preference.setData(this.preferenceData)
+      this.preferenceStore.setData(this.preferenceData)
       this.$message.success(this.$t('preferences.config.save.placeholder'))
     },
-
-    handleReset(type) {
-      this.preferenceData = {
-        ...this.preferenceData,
-        ...this.$store.preference.getDefaultData(type),
-      }
-      this.$store.preference.setData(this.preferenceData)
-    },
   },
 }
 </script>

From 33b018110cc7727a822f61b97ae5c5f1211adb0c Mon Sep 17 00:00:00 2001
From: viarotel <viarotel@qq.com>
Date: Fri, 12 Jul 2024 15:58:13 +0800
Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=F0=9F=93=9D=20Update=20Translation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Custom/components/DeployDialog/index.vue     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/Device/components/MoreDropdown/components/Custom/components/DeployDialog/index.vue b/src/components/Device/components/MoreDropdown/components/Custom/components/DeployDialog/index.vue
index 3d707d6..4f014b7 100644
--- a/src/components/Device/components/MoreDropdown/components/Custom/components/DeployDialog/index.vue
+++ b/src/components/Device/components/MoreDropdown/components/Custom/components/DeployDialog/index.vue
@@ -3,7 +3,7 @@
     <el-dialog
       v-model="visible"
       :title="$t('device.actions.more.custom.name')"
-      class="w-11/12 el-dialog-flex el-dialog-beautify"
+      class="w-[98%] el-dialog-flex el-dialog-beautify"
       append-to-body
       destroy-on-close
       @close="close(reject)"
@@ -22,10 +22,10 @@
 
       <template #footer>
         <el-button @click="close(reject)">
-          取消
+          {{ $t('common.cancel') }}
         </el-button>
         <el-button type="primary" @click="submit(resolve)">
-          确定
+          {{ $t('common.confirm') }}
         </el-button>
       </template>
     </el-dialog>

From 2013413611b3efe44811b230ceea036eba310026 Mon Sep 17 00:00:00 2001
From: viarotel <viarotel@qq.com>
Date: Fri, 12 Jul 2024 20:11:44 +0800
Subject: [PATCH 5/7] =?UTF-8?q?feat:=20=F0=9F=9A=80=20Support=20execution?=
 =?UTF-8?q?=20script=20function?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/exposes/adbkit/index.js              |  4 +-
 .../components/ControlBar/Shell/index.vue     | 80 +++++++++++++++++++
 .../Device/components/ControlBar/index.vue    |  8 ++
 .../components/TerminalDialog/index.vue       | 39 ++++++---
 .../components/TerminalAction/index.vue       |  3 +
 src/components/Device/index.vue               |  7 +-
 src/locales/languages/en-US.json              |  6 ++
 src/locales/languages/zh-CN.json              |  6 ++
 src/locales/languages/zh-TW.json              |  6 ++
 9 files changed, 145 insertions(+), 14 deletions(-)
 create mode 100644 src/components/Device/components/ControlBar/Shell/index.vue

diff --git a/electron/exposes/adbkit/index.js b/electron/exposes/adbkit/index.js
index ec5471c..6d7ced3 100644
--- a/electron/exposes/adbkit/index.js
+++ b/electron/exposes/adbkit/index.js
@@ -198,8 +198,8 @@ const push = async (
       progress?.(stats)
     })
 
-    res.on('end', (ret) => {
-      resolve(ret)
+    res.on('end', () => {
+      resolve(savePath)
     })
 
     res.on('error', (err) => {
diff --git a/src/components/Device/components/ControlBar/Shell/index.vue b/src/components/Device/components/ControlBar/Shell/index.vue
new file mode 100644
index 0000000..7a32e42
--- /dev/null
+++ b/src/components/Device/components/ControlBar/Shell/index.vue
@@ -0,0 +1,80 @@
+<template>
+  <div class="" @click="handleClick(device)">
+    <slot :loading="loading" />
+  </div>
+</template>
+
+<script setup>
+import { ElMessage } from 'element-plus'
+
+const props = defineProps({
+  device: {
+    type: Object,
+    default: () => null,
+  },
+  loading: {
+    type: Boolean,
+    default: false,
+  },
+})
+
+const invokeTerminal = inject('invokeTerminal')
+
+async function handleClick(device) {
+  let files = null
+
+  try {
+    files = await window.electron.ipcRenderer.invoke('show-open-dialog', {
+      properties: ['openFile'],
+      filters: [
+        {
+          name: window.t('device.control.shell.select'),
+          extensions: ['sh'],
+        },
+      ],
+    })
+  }
+  catch (error) {
+    if (error.message) {
+      const message = error.message?.match(/Error: (.*)/)?.[1]
+      ElMessage.warning(message || error.message)
+    }
+    return false
+  }
+
+  const closeMessage = ElMessage.loading(
+    window.t('device.control.shell.pushing'),
+  ).close
+
+  const filePath = files[0]
+
+  let pushFilePath = ''
+
+  try {
+    pushFilePath = await window.adbkit.push(device.id, filePath)
+  }
+  catch (error) {
+    closeMessage()
+    ElMessage.warning(error.message)
+    return false
+  }
+
+  if (!pushFilePath) {
+    closeMessage()
+    ElMessage.warning('Push script failed')
+    return false
+  }
+
+  await window.adbkit.deviceShell(device.id, `sh ${pushFilePath}`)
+
+  closeMessage()
+
+  await ElMessage.success(window.t('device.control.shell.success'))
+
+  const command = `adb -s ${device.id} shell sh ${pushFilePath}`
+
+  invokeTerminal(command)
+}
+</script>
+
+<style></style>
diff --git a/src/components/Device/components/ControlBar/index.vue b/src/components/Device/components/ControlBar/index.vue
index 2718789..6fa4f62 100644
--- a/src/components/Device/components/ControlBar/index.vue
+++ b/src/components/Device/components/ControlBar/index.vue
@@ -72,6 +72,7 @@ import MirrorGroup from './MirrorGroup/index.vue'
 import Rotation from './Rotation/index.vue'
 import Volume from './Volume/index.vue'
 import FileManage from './FileManage/index.vue'
+import Shell from './Shell/index.vue'
 
 export default {
   components: {
@@ -82,6 +83,7 @@ export default {
     Rotation,
     Volume,
     FileManage,
+    Shell,
   },
   props: {
     device: {
@@ -149,6 +151,12 @@ export default {
           svgIcon: 'file-send',
           component: 'FileManage',
         },
+        {
+          label: 'device.control.shell.name',
+          svgIcon: 'command',
+          component: 'Shell',
+          tips: 'device.control.shell.tips',
+        },
         {
           label: 'device.control.gnirehtet',
           elIcon: 'Link',
diff --git a/src/components/Device/components/TerminalAction/components/TerminalDialog/index.vue b/src/components/Device/components/TerminalAction/components/TerminalDialog/index.vue
index 1254b3c..24287fa 100644
--- a/src/components/Device/components/TerminalAction/components/TerminalDialog/index.vue
+++ b/src/components/Device/components/TerminalAction/components/TerminalDialog/index.vue
@@ -4,8 +4,9 @@
     width="80%"
     :close-on-click-modal="false"
     :close-on-press-escape="true"
+    destroy-on-close
     class="overflow-hidden !rounded-md el-dialog-headless dark:border dark:border-gray-700"
-    @open="onOpen"
+    @closed="onClosed"
   >
     <el-icon
       class="cursor-pointer absolute top-3 right-3 w-8 h-8 flex items-center justify-center hover:bg-gray-200 dark:text-gray-200 dark:hover:bg-gray-700 !active:bg-red-600 !active:text-gray-200 rounded-md"
@@ -15,8 +16,7 @@
     </el-icon>
 
     <VueCommand
-      v-if="renderShell"
-      :ref="(value) => (vShell = value)"
+      ref="vShell"
       v-model:history="history"
       :dispatched-queries="dispatchedQueries"
       :commands="commands"
@@ -38,7 +38,6 @@
 </template>
 
 <script>
-import { ref, shallowRef } from 'vue'
 import VueCommand, {
   createQuery,
   createStdout,
@@ -48,6 +47,7 @@ import 'vue-command/dist/vue-command.css'
 import { useAdb } from './composables/adb-async.js'
 import { useScrcpy } from './composables/scrcpy.js'
 import { useGnirehtet } from './composables/gnirehtet.js'
+import { sleep } from '$/utils/index.js'
 
 export default {
   components: {
@@ -57,7 +57,6 @@ export default {
     const vShell = ref(null)
     const history = shallowRef([createQuery()])
     const loading = ref(false)
-    const renderShell = ref(false)
     const dispatchedQueries = ref(new Set([]))
 
     const { adb } = useAdb({ vShell, history, loading })
@@ -84,18 +83,12 @@ export default {
       ...Object.keys(commands.value),
     ])
 
-    const onOpen = () => {
-      renderShell.value = true
-    }
-
     return {
       vShell,
       loading,
       history,
       commands,
       dispatchedQueries,
-      onOpen,
-      renderShell,
     }
   },
   data() {
@@ -128,6 +121,26 @@ export default {
       this.visible = false
     },
 
+    async invoke(command) {
+      this.visible = true
+
+      if (!this.vShell) {
+        await this.$nextTick()
+        await sleep(1000)
+      }
+
+      await this.vShell.setQuery(command)
+
+      const vueCommandHistoryEntryComponentRefs
+        = this.vShell.$refs.vueCommandHistoryEntryComponentRefs
+
+      const queryLength = vueCommandHistoryEntryComponentRefs.length
+
+      vueCommandHistoryEntryComponentRefs[queryLength - 1].focus()
+
+      this.$message.info(this.$t('device.control.shell.enter'))
+    },
+
     onDispatchedQueriesUpdate(value) {
       this.$appStore.set('terminal.dispatchedQueries', Array.from(value))
 
@@ -137,6 +150,10 @@ export default {
     onCtrlC() {
       window.gnirehtet.shell('stop')
     },
+
+    onClosed() {
+      this.vShell.dispatch('clear')
+    },
   },
 }
 </script>
diff --git a/src/components/Device/components/TerminalAction/index.vue b/src/components/Device/components/TerminalAction/index.vue
index 65e4b36..f514f5f 100644
--- a/src/components/Device/components/TerminalAction/index.vue
+++ b/src/components/Device/components/TerminalAction/index.vue
@@ -22,6 +22,9 @@ export default {
     handleShow() {
       this.$refs.terminalDialog.show()
     },
+    invoke(...args) {
+      this.$refs.terminalDialog.invoke(...args)
+    },
   },
 }
 </script>
diff --git a/src/components/Device/index.vue b/src/components/Device/index.vue
index b10128e..101dba8 100644
--- a/src/components/Device/index.vue
+++ b/src/components/Device/index.vue
@@ -28,7 +28,7 @@
         {{ $t('device.log.name') }}
       </el-button>
 
-      <TerminalAction />
+      <TerminalAction ref="terminalActionRef" />
     </div>
 
     <BatchActions
@@ -148,6 +148,11 @@ export default {
     WirelessAction,
     BatchActions,
   },
+  provide() {
+    return {
+      invokeTerminal: (...args) => this.$refs.terminalActionRef.invoke(...args),
+    }
+  },
   data() {
     return {
       loading: false,
diff --git a/src/locales/languages/en-US.json b/src/locales/languages/en-US.json
index f076f73..4f310e2 100644
--- a/src/locales/languages/en-US.json
+++ b/src/locales/languages/en-US.json
@@ -102,6 +102,12 @@
   "device.control.file.push.success": "Successfully pushed {totalCount} files to the /sdcard/Download/ directory of {deviceName}, {successCount} succeeded, and {failCount} failed",
   "device.control.file.push.success.single": "Files successfully pushed to the /sdcard/Download/ directory of {deviceName}",
   "device.control.file.push.error": "Failed to push the file, please check the file and try again",
+  "device.control.shell.name": "Execute Script",
+  "device.control.shell.tips": "Perform custom script through the ADB command",
+  "device.control.shell.select": "Please select the script you want to execute",
+  "device.control.shell.pushing": "Push script",
+  "device.control.shell.success": "Push script successfully",
+  "device.control.shell.enter": "Please enter the Enter key to confirm the execution of the script",
   "device.control.capture": "Screenshot",
   "device.control.capture.progress": "Capturing screenshot for {deviceName}...",
   "device.control.capture.success.message": "Open screenshot location?",
diff --git a/src/locales/languages/zh-CN.json b/src/locales/languages/zh-CN.json
index a16fa11..bde1b4b 100644
--- a/src/locales/languages/zh-CN.json
+++ b/src/locales/languages/zh-CN.json
@@ -102,6 +102,12 @@
   "device.control.file.push.success": "已成功将 {totalCount} 个文件推送到 {deviceName} 的 /sdcard/Download/ 目录，{successCount} 成功，{failCount} 失败。",
   "device.control.file.push.success.single": "文件已成功推送到 {deviceName} 的 /sdcard/Download/ 目录",
   "device.control.file.push.error": "推送文件失败，请检查文件后重试",
+  "device.control.shell.name": "执行脚本",
+  "device.control.shell.tips": "通过 ADB 命令执行自定义脚本",
+  "device.control.shell.select": "请选择要执行的脚本",
+  "device.control.shell.pushing": "推送脚本中",
+  "device.control.shell.success": "推送脚本成功",
+  "device.control.shell.enter": "请输入回车键确认执行该脚本",
   "device.control.capture": "截取屏幕",
   "device.control.capture.progress": "正在截取 {deviceName} 的屏幕快照...",
   "device.control.capture.success.message": "是否前往截屏位置进行查看？",
diff --git a/src/locales/languages/zh-TW.json b/src/locales/languages/zh-TW.json
index 46a6f13..e366e99 100644
--- a/src/locales/languages/zh-TW.json
+++ b/src/locales/languages/zh-TW.json
@@ -102,6 +102,12 @@
   "device.control.file.push.success": "已成功將 {totalCount} 個檔案推送到 {deviceName} 的 /sdcard/Download/ 目錄，{successCount} 成功，{failCount} 失敗。",
   "device.control.file.push.success.single": "檔案已成功推送到 {deviceName} 的 /sdcard/Download/ 目錄",
   "device.control.file.push.error": "推送檔案失敗，請檢查檔案後重試",
+  "device.control.shell.name": "執行腳本",
+  "device.control.shell.tips": "透過 ADB 命令執行自訂腳本",
+  "device.control.shell.select": "請選擇要執行的腳本",
+  "device.control.shell.pushing": "推送腳本中",
+  "device.control.shell.success": "推送腳本成功",
+  "device.control.shell.enter": "請輸入回車鍵確認執行該腳本",
   "device.control.capture": "擷取螢幕",
   "device.control.capture.progress": "正在擷取 {deviceName} 的螢幕快照...",
   "device.control.capture.success.message": "是否前往截圖位置進行檢視？",

From 8097022798ca3ea95ed6530a722f321a862f2e23 Mon Sep 17 00:00:00 2001
From: viarotel <viarotel@qq.com>
Date: Sat, 13 Jul 2024 17:05:17 +0800
Subject: [PATCH 6/7] =?UTF-8?q?feat:=20=F0=9F=8E=89=20Support=20batch=20ex?=
 =?UTF-8?q?ecution=20script=20function?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc-auto-import.json                    |   3 +-
 README-CN.md                                  |  17 +-
 README.md                                     |  21 +-
 auto-imports.d.ts                             |   1 +
 .../BatchActions/Application/index.vue        |  41 ++-
 .../BatchActions/FileManage/index.vue         |  71 ++++++
 .../BatchActions/Screenshot/index.vue         |  21 +-
 .../components/BatchActions/Shell/index.vue   |  83 +++++++
 .../Device/components/BatchActions/index.vue  |  56 ++---
 .../ControlBar/Application/index.vue          |  53 ++--
 .../ControlBar/FileManage/index.vue           | 157 ++++++------
 .../components/ControlBar/Gnirehtet/index.vue |   6 +-
 .../components/ControlBar/Shell/index.vue     |  59 ++---
 .../components/TerminalDialog/index.vue       | 235 ++++++++++--------
 .../components/TerminalAction/index.vue       |   2 +-
 src/locales/languages/en-US.json              |   8 +-
 src/locales/languages/zh-CN.json              |   8 +-
 src/locales/languages/zh-TW.json              |   8 +-
 src/plugins/element-plus/index.js             |   8 +-
 src/utils/device/index.js                     |  66 +++++
 src/utils/index.js                            |  37 +++
 21 files changed, 635 insertions(+), 326 deletions(-)
 create mode 100644 src/components/Device/components/BatchActions/FileManage/index.vue
 create mode 100644 src/components/Device/components/BatchActions/Shell/index.vue
 create mode 100644 src/utils/device/index.js

diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 74a9e1d..385207c 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -79,6 +79,7 @@
     "watch": true,
     "watchEffect": true,
     "watchPostEffect": true,
-    "watchSyncEffect": true
+    "watchSyncEffect": true,
+    "ElMessage": true
   }
 }
diff --git a/README-CN.md b/README-CN.md
index c5e4adf..07802d6 100644
--- a/README-CN.md
+++ b/README-CN.md
@@ -76,7 +76,10 @@ Windows 及 Linux 端内部集成了 Gnirehtet， 用于提供 PC 到安卓设
 
 ### 批量处理
 
+- 批量截取屏幕
 - 批量安装应用
+- 批量文件管理
+- 批量执行脚本
 
 ### 控制模式
 
@@ -99,6 +102,7 @@ Windows 及 Linux 端内部集成了 Gnirehtet， 用于提供 PC 到安卓设
 - 重启设备
 - 安装应用
 - 文件管理
+- 执行脚本
 - 反向供网（Gnirehtet）
 - 多屏协同
 
@@ -204,13 +208,12 @@ Windows 及 Linux 端内部集成了 Gnirehtet， 用于提供 PC 到安卓设
 15. 支持批量连接历史设备功能 ✅
 16. 支持使用内置终端执行自定义命令 ✅
 17. 支持设备自动执行镜像 ✅
-18. 支持常用批量功能 ✅
-19. 支持灵活启动镜像 ✅
-20. 支持更多批量处理功能 🚧
-21. 支持对设备进行分组 🚧
-22. 添加文件传输助手功能 🚧
-23. 支持通过界面从设备下载选中的文件 🚧
-24. 添加对游戏的增强功能，如游戏键位映射 🚧
+18. 支持灵活启动镜像 ✅
+19. 支持常用批量功能 ✅
+20. 支持对设备进行分组 🚧
+21. 添加文件传输助手功能 🚧
+22. 支持通过界面从设备下载选中的文件 🚧
+23. 添加对游戏的增强功能，如游戏键位映射 🚧
 
 ## 常见问题
 
diff --git a/README.md b/README.md
index a5f8335..ff7a4d2 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,10 @@ Refer to [scrcpy/doc/shortcuts](https://github.com/Genymobile/scrcpy/blob/master
 
 ### Batch Processing
 
-- Batch installation application
+- Batch Interception Screen
+- Batch Installation Application
+- Batch File Management
+- Batch Execution Script
 
 ### Control Model
 
@@ -97,6 +100,7 @@ Refer to [scrcpy/doc/shortcuts](https://github.com/Genymobile/scrcpy/blob/master
 - Reboot
 - Install APP
 - File Manager
+- Execution Script
 - Gnirehtet
 - Mirror Group
 
@@ -201,14 +205,13 @@ Refer to [scrcpy/doc/shortcuts](https://github.com/Genymobile/scrcpy/blob/master
 14. Add more features to device interaction bar: file push, screen rotation, audio control etc ✅
 15. Support bulk connecting to historical devices ✅
 16. Support to use built-in terminals to execute custom commands ✅
-17. Supports automatic execution of mirror on devices ✅
-18. Support common batch processing function ✅
-19. Support for custom startup mirroring ✅
-20. Support more batch processing functions 🚧
-21. Support the device to group 🚧
-22. Add file transmission assistant function 🚧
-23. Support GUI-based selective file downloads from devices 🚧
-24. Add game enhancement features such as game keyboard mapping 🚧
+17. Support automatic execution of mirror on devices ✅
+18. Support for custom startup mirroring ✅
+19. Support common batch processing function ✅
+20. Support the device to group 🚧
+21. Add file transmission assistant function 🚧
+22. Support GUI-based selective file downloads from devices 🚧
+23. Add game enhancement features such as game keyboard mapping 🚧
 
 ## FAQ
 
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 0ce0ca8..9c51698 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -6,6 +6,7 @@
 export {}
 declare global {
   const EffectScope: typeof import('vue')['EffectScope']
+  const ElMessage: typeof import('element-plus/es')['ElMessage']
   const acceptHMRUpdate: typeof import('pinia')['acceptHMRUpdate']
   const computed: typeof import('vue')['computed']
   const createApp: typeof import('vue')['createApp']
diff --git a/src/components/Device/components/BatchActions/Application/index.vue b/src/components/Device/components/BatchActions/Application/index.vue
index e785c4d..6453d4f 100644
--- a/src/components/Device/components/BatchActions/Application/index.vue
+++ b/src/components/Device/components/BatchActions/Application/index.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="" @click="handleClick">
-    <slot />
+    <slot v-bind="{ loading }" />
     <ApplicationProxy ref="applicationProxyRef" />
   </div>
 </template>
 
 <script>
 import ApplicationProxy from '$/components/Device/components/ControlBar/Application/index.vue'
-import { sleep } from '$/utils'
+import { allSettled } from '$/utils'
 
 export default {
   components: {
@@ -19,13 +19,42 @@ export default {
       default: () => [],
     },
   },
+  data() {
+    return {
+      loading: false,
+    }
+  },
   methods: {
     async handleClick() {
-      for (let index = 0; index < this.devices.length; index++) {
-        const item = this.devices[index]
-        await this.$refs.applicationProxyRef.invoke(item)
-        await sleep(1 * 1000)
+      let files = null
+
+      try {
+        files = await this.$electron.ipcRenderer.invoke('show-open-dialog', {
+          properties: ['openFile', 'multiSelections'],
+          filters: [
+            {
+              name: this.$t('device.control.install.placeholder'),
+              extensions: ['apk'],
+            },
+          ],
+        })
       }
+      catch (error) {
+        if (error.message) {
+          const message
+            = error.message?.match(/Error: (.*)/)?.[1] || error.message
+          this.$message.warning(message)
+        }
+        return false
+      }
+
+      this.loading = true
+
+      await allSettled(this.devices, (item) => {
+        return this.$refs.applicationProxyRef.invoke(item, { files })
+      })
+
+      this.loading = false
     },
   },
 }
diff --git a/src/components/Device/components/BatchActions/FileManage/index.vue b/src/components/Device/components/BatchActions/FileManage/index.vue
new file mode 100644
index 0000000..eaaa4fc
--- /dev/null
+++ b/src/components/Device/components/BatchActions/FileManage/index.vue
@@ -0,0 +1,71 @@
+<template>
+  <el-dropdown :hide-on-click="false">
+    <div class="">
+      <slot :loading="loading" />
+      <FileManageProxy ref="fileManageProxyRef" />
+    </div>
+    <template #dropdown>
+      <el-dropdown-menu>
+        <el-dropdown-item @click="handlePush(devices)">
+          <span class="" title="/sdcard/Download/">
+            {{ $t('device.control.file.push') }}
+          </span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </template>
+  </el-dropdown>
+</template>
+
+<script setup>
+import { ElMessage } from 'element-plus'
+import FileManageProxy from '$/components/Device/components/ControlBar/FileManage/index.vue'
+
+import { selectAndSendFileToDevice } from '$/utils/device/index.js'
+import { allSettled } from '$/utils'
+
+const props = defineProps({
+  devices: {
+    type: Object,
+    default: () => null,
+  },
+})
+
+const loading = ref(false)
+
+const fileManageProxyRef = ref(null)
+
+async function handlePush(devices) {
+  let files = null
+
+  try {
+    files = await window.electron.ipcRenderer.invoke('show-open-dialog', {
+      properties: ['openFile', 'multiSelections'],
+      filters: [
+        {
+          name: window.t('device.control.file.push.placeholder'),
+          extensions: ['*'],
+        },
+      ],
+    })
+  }
+  catch (error) {
+    if (error.message) {
+      const message = error.message?.match(/Error: (.*)/)?.[1] || error.message
+      ElMessage.warning(message)
+    }
+    return false
+  }
+
+  loading.value = true
+
+  await allSettled(devices, (item) => {
+    return fileManageProxyRef.value.handlePush(item, { files })
+  })
+
+  ElMessage.success(window.t('common.success.batch'))
+
+  loading.value = false
+}
+</script>
+
+<style></style>
diff --git a/src/components/Device/components/BatchActions/Screenshot/index.vue b/src/components/Device/components/BatchActions/Screenshot/index.vue
index 4adeb46..353f2d5 100644
--- a/src/components/Device/components/BatchActions/Screenshot/index.vue
+++ b/src/components/Device/components/BatchActions/Screenshot/index.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="" @click="handleClick">
-    <slot />
+    <slot v-bind="{ loading }" />
     <ScreenshotProxy ref="screenshotProxyRef" />
   </div>
 </template>
 
 <script>
 import ScreenshotProxy from '$/components/Device/components/ControlBar/Screenshot/index.vue'
-import { sleep } from '$/utils'
+import { allSettled, sleep } from '$/utils'
 
 export default {
   components: {
@@ -19,13 +19,20 @@ export default {
       default: () => [],
     },
   },
+  data() {
+    return {
+      loading: false,
+    }
+  },
   methods: {
     async handleClick() {
-      for (let index = 0; index < this.devices.length; index++) {
-        const item = this.devices[index]
-        await this.$refs.screenshotProxyRef.invoke(item)
-        await sleep(1 * 1000)
-      }
+      this.loading = true
+
+      await allSettled(this.devices, (item) => {
+        return this.$refs.screenshotProxyRef.invoke(item)
+      })
+
+      this.loading = false
     },
   },
 }
diff --git a/src/components/Device/components/BatchActions/Shell/index.vue b/src/components/Device/components/BatchActions/Shell/index.vue
new file mode 100644
index 0000000..39de422
--- /dev/null
+++ b/src/components/Device/components/BatchActions/Shell/index.vue
@@ -0,0 +1,83 @@
+<template>
+  <div class="" @click="handleClick(devices)">
+    <slot v-bind="{ loading }" />
+  </div>
+</template>
+
+<script setup>
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { selectAndSendFileToDevice } from '$/utils/device/index.js'
+import { allSettled } from '$/utils'
+
+const props = defineProps({
+  devices: {
+    type: Object,
+    default: () => null,
+  },
+})
+
+const loading = ref(false)
+
+async function handleClick(devices) {
+  let files = null
+
+  try {
+    files = await window.electron.ipcRenderer.invoke('show-open-dialog', {
+      properties: ['openFile'],
+      filters: [
+        {
+          name: window.t('device.control.shell.select'),
+          extensions: ['sh'],
+        },
+      ],
+    })
+  }
+  catch (error) {
+    if (error.message) {
+      const message = error.message?.match(/Error: (.*)/)?.[1]
+      ElMessage.warning(message || error.message)
+    }
+    return false
+  }
+
+  loading.value = true
+
+  const failFiles = []
+
+  await allSettled(devices, async (device) => {
+    const successFiles = await selectAndSendFileToDevice(device.id, {
+      files,
+      loadingText: window.t('device.control.shell.push.loading'),
+      successText: window.t('device.control.shell.push.success'),
+    }).catch((e) => {
+      console.warn(e.message)
+      failFiles.push(e.message)
+    })
+
+    const filePath = successFiles?.[0]
+
+    if (filePath) {
+      window.adbkit.deviceShell(device.id, `sh ${filePath}`)
+    }
+  })
+
+  if (failFiles.length) {
+    ElMessageBox.alert(
+      `<div>${failFiles.map(text => `${text}<br/>`).join('')}</div>`,
+      window.t('common.tips'),
+      {
+        type: 'warning',
+        dangerouslyUseHTMLString: true,
+      },
+    )
+    loading.value = false
+    return false
+  }
+
+  await ElMessage.success(window.t('device.control.shell.success'))
+
+  loading.value = false
+}
+</script>
+
+<style></style>
diff --git a/src/components/Device/components/BatchActions/index.vue b/src/components/Device/components/BatchActions/index.vue
index 33468c0..566b065 100644
--- a/src/components/Device/components/BatchActions/index.vue
+++ b/src/components/Device/components/BatchActions/index.vue
@@ -38,41 +38,41 @@
   </div>
 </template>
 
-<script>
+<script setup>
 import Application from './Application/index.vue'
 import Screenshot from './Screenshot/index.vue'
+import FileManage from './FileManage/index.vue'
+import Shell from './Shell/index.vue'
 
-export default {
-  components: {
-    Application,
-    Screenshot,
+const props = defineProps({
+  devices: {
+    type: Array,
+    default: () => [],
   },
-  props: {
-    devices: {
-      type: Array,
-      default: () => [],
-    },
+})
+
+const actionModel = [
+  {
+    label: 'device.control.capture',
+    elIcon: 'Crop',
+    component: Screenshot,
   },
-  data() {
-    return {
-      actionModel: [
-        {
-          label: 'device.control.capture',
-          elIcon: 'Crop',
-          component: 'Screenshot',
-        },
-        {
-          label: 'device.control.install',
-          svgIcon: 'install',
-          component: 'Application',
-        },
-      ],
-    }
+  {
+    label: 'device.control.install',
+    svgIcon: 'install',
+    component: Application,
   },
-  methods: {
-    handleShell() {},
+  {
+    label: 'device.control.file.name',
+    svgIcon: 'file-send',
+    component: FileManage,
   },
-}
+  {
+    label: 'device.control.shell.name',
+    svgIcon: 'command',
+    component: Shell,
+  },
+]
 </script>
 
 <style></style>
diff --git a/src/components/Device/components/ControlBar/Application/index.vue b/src/components/Device/components/ControlBar/Application/index.vue
index c4559db..d7cb061 100644
--- a/src/components/Device/components/ControlBar/Application/index.vue
+++ b/src/components/Device/components/ControlBar/Application/index.vue
@@ -5,6 +5,8 @@
 </template>
 
 <script>
+import { allSettled } from '$/utils'
+
 export default {
   props: {
     device: {
@@ -22,29 +24,27 @@ export default {
     preferenceData(...args) {
       return this.$store.preference.getData(...args)
     },
-    async handleInstall(device) {
-      let files = null
-
-      try {
-        files = await this.$electron.ipcRenderer.invoke('show-open-dialog', {
-          properties: ['openFile', 'multiSelections'],
-          filters: [
-            {
-              name: this.$t('device.control.install.placeholder'),
-              extensions: ['apk'],
-            },
-          ],
-        })
-      }
-      catch (error) {
-        if (error.message) {
-          const message = error.message?.match(/Error: (.*)/)?.[1]
-          this.$message.warning(message || error.message)
-        }
-      }
-
+    async handleInstall(device, { files } = {}) {
       if (!files) {
-        return false
+        try {
+          files = await this.$electron.ipcRenderer.invoke('show-open-dialog', {
+            properties: ['openFile', 'multiSelections'],
+            filters: [
+              {
+                name: this.$t('device.control.install.placeholder'),
+                extensions: ['apk'],
+              },
+            ],
+          })
+        }
+        catch (error) {
+          if (error.message) {
+            const message
+              = error.message?.match(/Error: (.*)/)?.[1] || error.message
+            this.$message.warning(message)
+          }
+          return false
+        }
       }
 
       const messageEl = this.$message.loading(
@@ -55,13 +55,12 @@ export default {
 
       let failCount = 0
 
-      for (let index = 0; index < files.length; index++) {
-        const item = files[index]
-        await this.$adb.install(device.id, item).catch((e) => {
+      await allSettled(files, (item) => {
+        return this.$adb.install(device.id, item).catch((e) => {
           console.warn(e)
           ++failCount
         })
-      }
+      })
 
       messageEl.close()
 
@@ -86,7 +85,7 @@ export default {
             }),
           )
         }
-        return
+        return false
       }
 
       this.$message.warning(this.$t('device.control.install.error'))
diff --git a/src/components/Device/components/ControlBar/FileManage/index.vue b/src/components/Device/components/ControlBar/FileManage/index.vue
index 592782d..c97b948 100644
--- a/src/components/Device/components/ControlBar/FileManage/index.vue
+++ b/src/components/Device/components/ControlBar/FileManage/index.vue
@@ -1,13 +1,13 @@
 <template>
   <el-dropdown :hide-on-click="false">
     <div class="">
-      <slot :loading="loading" />
+      <slot v-bind="{ loading }" />
     </div>
     <template #dropdown>
       <el-dropdown-menu>
-        <el-dropdown-item @click="handlePush">
+        <el-dropdown-item @click="handlePush(device)">
           <span class="" title="/sdcard/Download/">
-            {{ $t("device.control.file.push") }}
+            {{ $t('device.control.file.push') }}
           </span>
         </el-dropdown-item>
       </el-dropdown-menu>
@@ -15,87 +15,98 @@
   </el-dropdown>
 </template>
 
-<script>
-export default {
-  props: {
-    device: {
-      type: Object,
-      default: () => ({}),
-    },
+<script setup>
+import { ElMessage } from 'element-plus'
+import { selectAndSendFileToDevice } from '$/utils/device/index.js'
+import { useDeviceStore } from '$/store'
+import { allSettled } from '$/utils'
+
+const props = defineProps({
+  device: {
+    type: Object,
+    default: () => null,
   },
-  data() {
-    return {
-      loading: false,
+})
+
+const deviceStore = useDeviceStore()
+
+const loading = ref(false)
+
+async function handlePush(device, { files } = {}) {
+  if (!files) {
+    try {
+      files = await window.electron.ipcRenderer.invoke('show-open-dialog', {
+        properties: ['openFile', 'multiSelections'],
+        filters: [
+          {
+            name: window.t('device.control.file.push.placeholder'),
+            extensions: ['*'],
+          },
+        ],
+      })
     }
-  },
-  methods: {
-    async handlePush() {
-      this.loading = true
-      let files = null
-
-      try {
-        files = await this.$electron.ipcRenderer.invoke('show-open-dialog', {
-          properties: ['openFile', 'multiSelections'],
-          filters: [
-            {
-              name: this.$t('device.control.file.push.placeholder'),
-              extensions: ['*'],
-            },
-          ],
-        })
-      }
-      catch (error) {
-        if (error.message) {
-          const message = error.message?.match(/Error: (.*)/)?.[1]
-          this.$message.warning(message || error.message)
-        }
+    catch (error) {
+      if (error.message) {
+        const message
+          = error.message?.match(/Error: (.*)/)?.[1] || error.message
+        ElMessage.warning(message)
       }
 
-      if (!files) {
-        this.loading = false
-        return false
-      }
+      return false
+    }
+  }
 
-      let failCount = 0
+  loading.value = true
 
-      for (let index = 0; index < files.length; index++) {
-        const item = files[index]
-        await this.$adb.push(this.device.id, item).catch((e) => {
-          console.warn(e)
-          ++failCount
-        })
-      }
+  const closeMessage = ElMessage.loading(
+    window.t('device.control.file.push.loading'),
+    { grouping: true },
+  ).close
 
-      this.loading = false
+  let failCount = 0
 
-      const totalCount = files.length
-      const successCount = totalCount - failCount
+  await allSettled(files, (item) => {
+    return window.adbkit.push(device.id, item).catch(() => {
+      ++failCount
+    })
+  })
 
-      if (successCount) {
-        if (totalCount > 1) {
-          this.$message.success(
-            this.$t('device.control.file.push.success', {
-              deviceName: this.$store.device.getLabel(this.device),
-              totalCount,
-              successCount,
-              failCount,
-            }),
-          )
-        }
-        else {
-          this.$message.success(
-            this.$t('device.control.file.push.success.single', {
-              deviceName: this.$store.device.getLabel(this.device),
-            }),
-          )
-        }
-        return
-      }
+  loading.value = false
 
-      this.$message.warning(this.$t('device.control.file.push.error'))
-    },
-  },
+  const totalCount = files.length
+  const successCount = totalCount - failCount
+
+  if (successCount) {
+    closeMessage()
+
+    if (totalCount > 1) {
+      ElMessage.success(
+        window.t('device.control.file.push.success', {
+          deviceName: deviceStore.getLabel(device),
+          totalCount,
+          successCount,
+          failCount,
+        }),
+      )
+    }
+    else {
+      ElMessage.success(
+        window.t('device.control.file.push.success.single', {
+          deviceName: deviceStore.getLabel(device),
+        }),
+      )
+    }
+
+    return false
+  }
+
+  closeMessage()
+  ElMessage.warning(window.t('device.control.file.push.error'))
 }
+
+defineExpose({
+  handlePush,
+})
 </script>
 
 <style></style>
diff --git a/src/components/Device/components/ControlBar/Gnirehtet/index.vue b/src/components/Device/components/ControlBar/Gnirehtet/index.vue
index a3e2623..4881bd1 100644
--- a/src/components/Device/components/ControlBar/Gnirehtet/index.vue
+++ b/src/components/Device/components/ControlBar/Gnirehtet/index.vue
@@ -7,7 +7,7 @@
     <template v-if="device.$gnirehtetLoading" #dropdown>
       <el-dropdown-menu>
         <el-dropdown-item @click="handleStop">
-          {{ $t("device.control.gnirehtet.stop") }}
+          {{ $t('device.control.gnirehtet.stop') }}
         </el-dropdown-item>
       </el-dropdown-menu>
     </template>
@@ -48,9 +48,7 @@ export default {
       try {
         await this.$gnirehtet.run(this.device.id)
         await sleep()
-        this.$message.success(
-          this.$t('device.control.gnirehtet.start.success'),
-        )
+        this.$message.success(this.$t('device.control.gnirehtet.start.success'))
       }
       catch (error) {
         this.$message.warning(error.message || 'Start service failure')
diff --git a/src/components/Device/components/ControlBar/Shell/index.vue b/src/components/Device/components/ControlBar/Shell/index.vue
index 7a32e42..646ad01 100644
--- a/src/components/Device/components/ControlBar/Shell/index.vue
+++ b/src/components/Device/components/ControlBar/Shell/index.vue
@@ -6,74 +6,45 @@
 
 <script setup>
 import { ElMessage } from 'element-plus'
+import { selectAndSendFileToDevice } from '$/utils/device/index.js'
 
 const props = defineProps({
   device: {
     type: Object,
     default: () => null,
   },
-  loading: {
-    type: Boolean,
-    default: false,
-  },
 })
 
+const loading = ref(false)
+
 const invokeTerminal = inject('invokeTerminal')
 
 async function handleClick(device) {
   let files = null
 
+  loading.value = true
+
   try {
-    files = await window.electron.ipcRenderer.invoke('show-open-dialog', {
-      properties: ['openFile'],
-      filters: [
-        {
-          name: window.t('device.control.shell.select'),
-          extensions: ['sh'],
-        },
-      ],
+    files = await selectAndSendFileToDevice(device.id, {
+      extensions: ['sh'],
+      selectText: window.t('device.control.shell.select'),
+      loadingText: window.t('device.control.shell.push.loading'),
+      successText: window.t('device.control.shell.push.success'),
     })
   }
   catch (error) {
-    if (error.message) {
-      const message = error.message?.match(/Error: (.*)/)?.[1]
-      ElMessage.warning(message || error.message)
-    }
-    return false
-  }
-
-  const closeMessage = ElMessage.loading(
-    window.t('device.control.shell.pushing'),
-  ).close
-
-  const filePath = files[0]
-
-  let pushFilePath = ''
-
-  try {
-    pushFilePath = await window.adbkit.push(device.id, filePath)
-  }
-  catch (error) {
-    closeMessage()
+    loading.value = false
     ElMessage.warning(error.message)
     return false
   }
 
-  if (!pushFilePath) {
-    closeMessage()
-    ElMessage.warning('Push script failed')
-    return false
-  }
+  const filePath = files[0]
 
-  await window.adbkit.deviceShell(device.id, `sh ${pushFilePath}`)
-
-  closeMessage()
-
-  await ElMessage.success(window.t('device.control.shell.success'))
-
-  const command = `adb -s ${device.id} shell sh ${pushFilePath}`
+  const command = `adb -s ${device.id} shell sh ${filePath}`
 
   invokeTerminal(command)
+
+  loading.value = false
 }
 </script>
 
diff --git a/src/components/Device/components/TerminalAction/components/TerminalDialog/index.vue b/src/components/Device/components/TerminalAction/components/TerminalDialog/index.vue
index 24287fa..52b84f2 100644
--- a/src/components/Device/components/TerminalAction/components/TerminalDialog/index.vue
+++ b/src/components/Device/components/TerminalAction/components/TerminalDialog/index.vue
@@ -4,27 +4,26 @@
     width="80%"
     :close-on-click-modal="false"
     :close-on-press-escape="true"
-    destroy-on-close
+    :destroy-on-close="true"
     class="overflow-hidden !rounded-md el-dialog-headless dark:border dark:border-gray-700"
     @closed="onClosed"
   >
     <el-icon
-      class="cursor-pointer absolute top-3 right-3 w-8 h-8 flex items-center justify-center hover:bg-gray-200 dark:text-gray-200 dark:hover:bg-gray-700 !active:bg-red-600 !active:text-gray-200 rounded-md"
-      @click="hide"
+      class="cursor-pointer absolute top-3 right-3 w-8 h-8 flex items-center justify-center bg-white hover:bg-gray-200 dark:text-gray-200 dark:hover:bg-gray-700 !active:bg-red-600 !active:text-gray-200 rounded-md"
+      @click="close"
     >
       <CloseBold />
     </el-icon>
-
     <VueCommand
       ref="vShell"
       v-model:history="history"
       :dispatched-queries="dispatchedQueries"
       :commands="commands"
+      :invert="invert"
       hide-bar
       show-help
       help-text="Type in help"
       :help-timeout="3000"
-      :invert="invert"
       class=""
       @update:dispatched-queries="onDispatchedQueriesUpdate"
     >
@@ -37,125 +36,141 @@
   </el-dialog>
 </template>
 
-<script>
+<script setup>
 import VueCommand, {
   createQuery,
   createStdout,
   listFormatter,
 } from 'vue-command'
 import 'vue-command/dist/vue-command.css'
+import { ElMessage } from 'element-plus'
 import { useAdb } from './composables/adb-async.js'
 import { useScrcpy } from './composables/scrcpy.js'
 import { useGnirehtet } from './composables/gnirehtet.js'
 import { sleep } from '$/utils/index.js'
+import { useThemeStore } from '$/store/index.js'
 
-export default {
-  components: {
-    VueCommand,
+const themeStore = useThemeStore()
+
+const loading = ref(false)
+const visible = ref(false)
+
+const vShell = ref(null)
+const history = shallowRef([createQuery()])
+const dispatchedQueries = ref(new Set([]))
+
+const { adb } = useAdb({ vShell, history, loading })
+const { scrcpy } = useScrcpy({ vShell, history, loading })
+const { gnirehtet } = useGnirehtet({ vShell, history, loading })
+
+const invert = computed(() => !themeStore.isDark)
+
+const commands = ref({
+  adb,
+  scrcpy,
+  gnirehtet,
+  clear() {
+    history.value = []
+    return createQuery()
   },
-  setup() {
-    const vShell = ref(null)
-    const history = shallowRef([createQuery()])
-    const loading = ref(false)
-    const dispatchedQueries = ref(new Set([]))
+})
 
-    const { adb } = useAdb({ vShell, history, loading })
-    const { scrcpy } = useScrcpy({ vShell, history, loading })
-    const { gnirehtet } = useGnirehtet({ vShell, history, loading })
-
-    const commands = ref({
-      adb,
-      scrcpy,
-      gnirehtet,
-      clear() {
-        history.value = []
-        return createQuery()
-      },
-    })
-
-    commands.value.help = () => {
-      const commandList = Object.keys(commands.value)
-      return createStdout(listFormatter('Supported Commands:', ...commandList))
-    }
-
-    dispatchedQueries.value = new Set([
-      ...(window.appStore.get('terminal.dispatchedQueries') || []),
-      ...Object.keys(commands.value),
-    ])
-
-    return {
-      vShell,
-      loading,
-      history,
-      commands,
-      dispatchedQueries,
-    }
-  },
-  data() {
-    return {
-      visible: false,
-    }
-  },
-  computed: {
-    invert() {
-      return !this.$store.theme.isDark
-    },
-  },
-  watch: {
-    'vShell.signals': {
-      handler(value) {
-        value.off('SIGINT')
-
-        value.on('SIGINT', () => {
-          this.onCtrlC()
-        })
-      },
-    },
-  },
-  methods: {
-    show() {
-      this.visible = true
-    },
-
-    hide() {
-      this.visible = false
-    },
-
-    async invoke(command) {
-      this.visible = true
-
-      if (!this.vShell) {
-        await this.$nextTick()
-        await sleep(1000)
-      }
-
-      await this.vShell.setQuery(command)
-
-      const vueCommandHistoryEntryComponentRefs
-        = this.vShell.$refs.vueCommandHistoryEntryComponentRefs
-
-      const queryLength = vueCommandHistoryEntryComponentRefs.length
-
-      vueCommandHistoryEntryComponentRefs[queryLength - 1].focus()
-
-      this.$message.info(this.$t('device.control.shell.enter'))
-    },
-
-    onDispatchedQueriesUpdate(value) {
-      this.$appStore.set('terminal.dispatchedQueries', Array.from(value))
-
-      this.dispatchedQueries = value
-    },
-
-    onCtrlC() {
-      window.gnirehtet.shell('stop')
-    },
-
-    onClosed() {
-      this.vShell.dispatch('clear')
-    },
-  },
+commands.value.help = () => {
+  const commandList = Object.keys(commands.value)
+  return createStdout(listFormatter('Supported Commands:', ...commandList))
 }
+
+dispatchedQueries.value = new Set([
+  ...(window.appStore.get('terminal.dispatchedQueries') || []),
+  ...Object.keys(commands.value),
+])
+
+function getShell() {
+  let unwatch = null
+
+  return new Promise((resolve) => {
+    unwatch = watch(
+      () => vShell.value,
+      (value) => {
+        if (value) {
+          unwatch?.()
+          resolve(value)
+        }
+      },
+      { immediate: true },
+    )
+  })
+}
+
+;(async () => {
+  const shell = await getShell()
+
+  shell.signals.off('SIGINT')
+
+  shell.signals.on('SIGINT', () => {
+    onCtrlC()
+  })
+})()
+
+async function open() {
+  visible.value = true
+  await focus()
+}
+
+function close() {
+  visible.value = false
+}
+
+async function invoke(command) {
+  visible.value = true
+
+  const shell = await getShell()
+
+  shell.setQuery(command)
+
+  await focus()
+
+  ElMessage.info(window.t('device.control.shell.enter'))
+}
+
+async function focus() {
+  await nextTick()
+
+  const shell = await getShell()
+
+  const targetRefs = shell.$refs.vueCommandHistoryEntryComponentRefs || []
+
+  const targetRef = targetRefs[targetRefs.length - 1]
+
+  if (!targetRef) {
+    return false
+  }
+
+  await sleep()
+
+  targetRef.focus()
+}
+
+function onDispatchedQueriesUpdate(value) {
+  window.appStore.set('terminal.dispatchedQueries', Array.from(value))
+
+  dispatchedQueries.value = value
+}
+
+function onCtrlC() {
+  window.gnirehtet.shell('stop')
+}
+
+function onClosed() {
+  vShell.value.dispatch('clear')
+  history.value = [createQuery()]
+}
+
+defineExpose({
+  open,
+  close,
+  invoke,
+})
 </script>
 
 <style lang="postcss" scoped>
diff --git a/src/components/Device/components/TerminalAction/index.vue b/src/components/Device/components/TerminalAction/index.vue
index f514f5f..819d1ab 100644
--- a/src/components/Device/components/TerminalAction/index.vue
+++ b/src/components/Device/components/TerminalAction/index.vue
@@ -20,7 +20,7 @@ export default {
   },
   methods: {
     handleShow() {
-      this.$refs.terminalDialog.show()
+      this.$refs.terminalDialog.open()
     },
     invoke(...args) {
       this.$refs.terminalDialog.invoke(...args)
diff --git a/src/locales/languages/en-US.json b/src/locales/languages/en-US.json
index 4f310e2..38fa9bd 100644
--- a/src/locales/languages/en-US.json
+++ b/src/locales/languages/en-US.json
@@ -7,6 +7,7 @@
   "common.open": "Open",
   "common.input.placeholder": "Please input",
   "common.success": "Operation successful",
+  "common.success.batch": "Batch operation success",
   "common.progress": "Starting",
   "common.loading": "Loading",
   "common.search": "Search",
@@ -99,15 +100,18 @@
   "device.control.file.name": "File Manager",
   "device.control.file.push": "Push File",
   "device.control.file.push.placeholder": "Please select the file to push",
+  "device.control.file.push.loading": "Push file",
+  "device.control.file.push.success.name": "Push files successfully",
   "device.control.file.push.success": "Successfully pushed {totalCount} files to the /sdcard/Download/ directory of {deviceName}, {successCount} succeeded, and {failCount} failed",
   "device.control.file.push.success.single": "Files successfully pushed to the /sdcard/Download/ directory of {deviceName}",
   "device.control.file.push.error": "Failed to push the file, please check the file and try again",
   "device.control.shell.name": "Execute Script",
   "device.control.shell.tips": "Perform custom script through the ADB command",
   "device.control.shell.select": "Please select the script you want to execute",
-  "device.control.shell.pushing": "Push script",
-  "device.control.shell.success": "Push script successfully",
+  "device.control.shell.push.loading": "Push script",
+  "device.control.shell.push.success": "Push script success",
   "device.control.shell.enter": "Please enter the Enter key to confirm the execution of the script",
+  "device.control.shell.success": "Script execution successfully",
   "device.control.capture": "Screenshot",
   "device.control.capture.progress": "Capturing screenshot for {deviceName}...",
   "device.control.capture.success.message": "Open screenshot location?",
diff --git a/src/locales/languages/zh-CN.json b/src/locales/languages/zh-CN.json
index bde1b4b..9db9a9b 100644
--- a/src/locales/languages/zh-CN.json
+++ b/src/locales/languages/zh-CN.json
@@ -7,6 +7,7 @@
   "common.open": "打开",
   "common.input.placeholder": "请填写",
   "common.success": "操作成功",
+  "common.success.batch": "批量操作成功",
   "common.progress": "启动中",
   "common.loading": "加载中",
   "common.search": "搜索",
@@ -99,15 +100,18 @@
   "device.control.file.name": "文件管理",
   "device.control.file.push": "推送文件",
   "device.control.file.push.placeholder": "请选择要推送的文件",
+  "device.control.file.push.loading": "推送文件中",
+  "device.control.file.push.success.name": "推送文件成功",
   "device.control.file.push.success": "已成功将 {totalCount} 个文件推送到 {deviceName} 的 /sdcard/Download/ 目录，{successCount} 成功，{failCount} 失败。",
   "device.control.file.push.success.single": "文件已成功推送到 {deviceName} 的 /sdcard/Download/ 目录",
   "device.control.file.push.error": "推送文件失败，请检查文件后重试",
   "device.control.shell.name": "执行脚本",
   "device.control.shell.tips": "通过 ADB 命令执行自定义脚本",
   "device.control.shell.select": "请选择要执行的脚本",
-  "device.control.shell.pushing": "推送脚本中",
-  "device.control.shell.success": "推送脚本成功",
+  "device.control.shell.push.loading": "推送脚本中",
+  "device.control.shell.push.success": "推送脚本成功",
   "device.control.shell.enter": "请输入回车键确认执行该脚本",
+  "device.control.shell.success": "脚本执行成功",
   "device.control.capture": "截取屏幕",
   "device.control.capture.progress": "正在截取 {deviceName} 的屏幕快照...",
   "device.control.capture.success.message": "是否前往截屏位置进行查看？",
diff --git a/src/locales/languages/zh-TW.json b/src/locales/languages/zh-TW.json
index e366e99..72dced2 100644
--- a/src/locales/languages/zh-TW.json
+++ b/src/locales/languages/zh-TW.json
@@ -7,6 +7,7 @@
   "common.open": "開啟",
   "common.input.placeholder": "請輸入",
   "common.success": "操作成功",
+  "common.success.batch": "批量操作成功",
   "common.progress": "啟動中",
   "common.loading": "載入中",
   "common.search": "搜尋",
@@ -99,15 +100,18 @@
   "device.control.file.name": "檔案管理",
   "device.control.file.push": "推送檔案",
   "device.control.file.push.placeholder": "請選擇要推送的檔案",
+  "device.control.file.push.loading": "推送檔案中",
+  "device.control.file.push.success.name": "推送檔案成功",
   "device.control.file.push.success": "已成功將 {totalCount} 個檔案推送到 {deviceName} 的 /sdcard/Download/ 目錄，{successCount} 成功，{failCount} 失敗。",
   "device.control.file.push.success.single": "檔案已成功推送到 {deviceName} 的 /sdcard/Download/ 目錄",
   "device.control.file.push.error": "推送檔案失敗，請檢查檔案後重試",
   "device.control.shell.name": "執行腳本",
   "device.control.shell.tips": "透過 ADB 命令執行自訂腳本",
   "device.control.shell.select": "請選擇要執行的腳本",
-  "device.control.shell.pushing": "推送腳本中",
-  "device.control.shell.success": "推送腳本成功",
+  "device.control.shell.push.loading": "推送腳本中",
+  "device.control.shell.push.success": "推送腳本成功",
   "device.control.shell.enter": "請輸入回車鍵確認執行該腳本",
+  "device.control.shell.success": "腳本執行成功",
   "device.control.capture": "擷取螢幕",
   "device.control.capture.progress": "正在擷取 {deviceName} 的螢幕快照...",
   "device.control.capture.success.message": "是否前往截圖位置進行檢視？",
diff --git a/src/plugins/element-plus/index.js b/src/plugins/element-plus/index.js
index 0e07347..d1ad307 100644
--- a/src/plugins/element-plus/index.js
+++ b/src/plugins/element-plus/index.js
@@ -1,13 +1,15 @@
-import * as ElementPlusIcons from '@element-plus/icons-vue'
-
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import 'element-plus/theme-chalk/el-loading.css'
 import 'element-plus/theme-chalk/el-message.css'
 import 'element-plus/theme-chalk/el-message-box.css'
+import 'element-plus/theme-chalk/el-badge.css'
 
 import 'element-plus/theme-chalk/dark/css-vars.css'
 import './restyle.css'
 
+import * as ElementPlusIcons from '@element-plus/icons-vue'
+
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+
 import EleIconLoading from './components/EleIconLoading/index.vue'
 
 export default {
diff --git a/src/utils/device/index.js b/src/utils/device/index.js
new file mode 100644
index 0000000..de48390
--- /dev/null
+++ b/src/utils/device/index.js
@@ -0,0 +1,66 @@
+import { ElMessage } from 'element-plus'
+import { allSettled } from '$/utils'
+/**
+ * 选择并将文件发送到设备
+ */
+export async function selectAndSendFileToDevice(
+  deviceId,
+  {
+    files,
+    multiSelections = false,
+    extensions = ['*'],
+    selectText = window.t('device.control.file.push.placeholder'),
+    loadingText = window.t('device.control.file.push.loading'),
+    successText = window.t('device.control.file.push.success.name'),
+  } = {},
+) {
+  if (!files) {
+    try {
+      const properties = ['openFile']
+
+      if (multiSelections) {
+        properties.push('multiSelections')
+      }
+
+      files = await window.electron.ipcRenderer.invoke('show-open-dialog', {
+        properties,
+        filters: [
+          {
+            name: selectText,
+            extensions,
+          },
+        ],
+      })
+    }
+    catch (error) {
+      throw new Error(error.message?.match(/Error: (.*)/)?.[1] || error.message)
+    }
+  }
+
+  const closeMessage = ElMessage.loading(loadingText).close
+
+  const successFiles = []
+  const failFiles = []
+
+  await allSettled(files, async (item) => {
+    const ret = await window.adbkit.push(deviceId, item).catch((e) => {
+      console.warn(e?.message)
+      failFiles.push(`${deviceId}-${item}`)
+    })
+
+    if (ret) {
+      successFiles.push(ret)
+    }
+  })
+
+  if (failFiles.length) {
+    closeMessage()
+    throw new Error(`Push file failed: ${failFiles.join(',')}`)
+  }
+
+  closeMessage()
+
+  ElMessage.success({ message: successText, grouping: true })
+
+  return successFiles
+}
diff --git a/src/utils/index.js b/src/utils/index.js
index 90c6352..163a721 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -52,3 +52,40 @@ export function keyByValue(data, key = 'key', valueKey = 'value') {
 
   return value
 }
+
+/**
+ * 对列表中的每个项目执行给定的迭代器函数，并返回一个 Promise，
+ * 该 Promise 在所有迭代完成时解决，无论它们是成功还是失败。
+ *
+ * @param {Array} list - 要迭代的项目数组。
+ * @param {Function} iterator - 对列表中每个项目执行的函数。
+ *   它应该返回一个 Promise 或者可以是一个异步函数。
+ * @param {*} iterator.item - 当前正在处理的列表项。
+ * @param {number} iterator.index - 当前正在处理的项目的索引。
+ * @param {Array} iterator.array - 正在处理的原始数组。
+ * @returns {Promise<Array<PromiseSettledResult>>} 一个 Promise，解析为一个对象数组，
+ *   描述输入数组中每个 promise 的结果。
+ * @throws {TypeError} 如果第一个参数不是数组或第二个参数不是函数。
+ *
+ * @example
+ * const list = [1, 2, 3, 4, 5];
+ * const iterator = async (item) => {
+ *   if (item % 2 === 0) {
+ *     return item * 2;
+ *   } else {
+ *     throw new Error('奇数');
+ *   }
+ * };
+ * allSettled(list, iterator).then(console.log);
+ */
+export function allSettled(list = [], iterator) {
+  const promises = []
+
+  for (let index = 0; index < list.length; index++) {
+    const item = list[index]
+
+    promises.push(iterator(item))
+  }
+
+  return Promise.allSettled(promises)
+}

From 25c42d94ec38210c519db78ad60b32813e9ff2f5 Mon Sep 17 00:00:00 2001
From: viarotel <viarotel@qq.com>
Date: Sat, 13 Jul 2024 17:09:12 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Repair=20the=20proble?=
 =?UTF-8?q?m=20of=20equipment=20width=20in=20the=20English=20state?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Device/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/Device/index.vue b/src/components/Device/index.vue
index 101dba8..aae11a8 100644
--- a/src/components/Device/index.vue
+++ b/src/components/Device/index.vue
@@ -61,14 +61,14 @@
           sortable
           show-overflow-tooltip
           align="left"
-          width="200"
+          min-width="100"
         />
         <el-table-column
           :label="$t('device.name')"
           sortable
           show-overflow-tooltip
           align="left"
-          min-width="200"
+          min-width="150"
         >
           <template #default="{ row }">
             <div class="flex items-center">
@@ -97,7 +97,7 @@
         <el-table-column
           v-slot="{ row, $index }"
           :label="$t('device.control.name')"
-          width="400"
+          min-width="200"
           align="left"
         >
           <MirrorAction