diff --git a/.stylelintrc.cjs b/.stylelintrc.cjs
index d55c6ecf..f2783765 100644
--- a/.stylelintrc.cjs
+++ b/.stylelintrc.cjs
@@ -8,13 +8,19 @@ module.exports = {
"stylelint-config-html/vue", // 配置 vue 中 template 样式格式化
"stylelint-config-standard-scss", // 配置 stylelint scss 插件
"stylelint-config-recommended-vue/scss", // 配置 vue 中 scss 样式格式化
- "stylelint-config-recess-order" // 配置 stylelint css 属性书写顺序插件,
+ "stylelint-config-recess-order", // 配置 stylelint css 属性书写顺序插件,
+ "stylelint-config-recommended",
+ "stylelint-config-tailwindcss"
],
overrides: [
// 扫描 .vue/html 文件中的
diff --git a/src/layouts/components/Sidebar/components/Help/index.vue b/src/layouts/components/Sidebar/components/Help/index.vue
index a1e81b6d..9d20cb53 100644
--- a/src/layouts/components/Sidebar/components/Help/index.vue
+++ b/src/layouts/components/Sidebar/components/Help/index.vue
@@ -6,7 +6,7 @@
:options="options"
@select="handleSelect"
>
-
+
diff --git a/src/layouts/components/Sidebar/components/Logo/index.vue b/src/layouts/components/Sidebar/components/Logo/index.vue
index ce7fe696..ac97cb2a 100644
--- a/src/layouts/components/Sidebar/components/Logo/index.vue
+++ b/src/layouts/components/Sidebar/components/Logo/index.vue
@@ -1,5 +1,10 @@
-
+
-
-
diff --git a/src/layouts/components/Sidebar/components/Profile/index.vue b/src/layouts/components/Sidebar/components/Profile/index.vue
index c89ff5cc..03e21a81 100644
--- a/src/layouts/components/Sidebar/components/Profile/index.vue
+++ b/src/layouts/components/Sidebar/components/Profile/index.vue
@@ -6,7 +6,7 @@
:options="options"
@select="handleSelect"
>
-
+
diff --git a/src/layouts/components/Sidebar/components/Setting/index.vue b/src/layouts/components/Sidebar/components/Setting/index.vue
index e2d9ed23..fe3e933c 100644
--- a/src/layouts/components/Sidebar/components/Setting/index.vue
+++ b/src/layouts/components/Sidebar/components/Setting/index.vue
@@ -1,7 +1,7 @@
-
+
{{ t('Custom Setting') }}
diff --git a/src/layouts/components/Sidebar/components/Tree/index.vue b/src/layouts/components/Sidebar/components/Tree/index.vue
index e4800de4..ccb92acc 100644
--- a/src/layouts/components/Sidebar/components/Tree/index.vue
+++ b/src/layouts/components/Sidebar/components/Tree/index.vue
@@ -1,5 +1,5 @@
-
+
@@ -8,20 +8,39 @@
import mittBus from '@/utils/mittBus.ts';
import SvgIcon from '@/components/SvgIcon/index.vue';
+import { storeToRefs } from 'pinia';
import { CSSProperties } from 'vue';
+import { useTreeStore } from '@/stores/modules/tree.ts';
defineProps<{
name: string;
iconStyle: CSSProperties;
}>();
+const treeStore = useTreeStore();
+const { isCollapsed } = storeToRefs(treeStore);
+
const handleTreeIconClick = () => {
mittBus.emit('tree-click');
};
diff --git a/src/layouts/components/Sidebar/sideBottom.vue b/src/layouts/components/Sidebar/sideBottom.vue
index fcdc1ca5..90bfc02f 100644
--- a/src/layouts/components/Sidebar/sideBottom.vue
+++ b/src/layouts/components/Sidebar/sideBottom.vue
@@ -1,5 +1,5 @@
-
+
.bottom-item {
gap: 15px 12px !important;
- width: 100%;
- margin-bottom: 15px;
- cursor: pointer;
- :deep(svg:hover) {
- fill: var(--el-color-primary-light-1) !important;
+ :deep(.tree-icon):hover {
+ fill: var(--el-color-primary) !important;
}
}
diff --git a/src/layouts/components/Sidebar/sideTop.vue b/src/layouts/components/Sidebar/sideTop.vue
index d016a7fe..2e24f16c 100644
--- a/src/layouts/components/Sidebar/sideTop.vue
+++ b/src/layouts/components/Sidebar/sideTop.vue
@@ -1,7 +1,7 @@
-
+
-
+
@@ -44,14 +44,10 @@ const logoImage = globalStore.interface.logo_logout;
diff --git a/src/layouts/components/Tab/index.vue b/src/layouts/components/Tab/index.vue
index cdd65baf..e98d5376 100644
--- a/src/layouts/components/Tab/index.vue
+++ b/src/layouts/components/Tab/index.vue
@@ -6,9 +6,8 @@
justify="center"
align="center"
v-for="item in list"
- class="tab-item"
+ class="tab-item py-0 px-1.25"
:key="item.id"
- style="padding: 0 5px"
:class="{
'active-tab': item.isActive,
'first-click': item.clickCount === 1,
diff --git a/src/layouts/index.scss b/src/layouts/index.scss
index 9bbd5911..40f9c430 100644
--- a/src/layouts/index.scss
+++ b/src/layouts/index.scss
@@ -20,6 +20,15 @@
height: calc(100vh - 35px);
}
}
+ &::after {
+ position: absolute;
+ top: 0;
+ right: 0;
+ width: 10px;
+ height: 100%;
+ cursor: ew-resize;
+ content: '';
+ }
// 设置折叠状态下 padding 为零,否则侧边 item 图标无法点击
&.n-layout-sider--collapsed .n-layout-sider-scroll-container {
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 4df087d2..594802cf 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -3,7 +3,7 @@
@@ -18,7 +18,7 @@
:collapsed="isCollapsed"
:show-collapsed-content="false"
:native-scrollbar="false"
- class="transition-sider"
+ class="relative transition-sider"
:style="{
width: sideWidth + 'px',
maxWidth: '600px'
@@ -34,33 +34,27 @@