From 92eb4d0f2db022d97156b67a39b8a6d0932fe4d6 Mon Sep 17 00:00:00 2001 From: wenmine Date: Wed, 22 Nov 2023 14:15:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(styles-import):=20=E8=A7=A3=E5=86=B3tre?= =?UTF-8?q?e=E7=BB=84=E4=BB=B6=E9=80=89=E4=B8=AD=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E8=89=B2=E4=B8=BA=E9=BB=91=E8=89=B2=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/design-core/vite.config.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/design-core/vite.config.js b/packages/design-core/vite.config.js index 2a3a2bfc2b..6c9c858f81 100644 --- a/packages/design-core/vite.config.js +++ b/packages/design-core/vite.config.js @@ -204,7 +204,9 @@ const importmap = { '@opentiny/vue-icon': `https://unpkg.com/@opentiny/vue@${importMapVersions.tinyVue}/runtime/tiny-vue-icon.mjs`, '@opentiny/vue-common': `https://unpkg.com/@opentiny/vue@${importMapVersions.tinyVue}/runtime/tiny-vue-common.mjs`, '@opentiny/vue-locale': `https://unpkg.com/@opentiny/vue@${importMapVersions.tinyVue}/runtime/tiny-vue-locale.mjs`, - '@opentiny/vue-design-smb': `https://unpkg.com/@opentiny/vue-design-smb@${importMapVersions.tinyVue}/index.js` + '@opentiny/vue-design-smb': `https://unpkg.com/@opentiny/vue-design-smb@${importMapVersions.tinyVue}/index.js`, + '@opentiny/vue-theme/theme-tool': `https://unpkg.com/@opentiny/vue-theme@${importMapVersions.tinyVue}/theme-tool`, + '@opentiny/vue-theme/theme': `https://unpkg.com/@opentiny/vue-theme@${importMapVersions.tinyVue}/theme` } } From ea4c6656e1f3b1b8f26b994b44b9f087841021bd Mon Sep 17 00:00:00 2001 From: wenmine Date: Wed, 22 Nov 2023 16:50:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(styles-import):=20=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E9=80=89=E4=B8=AD=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/plugins/page/src/PageTree.vue | 20 +++++++++++++------- packages/theme/dark/pageManage.less | 2 +- packages/theme/light/pageManage.less | 4 ++-- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/packages/plugins/page/src/PageTree.vue b/packages/plugins/page/src/PageTree.vue index a1a220e122..d8a0d643eb 100644 --- a/packages/plugins/page/src/PageTree.vue +++ b/packages/plugins/page/src/PageTree.vue @@ -373,12 +373,19 @@ export default { color: var(--ti-lowcode-page-manage-tree-color); .tiny-tree-node { - &.is-current { - .tiny-tree-node__content { - background-color: var(--ti-lowcode-page-manage-page-tree-background-color); - &:hover { - background-color: var(--ti-lowcode-page-manage-page-tree-background-hover-color); - } + &:hover { + background-color: var(--ti-lowcode-page-manage-page-tree-background-hover-color); + } + &.is-current, + &.is-current .tiny-tree-node__content, + &.is-current .tiny-tree-node__content-box { + color: var(--ti-lowcode-page-manage-tree-color); + background-color: var(--ti-lowcode-page-manage-page-tree-background-active-color); + &:hover { + background-color: var(--ti-lowcode-page-manage-page-tree-background-hover-color); + } + & > .tiny-tree-node__content-left { + font-weight: 700; } } } @@ -408,7 +415,6 @@ export default { visibility: hidden; } &:hover { - background-color: var(--ti-lowcode-page-manage-page-tree-background-color) !important; border-radius: 0; .icons { .setting { diff --git a/packages/theme/dark/pageManage.less b/packages/theme/dark/pageManage.less index 5a77bb243e..4311afab22 100644 --- a/packages/theme/dark/pageManage.less +++ b/packages/theme/dark/pageManage.less @@ -13,7 +13,7 @@ --ti-lowcode-page-manage-content-tips-color: var(--ti-lowcode-common-text-color-5); --ti-lowcode-page-manage-search-border-color: var(--ti-lowcode-common-border-color-2); --ti-lowcode-page-manage-tree-color: var(--ti-lowcode-common-secondary-text-color); - --ti-lowcode-page-manage-page-tree-background-color: var(--ti-lowcode-common-component-hover-bg); + --ti-lowcode-page-manage-page-tree-background-active-color: var(--ti-lowcode-common-component-hover-bg); --ti-lowcode-page-manage-page-tree-background-hover-color: var(--ti-lowcode-common-primary-hover-color); --ti-lowcode-page-manage-svg-hover-color: var(--ti-lowcode-common-primary-color); --ti-lowcode-page-manage-text-color: var(--ti-lowcode-common-secondary-text-color); diff --git a/packages/theme/light/pageManage.less b/packages/theme/light/pageManage.less index 327864e7e2..e9caec3aca 100644 --- a/packages/theme/light/pageManage.less +++ b/packages/theme/light/pageManage.less @@ -10,8 +10,8 @@ --ti-lowcode-page-manage-content-tips-color: var(--ti-lowcode-common-text-color-5); --ti-lowcode-page-manage-search-border-color: var(--ti-lowcode-base-gray-30); --ti-lowcode-page-manage-tree-color: var(--ti-lowcode-common-text-main-color); - --ti-lowcode-page-manage-page-tree-background-color: var(--ti-lowcode-common-component-hover-bg); - --ti-lowcode-page-manage-page-tree-background-hover-color: var(--ti-lowcode-common-primary-hover-color); + --ti-lowcode-page-manage-page-tree-background-active-color: var(--ti-lowcode-common-component-hover-bg); + --ti-lowcode-page-manage-page-tree-background-hover-color: var(--ti-lowcode-common-component-hover-bg); --ti-lowcode-page-manage-svg-hover-color: var(--ti-lowcode-base-bg-3); --ti-lowcode-page-manage-text-color: var(--ti-lowcode-base-text-color-1); --ti-lowcode-page-manage-input-head-text-color: var(--ti-lowcode-base-text-color);