feat: 添加连接前后行为配置 (#15)

Author: bakacai

src-tauri/src/commands/device.rs

@@ -55,13 +55,18 @@ pub async fn connect_device(
     port: Option<String>,
     baud_rate: Option<u32>,
     stub_path: String,
+    before_operation: String,
+    after_operation: String,
 ) -> Result<bool, String> {
     let device_config = DeviceConfig {
         chip_type: chip_model,
         memory_type,
         port_name: port.ok_or("端口名不能为空")?,
         baud_rate: baud_rate.ok_or("波特率不能为空")?,
         stub_path,
+        // keep before/after as strings for serde transport; parsing happens in tool factory
+        before_operation,
+        after_operation,
     };
 
     // 创建 Tauri 进度回调

src-tauri/src/types/device.rs

@@ -13,4 +13,7 @@ pub struct DeviceConfig {
     pub port_name: String,
     pub baud_rate: u32,
     pub stub_path: String,
+    // use String for serde-friendly transport; parse to enums internally when needed
+    pub before_operation: String,
+    pub after_operation: String,
 }

src-tauri/src/utils/tool_factory.rs

@@ -45,6 +45,14 @@ pub fn create_tool_instance_with_progress(
         _ => return Err(format!("不支持的芯片型号: {}", config.chip_type)),
     };
 
+    // parse before/after operation strings into enums
+    let before_enum = match config.before_operation.as_str() {
+        "default_reset" => BeforeOperation::DefaultReset,
+        "no_reset" => BeforeOperation::NoReset,
+        "no_reset_no_sync" => BeforeOperation::NoResetNoSync,
+        _ => BeforeOperation::NoReset,
+    };
+
     let (stub_path, _temp_file) = prepare_stub_path(
         if !config.stub_path.is_empty() {
             Some(config.stub_path.as_str())
@@ -60,7 +68,7 @@ pub fn create_tool_instance_with_progress(
     // 创建 SifliToolBase (带进度回调)
     let base = SifliToolBase::new_with_external_stub(
         config.port_name.clone(),
-        BeforeOperation::NoReset,
+        before_enum,
         config.memory_type.to_lowercase(),
         config.baud_rate,
         1,

src/components/DeviceConnection.vue

@@ -312,6 +312,83 @@
       {{ isConnected ? t('deviceConnection.disconnectDevice') : t('deviceConnection.connectDevice') }}
     </button>
 
+    <!-- 下载行为配置 -->
+    <div class="card bg-base-100 shadow-sm p-3 mt-3">
+      <div
+        class="flex items-center justify-between cursor-pointer"
+        @click="downloadPanelCollapsed = !downloadPanelCollapsed"
+      >
+        <div class="flex items-center gap-2">
+          <span class="material-icons text-sm text-primary">download</span>
+          <span class="font-bold text-sm">{{ t('deviceConnection.downloadBehavior.title') }}</span>
+        </div>
+        <div class="flex items-center gap-2 text-xs text-base-content/70">
+          <span
+            class="material-icons text-sm transition-transform duration-200"
+            :class="{ 'rotate-180': !downloadPanelCollapsed }"
+            >keyboard_arrow_down</span
+          >
+        </div>
+      </div>
+
+      <transition name="fade-collapse">
+        <div v-show="!downloadPanelCollapsed" class="mt-3 pt-2 border-t border-base-300/30 space-y-4">
+          <div class="space-y-2">
+            <div class="flex items-center gap-2 text-xs font-semibold text-base-content/80">
+              <span class="w-1 h-4 rounded-full bg-primary/60"></span>
+              <span>{{ t('deviceConnection.downloadBehavior.beforeLabel') }}</span>
+            </div>
+            <div class="flex flex-col gap-2">
+              <label class="option-card" :class="{ 'option-card-active': downloadBefore === 'default_reset' }">
+                <div class="flex items-center gap-2">
+                  <input type="radio" v-model="downloadBefore" value="default_reset" class="radio radio-sm" />
+                  <span class="material-icons text-xs text-primary">sync</span>
+                  <span class="text-xs">{{ t('deviceConnection.downloadBehavior.before.default_reset') }}</span>
+                </div>
+              </label>
+              <label class="option-card" :class="{ 'option-card-active': downloadBefore === 'no_reset' }">
+                <div class="flex items-center gap-2">
+                  <input type="radio" v-model="downloadBefore" value="no_reset" class="radio radio-sm" />
+                  <span class="material-icons text-xs text-primary">sync_disabled</span>
+                  <span class="text-xs">{{ t('deviceConnection.downloadBehavior.before.no_reset') }}</span>
+                </div>
+              </label>
+              <label class="option-card" :class="{ 'option-card-active': downloadBefore === 'no_reset_no_sync' }">
+                <div class="flex items-center gap-2">
+                  <input type="radio" v-model="downloadBefore" value="no_reset_no_sync" class="radio radio-sm" />
+                  <span class="material-icons text-xs text-primary">do_not_disturb</span>
+                  <span class="text-xs">{{ t('deviceConnection.downloadBehavior.before.no_reset_no_sync') }}</span>
+                </div>
+              </label>
+            </div>
+          </div>
+
+          <div class="space-y-2">
+            <div class="flex items-center gap-2 text-xs font-semibold text-base-content/80">
+              <span class="w-1 h-4 rounded-full bg-secondary/60"></span>
+              <span>{{ t('deviceConnection.downloadBehavior.afterLabel') }}</span>
+            </div>
+            <div class="flex flex-col gap-2">
+              <label class="option-card" :class="{ 'option-card-active': downloadAfter === 'soft_reset' }">
+                <div class="flex items-center gap-2">
+                  <input type="radio" v-model="downloadAfter" value="soft_reset" class="radio radio-sm" />
+                  <span class="material-icons text-xs text-secondary">sync</span>
+                  <span class="text-xs">{{ t('deviceConnection.downloadBehavior.after.soft_reset') }}</span>
+                </div>
+              </label>
+              <label class="option-card" :class="{ 'option-card-active': downloadAfter === 'no_reset' }">
+                <div class="flex items-center gap-2">
+                  <input type="radio" v-model="downloadAfter" value="no_reset" class="radio radio-sm" />
+                  <span class="material-icons text-xs text-secondary">sync_disabled</span>
+                  <span class="text-xs">{{ t('deviceConnection.downloadBehavior.after.no_reset') }}</span>
+                </div>
+              </label>
+            </div>
+          </div>
+        </div>
+      </transition>
+    </div>
+
     <!-- stub应用开关 -->
     <div class="card bg-base-100 shadow-sm p-3 mt-3">
       <div class="flex items-center justify-between">
@@ -446,12 +523,13 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, computed } from 'vue';
+import { onMounted, computed, ref } from 'vue';
 import { storeToRefs } from 'pinia';
 import { useI18n } from 'vue-i18n';
 import { invoke } from '@tauri-apps/api/core';
 import { useLogStore } from '../stores/logStore';
 import { useDeviceStore } from '../stores/deviceStore';
+import type { ResetBeforeMode, ResetAfterMode } from '../stores/deviceStore';
 import { useStubConfigStore } from '../stores/stubConfigStore';
 import { WindowManager } from '../services/windowManager';
 import type { ChipModel } from '../config/chips';
@@ -494,6 +572,19 @@ const stubConfigSummary = computed(() => {
   };
 });
 
+// 下载行为面板
+const downloadPanelCollapsed = ref(true);
+
+const downloadBefore = computed<ResetBeforeMode>({
+  get: () => (deviceStore.downloadBehavior?.before ?? 'default_reset') as ResetBeforeMode,
+  set: (v: ResetBeforeMode) => deviceStore.setDownloadBeforeBehavior(v),
+});
+
+const downloadAfter = computed<ResetAfterMode>({
+  get: () => (deviceStore.downloadBehavior?.after ?? 'no_reset') as ResetAfterMode,
+  set: (v: ResetAfterMode) => deviceStore.setDownloadAfterBehavior(v),
+});
+
 const {
   isConnected,
   isConnecting,
@@ -687,6 +778,16 @@ const connectDevice = async () => {
   if (isConnected.value) {
     // 断开连接
     deviceStore.setConnecting(true);
+    if (downloadAfter.value === 'soft_reset') {
+      // 如果选择了下载后软复位，则先发送软复位命令
+      console.log('Sending soft reset command before disconnecting...');
+      try {
+        await invoke<void>('soft_reset');
+      } catch (error) {
+        logStore.addMessage(`${t('errors.softResetFailed')}: ${error}`, true);
+        console.log(t('errors.softResetFailed'), error);
+      }
+    }
     try {
       await invoke<void>('disconnect_device');
       deviceStore.setConnected(false);
@@ -709,6 +810,8 @@ const connectDevice = async () => {
         chipModel: selectedChip.value!.id,
         memoryType: selectedMemoryType.value,
         interfaceType: selectedInterface.value,
+        beforeOperation: downloadBefore.value,
+        afterOperation: downloadAfter.value,
       };
 
       if (selectedInterface.value === 'UART') {
@@ -835,6 +938,47 @@ const openLogWindow = async () => {
   width: 300px;
 }
 
+.fade-collapse-enter-active,
+.fade-collapse-leave-active {
+  transition:
+    opacity 0.2s ease,
+    max-height 0.2s ease;
+}
+
+.fade-collapse-enter-from,
+.fade-collapse-leave-to {
+  opacity: 0;
+  max-height: 0;
+}
+
+.fade-collapse-enter-to,
+.fade-collapse-leave-from {
+  opacity: 1;
+  max-height: 500px;
+}
+
+.option-card {
+  border: 1px solid hsl(var(--b3));
+  background: linear-gradient(135deg, hsl(var(--b1)) 0%, hsl(var(--b2)) 100%);
+  border-radius: 0.5rem;
+  padding: 0.5rem 0.65rem;
+  transition:
+    border-color 0.2s ease,
+    box-shadow 0.2s ease,
+    transform 0.2s ease;
+}
+
+.option-card:hover {
+  border-color: hsl(var(--p));
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.06);
+  transform: translateY(-1px);
+}
+
+.option-card-active {
+  border-color: hsl(var(--p));
+  box-shadow: 0 4px 14px rgba(0, 0, 0, 0.08);
+}
+
 @keyframes pulse {
   0% {
     transform: scale(1);

src/i18n/locales/en.json

@@ -344,6 +344,20 @@
     "pleaseCompleteConfig": "Please complete all necessary device configuration",
     "connectFailedMessage": "Failed to connect device, please check device connection and retry",
     "connectError": "Error occurred while connecting device",
+    "downloadBehavior": {
+      "title": "Behavior Settings",
+      "beforeLabel": "Before Connect",
+      "afterLabel": "Before Disconnect",
+      "before": {
+        "default_reset": "Default Reset Behavior",
+        "no_reset": "No Reboot",
+        "no_reset_no_sync": "No Reboot, No Stub Download"
+      },
+      "after": {
+        "soft_reset": "Soft Reboot",
+        "no_reset": "No Reboot"
+      }
+    },
     "stubConfig": {
       "title": "",
       "apply": "Apply Custom Stub Configuration",

src/i18n/locales/zh.json

@@ -344,6 +344,20 @@
     "pleaseCompleteConfig": "请完成所有必要的设备配置",
     "connectFailedMessage": "连接设备失败，请检查设备连接后重试",
     "connectError": "连接设备时出错",
+    "downloadBehavior": {
+      "title": "行为设定",
+      "beforeLabel": "连接前操作",
+      "afterLabel": "断开前操作",
+      "before": {
+        "default_reset": "默认复位行为",
+        "no_reset": "不重启",
+        "no_reset_no_sync": "不重启且不下载 Stub"
+      },
+      "after": {
+        "soft_reset": "软重启",
+        "no_reset": "不重启"
+      }
+    },
     "stubConfig": {
       "title": "Stub配置",
       "apply": "应用自定义配置",

src/stores/deviceStore.ts

@@ -2,6 +2,9 @@ import { defineStore } from 'pinia';
 import { load } from '@tauri-apps/plugin-store';
 import type { ChipModel } from '../config/chips';
 import { CHIP_MODELS } from '../config/chips';
+// 下载/重启行为类型
+export type ResetBeforeMode = 'default_reset' | 'no_reset' | 'no_reset_no_sync';
+export type ResetAfterMode = 'soft_reset' | 'no_reset';
 
 interface PortInfo {
   name: string;
@@ -60,6 +63,12 @@ export const useDeviceStore = defineStore('device', {
       SF32LB55: ['NOR', 'SD'],
       default: ['NOR'],
     } as Record<string, string[]>,
+
+    // 下载行为设置（保存到设备相关设置）
+    downloadBehavior: {
+      before: 'default_reset' as ResetBeforeMode,
+      after: 'no_reset' as ResetAfterMode,
+    },
   }),
 
   getters: {
@@ -173,6 +182,17 @@ export const useDeviceStore = defineStore('device', {
       this.saveToStorage();
     },
 
+    // 下载行为设置
+    setDownloadBeforeBehavior(value: ResetBeforeMode) {
+      this.downloadBehavior = { ...this.downloadBehavior, before: value };
+      this.saveToStorage();
+    },
+
+    setDownloadAfterBehavior(value: ResetAfterMode) {
+      this.downloadBehavior = { ...this.downloadBehavior, after: value };
+      this.saveToStorage();
+    },
+
     // 下拉框状态管理
     setShowChipDropdown(show: boolean) {
       this.showChipDropdown = show;
@@ -275,6 +295,12 @@ export const useDeviceStore = defineStore('device', {
           this.baudRateInput = baudRateData.value;
         }
 
+        // 加载下载行为设置
+        const downloadBehaviorData = await storeInstance.get('downloadBehavior');
+        if (downloadBehaviorData?.value) {
+          this.downloadBehavior = downloadBehaviorData.value;
+        }
+
         console.log('设备设置已从存储加载');
       } catch (error) {
         console.error('加载设备设置失败:', error);
@@ -314,6 +340,9 @@ export const useDeviceStore = defineStore('device', {
         // 保存波特率
         await storeInstance.set('baudRateInput', { value: this.baudRateInput });
 
+        // 保存下载行为设置
+        await storeInstance.set('downloadBehavior', { value: this.downloadBehavior });
+
         await storeInstance.save();
       } catch (error) {
         console.error('保存设备设置失败:', error);
@@ -338,6 +367,8 @@ export const useDeviceStore = defineStore('device', {
 
       this.baudRateInput = '1000000';
 
+      this.downloadBehavior = { before: 'default_reset', after: 'no_reset' };
+
       this.isConnected = false;
       this.isConnecting = false;
 

src/views/AboutView.vue

@@ -51,7 +51,7 @@
     <div class="w-full text-center mt-auto py-4">
       <div class="flex items-center justify-center">
         <span class="material-icons text-xs text-gray-500 mr-1">copyright</span>
-        <span class="text-sm text-gray-500">2025 SiFli Technologies(Nanjing) Co., Ltd</span>
+        <span class="text-sm text-gray-500">2025-2026 SiFli Technologies(Nanjing) Co., Ltd</span>
       </div>
     </div>
   </div>