diff --git a/.env.development b/.env.development
index 60d6a9c..5560e19 100644
--- a/.env.development
+++ b/.env.development
@@ -4,6 +4,7 @@ VITE_USE_MOCK = true
# 发布路径
VITE_PUBLIC_PATH = /
+
# 跨域代理，您可以配置多个 ,请注意，没有换行符
VITE_PROXY = [["/jeecgboot","http://localhost:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
diff --git a/.gitignore b/.gitignore
index a7b1fe6..6aef0f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ pnpm-debug.log*
# Editor directories and files
.idea
+.svn
# .vscode
*.suo
*.ntvs*
diff --git a/LICENSE b/LICENSE
index 2476d1d..7afdd65 100644
--- a/LICENSE
+++ b/LICENSE
@@ -32,4 +32,6 @@ SOFTWARE.
违反此条款属于侵权行为，须赔偿侵权经济损失，同时立即停止著作权侵权行为。
总结：在遵循Apache开源协议和开源协议补充条款下，允许商用使用，不会造成侵权行为！
- 解释权归：http://www.jeecg.com
+ 解释权归：
+ http://www.jeecg.com
+ http://guojusoft.com
diff --git a/README.md b/README.md
index dcceb0a..74e09e6 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
JEECG BOOT 低代码开发平台（Vue3前端）
===============
-当前最新版本： 3.6.1（发布时间：2023-12-11）
+当前最新版本： 3.6.2（发布时间：2024-01-08）
[](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE)
[](http://jeecg.com/aboutusIndex)
[](https://jeecg.blog.csdn.net)
-[](https://github.com/zhangdaiscott/jeecg-boot)
+[](https://github.com/zhangdaiscott/jeecg-boot)
[](https://github.com/zhangdaiscott/jeecg-boot)
[](https://github.com/zhangdaiscott/jeecg-boot)
diff --git a/build/generate/generateModifyVars.ts b/build/generate/generateModifyVars.ts
index 44670e2..705d339 100644
--- a/build/generate/generateModifyVars.ts
+++ b/build/generate/generateModifyVars.ts
@@ -1,11 +1,21 @@
-import { generateAntColors, primaryColor } from '../config/themeConfig';
-import { getThemeVariables } from 'ant-design-vue/dist/theme';
+import { primaryColor } from '../config/themeConfig';
+// import { getThemeVariables } from 'ant-design-vue/dist/theme';
import { resolve } from 'path';
+import { generate } from '@ant-design/colors';
+import { theme } from 'ant-design-vue/lib';
+import convertLegacyToken from 'ant-design-vue/lib/theme/convertLegacyToken';
+const { defaultAlgorithm, defaultSeed } = theme;
+
+function generateAntColors(color: string, theme: 'default' | 'dark' = 'default') {
+ return generate(color, {
+ theme,
+ });
+}
/**
* less global variable
*/
-export function generateModifyVars(dark = false) {
+export function generateModifyVars() {
const palettes = generateAntColors(primaryColor);
const primary = palettes[5];
@@ -15,12 +25,14 @@ export function generateModifyVars(dark = false) {
primaryColorObj[`primary-${index + 1}`] = palettes[index];
}
- const modifyVars = getThemeVariables({ dark });
+ const mapToken = defaultAlgorithm(defaultSeed);
+ const v3Token = convertLegacyToken(mapToken);
return {
- ...modifyVars,
+ ...v3Token,
+ // ...modifyVars,
// Used for global import to avoid the need to import each style file separately
// reference: Avoid repeated references
- hack: `${modifyVars.hack} @import (reference) "${resolve('src/design/config.less')}";`,
+ hack: `true; @import (reference) "${resolve('src/design/config.less')}";`,
'primary-color': primary,
...primaryColorObj,
'info-color': primary,
diff --git a/build/vite/plugin/index.ts b/build/vite/plugin/index.ts
index cf7cbde..6ec4a1e 100644
--- a/build/vite/plugin/index.ts
+++ b/build/vite/plugin/index.ts
@@ -11,7 +11,6 @@ import vueSetupExtend from 'vite-plugin-vue-setup-extend-plus';
import { configHtmlPlugin } from './html';
import { configMockPlugin } from './mock';
import { configCompressPlugin } from './compress';
-import { configStyleImportPlugin } from './styleImport';
import { configVisualizerConfig } from './visualizer';
import { configThemePlugin } from './theme';
import { configSvgIconsPlugin } from './svgSprite';
@@ -49,9 +48,6 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
// vite-plugin-purge-icons
vitePlugins.push(purgeIcons());
- // vite-plugin-style-import
- vitePlugins.push(configStyleImportPlugin(isBuild));
-
// rollup-plugin-visualizer
vitePlugins.push(configVisualizerConfig());
diff --git a/build/vite/plugin/theme.ts b/build/vite/plugin/theme.ts
index f9a10c3..542769d 100644
--- a/build/vite/plugin/theme.ts
+++ b/build/vite/plugin/theme.ts
@@ -57,7 +57,7 @@ export function configThemePlugin(isBuild: boolean): PluginOption[] {
vite_theme_plugin,
antdDarkThemePlugin({
preloadFiles: [
- path.resolve(process.cwd(), 'node_modules/ant-design-vue/dist/antd.less'),
+ // path.resolve(process.cwd(), 'node_modules/ant-design-vue/dist/reset.css'),
//path.resolve(process.cwd(), 'node_modules/ant-design-vue/dist/antd.dark.less'),
path.resolve(process.cwd(), 'src/design/index.less'),
],
diff --git a/index.html b/index.html
index 67ddad8..ef61a19 100644
--- a/index.html
+++ b/index.html
@@ -166,6 +166,7 @@
+
+