diff --git a/examples/sites/demos/pc/app/hrapprover/basic-usage-composition-api.vue b/examples/sites/demos/pc/app/hrapprover/basic-usage-composition-api.vue index 58532d8fd0..03354d6fcc 100644 --- a/examples/sites/demos/pc/app/hrapprover/basic-usage-composition-api.vue +++ b/examples/sites/demos/pc/app/hrapprover/basic-usage-composition-api.vue @@ -2,6 +2,7 @@
diff --git a/examples/sites/demos/pc/app/hrapprover/basic-usage.vue b/examples/sites/demos/pc/app/hrapprover/basic-usage.vue index 742f7b29db..d8cc511d4f 100644 --- a/examples/sites/demos/pc/app/hrapprover/basic-usage.vue +++ b/examples/sites/demos/pc/app/hrapprover/basic-usage.vue @@ -2,6 +2,7 @@
diff --git a/examples/sites/demos/pc/app/hrapprover/category-type-composition-api.vue b/examples/sites/demos/pc/app/hrapprover/category-type-composition-api.vue index a5b8f8dc43..0d6cc89d35 100644 --- a/examples/sites/demos/pc/app/hrapprover/category-type-composition-api.vue +++ b/examples/sites/demos/pc/app/hrapprover/category-type-composition-api.vue @@ -4,6 +4,7 @@ v-model="value" :approval-person="person" @update:approvalPerson="person = $event" + title="选择权签人" category="0506" >
diff --git a/examples/sites/demos/pc/app/hrapprover/category-type.vue b/examples/sites/demos/pc/app/hrapprover/category-type.vue index cb77bc73a2..5e40728fed 100644 --- a/examples/sites/demos/pc/app/hrapprover/category-type.vue +++ b/examples/sites/demos/pc/app/hrapprover/category-type.vue @@ -3,6 +3,7 @@ diff --git a/examples/sites/demos/pc/app/hrapprover/custom-service-composition-api.vue b/examples/sites/demos/pc/app/hrapprover/custom-service-composition-api.vue index c02960bcbf..15fc2e7ff6 100644 --- a/examples/sites/demos/pc/app/hrapprover/custom-service-composition-api.vue +++ b/examples/sites/demos/pc/app/hrapprover/custom-service-composition-api.vue @@ -6,6 +6,7 @@ @update:approvalPerson="person = $event" :fetch-hrapprover="getFetchHrapprover" :category="category" + title="选择权签人" >
diff --git a/examples/sites/demos/pc/app/hrapprover/custom-service.vue b/examples/sites/demos/pc/app/hrapprover/custom-service.vue index 00ff863e7c..40554bc577 100644 --- a/examples/sites/demos/pc/app/hrapprover/custom-service.vue +++ b/examples/sites/demos/pc/app/hrapprover/custom-service.vue @@ -6,6 +6,7 @@ @update:approvalPerson="person = $event" :fetch-hrapprover="getFetchHrapprover" :category="category" + title="选择权签人" > diff --git a/examples/sites/demos/pc/app/hrapprover/disabled-composition-api.vue b/examples/sites/demos/pc/app/hrapprover/disabled-composition-api.vue index 5af30bd1fe..e517fa29bb 100644 --- a/examples/sites/demos/pc/app/hrapprover/disabled-composition-api.vue +++ b/examples/sites/demos/pc/app/hrapprover/disabled-composition-api.vue @@ -4,6 +4,7 @@ diff --git a/examples/sites/demos/pc/app/hrapprover/disabled.vue b/examples/sites/demos/pc/app/hrapprover/disabled.vue index eb716e0ec3..c87aa99ad8 100644 --- a/examples/sites/demos/pc/app/hrapprover/disabled.vue +++ b/examples/sites/demos/pc/app/hrapprover/disabled.vue @@ -4,6 +4,7 @@ diff --git a/packages/theme/src/base/reset.less b/packages/theme/src/base/reset.less index 1b2f490cdc..dd5e9f6f7f 100644 --- a/packages/theme/src/base/reset.less +++ b/packages/theme/src/base/reset.less @@ -177,7 +177,23 @@ } } -.tiny-popper, +.tiny-popper { + &[x-placement^='top'] { + margin-bottom: 4px; + } + &[x-placement^='bottom'] { + margin-top: 4px; + } + &[x-placement^='right'] { + margin-left: 4px; + } + &[x-placement^='left'] { + margin-right: 4px; + } +} + + +.tiny-popconfirm-popover, .tiny-tooltip__popper { .popper__arrow { position: absolute; diff --git a/packages/theme/src/dept/index.less b/packages/theme/src/dept/index.less index 7c3951f95e..09b1c0b45f 100644 --- a/packages/theme/src/dept/index.less +++ b/packages/theme/src/dept/index.less @@ -22,22 +22,18 @@ .inject-Dept-vars(); &__search { - margin-bottom: 12px; + margin-bottom: 24px; } - &__text, &__label { + width: 80px; font-size: var(--tv-Dept-label-font-size); color: var(--tv-Dept-label-text-color); font-weight: var(--tv-Dept-label-font-weight); + text-align: left; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - } - - &__label { - text-align: right; - &.is-selected { text-align: left; margin-bottom: 4px; @@ -53,7 +49,7 @@ } &__item { - margin-bottom: 12px; + margin-bottom: 24px; } &__search &__label, diff --git a/packages/theme/src/dept/vars.less b/packages/theme/src/dept/vars.less index c546053eb1..48e1283255 100644 --- a/packages/theme/src/dept/vars.less +++ b/packages/theme/src/dept/vars.less @@ -12,8 +12,8 @@ .inject-Dept-vars() { --tv-Dept-label-font-size: var(--tv-font-size-md); - --tv-Dept-label-text-color: var(--tv-color-text); - --tv-Dept-label-font-weight: var(--tv-font-weight-bold); + --tv-Dept-label-text-color: var(--tv-color-text-secondary); + --tv-Dept-label-font-weight: var(--tv-font-weight-regular); --tv-Dept-selected-info-text-color: var(--tv-color-text); --tv-Dept-selected-info-bg-color: var(--tv-color-bg-active); --tv-Dept-selected-info-border-radius: var(--tv-border-radius-md); diff --git a/packages/theme/src/espace/index.less b/packages/theme/src/espace/index.less index bf4f21e7c1..2e2a7bd51a 100644 --- a/packages/theme/src/espace/index.less +++ b/packages/theme/src/espace/index.less @@ -22,7 +22,7 @@ .item-talk, .item-call, .item-email { - margin: 0 8px 0 0; + margin: 0 24px 0 0; line-height: 1; .@{svg-prefix-cls} { diff --git a/packages/theme/src/roles/index.less b/packages/theme/src/roles/index.less index e406ae5285..307f8a8d9c 100644 --- a/packages/theme/src/roles/index.less +++ b/packages/theme/src/roles/index.less @@ -24,7 +24,7 @@ &__selector { &.@{css-prefix}popover.@{css-prefix}popper { - padding: 0; + padding: 8px 0; } } @@ -57,11 +57,5 @@ background: var(--tv-Roles-poplist-item-hover-bg-color); } - &.is-selected { - &, - &:hover { - background: var(--tv-Roles-poplist-item-selected-bg-color); - } - } } } diff --git a/packages/theme/src/roles/vars.less b/packages/theme/src/roles/vars.less index 163b4225a5..bd2a843636 100644 --- a/packages/theme/src/roles/vars.less +++ b/packages/theme/src/roles/vars.less @@ -19,6 +19,4 @@ --tv-Roles-poplist-item-font-size: var(--tv-font-size-md); // 下拉面板选项悬浮背景色 --tv-Roles-poplist-item-hover-bg-color: var(--tv-color-bg-hover); - // 下拉面板选项选中色 - --tv-Roles-poplist-item-selected-bg-color: var(--tv-color-bg-active); }