From 7c9dc0495bc046cf07a4f7c505820aa935039d01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8D=A3=E5=BD=AC?= <rongbin.arb@alibaba-inc.com>
Date: Thu, 13 Aug 2020 22:42:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9entry=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/demo/src/editor/config.js            |  1 -
 .../src/components/settings/settings-pane.tsx | 29 +++++++------------
 packages/plugin-undo-redo/src/index.tsx       |  2 +-
 packages/react-renderer/package.json          |  2 +-
 4 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/packages/demo/src/editor/config.js b/packages/demo/src/editor/config.js
index a1c6ef94b..f7350a0ec 100644
--- a/packages/demo/src/editor/config.js
+++ b/packages/demo/src/editor/config.js
@@ -13,7 +13,6 @@ export default {
           href: '/',
         },
       },
-      
       {
         pluginKey: 'undoRedo',
         type: 'Custom',
diff --git a/packages/editor-skeleton/src/components/settings/settings-pane.tsx b/packages/editor-skeleton/src/components/settings/settings-pane.tsx
index 9045a62bf..0db2f2257 100644
--- a/packages/editor-skeleton/src/components/settings/settings-pane.tsx
+++ b/packages/editor-skeleton/src/components/settings/settings-pane.tsx
@@ -2,14 +2,13 @@ import { Component, MouseEvent, Fragment } from 'react';
 import { shallowIntl, createSetterContent, observer, obx, Title } from '@ali/lowcode-editor-core';
 import { createContent } from '@ali/lowcode-utils';
 import { createField } from '../field';
+import PopupService, { PopupPipe } from '../popup';
 import { SkeletonContext } from '../../context';
 import { SettingField, isSettingField, SettingTopEntry, SettingEntry } from '@ali/lowcode-designer';
-import { Icon } from '@alifd/next';
+// import { Icon } from '@alifd/next';
 import { isSetterConfig, CustomView } from '@ali/lowcode-types';
 import { intl } from '../../locale';
 import { Skeleton } from 'editor-skeleton/src/skeleton';
-import { Skeleton } from '../../skeleton';
-import { Stage } from '../../widget/stage';
 function transformStringToFunction(str) {
   if (typeof str !== 'string') return str;
   return new Function(`"use strict"; return ${str}`)();
@@ -227,6 +226,9 @@ export class SettingsPane extends Component<SettingsPaneProps> {
     return false;
   }
 
+  private popupPipe = new PopupPipe();
+  private pipe = this.popupPipe.create();
+
   private handleClick = (e: MouseEvent) => {
     // compatiable vision stageBox
     // TODO: optimize these codes
@@ -268,25 +270,16 @@ export class SettingsPane extends Component<SettingsPaneProps> {
 
   render() {
     const { target } = this.props;
+    const items = target.items;
 
     return (
       <div className="lc-settings-pane" onClick={this.handleClick}>
-        {this.currentStage && (
-          <div className="lc-setting-stage-back">
-            <Icon
-              className="lc-setting-stage-back-icon"
-              type="arrow-left"
-              size="xs"
-              onClick={this.popStage.bind(this)}
-            />
-            <Title title={this.currentStage.title} />
+        {/* todo: add head for single use */}
+        <PopupService popupPipe={this.popupPipe}>
+          <div className="lc-settings-content">
+            {items.map((item, index) => createSettingFieldView(item, target, index))}
           </div>
-        )}
-        <div className="lc-settings-content">
-          {this.currentStage
-            ? this.currentStage.content
-            : target.items.map((item, index) => createSettingFieldView(item, target, index))}
-        </div>
+        </PopupService>
       </div>
     );
   }
diff --git a/packages/plugin-undo-redo/src/index.tsx b/packages/plugin-undo-redo/src/index.tsx
index 4439e55d6..b3b0f604e 100644
--- a/packages/plugin-undo-redo/src/index.tsx
+++ b/packages/plugin-undo-redo/src/index.tsx
@@ -18,7 +18,7 @@ export interface IState {
 }
 
 export default class UndoRedo extends PureComponent<IProps, IState> {
-  public static display = 'LowcodeUndoRedo';
+  static displayName = 'LowcodeUndoRedo';
 
   private history: any;
 
diff --git a/packages/react-renderer/package.json b/packages/react-renderer/package.json
index 55a53cb5e..477765cbd 100644
--- a/packages/react-renderer/package.json
+++ b/packages/react-renderer/package.json
@@ -53,5 +53,5 @@
   "publishConfig": {
     "registry": "http://registry.npm.alibaba-inc.com"
   },
-  "homepage": "https:/unpkg.alibaba-inc.com/@ali/lowcode-react-renderer@0.8.17/build/index.html"
+  "homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-react-renderer@0.8.17/build/index.html"
 }