diff --git a/src/pages/Agent/Module/AddModal.tsx b/src/pages/Agent/Module/AddModal.tsx index dd40f1879d9e42b2ded5de3b8c540e902f8ee37a..3ad059df935518ca53c30d989bec701f57bb9869 100644 --- a/src/pages/Agent/Module/AddModal.tsx +++ b/src/pages/Agent/Module/AddModal.tsx @@ -22,19 +22,19 @@ export default forwardRef((props: any, ref: any) => { // 1.请求数据 const getVersionData = async () => { try { - const res: any = await queryVersionList({ page_num: 1, page_size: 100000 }); - const { code, msg, data=[] } = res || {} + const res: any = await queryVersionList({ page_num: 1, page_size: 100000 }); + const { code, msg, data = [] } = res || {} if (code === 200) { setVersionData(data) } else { - message.error(msg || formatMessage({id: 'request.version.fai'}) ); + message.error(msg || formatMessage({ id: 'request.version.fai' })); } } catch (e) { // setLoading(false) } } - useEffect(()=> { + useEffect(() => { // 请求版本列表数据 getVersionData() }, []) @@ -42,12 +42,12 @@ export default forwardRef((props: any, ref: any) => { useImperativeHandle( ref, () => ({ - show: ({ title= '', detailData}: any) => { - setVisible(true) - // setTitle(title); - setEditData(detailData) - form.setFieldsValue({ ...detailData, version: detailData.version && `${detailData.version}|${detailData.os}|${detailData.arch}` }) - } + show: ({ title = '', detailData }: any) => { + setVisible(true) + // setTitle(title); + setEditData(detailData) + form.setFieldsValue({ ...detailData, version: detailData.version && `${detailData.version}|${detailData.os}|${detailData.arch}` }) + } }) ) @@ -56,21 +56,21 @@ export default forwardRef((props: any, ref: any) => { setLoading(true); const { version, ...otherParam } = values - const list = version.split('|') - const field = ['version','os','arch'] + const list = version?.split('|') || [] + const field = ['version', 'os', 'arch'] field.forEach((n: any, i: number) => { otherParam[n] = list[i] }) const { code, msg } = values.id ? await agentEdit(otherParam) : await agentAdd(otherParam); if (code === 200) { - message.success(values.id? formatMessage({id: 'modified.succeeded'}): formatMessage({id: 'created.succeeded'})); - setVisible(false); + message.success(values.id ? formatMessage({ id: 'modified.succeeded' }) : formatMessage({ id: 'created.succeeded' })); + setVisible(false); form.resetFields(); props.callback(); - } + } else { - message.error(msg || formatMessage({id: 'created.failed'})); + message.error(msg || formatMessage({ id: 'created.failed' })); } setLoading(false); }).catch(() => { @@ -86,23 +86,23 @@ export default forwardRef((props: any, ref: any) => { const { formatMessage } = useIntl(); const placeholder = formatMessage({ id: "Form.select.placeholder" }); - const requiredMessage = formatMessage({ id: 'Form.select.message'}); - - return ( -
- -
+ const requiredMessage = formatMessage({ id: 'Form.select.message' }); + + return ( +
+ +
- - + { } ]} > - + { active - + passive - + @@ -164,22 +164,29 @@ export default forwardRef((props: any, ref: any) => { } name="version" rules={[{ - required: false, + required: true, message: requiredMessage, }]}> @@ -203,8 +210,8 @@ export default forwardRef((props: any, ref: any) => {
-
-
-
- ); +
+
+
+ ); }); \ No newline at end of file