From de935ad32c9cae204b4e35a425e8e0bf6f80f986 Mon Sep 17 00:00:00 2001
From: wangyuzhen01 <wangyuzhen01@baidu.com>
Date: Fri, 6 Jan 2023 15:49:36 +0800
Subject: [PATCH] =?UTF-8?q?amis-saas-8146=201.=20subEditor=20=E9=80=8F?=
 =?UTF-8?q?=E4=BC=A0=20amisEnv;=202.=20=E4=BF=AE=E5=A4=8D=E9=87=8D?=
 =?UTF-8?q?=E5=90=8D=20schemaTpl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ie42a07b6b208121acc99d7a7e9f5a65c86086e03
---
 packages/amis-editor-core/src/component/Editor.tsx    | 7 ++++++-
 packages/amis-editor-core/src/component/SubEditor.tsx | 7 ++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/amis-editor-core/src/component/Editor.tsx b/packages/amis-editor-core/src/component/Editor.tsx
index 68cc648d6..d07c66350 100644
--- a/packages/amis-editor-core/src/component/Editor.tsx
+++ b/packages/amis-editor-core/src/component/Editor.tsx
@@ -548,7 +548,12 @@ export default class Editor extends Component<EditorProps> {
           {!preview && <ContextMenuPanel store={this.store} />}
         </div>
 
-        <SubEditor store={this.store} manager={this.manager} theme={theme} />
+        <SubEditor
+          store={this.store}
+          manager={this.manager}
+          theme={theme}
+          amisEnv={amisEnv}
+        />
         <ScaffoldModal
           store={this.store}
           manager={this.manager}
diff --git a/packages/amis-editor-core/src/component/SubEditor.tsx b/packages/amis-editor-core/src/component/SubEditor.tsx
index 0ec07d27e..b120065cc 100644
--- a/packages/amis-editor-core/src/component/SubEditor.tsx
+++ b/packages/amis-editor-core/src/component/SubEditor.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import {EditorManager} from '../manager';
 import {EditorStoreType} from '../store/editor';
 import {render} from 'amis';
-import {createObject} from 'amis-core';
+import {createObject, RenderOptions} from 'amis-core';
 
 import {observer} from 'mobx-react';
 import Editor from './Editor';
@@ -18,6 +18,7 @@ export interface SubEditorProps {
   store: EditorStoreType;
   manager: EditorManager;
   theme?: string;
+  amisEnv?: RenderOptions;
 }
 
 @observer
@@ -96,7 +97,7 @@ export class SubEditor extends React.Component<SubEditorProps> {
   }
 
   buildSchema() {
-    const {store, manager} = this.props;
+    const {store, manager, amisEnv} = this.props;
     const subEditorContext = store.subEditorContext;
     const config = manager.config;
     let superEditorData: any = store.superEditorData;
@@ -152,7 +153,7 @@ export class SubEditor extends React.Component<SubEditorProps> {
                     isSubEditor={true}
                     iframeUrl={config.iframeUrl}
                     ctx={store.ctx}
-                    amisEnv={config.amisEnv}
+                    amisEnv={amisEnv || config.amisEnv}
                     appLocale={config.appLocale}
                     i18nEnabled={config.i18nEnabled}
                     plugins={config.plugins}