Commit Graph

295 Commits

Author SHA1 Message Date
yuanzbz 1350b9d400 Merge branch 'master' of https://github.com/zouzhibin/vue-admin-perfect into vue-i18n 2023-12-06 22:08:41 +08:00
yuanzbz a0de373666 修复: tsconfig.json 2023-12-06 22:07:22 +08:00
yuanzbz 7a4327bad1 Merge branch 'master' of https://gitee.com/yuanzbz/vue-admin-perfect into vue-i18n 2023-11-16 21:50:26 +08:00
yuanzbz 39de7fe1ac 修复: 修复表格搜索问题 2023-11-16 21:49:36 +08:00
yuanzbz e5b1107bf6 Merge branch 'vue-i18n' of https://github.com/zouzhibin/zb-admin into vue-i18n 2023-10-22 16:51:53 +08:00
yuanzbz 3b0a68c739 Merge branch 'master' of https://github.com/zouzhibin/zb-admin
# Conflicts:
#	src/components/Table/PropTable/index.vue
2023-10-22 16:50:59 +08:00
yuanzbz 7cad818a1a fix:新版 2023-10-22 16:36:40 +08:00
yuanzbz 406d47e7c5 特性: 修复中英文 2023-10-22 16:36:08 +08:00
yuanzbz d6363cd41c Merge branch 'master' of https://gitee.com/yuanzbz/vue-admin-perfect into vue-i18n
# Conflicts:
#	src/routers/modules/other.ts
2023-10-22 16:26:20 +08:00
yuanzbz 8fa9c3c4a2 修复: 修复表单 2023-10-22 16:25:30 +08:00
yuanzbz 1d57dd78b8 特性: 新增表单 2023-10-22 13:31:07 +08:00
yuanzbz bcecbd5052 Merge branch 'master' of https://gitee.com/yuanzbz/vue-admin-perfect into vue-i18n
# Conflicts:
#	yarn.lock
2023-10-14 20:18:13 +08:00
yuanzbz 2925c5d832 修复: 增加二维码 2023-10-14 20:17:27 +08:00
zouzhibin 5ab9b4ec08
Merge pull request #11 from BaobeierB/master
修复表格分页pageSize无效的bug
2023-08-25 13:50:01 +08:00
BaobeierB 3baf83c09b 修复表格分页pageSize无效的bug 2023-08-17 10:00:51 +08:00
zouzhibing dc2f38da43 Merge branch 'master' of https://github.com/zouzhibin/vue-admin-perfect into vue-i18n 2023-05-29 11:29:04 +08:00
zouzhibing fda5a40864 Merge remote-tracking branch 'origin/master' 2023-05-29 11:05:12 +08:00
yuanzbz 5a6ff0a614 Merge branch 'master' of https://gitee.com/yuanzbz/vue-admin-perfect into vue-i18n 2023-05-28 22:12:45 +08:00
yuanzbz e7459bc460 y 2023-05-28 22:12:29 +08:00
yuanzbz 74c9b741d2 Merge branch 'master' of https://gitee.com/yuanzbz/vue-admin-perfect into vue-i18n 2023-05-28 22:03:44 +08:00
yuanzbz 0563748bf6 y 2023-05-28 22:03:23 +08:00
zouzhibing b5684d1d59 文档: readme 修改 2023-03-02 10:52:35 +08:00
zouzhibing bb4b2d747a 特性: 中英文菜单切换 2023-03-02 10:30:35 +08:00
zouzhibing 76cb2b7890 Merge branch 'master' of https://gitee.com/yuanzbz/vue-admin-perfect into vue-i18n
 Conflicts:
	src/layout/components/SubMenu/SubItem.vue
2023-03-02 10:12:43 +08:00
zouzhibing 321931f6de 性能: 优化判断 2023-03-02 10:10:35 +08:00
zouzhibing b45c0f4b08 重构: 重构菜单,样式 2023-03-02 10:08:16 +08:00
zouzhibing 0f5b8e0422 Merge branch 'master' of https://github.com/zouzhibin/vue-admin-perfect into vue-i18n 2023-02-28 14:24:12 +08:00
zouzhibing c53834bcaa 性能: echarts图表优化、布局优化 2023-02-28 14:19:13 +08:00
zouzhibing 47de66b6ee feat:发布新版本 2023-02-27 20:03:35 +08:00
zouzhibing dd5246edaf Merge branch 'master' of https://github.com/zouzhibin/vue-admin-perfect into vue-i18n
 Conflicts:
	package-lock.json
2023-02-27 19:59:29 +08:00
zouzhibing 5f181fae03 特性: 优化菜单 2023-02-27 19:39:54 +08:00
zouzhibing 66a3c584df Merge branch 'todo1' of https://gitee.com/yuanzbz/vue-admin-perfect 2023-02-27 18:54:44 +08:00
zouzhibing 8ac3bc681a feat:修改二维码 2023-02-27 18:54:24 +08:00
zouzhibing f5f1d28435 feat:新增分栏 2023-02-27 17:44:14 +08:00
zouzhibing 6c87ac2508 fix:todo 2023-02-27 14:20:39 +08:00
zouzhibing bdfd41c4d6 fix:修改二维码 2023-02-22 21:00:10 +08:00
zouzhibing c037e12157 fix:修改页面 2023-02-20 09:22:32 +08:00
zouzhibing 94f30e910a Merge remote-tracking branch 'origin/vue-i18n' into vue-i18n
# Conflicts:
#	package-lock.json
#	src/main.ts
2023-02-01 11:33:20 +08:00
zouzhibing 7b0e03c086 Merge branch 'master' of https://github.com/zouzhibin/vue-admin-perfect into vue-i18n
 Conflicts:
	src/views/home/index.vue
2023-02-01 11:32:22 +08:00
zouzhibing 5d8383c519 fix:修改二维码图片 2023-02-01 11:16:56 +08:00
zouzhibing 54b7f2c4f6 refacto 2023-01-09 18:47:49 +08:00
zouzhibing 9c4dc55bd2 Merge branch 'master' of https://github.com/zouzhibin/vue-admin-perfect into vue-i18n
 Conflicts:
	package-lock.json
2023-01-09 18:44:31 +08:00
zouzhibing 3b259b3a96 提交 2023-01-09 16:44:42 +08:00
zouzhibing 20929efa5a Merge branch 'master' of https://gitee.com/yuanzbz/vue-admin-perfect into vue-i18n
 Conflicts:
	package-lock.json
	src/main.ts
	yarn.lock
2023-01-09 16:42:48 +08:00
zouzhibing 1361525f95 特性: 增加字典表和文本截断 2023-01-09 16:36:15 +08:00
zouzhibing 795ece2225 特性: 增加新功能字典管理和信息列表 2023-01-07 23:34:28 +08:00
zouzhibing 4b74d4da83 Merge branch 'master' of https://github.com/zouzhibin/vue-admin-perfect into vue-i18n 2022-12-15 21:35:50 +08:00
zouzhibing 2768c33f7f 修复: 图片问题 2022-12-15 21:35:17 +08:00
zouzhibing b8aaa067d0 Merge branch 'master' of https://github.com/zouzhibin/vue-admin-perfect into vue-i18n 2022-12-15 21:28:52 +08:00
zouzhibing 9361d9ccad 重构: 去掉一些不必要的代码 2022-12-15 21:28:19 +08:00