Merge branch 'release/1.0.0' of gitlab.alibaba-inc.com:ali-lowcode/ali-lowcode-engine into release/1.0.0

This commit is contained in:
荣彬 2020-08-22 07:57:30 +08:00
commit 3a28ed6b07
4 changed files with 376 additions and 635 deletions

File diff suppressed because it is too large Load Diff

View File

@ -72,7 +72,7 @@ export default class FunctionSetter extends PureComponent<FunctionSetterProps, {
* ()
*/
renderButton = () => {
return <Button type="primary" onClick={() => this.bindFunction()}></Button>
return <Button type="normal" onClick={() => this.bindFunction()}></Button>
}
focusFunctionName = (functionName) => {

View File

@ -217,7 +217,7 @@ class MonacoEditorDefaultView extends PureComponent {
width="100%"
height="300"
language={tarLanguage}
theme={theme || window.__monacoTheme || 'vs-dark'}
theme={theme || window.__monacoTheme}
options={isFullScreen ? this.fullScreenOptions : this.options}
onChange={this.onChange}
editorWillMount={editorWillMount}

View File

@ -30,7 +30,16 @@ class FaultComponent extends PureComponent {
render() {
// FIXME: errorlog
console.error('render error', this.props);
return <Div>RenderError</Div>;
return <Div style={{
width:'100%',
height:'50px',
lineHeight: '50px',
textAlign: 'center',
fontSize: '15px',
color: '#ff0000',
border: '2px solid #ff0000'
}}>组件渲染异常请查看控制台日志</Div>;
}
}