Skip to content

Commit dfed99f

Browse files
Youyou-smileszzcr
authored andcommitted
feat(dept): [dept] Optimize style
1 parent 1afb7ee commit dfed99f

File tree

10 files changed

+29
-21
lines changed

10 files changed

+29
-21
lines changed

examples/sites/demos/pc/app/hrapprover/custom-service-composition-api.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
@update:approvalPerson="person = $event"
77
:fetch-hrapprover="getFetchHrapprover"
88
:category="category"
9+
title="选择权签人"
910
></tiny-hrapprover>
1011
</div>
1112
</template>

examples/sites/demos/pc/app/hrapprover/custom-service.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
@update:approvalPerson="person = $event"
77
:fetch-hrapprover="getFetchHrapprover"
88
:category="category"
9+
title="选择权签人"
910
></tiny-hrapprover>
1011
</div>
1112
</template>

packages/theme/src/base/reset.less

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,23 @@
177177
}
178178
}
179179

180-
.tiny-popper,
180+
.tiny-popper {
181+
&[x-placement^='top'] {
182+
margin-bottom: 4px;
183+
}
184+
&[x-placement^='bottom'] {
185+
margin-top: 4px;
186+
}
187+
&[x-placement^='right'] {
188+
margin-left: 4px;
189+
}
190+
&[x-placement^='left'] {
191+
margin-right: 4px;
192+
}
193+
}
194+
195+
196+
.tiny-popconfirm-popover,
181197
.tiny-tooltip__popper {
182198
.popper__arrow {
183199
position: absolute;

packages/theme/src/dept/index.less

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,19 @@
2222
.inject-Dept-vars();
2323

2424
&__search {
25-
margin-bottom: 12px;
25+
margin-bottom: 24px;
2626
}
2727

2828
&__text,
2929
&__label {
30+
width: 80px;
3031
font-size: var(--tv-Dept-label-font-size);
3132
color: var(--tv-Dept-label-text-color);
3233
font-weight: var(--tv-Dept-label-font-weight);
34+
text-align: left;
3335
white-space: nowrap;
3436
overflow: hidden;
3537
text-overflow: ellipsis;
36-
}
37-
38-
&__label {
39-
text-align: right;
40-
4138
&.is-selected {
4239
text-align: left;
4340
margin-bottom: 4px;
@@ -53,7 +50,7 @@
5350
}
5451

5552
&__item {
56-
margin-bottom: 12px;
53+
margin-bottom: 24px;
5754
}
5855

5956
&__search &__label,

packages/theme/src/dept/vars.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
.inject-Dept-vars() {
1414
--tv-Dept-label-font-size: var(--tv-font-size-md);
15-
--tv-Dept-label-text-color: var(--tv-color-text);
16-
--tv-Dept-label-font-weight: var(--tv-font-weight-bold);
15+
--tv-Dept-label-text-color: var(--tv-color-text-secondary);
16+
--tv-Dept-label-font-weight: var(--tv-font-weight-regular);
1717
--tv-Dept-selected-info-text-color: var(--tv-color-text);
1818
--tv-Dept-selected-info-bg-color: var(--tv-color-bg-active);
1919
--tv-Dept-selected-info-border-radius: var(--tv-border-radius-md);

packages/theme/src/espace/index.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
.item-talk,
2323
.item-call,
2424
.item-email {
25-
margin: 0 8px 0 0;
25+
margin: 0 24px 0 0;
2626
line-height: 1;
2727

2828
.@{svg-prefix-cls} {

packages/theme/src/roles/index.less

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
&__selector {
2626
&.@{css-prefix}popover.@{css-prefix}popper {
27-
padding: 0;
27+
padding: 8px 0;
2828
}
2929
}
3030

@@ -57,11 +57,5 @@
5757
background: var(--tv-Roles-poplist-item-hover-bg-color);
5858
}
5959

60-
&.is-selected {
61-
&,
62-
&:hover {
63-
background: var(--tv-Roles-poplist-item-selected-bg-color);
64-
}
65-
}
6660
}
6761
}

packages/theme/src/roles/vars.less

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,4 @@
1919
--tv-Roles-poplist-item-font-size: var(--tv-font-size-md);
2020
// 下拉面板选项悬浮背景色
2121
--tv-Roles-poplist-item-hover-bg-color: var(--tv-color-bg-hover);
22-
// 下拉面板选项选中色
23-
--tv-Roles-poplist-item-selected-bg-color: var(--tv-color-bg-active);
2422
}

packages/vue/src/dept/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentiny/vue-dept",
3-
"version": "3.19.0",
3+
"version": "3.19.1",
44
"description": "",
55
"main": "lib/index.js",
66
"module": "index.ts",

packages/vue/src/dept/src/pc.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
@update:visible="state.open = $event"
1919
:close-on-click-modal="false"
2020
width="550px"
21+
top="10vh"
2122
append-to-body
2223
@close="closeDialog"
2324
:title="title"

0 commit comments

Comments
 (0)