Skip to content

Commit b0cd608

Browse files
NinjaxshNinjaxsh
authored
Merge branch 'youlaitech:master' into master
2 parents 0c11c10 + 8e41161 commit b0cd608

Some content is hidden

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

48 files changed

+1617
-2101
lines changed

‎CHANGELOG.md

+38-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,46 @@
11

2+
# 2.11.5 (2024/6/18)
3+
4+
## ✨ feat
5+
6+
- 支持后端文件导入([#142](https://github.com/youlaitech/vue3-element-admin/pull/142)) [@cshaptx4869](https://github.com/cshaptx4869)
7+
8+
9+
## 🐛 fix
10+
- vue-dev-tools 插件导致菜单路由切换卡死，暂时关闭 ([28349e](https://github.com/youlaitech/vue3-element-admin/commit/28349efe147afab36531ba148eaac3a448fe6c71)) [@haoxianrui](https://github.com/haoxianrui)
11+
12+
13+
14+
# 2.11.4 (2024/6/16)
15+
16+
## ✨ feat
17+
18+
- 操作栏增加render配置参数([#138](https://github.com/youlaitech/vue3-element-admin/pull/140)) [@cshaptx4869](https://github.com/cshaptx4869)
19+
- 左侧工具栏增加type配置参数([#141](https://github.com/youlaitech/vue3-element-admin/pull/141)) [@diamont1001](https://github.com/diamont1001)
20+
21+
## ♻️ refactor
22+
- 更换权限分配弹窗类型为 drawer 并添加父子联动开关([2d9193](https://github.com/youlaitech/vue3-element-admin/commit/2d9193c47fd224f01f82b9c0b2bbeb5e7cb33584)) [@haoxianrui](https://github.com/haoxianrui)
23+
24+
25+
26+
# 2.11.3 (2024/6/11)
27+
28+
## ✨ feat
29+
30+
- 支持默认工具栏的导入([#138](https://github.com/youlaitech/vue3-element-admin/pull/138)) [@cshaptx4869](https://github.com/cshaptx4869)
31+
- 添加CURD导入示例([19e7bb](https://github.com/youlaitech/vue3-element-admin/commit/eab91effd6a01d5a3d9257249c8d06aa252b3bf8)) [@cshaptx4869](https://github.com/cshaptx4869)
32+
33+
## ♻️ refactor
34+
- 修改导出全量数据选项文本([904fec](https://github.com/youlaitech/vue3-element-admin/commit/904fecad65217650482fcdbb10ffb7f3d27eb9ea)) [@cshaptx4869](https://github.com/cshaptx4869)
35+
36+
## 🐛 fix
37+
- 菜单列表未适配el-icon导致图标不显示问题修复([e72b68](https://github.com/youlaitech/vue3-element-admin/commit/e72b68337562b5a7ea24ad55bbe00023e1266b40)) [@haoxianrui](https://github.com/haoxianrui)
38+
239
# 2.11.2 (2024/6/8)
340

441
## ✨ feat
542

6-
- 支持表格远程筛选([#131](https://github.com/youlaitech/vue3-element-admin/pull/119)) [@cshaptx4869](https://github.com/cshaptx4869)
43+
- 支持表格远程筛选([#131](https://github.com/youlaitech/vue3-element-admin/pull/131)) [@cshaptx4869](https://github.com/cshaptx4869)
744
- 支持标签输入框([#132](https://github.com/youlaitech/vue3-element-admin/pull/132)) [@cshaptx4869](https://github.com/cshaptx4869)
845
- 表单项支持tips配置([#133](https://github.com/youlaitech/vue3-element-admin/pull/133)) [@cshaptx4869](https://github.com/cshaptx4869)
946
- 前端导出支持全量数据([#134](https://github.com/youlaitech/vue3-element-admin/pull/134)) [@cshaptx4869](https://github.com/cshaptx4869)

‎README.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
- **基础设施**：动态路由、按钮权限、国际化、代码规范、Git 提交规范、常用组件封装。
3232

33-
- **持续更新**：自2021年起，该项目持续开源更新，实时更新工具和依赖，积累了广泛的用户群体。
33+
- **持续更新**：项目持续开源更新，实时更新工具和依赖。
3434

3535

3636

@@ -44,10 +44,11 @@
4444

4545
## 项目地址
4646

47-
| 项目 | Gitee | Github | GitCode |
48-
| ---- | ------------------------------------------------------------ | ------------------------------------------------------------ | ------------------------------------------------------------ |
47+
| 项目 | Gitee | Github |
48+
| ---- | ------------------------------------------------------------ | ------------------------------------------------------------ |
4949
| 前端 | [vue3-element-admin](https://gitee.com/youlaiorg/vue3-element-admin) | [vue3-element-admin](https://github.com/youlaitech/vue3-element-admin) | [vue3-element-admin](https://gitcode.net/youlai/vue3-element-admin) |
50-
| 后端 | [youlai-boot](https://gitee.com/youlaiorg/youlai-boot) | [youlai-boot](https://github.com/haoxianrui/youlai-boot.git) | [youlai-boot](https://gitcode.net/youlai/youlai-boot) |
50+
| 精简版 | [vue3-element-admin-thin](https://gitee.com/cshaptx4869/vue3-element-admin-thin) | [vue3-element-admin-thin](https://github.com/youlaitech/vue3-element-admin-thin) |
51+
| 后端 | [youlai-boot](https://gitee.com/youlaiorg/youlai-boot) | [youlai-boot](https://github.com/haoxianrui/youlai-boot.git) |
5152

5253
## 环境准备
5354

‎mock/dept.mock.ts

+6
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,15 @@ export default defineMock([
3636
id: 1,
3737
parentId: 0,
3838
name: "有来技术",
39+
code: "YOULAI",
3940
sort: 1,
4041
status: 1,
4142
children: [
4243
{
4344
id: 2,
4445
parentId: 1,
4546
name: "研发部门",
47+
code: "RD001",
4648
sort: 1,
4749
status: 1,
4850
children: [],
@@ -53,6 +55,7 @@ export default defineMock([
5355
id: 3,
5456
parentId: 1,
5557
name: "测试部门",
58+
code: "QA001",
5659
sort: 1,
5760
status: 1,
5861
children: [],
@@ -126,20 +129,23 @@ const deptMap: Record<string, any> = {
126129
1: {
127130
id: 1,
128131
name: "有来技术",
132+
code: "YOULAI",
129133
parentId: 0,
130134
status: 1,
131135
sort: 1,
132136
},
133137
2: {
134138
id: 2,
135139
name: "研发部门",
140+
code: "RD001",
136141
parentId: 1,
137142
status: 1,
138143
sort: 1,
139144
},
140145
3: {
141146
id: 3,
142147
name: "测试部门",
148+
code: "QA001",
143149
parentId: 1,
144150
status: 1,
145151
sort: 1,

‎mock/dict.mock.ts

+60-139
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ export default defineMock([
55
url: "dict/:code/options",
66
method: ["GET"],
77
body: ({ params }) => {
8-
const typeCode = params.code;
8+
const code = params.code;
99

1010
let list = null;
1111

12-
if (typeCode == "gender") {
12+
if (code == "gender") {
1313
list = [
1414
{
1515
value: "1",
@@ -21,7 +21,7 @@ export default defineMock([
2121
},
2222
{
2323
value: "0",
24-
label: "未知",
24+
label: "保密",
2525
},
2626
];
2727
}
@@ -35,7 +35,7 @@ export default defineMock([
3535
},
3636

3737
{
38-
url: "dict/types/page",
38+
url: "dict/page",
3939
method: ["GET"],
4040
body: {
4141
code: "00000",
@@ -46,104 +46,37 @@ export default defineMock([
4646
name: "性别",
4747
code: "gender",
4848
status: 1,
49-
},
50-
{
51-
id: 2,
52-
name: "状态",
53-
code: "status",
54-
status: 1,
49+
dictItems: [
50+
{
51+
id: 1,
52+
name: "男",
53+
value: "1",
54+
sort: 1,
55+
status: 1,
56+
},
57+
{
58+
id: 2,
59+
name: "女",
60+
value: "2",
61+
sort: 2,
62+
status: 1,
63+
},
64+
{
65+
id: 3,
66+
name: "保密",
67+
value: "0",
68+
sort: 3,
69+
status: 1,
70+
},
71+
],
5572
},
5673
],
57-
total: 2,
74+
total: 1,
5875
},
5976
msg: "一切ok",
6077
},
6178
},
6279

63-
{
64-
url: "dict/page",
65-
method: ["GET"],
66-
body: {
67-
code: "00000",
68-
data: {
69-
list: [
70-
{
71-
id: 1,
72-
name: "男",
73-
value: "1",
74-
status: 1,
75-
},
76-
{
77-
id: 2,
78-
name: "女",
79-
value: "2",
80-
status: 1,
81-
},
82-
{
83-
id: 3,
84-
name: "未知",
85-
value: "0",
86-
status: 1,
87-
},
88-
],
89-
total: 3,
90-
},
91-
msg: "一切ok",
92-
},
93-
},
94-
95-
// 新增字典类型
96-
{
97-
url: "dict/types",
98-
method: ["POST"],
99-
body({ body }) {
100-
return {
101-
code: "00000",
102-
data: null,
103-
msg: "新增字典类型" + body.name + "成功",
104-
};
105-
},
106-
},
107-
108-
// 获取字典类型表单数据
109-
{
110-
url: "dict/types/:id/form",
111-
method: ["GET"],
112-
body: ({ params }) => {
113-
return {
114-
code: "00000",
115-
data: dictTypeMap[params.id],
116-
msg: "一切ok",
117-
};
118-
},
119-
},
120-
121-
// 修改字典类型
122-
{
123-
url: "dict/types/:id",
124-
method: ["PUT"],
125-
body({ body }) {
126-
return {
127-
code: "00000",
128-
data: null,
129-
msg: "修改字典类型" + body.name + "成功",
130-
};
131-
},
132-
},
133-
134-
// 删除字典类型
135-
{
136-
url: "dict/types/:id",
137-
method: ["DELETE"],
138-
body({ params }) {
139-
return {
140-
code: "00000",
141-
data: null,
142-
msg: "删除字典类型" + params.id + "成功",
143-
};
144-
},
145-
},
146-
14780
// 新增字典
14881
{
14982
url: "dict",
@@ -178,7 +111,7 @@ export default defineMock([
178111
return {
179112
code: "00000",
180113
data: null,
181-
msg: "修改字典类型" + body.name + "成功",
114+
msg: "修改字典" + body.name + "成功",
182115
};
183116
},
184117
},
@@ -197,51 +130,39 @@ export default defineMock([
197130
},
198131
]);
199132

200-
// 字典类型映射表数据
201-
const dictTypeMap: Record<string, any> = {
202-
1: {
203-
id: 1,
204-
name: "性别",
205-
code: "gender",
206-
status: 1,
207-
remark: null,
208-
},
209-
2: {
210-
id: 2,
211-
name: "状态",
212-
code: "status",
213-
status: 1,
214-
remark: null,
215-
},
216-
};
217-
218133
// 字典映射表数据
219134
const dictMap: Record<string, any> = {
220135
1: {
221-
id: 1,
222-
typeCode: "gender",
223-
name: "男",
224-
value: "1",
225-
status: 1,
226-
sort: 1,
227-
remark: null,
228-
},
229-
2: {
230-
id: 2,
231-
typeCode: "gender",
232-
name: "女",
233-
value: "2",
234-
status: 1,
235-
sort: 2,
236-
remark: null,
237-
},
238-
3: {
239-
id: 3,
240-
typeCode: "gender",
241-
name: "未知",
242-
value: "0",
243-
status: 1,
244-
sort: 1,
245-
remark: null,
136+
code: "00000",
137+
data: {
138+
id: 1,
139+
name: "性别",
140+
code: "gender",
141+
status: 1,
142+
dictItems: [
143+
{
144+
id: 1,
145+
name: "男",
146+
value: "1",
147+
sort: 1,
148+
status: 1,
149+
},
150+
{
151+
id: 2,
152+
name: "女",
153+
value: "2",
154+
sort: 2,
155+
status: 1,
156+
},
157+
{
158+
id: 3,
159+
name: "未知",
160+
value: "0",
161+
sort: 3,
162+
status: 1,
163+
},
164+
],
165+
},
166+
msg: "一切ok",
246167
},
247168
};

0 commit comments

Comments
 (0)