Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: 初始化项目的推荐模板无法使用的问题；删除当前展示项目时 git报错 #1344

Merged
merged 2 commits into from
Jan 17, 2019
Merged

fix: 初始化项目的推荐模板无法使用的问题；删除当前展示项目时 git报错 #1344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6653c60
fix: 初始化项目的推荐模板无法使用的问题；删除当前展示项目时 git报错
fenglai0802 Jan 17, 2019
6825af8
chore: 代码优化
fenglai0802 Jan 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tools/iceworks/renderer/src/components/Scaffold/Item.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ class ScaffoldItem extends Component {
};

createProject = () => {
const { createProject, data, scaffolds = {} } = this.props;
const { createProject, data = {} } = this.props;
const isOfficialSource = /ice\.alicdn\.com\/(pre-)?assets\/react-materials\.json/.test(
scaffolds.material.source
data.source
);
const hasIceScripts = data.builder === 'ice-scripts';

Expand Down
4 changes: 3 additions & 1 deletion tools/iceworks/renderer/src/pages/Home/ProjectDashboard/Def/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,9 @@ class Def extends Component {
init() {
const { currentProject = {} } = this.props.projects;
const cwd = currentProject.fullPath;
this.gitTools = new GitTools(cwd);
if (cwd) {
this.gitTools = new GitTools(cwd);
}
clientEmiter.cwd = cwd;
}

Expand Down