-
+
{projectsType && projectsType === "mirror" ? "导入" : "新建"}项目
-
+ {
+ (licenseList && licenseList.length>0 && state) ?
+
+ :
+
+ }
@@ -69,13 +148,14 @@ function Index(props){
{...props}
filepath={`${file_path}`}
language = {language}
- content={""}
+ content={content}
readOnly={false}
editor_type="new"
descName={filename ? `Add ${filename}`:""}
checkName={checkName}
onEmpty={(e)=>setEmpty(e)}
empty={empty}
+ state={state}
filename={filename}
>
diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js
index 808679ac1..c10e5de5b 100644
--- a/src/forge/Newfile/UserSubmitComponent.js
+++ b/src/forge/Newfile/UserSubmitComponent.js
@@ -69,7 +69,7 @@ class UserSubmitComponent extends Component {
// 提交变更
subMitFrom = () => {
- const { filepath, content, editor_type , checkName , onEmpty , checkContent} = this.props;
+ const { filepath, content, editor_type , checkName , onEmpty , checkContent , state , projectDetail} = this.props;
const { branch, projectsId , owner } = this.props.match.params;
const { submitType, filename , empty } = this.state;
if(editor_type==="upload" && checkContent && !content){
@@ -99,13 +99,25 @@ class UserSubmitComponent extends Component {
this.setState({ isSpin: false });
if (result.data && result.data.name) {
this.props.showNotification("文件新建成功!");
+ const { getDetail } = this.props;
if(submitType === "1"){
- const { getDetail } = this.props;
getDetail && getDetail();
}
- window.scrollTo(0,0);
- let url = `/${owner}/${projectsId}${values.branchname ? `/tree/${turnbar(values.branchname)}`: (branch ? `/tree/${turnbar(branch)}` : "")}`;
- this.props.history.push(url);
+ // 存在state是代表创建自定义许可证
+ if(state){
+ const url = `/${owner}/${projectsId}.json`;
+ const { name , identifier } = projectDetail;
+ axios.put(url,{name,identifier,license_id:parseInt(state)===-1?0:state }).then(res=>{
+ getDetail && getDetail();
+ window.scrollTo(0,0);
+ let url = `/${owner}/${projectsId}${values.branchname ? `/tree/${turnbar(values.branchname)}`: (branch ? `/tree/${turnbar(branch)}` : "")}`;
+ this.props.history.push(url);
+ }).catch(error=>{})
+ }else{
+ window.scrollTo(0,0);
+ let url = `/${owner}/${projectsId}${values.branchname ? `/tree/${turnbar(values.branchname)}`: (branch ? `/tree/${turnbar(branch)}` : "")}`;
+ this.props.history.push(url);
+ }
}
})
.catch((error) => {
diff --git a/src/forge/Newfile/m_editor.js b/src/forge/Newfile/m_editor.js
index f0450b63c..e9e7b154b 100644
--- a/src/forge/Newfile/m_editor.js
+++ b/src/forge/Newfile/m_editor.js
@@ -6,7 +6,6 @@ import 'codemirror/mode/clike/clike';
import 'codemirror/mode/css/css';
import UserSubmitComponent from "./UserSubmitComponent";
import CloudIDE from "./cloudIDE";
-import { Base64 } from "js-base64";
import "./index.css";
import "./editor.css";
@@ -35,7 +34,7 @@ class m_editor extends Component {
render() {
const { editorValue, changeValue } = this.state;
- const { readOnly, editorType,onEmpty,filename,empty, currentBranch, descName, checkName, detail, match: { params },filepath, ideTheme , md } = this.props;
+ const { readOnly, editorType,onEmpty,filename,empty, currentBranch, descName, checkName, detail, match: { params },filepath, state , projectDetail} = this.props;
const editor_options = {
lineNumbers: "on",
lineWrapping: true, //强制换行
@@ -87,6 +86,8 @@ class m_editor extends Component {
empty={empty}
filename={filename}
changeValueFlag={this.props.content !== changeValue}
+ state={state}
+ projectDetail={projectDetail}
>