From 5abfb2e6ce560993664cabf19e7f193158634489 Mon Sep 17 00:00:00 2001
From: dengqichen <dengqichen@iscmtech.com>
Date: Fri, 27 Dec 2024 13:29:37 +0800
Subject: [PATCH] 1

---
 .../List/components/DeploymentConfigModal.tsx | 88 +++++++++----------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/frontend/src/pages/Deploy/Deployment/List/components/DeploymentConfigModal.tsx b/frontend/src/pages/Deploy/Deployment/List/components/DeploymentConfigModal.tsx
index 5c7ce11f..c3658100 100644
--- a/frontend/src/pages/Deploy/Deployment/List/components/DeploymentConfigModal.tsx
+++ b/frontend/src/pages/Deploy/Deployment/List/components/DeploymentConfigModal.tsx
@@ -217,10 +217,10 @@ const DeploymentConfigModal: React.FC<DeploymentConfigModalProps> = ({
                     {/* 动态构建配置 */}
                     {selectedTemplate?.buildVariablesSchema?.properties && (
                         <>
-                            {/* 富文本编辑器字段 */}
-                            {Object.entries(selectedTemplate.buildVariablesSchema.properties)
-                                .filter(([_, property]) => property.editorConfig)
-                                .map(([key, property]) => {
+                            {/* 按照原始顺序渲染所有字段 */}
+                            {Object.entries(selectedTemplate.buildVariablesSchema.properties).map(([key, property]) => {
+                                // 如果是编辑器字段
+                                if (property.editorConfig) {
                                     const isFullscreen = fullscreenEditor?.key === key;
                                     const editorConfig = property.editorConfig;
                                     
@@ -298,48 +298,48 @@ const DeploymentConfigModal: React.FC<DeploymentConfigModalProps> = ({
                                             {editor}
                                         </Form.Item>
                                     );
-                                })
-                            }
-
-                            {/* 普通字段 */}
-                            <BetaSchemaForm
-                                layoutType="Embed"
-                                columns={convertJsonSchemaToColumns({
-                                    type: 'object',
-                                    properties: Object.fromEntries(
-                                        Object.entries(selectedTemplate.buildVariablesSchema.properties)
-                                            .filter(([_, prop]) => !prop.editorConfig)
-                                            .map(([key, prop]) => [
-                                                key,
-                                                {
-                                                    type: prop.type || 'string',
-                                                    title: prop.title,
-                                                    description: prop.description,
-                                                    default: prop.default,
-                                                    enum: prop.enum,
-                                                    enumNames: prop.enumNames,
-                                                    format: prop.format,
-                                                    minimum: prop.minimum,
-                                                    maximum: prop.maximum,
-                                                    minLength: prop.minLength,
-                                                    maxLength: prop.maxLength,
-                                                    pattern: prop.pattern,
-                                                    items: prop.items && {
-                                                        type: prop.items.type || 'string',
-                                                        enum: prop.items.enum,
-                                                        enumNames: prop.items.enumNames
+                                }
+                                
+                                // 如果是普通字段，使用 BetaSchemaForm
+                                return (
+                                    <BetaSchemaForm
+                                        key={key}
+                                        layoutType="Embed"
+                                        columns={convertJsonSchemaToColumns({
+                                            type: 'object',
+                                            properties: {
+                                                [key]: {
+                                                    type: property.type || 'string',
+                                                    title: property.title,
+                                                    description: property.description,
+                                                    default: property.default,
+                                                    enum: property.enum,
+                                                    enumNames: property.enumNames,
+                                                    format: property.format,
+                                                    minimum: property.minimum,
+                                                    maximum: property.maximum,
+                                                    minLength: property.minLength,
+                                                    maxLength: property.maxLength,
+                                                    pattern: property.pattern,
+                                                    items: property.items && {
+                                                        type: property.items.type || 'string',
+                                                        enum: property.items.enum,
+                                                        enumNames: property.items.enumNames
                                                     }
                                                 }
-                                            ])
-                                    ),
-                                    required: selectedTemplate.buildVariablesSchema.required || []
-                                })}
-                                initialValues={buildVariables}
-                                onValuesChange={(_, values) => setBuildVariables(prev => ({
-                                    ...prev,
-                                    ...values
-                                }))}
-                            />
+                                            },
+                                            required: selectedTemplate.buildVariablesSchema.required?.includes(key) ? [key] : []
+                                        })}
+                                        initialValues={{
+                                            [key]: buildVariables[key]
+                                        }}
+                                        onValuesChange={(_, values) => setBuildVariables(prev => ({
+                                            ...prev,
+                                            ...values
+                                        }))}
+                                    />
+                                );
+                            })}
                         </>
                     )}