Merge pull request #61 from Ember-Moth/main

fix: 服务器编辑时合并协议默认配置

CHANGELOG.md

@@ -1,3 +1,18 @@
+<a name="readme-top"></a>
+# Changelog
+
+# [1.6.0](https://github.com/perfect-panel/ppanel-web/compare/v1.5.4...v1.6.0) (2025-10-28)
+
+
+### ✨ Features
+
+* Add server installation dialog and commands ([4429c9d](https://github.com/perfect-panel/ppanel-web/commit/4429c9d))
+
+
+### 🐛 Bug Fixes
+
+* Add typeRoots configuration to ensure type definitions are resolved correctly ([ad60ea9](https://github.com/perfect-panel/ppanel-web/commit/ad60ea9))
+
 <a name="readme-top"></a>
 
 # Changelog

apps/admin/app/dashboard/servers/server-form.tsx

@@ -356,7 +356,8 @@ export default function ServerForm(props: {
         ...initialValues,
         protocols: PROTOCOLS.map((type) => {
           const existingProtocol = initialValues.protocols?.find((p) => p.type === type);
-          return existingProtocol || getProtocolDefaultConfig(type);
+          const defaultConfig = getProtocolDefaultConfig(type);
+          return existingProtocol ? { ...defaultConfig, ...existingProtocol } : defaultConfig;
         }),
       });
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ppanel-web",
-  "version": "1.5.4",
+  "version": "1.6.0",
   "private": true,
   "homepage": "https://github.com/perfect-panel/ppanel-web",
   "bugs": {