From 64397442c90ecca37ecb78906239abee8c0d8cc7 Mon Sep 17 00:00:00 2001
From: liaoxuezhi <2betop.cn@gmail.com>
Date: Mon, 9 Oct 2023 18:41:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=A8=20toolbar=20?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=20form=20=E5=80=BC=E5=8F=98=E5=8C=96?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20(#8326)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/amis-core/src/WithStore.tsx | 2 +-
 vite.config.ts                       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/amis-core/src/WithStore.tsx b/packages/amis-core/src/WithStore.tsx
index 6c9a0d4b9..6e1c37aee 100644
--- a/packages/amis-core/src/WithStore.tsx
+++ b/packages/amis-core/src/WithStore.tsx
@@ -252,7 +252,7 @@ export function HocStoreFactory(renderer: {
                   props.store?.storeType === 'ComboStore'
                   ? undefined
                   : syncDataFromSuper(
-                      props.data,
+                      store.data,
                       (props.data as any).__super,
                       (prevProps.data as any).__super,
                       store,
diff --git a/vite.config.ts b/vite.config.ts
index ea9fdb7f3..17c70cc06 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -62,7 +62,8 @@ export default defineConfig({
     }),
     monacoEditorPlugin({}),
     replace({
-      __editor_i18n: !!I18N
+      __editor_i18n: !!I18N,
+      preventAssignment: true
     })
   ].filter(n => n),
   optimizeDeps: {