Skip to content

Commit df1d68a

Browse files
pixelmaxQmbypanghu
andauthored
新版前端UI,预发布2.6.4版本。 (#1735)
* fix: 修改 layout 中相关 emit 和 重复声明的 theme ,采用最新的vue api * fix:修改 eslintrc 的配置文件,删除大多数无用配置 * fix: 修复 layout 切换手机样式模糊层的 bug * feature: 重构 layout , 添加暗黑模式 , 删除侧边栏颜色 * fix:细节调整,activeColor摘除。 * feature:右侧滚动模式调整 * feature:无用代码剔除 * fix: 修复暗黑模式相关细节 * fix: custome config layout * feature:样式细节调整 * fix: 增加前端样式配置文件 * feature:调整基础配置,增加表格边框 * feature:buttomInfo取消底色,a标签更改为活跃色 * feature:调整阴影颜色和配置同步 * feature:版本调整2.6.3==>2.6.4 --------- Co-authored-by: bypanghu <[email protected]>
1 parent 9d58390 commit df1d68a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2408
-2338
lines changed

server/core/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func RunWindowsServer() {
3838

3939
fmt.Printf(`
4040
欢迎使用 gin-vue-admin
41-
当前版本:v2.6.3
41+
当前版本:v2.6.4
4242
加群方式:微信号:shouzi_1994 QQ群:470239250
4343
插件市场:https://plugin.gin-vue-admin.com
4444
GVA讨论社区:https://support.qq.com/products/371961

server/docs/docs.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6918,10 +6918,6 @@ const docTemplate = `{
69186918
"description": "主键ID",
69196919
"type": "integer"
69206920
},
6921-
"activeColor": {
6922-
"description": "活跃颜色",
6923-
"type": "string"
6924-
},
69256921
"authorities": {
69266922
"type": "array",
69276923
"items": {
@@ -7001,7 +6997,7 @@ const docTemplate = `{
70016997

70026998
// SwaggerInfo holds exported Swagger Info so clients can modify it
70036999
var SwaggerInfo = &swag.Spec{
7004-
Version: "v2.6.3",
7000+
Version: "v2.6.4",
70057001
Host: "",
70067002
BasePath: "",
70077003
Schemes: []string{},

server/docs/swagger.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "使用gin+vue进行极速开发的全栈开发基础平台",
55
"title": "Gin-Vue-Admin Swagger API接口文档",
66
"contact": {},
7-
"version": "v2.6.3"
7+
"version": "v2.6.4"
88
},
99
"paths": {
1010
"/api/createApi": {
@@ -6910,10 +6910,6 @@
69106910
"description": "主键ID",
69116911
"type": "integer"
69126912
},
6913-
"activeColor": {
6914-
"description": "活跃颜色",
6915-
"type": "string"
6916-
},
69176913
"authorities": {
69186914
"type": "array",
69196915
"items": {

server/docs/swagger.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1530,9 +1530,6 @@ definitions:
15301530
ID:
15311531
description: 主键ID
15321532
type: integer
1533-
activeColor:
1534-
description: 活跃颜色
1535-
type: string
15361533
authorities:
15371534
items:
15381535
$ref: '#/definitions/system.SysAuthority'
@@ -1585,7 +1582,7 @@ info:
15851582
contact: {}
15861583
description: 使用gin+vue进行极速开发的全栈开发基础平台
15871584
title: Gin-Vue-Admin Swagger API接口文档
1588-
version: v2.6.3
1585+
version: v2.6.4
15891586
paths:
15901587
/api/createApi:
15911588
post:

server/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
//go:generate go mod download
1616

1717
// @title Gin-Vue-Admin Swagger API接口文档
18-
// @version v2.6.3
18+
// @version v2.6.4
1919
// @description 使用gin+vue进行极速开发的全栈开发基础平台
2020
// @securityDefinitions.apikey ApiKeyAuth
2121
// @in header

server/model/system/sys_user.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ type SysUser struct {
1414
SideMode string `json:"sideMode" gorm:"default:dark;comment:用户侧边主题"` // 用户侧边主题
1515
HeaderImg string `json:"headerImg" gorm:"default:https://qmplusimg.henrongyi.top/gva_header.jpg;comment:用户头像"` // 用户头像
1616
BaseColor string `json:"baseColor" gorm:"default:#fff;comment:基础颜色"` // 基础颜色
17-
ActiveColor string `json:"activeColor" gorm:"default:#1890ff;comment:活跃颜色"` // 活跃颜色
1817
AuthorityId uint `json:"authorityId" gorm:"default:888;comment:用户角色ID"` // 用户角色ID
1918
Authority SysAuthority `json:"authority" gorm:"foreignKey:AuthorityId;references:AuthorityId;comment:用户角色"`
2019
Authorities []SysAuthority `json:"authorities" gorm:"many2many:sys_user_authority;"`

web/.eslintrc.js

Lines changed: 2 additions & 241 deletions
Original file line numberDiff line numberDiff line change
@@ -11,246 +11,7 @@ module.exports = {
1111
},
1212
extends: ['plugin:vue/recommended', 'eslint:recommended'],
1313
rules: {
14-
'vue/no-v-model-argument': 0,
15-
'vue/max-attributes-per-line': 2,
16-
'vue/singleline-html-element-content-newline': 'off',
17-
'vue/multiline-html-element-content-newline': 'off',
18-
'vue/multi-word-component-names': 'off',
19-
'vue/no-v-html': 'off',
20-
'accessor-pairs': 2,
21-
'arrow-spacing': [
22-
2,
23-
{
24-
before: true,
25-
after: true
26-
}
27-
],
28-
'block-spacing': [2, 'always'],
29-
'brace-style': [
30-
2,
31-
'1tbs',
32-
{
33-
allowSingleLine: true
34-
}
35-
],
36-
camelcase: [
37-
0,
38-
{
39-
properties: 'always'
40-
}
41-
],
42-
'comma-dangle': [2, 'only-multiline'],
43-
'comma-spacing': [
44-
2,
45-
{
46-
before: false,
47-
after: true
48-
}
49-
],
50-
'comma-style': [2, 'last'],
51-
'constructor-super': 2,
52-
curly: [2, 'multi-line'],
53-
'dot-location': [2, 'property'],
54-
'eol-last': 2,
55-
eqeqeq: ['error', 'always', { null: 'ignore' }],
56-
'generator-star-spacing': [
57-
2,
58-
{
59-
before: true,
60-
after: true
61-
}
62-
],
63-
'handle-callback-err': [2, '^(err|error)$'],
64-
indent: [
65-
2,
66-
2,
67-
{
68-
SwitchCase: 1
69-
}
70-
],
71-
'jsx-quotes': [2, 'prefer-single'],
72-
'key-spacing': [
73-
2,
74-
{
75-
beforeColon: false,
76-
afterColon: true
77-
}
78-
],
79-
'keyword-spacing': [
80-
2,
81-
{
82-
before: true,
83-
after: true
84-
}
85-
],
86-
'new-cap': [
87-
2,
88-
{
89-
newIsCap: true,
90-
capIsNew: false
91-
}
92-
],
93-
'new-parens': 2,
94-
'no-array-constructor': 2,
95-
'no-caller': 2,
96-
'no-console': 'off',
97-
'no-class-assign': 2,
98-
'no-cond-assign': 2,
99-
'no-const-assign': 2,
100-
'no-control-regex': 0,
101-
'no-delete-var': 2,
102-
'no-dupe-args': 2,
103-
'no-dupe-class-members': 2,
104-
'no-dupe-keys': 2,
105-
'no-duplicate-case': 2,
106-
'no-empty-character-class': 2,
107-
'no-empty-pattern': 2,
108-
'no-eval': 2,
109-
'no-ex-assign': 2,
110-
'no-extend-native': 2,
111-
'no-extra-bind': 2,
112-
'no-extra-boolean-cast': 2,
113-
'no-extra-parens': [2, 'functions'],
114-
'no-fallthrough': 2,
115-
'no-floating-decimal': 2,
116-
'no-func-assign': 2,
117-
'no-implied-eval': 2,
118-
'no-inner-declarations': [2, 'functions'],
119-
'no-invalid-regexp': 2,
120-
'no-irregular-whitespace': 2,
121-
'no-iterator': 2,
122-
'no-label-var': 2,
123-
'no-labels': [
124-
2,
125-
{
126-
allowLoop: false,
127-
allowSwitch: false
128-
}
129-
],
130-
'no-lone-blocks': 2,
131-
'no-mixed-spaces-and-tabs': 2,
132-
'no-multi-spaces': 2,
133-
'no-multi-str': 2,
134-
'no-multiple-empty-lines': [
135-
2,
136-
{
137-
max: 1
138-
}
139-
],
140-
'no-native-reassign': 2,
141-
'no-negated-in-lhs': 2,
142-
'no-new-object': 2,
143-
'no-new-require': 2,
144-
'no-new-symbol': 2,
145-
'no-new-wrappers': 2,
146-
'no-obj-calls': 2,
147-
'no-octal': 2,
148-
'no-octal-escape': 2,
149-
'no-path-concat': 2,
150-
'no-proto': 2,
151-
'no-redeclare': 2,
152-
'no-regex-spaces': 2,
153-
'no-return-assign': [2, 'except-parens'],
154-
'no-self-assign': 2,
155-
'no-self-compare': 2,
156-
'no-sequences': 2,
157-
'no-shadow-restricted-names': 2,
158-
'no-spaced-func': 2,
159-
'no-sparse-arrays': 2,
160-
'no-this-before-super': 2,
161-
'no-throw-literal': 2,
162-
'no-trailing-spaces': 2,
163-
'no-undef': 'off',
164-
'no-undef-init': 2,
165-
'no-unexpected-multiline': 2,
166-
'no-unmodified-loop-condition': 2,
167-
'no-unneeded-ternary': [
168-
2,
169-
{
170-
defaultAssignment: false
171-
}
172-
],
173-
'no-unreachable': 2,
174-
'no-unsafe-finally': 2,
175-
'no-unused-vars': [
176-
2,
177-
{
178-
vars: 'all',
179-
args: 'none'
180-
}
181-
],
182-
'no-useless-call': 2,
183-
'no-useless-computed-key': 2,
184-
'no-useless-constructor': 2,
185-
'no-useless-escape': 0,
186-
'no-whitespace-before-property': 2,
187-
'no-with': 2,
188-
'one-var': [
189-
2,
190-
{
191-
initialized: 'never'
192-
}
193-
],
194-
'operator-linebreak': [
195-
2,
196-
'after',
197-
{
198-
overrides: {
199-
'?': 'before',
200-
':': 'before'
201-
}
202-
}
203-
],
204-
'padded-blocks': [2, 'never'],
205-
quotes: [
206-
2,
207-
'single',
208-
{
209-
avoidEscape: true,
210-
allowTemplateLiterals: true
211-
}
212-
],
213-
semi: [2, 'never'],
214-
'semi-spacing': [
215-
2,
216-
{
217-
before: false,
218-
after: true
219-
}
220-
],
221-
'space-before-blocks': [2, 'always'],
222-
'space-before-function-paren': [2, 'never'],
223-
'space-in-parens': [2, 'never'],
224-
'space-infix-ops': 2,
225-
'space-unary-ops': [
226-
2,
227-
{
228-
words: true,
229-
nonwords: false
230-
}
231-
],
232-
'spaced-comment': [
233-
2,
234-
'always',
235-
{
236-
markers: ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ',']
237-
}
238-
],
239-
'template-curly-spacing': [2, 'never'],
240-
'use-isnan': 2,
241-
'valid-typeof': 2,
242-
'wrap-iife': [2, 'any'],
243-
'yield-star-spacing': [2, 'both'],
244-
yoda: [2, 'never'],
245-
'prefer-const': 2,
246-
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
247-
'object-curly-spacing': [
248-
2,
249-
'always',
250-
{
251-
objectsInObjects: false
252-
}
253-
],
254-
'array-bracket-spacing': [2, 'never']
14+
"vue/max-attributes-per-line" : 0,
15+
"vue/no-v-model-argument" : 0
25516
}
25617
}

web/index.html

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html lang="zh-cn">
2+
<html lang="zh-cn" class="transition-colors">
33

44
<head>
55
<meta charset="utf-8">
@@ -8,11 +8,18 @@
88
<meta content="Gin,Vue,Admin.Gin-Vue-Admin,GVA,gin-vue-admin,后台管理框架,vue后台管理框架,gin-vue-admin文档,gin-vue-admin首页,gin-vue-admin" name="keywords" />
99
<link rel="icon" href="favicon.ico">
1010
<title></title>
11+
<style>
12+
.transition-colors{
13+
transition-property: color, background-color, border-color, text-decoration-color, fill, stroke;
14+
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
15+
transition-duration: 150ms;
16+
}
17+
</style>
1118
</head>
1219

1320
<body>
1421
<div id="app"></div>
1522
<script type="module" src="./src/main.js"></script>
1623
</body>
1724

18-
</html>
25+
</html>

web/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gin-vue-admin",
3-
"version": "2.6.3",
3+
"version": "2.6.4",
44
"private": true,
55
"scripts": {
66
"serve": "node openDocument.js && vite --host --mode development",
@@ -20,7 +20,7 @@
2020
"axios": "^1.4.0",
2121
"core-js": "^3.31.1",
2222
"echarts": "5.4.3",
23-
"element-plus": "^2.3.8",
23+
"element-plus": "^2.7.0",
2424
"highlight.js": "^11.8.0",
2525
"js-cookie": "^3.0.5",
2626
"marked": "4.3.0",
@@ -34,6 +34,7 @@
3434
"spark-md5": "^3.0.2",
3535
"tailwindcss": "^3.3.3",
3636
"vue": "^3.4.21",
37+
"vue-echarts": "^6.7.2",
3738
"vue-router": "^4.3.2",
3839
"vuedraggable": "^4.1.0"
3940
},

0 commit comments

Comments
 (0)