From db82a33c45577bbc2e593227fd9c2ff3916e0adb Mon Sep 17 00:00:00 2001 From: kubeops Date: Sun, 7 Jul 2024 12:27:35 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Notify/index.vue | 4 +--- src/components/Screenfull/index.vue | 4 +++- src/components/SearchMenu/index.vue | 3 ++- src/components/ThemeSwitch/index.vue | 4 +--- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/components/Notify/index.vue b/src/components/Notify/index.vue index f7ad01bd..4d5001e3 100644 --- a/src/components/Notify/index.vue +++ b/src/components/Notify/index.vue @@ -56,9 +56,7 @@ const handleHistory = () => { diff --git a/src/components/Screenfull/index.vue b/src/components/Screenfull/index.vue index 1744e28d..f860fd7e 100644 --- a/src/components/Screenfull/index.vue +++ b/src/components/Screenfull/index.vue @@ -76,7 +76,9 @@ const handleContentFullClick = () => {
- + + + diff --git a/src/components/SearchMenu/index.vue b/src/components/SearchMenu/index.vue index b9c4ee4c..3ee98d5c 100644 --- a/src/components/SearchMenu/index.vue +++ b/src/components/SearchMenu/index.vue @@ -1,6 +1,7 @@ + + + + diff --git a/src/components/Settings/index.vue b/src/components/Settings/index.vue new file mode 100644 index 00000000..0040bf8a --- /dev/null +++ b/src/components/Settings/index.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/layouts/components/NavigationBar/index.vue b/src/layouts/components/NavigationBar/index.vue index e8413e93..4b618cf6 100644 --- a/src/layouts/components/NavigationBar/index.vue +++ b/src/layouts/components/NavigationBar/index.vue @@ -12,6 +12,7 @@ import Notify from "@/components/Notify/index.vue" import ThemeSwitch from "@/components/ThemeSwitch/index.vue" import Screenfull from "@/components/Screenfull/index.vue" import SearchMenu from "@/components/SearchMenu/index.vue" +import Settings from "@/components/Settings/index.vue" import { useDevice } from "@/hooks/useDevice" import { useLayoutMode } from "@/hooks/useLayoutMode" @@ -21,7 +22,7 @@ const router = useRouter() const appStore = useAppStore() const userStore = useUserStore() const settingsStore = useSettingsStore() -const { showNotify, showThemeSwitch, showScreenfull, showSearchMenu } = storeToRefs(settingsStore) +const { showSettings, showNotify, showThemeSwitch, showScreenfull, showSearchMenu } = storeToRefs(settingsStore) /** 切换侧边栏 */ const toggleSidebar = () => { @@ -46,6 +47,7 @@ const logout = () => {
+ From 8ccb73c04d78427220daa5305930487a20adb72d Mon Sep 17 00:00:00 2001 From: kubeops Date: Sun, 7 Jul 2024 12:29:34 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=8E=BB=E6=8E=89RightPanel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Settings/SelectLayoutMode.vue | 103 ------------------ src/layouts/components/Settings/index.vue | 86 --------------- src/layouts/components/index.ts | 1 - src/layouts/index.vue | 8 +- 4 files changed, 4 insertions(+), 194 deletions(-) delete mode 100644 src/layouts/components/Settings/SelectLayoutMode.vue delete mode 100644 src/layouts/components/Settings/index.vue diff --git a/src/layouts/components/Settings/SelectLayoutMode.vue b/src/layouts/components/Settings/SelectLayoutMode.vue deleted file mode 100644 index 28ff95ec..00000000 --- a/src/layouts/components/Settings/SelectLayoutMode.vue +++ /dev/null @@ -1,103 +0,0 @@ - - - - - diff --git a/src/layouts/components/Settings/index.vue b/src/layouts/components/Settings/index.vue deleted file mode 100644 index a932ed20..00000000 --- a/src/layouts/components/Settings/index.vue +++ /dev/null @@ -1,86 +0,0 @@ - - - - - diff --git a/src/layouts/components/index.ts b/src/layouts/components/index.ts index c6a9ab27..3c2f9d2e 100644 --- a/src/layouts/components/index.ts +++ b/src/layouts/components/index.ts @@ -1,6 +1,5 @@ export { default as AppMain } from "./AppMain.vue" export { default as NavigationBar } from "./NavigationBar/index.vue" -export { default as Settings } from "./Settings/index.vue" export { default as Sidebar } from "./Sidebar/index.vue" export { default as TagsView } from "./TagsView/index.vue" export { default as RightPanel } from "./RightPanel/index.vue" diff --git a/src/layouts/index.vue b/src/layouts/index.vue index fb2712da..c0c35e45 100644 --- a/src/layouts/index.vue +++ b/src/layouts/index.vue @@ -9,7 +9,7 @@ import { useLayoutMode } from "@/hooks/useLayoutMode" import LeftMode from "./LeftMode.vue" import TopMode from "./TopMode.vue" import LeftTopMode from "./LeftTopMode.vue" -import { Settings, RightPanel } from "./components" +// import { Settings, RightPanel } from "./components" import { getCssVariableValue, setCssVariableValue } from "@/utils" /** Layout 布局响应式 */ @@ -19,7 +19,7 @@ const { setWatermark, clearWatermark } = useWatermark() const { isMobile } = useDevice() const { isLeft, isTop, isLeftTop } = useLayoutMode() const settingsStore = useSettingsStore() -const { showSettings, showTagsView, showWatermark, showGreyMode, showColorWeakness } = storeToRefs(settingsStore) +const { showTagsView, showWatermark, showGreyMode, showColorWeakness } = storeToRefs(settingsStore) const classes = computed(() => { return { @@ -53,9 +53,9 @@ watchEffect(() => { - +
From c591208d27f43eafb4ffbbb39be408085e814b33 Mon Sep 17 00:00:00 2001 From: kubeops Date: Sun, 7 Jul 2024 12:30:42 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9app-container=E7=9A=84pad?= =?UTF-8?q?ding=EF=BC=8Csearch-wrapper=E7=9A=84margin-bottom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/index.scss | 2 +- src/styles/vxe-table.scss | 2 +- src/views/table/element-plus/index.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/styles/index.scss b/src/styles/index.scss index 0204c4a9..2c90f550 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -17,7 +17,7 @@ // 业务页面几乎都应该在根元素上挂载 class="app-container"，以保持页面美观 .app-container { - padding: 20px; + padding: 8px; } html { diff --git a/src/styles/vxe-table.scss b/src/styles/vxe-table.scss index 684cf39f..8f80638b 100644 --- a/src/styles/vxe-table.scss +++ b/src/styles/vxe-table.scss @@ -5,7 +5,7 @@ &--form-wrapper { .vxe-form { padding: 10px 20px !important; - margin-bottom: 20px !important; + margin-bottom: 5px !important; } } diff --git a/src/views/table/element-plus/index.vue b/src/views/table/element-plus/index.vue index 1e3f8198..22cb7e33 100644 --- a/src/views/table/element-plus/index.vue +++ b/src/views/table/element-plus/index.vue @@ -207,7 +207,7 @@ watch([() => paginationData.currentPage, () => paginationData.pageSize], getTabl diff --git a/src/layouts/components/index.ts b/src/layouts/components/index.ts index 3c2f9d2e..5a5da92e 100644 --- a/src/layouts/components/index.ts +++ b/src/layouts/components/index.ts @@ -2,5 +2,4 @@ export { default as AppMain } from "./AppMain.vue" export { default as NavigationBar } from "./NavigationBar/index.vue" export { default as Sidebar } from "./Sidebar/index.vue" export { default as TagsView } from "./TagsView/index.vue" -export { default as RightPanel } from "./RightPanel/index.vue" export { default as Logo } from "./Logo/index.vue" From 2d96672cb9da5dd79cacedd5cdb6a02ebd4e95bf Mon Sep 17 00:00:00 2001 From: kubeops Date: Sun, 7 Jul 2024 13:33:50 +0800 Subject: [PATCH 6/6] =?UTF-8?q?TagsView=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/components/TagsView/index.vue | 5 ++--- src/styles/variables.css | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/layouts/components/TagsView/index.vue b/src/layouts/components/TagsView/index.vue index a7178d81..4f4a1541 100644 --- a/src/layouts/components/TagsView/index.vue +++ b/src/layouts/components/TagsView/index.vue @@ -217,12 +217,11 @@ onMounted(() => { margin-right: 5px; } &.active { - background-color: var(--v3-tagsview-tag-active-bg-color); - color: var(--v3-tagsview-tag-active-text-color); + color: var(--v3-tagsview-tag-active-bg-color); border-color: var(--v3-tagsview-tag-active-border-color); } .el-icon { - margin: 0 2px; + margin-bottom: 1.5px; vertical-align: middle; border-radius: 50%; &:hover { diff --git a/src/styles/variables.css b/src/styles/variables.css index 9f0caf3c..9569cf2c 100644 --- a/src/styles/variables.css +++ b/src/styles/variables.css @@ -28,7 +28,6 @@ /** TagsView 组件 */ --v3-tagsview-height: 34px; --v3-tagsview-text-color: var(--el-text-color-regular); - --v3-tagsview-tag-active-text-color: #ffffff; --v3-tagsview-tag-bg-color: var(--el-bg-color); --v3-tagsview-tag-active-bg-color: var(--el-color-primary); --v3-tagsview-tag-border-radius: 2px;