Skip to content

Commit b0bb778

Browse files
committed
fix(grid): [grid] fix x-design theme style
1 parent 8dd8a7e commit b0bb778

File tree

7 files changed

+28
-35
lines changed

7 files changed

+28
-35
lines changed

examples/sites/demos/apis/grid.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,11 +1049,11 @@ export default {
10491049
},
10501050
{
10511051
name: 'tooltip-config',
1052-
type: 'IToolTipConfig',
1053-
typeAnchorName: 'IToolTipConfig',
1052+
linkTo: 'tooltip#tooltip--props',
1053+
type: 'Tooltip.Props',
10541054
defaultValue: '',
10551055
desc: {
1056-
'zh-CN': 'Grid 内置 tooltip 配置项,请参考 Tooltip 组件属性说明',
1056+
'zh-CN': 'Grid 内置 tooltip 配置项,配置项将透传至 Tooltip,请参考 Tooltip 组件属性说明',
10571057
'en-US':
10581058
'Configuration item of the built-in tooltip of the Grid. For details, see the Tooltip Attribute Description.'
10591059
},

packages/theme/src/grid/custom.less

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
.@{grid-custom-prefix-cls}__tabs-body {
3232
overflow-y: auto;
3333
border: 0;
34-
padding: 12px 0;
34+
padding: 16px 0;
3535

3636
.tabs-body-item {
3737
.@{grid-custom-prefix-cls}__alert {
@@ -40,11 +40,11 @@
4040

4141
.@{grid-custom-prefix-cls}__setting {
4242
border-bottom: 1px solid transparent;
43-
padding: 12px 0 24px;
43+
padding: 8px 0 0;
4444

4545
.setting-item {
4646
font-size: var(--tv-Grid-font-size);
47-
padding: 10px 8px;
47+
padding: 8px;
4848
overflow: hidden;
4949
position: relative;
5050
display: flex;
@@ -94,7 +94,6 @@
9494

9595
.setting-item {
9696
span.label {
97-
width: 26%;
9897
display: inline-block;
9998
text-align: right;
10099
padding-right: 24px;

packages/theme/src/grid/menu.less

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
font-size: var(--tv-Grid-font-size);
2828
background-color: #fff;
2929
box-shadow: 2px 2px 4px -2px rgba(0, 0, 0, 0.2);
30-
padding: 0 1px;
30+
padding: 8px 0;
3131
color: var(--tv-Grid-text-color);
3232
overflow: visible;
3333
.user-select(none);
@@ -39,38 +39,25 @@
3939
.@{grid-menu-prefix-cls}__option-wrapper,
4040
.@{grid-menu-prefix-cls}__clild-wrapper {
4141
margin: 0;
42-
padding: 0;
4342
list-style-type: none;
4443
border-bottom: 1px solid var(--tv-Grid-divider-color);
4544

45+
&:last-child {
46+
border: 0;
47+
}
48+
4649
li {
4750
position: relative;
48-
margin: 1px 0;
49-
border: 1px solid transparent;
50-
51-
&:last-child {
52-
border: 0;
53-
}
5451

5552
&.link__active {
56-
color: #2b2b2b;
57-
background-color: #c5c5c5;
58-
border-color: #c5c5c5;
53+
color: var(--tv-Grid-text-color);
54+
background-color: var(--tv-Grid-bg-color-active);
5955
}
6056

6157
&.link__disabled {
6258
.@{grid-menu-prefix-cls}__link {
63-
color: var(--tv-Grid-text-color);
64-
cursor: initial;
65-
}
66-
67-
&.link__active {
68-
border-color: #c0c1c2;
69-
background-color: #eeeeee;
70-
71-
&:hover {
72-
background-color: inherit;
73-
}
59+
color: var(--tv-Grid-text-color-disabled);
60+
cursor: not-allowed;
7461
}
7562
}
7663
}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,17 @@
5353
}
5454

5555
.MiniColumnHeight() {
56-
height: 30px;
56+
height: 32px;
5757
}
5858

5959
.DefaultTdPadding() {
6060
padding: var(--tv-Grid-cell-padding-y) var(--tv-Grid-cell-padding-x);
6161
}
6262

63+
.SmallTdPadding() {
64+
padding: var(--tv-Grid-cell-padding-y-small) var(--tv-Grid-cell-padding-x-small);
65+
}
66+
6367
.MiniTdPadding () {
6468
padding: var(--tv-Grid-cell-padding-y-mini) var(--tv-Grid-cell-padding-x-mini);
6569
}

packages/theme/src/grid/table.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
.@{grid-prefix-cls}-header__column,
9999
.@{grid-prefix-cls}-body__column,
100100
.@{grid-prefix-cls}-footer__column {
101-
.DefaultTdPadding();
101+
.SmallTdPadding();
102102
}
103103

104104
.@{grid-prefix-cls}-body__column,
@@ -907,7 +907,7 @@
907907
.DefaultTdPadding();
908908

909909
&.col__actived {
910-
.DefaultTdPadding();
910+
padding: 0 var(--tv-Grid-cell-padding-x);
911911
}
912912

913913
// 可编辑表格showStatus为true时,左上角的角标

packages/theme/src/grid/vars.less

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,15 @@
146146
--tv-Grid-toolbar-btn-icon-border-color-hover: var(--tv-color-border-hover);
147147
// 工具栏图标按钮边框圆角
148148
--tv-Grid-toolbar-btn-icon-border-radius: var(--tv-border-radius-md);
149-
// -------mini表格-------
149+
// -------mini/small表格-------
150150
// mini表格单元格水平内边距
151151
--tv-Grid-cell-padding-x-mini: 16px;
152152
// mini表格单元格垂直内边距
153-
--tv-Grid-cell-padding-y-mini: 8px;
153+
--tv-Grid-cell-padding-y-mini: 4px;
154+
// small表格单元格水平内边距
155+
--tv-Grid-cell-padding-x-small: 16px;
156+
// small表格单元格垂直内边距
157+
--tv-Grid-cell-padding-y-small: 8px;
154158
// -------其他-------
155159
// 树节点图标右侧内边距
156160
--tv-Grid-tree-expand-icon-padding-right: var(--tv-space-md);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
*
1111
*/
1212
import BaseSelect from './src/index'
13-
import '@opentiny/vue-theme/base-select/index.less'
1413
import { version } from './package.json'
1514

1615
BaseSelect.model = {

0 commit comments

Comments
 (0)