@yorha2b-lab/autodev 3.4.0 → 3.4.2

package/bin/autodev.js

@@ -52,8 +52,11 @@ program
     .alias('start')
     .description(language('开启全频道联动监控：支持 Page/Part/API 协同构筑', 'Start full-channel linked monitoring: Coordinated Page/Part/API construction'))
     .action(() => {
+        const result = bunker.init(program.opts())
+        if (!result) {
+            return
+        }
         bootSequence(pkg.version)
-        bunker.init(program.opts())
         require('../src/commands/watch.js')()
         const { config } = bunker.get()
         if (config.proxyTarget && !config.needMock && config.enableAutoAlignment) {

package/package.json

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

package/src/commands/watch.js

@@ -10,13 +10,7 @@ const watch = () => {
     const { copyTemplateDir } = require('../utils/utils.js')
     const { createTaskQueue } = require('../core/task-queue.js')
 
-    const { menus, config, options, template, language, apiHandler, pageHandler, partHandler } = get()
-
-    const compilerPath = path.join(__dirname, `../core/${template}-compiler.js`)
-    if (!fs.existsSync(compilerPath)) {
-        console.error(chalk.red(language(`❌ 暂不支持 [${template}] 框架。`, `❌ [${template}] framework not supported.`)))
-        return
-    }
+    const { menus, config, options, language, apiHandler, pageHandler, partHandler } = get()
 
     try {
         if (config.hbsDir === '') {
@@ -46,6 +40,7 @@ const watch = () => {
 
     const watcher = chokidar.watch(['./screenShot', './screenPart', './response'], {
         persistent: true,
+        ignoreInitial: true,
         ignored: /(^|[\/\\])\../,
         awaitWriteFinish: { stabilityThreshold: 500, pollInterval: 100 }
     })

package/src/core/context.js

@@ -1,5 +1,6 @@
 const fs = require('fs')
 const path = require('path')
+const chalk = require('chalk')
 const Handlebars = require('handlebars')
 const stringify = require('json-stringify-pretty-compact')
 
@@ -26,10 +27,16 @@ module.exports = {
         const tplDir = config.hbsDir !== '' ? path.join(process.cwd(), config.hbsDir) : path.join(__dirname, `../../templates/${template}`)
 
         const compilerPath = path.join(__dirname, `./${template}-compiler.js`)
+        if (!fs.existsSync(compilerPath)) {
+            console.error(chalk.red(language(`❌ 暂不支持 [${template}] 框架。欢迎提交 Pull Request 贡献。`, `❌ [${template}] framework not supported. Welcome to contribute a Pull Request to help.`)))
+            return
+        }
         const { index, resource } = require(compilerPath)
 
         // 💡 物理扫描：把目录下所有的 .hbs 文件全部识别并自动注册
-        const partialsDir = path.join(__dirname, `../../templates/${template}/handlebars`)
+        const partialsDir = config.hbsDir !== ''
+            ? path.join(process.cwd(), config.hbsDir, 'handlebars')
+            : path.join(__dirname, `../../templates/${template}/handlebars`)
         fs.readdirSync(partialsDir).forEach(file => {
             if (file.endsWith('.hbs')) {
                 const name = path.basename(file, '.hbs') // 去掉后缀拿名字
@@ -54,10 +61,5 @@ module.exports = {
     /**
      * @description 全频道信号接入：获取全局上下文
      */
-    get: () => {
-        if (!instance) {
-            throw new Error(language('🤖 Pod 042 报警：中枢神经元尚未初始化，无法建立信号连接。', '🤖 Pod 042 Warnning：Central neuron not initialized, cannot establish signal connection.'))
-        }
-        return instance
-    }
+    get: () => instance
 }

package/src/core/react-compiler.js

@@ -14,7 +14,6 @@ const resource = ({ pageConfig, resourceTpl }) => {
 
     const hasTabs = pageConfig.tabs?.length > 0
     const hasFormItems = pageConfig.formItems?.length > 0
-    const hasDateColumn = processedColumns.some(item => item.type === 'date')
 
     const columnsData = processedColumns.map(item => {
         delete item.type
@@ -31,7 +30,7 @@ const resource = ({ pageConfig, resourceTpl }) => {
     }
 
     const bodyCode = resourceTpl(viewData)
-    const importsStr = generateSmartImports({ module: 'resource', hasTabs, bodyCode, hasFormItems, hasDateColumn })
+    const importsStr = generateSmartImports({ module: 'resource', hasTabs, bodyCode, hasFormItems })
     return cleanCode(`${importsStr}\n\n${bodyCode}`)
 }
 

package/src/utils/utils.js

@@ -305,7 +305,7 @@ const copyTemplateDir = (options, templateSubDir, targetSubDir) => {
  * @param {boolean} hasTabs - 是否包含标签页
  * @returns {string} 拼接后的 import 语句
  */
-const generateSmartImports = ({ module, hasTabs, bodyCode, hasFormItems, hasDateColumn }) => {
+const generateSmartImports = ({ module, hasTabs, bodyCode, hasFormItems }) => {
 
     const hooksLib = ['useTableQuery']
     const utilsLib = ['timeRender', 'moneyRender']

package/templates/react/components/MyModalForm.js

@@ -130,8 +130,9 @@ export const MyModalForm = ({ width, title, submit, record, visible, setModal, l
     const [selectedTableRows, setSelectedTableRows] = useState([])
 
     const flattenFormItems = items => {
+        if (!Array.isArray(items)) return []
         return items.flatMap(item => {
-            if (item.layoutType && item.childItems) {
+            if (item.childItems) {
                 return flattenFormItems(item.childItems)
             }
             return item
@@ -181,7 +182,7 @@ export const MyModalForm = ({ width, title, submit, record, visible, setModal, l
         try {
             const values = await form.validateFields()
             const formattedValues = { ...values }
-            formItems.forEach(item => {
+            flattenFormItems(formItems).forEach(item => {
                 const val = formattedValues[item.name]
                 if (item.type?.includes('date') && val) {
                     if (Array.isArray(val)) {
@@ -218,7 +219,7 @@ export const MyModalForm = ({ width, title, submit, record, visible, setModal, l
     const tableRowSelection = useMemo(() => ({
         selectedRowKeys: selectedTableRows.map(row => row[rowKey]),
         onChange: (selectedRowKeys, selectedRows) => setSelectedTableRows(selectedRows),
-    }), [rowKey, modalTable, selectedTableRows])
+    }), [rowKey, selectedTableRows])
 
     return (
         <Modal centered title={title} width={width} open={visible} onOk={handleOk} destroyOnClose onCancel={handleCancel} confirmLoading={pending}>

package/templates/react/components/MyModalTable.js

@@ -1,7 +1,7 @@
 import { MyTable } from './MyTable'
 import { useMemo, useState } from 'react'
-import { Modal, Space, Button } from 'antd'
 import { MySearchForm } from './MySearchForm'
+import { Form, Modal, Space, Button } from 'antd'
 import { useTableQuery } from '../hooks/useTableQuery'
 
 /**
@@ -38,6 +38,7 @@ import { useTableQuery } from '../hooks/useTableQuery'
  */
 export const MyModalTable = ({ api, onOk, title, width, footer, visible, operate, setModal, formItems, setModalForm, rowSelection, formatResponse, functionButtons, columns: modalColumns, rowKey = 'id', initialParams = {}, modalPagination = true }) => {
 
+    const [form] = Form.useForm()
     const [pending, setPending] = useState(false)
 
     /**
@@ -82,7 +83,7 @@ export const MyModalTable = ({ api, onOk, title, width, footer, visible, operate
                 💡 [地堡战术细节]
                 syncUrlParams={false}：确保弹窗内的搜索行为不会干扰全局 URL 信号。
             */}
-            {formItems?.length > 0 && <MySearchForm search={search} formItems={formItems} setSearch={handleSearch} syncUrlParams={false} />}
+            {formItems?.length > 0 && <MySearchForm form={form} search={search} formItems={formItems} setSearch={handleSearch} syncUrlParams={false} />}
             {/*
                 💡 [高阶赋能逻辑]
                 functionButtons 能够获得对当前表格状态 (refresh, setLoading...) 的完全控制权。

package/templates/react/components/MySearchForm.js

@@ -22,6 +22,7 @@ import { Row, Col, Form, Button, Space } from 'antd'
  * @param {React.ReactNode} [props.extraOperate] - 额外挂件：在按钮区域注入自定义战术单元
  * @param {boolean} props.loading - 战场负载状态：请求中时锁定按钮，防止由于重复指令导致的逻辑冲突
  * @param {boolean} [props.syncUrlParams=true] - 物理同步开关：是否将搜索状态实时镜像至 URL 链接中
+ * @param {Object} props.initialParams - [重要] 战术底价：定义不可被重置协议核平的核心业务参数（如 projectId）
  *
  * @example
  * <MySearchForm
@@ -31,7 +32,7 @@ import { Row, Col, Form, Button, Space } from 'antd'
  *   formItems={[{ label: '状态', name: 'status', type: 'select', options: [...] }]}
  * />
  */
-export const MySearchForm = ({ form, search, loading, labelCol, setSearch, formItems, showLimit = 7, initialValues, customReset, extraOperate, customFinish, onValuesChange, syncUrlParams = true, defaultPageSize = 10 }) => {
+export const MySearchForm = ({ form, search, loading, labelCol, setSearch, formItems, showLimit = 7, initialParams, initialValues, customReset, extraOperate, customFinish, onValuesChange, syncUrlParams = true, defaultPageSize = 10 }) => {
 
     const [limit, setLimit] = useState(showLimit)
 
@@ -40,15 +41,21 @@ export const MySearchForm = ({ form, search, loading, labelCol, setSearch, formI
      * @description 执行“归零协议”：清除当前所有搜索信号，并可选择性擦除 URL 中的物理记录。
      */
     const handleReset = () => {
+        form.resetFields()
         if (syncUrlParams) {
-            // 物理清除：重置浏览器历史记录，保持 URL 纯净
-            window.history.replaceState(null, '', window.location.pathname)
+            // 💡 修正逻辑：只有当 formItems 里【没有任何一项】包含这个 key 时，才视为默认参数
+            const defaultQueryEntries = Object.entries(initialValues).filter(([key, _]) => !formItems.some(item => item.name.includes(key)))
+            const defaultQuery = Object.fromEntries(defaultQueryEntries)
+            const params = new URLSearchParams(defaultQuery)
+            // 💡 执行物理重写：将 URL 恢复为仅含默认参数的状态
+            const newUrl = params.toString() ? `${window.location.pathname}?${params.toString()}` : window.location.pathname
+            window.history.replaceState(null, '', newUrl)
         }
         if (customReset) {
             customReset()
         } else {
             // 逻辑重置：强制返回第一页，并恢复默认吞吐量
-            setSearch({ pageNo: 1, pageSize: search.pageSize ?? defaultPageSize })
+            setSearch({ pageNo: 1, pageSize: search.pageSize ?? defaultPageSize, ...initialParams })
         }
     }
 
@@ -59,26 +66,27 @@ export const MySearchForm = ({ form, search, loading, labelCol, setSearch, formI
      */
     const handleFinish = values => {
         const formattedValues = { ...values }
-        if (syncUrlParams) {
-            Object.keys(formattedValues).forEach(key => {
-                const val = formattedValues[key]
-                const isDateType = formItems.find(item => item.name === key)?.type?.includes('date')
-                // 💡 [黑科技 1] 日期自动转换与拆解
-                if (isDateType && val) {
-                    if (Array.isArray(val) && val.length > 0) {
-                        // 物理拆分：当 name 为 'start,end' 格式时，自动拆解为两个独立的后端参数
-                        const [startKey, endKey] = key.split(',')
-                        formattedValues[startKey] = val[0].startOf('day').valueOf()// 修正为当日 00:00:00
-                        formattedValues[endKey] = val[1].endOf('day').valueOf()// 修正为当日 23:59:59
-                        delete formattedValues[key]
-                    } else {
-                        // 单日转换：转化为毫秒级数字
-                        formattedValues[key] = val.valueOf()
-                    }
+        Object.keys(formattedValues).forEach(key => {
+            const val = formattedValues[key]
+            const isDateType = formItems.find(item => item.name === key)?.type?.includes('date')
+            // 💡 [黑科技 1] 日期自动转换与拆解
+            if (isDateType && val) {
+                if (Array.isArray(val) && val.length > 0) {
+                    // 物理拆分：当 name 为 'start,end' 格式时，自动拆解为两个独立的后端参数
+                    const [startKey, endKey] = key.split(',')
+                    formattedValues[startKey] = val[0].startOf('day').valueOf()// 修正为当日 00:00:00
+                    formattedValues[endKey] = val[1].endOf('day').valueOf()// 修正为当日 23:59:59
+                    delete formattedValues[key]
+                } else {
+                    // 单日转换：转化为毫秒级数字
+                    formattedValues[key] = val.valueOf()
                 }
-            })
+            }
+        })
+        if (syncUrlParams) {
             // 💡 [黑科技 2] 镜像至 URL
-            const params = new URLSearchParams(Object.fromEntries(Object.entries(formattedValues).filter(([key, value]) => !['', null, undefined].includes(value))))
+            const currentQuery = Object.fromEntries(new URLSearchParams(window.location.search).entries())
+            const params = new URLSearchParams(Object.fromEntries(Object.entries({ ...currentQuery, ...formattedValues }).filter(([key, value]) => !['', null, undefined].includes(value))))
             window.history.replaceState(null, '', `${window.location.pathname}?${params.toString()}`)
         }
         if (customFinish) {

package/templates/react/components/MyTable.js

@@ -183,7 +183,7 @@ export const MyTable = ({ size, query, total, search, autoScroll, onChange, pagi
                 pagination={paginationConfig}
                 components={isEditable ? components : undefined}
                 // 💡 信号注入：将行监听协议绑定至底层 tr
-                onRow={(record, index) => ({ record, index, onValuesChange: lineFormChange })}
+                onRow={(record, index) => ({ record, index, ...(typeof onValuesChange === 'function' ? { onValuesChange: lineFormChange } : {}) })}
                 rowClassName={(record, index) => {
                     const externalClass = typeof rowClassName === 'function' ? rowClassName(record, index) : rowClassName
                     const classes = [externalClass]

package/templates/react/handlebars/MySearchForm.hbs

@@ -1 +1 @@
-<MySearchForm form={form} search={search} initialValues={query} loading={loading} setSearch={setSearch} formItems={ {{formItems}} } />
+<MySearchForm form={form} search={search} initialValues={query} loading={loading} setSearch={setSearch} formItems={ {{formItems}} } initialParams={initialParams} />

package/templates/react/handlebars/MyTable.hbs

@@ -27,7 +27,10 @@
             window.history.replaceState(null, '', `${window.location.pathname}?${params.toString()}`)
             setSearch(newSearch)
         } else {
-            setSearch({ ...search,pageNo: pagination.current, pageSize: pagination.pageSize, orderBy: undefined })
+            const newSearch = { ...search, pageNo: pagination.current, pageSize: pagination.pageSize, orderBy: undefined }
+            const params = new URLSearchParams(Object.fromEntries(Object.entries({ ...query, ...newSearch }).filter(([key, value]) => !['', null, undefined].includes(value))))
+            window.history.replaceState(null, '', `${window.location.pathname}?${params.toString()}`)
+            setSearch(newSearch)
         }
     }}
     {{{{/raw}}}}

package/templates/react/handlebars/handleBlock.hbs

@@ -28,6 +28,7 @@ const {{this.action}} = () => {
 {{#if hasTabs}}
 const onTabChange = key => {
     setActiveKey(key)
+    {{#if hasFormItems}}form.resetFields(){{/if}}
     {{#if hasRowSelection}}setSelectedRows([]){{/if}}
     setSearch({ pageNo: 1, pageSize: 10, type: key })
 }

package/templates/react/handlebars/hookBlock.hbs

@@ -1,10 +1,10 @@
-const initParams = {{#if hasTabs}}{ type: tabs[0].key }{{else}}{}{{/if}}
+const initialParams = {{#if hasTabs}}{ type: tabs[0].key }{{else}}{}{{/if}}
 
 const query = formatQuery(Object.fromEntries(new URLSearchParams(location.search).entries()),  {{formItems}})
 
 const { total, columns, loading, dataSource, search, setSearch, setDataSource, refresh } = useTableQuery({
         api: async params => await request('/api/{{fileName}}', { method: 'POST', body: params }),
-        initialParams: { pageNo: 1, pageSize: 10, ...initParams, ...query },
+        initialParams: { pageNo: 1, pageSize: 10, ...initialParams, ...query },
         cols:tableColumns,
         formatResponse: response => {
             return {

package/templates/react/hooks/useTableQuery.js

@@ -41,6 +41,8 @@ export const useTableQuery = ({ api, cols, initialParams = {}, formatResponse })
     const apiRef = useRef(api)
     // 💡 [核心防御] 信号 ID 计数器：用于物理拦截由于网络时延导致的“竞态病毒（Race Condition）”
     const fetchIdRef = useRef(0)
+    // 💡 [核心防御] 数据解码协议引用：确保异步回调中永远能指向最新的指令地址
+    const formatResponseRef = useRef(formatResponse)
 
     useEffect(() => {
         apiRef.current = api
@@ -70,10 +72,16 @@ export const useTableQuery = ({ api, cols, initialParams = {}, formatResponse })
             const response = await apiRef.current(search)
             // 💡 [物理拦截] 信号校准：若当前 ID 不是最新 ID，说明该信号已过期，执行丢弃协议
             if (currentFetchId !== fetchIdRef.current) return
-            const { data, total, columns: newCols } = formatResponse(response ?? {})
+            const { data, total, columns: newCols } = formatResponseRef.current?.(response ?? {}) || {}
             // 💡 [性能装甲] 只有当列指纹发生变化时，才触发 React 的重绘逻辑
-            if (newCols && getColumnSchema(newCols) !== getColumnSchema(columns)) {
-                setColumns(newCols)
+            if (newCols) {
+                // 使用函数式状态更新，既能拿到最新的 prevCols，又无需将 columns 作为 useCallback 的依赖！
+                setColumns(prevCols => {
+                    if (getColumnSchema(newCols) !== getColumnSchema(prevCols)) {
+                        return newCols
+                    }
+                    return prevCols
+                })
             }
             setDataSource(data)
             setTotal(total ?? 0)

package/templates/react/utils/utils.js

@@ -58,7 +58,7 @@ export const initOSS = async (url, options) => {
 export const formatQuery = (params, formItems) => {
     const cleanParams = {}
     Object.keys(params).forEach(key => {
-        if (formItems.some(item => item.name.includes(key) && item.type?.includes('date'))) {
+        if (formItems.some(item => item.name.includes(key) && item.type?.includes('date')) && params[key]) {
             cleanParams[key] = Number(params[key])
         } else {
             cleanParams[key] = params[key] ?? null
@@ -225,7 +225,9 @@ export const formatUnit = (value, { k = 1024, units = ['B', 'KB', 'MB', 'GB', 'T
     if (value === null || value === undefined || isNaN(value) || value === 0) {
         return `0 ${units[0] ?? ''}`
     }
-    const i = Math.floor(Math.log(value) / Math.log(k))
+    const absValue = Math.abs(value)
+    // 💡 安全屏障：小于 1 的数值直接归入初始级单位，不进行对数拆解
+    const i = absValue < 1 ? 0 : Math.floor(Math.log(absValue) / Math.log(k))
     const index = Math.min(i, units.length - 1)
     const result = (value / Math.pow(k, index)).toFixed(decimals)
     return `${parseFloat(result)} ${units[index]}`