github/lowcode-engine
1
0
Fork 0
mirror of https://github.com/alibaba/lowcode-engine.git synced 2026-01-13 09:41:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/setter-bugs-1012' into 'release/1.0.0'

Browse Source 
Fix/setter bugs 1012



See merge request !1015868
This commit is contained in:
荣彬 2020-10-19 16:45:56 +08:00
commit 747abaf56f
6 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/demo/public/index.html
View File

@ -19,11 +19,11 @@
<script src="https://unpkg.alibaba-inc.com/@alifd/next@1.20.25/dist/next.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/rax@1.1.3/dist/rax.js"></script>
<script>
var require = { paths: { vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.21.0/min/vs' } };
var require = { paths: { vs: 'https://g.alicdn.com/code/lib/monaco-editor/0.21.2/min/vs' } };
</script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.21.0/min/vs/loader.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.21.0/min/vs/editor/editor.main.nls.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.21.0/min/vs/editor/editor.main.js"></script>
<script src="https://g.alicdn.com/code/lib/monaco-editor/0.21.2/min/vs/loader.min.js"></script>
<script src="https://g.alicdn.com/code/lib/monaco-editor/0.21.2/min/vs/editor/editor.main.nls.js"></script>
<script src="https://g.alicdn.com/code/lib/monaco-editor/0.21.2/min/vs/editor/editor.main.js"></script>
<link rel="stylesheet" href="/css/editor-preset-vision.css" />
<script>
window.pageConfig = {

5
packages/editor-preset-general/build.json
View File

@ -9,7 +9,10 @@
"externals": {
"react": "var window.React",
"react-dom": "var window.ReactDOM",
"prop-types": "var window.PropTypes"
"prop-types": "var window.PropTypes",
"monaco-editor/esm/vs/editor/editor.api":"var window.monaco",
"monaco-editor/esm/vs/editor/editor.main.js":"var window.monaco"
}
}
],

5
packages/editor-preset-vision/build.json
View File

@ -10,7 +10,10 @@
"react": "var window.React",
"react-dom": "var window.ReactDOM",
"prop-types": "var window.PropTypes",
"rax": "var window.Rax"
"rax": "var window.Rax",
"@ali/visualengine-utils": "var window.VisualEngineUtils",
"monaco-editor/esm/vs/editor/editor.api":"var window.monaco",
"monaco-editor/esm/vs/editor/editor.main.js":"var window.monaco"
}
}
],

2
packages/editor-setters/src/function-setter/index.tsx
View File

@ -181,7 +181,7 @@ export default class FunctionSetter extends PureComponent<FunctionSetterProps> {
const { onChange } = this.props;
onChange({
type: 'JSFunction',
value: `function(){ this.${eventName}() }`,
value: `function(){ return this.${eventName}() }`,
});
};

4
packages/editor-skeleton/src/layouts/left-float-pane.tsx
View File

@ -40,8 +40,8 @@ export default class LeftFloatPane extends Component<{ area: Area<any, Panel> }>
.contentWindow.document.documentElement.contains(target)) {
return false;
}
// 点击非编辑区域的 popup / dialog 等，不触发失焦
if (!document.querySelector('.lc-workbench')?.contains(target)) {
// 点击非编辑区域的popup/dialog,插件栏左侧等不触发失焦
if (!document.querySelector('.lc-workbench')?.contains(target) || document.querySelector('.lc-left-area')?.contains(target)) {
return true;
}
const docks = area.current?.getAssocDocks();

2
packages/react-renderer/package.json
View File

@ -53,5 +53,5 @@
"publishConfig": {
"registry": "http://registry.npm.alibaba-inc.com"
},
"homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-react-renderer@1.0.10/build/index.html"
"homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-react-renderer@1.0.11/build/index.html"
}