From fb1bfdb3e285ede24f5a39ce9375b16994b44d8e Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 12 Jul 2024 14:29:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=85=E7=BD=91=E7=89=88=E6=9C=AC=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 39 +++++++++++----------- src/forge/Index.js | 6 ++-- src/forge/Main/projecthome/Index.jsx | 8 ++--- src/forge/Main/projecthome/SubBanner.jsx | 8 ++--- src/forge/Newfile/m_editor.js | 41 ++++++++++++------------ src/forge/Server/fetch.js | 6 ++-- 6 files changed, 55 insertions(+), 53 deletions(-) diff --git a/public/index.html b/public/index.html index 140fd06af..d38d9124d 100755 --- a/public/index.html +++ b/public/index.html @@ -8,23 +8,35 @@ - - + + - - - + + + + + + + + + + + + + + + @@ -42,27 +54,17 @@
- - + + - - <%= htmlWebpackPlugin.tags.bodyTags %> - \ No newline at end of file diff --git a/src/forge/Index.js b/src/forge/Index.js index 5a8d16175..dc4bb8707 100644 --- a/src/forge/Index.js +++ b/src/forge/Index.js @@ -60,18 +60,18 @@ class Index extends Component { )} > ( )} > - {/* ( )} - > */} + > ); diff --git a/src/forge/Main/projecthome/Index.jsx b/src/forge/Main/projecthome/Index.jsx index 46e6293a1..7e748858a 100644 --- a/src/forge/Main/projecthome/Index.jsx +++ b/src/forge/Main/projecthome/Index.jsx @@ -14,7 +14,7 @@ import Nodata from '../../Nodata'; const { Search } = Input; const LIMIT = 20; -function Index() { +function Index(props) { const [ cateList , setCateList ] = useState(undefined); const [ projectsList , setProjectsList ] = useState(undefined); @@ -64,7 +64,7 @@ function Index() { return(
- + {/* */}
@@ -93,7 +93,7 @@ function Index() { style={{width:"300px"}} allowClear /> - 更多 + 更多
@@ -146,7 +146,7 @@ function Index() { { projectsList && projectsList.length > 0 &&
- 查看更多开源项目 + 查看更多开源项目
}
diff --git a/src/forge/Main/projecthome/SubBanner.jsx b/src/forge/Main/projecthome/SubBanner.jsx index cb868b943..7a11812b5 100644 --- a/src/forge/Main/projecthome/SubBanner.jsx +++ b/src/forge/Main/projecthome/SubBanner.jsx @@ -31,8 +31,8 @@ const settings={ adaptiveHeight:true } -function SubBanner() { - +function SubBanner(props) { + const mygetHelmetapi = props && props.mygetHelmetapi; const [ list , setList ] = useState(undefined); useEffect(()=>{ @@ -50,8 +50,8 @@ function SubBanner() { return(
-

GitLink 确实开源

-

新一代开发创新服务平台 让你的创意在这里释放

+

{mygetHelmetapi && mygetHelmetapi.name}

+

新一代开发创新服务平台 让你的创意在这里释放

{ list && list.length > 0 ? diff --git a/src/forge/Newfile/m_editor.js b/src/forge/Newfile/m_editor.js index f0450b63c..b06994207 100644 --- a/src/forge/Newfile/m_editor.js +++ b/src/forge/Newfile/m_editor.js @@ -1,12 +1,12 @@ import React, { Component, Fragment } from "react"; -import { UnControlled as CodeMirror } from 'react-codemirror2'; -import 'codemirror/addon/selection/active-line.js'; -import 'codemirror/mode/javascript/javascript.js'; -import 'codemirror/mode/clike/clike'; -import 'codemirror/mode/css/css'; +// import { UnControlled as CodeMirror } from 'react-codemirror2'; +// import 'codemirror/addon/selection/active-line.js'; +// import 'codemirror/mode/javascript/javascript.js'; +// import 'codemirror/mode/clike/clike'; +// import 'codemirror/mode/css/css'; import UserSubmitComponent from "./UserSubmitComponent"; -import CloudIDE from "./cloudIDE"; -import { Base64 } from "js-base64"; +// import CloudIDE from "./cloudIDE"; +import Editor from "react-monaco-editor"; import "./index.css"; import "./editor.css"; @@ -35,7 +35,8 @@ 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; + console.log("editorValue:",editorValue) + const { readOnly, editorType,onEmpty,filename,empty, currentBranch, descName, checkName, detail , language , match: { params },filepath,ideTheme } = this.props; const editor_options = { lineNumbers: "on", lineWrapping: true, //强制换行 @@ -61,16 +62,17 @@ class m_editor extends Component { let download_url = detail && detail.download_url; return ( -
- {!readOnly ? - : - - } +
+
{!readOnly && (
@@ -86,7 +88,6 @@ class m_editor extends Component { onEmpty={onEmpty} empty={empty} filename={filename} - changeValueFlag={this.props.content !== changeValue} >
)} @@ -94,4 +95,4 @@ class m_editor extends Component { ); } } -export default m_editor; +export default m_editor; \ No newline at end of file diff --git a/src/forge/Server/fetch.js b/src/forge/Server/fetch.js index 742ef54a7..c07aaefee 100644 --- a/src/forge/Server/fetch.js +++ b/src/forge/Server/fetch.js @@ -1,10 +1,10 @@ import javaFetch from '../javaFetch'; -let settings = localStorage.chromesetting && JSON.parse(localStorage.chromesetting); -let actionUrl = (settings && settings.common && settings.common.softbot) ? settings.common.softbot :'http://172.20.32.202:4000' ; +// let settings = localStorage.chromesetting && JSON.parse(localStorage.chromesetting); +// let actionUrl = (settings && settings.common && settings.common.softbot) ? settings.common.softbot :'http://172.20.32.202:4000' ; // let actionUrl = 'http://172.20.32.202:4000' -const service = javaFetch(actionUrl); +const service = javaFetch(); // export const httpUrl = actionUrl; // export const main_site_url = settings && settings.common.main_site_url export default service; \ No newline at end of file