Commit Graph

547 Commits

Author SHA1 Message Date
YunaiV
f59e4a4622 Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/views/bpm/oa/leave/create.vue
	src/views/bpm/oa/leave/detail.vue
2023-04-15 16:06:17 +08:00
YunaiV
4dabb710c5 优化 OA 请假,create 和 detail 使用独立路由,可接入工作流 2023-04-15 16:03:12 +08:00
puhui999
5910d53d8f 修复差异 2023-04-15 13:43:38 +08:00
puhui999
ec58321dd8 Merge remote-tracking branch 'yudao/dev' into dev
# Conflicts:
#	src/views/Login/components/LoginForm.vue
#	src/views/Login/components/MobileForm.vue
#	src/views/mp/components/wx-editor/WxEditor.vue
2023-04-15 13:38:31 +08:00
YunaiV
de5b1216cd 修复字典数据和类型的 status 未校验的问题 2023-04-15 10:28:23 +08:00
YunaiV
168f751a24 修复 Vue3 管理后台新增租户时,未校验账号、密码是否为空 2023-04-15 09:19:37 +08:00
YunaiV
18742b8cc7 移除 css 的引入 2023-04-15 09:13:25 +08:00
YunaiV
f1f49fdf29 调整下排版 2023-04-15 08:50:50 +08:00
YunaiV
48c7b58b03 1. 重命名 DataGrid 为 MessageTable,增加可读性
2. 调整素材管理,读取 API 接口
2023-04-15 08:42:52 +08:00
芋道源码
a5a8773972
!121 refactor: 重构MP模块
Merge pull request !121 from dhb52/dev
2023-04-14 17:16:08 +00:00
YunaiV
e9eb585977 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-04-15 01:13:11 +08:00
YunaiV
1170a9480f ep-admin: fix: 修复已知问题
0a6f3066 kailong321200875 <321200875@qq.com> on 2023/4/12 at 10:20 AM
2023-04-15 01:06:48 +08:00
YunaiV
9fba2886ab ep-admin: fix: 修复表格与搜索框字段不能不一致的问题 2023-04-15 00:53:07 +08:00
puhui999
b26bba9939 移除vex hooks自动导入,修复打包报错 2023-04-14 22:40:05 +08:00
puhui999
7564c43f16 改editor为editor_一点小问题 2023-04-14 22:06:27 +08:00
puhui999
02d98f2ce7 Merge remote-tracking branch 'yudao/dev' into dev
# Conflicts:
#	src/views/mp/components/wx-editor/WxEditor.vue
#	src/views/mp/tag/TagForm.vue
2023-04-14 21:58:49 +08:00
puhui999
d62e607292 修正绑定第三方跳转扫码登录错误 2023-04-14 21:47:58 +08:00
puhui999
2bef7f707c 修改没必要的lang="tsx" 2023-04-14 21:46:34 +08:00
puhui999
b93491579c 给所有组件添加name属性预防未知bug!!! 2023-04-14 21:32:11 +08:00
dhb52
5f1aa86912 chore: 移除quill 2023-04-14 19:43:50 +08:00
dhb52
c4746fc804 refactor: 尝试拆分【消息管理】页面 2023-04-14 18:06:16 +08:00
dhb52
0b055b5db4 fix: type='text' => type='primary' link 2023-04-14 15:26:06 +08:00
dhb52
4f3e7ecaac fix: WxMpSelect => WxAccountSelect 2023-04-14 15:22:23 +08:00
dhb52
bb49c6bbda fix: 删除自动生成的auto-*.d.ts 2023-04-14 15:16:50 +08:00
dhb52
1aae769562 feat: 在vscode中折叠文件目录 2023-04-14 15:15:35 +08:00
dhb52
dc32b9242d refactor: 删除WxAccountSelect 2023-04-14 15:15:01 +08:00
dhb52
92da7e341b fix: 使用ElDialog:destroy-on-close属性解决对话框重新加载 2023-04-14 15:08:58 +08:00
dhb52
813e7d2776 refactor: 使用Editor组件替换WxEditor 2023-04-14 14:49:19 +08:00
dhb52
f25a4d7343 Merge remote-tracking branch 'yudao/dev' into dev 2023-04-13 23:19:37 +08:00
YunaiV
1a1bfe0ebb REVIEW 公众号的实现 2023-04-13 22:25:35 +08:00
芋道源码
3aefedff6a
!118 refactor: mp模块ts重构
Merge pull request !118 from dhb52/dev
2023-04-13 13:14:22 +00:00
YunaiV
f436490165 修复 IconSelect 报错 2023-04-13 21:11:55 +08:00
芋道源码
44c18473d7
!119 【众测版】合并最新的 Vue3 重构
Merge pull request !119 from 芋道源码/dev
2023-04-13 00:18:55 +00:00
YunaiV
c461800eea Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	.vscode/launch.json
2023-04-13 08:18:29 +08:00
YunaiV
afc16706a9 Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-04-13 08:00:45 +08:00
芋道源码
b131320cc1
Merge pull request #2 from koutianyu/dev
修复新增或修改菜单时,无法选择菜单图标的bug
2023-04-13 07:58:15 +08:00
YunaiV
5d089161e0 代码生成,支持设置前端的模版 2023-04-13 07:54:37 +08:00
YunaiV
f3c6249600 代码生成,支持设置前端的模版 2023-04-13 00:21:32 +08:00
dhb52
3536077a34 refactor: MP消息管理 ts重构 2023-04-12 14:37:59 +08:00
dhb52
357a4789f4 fix: import type { FormInstance ...} from 'element-plus' 2023-04-12 14:19:31 +08:00
dhb52
fbbf4131f6 fix: 去除WxLocation组件多余Location图标 2023-04-12 14:05:21 +08:00
dhb52
df3b381d6f refactor: mp模块ts重构 2023-04-12 13:29:24 +08:00
YunaiV
ebbf47f509 正式移除 VXE 表格 2023-04-11 23:47:59 +08:00
YunaiV
fd447dc7a3 REVIEW 公众号选择的下拉框 2023-04-11 23:28:59 +08:00
芋道源码
129766fca4
!113 refactor: 抽离组件【公众号下拉选择】并重构相关页面
Merge pull request !113 from dhb52/dev
2023-04-11 15:13:15 +00:00
芋道源码
232927952d
!117 优化vscode代码debugger调试,使用vscode自带的功能,不使用插件
Merge pull request !117 from puhui999/master-vscode-debug
2023-04-11 15:09:04 +00:00
YunaiV
30cf8008ce REVIEW 退款订单 2023-04-11 23:01:51 +08:00
YunaiV
8863d1d080 REVIEW 支付应用、支付订单 2023-04-11 20:41:20 +08:00
dhb52
1397767492 refactor: 【MP素材管理】使用【WxMpSelect】 2023-04-11 11:14:20 +08:00
dhb52
c7b296a8e5 refactor: 抽离WxMpSelect组件 2023-04-11 11:13:46 +08:00