Merge pull request #1350 from alibaba/iceworks/release-2.15.3

fix: create project buffix
alibaba · Jan 18, 2019 · 09a19e4 · 09a19e4
2 parents 023e685 + 04628f9
commit 09a19e4
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/tools/iceworks/app/package.json b/tools/iceworks/app/package.json
@@ -3,7 +3,7 @@
   "productName": "Iceworks",
   "private": true,
   "description": "ICE Desktop Application.",
-  "version": "2.15.2",
+  "version": "2.15.3",
   "author": {
     "name": "Alibaba Group Holding Limited",
     "url": "http://alibaba.github.io/ice"

diff --git a/tools/iceworks/changelog/2.15.3.json b/tools/iceworks/changelog/2.15.3.json
@@ -0,0 +1,5 @@
+{
+  "log": [
+    "修复：模板创建提示问题"
+  ]
+}
diff --git a/tools/iceworks/changelog/changelog.json b/tools/iceworks/changelog/changelog.json
@@ -1,4 +1,11 @@
 [
+  {
+    "changelog": [
+      "修复：模板创建提示问题"
+    ],
+    "releaseDate": "2019年01月17日",
+    "version": "2.15.3"
+  },
   {
     "changelog": [
       "修复：初始化新建项目，推荐模板不可用"

diff --git a/tools/iceworks/renderer/src/components/Scaffold/Item.jsx b/tools/iceworks/renderer/src/components/Scaffold/Item.jsx
@@ -22,13 +22,13 @@ class ScaffoldItem extends Component {
   };
 
   createProject = () => {
-    const { createProject, data = {} } = this.props;
-    const isOfficialSource = /ice\.alicdn\.com\/(pre-)?assets\/react-materials\.json/.test(
-      data.source
+    const { createProject, data = {}, scaffolds= {}, isOfficialSource = false } = this.props;
+    const isOfficialSrc = isOfficialSource || /ice\.alicdn\.com\/(pre-)?assets\/react-materials\.json/.test(
+      scaffolds.material.source
     );
     const hasIceScripts = data.builder === 'ice-scripts';
 
-    if (isOfficialSource) {
+    if (isOfficialSrc) {
       if (hasIceScripts) {
         createProject(data);
       } else {

diff --git a/tools/iceworks/renderer/src/components/StartPanel/index.js b/tools/iceworks/renderer/src/components/StartPanel/index.js
@@ -49,11 +49,13 @@ class StartPanel extends Component {
         {scaffolds.length ? (
           <div className="start-recommend-scaffolds">
             {scaffolds.map((material, index) => {
+
               return (
                 <ScaffoldItem
                   key={index}
                   createProject={this.props.handleSelectedScaffold}
                   data={material}
+                  isOfficialSource={true}
                 />
               );
             })}