From cb3c0b42dbd2511d811200c7683d0d1b277c0405 Mon Sep 17 00:00:00 2001 From: shenjunjian <40288193@qq.com> Date: Fri, 13 Sep 2024 01:35:40 -0700 Subject: [PATCH] fix(theme): update unresolved smb style --- examples/sites/demos/pc/app/tree/icons-composition-api.vue | 4 ++-- examples/sites/demos/pc/app/tree/icons.vue | 4 ++-- packages/theme/src/transfer/index.less | 2 +- packages/theme/src/tree/index.less | 2 +- packages/theme/src/tree/vars.less | 2 +- packages/vue/src/cascader-node/src/pc.vue | 4 ++-- packages/vue/src/cascader/src/pc.vue | 6 +++--- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/sites/demos/pc/app/tree/icons-composition-api.vue b/examples/sites/demos/pc/app/tree/icons-composition-api.vue index 8b4690d70d..b6ffcdbbb0 100644 --- a/examples/sites/demos/pc/app/tree/icons-composition-api.vue +++ b/examples/sites/demos/pc/app/tree/icons-composition-api.vue @@ -23,8 +23,8 @@ import { Tree as TinyTree } from '@opentiny/vue' import { iconPutAway, iconExpand, iconRightO, iconEditorTable, iconFile } from '@opentiny/vue-icon' const icon = iconRightO() -const shrinkIcon = iconPutAway() -const expandIcon = iconExpand() +const shrinkIcon = iconExpand() +const expandIcon = iconPutAway() const tinyIconEditorTable = iconEditorTable() const tinyIconFile = iconFile() diff --git a/examples/sites/demos/pc/app/tree/icons.vue b/examples/sites/demos/pc/app/tree/icons.vue index 6942896e97..ac6e474ebc 100644 --- a/examples/sites/demos/pc/app/tree/icons.vue +++ b/examples/sites/demos/pc/app/tree/icons.vue @@ -28,8 +28,8 @@ export default { data() { return { icon: iconRightO(), - shrinkIcon: iconPutAway(), - expandIcon: iconExpand(), + shrinkIcon: iconExpand(), + expandIcon: iconPutAway(), tinyIconEditorTable: iconEditorTable(), tinyIconFile: iconFile(), data: [ diff --git a/packages/theme/src/transfer/index.less b/packages/theme/src/transfer/index.less index d2e9c1a3de..23c7afb4cb 100644 --- a/packages/theme/src/transfer/index.less +++ b/packages/theme/src/transfer/index.less @@ -277,7 +277,7 @@ display: inline-block; box-sizing: border-box; border-radius: var(--ti-transfer-panel-filter-border-radius); - border-bottom-color: #c2c2c2 !important; + border-bottom-color: #f0f0f0 !important; padding-left: 24px; padding-right: 0; } diff --git a/packages/theme/src/tree/index.less b/packages/theme/src/tree/index.less index e27a508632..db7625ea51 100644 --- a/packages/theme/src/tree/index.less +++ b/packages/theme/src/tree/index.less @@ -93,7 +93,7 @@ .@{tree-node-prefix-cls}.is-current:not(.show-checkbox) > .@{tree-node-prefix-cls}__content { .@{tree-node-prefix-cls}__content-box, .@{tree-node-prefix-cls}__content-right { - background-color: var(--ti-tree-node-content-current-bg-color); + background-color: var(--ti-tree-node-highlight-bg-color); } } } diff --git a/packages/theme/src/tree/vars.less b/packages/theme/src/tree/vars.less index c7b8265a05..dffa0d2ee5 100644 --- a/packages/theme/src/tree/vars.less +++ b/packages/theme/src/tree/vars.less @@ -69,7 +69,7 @@ // 节点左内边距 --ti-tree-node-padding-left: var(--ti-common-space-4x); // 节点高亮背景色 - --ti-tree-node-highlight-bg-color: var(--ti-common-color-light); + --ti-tree-node-highlight-bg-color: var(--ti-base-text-color-2); // 节点内容高度 --ti-tree-node-content-height: var(--ti-common-space-8x); // 节点内容边框弧度 diff --git a/packages/vue/src/cascader-node/src/pc.vue b/packages/vue/src/cascader-node/src/pc.vue index fac0dd4ff4..c13f5ad013 100644 --- a/packages/vue/src/cascader-node/src/pc.vue +++ b/packages/vue/src/cascader-node/src/pc.vue @@ -15,7 +15,7 @@ import { $prefix, setup, h, $props, defineComponent } from '@opentiny/vue-common import Checkbox from '@opentiny/vue-checkbox' import Radio from '@opentiny/vue-radio' import { isEqual } from '@opentiny/vue-renderless/common/object' -import { iconLoadingShadow, iconRightward, iconYes } from '@opentiny/vue-icon' +import { iconLoadingShadow, iconChevronRight, iconYes } from '@opentiny/vue-icon' import type { PropType } from '@opentiny/vue-common' import type { ICascaderNodeApi, ICascaderNodeRenderlessParams } from '@opentiny/vue-renderless/types/cascader-node.type' import type { ICascaderPanelNode } from '@opentiny/vue-renderless/types/cascader-panel.type' @@ -28,7 +28,7 @@ export default defineComponent({ TinyRadio: Radio, IconYes: iconYes(), IconLoading: iconLoadingShadow(), - IconChevronRight: iconRightward() + IconChevronRight: iconChevronRight() }, inheritAttrs: false, emits: ['expand', 'update:modelValue', 'expand-change', 'active-item-change', 'change'], diff --git a/packages/vue/src/cascader/src/pc.vue b/packages/vue/src/cascader/src/pc.vue index 8e21f340ab..46ce1ee069 100644 --- a/packages/vue/src/cascader/src/pc.vue +++ b/packages/vue/src/cascader/src/pc.vue @@ -199,7 +199,7 @@ import Scrollbar from '@opentiny/vue-scrollbar' import CascaderPanel from '@opentiny/vue-cascader-panel' import FilterBox from '@opentiny/vue-filter-box' import Tooltip from '@opentiny/vue-tooltip' -import { iconClose, iconChevronDown, iconChevronUp, iconYes } from '@opentiny/vue-icon' +import { iconClose, IconTriangleDown, IconUpWard, iconYes } from '@opentiny/vue-icon' import '@opentiny/vue-theme/cascader/index.less' export default defineComponent({ @@ -259,8 +259,8 @@ export default defineComponent({ TinyFilterBox: FilterBox, TinyCascaderPanel: CascaderPanel, IconClose: iconClose(), - IconChevronDown: iconChevronDown(), - IconChevronUp: iconChevronUp(), + IconChevronDown: IconTriangleDown(), + IconChevronUp: IconUpWard(), IconYes: iconYes(), TinyTooltip: Tooltip },