@yorha2b-lab/autodev 2.1.7 → 2.1.8

package/package.json

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

package/templates/react/components/MyModalForm.js

@@ -43,8 +43,6 @@ export const MyModalForm = ({ width, title, submit, record, visible, setModal, l
             }
         } catch (error) {
             console.log('表单校验失败:', error)
-        } finally {
-            setPending(false)
         }
     }
 

package/templates/react/components/MyModalTable.js

@@ -1,3 +1,4 @@
+import { useState } from 'react'
 import { MyTable } from './MyTable'
 import { Modal, Space, Button } from 'antd'
 import { MySearchForm } from './MySearchForm'
@@ -6,6 +7,8 @@ import { useTableQuery } from '../hooks/useTableQuery'
 
 export const MyModalTable = ({ api, onOk, title, width, footer, visible, columns, setModal, formItems, rowSelection, formatResponse, functionButtons, extraParams = {} }) => {
 
+    const [pending, setPending] = useState(false)
+
     const { total, loading, dataSource, search, setSearch } = useTableQuery(api, formatResponse, extraParams)
 
     const handleSearch = values => setSearch({ ...search, ...values, pageNo: 1 })
@@ -14,13 +17,19 @@ export const MyModalTable = ({ api, onOk, title, width, footer, visible, columns
 
     const handleOk = () => {
         if (onOk) {
-            onOk()
+            try {
+                setPending(true)
+                onOk()
+                setPending(false)
+            } catch (error) {
+                console.log('操作失败:', error)
+            }
         }
         setModal({ visible: false })
     }
 
     return (
-        <Modal centered destroyOnClose title={title} width={width} open={visible} onOk={handleOk} footer={footer} onCancel={() => setModal({ visible: false })}>
+        <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>}
             <MyTable

package/templates/react/components/index.js

@@ -1,5 +1,5 @@
-import { useState } from 'react'
 import { initOSS } from '../utils/utils'
+import { useState, useEffect } from 'react'
 import { UploadOutlined } from '@ant-design/icons'
 import { Button, Tree, Radio, Input, Upload, Select, Cascader, Checkbox, DatePicker, InputNumber, TreeSelect, AutoComplete } from 'antd'
 
@@ -18,6 +18,12 @@ const AliyunOSSUpload = ({ value, onChange, ...restProps }) => {
         }
     }
 
+    useEffect(() => {
+        if (!OSSData) {
+            init()
+        }
+    }, [])
+
     const handleChange = ({ fileList }) => onChange?.([...fileList])
 
     const onRemove = file => {
@@ -35,10 +41,10 @@ const AliyunOSSUpload = ({ value, onChange, ...restProps }) => {
 
     const beforeUpload = async file => {
         const expire = Number(OSSData.expire) * 1000
-        if (expire < Date.now() || !OSSData) {
+        if (expire < Date.now()) {
             await init()
         }
-        file.url = `${OSSData.dir ?? path}/${file.uid}_${file.name}`.replace(/\/\//g, '/')
+        file.url = `${OSSData?.dir ?? path}/${file.uid}_${file.name}`.replace(/\/\//g, '/')
         return file
     }