From 024db057ac6c886b3caa9baffc8ca1dd6db6ee40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=A7=E6=AF=85?= <changyun.pcy@alibaba-inc.com>
Date: Tue, 2 Feb 2021 20:43:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E5=B0=86=20JSSlot=20?=
 =?UTF-8?q?=E9=99=8D=E7=BA=A7=E5=88=B0=20JSBlock=20=E7=9A=84=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD,=20=E4=BB=A5=E4=BE=BF=E8=A7=A3=E5=86=B3=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E5=92=8C=E5=87=BA=E7=A0=81=E6=97=B6=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=20JSBlock=20=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor-preset-vision/src/editor.ts   |  5 +-
 .../downgrade-schema-reducer.ts               | 52 +++++++++----------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/packages/editor-preset-vision/src/editor.ts b/packages/editor-preset-vision/src/editor.ts
index 62b179095..bc01a01a4 100644
--- a/packages/editor-preset-vision/src/editor.ts
+++ b/packages/editor-preset-vision/src/editor.ts
@@ -12,7 +12,7 @@ import { Skeleton, SettingsPrimaryPane, registerDefaults } from '@ali/lowcode-ed
 import { deepValueParser } from './deep-value-parser';
 import { liveEditingRule, liveEditingSaveHander } from './vc-live-editing';
 import {
-  compatibleReducer,
+  // compatibleReducer,
   upgradePageLifeCyclesReducer,
   stylePropsReducer,
   upgradePropsReducer,
@@ -55,7 +55,8 @@ designer.addPropsReducer(filterReducer, TransformStage.Save);
 designer.addPropsReducer(filterReducer, TransformStage.Render);
 
 // FIXME: Dirty fix, will remove this reducer
-designer.addPropsReducer(compatibleReducer, TransformStage.Save);
+// designer.addPropsReducer(compatibleReducer, TransformStage.Save);
+
 // 兼容历史版本的 Page 组件
 designer.addPropsReducer(upgradePageLifeCyclesReducer, TransformStage.Save);
 
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 8b75beda6..f2b263bbf 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
@@ -1,26 +1,26 @@
-import {
-  isPlainObject,
-} from '@ali/lowcode-utils';
-import { isJSExpression, isJSSlot } from '@ali/lowcode-types';
+// import { isPlainObject } from '@ali/lowcode-utils';
+// import { isJSExpression, isJSSlot } from '@ali/lowcode-types';
 
 export function compatibleReducer(props: any) {
-  if (!props || !isPlainObject(props)) {
-    return props;
-  }
-  // 为了能降级到老版本，建议在后期版本去掉以下代码
-  if (isJSSlot(props)) {
-    return {
-      type: 'JSBlock',
-      value: {
-        componentName: 'Slot',
-        children: props.value,
-        props: {
-          slotTitle: props.title,
-          slotName: props.name,
-        },
-      },
-    };
-  }
+  return props;
+  // if (!props || !isPlainObject(props)) {
+  //   return props;
+  // }
+
+  // // 为了能降级到老版本，建议在后期版本去掉以下代码
+  // if (isJSSlot(props)) {
+  //   return {
+  //     type: 'JSBlock',
+  //     value: {
+  //       componentName: 'Slot',
+  //       children: props.value,
+  //       props: {
+  //         slotTitle: props.title,
+  //         slotName: props.name,
+  //       },
+  //     },
+  //   };
+  // }
   // if (isJSExpression(props) && !props.events) {
   //   return {
   //     type: 'variable',
@@ -28,9 +28,9 @@ export function compatibleReducer(props: any) {
   //     variable: props.value,
   //   };
   // }
-  const newProps: any = {};
-  Object.entries<any>(props).forEach(([key, val]) => {
-    newProps[key] = compatibleReducer(val);
-  });
-  return newProps;
+  // const newProps: any = {};
+  // Object.entries<any>(props).forEach(([key, val]) => {
+  //   newProps[key] = compatibleReducer(val);
+  // });
+  // return newProps;
 }