@yorha2b-lab/autodev 4.0.1 → 4.1.0

package/example/example.json

@@ -21,37 +21,33 @@
         "columns": [
             {
                 "title": "职业",
-                "dataIndex": "profession",
-                "type": "text"
+                "dataIndex": "profession"
             },
             {
                 "title": "一觉",
-                "dataIndex": "firstAwakening",
-                "type": "text"
+                "dataIndex": "firstAwakening"
             },
             {
                 "title": "一觉立绘",
-                "dataIndex": "firstAwakeningImage",
+                "dataIndex": "firstAwakeningArt",
                 "type": "image"
             },
             {
                 "title": "二觉",
-                "dataIndex": "secondAwakening",
-                "type": "text"
+                "dataIndex": "secondAwakening"
             },
             {
                 "title": "二觉立绘",
-                "dataIndex": "secondAwakeningImage",
+                "dataIndex": "secondAwakeningArt",
                 "type": "image"
             },
             {
                 "title": "三觉",
-                "dataIndex": "thirdAwakening",
-                "type": "text"
+                "dataIndex": "thirdAwakening"
             },
             {
                 "title": "三觉立绘",
-                "dataIndex": "thirdAwakeningImage",
+                "dataIndex": "thirdAwakeningArt",
                 "type": "image"
             },
             {
@@ -61,7 +57,7 @@
             },
             {
                 "title": "职业类型",
-                "dataIndex": "professionType",
+                "dataIndex": "jobType",
                 "type": "tag"
             },
             {
@@ -72,17 +68,17 @@
         ],
         "operation": [
             {
-                "uri": "BUNKER_API_ANCHOR_viewByRecord",
+                "uri": "BUNKER_API_ANCHOR_view",
                 "label": "查看",
                 "action": "viewByRecord"
             },
             {
-                "uri": "BUNKER_API_ANCHOR_editByRecord",
+                "uri": "BUNKER_API_ANCHOR_edit",
                 "label": "编辑",
                 "action": "editByRecord"
             },
             {
-                "uri": "BUNKER_API_ANCHOR_deleteByRecord",
+                "uri": "BUNKER_API_ANCHOR_delete",
                 "label": "删除",
                 "action": "deleteByRecord"
             }
@@ -94,7 +90,7 @@
     "formItems": [
         {
             "label": "转职职业",
-            "name": "transferProfession",
+            "name": "transferJob",
             "type": "select"
         },
         {
@@ -104,13 +100,12 @@
         },
         {
             "label": "职业类型",
-            "name": "professionType",
+            "name": "jobType",
             "type": "select"
         },
         {
             "label": "觉醒名称关键词",
-            "name": "awakeningKeyword",
-            "type": "text"
+            "name": "awakeningKeyword"
         },
         {
             "label": "登场时间",
@@ -141,7 +136,7 @@
             ]
         },
         {
-            "name": "professionTypeOptions",
+            "name": "jobTypeOptions",
             "options": [
                 {
                     "label": "物理",
@@ -154,20 +149,20 @@
             ]
         }
     ],
-    "pageStruct": [
+    "renderTree": [
         "MySearchForm",
-        "FunctionButtonsBlock",
+        "FunctionButtons",
         "MyTable"
     ],
     "functionButton": [
         {
             "btn": "批量删除",
-            "uri": "BUNKER_API_ANCHOR_batchDeleteBySelected",
+            "uri": "BUNKER_API_ANCHOR_batchDelete",
             "action": "batchDeleteBySelected"
         },
         {
             "btn": "批量导出",
-            "uri": "BUNKER_API_ANCHOR_exportData",
+            "uri": "BUNKER_API_ANCHOR_batchExport",
             "action": "exportData"
         }
     ]

package/package.json

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

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 tabKeys = pageConfig.tabs.map(tab => tab.key).sort((a, b) => a.length - b.length)
     const optionDict = pageConfig.optionList?.reduce((acc, item) => ({ ...acc, [item.name]: item.options }), {})
 
     const columnsData = processedColumns.map(item => {
@@ -23,11 +24,14 @@ const resource = ({ pageConfig, resourceTpl }) => {
 
     const viewData = {
         hasTabs,
+        columnsData,
         hasFormItems,
         tabs: pageConfig.tabs,
         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,
+        tabColumns: stringify.default(Object.fromEntries(tabKeys.map(tab => [tab, '_CODE_commonColumns_CODE_'])), { indent: 4, maxLength: 100 }),
+        formItemsData: !hasTabs ?
+            `export const formItems = ${stringify.default(formItems, { indent: 4, maxLength: 120 })}` :
+            `const searchItems = ${stringify.default(formItems, { indent: 4, maxLength: 120 })}\n\nexport const formItems = ${stringify.default(Object.fromEntries(tabKeys.map(tab => [tab, '_CODE_searchItems_CODE_'])), { indent: 4, maxLength: 100 })}`,
     }
 
     const bodyCode = resourceTpl(viewData)
@@ -50,10 +54,12 @@ const index = ({ config, fileName, indexTpl, pageConfig }) => {
     const hasFormItems = pageConfig.formItems?.length > 0
     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 renderTree = pageConfig.renderTree?.filter(item => item.toLowerCase() !== 'tabs') || []
     const functionButtons = pageConfig.functionButton?.filter(item => !['查询', '重置', 'query', 'search', 'reset'].includes(item.btn.toLowerCase().replaceAll(' ', ''))) || []
     const needRenderAction = hasImageColumn
 
+    const pageStruct = ['stateBlock', 'handleBlock', 'hookBlock', hasOperate ? 'operateBlock' : '', 'renderBlock'].filter(Boolean)
+
     let columnsValue = hasTabs ? 'columns[activeKey]' : 'columns'
     if (hasOperate) {
         columnsValue = `${columnsValue}.concat(operate)`
@@ -64,8 +70,8 @@ const index = ({ config, fileName, indexTpl, pageConfig }) => {
 
     const viewData = {
         hasTabs,
+        renderTree,
         pageStruct,
-        hasOperate,
         columnsValue,
         hasFormItems,
         renderAction,

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

@@ -50,12 +50,12 @@ module.exports = `
 - **格式**: [{btn:'显示文本', action:'操作动词BySelected',uri:'BUNKER_API_ANCHOR_动词BySelected'}]。
 - **导出数据**: action 设为 'exportData' 或 'export+模块名'。
 - **逻辑锁定**: ⚠️只要页面中出现了非查询、非重置的独立操作按钮，必须识别并存入 [functionButton] 数组。
-- **构筑联动**: ⚠️若 [functionButton] 数组不为空，则在下文的 [pageStruct] 中必须包含 "FunctionButtonsBlock"。
+- **构筑联动**: ⚠️若 [functionButton] 数组不为空，则在下文的 [RenderTree] 中必须包含 "FunctionButtons"。
 
-## 3. 布局逻辑编排 (PageStruct)
+## 3. 布局逻辑编排 (RenderTree)
 - **定义**: 定义从上至下的物理堆叠顺序。
-- **白名单**: [MyTable, AlertInfo, MySearchForm, FunctionButtonsBlock]
-- **注释**: MyTable 是表格主体，AlertInfo 是统计条，MySearchForm 是搜索表单，FunctionButtonsBlock 是全局功能按钮。
+- **白名单**: [MyTable, AlertInfo, MySearchForm, FunctionButtons]
+- **注释**: MyTable 是表格主体，AlertInfo 是统计条，MySearchForm 是搜索表单，FunctionButtons 是全局功能按钮。
 
 
 ## 4. 字典数组 (OptionList)

package/src/schema/page.json

@@ -10,7 +10,7 @@
             "formItems",
             "staticInfo",
             "optionList",
-            "pageStruct",
+            "renderTree",
             "functionButton"
         ],
         "properties": {
@@ -195,7 +195,7 @@
                     }
                 }
             },
-            "pageStruct": {
+            "renderTree": {
                 "type": "array",
                 "items": {
                     "type": "string",
@@ -203,7 +203,7 @@
                         "MyTable",
                         "AlertInfo",
                         "MySearchForm",
-                        "FunctionButtonsBlock"
+                        "FunctionButtons"
                     ]
                 }
             },

package/templates/react/handlebars/FunctionButtons.hbs

@@ -0,0 +1,11 @@
+{{#if hasTabs}}
+{{#each tabs}}
+{activeKey === '{{this.key}}' && commonButtons}
+{{/each}}
+{{else}}
+<Space style=\{{ marginBottom: 16 }}>
+    {{#each functionButtons}}
+    <Button type='primary' onClick={ {{this.action}} }>{{this.btn}}</Button>
+    {{/each}}
+</Space>
+{{/if}}

package/templates/react/handlebars/operateBlock.hbs

@@ -0,0 +1,22 @@
+
+const operate = {
+    title: '操作',
+    render: (_, record) => (
+        <Space>
+            {{#each operations}}
+            <a onClick={()=> {{this.action}}(record)}>{{this.label}}</a>
+            {{/each}}
+        </Space>
+    )
+}
+
+{{#if hasTabs}}
+const commonButtons = (
+    <Space style=\{{ marginBottom: 16 }}>
+        {{#each functionButtons}}
+        <Button type='primary' onClick={ {{this.action}} }>{{this.btn}}</Button>
+        {{/each}}
+    </Space>
+)
+
+{{/if}}

package/templates/react/handlebars/renderBlock.hbs

@@ -0,0 +1,9 @@
+return (
+    <Card {{#if hasTabs}}tabList={tabs} activeTabKey={activeKey} onTabChange={onTabChange}{{/if}}>
+        {{#if hasImageColumn}}{img.visible && <MyImage img={img} setImg={setImg}/>}{{~/if}}
+        {modal.visible && <MyModalForm {...modal} submit={modalSubmit} setModal={setModal} />}
+        {{#each renderTree as |treeNode|}}
+        {{> (treeNode) @root }}
+        {{/each}}
+    </Card>
+)

package/templates/react/index.hbs

@@ -1,31 +1,5 @@
 export default props => {
-
-    {{> stateBlock }}
-
-    {{> handleBlock }}
-
-    {{> hookBlock }}
-
-    {{#if hasOperate}}
-    {{> tableOperate }}
-    {{/if}}
-
-    {{#if hasTabs}}
-    /**
-      * 多页签时功能按钮会根据页签数动态循环渲染
-      * 因为截图限制，其他页签的功能按钮直接复制第一个页签的功能按钮占位
-      * 如果每个页签的功能按钮都一样,下方循环处需要手动删除;不同则视情况决定是否有必要使用watch:part补充
-      * resource.js中的columns和formItems同理,自行根据情况调整
-    */
-    {{/if}}
-
-    return (
-        <Card {{#if hasTabs}}tabList={tabs} activeTabKey={activeKey} onTabChange={onTabChange}{{/if}}>
-            {{#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}}
-        </Card>
-    )
+    {{#each pageStruct as |partialName|}}
+    {{> (partialName) @root }}
+    {{/each}}
 }

package/templates/react/resource.hbs

@@ -8,9 +8,15 @@ export const {{this.name}} = {{{stringify this.data 50}}}
 {{/each}}
 
 {{#if hasFormItems}}
-export const formItems = {{{stringify formItemsData 150}}}
+{{{formItemsData}}}
 {{/if}}
 
+{{#if hasTabs}}
+const commonColumns = {{{stringify columnsData 200}}}
+
+export const tableColumns = {{{tabColumns}}}
+{{else}}
 export const tableColumns = {{{stringify columnsData 200}}}
+{{/if}}
 
 export const modalItems = []

package/templates/react/handlebars/FunctionButtonsBlock.hbs

@@ -1,16 +0,0 @@
-{{#if hasTabs}}
-{{#each tabs}}
-{activeKey === '{{this.key}}' &&
-    <Space style=\{{ marginBottom: 16 }}>
-        {{#each ../functionButtons}}
-        <Button type='primary' onClick={ {{this.action}} }>{{this.btn}}</Button>
-        {{/each}}
-    </Space>}
-{{/each}}
-{{else}}
-<Space style=\{{ marginBottom: 16 }}>
-    {{#each functionButtons}}
-    <Button type='primary' onClick={ {{this.action}} }>{{this.btn}}</Button>
-    {{/each}}
-</Space>
-{{/if}}

package/templates/react/handlebars/tableOperate.hbs

@@ -1,10 +0,0 @@
-const operate = {
-    title: '操作',
-    render: (_, record) => (
-        <Space>
-            {{#each operations}}
-            <a onClick={()=> {{this.action}}(record)}>{{this.label}}</a>
-            {{/each}}
-        </Space>
-    )
-}