diff --git a/packages/canvas/src/components/render/RenderMain.js b/packages/canvas/src/components/render/RenderMain.js
index 29a7ac33b6..468f0e0f78 100644
--- a/packages/canvas/src/components/render/RenderMain.js
+++ b/packages/canvas/src/components/render/RenderMain.js
@@ -162,7 +162,7 @@ const setState = (data, clear) => {
   Object.assign(state, parseData(data, {}, getContext()) || {})
 
   // 在状态变量合并之后，执行访问器中watchEffect，为了可以在访问器函数中可以访问其他state变量
-  Object.entries(data)?.forEach(([key, stateData]) => {
+  Object.entries(data || {})?.forEach(([key, stateData]) => {
     if (isStateAccessor(stateData)) {
       const accessor = stateData.accessor
       if (accessor?.getter?.value) {
diff --git a/packages/toolbars/logo/src/Main.vue b/packages/toolbars/logo/src/Main.vue
index 2526b4959b..42313e9306 100644
--- a/packages/toolbars/logo/src/Main.vue
+++ b/packages/toolbars/logo/src/Main.vue
@@ -76,7 +76,7 @@
             <tiny-tooltip
               class="item"
               effect="dark"
-              content="是否需要生成工程的默认配置，如package.json等文件。如果选择的为否，只会生成页面对应的代码。不会生成一些配置文件。"
+              content="是否生成工程默认配置，如package.json等文件。如选择为否，只生成页面对应代码，不生成配置文件。"
               placement="top"
               popper-class="help-tooltip"
             >