From c2e83c7cdca4454b244a4b24616f694873bf64c6 Mon Sep 17 00:00:00 2001
From: "shuaige.zsg" <shuaige.zsg@alibaba-inc.com>
Date: Fri, 15 May 2020 17:46:26 +0800
Subject: [PATCH] feat: change reducer stage

---
 packages/designer/src/designer/builtin-hotkey.ts    |  2 ++
 packages/designer/src/document/document-model.ts    |  2 +-
 packages/designer/src/document/node/node.ts         |  4 ++--
 .../vision-preset/src/bundle/upgrade-metadata.ts    | 13 -------------
 packages/vision-preset/src/editor.ts                |  2 +-
 5 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/packages/designer/src/designer/builtin-hotkey.ts b/packages/designer/src/designer/builtin-hotkey.ts
index 8e01bbfff..3f1fbc2c4 100644
--- a/packages/designer/src/designer/builtin-hotkey.ts
+++ b/packages/designer/src/designer/builtin-hotkey.ts
@@ -108,6 +108,8 @@ hotkey.bind(['command+c', 'ctrl+c', 'command+x', 'ctrl+x'], (e, action) => {
   const componentsMap = {};
   const componentsTree = selected.map((item) => item.export(TransformStage.Save));
 
+  // FIXME: clear node.id
+
   const data = { type: 'nodeSchema', componentsMap, componentsTree };
 
   clipboard.setData(data);
diff --git a/packages/designer/src/document/document-model.ts b/packages/designer/src/document/document-model.ts
index fe7908500..b1c72b44d 100644
--- a/packages/designer/src/document/document-model.ts
+++ b/packages/designer/src/document/document-model.ts
@@ -483,7 +483,7 @@ export class DocumentModel {
 
   // add toData
   toData() {
-    const node = this.project?.currentDocument?.export(TransformStage.Serilize);
+    const node = this.project?.currentDocument?.export(TransformStage.Save);
     return { componentsTree: [node] };
   }
 
diff --git a/packages/designer/src/document/node/node.ts b/packages/designer/src/document/node/node.ts
index 63a75421d..b9dfc983a 100644
--- a/packages/designer/src/document/node/node.ts
+++ b/packages/designer/src/document/node/node.ts
@@ -486,9 +486,9 @@ export class Node<Schema extends NodeSchema = NodeSchema> {
       componentName: this.componentName,
     };
 
-    if (stage !== TransformStage.Save) {
+    // if (stage !== TransformStage.Save) {
       baseSchema.id = this.id;
-    }
+    // }
 
     if (this.isLeaf()) {
       baseSchema.children = this.props.get('children')?.export(stage);
diff --git a/packages/vision-preset/src/bundle/upgrade-metadata.ts b/packages/vision-preset/src/bundle/upgrade-metadata.ts
index 3e1713e6d..cad503a57 100644
--- a/packages/vision-preset/src/bundle/upgrade-metadata.ts
+++ b/packages/vision-preset/src/bundle/upgrade-metadata.ts
@@ -261,19 +261,6 @@ export function upgradePropConfig(config: OldPropConfig, collector: ConfigCollec
   } else if (hidden != null || disabled != null) {
     extraProps.condition = (field: Field) => !(isHidden(field) || isDisabled(field));
   }
-  if (ignore != null || disabled != null) {
-    // FIXME! addFilter
-    extraProps.virtual = (field: Field) => {
-      if (isDisabled(field)) {
-        return true;
-      }
-
-      if (typeof ignore === 'function') {
-        return ignore.call(field, field.getValue()) === true;
-      }
-      return ignore === true;
-    };
-  }
 
   if (type === 'group') {
     newConfig.items = items ? upgradeConfigure(items, collector) : [];
diff --git a/packages/vision-preset/src/editor.ts b/packages/vision-preset/src/editor.ts
index 201be5e8a..4f2cd4789 100644
--- a/packages/vision-preset/src/editor.ts
+++ b/packages/vision-preset/src/editor.ts
@@ -58,7 +58,7 @@ function filterReducer(props: any, node: Node): any {
   }
   return props;
 }
-designer.addPropsReducer(filterReducer, TransformStage.Serilize);
+designer.addPropsReducer(filterReducer, TransformStage.Save);
 designer.addPropsReducer(filterReducer, TransformStage.Render);
 
 function upgradePropsReducer(props: any) {