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

修复打包导致的 ImageUploaderSpaceGrid 样式的权重问题以及css变量作用域导致的 --gap-horizontal--gap-vertical 变量未正常生效的问题 #6440

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions src/components/image-uploader/image-uploader.less
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
.@{class-prefix-image-uploader} {
--cell-size: 80px;
--gap: 12px;
--gap-horizontal: var(--gap);
--gap-vertical: var(--gap);
---gap: var(--gap);
---gap-horizontal: var(--gap-horizontal, var(--gap));
---gap-vertical: var(--gap-vertical, var(--gap));
---gap-horizontal: var(--gap-horizontal);
Copy link
Member

Choose a reason for hiding this comment

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

自循环写法感觉很怪异,包括以前的写法也很怪。

Copy link
Author

Choose a reason for hiding this comment

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

自循环写法感觉很怪异,包括以前的写法也很怪。

确实比较奇怪,但个人暂未想到其他办法,除非在ts文件里把css变量pick出来,丢到 Space 和 Grid 组件上

Copy link
Member

Choose a reason for hiding this comment

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

从代码看之前就是想用外面配置的 ---gap-xxx 做传递。我感觉是换个变量名字会更好一些。

Copy link
Author

Choose a reason for hiding this comment

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

从代码看之前就是想用外面配置的 ---gap-xxx 做传递。我感觉是换个变量名字会更好一些。

不建议改,一来向前兼容,二来能保持变量名与space和grid相同,降低理解成本

Copy link
Member

Choose a reason for hiding this comment

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

那就不好搞了,--gap-horizontal 有了用 --gap-horizontal,没有才用 --gap 是预期行为。外部提供了 --gap-horizontal 也是“符合预期”的。

Copy link
Author

Choose a reason for hiding this comment

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

那就不好搞了,--gap-horizontal 有了用 --gap-horizontal,没有才用 --gap 是预期行为。外部提供了 --gap-horizontal 也是“符合预期”的。

所以也就俩选项了:用当前比较奇怪的css写法,或者写到ts里,pick之后放到space和grid上

---gap-vertical: var(--gap-vertical);

&-grid,
&-space {
&-grid.adm-grid,
&-space.adm-space {
--gap: var(---gap);
--gap-horizontal: var(---gap-horizontal);
--gap-vertical: var(---gap-vertical);
Expand Down
Loading