diff --git a/src/forge/Head/Footer.jsx b/src/forge/Head/Footer.jsx index 840d919b..8a69c2ad 100644 --- a/src/forge/Head/Footer.jsx +++ b/src/forge/Head/Footer.jsx @@ -18,45 +18,48 @@ function Footer(){ } return( -
- {value && showhtml(value)} - {/*
- - - - +
+
+
+ {value && showhtml(value)} + {/*
+ + + +
    +
  • 合作伙伴
  • +
  • 热线:
  • +
  • QQ群:1071514693
  • +
+
+

© Copyright 2007~2021 国防科技大学Trustie团队 & IntelliDE 湘ICP备 17009477号

*/}
-

© Copyright 2007~2021 国防科技大学Trustie团队 & IntelliDE 湘ICP备 17009477号

*/}
) } diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js index 9883ce8f..6c921c9f 100644 --- a/src/forge/Newfile/UserSubmitComponent.js +++ b/src/forge/Newfile/UserSubmitComponent.js @@ -117,7 +117,7 @@ class UserSubmitComponent extends Component { diff --git a/src/forge/Newfile/m_editor.js b/src/forge/Newfile/m_editor.js index 4e2e6851..7f773d98 100644 --- a/src/forge/Newfile/m_editor.js +++ b/src/forge/Newfile/m_editor.js @@ -51,7 +51,7 @@ class m_editor extends Component { return (
-
+
{!readOnly && ( -
+
{ const [ image , setImage ] = useState(undefined); const [ imageFlag , setImageFlag] = useState(false); const { getFieldDecorator, validateFields , setFieldsValue } = form; - const radioStyle = { display: 'block', height: '30px', @@ -60,19 +60,44 @@ export default Form.create()( }) },[]) + function checkname(rule, value, callback){ + if(!value){ + callback(); + } + if(value && !value.match(/^[a-zA-Z][a-zA-Z0-9_-]{3,19}$/)){ + callback("只能使用以字母开头,包含字母、数字、下划线、横杠等,长度4到20个字符"); + } + callback(); + } + return( -
+

新建组织

{helper( - 组织名称:(组织名称应该简单明了), + 组织账号:, "name", + [ + { required: true, message: "请输入组织账号" }, + { + validator:checkname + } + ], + + )} + {helper( + 组织名称:, + "nickname", [{ required: true, message: "请输入组织名称" }], )} + {helper( '组织描述', "description", diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css index 7b4d15a7..82dcfa24 100644 --- a/src/modules/tpm/TPMIndex.css +++ b/src/modules/tpm/TPMIndex.css @@ -95,7 +95,7 @@ body>.-task-title { } .newContainer { - background: #f5f5f5; + background: #fff; } .ant-modal-title { diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js index 773c07ca..604beba1 100644 --- a/src/modules/tpm/TPMIndexHOC.js +++ b/src/modules/tpm/TPMIndexHOC.js @@ -5,7 +5,6 @@ import axios from 'axios'; import { Spin } from 'antd'; import './TPMIndex.css'; import LoginDialog from '../login/LoginDialog'; -import EducoderAccount from '../../forge/Component/EducoderAccount'; export function TPMIndexHOC(WrappedComponent) { return class II extends React.Component { @@ -206,14 +205,13 @@ export function TPMIndexHOC(WrappedComponent) { render() { - let { isRender , current_user , giteaVisible , email } = this.state; + let { isRender , current_user } = this.state; const common = { showLoginDialog: this.showLoginDialog, checkIfLogin: this.checkIfLogin, }; return (
- {isRender === true ? this.hideLoginDialog()} {...this.props}