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

feat(Loading): add text-color prop #7806

Merged
merged 10 commits into from Dec 29, 2020

Conversation

ZhengXiaowei
Copy link
Contributor

@ZhengXiaowei ZhengXiaowei commented Dec 24, 2020

Loading组件新增属性textColor,用于修改文案颜色,也可以通过修改color一起修改图标和文案的颜色。 #7795

@github-actions
Copy link

github-actions bot commented Dec 24, 2020

🎊 PR Preview 33b0023 has been successfully built and deployed to https://youzan-vant-preview-pr-7806.surge.sh

🕐 Build time: 124.534s

🤖 By surge-preview

src/loading/README.md Outdated Show resolved Hide resolved
src/loading/README.md Outdated Show resolved Hide resolved
@chenjiahan
Copy link
Member

demo 展示的内容需要和文档保持一致喔,另外单测没通过,应该是 demo 对应的 snapshot 没更新

@ZhengXiaowei
Copy link
Contributor Author

demo 展示的内容需要和文档保持一致喔,另外单测没通过,应该是 demo 对应的 snapshot 没更新

我更新了下快照,但是我不确定是不是这样更新。

// 在原有的测试用例上新增了2句
await later();
expect(wrapper.html()).toMatchSnapshot();

你这边可以先审查下 有问题我再调整,demo也调整了下~

@chenjiahan chenjiahan changed the title feat(Loading): add textColor prop feat(Loading): add text-color prop Dec 28, 2020
@chenjiahan
Copy link
Member

我更新了下快照,但是我不确定是不是这样更新。

不是这里喔,是 demo.spec.js 没更新,需要全量跑一下单测并更新。

另外文档和 demo 里的色值不一致

@ZhengXiaowei
Copy link
Contributor Author

我更新了下快照,但是我不确定是不是这样更新。

不是这里喔,是 demo.spec.js 没更新,需要全量跑一下单测并更新。

另外文档和 demo 里的色值不一致

咦 我使用yarn test跑全量也没有更新, 说是需要用-u去更新,可是vant-cli test的参数中么有-u的参数

@chenjiahan
Copy link
Member

chenjiahan commented Dec 29, 2020

yarn test:watch,-u 是 jest 的参数

@ZhengXiaowei
Copy link
Contributor Author

yarn test:watch,-u 是 jest 的参数

ok 辛苦再审查下~

@chenjiahan chenjiahan merged commit 680c93d into youzan:dev Dec 29, 2020
@chenjiahan
Copy link
Member

👏👏

@ZhengXiaowei ZhengXiaowei deleted the feature/loading-text-color branch December 30, 2020 00:58
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