@yorha2b-lab/autodev 2.1.6 → 2.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yorha2b-lab/autodev",
-  "version": "2.1.6",
+  "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

@@ -3,13 +3,15 @@ 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'
 
-const AliyunOSSUpload = ({ path, style, value, disabled, onChange }) => {
+const AliyunOSSUpload = ({ value, onChange, ...restProps }) => {
 
-    const [OSSData, setOSSData] = useState()
+    const { oss, url, path, options, ...originUploadProps } = restProps
+
+    const [OSSData, setOSSData] = useState(oss)
 
     const init = async () => {
         try {
-            const result = await initOSS()
+            const result = await initOSS(url, options)
             setOSSData(result)
         } catch (err) {
             console.log(err)
@@ -17,7 +19,9 @@ const AliyunOSSUpload = ({ path, style, value, disabled, onChange }) => {
     }
 
     useEffect(() => {
-        init()
+        if (!OSSData) {
+            init()
+        }
     }, [])
 
     const handleChange = ({ fileList }) => onChange?.([...fileList])
@@ -36,14 +40,11 @@ const AliyunOSSUpload = ({ path, style, value, disabled, onChange }) => {
     })
 
     const beforeUpload = async file => {
-        if (!OSSData) {
-            return false
-        }
         const expire = Number(OSSData.expire) * 1000
         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
     }
 
@@ -55,10 +56,11 @@ const AliyunOSSUpload = ({ path, style, value, disabled, onChange }) => {
         data: getExtraData,
         action: OSSData?.host,
         onChange: handleChange,
+        ...originUploadProps
     }
 
     return (
-        <Upload {...uploadProps} disabled={disabled} style={style}>
+        <Upload {...uploadProps}>
             <Button icon={<UploadOutlined />}>选择文件</Button>
         </Upload>
     )

package/templates/react/utils/utils.js

@@ -3,6 +3,16 @@ import { request } from './request'
 
 //常用工具函数，使用前确保已安装对应模块
 
+export const parseExcel = async file => {
+    /* const arrayBuffer = await file.arrayBuffer()
+    const XLSX = require('xlsx')
+    const workbook = XLSX.read(arrayBuffer, { type: 'array' })
+    const firstSheetName = workbook.SheetNames?.[0]
+    const worksheet = workbook.Sheets[firstSheetName]
+    const excelData = XLSX.utils.sheet_to_json(worksheet, { header: 1 })
+    return excelData.filter(item => item.length > 0) */
+}
+
 export const initOSS = async (url, options) => {
     /* const OSS = require('ali-oss')
     const crypto = require('crypto-js')
@@ -16,7 +26,7 @@ export const initOSS = async (url, options) => {
         ],
     }))
     const signature = crypto.enc.Base64.stringify(crypto.HmacSHA1(policy, accessKeySecret))
-    return { client, policy, signature, ...response?.data } */
+    return { client, policy, signature,host: `https://${bucket}.${endpoint.split('//')[1]}`, ...response?.data } */
 }
 
 export const formatQuery = (params, formItems) => {