0.15.0 更新客户端enter直接触发搜索

Author: Vanilla-Beauty

README.md

@@ -4,9 +4,6 @@
 
 ![example](doc/example.png)
 
-
-
-
 # 操作说明
 
 - 搜索模式选项说明
@@ -79,7 +76,7 @@ log_level = "trace" # 日志级别
 # log_level = "info" # 日志级别
 ```
 
-# 功能列表
+# 功能 && TODO
 
 > 最新的功能可能还没有发布到[Release](https://github.com/ToniXWD/file_elf/releases), 需要本地编译
 
@@ -100,6 +97,8 @@ log_level = "trace" # 日志级别
 - [ ] 支持配置文件热重载
 - [ ] 支持剥离关系型数据库 `sqlite3`存储, 创建自定义的文件格式存储
 - [ ] 配置文件支持自定义数据库(目前使用 `sqlite3`)
+- [ ] 搜索项支持系统级别的更多操作(仅 `windows`)
+- [ ] 客户端界面优化: 设定默认聚焦组件 && `table` 切换 && `Enter `默认行为
 
 # 安装和开发
 

app/search-files-app/src-tauri/tauri.conf.json

@@ -44,7 +44,7 @@
   },
   "productName": "search-files-app",
   "mainBinaryName": "search-files-app",
-  "version": "0.14.3",
+  "version": "0.15.0",
   "identifier": "com.file.efl.toni",
   "plugins": {
     "cli": {

app/search-files-app/src/elements/ResultItem.js

@@ -59,6 +59,7 @@ const ResultItem = ({ result, addMessage }) => {
         <ListGroup.Item>
             {/* 解构 result 以提取字符串和布尔值 */}
             {result[0]}{' '}  {/* 这是字符串部分 */}
+            <br></br>
             <Button variant="outline-secondary" size="sm" onClick={() => openDir(result[0])}>
                 📁
             </Button>

app/search-files-app/src/elements/SearchForm.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { Form, Button, Container, Row, Col } from 'react-bootstrap';
 import ResultsList from './ResultsList.js';
 import NotificationToast from './NotificationToast.js';
@@ -14,8 +14,20 @@ const SearchForm = () => {
     const [message, setMessage] = useState('');
     const [showToast, setShowToast] = useState(false);
 
+    // 创建输入框的引用
+    const inputRef = useRef(null);
+
+    // 聚焦输入框的函数
+    const focusInput = () => {
+        if (inputRef.current) {
+            inputRef.current.focus();
+        }
+    };
+
     useEffect(() => {
         setResults([]);
+
+        focusInput();
     }, []);
 
     const handleSearch = async () => {
@@ -59,13 +71,21 @@ const SearchForm = () => {
             <Row className="justify-content-center">
                 <Col md={6}>
                     <h1 className="text-start mb-4">Search Files</h1>
-                    <Form>
+                    <Form onSubmit={(e) => e.preventDefault()}>
                         <Form.Group controlId="entry">
                             <Form.Control
                                 type="text"
                                 value={entry}
                                 onChange={(e) => setEntry(e.target.value)}
+                                ref={inputRef} // 绑定引用
                                 placeholder="Enter your search query"
+                                onKeyDown={(e) => {
+                                    if (e.key === 'Enter') {
+                                        e.preventDefault(); // 阻止默认行为，避免清空输入框
+                                        console.log('Enter pressed');
+                                        handleSearch();
+                                    }
+                                }}
                             />
                         </Form.Group>
                         <br />
@@ -91,7 +111,10 @@ const SearchForm = () => {
                             <HelpBar></HelpBar>
                             <ConfigBar></ConfigBar
                             >
-                            <Button variant="primary" className="ms-auto" onClick={handleSearch}>Search</Button>
+                            <Button variant="primary" type="button" className="ms-auto"
+                                onClick={handleSearch}>
+                                Search
+                            </Button>
                         </div>
                     </Form>
                     <ResultsList results={results} addMessage={addMessage} />

build.ps1

@@ -9,7 +9,8 @@ param (
 $PUBLISH_DIR = "./publish"
 $CARGO_TARGET_DIR = "./target/release"
 $TAURI_APP_DIR = "./app/search-files-app"
-$TAURI_TARGET_DIR = "$TAURI_APP_DIR/src-tauri/target/release"
+$TAURI_TARGET_RELEASE_DIR = "$TAURI_APP_DIR/src-tauri/target/release"
+$TAURI_TARGET_DEBUG_DIR = "$TAURI_APP_DIR/src-tauri/target/debug"
 $RUST_BINARY = "file_elf.exe"
 $TAURI_BINARY = "search-files-app.exe"
 $TAURI_INSTALL_MSI = "bundle/msi/search-files-app_*_x64_en-US.msi"
@@ -44,9 +45,9 @@ function Publish-Files {
     Write-Host "Copying files to the publish directory..."
     Copy-Item "base.toml" "$PUBLISH_DIR/"
     Copy-Item "$CARGO_TARGET_DIR/$RUST_BINARY" "$PUBLISH_DIR/"
-    Copy-Item "$TAURI_TARGET_DIR/$TAURI_BINARY" "$PUBLISH_DIR/"
-    Copy-Item "$TAURI_TARGET_DIR/$TAURI_INSTALL_MSI" "$PUBLISH_DIR/"
-    Copy-Item "$TAURI_TARGET_DIR/$TAURI_INSTALL_EXE" "$PUBLISH_DIR/"
+    Copy-Item "$TAURI_TARGET_RELEASE_DIR/$TAURI_BINARY" "$PUBLISH_DIR/"
+    Copy-Item "$TAURI_TARGET_RELEASE_DIR/$TAURI_INSTALL_MSI" "$PUBLISH_DIR/"
+    Copy-Item "$TAURI_TARGET_RELEASE_DIR/$TAURI_INSTALL_EXE" "$PUBLISH_DIR/"
 }
 
 # Package the build artifacts into a zip file
@@ -61,7 +62,8 @@ function Clean-Build {
     cargo clean
     Remove-Item -Recurse -Force $PUBLISH_DIR
     Remove-Item -Recurse -Force "$TAURI_APP_DIR/build/"
-    Remove-Item -Recurse -Force "$TAURI_TARGET_DIR/"
+    Remove-Item -Recurse -Force "$TAURI_TARGET_RELEASE_DIR/"
+    Remove-Item -Recurse -Force "$TAURI_TARGET_DEBUG_DIR/"
 }
 
 # Clean only the publish directory
@@ -74,7 +76,7 @@ function Clean-Publish {
 function Clean-Tauri {
     Write-Host "Cleaning Tauri build artifacts..."
     Remove-Item -Recurse -Force "$TAURI_APP_DIR/build/"
-    Remove-Item -Recurse -Force "$TAURI_TARGET_DIR/"
+    Remove-Item -Recurse -Force "$TAURI_TARGET_RELEASE_DIR/"
 }
 
 # Clean only the Rust project artifacts