From 45ee0925931a62dea406655f0e40320218fc1d94 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sat, 10 May 2025 21:31:48 +0800
Subject: [PATCH] no message

---
 app/Http/Controllers/Api/AppsController.php |  2 +-
 app/Module/Apps/Apps.php                    | 20 +++++++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Api/AppsController.php b/app/Http/Controllers/Api/AppsController.php
index d0de4a146..8475e3afe 100755
--- a/app/Http/Controllers/Api/AppsController.php
+++ b/app/Http/Controllers/Api/AppsController.php
@@ -209,7 +209,7 @@ class AppsController extends AbstractController
         $logContent = implode("\n", $output);
 
         return Base::retSuccess('success', [
-            'log' => $logContent
+            'log' => trim($logContent)
         ]);
     }
 }
diff --git a/app/Module/Apps/Apps.php b/app/Module/Apps/Apps.php
index d23b7b5ba..67bbf23ef 100644
--- a/app/Module/Apps/Apps.php
+++ b/app/Module/Apps/Apps.php
@@ -58,6 +58,7 @@ class Apps
     public static function appInfo(string $appName): array
     {
         return Base::retSuccess("success", [
+            'name' => $appName,
             'info' => self::getAppInfo($appName),
             'local' => self::getAppLocalInfo($appName),
             'versions' => self::getAvailableVersions($appName),
@@ -298,13 +299,26 @@ class Apps
                         'name' => $field['name'],
                         'type' => $field['type'] ?? 'text',
                         'default' => $field['default'] ?? '',
-                        'label' => self::getMultiLanguageField($field['label']),
-                        'placeholder' => self::getMultiLanguageField($field['placeholder']),
+                        'label' => self::getMultiLanguageField($field['label'] ?? ''),
+                        'placeholder' => self::getMultiLanguageField($field['placeholder'] ?? ''),
+                        'required' => $field['required'] ?? false,
                     ];
 
+                    // 处理 select 类型的选项
+                    if ($normalizedField['type'] === 'select' && isset($field['options']) && is_array($field['options'])) {
+                        $selectOptions = [];
+                        foreach ($field['options'] as $option) {
+                            $selectOptions[] = [
+                                'label' => self::getMultiLanguageField($option['label'] ?? ''),
+                                'value' => $option['value'] ?? '',
+                            ];
+                        }
+                        $normalizedField['options'] = $selectOptions;
+                    }
+
                     // 处理其他属性
                     foreach ($field as $key => $value) {
-                        if (!in_array($key, ['name', 'type', 'default', 'label', 'placeholder'])) {
+                        if (!in_array($key, ['name', 'type', 'default', 'label', 'placeholder', 'required', 'options'])) {
                             $normalizedField[$key] = $value;
                         }
                     }