Commit Graph

525 Commits

Author SHA1 Message Date
YunaiV
06974ca3c0 修复打包会报错的问题 2023-04-15 17:28:33 +08:00
YunaiV
e3660e0b20 REVIEW 站内信模版的发送 2023-04-15 17:07:41 +08:00
dhb52
ae74af59fc fix: 增加上传处理 2023-04-15 16:54:36 +08:00
芋道源码
97f9560c4d
!124 重构VUE3【站内信-模板管理】
Merge pull request !124 from ZanGe丶/dev
2023-04-15 08:46:56 +00:00
YunaiV
abf9b50c2f REVIEW 素材管理的重构 2023-04-15 16:37:11 +08:00
芋道源码
71fd9af2e1
!126 refactor: MP模块组件拆分
Merge pull request !126 from dhb52/dev
2023-04-15 08:20:48 +00:00
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
dhb52
389c73d834 refactor: MP消息管理-拆分组件 2023-04-15 15:59:33 +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
咱哥丶
776eb3a7b0 重构VUE3【站内信-模板管理】 2023-04-15 12:25:11 +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
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
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
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
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
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
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
芋道源码
0d96645bb3
!116 【重构】Vue3 管理后台:[支付管理 -> 应用信息][支付管理 -> 支付订单][支付管理 -> 退款订单] 使用 Element Plus 原生实现
Merge pull request !116 from 东方白/dev
2023-04-11 00:37:02 +00:00
东方白
7cb859e976 【重构】Vue3 管理后台:[支付管理 -> 应用信息][支付管理 -> 支付订单][支付管理 -> 退款订单] 使用 Element Plus 原生实现 2023-04-10 22:29:50 +08:00
wuxiran
df399647ed 1、修复岗位顺序没有新增输入的问题
2、修复部门管理中的错别字
2023-04-10 12:19:59 +08:00
dhb52
053ee54a16 refactor: 【MP粉丝管理】应用【公众号选择器】组件 2023-04-10 01:20:37 +08:00
dhb52
b84298641c refactor:【MP标签】应用【公众号选择器】组件 2023-04-10 01:15:16 +08:00
dhb52
af18201ceb refactor:【自动回复、图文】应用【公众号选择器】组件 2023-04-10 01:07:04 +08:00
dhb52
7711ceb3f3 fix: 【MP自定义菜单】accountChanged参数错误 2023-04-10 01:05:13 +08:00
dhb52
098b7305c9 refactor: 【MP自定义菜单】应用【公众号选择器】组件 2023-04-10 00:46:18 +08:00
dhb52
a8b4c16a7e refactor: WxMaterialSelect组件setup 2023-04-10 00:26:43 +08:00
dhb52
e035eb2618 refactor: 【草稿,素材】应用【公众号选择器】组件 2023-04-10 00:25:45 +08:00
dhb52
c33e4de5a8 refactor: 抽离组件【公众号下拉选择】 2023-04-10 00:18:56 +08:00
dhb52
521b521d07 Merge remote-tracking branch 'yudao/dev' into dev 2023-04-09 21:22:33 +08:00
YunaiV
7e3f6190a5 REVIEW OA 请假 2023-04-09 18:49:54 +08:00
YunaiV
47b5ce2f35 REVIEW OA 请假 2023-04-09 18:32:26 +08:00
芋道源码
50efd60e15
!108 重构VUE3【OA示例-请假查询】
Merge pull request !108 from ZanGe丶/dev
2023-04-09 10:20:39 +00:00
YunaiV
7bfb109acc REVIEW 公众号的自动回复 2023-04-09 18:14:58 +08:00
芋道源码
61bb2b8c99
!110 feat: 微信自动回复
Merge pull request !110 from dhb52/dev
2023-04-09 09:54:53 +00:00
dhb52
a692674b24 fix: 删除未引入的formatDate 2023-04-09 17:14:31 +08:00
dhb52
99166ee664 fix: Merge后的修复 2023-04-09 13:41:14 +08:00
YunaiV
642652bd08 修复系统管理-岗位管理-新增-表单中无法在岗位编码字段输入内容 #6 2023-04-09 13:19:20 +08:00
dhb52
75750c1bd3 Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vue3 into dev
Signed-off-by: dhb52 <dhb52@126.com>
2023-04-09 05:16:23 +00:00
dhb52
4465220ed7 fix: size="mini" & type="text"过时 2023-04-09 13:08:19 +08:00
咱哥丶
66856ae052 重构VUE3【OA示例-请假查询】 2023-04-09 12:27:22 +08:00
dhb52
daa124a478 feat: 微信自动回复 2023-04-09 11:59:15 +08:00
YunaiV
d16ff6ff1c REVIEW 公众号素材管理 2023-04-09 09:56:42 +08:00
芋道源码
ee35fd6702
!105 feat: 微信素材管理
Merge pull request !105 from dhb52/dev
2023-04-09 01:22:29 +00:00
puhui999
46bf186ecc 修复token过期时路由跳转问题 2023-04-09 00:39:52 +08:00
YunaiV
276e82c5a8 REVIEW 单点登录界面 2023-04-09 00:21:27 +08:00
dhb52
7cf8ea8da8 feat: 微信素材管理 2023-04-08 23:40:21 +08:00
芋道源码
0f0ba8b8a9
!95 新增SSO登录
Merge pull request !95 from puhui999/dev
2023-04-08 14:58:56 +00:00
YunaiV
1e0f613449 REVIEW 商品品牌 2023-04-08 22:49:51 +08:00
puhui999
841040b41e Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vue3 into dev
Signed-off-by: puhui999 <puhui999@163.com>
2023-04-08 14:44:20 +00:00
芋道源码
5f10efbf39
!104 新增商品品牌功能
Merge pull request !104 from Aix/dev
2023-04-08 14:32:55 +00:00
YunaiV
31dfa86783 REVIEW 公众号的粉丝管理 2023-04-08 22:32:04 +08:00
芋道源码
eccfa116aa
!103 feat: 微信粉丝管理
Merge pull request !103 from dhb52/dev
2023-04-08 13:39:56 +00:00
YunaiV
40e23bd805 REVIEW 公众号的菜单 2023-04-08 21:37:54 +08:00
dhb52
867b60a948 feat: 微信粉丝管理 2023-04-08 20:48:26 +08:00
Aix
b133983eb6 Merge remote-tracking branch 'origin/dev' into dev 2023-04-08 20:32:03 +08:00
Aix
ef4f6bda5c 【feature】新增商品品牌功能 2023-04-08 20:31:52 +08:00
YunaiV
f7fe794944 REVIEW 公众号的草稿箱 2023-04-08 20:28:33 +08:00
YunaiV
d0f8b5e116 Merge branch 'dev' of https://gitee.com/dhb52/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/views/mp/components/wx-material-select/main.vue
2023-04-08 18:05:31 +08:00
YunaiV
40699edb57 微调微信公众号的回复和素材选择的排版 2023-04-08 17:30:30 +08:00
芋道源码
dd4be6093d
!100 fix: 图文显示有误,articles为数组
Merge pull request !100 from dhb52/N/A
2023-04-08 09:21:42 +00:00
芋道源码
2d65c2a0c1
!96 fix: 获取FreePublic出错&分页溢出
Merge pull request !96 from dhb52/N/A
2023-04-08 09:03:01 +00:00
puhui999
b2a91aa1c8 Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vue3 into dev
Signed-off-by: puhui999 <puhui999@163.com>
2023-04-08 05:22:26 +00:00
dhb52
be95015c68 Merge branch 'master' into dev 2023-04-08 12:19:51 +08:00
YunaiV
df57191cf0 所有菜单的 name 都加上模块的前缀,避免冲突 2023-04-08 11:48:37 +08:00
dhb52
0ffa807343 feat: 微信草稿箱 2023-04-08 10:18:10 +08:00
dhb52
d5d16e4e39 feat: 微信自定义菜单 2023-04-08 10:15:11 +08:00