From db6f231176b775d5faa69d9926b5284d966e5ab7 Mon Sep 17 00:00:00 2001 From: "mario.gk" Date: Mon, 4 May 2020 17:11:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?actionPane=20=E6=94=AF=E6=8C=81=20index?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/demo/src/vision/index.ts | 28 +++++++++---------- .../editor-skeleton/src/layouts/top-area.tsx | 6 +++- packages/vision-preset/src/panes.ts | 2 +- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/packages/demo/src/vision/index.ts b/packages/demo/src/vision/index.ts index 74175f7bd..d0cc40504 100644 --- a/packages/demo/src/vision/index.ts +++ b/packages/demo/src/vision/index.ts @@ -140,20 +140,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/vision-preset/src/panes.ts b/packages/vision-preset/src/panes.ts index 792628d51..80bc2aabb 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: props?.index, }; if (type === 'dock') { newConfig.type = 'PanelDock'; From c1760da2edb9d6d80bf1f384191e8ff2444756f6 Mon Sep 17 00:00:00 2001 From: "mario.gk" Date: Mon, 4 May 2020 18:31:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?pane=20=E7=9B=B8=E5=85=B3=20bug=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/demo/public/schema.json | 3 +- packages/demo/src/vision/index.ts | 100 ++++--------------- packages/editor-skeleton/src/widget/panel.ts | 2 - packages/vision-preset/src/panes.ts | 2 +- packages/vision-preset/src/vision.less | 4 + 5 files changed, 29 insertions(+), 82 deletions(-) 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 d0cc40504..fce7f2400 100644 --- a/packages/demo/src/vision/index.ts +++ b/packages/demo/src/vision/index.ts @@ -327,93 +327,37 @@ function initActionPane() { // 操作历史与页面历史面板 function initHistoryPane() { - // let historyConfigs = {getDesignerModuleConfigs( - // this.designerConfigs, - // 'history', - // )}; - let historyConfigs = { - enableRedoAndUndo: true, - enablePageHistory: true, - };; - - // if (!historyConfigs) { - // return; - // } - - // if (historyConfigs === true) { - // historyConfigs = { - // enableRedoAndUndo: true, - // enablePageHistory: true, - // }; - // } - - // if (historyConfigs.enableRedoAndUndo === undefined) { - // historyConfigs.enableRedoAndUndo = true; - // } - // if (historyConfigs.enablePageHistory === undefined) { - // historyConfigs.enablePageHistory = true; - // } - - const isDemoMode = false; - const isEnvSupportsHistoryPane = true; - const historyManager = PageHistoryManager.getManager(); - - console.log('PageHistoryManager', historyManager); - console.log('PageHistoryManager.onOpenPane', historyManager.onOpenPane); - // 历史撤销、重做以及唤起页面历史按钮 if (typeof HistoryPane === 'function') { - // const historyPane = { - // ...HistoryPane({ - // showPageHistory: - // isEnvSupportsHistoryPane - // // && this.app.isForm() - // && !isDemoMode, - // historyManager, - // historyConfigs, - // }), - // index: -940, - // }; - // console.log('aaaaaa', historyPane); - - Panes.add(HistoryPane, { - props : { - showPageHistory: - isEnvSupportsHistoryPane - // && this.app.isForm() - && !isDemoMode, - historyManager, - historyConfigs, - index: -940, - } + Panes.add({ + ...HistoryPane({ + showPageHistory: true, + historyManager: PageHistoryManager.getManager(), + historyConfigs: { + enableRedoAndUndo: true, + enablePageHistory: true, + }, + }), + index: -940, }); } else { - Panes.add(HistoryPane, { + Panes.add({ + ...HistoryPane, index: -940, }); } // 页面历史 UI 面板 - if ( - PageHistoryPane - && !isDemoMode - && isEnvSupportsHistoryPane - ) { - console.log(1111, PageHistoryPane({ - historyManager: PageHistoryManager.getManager(), - app: {}, - })) - Panes.add(PageHistoryPane, { - props : { - historyManager: { - historyManager, - app: { - - } - }, - index: -940, + Panes.add(PageHistoryPane, { + props : { + historyManager: { + historyManager: PageHistoryManager.getManager(), + app: { + + } }, - }); - } + index: -940, + }, + }); } 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 80bc2aabb..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: 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; +}