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.

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

Iceworks/release 2.15.1 #1336

Merged
merged 11 commits into from
Jan 16, 2019
Merged

Iceworks/release 2.15.1 #1336

merged 11 commits into from
Jan 16, 2019

Conversation

fenglai0802
Copy link
Contributor

No description provided.

1. 移除scan-layout 中从远端获取数据的相关逻辑,只取项目本地的
2. 创建页面时的下载区块逻辑和下载区块到页面的逻辑统一
3. 移除commonBlock的判断:创建是都是传入true,没必要。
feat: 根据项目的package.json中的依赖判断区块下载版本
* fix: 依赖获取判断逻辑添加

* chore: version-0.x字段 指向新版本  1.x
fix: 同步执行区块下载,否则会先生成页面导致找不到区块依赖
@chenbin92 chenbin92 merged commit 71b01a9 into master Jan 16, 2019
@delete-merged-branch delete-merged-branch bot deleted the iceworks/release-2.15.1 branch January 16, 2019 09:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants