Merge remote-tracking branch 'origin/dev'

viarotel-org · Jul 2, 2024 · 20151c4 · 20151c4
2 parents 3024d25 + 22cc5a3
commit 20151c4
Show file tree

Hide file tree

Showing 47 changed files with 3,491 additions and 204 deletions.
diff --git a/electron/resources/extra/linux/android-platform-tools/NOTICE.txt b/electron/resources/extra/linux/android-platform-tools/NOTICE.txt
diff --git a/electron/resources/extra/linux/android-platform-tools/adb b/electron/resources/extra/linux/android-platform-tools/adb
diff --git a/electron/resources/extra/linux/android-platform-tools/etc1tool b/electron/resources/extra/linux/android-platform-tools/etc1tool
diff --git a/electron/resources/extra/linux/android-platform-tools/fastboot b/electron/resources/extra/linux/android-platform-tools/fastboot
diff --git a/electron/resources/extra/linux/android-platform-tools/hprof-conv b/electron/resources/extra/linux/android-platform-tools/hprof-conv
diff --git a/electron/resources/extra/linux/android-platform-tools/lib64/libc++.so b/electron/resources/extra/linux/android-platform-tools/lib64/libc++.so
diff --git a/electron/resources/extra/linux/android-platform-tools/make_f2fs b/electron/resources/extra/linux/android-platform-tools/make_f2fs
diff --git a/electron/resources/extra/linux/android-platform-tools/make_f2fs_casefold b/electron/resources/extra/linux/android-platform-tools/make_f2fs_casefold
diff --git a/electron/resources/extra/linux/android-platform-tools/mke2fs b/electron/resources/extra/linux/android-platform-tools/mke2fs
diff --git a/electron/resources/extra/linux/android-platform-tools/source.properties b/electron/resources/extra/linux/android-platform-tools/source.properties
@@ -1,2 +1,2 @@
 Pkg.UserSrc=false
-Pkg.Revision=34.0.5
+Pkg.Revision=35.0.1
diff --git a/electron/resources/extra/linux/android-platform-tools/sqlite3 b/electron/resources/extra/linux/android-platform-tools/sqlite3
diff --git a/electron/resources/extra/mac/android-platform-tools/NOTICE.txt b/electron/resources/extra/mac/android-platform-tools/NOTICE.txt
diff --git a/electron/resources/extra/mac/android-platform-tools/adb b/electron/resources/extra/mac/android-platform-tools/adb
diff --git a/electron/resources/extra/mac/android-platform-tools/etc1tool b/electron/resources/extra/mac/android-platform-tools/etc1tool
diff --git a/electron/resources/extra/mac/android-platform-tools/fastboot b/electron/resources/extra/mac/android-platform-tools/fastboot
diff --git a/electron/resources/extra/mac/android-platform-tools/hprof-conv b/electron/resources/extra/mac/android-platform-tools/hprof-conv
diff --git a/electron/resources/extra/mac/android-platform-tools/lib64/libc++.dylib b/electron/resources/extra/mac/android-platform-tools/lib64/libc++.dylib
diff --git a/electron/resources/extra/mac/android-platform-tools/make_f2fs b/electron/resources/extra/mac/android-platform-tools/make_f2fs
diff --git a/electron/resources/extra/mac/android-platform-tools/make_f2fs_casefold b/electron/resources/extra/mac/android-platform-tools/make_f2fs_casefold
diff --git a/electron/resources/extra/mac/android-platform-tools/mke2fs b/electron/resources/extra/mac/android-platform-tools/mke2fs
diff --git a/electron/resources/extra/mac/android-platform-tools/source.properties b/electron/resources/extra/mac/android-platform-tools/source.properties
@@ -1,2 +1,2 @@
 Pkg.UserSrc=false
-Pkg.Revision=34.0.5
+Pkg.Revision=35.0.1
diff --git a/electron/resources/extra/mac/android-platform-tools/sqlite3 b/electron/resources/extra/mac/android-platform-tools/sqlite3
diff --git a/electron/resources/extra/win/android-platform-tools/AdbWinApi.dll b/electron/resources/extra/win/android-platform-tools/AdbWinApi.dll
diff --git a/electron/resources/extra/win/android-platform-tools/AdbWinUsbApi.dll b/electron/resources/extra/win/android-platform-tools/AdbWinUsbApi.dll
diff --git a/electron/resources/extra/win/android-platform-tools/NOTICE.txt b/electron/resources/extra/win/android-platform-tools/NOTICE.txt
diff --git a/electron/resources/extra/win/android-platform-tools/adb.exe b/electron/resources/extra/win/android-platform-tools/adb.exe
diff --git a/electron/resources/extra/win/android-platform-tools/etc1tool.exe b/electron/resources/extra/win/android-platform-tools/etc1tool.exe
diff --git a/electron/resources/extra/win/android-platform-tools/fastboot.exe b/electron/resources/extra/win/android-platform-tools/fastboot.exe
diff --git a/electron/resources/extra/win/android-platform-tools/hprof-conv.exe b/electron/resources/extra/win/android-platform-tools/hprof-conv.exe
diff --git a/electron/resources/extra/win/android-platform-tools/libwinpthread-1.dll b/electron/resources/extra/win/android-platform-tools/libwinpthread-1.dll
diff --git a/electron/resources/extra/win/android-platform-tools/make_f2fs.exe b/electron/resources/extra/win/android-platform-tools/make_f2fs.exe
diff --git a/electron/resources/extra/win/android-platform-tools/make_f2fs_casefold.exe b/electron/resources/extra/win/android-platform-tools/make_f2fs_casefold.exe
diff --git a/electron/resources/extra/win/android-platform-tools/mke2fs.exe b/electron/resources/extra/win/android-platform-tools/mke2fs.exe
diff --git a/electron/resources/extra/win/android-platform-tools/source.properties b/electron/resources/extra/win/android-platform-tools/source.properties
@@ -1,2 +1,2 @@
 Pkg.UserSrc=false
-Pkg.Revision=34.0.5
+Pkg.Revision=35.0.1
diff --git a/electron/resources/extra/win/android-platform-tools/sqlite3.exe b/electron/resources/extra/win/android-platform-tools/sqlite3.exe
diff --git a/electron/resources/extra/win/scrcpy/SDL2.dll b/electron/resources/extra/win/scrcpy/SDL2.dll
diff --git a/...resources/extra/win/scrcpy/avcodec-60.dll → ...resources/extra/win/scrcpy/avcodec-61.dll b/...resources/extra/win/scrcpy/avcodec-60.dll → ...resources/extra/win/scrcpy/avcodec-61.dll
diff --git a/electron/resources/extra/win/scrcpy/avformat-60.dll b/electron/resources/extra/win/scrcpy/avformat-60.dll
diff --git a/electron/resources/extra/win/scrcpy/avformat-61.dll b/electron/resources/extra/win/scrcpy/avformat-61.dll
diff --git a/electron/resources/extra/win/scrcpy/avutil-58.dll b/electron/resources/extra/win/scrcpy/avutil-58.dll
diff --git a/electron/resources/extra/win/scrcpy/avutil-59.dll b/electron/resources/extra/win/scrcpy/avutil-59.dll
diff --git a/electron/resources/extra/win/scrcpy/libusb-1.0.dll b/electron/resources/extra/win/scrcpy/libusb-1.0.dll
diff --git a/electron/resources/extra/win/scrcpy/scrcpy-server b/electron/resources/extra/win/scrcpy/scrcpy-server
diff --git a/electron/resources/extra/win/scrcpy/scrcpy.exe b/electron/resources/extra/win/scrcpy/scrcpy.exe
diff --git a/electron/resources/extra/win/scrcpy/swresample-4.dll b/electron/resources/extra/win/scrcpy/swresample-4.dll
diff --git a/electron/resources/extra/win/scrcpy/swresample-5.dll b/electron/resources/extra/win/scrcpy/swresample-5.dll
diff --git a/src/components/Device/components/TerminalAction/components/TerminalDialog/index.vue b/src/components/Device/components/TerminalAction/components/TerminalDialog/index.vue
@@ -4,7 +4,7 @@
     width="80%"
     :close-on-click-modal="false"
     :close-on-press-escape="true"
-    class="overflow-hidden rounded-md el-dialog-headless dark:border dark:border-gray-700"
+    class="overflow-hidden !rounded-md el-dialog-headless dark:border dark:border-gray-700"
     @open="onOpen"
   >
     <el-icon