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

perf: 规范不同系统中的结束符 #505

Merged
merged 6 commits into from
May 12, 2023

Conversation

SpringHgui
Copy link
Contributor

@SpringHgui SpringHgui commented May 12, 2023

🤔 这个 PR 的性质是?

  • 日常 bug 修复
  • 新特性提交
  • 文档改进
  • 演示代码改进
  • 组件样式/交互改进
  • CI/CD 改进
  • 重构
  • 代码风格优化
  • 测试用例
  • 分支合并
  • 其他

🔗 相关 Issue

💡 需求背景和解决方案

📝 更新日志

  • perf: 规范不同系统中的结束符

  • 本条 PR 不需要纳入 Changelog

☑️ 请求合并前的自查清单

⚠️ 请自检并全部勾选全部选项⚠️

  • 文档已补充或无须补充
  • 代码演示已提供或无须提供
  • TypeScript 定义已补充或无须补充
  • Changelog 已提供或无须提供

@github-actions
Copy link
Contributor

github-actions bot commented May 12, 2023

完成

Copy link
Collaborator

@timi137137 timi137137 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

请顺便添加关于tsx jsx html 的结束符设置

@SpringHgui
Copy link
Contributor Author

先别合并,文本文件可以解决,拉下来的图片资源会有问题

Windows PowerShell
版权所有 (C) Microsoft Corporation。保留所有权利。

尝试新的跨平台 PowerShell https://aka.ms/pscore6

PS D:\Github\tdesign-vue-next-starter2> git diff
warning: in the working copy of 'docs/starter.png', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'src/assets/assets-login-bg-black.png', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'src/assets/assets-login-bg-white.png', CRLF will be replaced by LF the next time Git touches it
warning: in the working copy of 'src/assets/assets-tencent-logo.png', CRLF will be replaced by LF the next time Git touches it
diff --git a/docs/starter.png b/docs/starter.png
index 6c8d7e7..ec4ae1d 100644
Binary files a/docs/starter.png and b/docs/starter.png differ
diff --git a/src/assets/assets-login-bg-black.png b/src/assets/assets-login-bg-black.png
index b4dde4b..9b0c86b 100644
Binary files a/src/assets/assets-login-bg-black.png and b/src/assets/assets-login-bg-black.png differ
diff --git a/src/assets/assets-login-bg-white.png b/src/assets/assets-login-bg-white.png
index 4275549..d8fdef2 100644
Binary files a/src/assets/assets-login-bg-white.png and b/src/assets/assets-login-bg-white.png differ
diff --git a/src/assets/assets-tencent-logo.png b/src/assets/assets-tencent-logo.png
index 26fdb92..51b2a94 100644
Binary files a/src/assets/assets-tencent-logo.png and b/src/assets/assets-tencent-logo.png differ
PS D:\Github\tdesign-vue-next-starter2>

@SpringHgui
Copy link
Contributor Author

我这边测试没问题了,最好windows下多人验证下没问题,就可以合并了

@timi137137 timi137137 changed the title fix: eol perf: 规范不同系统中的结束符 May 12, 2023
@timi137137 timi137137 merged commit 4292bd2 into Tencent:develop May 12, 2023
uyarn added a commit that referenced this pull request May 18, 2023
* perf: 路由守卫获取菜单异常,跳转登录页并弹窗提示 (#502)

* perf: 规范不同系统中的结束符 (#505)

* fix: eol

* fix: 测试效果

* fix: 默认全部文件eol=lf

* fix: 防止误判,仅对部分明确的文件设置

* fix: 新建文件eol格式错误进行互补

* Update settings.json

* fix: 修复无法将通知设为未读 (#511)

* fix: 修复 store 中并未对 localStorage 的 TOKEN_NAME 键进行赋值的缺陷 (#504)

* fix: 接口请求不携带token

* fix: 优化token持久化策略

* fix: 删除多余的log

* chore: release 0.7.5 (#512)

---------

Co-authored-by: liweijie0812 <674416404@qq.com>
Co-authored-by: Gui.H <springhgui@outlook.com>
Co-authored-by: You <i@izoyo.cn>
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.

2 participants