Skip to content

Commit 0f5ed54

Browse files
discreted66discreted66
committed
fix:修复saas主题
1 parent 7f4d89c commit 0f5ed54

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"

‎packages/vue/src/option/src/mobile-first.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
:class="
1010
m(
1111
'h-fit flex items-center justify-between rounded text-color-text-primary text-sm sm:text-xs',
12-
'min-h-[40px] sm:min-h-[32px] cursor-pointer group sm:hover:bg-color-bg-4 sm:active:bg-color-bg-3 pl-0 pr-3 sm:px-3 my-1 sm:m-1',
12+
'min-h-[40px] sm:min-h-[32px] cursor-pointer group sm:hover:bg-color-bg-4 sm:active:bg-color-bg-3 pl-0 pr-3 sm:px-2 my-1 sm:m-1',
1313
{
1414
'text-color-brand bg-color-bg-1 sm:bg-color-fill-6': state.itemSelected && !disabled,
1515
'text-color-text-disabled cursor-not-allowed [&_svg]:fill-color-icon-disabled [&_svg_path:first-of-type]:fill-color-bg-3':
@@ -26,9 +26,9 @@
2626
<component
2727
:is="`icon-${state.selectCls}`"
2828
:class="
29-
m('fill-color-icon-secondary relative', {
29+
m('fill-color-icon-secondary relative w-3.5 h-3.5', {
3030
'group-hover:fill-color-brand-hover': state.hover,
31-
'fill-color-brand': state.itemSelected,
31+
'fill-color-brand text-color-brand': state.itemSelected,
3232
'fill-color-brand-disabled': state.itemSelected && required
3333
})
3434
"
@@ -45,7 +45,7 @@
4545
v-if="!state.selectMultiple && state.itemSelected && !disabled && !state.groupDisabled"
4646
class="inline-block sm:hidden w-4 ml-4 shrink-0"
4747
>
48-
<icon-finish custom-class="w-4 h-4 fill-color-brand"> </icon-finish
48+
<icon-finish custom-class="w-3.5 h-3.5 fill-color-brand"> </icon-finish
4949
></span>
5050
</div>
5151
</template>

‎packages/vue/src/pager/src/mobile-first.vue

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@ export default defineComponent({
9696
<ul class="inline-flex m-0 p-0 list-none w-fit">
9797
<li
9898
class={[
99-
'py-0 px-0 cursor-pointer box-border h-8 text-color-brand bg-color-bg-1 select-none flex items-center justify-center relative rounded',
100-
prevText ? 'w-fit' : 'w-8'
99+
'py-0 px-0 cursor-pointer box-border h-7 text-color-brand bg-color-bg-1 select-none flex items-center justify-center relative rounded',
100+
prevText ? 'w-fit' : 'w-7'
101101
]}>
102102
<button
103103
type="button"
104104
class={[
105-
'h-8 p-0 border border-solid rounded flex items-center justify-center group',
105+
'h-7 p-0 border border-solid rounded flex items-center justify-center group',
106106
'cursor-pointer border-color-border bg-color-bg-1 sm:bg-transparent sm:border-0',
107-
prevText ? 'w-fit' : 'w-8',
107+
prevText ? 'w-fit' : 'w-7',
108108
{
109109
'disabled:cursor-not-allowed disabled:border-color-border disabled:bg-color-bg-3 disabled:sm:bg-transparent':
110110
prevDisabled,
@@ -117,7 +117,7 @@ export default defineComponent({
117117
{prevText ? (
118118
<span
119119
class={[
120-
'inline-block w-fit mx-1 text-color-text-placeholder sm:text-color-primary',
120+
'inline-block w-fit mx-1 text-color-text-placeholder sm:text-color-primary text-xs',
121121
{
122122
'disabled:text-color-text-primary sm:text-color-border': prevDisabled,
123123
'group-hover:text-color-link sm:group-hover:text-color-icon-hover sm:group-active:text-color-active':
@@ -140,22 +140,22 @@ export default defineComponent({
140140
)}
141141
</button>
142142
</li>
143-
<li class="h-8 text-color-text-primary flex items-center justify-center rounded !mx-4">
144-
<span class="inline-block my-0 mx-0">
143+
<li class="h-7 text-color-text-primary flex items-center justify-center rounded !mx-4">
144+
<span class="inline-block my-0 mx-0 leading-5 text-xs">
145145
{this.internalCurrentPage}/{this.internalPageCount}
146146
</span>
147147
</li>
148148
<li
149149
class={[
150-
'py-0 px-0 cursor-pointer box-border h-8 text-color-brand bg-color-bg-1 select-none flex items-center justify-center relative rounded',
151-
nextText ? 'w-fit' : 'w-8'
150+
'py-0 px-0 cursor-pointer box-border h-7 text-color-brand bg-color-bg-1 select-none flex items-center justify-center relative rounded',
151+
nextText ? 'w-fit' : 'w-7'
152152
]}>
153153
<button
154154
type="button"
155155
class={[
156-
'h-8 p-0 border border-solid rounded flex items-center justify-center group',
156+
'h-7 p-0 border border-solid rounded flex items-center justify-center group',
157157
'cursor-pointer border-color-border bg-color-bg-1 sm:bg-transparent sm:border-0',
158-
nextText ? 'w-fit' : 'w-8',
158+
nextText ? 'w-fit' : 'w-7',
159159
{
160160
'disabled:cursor-not-allowed disabled:border-color-border disabled:bg-color-bg-3 disabled:sm:bg-transparent':
161161
nextDisabled,
@@ -169,7 +169,7 @@ export default defineComponent({
169169
{nextText ? (
170170
<span
171171
class={[
172-
'inline-block w-fit mx-1 text-color-text-placeholder sm:text-color-primary',
172+
'inline-block w-fit mx-1 text-color-text-placeholder sm:text-color-primary text-xs',
173173
{
174174
'disabled:text-color-text-primary disabled:sm:text-color-border': nextDisabled,
175175
'group-hover:fill-color-brand sm:group-hover:fill-color-icon-hover sm:group-active:fill-color-icon-active':

‎packages/vue/src/select/src/mobile-first.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@
436436
<slot name="dropdown"></slot>
437437
<div
438438
v-if="multiple && showCheck && showAlloption && !state.multipleLimit && !state.query && !remote"
439-
class="whitespace-nowrap box-border py-0 h-10 leading-10 sm:h-8 sm:leading-8 text-sm sm:text-xs pl-0 pr-3 sm:px-3 my-1 sm:m-1 rounded cursor-pointer"
439+
class="whitespace-nowrap box-border py-0 h-10 leading-10 sm:h-8 sm:leading-8 text-sm sm:text-xs pl-0 pr-3 sm:px-2 my-1 sm:m-1 rounded cursor-pointer"
440440
:class="[
441441
{
442442
hover: state.hoverIndex === -9 && state.selectCls !== 'checked-sur'
@@ -451,7 +451,7 @@
451451
<component
452452
:is="`icon-${state.selectCls}`"
453453
:class="
454-
m(['-mt-0.5 mr-2 fill-color-icon-secondary', state.selectCls !== 'check' && 'fill-color-brand'])
454+
m(['-mt-0.5 mr-2 fill-color-icon-secondary w-3.5 h-3.5 ', state.selectCls !== 'check' && 'fill-color-brand text-color-brand'])
455455
"
456456
/>
457457
<span :class="[state.selectCls === 'checked-sur' ? 'text-color-brand' : 'text-color-text-primary']">
@@ -469,7 +469,7 @@
469469
!state.emptyText &&
470470
!remote
471471
"
472-
class="whitespace-nowrap box-border py-0 h-10 leading-10 sm:h-8 sm:leading-8 text-sm sm:text-xs pl-0 pr-3 sm:px-3 my-1 sm:m-1 rounded cursor-pointer"
472+
class="whitespace-nowrap box-border py-0 h-10 leading-10 sm:h-8 sm:leading-8 text-sm sm:text-xs pl-0 pr-3 sm:px-2 my-1 sm:m-1 rounded cursor-pointer"
473473
:class="[
474474
{
475475
hover: state.hoverIndex === -9 && state.filteredSelectCls !== 'checked-sur'

‎packages/vue/src/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/tag/src/mobile-first.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export default defineComponent({
5353
const operable = selectable ? false : this.operable
5454
5555
const classes = m(
56-
'text-xs inline-flex items-center rounded box-border border-0.5 sm:border mr-2',
56+
'text-xs inline-flex items-center rounded box-border border-0.5 sm:border mr-1',
5757
effect === 'plain' || hit ? gcls(`${type}-border`) : 'border-transparent',
5858
gcls(`${effect}-${type}`),
5959
gcls(size),

‎packages/vue/src/tag/src/token.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export const classes = {
1616
'light-warning': 'text-color-warning bg-color-warning-subtler',
1717
'light-error': 'text-color-error bg-color-error-subtler',
1818
'light-default': 'text-color-info-primary bg-color-info-primary-subtler',
19-
'light-info': 'text-color-text-primary bg-color-bg-2',
19+
'light-info': 'text-color-text-primary bg-color-bg-3',
2020
'light-pink': 'text-color-chart-17 bg-color-chart-17-subtler',
2121
'light-purple': 'text-color-chart-11 bg-color-chart-11-subtler',
2222
'light-cyan': 'text-color-chart-2 bg-color-chart-2-subtler',
@@ -48,7 +48,7 @@ export const classes = {
4848
'fill-light-warning': 'fill-color-warning-subtle hover:fill-color-warning',
4949
'fill-light-error': 'fill-color-error-subtle hover:fill-color-error',
5050
'fill-light-default': 'fill-color-info-primary-subtle hover:fill-color-info-primary',
51-
'fill-light-info': 'fill-color-none hover:fill-color-none',
51+
'fill-light-info': 'fill-color-icon-secondary hover:fill-color-icon-secondary',
5252
'fill-light-pink': 'fill-color-chart-17-subtle hover:fill-color-chart-17',
5353
'fill-light-purple': 'fill-color-chart-11-subtle hover:fill-color-chart-11',
5454
'fill-light-cyan': 'fill-color-chart-2-subtle hover:fill-color-chart-2',

‎packages/vue/src/tooltip/src/mobile-first.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ export default defineComponent({
166166
onMouseenter={() => mouseenter()}
167167
onMouseleave={() => mouseleave()}>
168168
{addWrapper ? (
169-
<div style={`overflow:auto;max-height:${this.contentMaxHeight}`}>{content}</div>
169+
<div class={`leading-5`} style={`overflow:auto;max-height:${this.contentMaxHeight}`}>{content}</div>
170170
) : (
171171
content
172172
)}

0 commit comments

Comments
 (0)