From 58f284b5b1646cb48e1c3d866ab6dd88e5b9642d Mon Sep 17 00:00:00 2001 From: zmq248570 Date: Tue, 5 May 2020 14:57:09 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=E8=AE=BE=E7=BD=AE+help?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/demo/package.json | 3 +- packages/demo/src/vision/index.ts | 34 ++++++++++++++++--- packages/demo/src/vision/module.d.ts | 1 + .../src/renderer-view.tsx | 10 ++++++ 4 files changed, 43 insertions(+), 5 deletions(-) diff --git a/packages/demo/package.json b/packages/demo/package.json index 562476b97..ef36aa7dd 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -41,7 +41,8 @@ "@alife/theme-lowcode-light": "^0.1.0", "react": "^16.8.1", "react-dom": "^16.8.1", - "@ali/vu-function-parser": "^2.5.0-beta.0" + "@ali/vu-function-parser": "^2.5.0-beta.0", + "compare-versions": "^3.0.1" }, "devDependencies": { "@ali/iceluna-cli": "^0.0.16", diff --git a/packages/demo/src/vision/index.ts b/packages/demo/src/vision/index.ts index 157b496a3..2e3bac151 100644 --- a/packages/demo/src/vision/index.ts +++ b/packages/demo/src/vision/index.ts @@ -18,8 +18,11 @@ import { upgradeAssetsBundle } from './upgrade-assets'; import { isCSSUrl } from '@ali/lowcode-utils'; import { I18nSetter } from '@ali/visualengine-utils'; import VariableSetter from '@ali/vs-variable-setter'; -import { isObject, isArray } from 'lodash'; +import _isArray from "lodash/isArray"; +import _isObject from "lodash/isObject"; +import _get from 'lodash/get'; import funcParser from '@ali/vu-function-parser'; +import cv from 'compare-versions'; const { editor, skeleton, context, HOOKS, Trunk } = Engine; @@ -104,6 +107,9 @@ function initDemoPanes() { align: 'bottom', icon: 'set', description: '设置', + // onClick:()=>{ + // Engine.Pages.currentPage.root.select(); + // } }, }); skeleton.add({ @@ -114,6 +120,15 @@ function initDemoPanes() { align: 'bottom', icon: 'help', description: '帮助', + onClick:()=>{ + const linkConfig = getDesignerModuleConfigs({}, 'helpLink'); + const reVersion = getConfig('RE_VERSION'); + let defaultLink = 'https://go.alibaba-inc.com/help/'; + if (cv(reVersion, '7.0.0') >= 0) { + defaultLink = 'https://go.alibaba-inc.com/help3/'; + } + window.open(linkConfig.url ? linkConfig.url : defaultLink, '_blank'); + } }, }); @@ -189,6 +204,18 @@ async function initTrunkPane() { Panes.add(TrunkPane); } +// 帮助面板 +function getDesignerModuleConfigs(source?:any, moduleName?:any) { + return _get(source, ['modules', moduleName], {}); +} +function getConfig(name: any) { + const { g_config, pageConfig } = window as any; + return ( + window[name] + || (g_config || {})[name] + || (pageConfig || {})[name] + ); +} // 数据源面板 function initDataPoolPane() { const dpConfigs = {}; @@ -336,9 +363,9 @@ function replaceFuncProp(props?: any){ } if ((prop.compiled && prop.source) || prop.type === 'actionRef' || prop.type === 'js') { replaceProps[name] = funcParser(prop); - } else if (isObject(prop)) { + } else if (_isObject(prop)) { replaceFuncProp(prop); - } else if (isArray(prop)) { + } else if (_isArray(prop)) { prop.map((propItem) => { replaceFuncProp(propItem); }); @@ -348,7 +375,6 @@ function replaceFuncProp(props?: any){ for (const name in replaceProps) { props[name] = replaceProps[name]; } - return props; }; diff --git a/packages/demo/src/vision/module.d.ts b/packages/demo/src/vision/module.d.ts index ba843aea9..be53328de 100644 --- a/packages/demo/src/vision/module.d.ts +++ b/packages/demo/src/vision/module.d.ts @@ -10,3 +10,4 @@ declare module '@ali/ve-i18n-manage-pane'; declare module '@ali/ve-action-pane'; declare module '@ali/vu-legao-design-fetch-context'; declare module "@ali/vu-function-parser"; +declare module "compare-versions"; diff --git a/packages/react-simulator-renderer/src/renderer-view.tsx b/packages/react-simulator-renderer/src/renderer-view.tsx index 7b41312c8..227cdd6dc 100644 --- a/packages/react-simulator-renderer/src/renderer-view.tsx +++ b/packages/react-simulator-renderer/src/renderer-view.tsx @@ -84,6 +84,16 @@ class Renderer extends Component<{ renderer: SimulatorRenderer }> { const { __id, __desingMode, ...viewProps } = props; viewProps.componentId = __id; viewProps._leaf = host.document.getNode(__id); + // if (Component.displayName === 'Calendar') { + // // debugger + // const testProps = { + // // defaultDate: undefined, + // // dateCellRender:(date: any)=>{return date.date();} + // // onSelect:(value:any)=>{console.log(value,'test')} + // // defaultMonth: undefined, + // }; + // Object.assign(viewProps, testProps); + // } return createElement( Component, viewProps, From c3b075b7d5ea9f0c7ee39958857d0916ee2fee73 Mon Sep 17 00:00:00 2001 From: "mario.gk" Date: Tue, 5 May 2020 18:51:37 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=A1=B6=E9=83=A8=E4=B8=AD=E9=97=B4?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/editor-skeleton/src/layouts/workbench.less | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/editor-skeleton/src/layouts/workbench.less b/packages/editor-skeleton/src/layouts/workbench.less index e87427624..6c7348cfd 100644 --- a/packages/editor-skeleton/src/layouts/workbench.less +++ b/packages/editor-skeleton/src/layouts/workbench.less @@ -185,12 +185,12 @@ body { display: flex; margin-bottom: 2px; padding: 8px; - .lc-top-area-left{} + .lc-top-area-center{ flex: 1; display: flex; - justify-content: flex-end; - margin-right: 8px; + justify-content: center; + margin: 0 8px; } .lc-top-area-right{ display: flex; @@ -274,7 +274,7 @@ body { svg { fill: var(--color-icon-normal,rgba(31,56,88,.4)); } - + &.has-tip{ cursor: pointer; } From 48f3be132635b8edd928a0cdbdd82ceee2b764d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E7=86=A0?= Date: Tue, 5 May 2020 19:19:34 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=F0=9F=90=9B=20history=20pane=20zind?= =?UTF-8?q?ex?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/editor-skeleton/src/layouts/workbench.less | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/editor-skeleton/src/layouts/workbench.less b/packages/editor-skeleton/src/layouts/workbench.less index 6c7348cfd..a6f3a9359 100644 --- a/packages/editor-skeleton/src/layouts/workbench.less +++ b/packages/editor-skeleton/src/layouts/workbench.less @@ -331,6 +331,7 @@ body { flex: 1; display: flex; flex-direction: column; + z-index: 10; .lc-toolbar { height: var(--toolbar-height); background-color: var(--color-pane-background); From 1ea0d73d09bf5b6b2bf34051c8c58699f93c9bbc Mon Sep 17 00:00:00 2001 From: "xiaoxian.xlf" Date: Tue, 5 May 2020 19:22:17 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20documentModel=20toData=20=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/designer/src/document/document-model.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/designer/src/document/document-model.ts b/packages/designer/src/document/document-model.ts index ac739d625..39d50f3de 100644 --- a/packages/designer/src/document/document-model.ts +++ b/packages/designer/src/document/document-model.ts @@ -461,14 +461,16 @@ export class DocumentModel { return config.checkNestingDown(parent, obj) && this.checkNestingUp(parent, obj); } - // ======= compatibles + // ======= compatibles for vision getRoot() { return this.rootNode; } - /** - * 兼容vision - */ + // add toData + toData() { + return { componentsTree: [this.project?.currentDocument?.export()] }; + } + getHistory(): History { return this.history; } From 2701824f6f52e6ad589b2a7f8abf62907334ac52 Mon Sep 17 00:00:00 2001 From: zmq248570 Date: Tue, 5 May 2020 19:24:08 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=E6=95=B0=E6=8D=AE=E5=88=97=E7=82=B9?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=BC=96=E8=BE=91=20drawer=20=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E6=89=93=E5=BC=80=E7=A9=BA=E7=99=BD?= 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/main-area.tsx | 2 +- .../src/layouts/right-area.tsx | 2 +- .../editor-skeleton/src/layouts/top-area.tsx | 2 +- .../src/renderer-view.tsx | 10 ------- 5 files changed, 5 insertions(+), 39 deletions(-) diff --git a/packages/demo/src/vision/index.ts b/packages/demo/src/vision/index.ts index f8a2ecfb5..e01b724c6 100644 --- a/packages/demo/src/vision/index.ts +++ b/packages/demo/src/vision/index.ts @@ -102,10 +102,7 @@ function initDemoPanes() { props: { align: 'bottom', icon: 'set', - description: '设置', - // onClick:()=>{ - // Engine.Pages.currentPage.root.select(); - // } + description: '设置' }, }); skeleton.add({ @@ -115,16 +112,7 @@ function initDemoPanes() { props: { align: 'bottom', icon: 'help', - description: '帮助', - onClick:()=>{ - const linkConfig = getDesignerModuleConfigs({}, 'helpLink'); - const reVersion = getConfig('RE_VERSION'); - let defaultLink = 'https://go.alibaba-inc.com/help/'; - if (cv(reVersion, '7.0.0') >= 0) { - defaultLink = 'https://go.alibaba-inc.com/help3/'; - } - window.open(linkConfig.url ? linkConfig.url : defaultLink, '_blank'); - } + description: '帮助' }, }); @@ -200,18 +188,6 @@ async function initTrunkPane() { Panes.add(TrunkPane); } -// 帮助面板 -function getDesignerModuleConfigs(source?:any, moduleName?:any) { - return _get(source, ['modules', moduleName], {}); -} -function getConfig(name: any) { - const { g_config, pageConfig } = window as any; - return ( - window[name] - || (g_config || {})[name] - || (pageConfig || {})[name] - ); -} // 数据源面板 function initDataPoolPane() { const dpConfigs = {}; diff --git a/packages/editor-skeleton/src/layouts/main-area.tsx b/packages/editor-skeleton/src/layouts/main-area.tsx index 891053427..9361a320f 100644 --- a/packages/editor-skeleton/src/layouts/main-area.tsx +++ b/packages/editor-skeleton/src/layouts/main-area.tsx @@ -13,7 +13,7 @@ export default class MainArea extends Component<{ area: Area +
{area.container.items.map((item) => item.content)}
); diff --git a/packages/editor-skeleton/src/layouts/right-area.tsx b/packages/editor-skeleton/src/layouts/right-area.tsx index 9379f55b1..69178edc3 100644 --- a/packages/editor-skeleton/src/layouts/right-area.tsx +++ b/packages/editor-skeleton/src/layouts/right-area.tsx @@ -12,7 +12,7 @@ export default class RightArea extends Component<{ area: Area }> { render() { const { area } = this.props; return ( -
diff --git a/packages/editor-skeleton/src/layouts/top-area.tsx b/packages/editor-skeleton/src/layouts/top-area.tsx index 2b8535117..062399a32 100644 --- a/packages/editor-skeleton/src/layouts/top-area.tsx +++ b/packages/editor-skeleton/src/layouts/top-area.tsx @@ -8,7 +8,7 @@ export default class TopArea extends Component<{ area: Area }> { render() { const { area } = this.props; return ( -
diff --git a/packages/react-simulator-renderer/src/renderer-view.tsx b/packages/react-simulator-renderer/src/renderer-view.tsx index 9e76eee34..e964c2be9 100644 --- a/packages/react-simulator-renderer/src/renderer-view.tsx +++ b/packages/react-simulator-renderer/src/renderer-view.tsx @@ -84,16 +84,6 @@ class Renderer extends Component<{ renderer: SimulatorRenderer }> { const { __id, __desingMode, ...viewProps } = props; viewProps.componentId = __id; viewProps._leaf = host.document.getNode(__id); - // if (Component.displayName === 'Calendar') { - // // debugger - // const testProps = { - // // defaultDate: undefined, - // // dateCellRender:(date: any)=>{return date.date();} - // // onSelect:(value:any)=>{console.log(value,'test')} - // // defaultMonth: undefined, - // }; - // Object.assign(viewProps, testProps); - // } return createElement( Component, viewProps,