@yorha2b-lab/autodev 2.1.21 → 2.1.22

package/package.json

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

package/templates/react/components/MyModalTable.js

@@ -5,11 +5,11 @@ import { MySearchForm } from './MySearchForm'
 import { useTableQuery } from '../hooks/useTableQuery'
 
 
-export const MyModalTable = ({ api, onOk, title, width, footer, visible, columns, operate, setModal, formItems, setModalForm, rowSelection, formatResponse, functionButtons, extraParams = {}, modalPagination = true }) => {
+export const MyModalTable = ({ api, onOk, title, width, footer, visible, operate, setModal, formItems, setModalForm, rowSelection, formatResponse, functionButtons, columns: modalColumns, initialParams = {}, modalPagination = true }) => {
 
     const [pending, setPending] = useState(false)
 
-    const { total, loading, dataSource, search, refresh, setSearch, setDataSource } = useTableQuery(api, formatResponse, extraParams)
+    const { total, loading, columns, dataSource, search, refresh, setLoading, setSearch, setDataSource } = useTableQuery({ api, cols: modalColumns, initialParams, formatResponse })
 
     const handleSearch = values => setSearch({ ...search, ...values, pageNo: 1 })
 
@@ -20,7 +20,6 @@ export const MyModalTable = ({ api, onOk, title, width, footer, visible, columns
             try {
                 setPending(true)
                 await onOk()
-                setPending(false)
             } catch (error) {
                 console.log('操作失败:', error)
             } finally {
@@ -32,7 +31,7 @@ export const MyModalTable = ({ api, onOk, title, width, footer, visible, columns
     return (
         <Modal centered destroyOnClose title={title} width={width} open={visible} onOk={handleOk} footer={footer} onCancel={() => setModal({ visible: false })} confirmLoading={pending}>
             {formItems?.length > 0 && <MySearchForm search={search} formItems={formItems} setSearch={handleSearch} syncUrlParams={false} />}
-            {functionButtons?.length > 0 && <Space>{functionButtons.map(item => <Button key={item.name} type={item.type} onClick={item.onClick}>{item.name}</Button>)}</Space>}
+            {functionButtons?.length > 0 && <Space>{functionButtons.map(item => <Button key={item.name} type={item.type} onClick={() => item.onClick({ refresh, setLoading, setSearch, setDataSource })}>{item.name}</Button>)}</Space>}
             <MyTable
                 total={total}
                 search={search}

package/templates/react/components/index.js

@@ -101,7 +101,7 @@ export const formNode = ({ item }) => {
         case 'upload':
             return <Upload {...item.uploadProps} {...commonProps}>{item.content ?? '上传文件'}</Upload>
         case 'select':
-            return <Select allowClear showSearch mode={item.mode} options={item.options} {...commonProps} />
+            return <Select allowClear showSearch mode={item.mode} options={item.options} optionFilterProp='label' {...commonProps} />
         default:
             return <Input allowClear {...commonProps} />
     }

package/templates/react/handlebars/MyTable.hbs

@@ -21,7 +21,7 @@
             window.history.replaceState(null, '', `${window.location.pathname}?${params.toString()}`)
             setSearch(newSearch)
         } else {
-            setSearch({ ...search, orderBy: undefined })
+            setSearch({ ...search,pageNo: pagination.current, pageSize: pagination.pageSize, orderBy: undefined })
         }
     }}
     {{{{/raw}}}}

package/templates/react/hooks/useTableQuery.js

@@ -1,6 +1,6 @@
 import { useRef, useState, useEffect, useCallback } from 'react'
 
-export const useTableQuery = ({ api, cols = [], initialParams = {}, formatResponse }) => {
+export const useTableQuery = ({ api, cols, initialParams = {}, formatResponse }) => {
 
     const [total, setTotal] = useState(0)
     const [columns, setColumns] = useState(cols)