diff --git a/src/components/ai/AiHelper.tsx b/src/components/ai/AiHelper.tsx index 63eb883..006ff0e 100644 --- a/src/components/ai/AiHelper.tsx +++ b/src/components/ai/AiHelper.tsx @@ -4,7 +4,7 @@ import { GlobalContext } from "../../context/GlobalContext.ts"; import { del, get, post, put, websocketUrl, Axios } from "../../util/AjaxUtils.ts"; import { // Col, Divider, Row, - Spin, Image, Pagination + Spin, Image, Pagination,Modal } from "antd"; import { AxiosResponse } from "axios"; import useMessage from "antd/es/message/useMessage"; @@ -51,6 +51,7 @@ export default function AiHelper(props: PropsType) { } }) } + // const [selectedImg,setSelectedImg] = useState('') // 获取页面样式图片等信息 const getPageImgData = (page: number) => { @@ -70,8 +71,10 @@ export default function AiHelper(props: PropsType) { } }) } - const height = window.innerHeight - 265; + const height = window.innerHeight - 265; + // 提示是否可以生成模块 + const [modal, setModal] = useState(false) // const pathParams = useParams(); // const [openModal ,setOpenModal] = useState(false) //是提示替换弹框 // const height = window.innerHeight - 280; @@ -228,7 +231,21 @@ export default function AiHelper(props: PropsType) { } }) } + const getProjDesc = () => { + get({ + messageApi: messageApi, + url: `/api/proj/get/${props.projId}`, + onSuccess({ data }) { + console.log(data.projDesc); + if(data.projDesc) { + generateProjModArray(); + }else{ + setModal(true) + } + } + }) + } const generateProjIntroduction = () => { ws.current?.send(JSON.stringify({ @@ -531,7 +548,8 @@ export default function AiHelper(props: PropsType) { { - generateProjModArray(); + getProjDesc() + // generateProjModArray(); }} handleSave={(index, mod) => { if (projModArray.length > MAX_MOD_SIZE) { @@ -645,7 +663,7 @@ export default function AiHelper(props: PropsType) {
@@ -660,7 +678,7 @@ export default function AiHelper(props: PropsType) { ) }) } - +
@@ -710,7 +728,7 @@ export default function AiHelper(props: PropsType) {
*/} + { + setModal(false); + }} + onOk={() => { + setModal(false); + }} + style={{ + display: 'flex', + alignItems: 'center', + justifyContent: 'center', + height: `${height}px`, + }} + > +
+ 为了合理生成功能列表,请在项目详情生成完成后再生成功能列表 +
+
+ ) } \ No newline at end of file diff --git a/src/components/ai/mod/AiHelperMod.tsx b/src/components/ai/mod/AiHelperMod.tsx index ca1b693..3f38e5e 100644 --- a/src/components/ai/mod/AiHelperMod.tsx +++ b/src/components/ai/mod/AiHelperMod.tsx @@ -48,6 +48,7 @@ export default function AiHelperMod(props: PropsType) { const [editModal, setEditModal] = useState(false) const [updata, setUpdata] = useState([]) const [status, setStatus] = useState('') + // const [items, setItems] = useState([]) const pathParams = useParams(); useEffect(() => { diff --git a/src/route/proj/ProjEdit.tsx b/src/route/proj/ProjEdit.tsx index 8bedf88..d864749 100644 --- a/src/route/proj/ProjEdit.tsx +++ b/src/route/proj/ProjEdit.tsx @@ -150,7 +150,7 @@ export default function ProjEdit() { desc: '完善软件简称、版本号、软件所属者及联系人等信息', step: 2, btnName: !isGenerateSuccess ? '设置' : '查看', - status: data.apply.projDevCompleteDate ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT, + status: data.apply.projVersion ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT, handleEdit() { // if (generateStatus != GenerateStatus.SUCCESS) { if (!isGenerateSuccess) { diff --git a/src/route/proj/ProjEditAll.tsx b/src/route/proj/ProjEditAll.tsx index f1d5567..0d122fa 100644 --- a/src/route/proj/ProjEditAll.tsx +++ b/src/route/proj/ProjEditAll.tsx @@ -202,7 +202,7 @@ export default function ProjEditAll() { step: 2, // btnName: !isGenerateSuccess ? '设置' : '查看', btnName: '查看', - status: data.apply.projDevCompleteDate ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT, + status: data.apply.projVersion ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT, handleEdit() { // if (generateStatus != GenerateStatus.SUCCESS) { // if (!isGenerateSuccess) { diff --git a/src/route/proj/ProjEditFree.tsx b/src/route/proj/ProjEditFree.tsx index d06e9ea..39c751e 100644 --- a/src/route/proj/ProjEditFree.tsx +++ b/src/route/proj/ProjEditFree.tsx @@ -227,7 +227,7 @@ export default function ProjEdit() { desc: '完善软件简称、版本号、软件所属者及联系人等信息', step: 2, btnName: !isGenerateSuccess ? '设置' : '查看', - status: data.apply.projDevCompleteDate ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT, + status: data.apply.projVersion ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT, // canBtnClick: false, handleEdit() { if (generateStatus != GenerateStatus.SUCCESS) { diff --git a/src/route/proj/ProjNew.tsx b/src/route/proj/ProjNew.tsx index b0a9aef..86233f2 100644 --- a/src/route/proj/ProjNew.tsx +++ b/src/route/proj/ProjNew.tsx @@ -21,7 +21,8 @@ type ProjInfo = { belongPeople: string; contacts: string; projDevCompleteDate: string; - coupon?: string + coupon?: string; + projVersion: string; }; export default function ProjNew() { @@ -49,6 +50,7 @@ export default function ProjNew() { belongPeople: '', contacts: '', projDevCompleteDate: '', + projVersion: '', }); const [form] = Form.useForm(); // 所属者弹窗 @@ -221,17 +223,13 @@ export default function ProjNew() {
{ - // if(isEndsWithKeywords(formData.projName)){ - // setIsCreateModalOpen(true); - - // }else{ - // setHasKeywords(true); - // } + // console.log('formData', formData); setIsCreateModalOpen(true); setProjInfo({ projName: formData.projName, @@ -239,6 +237,7 @@ export default function ProjNew() { belongPeople: formData.belongPeople, contacts: formData.contacts, projDevCompleteDate: formData.projDevCompleteDate, + projVersion: formData.projVersion?formData.projVersion:'v1.0', }) }} autoComplete="off" @@ -261,7 +260,7 @@ export default function ProjNew() { } else { setShowTip(true) } - }else{ + } else { setShowTip(false) } @@ -277,6 +276,19 @@ export default function ProjNew() { color: 'green', }}>系统全称建议以“软件”、“系统”、“平台”或“APP”结尾
+
+
系统版本*
+ + name="projVersion" + + > + + + + +
知识产权所属者* @@ -309,12 +321,12 @@ export default function ProjNew() {
- 开发完成时间* + 开发完成时间
// label="开发完成时间" name="projDevCompleteDate" - rules={[{ required: true, message: '请输入开发完成时间' }]} + // rules={[{ required: true, message: '请输入开发完成时间' }]} >
+
@@ -421,10 +434,12 @@ export default function ProjNew() { url: '/api/proj/create', body: { projName: projInfo.projName, + projVersion: projInfo.projVersion, + projChargeType: pathParams.projChargeType, listProjChargeAdditional: listProjChargeAdditional, // dayjs(formInfo.getFieldValue('projDevCompleteDate')).format(dateFormat), - projDevCompleteDate: dayjs(projInfo.projDevCompleteDate).format(dateFormat), + projDevCompleteDate:projInfo.projDevCompleteDate? dayjs(projInfo.projDevCompleteDate).format(dateFormat):'', authorCrcAccount: belongPeopleInfo.authorCrcAccount, authorId: belongPeopleInfo.authorId, authorIdCard: belongPeopleInfo.authorIdCard, @@ -439,7 +454,6 @@ export default function ProjNew() { applyContactId: concatPeopleInfo.applyConcatId, applyContactName: concatPeopleInfo.applyContactName, applyContactPhone: concatPeopleInfo.applyContactPhone, - projVersion: 'v1.0', couponId: couponId ? couponId : '', }, diff --git a/src/route/proj/edit/ProjEditStep2.tsx b/src/route/proj/edit/ProjEditStep2.tsx index 7bc0c25..7ce7bdd 100644 --- a/src/route/proj/edit/ProjEditStep2.tsx +++ b/src/route/proj/edit/ProjEditStep2.tsx @@ -626,12 +626,12 @@ export default function ProjEditStep2(props: any) {
-
* 开发完成时间:
+
开发完成时间:
// label="开发完成时间" name="projDevCompleteDate" - rules={[{ required: true, message: '请输入开发完成时间' }]} + // rules={[{ required: true, message: '请输入开发完成时间' }]} >
-
* 开发完成时间:
+
开发完成时间:
// label="开发完成时间" name="projDevCompleteDate" - rules={[{ required: true, message: '请输入开发完成时间' }]} + // rules={[{ required: true, message: '请输入开发完成时间' }]} >