release: update 5.9.0

This commit is contained in:
xiaoxian521 2024-12-15 10:47:55 +08:00
parent a4f9251789
commit c50bb9981b
25 changed files with 2509 additions and 3163 deletions

2
.nvmrc
View File

@ -1 +1 @@
v20.15.0 v22.12.0

View File

@ -10,11 +10,11 @@ The simplified version is based on the shelf extracted from [vue-pure-admin](htt
## `js` version ## `js` version
[Click me to view js version](https://pure-admin.github.io/pure-admin-doc/pages/js/) [Click me to view js version](https://pure-admin.cn/pages/js/)
## `max` version ## `max` version
[Click me to view the max version](https://github.com/pure-admin/vue-pure-admin-max) [Click me to view the max version](https://pure-admin.cn/pages/max/)
## Supporting video ## Supporting video
@ -23,12 +23,12 @@ The simplified version is based on the shelf extracted from [vue-pure-admin](htt
## Nanny-level documents ## Nanny-level documents
[Click me to view vue-pure-admin documentation](https://pure-admin.github.io/pure-admin-doc) [Click me to view vue-pure-admin documentation](https://pure-admin.cn/)
[Click me to view @pureadmin/utils documentation](https://pure-admin-utils.netlify.app) [Click me to view @pureadmin/utils documentation](https://pure-admin-utils.netlify.app)
## Quality service, software outsourcing, sponsorship support ## Quality service, software outsourcing, sponsorship support
[Click me to view details](https://pure-admin.github.io/pure-admin-doc/pages/service/) [Click me to view details](https://pure-admin.cn/pages/service/)
## Preview ## Preview

View File

@ -14,11 +14,11 @@
## `js` 版本 ## `js` 版本
[点我查看 js 版本](https://pure-admin.github.io/pure-admin-doc/pages/js/) [点我查看 js 版本](https://pure-admin.cn/pages/js/)
## `max` 版本 ## `max` 版本
[点我查看 max 版本](https://github.com/pure-admin/vue-pure-admin-max) [点我查看 max 版本](https://pure-admin.cn/pages/max/)
## 配套视频 ## 配套视频
@ -27,12 +27,12 @@
## 配套保姆级文档 ## 配套保姆级文档
[点我查看 vue-pure-admin 文档](https://pure-admin.github.io/pure-admin-doc) [点我查看 vue-pure-admin 文档](https://pure-admin.cn/)
[点我查看 @pureadmin/utils 文档](https://pure-admin-utils.netlify.app) [点我查看 @pureadmin/utils 文档](https://pure-admin-utils.netlify.app)
## 优质服务、软件外包、赞助支持 ## 优质服务、软件外包、赞助支持
[点我查看详情](https://pure-admin.github.io/pure-admin-doc/pages/service/) [点我查看详情](https://pure-admin.cn/pages/service/)
## 预览 ## 预览

View File

@ -1,13 +1,13 @@
import type { Plugin } from "vite"; import type { Plugin } from "vite";
import gradient from "gradient-string";
import { getPackageSize } from "./utils"; import { getPackageSize } from "./utils";
import dayjs, { type Dayjs } from "dayjs"; import dayjs, { type Dayjs } from "dayjs";
import duration from "dayjs/plugin/duration"; import duration from "dayjs/plugin/duration";
import gradientString from "gradient-string";
import boxen, { type Options as BoxenOptions } from "boxen"; import boxen, { type Options as BoxenOptions } from "boxen";
dayjs.extend(duration); dayjs.extend(duration);
const welcomeMessage = gradientString("cyan", "magenta").multiline( const welcomeMessage = gradient(["cyan", "magenta"]).multiline(
`您好! 欢迎使用 pure-admin 开源项目\n我们为您精心准备了下面两个贴心的保姆级文档\nhttps://pure-admin.github.io/pure-admin-doc\nhttps://pure-admin-utils.netlify.app` `您好! 欢迎使用 pure-admin 开源项目\n我们为您精心准备了下面两个贴心的保姆级文档\nhttps://pure-admin.cn\nhttps://pure-admin-utils.netlify.app`
); );
const boxenOptions: BoxenOptions = { const boxenOptions: BoxenOptions = {
@ -41,7 +41,7 @@ export function viteBuildInfo(): Plugin {
callback: (size: string) => { callback: (size: string) => {
console.log( console.log(
boxen( boxen(
gradientString("cyan", "magenta").multiline( gradient(["cyan", "magenta"]).multiline(
`🎉 恭喜打包完成(总用时${dayjs `🎉 恭喜打包完成(总用时${dayjs
.duration(endTime.diff(startTime)) .duration(endTime.diff(startTime))
.format("mm分ss秒")}${size}` .format("mm分ss秒")}${size}`

View File

@ -25,10 +25,6 @@ const include = [
* *
* `@iconify-icons/` `exclude` 使 * `@iconify-icons/` `exclude` 使
*/ */
const exclude = [ const exclude = ["@iconify-icons/ep", "@iconify-icons/ri"];
"@iconify-icons/ep",
"@iconify-icons/ri",
"@pureadmin/theme/dist/browser-utils"
];
export { include, exclude }; export { include, exclude };

View File

@ -4,16 +4,13 @@ import { pathResolve } from "./utils";
import { viteBuildInfo } from "./info"; import { viteBuildInfo } from "./info";
import svgLoader from "vite-svg-loader"; import svgLoader from "vite-svg-loader";
import type { PluginOption } from "vite"; import type { PluginOption } from "vite";
import checker from "vite-plugin-checker";
import vueJsx from "@vitejs/plugin-vue-jsx"; import vueJsx from "@vitejs/plugin-vue-jsx";
import Inspector from "vite-plugin-vue-inspector";
import { configCompressPlugin } from "./compress"; import { configCompressPlugin } from "./compress";
import removeNoMatch from "vite-plugin-router-warn"; import removeNoMatch from "vite-plugin-router-warn";
import { visualizer } from "rollup-plugin-visualizer"; import { visualizer } from "rollup-plugin-visualizer";
import removeConsole from "vite-plugin-remove-console"; import removeConsole from "vite-plugin-remove-console";
import { themePreprocessorPlugin } from "@pureadmin/theme";
import VueI18nPlugin from "@intlify/unplugin-vue-i18n/vite"; import VueI18nPlugin from "@intlify/unplugin-vue-i18n/vite";
import { genScssMultipleScopeVars } from "../src/layout/theme"; import { codeInspectorPlugin } from "code-inspector-plugin";
import { vitePluginFakeServer } from "vite-plugin-fake-server"; import { vitePluginFakeServer } from "vite-plugin-fake-server";
export function getPluginsList( export function getPluginsList(
@ -26,21 +23,18 @@ export function getPluginsList(
// jsx、tsx语法支持 // jsx、tsx语法支持
vueJsx(), vueJsx(),
VueI18nPlugin({ VueI18nPlugin({
jitCompilation: false,
include: [pathResolve("../locales/**")] include: [pathResolve("../locales/**")]
}), }),
checker({ /**
typescript: true, * DOM IDE
vueTsc: true, * Mac Option + Shift
eslint: { * Windows Alt + Shift
lintCommand: `eslint ${pathResolve("../{src,mock,build}/**/*.{vue,js,ts,tsx}")}`, * https://inspector.fe-dev.cn/guide/start.html
useFlatConfig: true */
}, codeInspectorPlugin({
terminal: false, bundler: "vite",
enableBuild: false hideConsole: true
}), }),
// 按下Command(⌘)+Shift(⇧)然后点击页面元素会自动打开本地IDE并跳转到对应的代码位置
Inspector(),
viteBuildInfo(), viteBuildInfo(),
/** /**
* vue-router动态路由警告No match found for location with path * vue-router动态路由警告No match found for location with path
@ -55,13 +49,6 @@ export function getPluginsList(
infixName: false, infixName: false,
enableProd: true enableProd: true
}), }),
// 自定义主题
themePreprocessorPlugin({
scss: {
multipleScopeVars: genScssMultipleScopeVars(),
extract: true
}
}),
// svg组件化支持 // svg组件化支持
svgLoader(), svgLoader(),
VITE_CDN ? cdn : null, VITE_CDN ? cdn : null,

View File

@ -78,7 +78,8 @@ export default defineFlatConfig([
languageOptions: { languageOptions: {
parser: parserTypeScript, parser: parserTypeScript,
parserOptions: { parserOptions: {
sourceType: "module" sourceType: "module",
warnOnUnsupportedTypeScriptVersion: false
} }
}, },
plugins: { plugins: {
@ -93,6 +94,8 @@ export default defineFlatConfig([
"@typescript-eslint/prefer-as-const": "warn", "@typescript-eslint/prefer-as-const": "warn",
"@typescript-eslint/no-empty-function": "off", "@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-non-null-assertion": "off", "@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/no-unused-expressions": "off",
"@typescript-eslint/no-unsafe-function-type": "off",
"@typescript-eslint/no-import-type-side-effects": "error", "@typescript-eslint/no-import-type-side-effects": "error",
"@typescript-eslint/explicit-module-boundary-types": "off", "@typescript-eslint/explicit-module-boundary-types": "off",
"@typescript-eslint/consistent-type-imports": [ "@typescript-eslint/consistent-type-imports": [

View File

@ -1,6 +1,6 @@
{ {
"name": "pure-admin-thin", "name": "pure-admin-thin",
"version": "5.8.0", "version": "5.9.0",
"private": true, "private": true,
"type": "module", "type": "module",
"scripts": { "scripts": {
@ -49,93 +49,91 @@
}, },
"dependencies": { "dependencies": {
"@pureadmin/descriptions": "^1.2.1", "@pureadmin/descriptions": "^1.2.1",
"@pureadmin/table": "^3.2.0", "@pureadmin/table": "^3.2.1",
"@pureadmin/utils": "^2.4.8", "@pureadmin/utils": "^2.5.0",
"@vueuse/core": "^10.11.1", "@vueuse/core": "^12.0.0",
"@vueuse/motion": "^2.2.3", "@vueuse/motion": "^2.2.6",
"animate.css": "^4.1.1", "animate.css": "^4.1.1",
"axios": "^1.7.4", "axios": "^1.7.9",
"dayjs": "^1.11.12", "dayjs": "^1.11.13",
"echarts": "^5.5.1", "echarts": "^5.5.1",
"element-plus": "^2.8.0", "element-plus": "^2.9.0",
"js-cookie": "^3.0.5", "js-cookie": "^3.0.5",
"localforage": "^1.10.0", "localforage": "^1.10.0",
"mitt": "^3.0.1", "mitt": "^3.0.1",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"path": "^0.12.7", "path-browserify": "^1.0.1",
"pinia": "^2.2.2", "pinia": "^2.3.0",
"pinyin-pro": "^3.24.2", "pinyin-pro": "^3.26.0",
"qs": "^6.13.0", "qs": "^6.13.1",
"responsive-storage": "^2.2.0", "responsive-storage": "^2.2.0",
"sortablejs": "^1.15.2", "sortablejs": "^1.15.6",
"vue": "^3.4.38", "vue": "^3.5.13",
"vue-i18n": "^9.14.0", "vue-i18n": "^10.0.5",
"vue-router": "^4.4.3", "vue-router": "^4.5.0",
"vue-tippy": "^6.4.4", "vue-tippy": "^6.5.0",
"vue-types": "^5.1.3" "vue-types": "^5.1.3"
}, },
"devDependencies": { "devDependencies": {
"@commitlint/cli": "^19.4.0", "@commitlint/cli": "^19.6.0",
"@commitlint/config-conventional": "^19.2.2", "@commitlint/config-conventional": "^19.6.0",
"@commitlint/types": "^19.0.3", "@commitlint/types": "^19.5.0",
"@eslint/js": "^9.9.0", "@eslint/js": "^9.16.0",
"@faker-js/faker": "^8.4.1", "@faker-js/faker": "^9.3.0",
"@iconify-icons/ep": "^1.2.12", "@iconify-icons/ep": "^1.2.12",
"@iconify-icons/ri": "^1.2.10", "@iconify-icons/ri": "^1.2.10",
"@iconify/vue": "^4.1.2", "@iconify/vue": "^4.2.0",
"@intlify/unplugin-vue-i18n": "^4.0.0", "@intlify/unplugin-vue-i18n": "^6.0.1",
"@pureadmin/theme": "^3.2.0",
"@types/gradient-string": "^1.1.6",
"@types/js-cookie": "^3.0.6", "@types/js-cookie": "^3.0.6",
"@types/node": "^20.16.1", "@types/node": "^20.17.9",
"@types/nprogress": "^0.2.3", "@types/nprogress": "^0.2.3",
"@types/qs": "^6.9.15", "@types/path-browserify": "^1.0.3",
"@types/qs": "^6.9.17",
"@types/sortablejs": "^1.15.8", "@types/sortablejs": "^1.15.8",
"@typescript-eslint/eslint-plugin": "^7.18.0", "@typescript-eslint/eslint-plugin": "^8.18.0",
"@typescript-eslint/parser": "^7.18.0", "@typescript-eslint/parser": "^8.18.0",
"@vitejs/plugin-vue": "^5.1.2", "@vitejs/plugin-vue": "^5.2.1",
"@vitejs/plugin-vue-jsx": "^4.0.1", "@vitejs/plugin-vue-jsx": "^4.1.1",
"autoprefixer": "^10.4.20", "autoprefixer": "^10.4.20",
"boxen": "^7.1.1", "boxen": "^8.0.1",
"cssnano": "^7.0.5", "code-inspector-plugin": "^0.18.2",
"eslint": "^9.9.0", "cssnano": "^7.0.6",
"eslint": "^9.16.0",
"eslint-config-prettier": "^9.1.0", "eslint-config-prettier": "^9.1.0",
"eslint-define-config": "^2.1.0", "eslint-define-config": "^2.1.0",
"eslint-plugin-prettier": "^5.2.1", "eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-vue": "^9.27.0", "eslint-plugin-vue": "^9.32.0",
"gradient-string": "^2.0.2", "gradient-string": "^3.0.0",
"husky": "^9.1.4", "husky": "^9.1.7",
"lint-staged": "^15.2.9", "lint-staged": "^15.2.10",
"postcss": "^8.4.41", "postcss": "^8.4.49",
"postcss-html": "^1.7.0", "postcss-html": "^1.7.0",
"postcss-import": "^16.1.0", "postcss-import": "^16.1.0",
"postcss-scss": "^4.0.9", "postcss-scss": "^4.0.9",
"prettier": "^3.3.3", "prettier": "^3.4.2",
"rimraf": "^5.0.10", "rimraf": "^6.0.1",
"rollup-plugin-visualizer": "^5.12.0", "rollup-plugin-visualizer": "^5.12.0",
"sass": "^1.77.8", "sass": "^1.82.0",
"stylelint": "^16.8.2", "stylelint": "^16.11.0",
"stylelint-config-recess-order": "^5.0.1", "stylelint-config-recess-order": "^5.1.1",
"stylelint-config-recommended-vue": "^1.5.0", "stylelint-config-recommended-vue": "^1.5.0",
"stylelint-config-standard-scss": "^13.1.0", "stylelint-config-standard-scss": "^13.1.0",
"stylelint-prettier": "^5.0.2", "stylelint-prettier": "^5.0.2",
"svgo": "^3.3.2", "svgo": "^3.3.2",
"tailwindcss": "^3.4.10", "tailwindcss": "^3.4.16",
"typescript": "^5.5.4", "typescript": "5.6.3",
"vite": "^5.4.1", "vite": "^6.0.3",
"vite-plugin-cdn-import": "^1.0.1", "vite-plugin-cdn-import": "^1.0.1",
"vite-plugin-checker": "^0.7.2",
"vite-plugin-compression": "^0.5.1", "vite-plugin-compression": "^0.5.1",
"vite-plugin-fake-server": "^2.1.1", "vite-plugin-fake-server": "^2.1.4",
"vite-plugin-remove-console": "^2.2.0", "vite-plugin-remove-console": "^2.2.0",
"vite-plugin-router-warn": "^1.0.0", "vite-plugin-router-warn": "^1.0.0",
"vite-plugin-vue-inspector": "^5.1.3",
"vite-svg-loader": "^5.1.0", "vite-svg-loader": "^5.1.0",
"vue-eslint-parser": "^9.4.3", "vue-eslint-parser": "^9.4.3",
"vue-tsc": "^2.0.29" "vue-tsc": "^2.1.10"
}, },
"engines": { "engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0", "node": "^18.18.0 || ^20.9.0 || >=22.0.0",
"pnpm": ">=9" "pnpm": ">=9"
}, },
"pnpm": { "pnpm": {

5120
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
{ {
"Version": "5.8.0", "Version": "5.9.0",
"Title": "PureAdmin", "Title": "PureAdmin",
"FixedHeader": true, "FixedHeader": true,
"HiddenSideBar": false, "HiddenSideBar": false,

View File

@ -4,7 +4,7 @@ import { IconifyIconOnline, IconifyIconOffline, FontIcon } from "../index";
/** /**
* `iconfont` `svg` `iconify` * `iconfont` `svg` `iconify`
* @see {@link https://pure-admin.github.io/pure-admin-doc/pages/icon/} * @see {@link https://pure-admin.cn/pages/icon/}
* @param icon * @param icon
* @param attrs iconType * @param attrs iconType
* @returns Component * @returns Component

View File

@ -54,7 +54,7 @@ const props = {
export default defineComponent({ export default defineComponent({
name: "PureTableBar", name: "PureTableBar",
props, props,
emits: ["refresh"], emits: ["refresh", "fullscreen"],
setup(props, { emit, slots, attrs }) { setup(props, { emit, slots, attrs }) {
const size = ref("default"); const size = ref("default");
const loading = ref(false); const loading = ref(false);
@ -117,6 +117,11 @@ export default defineComponent({
toggleRowExpansionAll(props.tableRef.data, isExpandAll.value); toggleRowExpansionAll(props.tableRef.data, isExpandAll.value);
} }
function onFullscreen() {
isFullscreen.value = !isFullscreen.value;
emit("fullscreen", isFullscreen.value);
}
function toggleRowExpansionAll(data, isExpansion) { function toggleRowExpansionAll(data, isExpansion) {
data.forEach(item => { data.forEach(item => {
props.tableRef.toggleRowExpansion(item, isExpansion); props.tableRef.toggleRowExpansion(item, isExpansion);
@ -378,7 +383,7 @@ export default defineComponent({
class={["w-[16px]", iconClass.value]} class={["w-[16px]", iconClass.value]}
icon={isFullscreen.value ? ExitFullscreen : Fullscreen} icon={isFullscreen.value ? ExitFullscreen : Fullscreen}
v-tippy={isFullscreen.value ? "退出全屏" : "全屏"} v-tippy={isFullscreen.value ? "退出全屏" : "全屏"}
onClick={() => (isFullscreen.value = !isFullscreen.value)} onClick={() => onFullscreen()}
/> />
</div> </div>
</div> </div>

View File

@ -6,7 +6,7 @@ export interface OptionsType {
label?: string | (() => VNode | Component); label?: string | (() => VNode | Component);
/** /**
* @description `useRenderIcon` * @description `useRenderIcon`
* @see {@link https://pure-admin.github.io/pure-admin-doc/pages/icon/#%E9%80%9A%E7%94%A8%E5%9B%BE%E6%A0%87-userendericon-hooks } * @see {@link https://pure-admin.cn/pages/icon/#%E9%80%9A%E7%94%A8%E5%9B%BE%E6%A0%87-userendericon-hooks }
*/ */
icon?: string | Component; icon?: string | Component;
/** 图标属性、样式配置 */ /** 图标属性、样式配置 */

View File

@ -14,7 +14,6 @@ import { emitter } from "@/utils/mitt";
import LayPanel from "../lay-panel/index.vue"; import LayPanel from "../lay-panel/index.vue";
import { useNav } from "@/layout/hooks/useNav"; import { useNav } from "@/layout/hooks/useNav";
import { useAppStoreHook } from "@/store/modules/app"; import { useAppStoreHook } from "@/store/modules/app";
import { toggleTheme } from "@pureadmin/theme/dist/browser-utils";
import { useMultiTagsStoreHook } from "@/store/modules/multiTags"; import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
import Segmented, { type OptionsType } from "@/components/ReSegmented"; import Segmented, { type OptionsType } from "@/components/ReSegmented";
import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange"; import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";
@ -50,9 +49,7 @@ const {
if (unref(layoutTheme)) { if (unref(layoutTheme)) {
const layout = unref(layoutTheme).layout; const layout = unref(layoutTheme).layout;
const theme = unref(layoutTheme).theme; const theme = unref(layoutTheme).theme;
toggleTheme({ document.documentElement.setAttribute("data-theme", theme);
scopeName: `layout-theme-${theme}`
});
setLayoutModel(layout); setLayoutModel(layout);
} }

View File

@ -1,6 +1,6 @@
<script setup lang="ts"> <script setup lang="ts">
import path from "path";
import { getConfig } from "@/config"; import { getConfig } from "@/config";
import { posix } from "path-browserify";
import { menuType } from "@/layout/types"; import { menuType } from "@/layout/types";
import { ReText } from "@/components/ReText"; import { ReText } from "@/components/ReText";
import { useNav } from "@/layout/hooks/useNav"; import { useNav } from "@/layout/hooks/useNav";
@ -99,8 +99,7 @@ function resolvePath(routePath) {
if (httpReg.test(routePath) || httpReg.test(props.basePath)) { if (httpReg.test(routePath) || httpReg.test(props.basePath)) {
return routePath || props.basePath; return routePath || props.basePath;
} else { } else {
// 使path.posix.resolvepath.resolve windows使electron return posix.resolve(props.basePath, routePath);
return path.posix.resolve(props.basePath, routePath);
} }
} }
</script> </script>

View File

@ -63,7 +63,7 @@ const { title, getLogo } = useNav();
font-size: 18px; font-size: 18px;
font-weight: 600; font-weight: 600;
line-height: 32px; line-height: 32px;
color: $subMenuActiveText; color: var(--pure-theme-sub-menu-active-text);
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }

View File

@ -6,14 +6,9 @@ import { routerArrays } from "@/layout/types";
import { router, resetRouter } from "@/router"; import { router, resetRouter } from "@/router";
import type { themeColorsType } from "../types"; import type { themeColorsType } from "../types";
import { useAppStoreHook } from "@/store/modules/app"; import { useAppStoreHook } from "@/store/modules/app";
import { useGlobal, storageLocal } from "@pureadmin/utils";
import { useEpThemeStoreHook } from "@/store/modules/epTheme"; import { useEpThemeStoreHook } from "@/store/modules/epTheme";
import { useMultiTagsStoreHook } from "@/store/modules/multiTags"; import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
import { import { darken, lighten, useGlobal, storageLocal } from "@pureadmin/utils";
darken,
lighten,
toggleTheme
} from "@pureadmin/theme/dist/browser-utils";
export function useDataThemeChange() { export function useDataThemeChange() {
const { layoutTheme, layout } = useLayout(); const { layoutTheme, layout } = useLayout();
@ -54,9 +49,7 @@ export function useDataThemeChange() {
isClick = true isClick = true
) { ) {
layoutTheme.value.theme = theme; layoutTheme.value.theme = theme;
toggleTheme({ document.documentElement.setAttribute("data-theme", theme);
scopeName: `layout-theme-${theme}`
});
// 如果非isClick保留之前的themeColor // 如果非isClick保留之前的themeColor
const storageThemeColor = $storage.layout.themeColor; const storageThemeColor = $storage.layout.themeColor;
$storage.layout = { $storage.layout = {

View File

@ -1,129 +0,0 @@
/**
* @description 使
*/
import type { multipleScopeVarsOptions } from "@pureadmin/theme";
/** 预设主题色 */
const themeColors = {
/* 亮白色 */
light: {
subMenuActiveText: "#000000d9",
menuBg: "#fff",
menuHover: "#f6f6f6",
subMenuBg: "#fff",
subMenuActiveBg: "#e0ebf6",
menuText: "rgb(0 0 0 / 60%)",
sidebarLogo: "#fff",
menuTitleHover: "#000",
menuActiveBefore: "#4091f7"
},
/* 道奇蓝 */
default: {
subMenuActiveText: "#fff",
menuBg: "#001529",
menuHover: "rgb(64 145 247 / 15%)",
subMenuBg: "#0f0303",
subMenuActiveBg: "#4091f7",
menuText: "rgb(254 254 254 / 65%)",
sidebarLogo: "#002140",
menuTitleHover: "#fff",
menuActiveBefore: "#4091f7"
},
/* 深紫罗兰色 */
saucePurple: {
subMenuActiveText: "#fff",
menuBg: "#130824",
menuHover: "rgb(105 58 201 / 15%)",
subMenuBg: "#000",
subMenuActiveBg: "#693ac9",
menuText: "#7a80b4",
sidebarLogo: "#1f0c38",
menuTitleHover: "#fff",
menuActiveBefore: "#693ac9"
},
/* 深粉色 */
pink: {
subMenuActiveText: "#fff",
menuBg: "#28081a",
menuHover: "rgb(216 68 147 / 15%)",
subMenuBg: "#000",
subMenuActiveBg: "#d84493",
menuText: "#7a80b4",
sidebarLogo: "#3f0d29",
menuTitleHover: "#fff",
menuActiveBefore: "#d84493"
},
/* 猩红色 */
dusk: {
subMenuActiveText: "#fff",
menuBg: "#2a0608",
menuHover: "rgb(225 60 57 / 15%)",
subMenuBg: "#000",
subMenuActiveBg: "#e13c39",
menuText: "rgb(254 254 254 / 65.1%)",
sidebarLogo: "#42090c",
menuTitleHover: "#fff",
menuActiveBefore: "#e13c39"
},
/* 橙红色 */
volcano: {
subMenuActiveText: "#fff",
menuBg: "#2b0e05",
menuHover: "rgb(232 95 51 / 15%)",
subMenuBg: "#0f0603",
subMenuActiveBg: "#e85f33",
menuText: "rgb(254 254 254 / 65%)",
sidebarLogo: "#441708",
menuTitleHover: "#fff",
menuActiveBefore: "#e85f33"
},
/* 绿宝石 */
mingQing: {
subMenuActiveText: "#fff",
menuBg: "#032121",
menuHover: "rgb(89 191 193 / 15%)",
subMenuBg: "#000",
subMenuActiveBg: "#59bfc1",
menuText: "#7a80b4",
sidebarLogo: "#053434",
menuTitleHover: "#fff",
menuActiveBefore: "#59bfc1"
},
/* 酸橙绿 */
auroraGreen: {
subMenuActiveText: "#fff",
menuBg: "#0b1e15",
menuHover: "rgb(96 172 128 / 15%)",
subMenuBg: "#000",
subMenuActiveBg: "#60ac80",
menuText: "#7a80b4",
sidebarLogo: "#112f21",
menuTitleHover: "#fff",
menuActiveBefore: "#60ac80"
}
};
/**
* @description
*/
export const genScssMultipleScopeVars = (): multipleScopeVarsOptions[] => {
const result = [] as multipleScopeVarsOptions[];
Object.keys(themeColors).forEach(key => {
result.push({
scopeName: `layout-theme-${key}`,
varsContent: `
$subMenuActiveText: ${themeColors[key].subMenuActiveText} !default;
$menuBg: ${themeColors[key].menuBg} !default;
$menuHover: ${themeColors[key].menuHover} !default;
$subMenuBg: ${themeColors[key].subMenuBg} !default;
$subMenuActiveBg: ${themeColors[key].subMenuActiveBg} !default;
$menuText: ${themeColors[key].menuText} !default;
$sidebarLogo: ${themeColors[key].sidebarLogo} !default;
$menuTitleHover: ${themeColors[key].menuTitleHover} !default;
$menuActiveBefore: ${themeColors[key].menuActiveBefore} !default;
`
} as multipleScopeVarsOptions);
});
return result;
};

View File

@ -50,7 +50,7 @@ function getObjectKeys(obj) {
if (obj[k] && isObject(obj[k])) { if (obj[k] && isObject(obj[k])) {
stack.push({ obj: obj[k], key: newKey }); stack.push({ obj: obj[k], key: newKey });
} else { } else {
keys.add(newKey); keys.add(key);
} }
} }
} }

View File

@ -163,9 +163,10 @@
/* 仿 el-scrollbar 滚动条样式支持大多数浏览器如Chrome、Edge、Firefox、Safari等。整体暗色风格在 src/style/dark.scss 文件进行了适配 */ /* 仿 el-scrollbar 滚动条样式支持大多数浏览器如Chrome、Edge、Firefox、Safari等。整体暗色风格在 src/style/dark.scss 文件进行了适配 */
.pure-scrollbar { .pure-scrollbar {
scrollbar-color: rgb(221 222 224) transparent; /* 滑块颜色、轨道颜色 */
/* Firefox */ /* Firefox */
scrollbar-width: thin; /* 可选值为 'auto', 'thin', 'none' */ scrollbar-width: thin; /* 可选值为 'auto', 'thin', 'none' */
scrollbar-color: rgb(221 222 224) transparent; /* 滑块颜色、轨道颜色 */
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 6px; /* 滚动条宽度 */ width: 6px; /* 滚动条宽度 */
} }

View File

@ -1,7 +1,8 @@
@import "./transition"; @use "theme";
@import "./element-plus"; @use "transition";
@import "./sidebar"; @use "element-plus";
@import "./dark"; @use "sidebar";
@use "dark";
/* 自定义全局 CssVar */ /* 自定义全局 CssVar */
:root { :root {
@ -13,6 +14,16 @@
/* switch关闭状态下的color 需要时可取用 */ /* switch关闭状态下的color 需要时可取用 */
--pure-switch-off-color: #a6a6a6; --pure-switch-off-color: #a6a6a6;
/** 主题色 */
--pure-theme-sub-menu-active-text: initial;
--pure-theme-menu-bg: none;
--pure-theme-menu-hover: none;
--pure-theme-sub-menu-bg: transparent;
--pure-theme-menu-text: initial;
--pure-theme-sidebar-logo: none;
--pure-theme-menu-title-hover: initial;
--pure-theme-menu-active-before: transparent;
} }
/* 灰色模式 */ /* 灰色模式 */

View File

@ -1,7 +1,5 @@
/* $sideBarWidth: vertical 模式下主体内容距离网页文档左侧的距离 */ /* $sideBarWidth: vertical 模式下主体内容距离网页文档左侧的距离 */
@mixin merge-style($sideBarWidth) { @mixin merge-style($sideBarWidth) {
$menuActiveText: #7a80b4;
@media screen and (width >= 150px) and (width <= 420px) { @media screen and (width >= 150px) and (width <= 420px) {
.app-main-nofixed-header { .app-main-nofixed-header {
overflow-y: hidden; overflow-y: hidden;
@ -94,7 +92,7 @@
height: 100%; height: 100%;
overflow: visible; overflow: visible;
font-size: 0; font-size: 0;
background: $menuBg; background: var(--pure-theme-menu-bg) !important;
border-right: 1px solid var(--pure-border-color); border-right: 1px solid var(--pure-border-color);
/* 展开动画 */ /* 展开动画 */
@ -150,11 +148,11 @@
.el-menu-item, .el-menu-item,
.el-sub-menu__title { .el-sub-menu__title {
height: 50px; height: 50px;
color: $menuText; color: var(--pure-theme-menu-text);
background-color: transparent !important; background-color: transparent !important;
&:hover { &:hover {
color: $menuTitleHover !important; color: var(--pure-theme-menu-title-hover) !important;
} }
div, div,
@ -173,15 +171,15 @@
.is-active > .el-sub-menu__title, .is-active > .el-sub-menu__title,
.is-active.submenu-title-noDropdown { .is-active.submenu-title-noDropdown {
color: $subMenuActiveText !important; color: var(--pure-theme-sub-menu-active-text) !important;
i { i {
color: $subMenuActiveText !important; color: var(--pure-theme-sub-menu-active-text) !important;
} }
} }
.is-active { .is-active {
color: $subMenuActiveText !important; color: var(--pure-theme-sub-menu-active-text) !important;
transition: color 0.3s; transition: color 0.3s;
} }
@ -204,7 +202,7 @@
& .el-sub-menu .el-menu-item { & .el-sub-menu .el-menu-item {
min-width: $sideBarWidth !important; min-width: $sideBarWidth !important;
font-size: 14px; font-size: 14px;
background-color: $subMenuBg !important; background-color: var(--pure-theme-sub-menu-bg) !important;
} }
/* 有子集的激活菜单左侧小竖条 */ /* 有子集的激活菜单左侧小竖条 */
@ -218,7 +216,7 @@
height: 100%; height: 100%;
clear: both; clear: both;
content: ""; content: "";
background-color: $menuActiveBefore; background-color: var(--pure-theme-menu-active-before);
transition: all var(--pure-transition-duration) ease-in-out; transition: all var(--pure-transition-duration) ease-in-out;
transform: translateY(0); transform: translateY(0);
} }
@ -253,7 +251,7 @@
/* vertical 菜单折叠 */ /* vertical 菜单折叠 */
.el-menu--vertical { .el-menu--vertical {
.el-menu--popup { .el-menu--popup {
background-color: $subMenuBg !important; background-color: var(--pure-theme-sub-menu-bg) !important;
.el-menu-item { .el-menu-item {
span { span {
@ -271,10 +269,10 @@
.is-active > .el-sub-menu__title, .is-active > .el-sub-menu__title,
.is-active.submenu-title-noDropdown { .is-active.submenu-title-noDropdown {
color: $subMenuActiveText !important; color: var(--pure-theme-sub-menu-active-text) !important;
i { i {
color: $subMenuActiveText !important; color: var(--pure-theme-sub-menu-active-text) !important;
} }
} }
@ -282,23 +280,23 @@
.el-menu .el-sub-menu__title { .el-menu .el-sub-menu__title {
min-width: $sideBarWidth !important; min-width: $sideBarWidth !important;
font-size: 14px; font-size: 14px;
background-color: $subMenuBg !important; background-color: var(--pure-theme-sub-menu-bg) !important;
} }
.el-menu-item, .el-menu-item,
.el-sub-menu__title { .el-sub-menu__title {
height: 50px; height: 50px;
line-height: 50px; line-height: 50px;
color: $menuText; color: var(--pure-theme-menu-text);
background-color: $subMenuBg; background-color: var(--pure-theme-sub-menu-bg);
&:hover { &:hover {
color: $menuTitleHover !important; color: var(--pure-theme-menu-title-hover) !important;
} }
} }
.is-active { .is-active {
color: $subMenuActiveText !important; color: var(--pure-theme-sub-menu-active-text) !important;
transition: color 0.3s; transition: color 0.3s;
} }
@ -342,15 +340,15 @@
} }
.el-menu--popup { .el-menu--popup {
background-color: $subMenuBg !important; background-color: var(--pure-theme-sub-menu-bg) !important;
a > .is-active.submenu-title-noDropdown { a > .is-active.submenu-title-noDropdown {
border-bottom: none; border-bottom: none;
} }
.el-menu-item { .el-menu-item {
color: $menuText; color: var(--pure-theme-menu-text);
background-color: $subMenuBg; background-color: var(--pure-theme-sub-menu-bg);
span { span {
font-size: 14px; font-size: 14px;
@ -358,7 +356,7 @@
} }
.el-sub-menu__title { .el-sub-menu__title {
color: $menuText; color: var(--pure-theme-menu-text);
} }
} }
@ -366,31 +364,31 @@
.el-menu .el-sub-menu__title { .el-menu .el-sub-menu__title {
min-width: $sideBarWidth !important; min-width: $sideBarWidth !important;
font-size: 14px; font-size: 14px;
background-color: $subMenuBg !important; background-color: var(--pure-theme-sub-menu-bg) !important;
&:hover { &:hover {
color: $menuTitleHover !important; color: var(--pure-theme-menu-title-hover) !important;
} }
} }
.is-active > .el-sub-menu__title, .is-active > .el-sub-menu__title,
.is-active.submenu-title-noDropdown { .is-active.submenu-title-noDropdown {
color: $subMenuActiveText !important; color: var(--pure-theme-sub-menu-active-text) !important;
i { i {
color: $subMenuActiveText !important; color: var(--pure-theme-sub-menu-active-text) !important;
} }
} }
.nest-menu .el-sub-menu > .el-sub-menu__title, .nest-menu .el-sub-menu > .el-sub-menu__title,
.el-menu-item { .el-menu-item {
&:hover { &:hover {
color: $menuTitleHover !important; color: var(--pure-theme-menu-title-hover) !important;
} }
} }
.el-menu-item.is-active { .el-menu-item.is-active {
color: $subMenuActiveText !important; color: var(--pure-theme-sub-menu-active-text) !important;
transition: color 0.3s; transition: color 0.3s;
} }
@ -415,7 +413,7 @@
justify-content: space-around; justify-content: space-around;
width: 100%; width: 100%;
height: 48px; height: 48px;
background: $menuBg; background: var(--pure-theme-menu-bg) !important;
.horizontal-header-left { .horizontal-header-left {
display: flex; display: flex;
@ -440,7 +438,7 @@
font-size: 18px; font-size: 18px;
font-weight: 600; font-weight: 600;
line-height: 32px; line-height: 32px;
color: $subMenuActiveText; color: var(--pure-theme-sub-menu-active-text);
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
@ -458,7 +456,7 @@
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
min-width: 340px; min-width: 340px;
color: $subMenuActiveText; color: var(--pure-theme-sub-menu-active-text);
/* 搜索 */ /* 搜索 */
.search-container, .search-container,
@ -473,20 +471,20 @@
/* 设置 */ /* 设置 */
.set-icon { .set-icon {
&:hover { &:hover {
background: $menuHover; background: var(--pure-theme-menu-hover);
} }
} }
.dropdown-badge { .dropdown-badge {
height: 48px; height: 48px;
color: $subMenuActiveText; color: var(--pure-theme-sub-menu-active-text);
} }
.globalization { .globalization {
width: 40px; width: 40px;
height: 48px; height: 48px;
padding: 11px; padding: 11px;
color: $subMenuActiveText; color: var(--pure-theme-sub-menu-active-text);
cursor: pointer; cursor: pointer;
outline: none; outline: none;
} }
@ -497,7 +495,7 @@
justify-content: space-around; justify-content: space-around;
height: 48px; height: 48px;
padding: 10px; padding: 10px;
color: $subMenuActiveText; color: var(--pure-theme-sub-menu-active-text);
cursor: pointer; cursor: pointer;
p { p {
@ -522,10 +520,10 @@
.el-menu-item, .el-menu-item,
.el-sub-menu__title { .el-sub-menu__title {
padding-right: var(--el-menu-base-level-padding); padding-right: var(--el-menu-base-level-padding);
color: $menuText; color: var(--pure-theme-menu-text);
&:hover { &:hover {
color: $menuTitleHover !important; color: var(--pure-theme-menu-title-hover) !important;
} }
} }
@ -533,7 +531,7 @@
.el-sub-menu__title { .el-sub-menu__title {
height: 48px; height: 48px;
line-height: 48px; line-height: 48px;
background: $menuBg; background: var(--pure-theme-menu-bg) !important;
svg { svg {
position: static !important; position: static !important;
@ -542,15 +540,15 @@
.is-active > .el-sub-menu__title, .is-active > .el-sub-menu__title,
.is-active.submenu-title-noDropdown { .is-active.submenu-title-noDropdown {
color: $subMenuActiveText !important; color: var(--pure-theme-sub-menu-active-text) !important;
i { i {
color: $subMenuActiveText !important; color: var(--pure-theme-sub-menu-active-text) !important;
} }
} }
.is-active { .is-active {
color: $subMenuActiveText !important; color: var(--pure-theme-sub-menu-active-text) !important;
transition: color 0.3s; transition: color 0.3s;
} }
} }
@ -596,7 +594,7 @@ body[layout="vertical"] {
} }
.sidebar-logo-container { .sidebar-logo-container {
background: $sidebarLogo; background: var(--pure-theme-sidebar-logo);
} }
.hideSidebar { .hideSidebar {

95
src/style/theme.scss Normal file
View File

@ -0,0 +1,95 @@
/* 亮白色 */
html[data-theme="light"] {
--pure-theme-sub-menu-active-text: #000000d9;
--pure-theme-menu-bg: #fff;
--pure-theme-menu-hover: #f6f6f6;
--pure-theme-sub-menu-bg: #fff;
--pure-theme-menu-text: rgb(0 0 0 / 60%);
--pure-theme-sidebar-logo: #fff;
--pure-theme-menu-title-hover: #000;
--pure-theme-menu-active-before: #4091f7;
}
/* 道奇蓝 */
html[data-theme="default"] {
--pure-theme-sub-menu-active-text: #fff;
--pure-theme-menu-bg: #001529;
--pure-theme-menu-hover: rgb(64 145 247 / 15%);
--pure-theme-sub-menu-bg: #0f0303;
--pure-theme-menu-text: rgb(254 254 254 / 65%);
--pure-theme-sidebar-logo: #002140;
--pure-theme-menu-title-hover: #fff;
--pure-theme-menu-active-before: #4091f7;
}
/* 深紫罗兰色 */
html[data-theme="saucePurple"] {
--pure-theme-sub-menu-active-text: #fff;
--pure-theme-menu-bg: #130824;
--pure-theme-menu-hover: rgb(105 58 201 / 15%);
--pure-theme-sub-menu-bg: #000;
--pure-theme-menu-text: #7a80b4;
--pure-theme-sidebar-logo: #1f0c38;
--pure-theme-menu-title-hover: #fff;
--pure-theme-menu-active-before: #693ac9;
}
/* 深粉色 */
html[data-theme="pink"] {
--pure-theme-sub-menu-active-text: #fff;
--pure-theme-menu-bg: #28081a;
--pure-theme-menu-hover: rgb(216 68 147 / 15%);
--pure-theme-sub-menu-bg: #000;
--pure-theme-menu-text: #7a80b4;
--pure-theme-sidebar-logo: #3f0d29;
--pure-theme-menu-title-hover: #fff;
--pure-theme-menu-active-before: #d84493;
}
/* 猩红色 */
html[data-theme="dusk"] {
--pure-theme-sub-menu-active-text: #fff;
--pure-theme-menu-bg: #2a0608;
--pure-theme-menu-hover: rgb(225 60 57 / 15%);
--pure-theme-sub-menu-bg: #000;
--pure-theme-menu-text: rgb(254 254 254 / 65.1%);
--pure-theme-sidebar-logo: #42090c;
--pure-theme-menu-title-hover: #fff;
--pure-theme-menu-active-before: #e13c39;
}
/* 橙红色 */
html[data-theme="volcano"] {
--pure-theme-sub-menu-active-text: #fff;
--pure-theme-menu-bg: #2b0e05;
--pure-theme-menu-hover: rgb(232 95 51 / 15%);
--pure-theme-sub-menu-bg: #0f0603;
--pure-theme-menu-text: rgb(254 254 254 / 65%);
--pure-theme-sidebar-logo: #441708;
--pure-theme-menu-title-hover: #fff;
--pure-theme-menu-active-before: #e85f33;
}
/* 绿宝石 */
html[data-theme="mingQing"] {
--pure-theme-sub-menu-active-text: #fff;
--pure-theme-menu-bg: #032121;
--pure-theme-menu-hover: rgb(89 191 193 / 15%);
--pure-theme-sub-menu-bg: #000;
--pure-theme-menu-text: #7a80b4;
--pure-theme-sidebar-logo: #053434;
--pure-theme-menu-title-hover: #fff;
--pure-theme-menu-active-before: #59bfc1;
}
/* 酸橙绿 */
html[data-theme="auroraGreen"] {
--pure-theme-sub-menu-active-text: #fff;
--pure-theme-menu-bg: #0b1e15;
--pure-theme-menu-hover: rgb(96 172 128 / 15%);
--pure-theme-sub-menu-bg: #000;
--pure-theme-menu-text: #7a80b4;
--pure-theme-sidebar-logo: #112f21;
--pure-theme-menu-title-hover: #fff;
--pure-theme-menu-active-before: #60ac80;
}

View File

@ -172,7 +172,7 @@ Print.prototype = {
if (!frameWindow.document.execCommand("print", false, null)) { if (!frameWindow.document.execCommand("print", false, null)) {
frameWindow.print(); frameWindow.print();
} }
} catch (e) { } catch {
frameWindow.print(); frameWindow.print();
} }
frameWindow.close(); frameWindow.close();

8
types/global.d.ts vendored
View File

@ -61,7 +61,7 @@ declare global {
/** /**
* *
* @see {@link https://pure-admin.github.io/pure-admin-doc/pages/config/#%E5%85%B7%E4%BD%93%E9%85%8D%E7%BD%AE} * @see {@link https://pure-admin.cn/pages/config/#%E5%85%B7%E4%BD%93%E9%85%8D%E7%BD%AE}
*/ */
interface ViteEnv { interface ViteEnv {
VITE_PORT: number; VITE_PORT: number;
@ -75,11 +75,11 @@ declare global {
/** /**
* `@pureadmin/table` `TableColumns` 便 * `@pureadmin/table` `TableColumns` 便
*/ */
interface TableColumnList extends Array<TableColumns> {} type TableColumnList = Array<TableColumns>;
/** /**
* `public/platform-config.json` * `public/platform-config.json`
* @see {@link https://pure-admin.github.io/pure-admin-doc/pages/config/#platform-config-json} * @see {@link https://pure-admin.cn/pages/config/#platform-config-json}
*/ */
interface PlatformConfigs { interface PlatformConfigs {
Version?: string; Version?: string;
@ -112,7 +112,7 @@ declare global {
/** /**
* `PlatformConfigs` * `PlatformConfigs`
* @see {@link https://pure-admin.github.io/pure-admin-doc/pages/config/#platform-config-json} * @see {@link https://pure-admin.cn/pages/config/#platform-config-json}
*/ */
interface StorageConfigs { interface StorageConfigs {
version?: string; version?: string;