@yorha2b-lab/autodev 3.4.4 → 3.5.0

package/config.js

@@ -11,7 +11,7 @@ module.exports = {
     enableAutoAlignment: false,
 
     textModel: 'qwen-turbo',
-    visionModel: 'qwen3.6-plus',
+    visionModel: 'qwen3.7-plus',
 
     hooksDir: 'src/hooks',
     pagesDir: 'src/pages',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yorha2b-lab/autodev",
-  "version": "3.4.4",
+  "version": "3.5.0",
   "description": "基于视觉大模型的前端(react+Antd)全自动 CRUD 代码生成器",
   "bin": {
     "autodev": "bin/autodev.js"

package/src/commands/handlers/part-handler.js

@@ -25,7 +25,7 @@ module.exports = async filePath => {
             `🤖 Pod 042: Extracting UI metadata from neural cloud network...\n`
         ))
 
-        const pageConfig = await recognizePage(partPrompt, filePath)
+        const pageConfig = await recognizePage(partPrompt, filePath, 'part')
 
         const { formItems, dictBlocks, processedColumns } = formatFormItemAndColumns({ pageConfig })
 

package/src/core/react-compiler.js

@@ -14,6 +14,7 @@ const resource = ({ pageConfig, resourceTpl }) => {
 
     const hasTabs = pageConfig.tabs?.length > 0
     const hasFormItems = pageConfig.formItems?.length > 0
+    const optionDict = pageConfig.optionList?.reduce((acc, item) => ({ ...acc, [item.name]: item.options }), {})
 
     const columnsData = processedColumns.map(item => {
         delete item.type
@@ -24,7 +25,7 @@ const resource = ({ pageConfig, resourceTpl }) => {
         hasTabs,
         hasFormItems,
         tabs: pageConfig.tabs,
-        dictBlocks: dictBlocks.map(item => ({ name: item, data: pageConfig.optionDict[item] ?? [] })),
+        dictBlocks: dictBlocks.map(item => ({ name: item, data: optionDict[item] ?? [] })),
         formItemsData: hasTabs ? Object.fromEntries(pageConfig.tabs.map(tab => [tab.key, formItems])) : formItems,
         columnsData: hasTabs ? Object.fromEntries(pageConfig.tabs.map(tab => [tab.key, columnsData])) : columnsData,
     }
@@ -49,8 +50,7 @@ const index = ({ config, fileName, indexTpl, pageConfig }) => {
     const hasOperate = pageConfig.table?.operation?.length > 0
     const hasImageColumn = pageConfig.table?.columns?.some(item => item.type === 'image')
     const pageStruct = pageConfig.pageStruct?.filter(item => item.toLowerCase() !== 'tabs') || []
-    const functionButtons = pageConfig.functionButton?.filter(item => !['查询', '重置'].includes(item.btn)) || []
-    const hasFunctionButtons = functionButtons.length > 0
+    const functionButtons = pageConfig.functionButton?.filter(item => !['查询', '重置', 'query', 'search', 'reset'].includes(item.btn.toLowerCase().replaceAll(' ', ''))) || []
     const needRenderAction = hasImageColumn
 
     let columnsValue = hasTabs ? 'columns[activeKey]' : 'columns'
@@ -64,6 +64,7 @@ const index = ({ config, fileName, indexTpl, pageConfig }) => {
     const viewData = {
         hasTabs,
         fileName,
+        pageStruct,
         hasOperate,
         columnsValue,
         hasFormItems,
@@ -79,7 +80,6 @@ const index = ({ config, fileName, indexTpl, pageConfig }) => {
         operations: pageConfig.table.operation || [],
         hasRowSelection: pageConfig.table.rowSelection,
         formItems: hasFormItems ? (hasTabs ? 'formItems[activeKey]' : 'formItems') : '[]',
-        pageStruct: hasFunctionButtons ? pageStruct : pageStruct.filter(item => item !== 'FunctionButtonsBlock'),
     }
 
     const bodyCode = indexTpl(viewData)

package/src/prompts/react/watch-page.js

@@ -10,6 +10,7 @@ module.exports = `
 ## 2. 零部件构筑规范 (Component Specifications)
 
 ### 标签页 (Tabs)
+- **基础格式**: [{ label: '文本', key: 'englishName' }]
 - **识别条件**: 仅当下部有显著长横线 (Ink Bar) 或呈现包裹感 (Card style) 时判定。
 - **排除项**: 表格上方的独立按钮必须归类为 [functionButton]。
 
@@ -20,44 +21,46 @@ module.exports = `
     - 非默认组件: 仅当类型为 [auto, date, radio, select, upload, checkbox, textarea, daterange] 时才允许添加 type 属性。
 **标准定义 (FormItem)**:
     - date: 单日期
-    - daterange: 日期范围
     - enum: 枚举类型
+    - daterange: 日期范围
     - text: 普通文本（默认）
 - 命名规范:
-    - daterange: name 必须设为 '字段英文名start,字段英文名end'。
+    - daterange: name 必须设为 '字段英文名Start,字段英文名End'
+    - **⚠️注意⚠️**：不要用_分隔字段名。
 
 ### 统计条 (StaticInfo)
 - **独立存在**: 位于表格外周的汇总信息。输出格式: { has: true, text: '具体内容' }。
 
 ### 表格主体 (Table)
+- ⚠️ **操作锁定**: 严禁在 columns 数组中包含“操作”列。
 - **标准项**: {title:'列名', dataIndex:'列名英文名词',type:''}。
 - **配置项**: [pagination, expandable, rowSelection] 均为布尔值false,只有页面明确有对应功能时才为true。
 - **标准定义 (Columns)**:
-    - ⚠️ **操作锁定**: 严禁在 columns 数组中包含“操作”列。
     - enum: 枚举列
     - money: 金额列
     - index: 序号列
     - image: 图片列
     - date: 时间/日期列
     - text: 普通文本（默认）
-    - tag: 标签列(有背景色的标签)
+    - tag: 标签列(有背景色的文本)
     - badge: 徽标列(文本前有颜色小圆点)
-    - **行操作 (Operation)**: [{label:'操作名', action:'动词ByRecord'}]。
+    - **行操作 (operation)**: [{label:'操作名', action:'动词ByRecord'}]。
 
 ### 全局功能按钮 (FunctionButton)
-- **格式**: [{btn:'显示文本', action:'动作名'}]。
-- **联动命名**: 若与行操作重复，action 必须加上 'BySelected' 前缀。
-- **导出协议**: action 设为 'exportData' 或 'export+模块名'。
+- **格式**: [{btn:'显示文本', action:'操作动词BySelected'}]。
+- **导出数据**: action 设为 'exportData' 或 'export+模块名'。
+- **逻辑锁定**: ⚠️只要页面中出现了非查询、非重置的独立操作按钮，必须识别并存入 [functionButton] 数组。
+- **构筑联动**: ⚠️若 [functionButton] 数组不为空，则在下文的 [pageStruct] 中必须包含 "FunctionButtonsBlock"。
+
+## 3. 布局逻辑编排 (PageStruct)
+- **定义**: 定义从上至下的物理堆叠顺序。
+- **白名单**: [MyTable, AlertInfo, MySearchForm, FunctionButtonsBlock]
+- **注释**: MyTable 是表格主体，AlertInfo 是统计条，MySearchForm 是搜索表单，FunctionButtonsBlock 是全局功能按钮。
 
-## 3. 布局逻辑编排 (Page Structure)
-- **字段**: [pageStruct] 定义从上至下的物理堆叠顺序。
-- **白名单**: 只能从 [AlertInfo, MySearchForm, FunctionButtonsBlock, MyTable] 中选择。
-- **⚠️ 约束**: 严禁在 pageStruct 中包含 其他未定义组件；并且只有真实存在的组件才能被包含。
 
-## 4. 输出约束 (Output Format)
-- **格式**: 纯 JSON 对象，严禁 Markdown 标签包围。
-- **字典映射 (OptionDict)**: 必须包含所有 select 类型所需的 Options 数组，键名格式为 字段英文名+Options ，元素格式为 {label:'', value:''}。
+## 4. 字典数组 (OptionList)
+- **格式**:[{name:'字段英文名+Options',options:[{label:'', value:''}]}]。
+- **注释**:label:选项文本,value:文本英文。
+- **数据源**:根据对应列的内容去重，生成选项数组。
 
-**JSON 骨架要求**:
-{ "tabs": [], "table": {}, "formItems": [], "staticInfo": {}, "optionDict": {}, "functionButton": [], "pageStruct": [] }
 `.trim();

package/src/prompts/react/watch-part.js

@@ -21,25 +21,26 @@ module.exports = `
     - image: 图片列
     - date: 时间/日期列
     - text: 普通文本（默认）
-    - tag: 标签列(有背景色的标签)
+    - tag: 标签列(有背景色的文本)
     - badge: 徽标列(文本前有颜色小圆点)
     - **行操作 (Operation)**: [{label:'操作名', action:'动词ByRecord'}]
 
 ## 2. 表单 (Form)
 - **基础格式**: [{ label: '文本', name: 'englishName',type:''}]
 - **高级格式**: [{ title: '文本', layoutType:'',childItems:[{ label: '文本', name: 'englishName',type:'' }] }]
+- ***⚠️⚠️⚠️注意⚠️⚠️⚠️***：当存在明显的粗体标题或者有明显的分组式结构时，必须使用高级格式。
 - 禁止输出:
     - ***⚠️⚠️⚠️严禁输出columns,只允许输出formItems⚠️⚠️⚠️***
 - ⚠️ 属性精简规则:
     - 默认输入框: 仅保留 [label, name] 属性。**严禁出现 type 属性**。
     - 非默认组件: 仅当类型为 [auto, date, radio, select, upload, checkbox, textarea, daterange] 时才允许添加 type 属性。
-- ⚠️ layoutType:
+- ***⚠️⚠️⚠️layoutType⚠️⚠️⚠️***:
     - section: 段落布局(分段title+childItems项，无明显背景色，纯文本title)
     - collapse: 折叠布局(折叠展开title+childItems项，有明显背景色，或文本前有展开箭头)
 **标准定义 (FormItem)**:
     - date: 单日期
-    - daterange: 日期范围
     - enum: 枚举类型
+    - daterange: 日期范围
     - text: 普通文本（默认）
 - 命名规范:
     - daterange: name 必须设为 '字段英文名start,字段英文名end'。

package/src/schema/page.json

@@ -0,0 +1,228 @@
+{
+    "strict": true,
+    "name": "page_construction_protocol",
+    "schema": {
+        "type": "object",
+        "additionalProperties": false,
+        "required": [
+            "tabs",
+            "table",
+            "formItems",
+            "staticInfo",
+            "optionList",
+            "pageStruct",
+            "functionButton"
+        ],
+        "properties": {
+            "tabs": {
+                "type": "array",
+                "items": {
+                    "type": "object",
+                    "required": [
+                        "label",
+                        "key"
+                    ],
+                    "additionalProperties": false,
+                    "properties": {
+                        "label": {
+                            "type": "string"
+                        },
+                        "key": {
+                            "type": "string"
+                        }
+                    }
+                }
+            },
+            "table": {
+                "type": "object",
+                "additionalProperties": false,
+                "required": [
+                    "columns",
+                    "operation",
+                    "pagination",
+                    "expandable",
+                    "rowSelection"
+                ],
+                "properties": {
+                    "columns": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "additionalProperties": false,
+                            "required": [
+                                "title",
+                                "dataIndex",
+                                "type"
+                            ],
+                            "properties": {
+                                "title": {
+                                    "type": "string"
+                                },
+                                "dataIndex": {
+                                    "type": "string"
+                                },
+                                "type": {
+                                    "type": "string",
+                                    "enum": [
+                                        "tag",
+                                        "text",
+                                        "date",
+                                        "enum",
+                                        "badge",
+                                        "money",
+                                        "index",
+                                        "image"
+                                    ]
+                                }
+                            }
+                        }
+                    },
+                    "operation": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "required": [
+                                "label",
+                                "action"
+                            ],
+                            "additionalProperties": false,
+                            "properties": {
+                                "label": {
+                                    "type": "string"
+                                },
+                                "action": {
+                                    "type": "string"
+                                }
+                            }
+                        }
+                    },
+                    "pagination": {
+                        "type": "boolean"
+                    },
+                    "expandable": {
+                        "type": "boolean"
+                    },
+                    "rowSelection": {
+                        "type": "boolean"
+                    }
+                }
+            },
+            "formItems": {
+                "type": "array",
+                "items": {
+                    "type": "object",
+                    "required": [
+                        "label",
+                        "name",
+                        "type"
+                    ],
+                    "additionalProperties": false,
+                    "properties": {
+                        "label": {
+                            "type": "string"
+                        },
+                        "name": {
+                            "type": "string"
+                        },
+                        "type": {
+                            "type": "string",
+                            "enum": [
+                                "text",
+                                "auto",
+                                "date",
+                                "radio",
+                                "select",
+                                "upload",
+                                "checkbox",
+                                "textarea",
+                                "daterange"
+                            ]
+                        }
+                    }
+                }
+            },
+            "staticInfo": {
+                "type": "object",
+                "additionalProperties": false,
+                "required": [
+                    "has",
+                    "text"
+                ],
+                "properties": {
+                    "has": {
+                        "type": "boolean"
+                    },
+                    "text": {
+                        "type": "string"
+                    }
+                }
+            },
+            "optionList": {
+                "type": "array",
+                "items": {
+                    "type": "object",
+                    "required": [
+                        "name",
+                        "options"
+                    ],
+                    "additionalProperties": false,
+                    "properties": {
+                        "name": {
+                            "type": "string"
+                        },
+                        "options": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "required": [
+                                    "label",
+                                    "value"
+                                ],
+                                "additionalProperties": false,
+                                "properties": {
+                                    "label": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "pageStruct": {
+                "type": "array",
+                "items": {
+                    "type": "string",
+                    "enum": [
+                        "MyTable",
+                        "AlertInfo",
+                        "MySearchForm",
+                        "FunctionButtonsBlock"
+                    ]
+                }
+            },
+            "functionButton": {
+                "type": "array",
+                "items": {
+                    "type": "object",
+                    "required": [
+                        "btn",
+                        "action"
+                    ],
+                    "additionalProperties": false,
+                    "properties": {
+                        "btn": {
+                            "type": "string"
+                        },
+                        "action": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

package/src/services/llm.js

@@ -18,7 +18,7 @@ const getOpenAI = () => {
     return client
 }
 
-const askAI = async (model, messages, retryCount = 0) => {
+const askAI = async ({ model, messages, response_format = { type: 'json_object' }, retryCount = 0 }) => {
 
     if (retryCount > 3) {
         throw new Error(language(
@@ -33,8 +33,8 @@ const askAI = async (model, messages, retryCount = 0) => {
             model,
             messages,
             top_p: 0.1,
+            response_format,
             temperature: 0.01,
-            response_format: { type: 'json_object' }
         })
         let raw = response.choices[0].message.content.trim()
         raw = raw.replace(/^```json\n?/, '').replace(/\n?```$/, '')
@@ -65,15 +65,15 @@ module.exports = {
         const config = getConfig()
         const mockPrompt = require('../prompts/mock.js')
         const { MOCK_DESIGNER } = require('../prompts/system.js')
-        return askAI(
-            config.textModel,
-            [
+        return askAI({
+            model: config.textModel,
+            messages: [
                 { role: 'system', content: MOCK_DESIGNER },
                 { role: 'user', content: mockPrompt(columns, fileName) }
             ]
-        )
+        })
     },
-    recognizePage: async (prompt, filePath) => {
+    recognizePage: async (prompt, filePath, taskType = 'page') => {
         const config = getConfig()
         const { UI_DESIGNER } = require('../prompts/system.js')
         const sharp = require('sharp')
@@ -83,9 +83,9 @@ module.exports = {
             .toBuffer()
         const base64Image = compressedBuffer.toString('base64')
 
-        return askAI(
-            config.visionModel,
-            [
+        return askAI({
+            model: config.visionModel,
+            messages: [
                 { role: 'system', content: UI_DESIGNER },
                 {
                     role: 'user',
@@ -94,19 +94,20 @@ module.exports = {
                         { type: 'image_url', image_url: { url: `data:image/jpeg;base64,${base64Image}` } }
                     ]
                 }
-            ]
-        )
+            ],
+            response_format: taskType === 'page' ? { type: 'json_schema', strict: true, json_schema: require('../schema/page.json') } : { type: 'json_object' }
+        })
     },
     alignResponseFields: async (options, responseStr, resourceStr) => {
         const config = getConfig()
         const { API_DESIGNER } = require('../prompts/system.js')
         const apiPrompt = require(`../prompts/${options.template}/watch-api.js`)
-        return askAI(
-            config.textModel,
-            [
+        return askAI({
+            model: config.textModel,
+            messages: [
                 { role: 'system', content: API_DESIGNER },
                 { role: 'user', content: apiPrompt(responseStr, resourceStr) }
             ]
-        )
+        })
     }
 }

package/src/utils/utils.js

@@ -167,7 +167,7 @@ const matrixEffect = async (duration = 1500) => {
         '5f 43 4f 44 45 5f' // _CODE_
     ]
 
-    const threshold = 3000
+    const threshold = 5000
     const endTime = Date.now() + duration
     const width = process.stdout.columns || 80
     const isLegendary = currentTotal >= threshold
@@ -255,10 +255,17 @@ const formatFormItemAndColumns = ({ pageConfig }) => {
     const formDicts = pageConfig.formItems?.filter(item => item.type === 'select')?.map(item => `${item.name}Options`) ?? []
     const dictBlocks = Array.from(new Set([...formDicts, ...tableDicts]))
 
-    const formItems = pageConfig.formItems?.map(item => ({
-        ...item,
-        ...(item.type === 'select' ? { options: `_CODE_${item.name}Options_CODE_` } : {})
-    }))
+    const formItems = pageConfig.formItems?.map(item => {
+
+        if (item.type === 'text') {
+            delete item.type
+        }
+
+        return {
+            ...item,
+            ...(item.type === 'select' ? { options: `_CODE_${item.name}Options_CODE_` } : {})
+        }
+    })
 
     const processedColumns = columns?.map(col => {
         if (['image'].includes(col.type)) {

package/templates/react/components/MyImage.js

@@ -4,7 +4,7 @@ export const MyImage = ({ img, setImg }) => {
     return (
         <div style={{ display: 'none' }}>
             <Image.PreviewGroup preview={{ visible: img.visible, onVisibleChange: vis => setImg({ ...img, visible: vis }) }}>
-                {img.list.map((img, index) => (<Image key={index} src={img} />))}
+                {img.list.map((src, index) => (<Image key={index} src={src} />))}
             </Image.PreviewGroup>
         </div>
     )

package/templates/react/components/index.js

@@ -27,7 +27,7 @@ import { Button, Tree, Radio, Input, Upload, Select, Cascader, Checkbox, DatePic
 const AliyunOSSUpload = ({ value, onChange, ...restProps }) => {
 
     // 💡 物理剥离：将地堡专用参数与 Antd 原生属性分离
-    const { oss, url, path, options, ...originUploadProps } = restProps
+    const { oss, url, path, options, expireField = 'expire', ...originUploadProps } = restProps
 
     const [OSSData, setOSSData] = useState(oss)
 
@@ -81,7 +81,7 @@ const AliyunOSSUpload = ({ value, onChange, ...restProps }) => {
      */
     const beforeUpload = async file => {
         let currentOSS = OSSData
-        const expire = Number(OSSData?.expire ?? 0) * 1000
+        const expire = Number(OSSData?.[expireField] ?? 0) * 1000
         if (expire < Date.now()) {
             currentOSS = await init()
         }

package/templates/react/index.hbs

@@ -21,8 +21,8 @@ export default props => {
 
     return (
         <Card {{#if hasTabs}}tabList={tabs} activeTabKey={activeKey} onTabChange={onTabChange}{{/if}}>
-            {modal.visible && <MyModalForm {...modal} submit={modalSubmit} setModal={setModal} />}
             {{#if hasImageColumn}}{img.visible && <MyImage img={img} setImg={setImg}/>}{{/if}}
+            {modal.visible && <MyModalForm {...modal} submit={modalSubmit} setModal={setModal} />}
             {{#each pageStruct as |partialName|}}
             {{> (partialName) @root }}
             {{/each}}