diff --git a/src/components/business/loading-empty-wrapper.vue b/src/components/business/loading-empty-wrapper.vue index b331ae26..6c49aac2 100644 --- a/src/components/business/loading-empty-wrapper.vue +++ b/src/components/business/loading-empty-wrapper.vue @@ -54,7 +54,7 @@ const props = withDefaults(defineProps(), { placeholderClass: 'bg-white dark:bg-dark transition-background-color duration-300 ease-in-out', emptyDesc: '暂无数据', iconClass: 'text-320px text-primary', - descClass: 'text-16px text-[#666]', + descClass: 'text-16px text-#666', showNetworkReload: false }); diff --git a/src/components/common/dark-mode-container.vue b/src/components/common/dark-mode-container.vue index f2be2d14..5bb8714f 100644 --- a/src/components/common/dark-mode-container.vue +++ b/src/components/common/dark-mode-container.vue @@ -1,7 +1,7 @@ diff --git a/src/settings/theme.json b/src/settings/theme.json index 65a81792..a812847e 100644 --- a/src/settings/theme.json +++ b/src/settings/theme.json @@ -120,9 +120,11 @@ ] }, "footer": { + "visible": true, "fixed": false, + "right": true, "height": 48, - "visible": true + "inverted": false }, "page": { "animate": true, diff --git a/src/settings/theme.ts b/src/settings/theme.ts index ff1c5c07..b678cb94 100644 --- a/src/settings/theme.ts +++ b/src/settings/theme.ts @@ -83,9 +83,11 @@ const defaultThemeSetting: Theme.Setting = { horizontalPositionList: themeHorizontalMenuPositionOptions }, footer: { + visible: true, fixed: false, + right: true, height: 48, - visible: true + inverted: false }, page: { animate: true, diff --git a/src/store/modules/theme/index.ts b/src/store/modules/theme/index.ts index b61a4c7a..35be6f11 100644 --- a/src/store/modules/theme/index.ts +++ b/src/store/modules/theme/index.ts @@ -145,17 +145,25 @@ export const useThemeStore = defineStore('theme-store', { setHorizontalMenuPosition(position: UnionKey.ThemeHorizontalMenuPosition) { this.menu.horizontalPosition = position; }, + /** 设置底部是否显示 */ + setFooterVisible(isVisible: boolean) { + this.footer.visible = isVisible; + }, /** 设置底部是否固定 */ setFooterIsFixed(isFixed: boolean) { this.footer.fixed = isFixed; }, + /** 设置底部是否固定 */ + setFooterIsRight(right: boolean) { + this.footer.right = right; + }, /** 设置底部高度 */ setFooterHeight(height: number) { this.footer.height = height; }, - /** 设置底部是否显示 */ - setFooterVisible(isVisible: boolean) { - this.footer.visible = isVisible; + /** 设置底部高度 */ + setFooterInverted(inverted: boolean) { + this.footer.inverted = inverted; }, /** 设置切换页面时是否过渡动画 */ setPageIsAnimate(animate: boolean) { diff --git a/src/styles/css/global.css b/src/styles/css/global.css index 6fbfc094..d5038769 100644 --- a/src/styles/css/global.css +++ b/src/styles/css/global.css @@ -1,6 +1,5 @@ @import "./transition.css"; @import "./reset.css"; -@import "./scrollbar.css"; html, body, diff --git a/src/styles/css/scrollbar.css b/src/styles/css/scrollbar.css deleted file mode 100644 index 8119c70b..00000000 --- a/src/styles/css/scrollbar.css +++ /dev/null @@ -1,52 +0,0 @@ -html { - scrollbar-width: thin; - scrollbar-color: #e1e1e1 transparent; -} - -/*---滚动条默认显示样式--*/ -html::-webkit-scrollbar-thumb { - background-color: #e1e1e1; - border-radius: 8px; -} -/*---鼠标点击滚动条显示样式--*/ -html::-webkit-scrollbar-thumb:hover { - background-color: #e1e1e1; - border-radius: 8px; -} -/*---滚动条大小--*/ -html::-webkit-scrollbar { - width: 8px; - height: 8px; -} -/*---滚动框背景样式--*/ -html::-webkit-scrollbar-track-piece { - background-color: rgba(0, 0, 0, 0); - border-radius: 0; -} - -html.dark { - scrollbar-width: thin; - scrollbar-color: #555 transparent; -} - -/*---滚动条默认显示样式--*/ -html.dark::-webkit-scrollbar-thumb { - background-color: #555; - border-radius: 8px; -} -/*---鼠标点击滚动条显示样式--*/ -html.dark::-webkit-scrollbar-thumb:hover { - background-color: #555; - border-radius: 8px; -} -/*---滚动条大小--*/ -html.dark::-webkit-scrollbar { - width: 8px; - height: 8px; -} - -/*---滚动框背景样式--*/ -html.dark::-webkit-scrollbar-track-piece { - background-color: rgba(0, 0, 0, 0); - border-radius: 0; -} diff --git a/src/styles/scss/scrollbar.scss b/src/styles/scss/scrollbar.scss index 169f91b3..ae9edb0d 100644 --- a/src/styles/scss/scrollbar.scss +++ b/src/styles/scss/scrollbar.scss @@ -1,4 +1,7 @@ @mixin scrollbar($size: 8px, $color: #d9d9d9) { + scrollbar-width: thin; + scrollbar-color: $color transparent; + &::-webkit-scrollbar-thumb { background-color: $color; border-radius: $size; diff --git a/src/typings/system.d.ts b/src/typings/system.d.ts index 527c48da..587cbbb5 100644 --- a/src/typings/system.d.ts +++ b/src/typings/system.d.ts @@ -200,12 +200,16 @@ declare namespace Theme { /** 底部样式 */ interface Footer { - /** 是否固定底部 */ - fixed: boolean; - /** 底部高度 */ - height: number; /* 底部是否可见 */ visible: boolean; + /** 是否固定底部 */ + fixed: boolean; + /** 底部是否居右(顶部混合菜单模式有效) */ + right: boolean; + /** 底部高度 */ + height: number; + /** 底部反转色 */ + inverted: boolean; } /** 页面样式 */ diff --git a/src/views/_builtin/login/components/pwd-login/components/other-account.vue b/src/views/_builtin/login/components/pwd-login/components/other-account.vue index 64f6dd79..b7ce0342 100644 --- a/src/views/_builtin/login/components/pwd-login/components/other-account.vue +++ b/src/views/_builtin/login/components/pwd-login/components/other-account.vue @@ -1,6 +1,6 @@