From 39ba2bf6ef987a29953b711de39f8a6334f3ac44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8D=A3=E5=BD=AC?= Date: Sat, 22 May 2021 23:52:08 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=94=AF=E6=8C=81=20slot=20?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E5=90=8E=20params=20=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=BF=9D=E7=95=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/props-reducers/downgrade-schema-reducer.ts | 1 + packages/utils/src/schema.ts | 11 ++++++----- .../src/props-reducers/downgrade-schema-reducer.ts | 11 ++++++----- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/packages/editor-preset-vision/src/props-reducers/downgrade-schema-reducer.ts b/packages/editor-preset-vision/src/props-reducers/downgrade-schema-reducer.ts index 65186ea81..443f1db81 100644 --- a/packages/editor-preset-vision/src/props-reducers/downgrade-schema-reducer.ts +++ b/packages/editor-preset-vision/src/props-reducers/downgrade-schema-reducer.ts @@ -18,6 +18,7 @@ export function compatibleReducer(props: any) { slotTitle: props.title, slotName: props.name, }, + __params__: props.params, }, }; } diff --git a/packages/utils/src/schema.ts b/packages/utils/src/schema.ts index 46bff1a69..29629e5be 100644 --- a/packages/utils/src/schema.ts +++ b/packages/utils/src/schema.ts @@ -27,6 +27,7 @@ export function compatibleLegaoSchema(props: any): any { title: (props.value.props as any)?.slotTitle, name: (props.value.props as any)?.slotName, value: props.value.children, + params: (props.value.props as any)?.__params__, }; } else { return props.value; @@ -44,11 +45,11 @@ export function compatibleLegaoSchema(props: any): any { if (/^__slot__/.test(key) && props[key] === true) { return; } - // TODO: 目前 dataSource 面板里既用到了 JSExpression,又用到了 variable,这里先都不处理,后面再重构 - if (key === 'dataSource') { - newProps[key] = props[key]; - return; - } + // TODO: 先移除,目前没有业务使用 + // if (key === 'dataSource') { + // newProps[key] = props[key]; + // return; + // } newProps[key] = compatibleLegaoSchema(props[key]); }); return newProps; diff --git a/packages/vision-polyfill/src/props-reducers/downgrade-schema-reducer.ts b/packages/vision-polyfill/src/props-reducers/downgrade-schema-reducer.ts index b727ecee6..4143c934c 100644 --- a/packages/vision-polyfill/src/props-reducers/downgrade-schema-reducer.ts +++ b/packages/vision-polyfill/src/props-reducers/downgrade-schema-reducer.ts @@ -24,6 +24,7 @@ export function compatibleReducer(props: any, node: Node): any { slotName: props.name, }, }, + __params__: props.params, }; } if (isJSExpression(props) && !props.events) { @@ -35,11 +36,11 @@ export function compatibleReducer(props: any, node: Node): any { } const newProps: any = {}; Object.entries(props).forEach(([key, val]) => { - // TODO: 目前 dataSource 面板里既用到了 JSExpression,又用到了 variable,这里先都不处理,后面再重构 - if (key === 'dataSource') { - newProps[key] = props[key]; - return; - } + // // TODO: 目前 dataSource 面板里既用到了 JSExpression,又用到了 variable,这里先都不处理,后面再重构 + // if (key === 'dataSource') { + // newProps[key] = props[key]; + // return; + // } newProps[key] = compatibleReducer(val, node); }); return newProps;