From 5d808ef0fc2a219f94a835b5f7eddf506a424e56 Mon Sep 17 00:00:00 2001
From: jichen <fenglai0802@163.com>
Date: Fri, 18 Jan 2019 14:33:37 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=85=BC=E5=AE=B9=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89layout=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/iceworks/app/main/scaffolder/lib/createPage.js       | 6 +++++-
 tools/iceworks/renderer/src/pages/Home/CreatPage/index.jsx | 4 ----
 tools/iceworks/renderer/src/stores/projects.js             | 5 +----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/tools/iceworks/app/main/scaffolder/lib/createPage.js b/tools/iceworks/app/main/scaffolder/lib/createPage.js
index 06a7fd61c2..4ee067c6c4 100755
--- a/tools/iceworks/app/main/scaffolder/lib/createPage.js
+++ b/tools/iceworks/app/main/scaffolder/lib/createPage.js
@@ -54,7 +54,11 @@ module.exports = async function createPage({
   excludeLayout = false,
 }) {
   let fileList = [];
-  const layoutName = layout.name;
+  let layoutName = '';
+  if (layout) { // 兼容没有layout的情况，比如通过打开项目引入的项目很可能没有。
+    layoutName = layout.name;
+  }
+
   routePath = routePath || pageName;
 
   // 获取当前项目的package.json中的数据
diff --git a/tools/iceworks/renderer/src/pages/Home/CreatPage/index.jsx b/tools/iceworks/renderer/src/pages/Home/CreatPage/index.jsx
index d088cb1bed..c8289ba7a9 100644
--- a/tools/iceworks/renderer/src/pages/Home/CreatPage/index.jsx
+++ b/tools/iceworks/renderer/src/pages/Home/CreatPage/index.jsx
@@ -80,10 +80,6 @@ class CreatePage extends Component {
     this.statusCompileDisposer();
   }
 
-  fetchData = () => {
-    this.props.newpage.fetch();
-  };
-
   handleCancelCreate = () => {
     this.props.newpage.toggle();
     this.props.blocks.reset();
diff --git a/tools/iceworks/renderer/src/stores/projects.js b/tools/iceworks/renderer/src/stores/projects.js
index bde5420668..a926a99e0f 100644
--- a/tools/iceworks/renderer/src/stores/projects.js
+++ b/tools/iceworks/renderer/src/stores/projects.js
@@ -148,10 +148,7 @@ class Projects extends EventEmitter {
   @action
   has(path) {
     return this.list.some((project) => {
-      if (project.fullPath === path) {
-        return true;
-      }
-      return false;
+      return project.fullPath === path;
     });
   }