mirror of
https://github.com/soybeanjs/soybean-admin.git
synced 2025-09-29 06:36:41 +08:00
refactor(vscode): 调整 ESLint 配置并格式化相关文件
- 将 "source.fixAll.eslint" 设置为 "explicit" 模式 - 格式化 .vscode/settings
This commit is contained in:
parent
94179ae552
commit
2eb04c8493
2
.vscode/settings.json
vendored
2
.vscode/settings.json
vendored
@ -48,7 +48,7 @@
|
||||
"ភាសាខ្មែរ"
|
||||
],
|
||||
"editor.codeActionsOnSave": {
|
||||
"source.fixAll.eslint": true
|
||||
"source.fixAll.eslint": "explicit"
|
||||
},
|
||||
"editor.fontLigatures": true,
|
||||
"editor.formatOnSave": false,
|
||||
|
@ -1,3 +1,13 @@
|
||||
<!--
|
||||
* @Author: whr2349 378237242@QQ.com
|
||||
* @Date: 2023-08-17 09:25:28
|
||||
* @LastEditors: whr2349 378237242@QQ.com
|
||||
* @LastEditTime: 2023-09-05 10:35:12
|
||||
* @FilePath: \soybean-admin\src\components\common\app-loading.vue
|
||||
* @Description:
|
||||
*
|
||||
* Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
|
||||
-->
|
||||
<template>
|
||||
<div class="fixed-center flex-col">
|
||||
<system-logo class="text-128px text-primary" />
|
||||
|
@ -1,3 +1,13 @@
|
||||
/*
|
||||
* @Author: whr2349 378237242@QQ.com
|
||||
* @Date: 2023-08-17 09:25:28
|
||||
* @LastEditors: whr2349 378237242@QQ.com
|
||||
* @LastEditTime: 2023-08-17 17:14:37
|
||||
* @FilePath: \soybean-admin\src\layouts\index.ts
|
||||
* @Description:
|
||||
*
|
||||
* Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
|
||||
*/
|
||||
const BasicLayout = () => import('./basic-layout/index.vue');
|
||||
const BlankLayout = () => import('./blank-layout/index.vue');
|
||||
|
||||
|
11
src/main.ts
11
src/main.ts
@ -1,3 +1,13 @@
|
||||
/*
|
||||
* @Author: whr2349 378237242@QQ.com
|
||||
* @Date: 2023-08-17 09:25:28
|
||||
* @LastEditors: whr2349 378237242@QQ.com
|
||||
* @LastEditTime: 2023-08-17 14:11:06
|
||||
* @FilePath: \soybean-admin\src\main.ts
|
||||
* @Description:
|
||||
*
|
||||
* Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
|
||||
*/
|
||||
import { createApp } from 'vue';
|
||||
import App from './App.vue';
|
||||
import AppLoading from './components/common/app-loading.vue';
|
||||
@ -16,6 +26,7 @@ async function setupApp() {
|
||||
|
||||
appLoading.mount('#appLoading');
|
||||
|
||||
// app
|
||||
const app = createApp(App);
|
||||
|
||||
// store plugin: pinia
|
||||
|
@ -1,2 +1,12 @@
|
||||
/*
|
||||
* @Author: whr2349 378237242@QQ.com
|
||||
* @Date: 2023-08-17 09:25:28
|
||||
* @LastEditors: whr2349 378237242@QQ.com
|
||||
* @LastEditTime: 2023-08-23 15:34:22
|
||||
* @FilePath: \soybean-admin\src\settings\index.ts
|
||||
* @Description:
|
||||
*
|
||||
* Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
|
||||
*/
|
||||
export * from './theme';
|
||||
export * from './color';
|
||||
|
@ -1,3 +1,13 @@
|
||||
/*
|
||||
* @Author: whr2349 378237242@QQ.com
|
||||
* @Date: 2023-08-17 09:25:28
|
||||
* @LastEditors: whr2349 378237242@QQ.com
|
||||
* @LastEditTime: 2023-08-25 11:24:58
|
||||
* @FilePath: \soybean-admin\src\store\modules\theme\helpers.ts
|
||||
* @Description:
|
||||
*
|
||||
* Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
|
||||
*/
|
||||
import type { GlobalThemeOverrides } from 'naive-ui';
|
||||
import { cloneDeep } from 'lodash-es';
|
||||
import { themeSetting } from '@/settings';
|
||||
@ -12,11 +22,14 @@ export function initThemeSettings() {
|
||||
if (isProd && storageSettings) {
|
||||
return storageSettings;
|
||||
}
|
||||
|
||||
const themeColor = sessionStg.get('themeColor') || themeSetting.themeColor;
|
||||
// 获取颜色对应的信息颜色
|
||||
const info = themeSetting.isCustomizeInfoColor ? themeSetting.otherColor.info : getColorPalette(themeColor, 7);
|
||||
// 将颜色对应的信息颜色和其他颜色合并
|
||||
const otherColor = { ...themeSetting.otherColor, info };
|
||||
// 将其他颜色和颜色对应的信息颜色合并
|
||||
const setting = cloneDeep({ ...themeSetting, themeColor, otherColor });
|
||||
// 返回设置
|
||||
return setting;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user