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

This commit is contained in:
zmq248570 2020-05-04 19:50:19 +08:00
commit 28d7660f1a
6 changed files with 26 additions and 19 deletions

View File

@ -2,7 +2,8 @@
"componentName": "Page", "componentName": "Page",
"fileName": "test", "fileName": "test",
"dataSource": { "dataSource": {
"list": [] "list": [],
"online": []
}, },
"state": { "state": {
"text": "outter" "text": "outter"

View File

@ -143,20 +143,20 @@ function initDemoPanes() {
children: '保存', children: '保存',
}), }),
}); });
skeleton.add({ // skeleton.add({
area: 'topArea', // area: 'topArea',
type: 'Dock', // type: 'Dock',
name: 'preview4', // name: 'preview4',
props: { // props: {
align: 'center', // align: 'center',
}, // },
content: createElement('img', { // content: createElement('img', {
src: 'https://img.alicdn.com/tfs/TB1WW.VC.z1gK0jSZLeXXb9kVXa-486-64.png', // src: 'https://img.alicdn.com/tfs/TB1WW.VC.z1gK0jSZLeXXb9kVXa-486-64.png',
style: { // style: {
height: 32, // height: 32,
}, // },
}), // }),
}); // });
skeleton.add({ skeleton.add({
area: 'topArea', area: 'topArea',
type: 'Dock', type: 'Dock',

View File

@ -24,7 +24,11 @@ class Contents extends Component<{ area: Area }> {
const left: any[] = []; const left: any[] = [];
const center: any[] = []; const center: any[] = [];
const right: any[] = []; const right: any[] = [];
area.container.items.forEach(item => { area.container.items.sort((a,b) => {
const index1 = a.config?.index || 0;
const index2 = b.config?.index || 0;
return index1 === index2 ? 0 : (index1 > index2 ? 1 : -1);
}).forEach(item => {
if (item.align === 'center') { if (item.align === 'center') {
center.push(item.content); center.push(item.content);
} else if (item.align === 'left') { } else if (item.align === 'left') {

View File

@ -74,8 +74,6 @@ export default class Panel implements IWidget {
); );
content.forEach((item) => this.add(item)); content.forEach((item) => this.add(item));
} }
// compatiable for vision, init at first
this.initBody();
// todo: process shortcut // todo: process shortcut
} }

View File

@ -63,7 +63,7 @@ function upgradeConfig(config: OldPaneConfig): IWidgetBaseConfig & { area: strin
onDestroy: destroy, onDestroy: destroy,
}, },
contentProps: props, contentProps: props,
index, index: index || props?.index,
}; };
if (type === 'dock') { if (type === 'dock') {
newConfig.type = 'PanelDock'; newConfig.type = 'PanelDock';

View File

@ -84,3 +84,7 @@ html.engine-blur #engine {
width: 100%; width: 100%;
white-space: nowrap; white-space: nowrap;
} }
.lc-left-float-pane {
font-size: 14px;
}