@yorha2b-lab/autodev 2.1.19 → 2.1.21

package/package.json

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

package/src/utils/utils.js

@@ -189,7 +189,7 @@ const generateSmartImports = (codeStr, hasTabs) => {
         usedReact.length && `import { ${usedReact.join(', ')} } from 'react'`,
         `import { request } from '../../utils/request'`,
         `import { formatQuery } from '../../utils/utils'`,
-        `import { ${hasTabs ? 'tabs, ' : ''}columns, formItems, modalItems } from './resource'`,
+        `import { ${hasTabs ? 'tabs, ' : ''}formItems, modalItems, tableColumns} from './resource'`,
         ...usedHooks.map(hook => `import { ${hook} } from '../../hooks/${hook}'`),
         ...usedComps.map(comp => `import { ${comp} } from '../../components/${comp}'`),
         usedAntd.length && `import { Form, ${usedAntd.join(', ')} } from 'antd'`

package/templates/react/components/MyTable.js

@@ -58,8 +58,8 @@ export const MyTable = ({ size, query, total, search, autoScroll, onChange, pagi
         return {
             total,
             showSizeChanger: true,
-            current: search?.pageNo,
-            pageSize: search?.pageSize,
+            current: Number(search?.pageNo),
+            pageSize: Number(search?.pageSize),
             showTotal: (total) => `共 ${total} 条`,
             ...(typeof pagination === 'object' ? pagination : {})
         }

package/templates/react/handlebars/MyTable.hbs

@@ -14,7 +14,16 @@
     {{/if}}
     {{#if hasPagination}}
     {{{{raw}}}}
-    onChange={(pagination, filters, sorter) => setSearch({ ...search , pageNo: pagination.current, pageSize: pagination.pageSize, orderBy: sorter.column ? sorter.field : undefined })}
+    onChange={(pagination, filters, sorter) => {
+        if (sorter.column) {
+            const newSearch = { ...search, pageNo: pagination.current, pageSize: pagination.pageSize, orderBy: sorter.field }
+            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)
+        } else {
+            setSearch({ ...search, orderBy: undefined })
+        }
+    }}
     {{{{/raw}}}}
     {{/if}}
     {{#if hasRowSelection}}

package/templates/react/handlebars/hookBlock.hbs

@@ -5,12 +5,12 @@ const query = formatQuery(Object.fromEntries(new URLSearchParams(location.search
 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, ...query },
-        cols:[],//前端指定列数组
+        cols:tableColumns,//前端指定列数组
         formatResponse: response => {
             return {
                 data: response?.data ?? [],
                 total: response?.data?.total ?? 0,
-                columns: [],//可选,解析接口动态列;优先级高于cols
+                columns: undefined,//可选,解析接口动态列;优先级高于cols
             }
         },
     })

package/templates/react/hooks/useTableQuery.js

@@ -15,7 +15,7 @@ export const useTableQuery = ({ api, cols = [], initialParams = {}, formatRespon
         apiRef.current = api
     }, [api])
 
-    const getColumnSchema = cols => cols.map(col => ({ title: col.title, dataIndex: col.dataIndex })).join('|')
+    const getColumnSchema = cols => cols.map(col => `${col.title}-${col.dataIndex}-${col.sortOrder}`).join('|')
 
     const fetchData = useCallback(async () => {
         if (!apiRef.current) return
@@ -43,5 +43,5 @@ export const useTableQuery = ({ api, cols = [], initialParams = {}, formatRespon
         fetchData()
     }, [fetchData])
 
-    return { total, columns, loading, dataSource, search, setSearch, setDataSource, refresh: fetchData }
+    return { total, columns, loading, dataSource, search, setSearch, setLoading, setDataSource, refresh: fetchData }
 }

package/templates/react/resource.hbs

@@ -13,6 +13,6 @@ export const {{this.name}} = {{{stringify this.data 50}}}
 export const formItems = {{{stringify formItemsData 150}}}
 {{/if}}
 
-export const columns = {{{stringify columnsData 200}}}
+export const tableColumns = {{{stringify columnsData 200}}}
 
 export const modalItems = []