@yorha2b-lab/autodev 1.0.18 → 1.0.20

package/bin/autodev.js

@@ -3,8 +3,8 @@ const fs = require('fs')
 const path = require('path')
 const chalk = require('chalk')
 const figlet = require('figlet')
-const pkg = require('../package.json')
 const { program } = require('commander')
+const pkg = require(path.join(__dirname, '../package.json'))
 
 console.log(chalk.cyan(figlet.textSync('AutoDev', { horizontalLayout: 'full' })))
 console.log(chalk.gray('Booting System...'))

package/package.json

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

package/templates/react/components/MyModalForm.js

@@ -3,7 +3,7 @@ import { MyBaseForm } from './MyBaseForm'
 import { useState, useEffect } from 'react'
 import { Row, Col, Form, Modal, } from 'antd'
 
-export const MyModalForm = ({ width, title, submit, record, visible, setModal, labelCol, formItems, wrapperCol, dateSeparator = ',', onValuesChange }) => {
+export const MyModalForm = ({ width, title, submit, record, visible, setModal, labelCol, formItems, wrapperCol, onValuesChange }) => {
 
     const [form] = Form.useForm()
     const [pending, setPending] = useState(false)
@@ -14,7 +14,7 @@ export const MyModalForm = ({ width, title, submit, record, visible, setModal, l
             if (record && Object.keys(record).length > 0) {
                 const entries = Object.entries(record).map(([key, value]) => [
                     key,
-                    formItems.find(item => item.name === key)?.type?.includes('date') ? value?.split(dateSeparator)?.map(item => dayjs(item)) : value
+                    formItems.find(item => item.name === key)?.type?.includes('date') ? (value?.toString()?.includes(',') ? value?.split(',')?.map(item => dayjs(Number(item))) : dayjs(Number(value))) : value
                 ])
                 form.setFieldsValue(Object.fromEntries(entries))
             }

package/templates/react/components/MySearchForm.js

@@ -4,7 +4,7 @@ import { MyBaseForm } from './MyBaseForm'
 import { useState, useEffect } from 'react'
 import { Row, Col, Form, Button, Space } from 'antd'
 
-export const MySearchForm = ({ form, search, loading, labelCol, setSearch, formItems, showLimit = 7, dateSeparator = '\GMT\,', initialValues, customReset, extraOperate, customFinish, onValuesChange, defaultPageSize = 10 }) => {
+export const MySearchForm = ({ form, search, loading, labelCol, setSearch, formItems, showLimit = 7, initialValues, customReset, extraOperate, customFinish, onValuesChange, defaultPageSize = 10 }) => {
 
     const [limit, setLimit] = useState(showLimit)
 
@@ -18,24 +18,36 @@ export const MySearchForm = ({ form, search, loading, labelCol, setSearch, formI
     }
 
     const handleFinish = values => {
-        const params = new URLSearchParams(Object.fromEntries(Object.entries(values).filter(([key, value]) => !['', null, undefined].includes(value))))
+        const formattedValues = { ...values }
+        Object.keys(formattedValues).forEach(key => {
+            const val = formattedValues[key]
+            const isDateType = formItems.find(item => item.name === key)?.type?.includes('date')
+            if (isDateType && val) {
+                if (Array.isArray(val)) {
+                    formattedValues[key] = val.map((d, i) => i === 0 ? d.startOf('day').valueOf() : d.endOf('day').valueOf()).join(',')
+                } else {
+                    formattedValues[key] = val.valueOf()
+                }
+            }
+        })
+        const params = new URLSearchParams(Object.fromEntries(Object.entries(formattedValues).filter(([key, value]) => !['', null, undefined].includes(value))))
         history.push({ search: params.toString() })
         if (customFinish) {
-            customFinish(values)
+            customFinish(formattedValues)
         } else {
-            setSearch({ ...search, ...values, pageNo: 1 })
+            setSearch({ ...search, ...formattedValues, pageNo: 1 })
         }
     }
 
     useEffect(() => {
-        if (Object.values(initialValues).length > 0) {
+        if (Object.values(initialValues).length > 0 && formItems.length > 0) {
             const entries = Object.entries(initialValues).filter(([key]) => formItems.some(item => item.name === key)).map(([key, value]) => [
                 key,
-                formItems.find(item => item.name === key)?.type?.includes('date') ? value?.split(dateSeparator)?.map(item => dayjs(item)) : value
+                formItems.find(item => item.name === key)?.type?.includes('date') ? (value?.toString()?.includes(',') ? value?.split(',')?.map(item => dayjs(Number(item))) : dayjs(Number(value))) : value
             ])
             form.setFieldsValue(Object.fromEntries(entries))
         }
-    }, [])
+    }, [initialValues, form, formItems])
 
     return (
         <Form form={form} onFinish={handleFinish} labelCol={labelCol} onValuesChange={onValuesChange}>