wip: 临时提交

This commit is contained in:
Ray.Hao
2025-05-27 17:31:44 +08:00
parent bdfec03e9b
commit 783eff2be5
12 changed files with 35 additions and 26 deletions

View File

@@ -12,7 +12,7 @@
</template>
<script lang="ts" setup>
import defaultSettings from "@/settings";
import { defaultSettings } from "@/settings";
import logo from "@/assets/logo.png";
defineProps({

View File

@@ -62,7 +62,7 @@
<script setup lang="ts">
import { useI18n } from "vue-i18n";
import { useRoute, useRouter } from "vue-router";
import defaultSettings from "@/settings";
import { defaultSettings } from "@/settings";
import { DeviceEnum } from "@/enums/settings/device.enum";
import { useAppStore, useSettingsStore, useUserStore } from "@/store";
import { SidebarColor, ThemeMode } from "@/enums/settings/theme.enum";

View File

@@ -148,10 +148,9 @@
import { DocumentCopy, RefreshLeft, Check } from "@element-plus/icons-vue";
const { t } = useI18n();
import { LayoutMode } from "@/enums/settings/layout.enum";
import { ThemeMode } from "@/enums/settings/theme.enum";
import { SidebarColor } from "@/enums/settings/theme.enum";
import { LayoutMode, SidebarColor, ThemeMode } from "@/enums";
import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
import { themeColorPresets } from "@/settings";
// 按钮图标
const copyIcon = markRaw(DocumentCopy);
@@ -174,18 +173,8 @@ const layoutOptions: LayoutOption[] = [
{ value: LayoutMode.MIX, label: t("settings.mixLayout"), className: "mix" },
];
// 颜色预设
const colorPresets = [
"#4080FF",
"#626AEF",
"#ff4500",
"#ff8c00",
"#00ced1",
"#1e90ff",
"#c71585",
"rgb(255, 120, 0)",
"hsva(120, 40, 94)",
];
// 使用统一的颜色预设配置
const colorPresets = themeColorPresets;
const route = useRoute();
const appStore = useAppStore();

View File

@@ -1,5 +1,5 @@
import { useAppStore, useSettingsStore } from "@/store";
import defaultSettings from "@/settings";
import { defaultSettings } from "@/settings";
/**
* 布局相关的通用逻辑

View File

@@ -15,7 +15,7 @@ import TopLayout from "./views/TopLayout.vue";
import MixLayout from "./views/MixLayout.vue";
import Settings from "./components/Settings/index.vue";
import { LayoutMode } from "@/enums/settings/layout.enum";
import defaultSettings from "@/settings";
import { defaultSettings } from "@/settings";
const { currentLayout } = useLayout();