Skip to content

Commit 1109141

Browse files
authored
fix:修复saas主题 (#3347)
1 parent b90f08f commit 1109141

File tree

17 files changed

+43
-39
lines changed

17 files changed

+43
-39
lines changed

packages/theme-saas/src/grid/header.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777

7878
.@{grid-prefix-cls}-cell-text {
7979
@apply w-full;
80+
line-height: 1.375rem;
8081
}
8182

8283
.@{grid-prefix-cls}-edit-icon {

packages/theme-saas/src/grid/mixins/table.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
&:not(.col__actived) {
3434
.@{grid-cell-prefix-cls} {
3535
.TextEllipsis();
36-
@apply leading-normal;
36+
line-height: 1.375rem;
3737
// 表头布局从block改为了flex,此处兼容插槽文本溢出不显示省略号问题
3838
&:not(:has(.tiny-grid-cell-text)) > span:only-of-type:not(.@{grid-cell-prefix}__expanded) {
3939
@apply text-ellipsis;

packages/theme/src/checkbox/index.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@
111111
padding-left: 8px;
112112
font-size: var(--tv-Checkbox-font-size);
113113
font-weight: var(--tv-Checkbox-font-weight);
114-
padding-top: 3px;
115114
}
116115

117116
&.is-display-only {

packages/theme/src/date-panel/index.less

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@
158158

159159
// 时区选择
160160
&__timezone {
161-
margin-bottom: 8px;
162161
padding: 8px 0;
163162

164163
.@{picker-panel-prefix-cls}__tzlist {
@@ -169,11 +168,11 @@
169168
white-space: nowrap;
170169
overflow: hidden;
171170
text-overflow: ellipsis;
172-
padding: var(--tv-DatePanel-timezone-li-padding);
171+
padding: var(--tv-DatePanel-timezone-li-padding, 5.5px 16px);
173172
cursor: pointer;
174173

175174
&:hover {
176-
background-color: var(--tv-DatePanel-bg-color-hover);
175+
background-color: var(--tv-DatePanel-bg-color-hover, #f5f5f5);
177176
}
178177
}
179178

@@ -182,8 +181,8 @@
182181
width: 238px;
183182
bottom: 77px;
184183
max-height: 260px;
185-
box-shadow: var(--tv-DatePanel-box-shadow);
186-
background-color: var(--tv-DatePanel-bg-color);
184+
box-shadow: var(--tv-DatePanel-box-shadow, 0 4px 16px 0 rgba(0, 0, 0, 0.08));
185+
background-color: var(--tv-DatePanel-bg-color, #fff);
187186
}
188187
}
189188

packages/theme/src/dropdown-item/index.less

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@
3535

3636
&[class*='tiny-'] {
3737
padding: var(--tv-DropdownItem-padding);
38+
margin-bottom: var(--tv-DropdownItem-margin-y);
3839

3940
&:last-of-type {
40-
margin-bottom: 0px;
41+
margin-bottom: 0;
4142
}
4243
}
4344

@@ -49,9 +50,9 @@
4950
&:before {
5051
content: '';
5152
content: '';
52-
height: 0px;
53+
height: 0;
5354
display: block;
54-
margin: 0px;
55+
margin: 0;
5556
}
5657

5758
&__wrap {

packages/theme/src/dropdown-item/vars.less

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@
3434
--tv-DropdownItem-icon-color-disabled: var(--tv-color-icon-disabled, #c2c2c2);
3535

3636
// 菜单项内边距
37-
--tv-DropdownItem-padding: 0px var(--tv-space-xl, 16px);
37+
--tv-DropdownItem-padding: 0 var(--tv-space-xl, 16px);
38+
// 菜单项下边距
39+
--tv-DropdownItem-margin-y: var(--tv-space-sm, 4px);
3840
// 展开图标的水平外边距
3941
--tv-DropdownItem-expand-margin-x: var(--tv-space-md, 8px);
4042
// 自定义图标的水平外边距

packages/theme/src/svgs/checked-sur.svg

Lines changed: 1 addition & 1 deletion
Loading

packages/theme/src/svgs/halfselect.svg

Lines changed: 1 addition & 1 deletion
Loading

packages/vue/src/base-select/src/token.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export const classes = {
22
'caret': 'text-base rotate-0 transition-transform duration-300 fill-color-text-placeholder cursor-pointer ',
33
'select-tags':
4-
'absolute leading-normal whitespace-normal sm:pl-3 pr-2 z-[1] top-1/2 -translate-y-2/4 flex items-center flex-wrap [&_[data-tag=tiny-tag]]:my-0.5 [&_[data-tag=tiny-tag]]:h-7 [&_[data-tag=tiny-tag]]:text-sm [&_[data-tag=tiny-tag]]:sm:h-5 [&_[data-tag=tiny-tag]]:sm:text-sm [&_[data-tag=tiny-tag]_svg]:shrink-0',
4+
'absolute leading-normal whitespace-normal sm:pl-3 pr-2 z-[1] top-1/2 -translate-y-2/4 flex items-center flex-wrap [&_[data-tag=tiny-tag]]:my-0.5 [&_[data-tag=tiny-tag]]:h-7 [&_[data-tag=tiny-tag]]:sm:h-5 [&_[data-tag=tiny-tag]_svg]:shrink-0',
55
'tags-text': 'inline-block w-full whitespace-nowrap text-ellipsis overflow-hidden align-bottom',
66
'tag-info':
77
'whitespace-nowrap text-ellipsis overflow-hidden inline-flex justify-start items-center border-transparent text-color-text-primary'

packages/vue/src/date-panel/src/mobile-first.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@
165165

166166
<div
167167
data-tag="tiny-picker-panel__timezone"
168+
class="tiny-picker-panel__timezone"
168169
v-if="state.isShowTz || state.timezone.isServiceTimezone"
169170
v-clickoutside="handleTzPickClose"
170171
>
@@ -178,7 +179,7 @@
178179
<component fill="#ccc" :is="state.showpopup ? 'IconChevronDown' : 'IconChevronUp'" @click="toggleTz" />
179180
</template>
180181
</tiny-input>
181-
<div data-tag="tiny-picker-panel__tzlist">
182+
<div data-tag="tiny-picker-panel__tzlist" class="tiny-picker-panel__tzlist">
182183
<tiny-popup
183184
v-model="state.showpopup"
184185
:overlay="false"
@@ -191,6 +192,7 @@
191192
<ul>
192193
<li
193194
data-tag="tiny-picker-panel__tzlist-li"
195+
class="tiny-picker-panel__tzlist-li"
194196
:title="tz.name"
195197
v-show="!tz.visible"
196198
v-for="(tz, index) in state.renderTzdata"

0 commit comments

Comments
 (0)