diff --git a/packages/demo/public/schema.json b/packages/demo/public/schema.json index 1c7d2a300..591992766 100644 --- a/packages/demo/public/schema.json +++ b/packages/demo/public/schema.json @@ -2,7 +2,8 @@ "componentName": "Page", "fileName": "test", "dataSource": { - "list": [] + "list": [], + "online": [] }, "state": { "text": "outter" diff --git a/packages/demo/src/vision/index.ts b/packages/demo/src/vision/index.ts index 7a00e33cb..157b496a3 100644 --- a/packages/demo/src/vision/index.ts +++ b/packages/demo/src/vision/index.ts @@ -143,20 +143,20 @@ function initDemoPanes() { children: '保存', }), }); - skeleton.add({ - area: 'topArea', - type: 'Dock', - name: 'preview4', - props: { - align: 'center', - }, - content: createElement('img', { - src: 'https://img.alicdn.com/tfs/TB1WW.VC.z1gK0jSZLeXXb9kVXa-486-64.png', - style: { - height: 32, - }, - }), - }); + // skeleton.add({ + // area: 'topArea', + // type: 'Dock', + // name: 'preview4', + // props: { + // align: 'center', + // }, + // content: createElement('img', { + // src: 'https://img.alicdn.com/tfs/TB1WW.VC.z1gK0jSZLeXXb9kVXa-486-64.png', + // style: { + // height: 32, + // }, + // }), + // }); skeleton.add({ area: 'topArea', type: 'Dock', diff --git a/packages/editor-skeleton/src/layouts/top-area.tsx b/packages/editor-skeleton/src/layouts/top-area.tsx index 532fc1fef..2b8535117 100644 --- a/packages/editor-skeleton/src/layouts/top-area.tsx +++ b/packages/editor-skeleton/src/layouts/top-area.tsx @@ -24,7 +24,11 @@ class Contents extends Component<{ area: Area }> { const left: any[] = []; const center: 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') { center.push(item.content); } else if (item.align === 'left') { diff --git a/packages/editor-skeleton/src/widget/panel.ts b/packages/editor-skeleton/src/widget/panel.ts index d0336fe6c..f03e6a130 100644 --- a/packages/editor-skeleton/src/widget/panel.ts +++ b/packages/editor-skeleton/src/widget/panel.ts @@ -74,8 +74,6 @@ export default class Panel implements IWidget { ); content.forEach((item) => this.add(item)); } - // compatiable for vision, init at first - this.initBody(); // todo: process shortcut } diff --git a/packages/vision-preset/src/panes.ts b/packages/vision-preset/src/panes.ts index 792628d51..3604e6186 100644 --- a/packages/vision-preset/src/panes.ts +++ b/packages/vision-preset/src/panes.ts @@ -63,7 +63,7 @@ function upgradeConfig(config: OldPaneConfig): IWidgetBaseConfig & { area: strin onDestroy: destroy, }, contentProps: props, - index, + index: index || props?.index, }; if (type === 'dock') { newConfig.type = 'PanelDock'; diff --git a/packages/vision-preset/src/vision.less b/packages/vision-preset/src/vision.less index 492464688..b87da9230 100644 --- a/packages/vision-preset/src/vision.less +++ b/packages/vision-preset/src/vision.less @@ -84,3 +84,7 @@ html.engine-blur #engine { width: 100%; white-space: nowrap; } + +.lc-left-float-pane { + font-size: 14px; +}