Commit Graph

509 Commits

Author SHA1 Message Date
dhb52
9500ceab05 refactor: 【MP粉丝管理】应用【公众号选择器】组件
(cherry picked from commit 053ee54a16)
2023-06-13 12:13:52 +08:00
dhb52
8df788b537 refactor:【自动回复、图文】应用【公众号选择器】组件
(cherry picked from commit af18201ceb)
2023-06-13 12:13:46 +08:00
dhb52
eae9242a91 fix: 【MP自定义菜单】accountChanged参数错误
(cherry picked from commit 7711ceb3f3)
2023-06-13 12:12:16 +08:00
dhb52
1948bc9971 refactor: 【MP自定义菜单】应用【公众号选择器】组件
(cherry picked from commit 098b7305c9)
2023-06-13 12:12:11 +08:00
dhb52
f789af4582 refactor: WxMaterialSelect组件setup
(cherry picked from commit a8b4c16a7e)
2023-06-13 12:12:07 +08:00
dhb52
6b33f8c74f refactor: 【草稿,素材】应用【公众号选择器】组件
(cherry picked from commit e035eb2618)
2023-06-13 12:12:02 +08:00
dhb52
e480b68c08 refactor: 抽离组件【公众号下拉选择】
(cherry picked from commit c33e4de5a8)
2023-06-13 12:11:56 +08:00
shizhong
2afd089f51 REVIEW OA 请假 2023-06-13 12:11:43 +08:00
shizhong
c33a40623c REVIEW OA 请假 2023-06-13 12:11:09 +08:00
shizhong
ae48c07bbb REVIEW 公众号的自动回复 2023-06-13 12:09:57 +08:00
dhb52
910549f9ee fix: 删除未引入的formatDate
(cherry picked from commit a692674b24)
2023-06-13 12:09:34 +08:00
dhb52
6cd59a3440 fix: Merge后的修复
(cherry picked from commit 99166ee664)
2023-06-13 12:09:26 +08:00
shizhong
d4424fbcea fix: size="mini" & type="text"过时 2023-06-13 12:06:59 +08:00
dhb52
61106e9601 feat: 微信自动回复
(cherry picked from commit daa124a478)
2023-06-13 12:04:26 +08:00
shizhong
318b9aa8b5 REVIEW 公众号素材管理 2023-06-13 12:04:17 +08:00
puhui999
e261d7a2d6 修复token过期时路由跳转问题
(cherry picked from commit 46bf186ecc)
2023-06-13 12:02:18 +08:00
shizhong
68981b9153 REVIEW 单点登录界面 2023-06-13 12:02:05 +08:00
dhb52
7a2ccb8973 feat: 微信素材管理
(cherry picked from commit 7cf8ea8da8)
2023-06-13 12:00:12 +08:00
YunaiV
4f89c1edfe REVIEW 商品品牌
(cherry picked from commit 1e0f613449)
2023-06-13 12:00:03 +08:00
YunaiV
f9d0d5d38b REVIEW 公众号的粉丝管理
(cherry picked from commit 31dfa86783)
2023-06-13 11:59:55 +08:00
YunaiV
fc3be48cc7 REVIEW 公众号的菜单
(cherry picked from commit 40e23bd805)
2023-06-13 11:59:44 +08:00
dhb52
6833a67b82 feat: 微信粉丝管理
(cherry picked from commit 867b60a948)
2023-06-13 11:59:35 +08:00
Aix
7992cd951e 【feature】新增商品品牌功能
(cherry picked from commit ef4f6bda5c)
2023-06-13 11:59:25 +08:00
YunaiV
35d3262924 REVIEW 公众号的草稿箱
(cherry picked from commit f7fe794944)
2023-06-13 11:59:18 +08:00
shizhong
e7c5824f70 修改 2023-06-13 11:59:15 +08:00
shizhong
adc5bdae2e 微调微信公众号的回复和素材选择的排版 2023-06-13 11:55:41 +08:00
dhb52
1f6da4eb06 feat: 微信草稿箱
(cherry picked from commit 0ffa807343)
2023-06-13 11:53:40 +08:00
dhb52
0ccabe38ac feat: 微信自定义菜单
(cherry picked from commit d5d16e4e39)
2023-06-13 11:53:29 +08:00
dhb52
83904a2167 feat: 新增 WxEditor,暂时使用quill-editor
(cherry picked from commit 2e7edd94bc)
2023-06-13 11:53:16 +08:00
dhb52
8ab35b3811 fix: 修复WxReply、WxMaterialSelect组件bug
(cherry picked from commit 42a9715ff2)
2023-06-13 11:52:00 +08:00
dhb52
1285b362d1 fix: 图文显示有误,articles为数组
Signed-off-by: dhb52 <dhb52@126.com>
(cherry picked from commit a422ad4177)
2023-06-13 11:49:38 +08:00
shizhong
789ac414e9 增加 swagger、druid、skywalking、admin 的自定义路径 2023-06-13 11:49:19 +08:00
dhb52
1ba37bfca4 fix: 获取FreePublic出错&分页溢出
Signed-off-by: dhb52 <dhb52@126.com>
(cherry picked from commit 365915e37c)
2023-06-13 11:43:34 +08:00
shizhong
e83717e80e 修改 2023-06-13 11:43:05 +08:00
puhui999
fbff879504 完善SSO单点登录
(cherry picked from commit e22363d061)
2023-06-13 11:37:51 +08:00
puhui999
1103f8ff39 增加SSO单点登录
(cherry picked from commit 2d019f1bf9)
2023-06-13 11:36:09 +08:00
shizhong
fb3a842131 修改 2023-06-13 11:35:06 +08:00
shizhong
47eac89d1e 1. 统一化代码 2. 增加 DocAlert 关联文档 2023-06-13 11:24:37 +08:00
shizhong
e17913d038 修复在vue3+vite3 模块中使用顶层await打包的时候报错 2023-06-13 11:06:20 +08:00
shizhong
ba4cc02bfd 项目全局使用formatDate方法移除parseTime方法 2023-06-13 11:03:33 +08:00
Chika
8be4f31a1b 流程-已办任务路由中增加详情Model
(cherry picked from commit c1e760da6d)
2023-06-13 10:58:46 +08:00
Chika
522bf82d0e 添加流程-已办任务路由
(cherry picked from commit 900b51db86)
2023-06-13 10:58:32 +08:00
马光祖
0e62153dd1 fix: 设置 vite basePath 后,重新登录跳转路由错误
(cherry picked from commit d0d6a13285)
2023-06-13 10:57:30 +08:00
shizhong
7cfb09fe3c 命名 2023-06-13 10:56:20 +08:00
gexinzhineng/gxzn27
38fa336816 格式 2023-05-31 17:28:22 +08:00
gexinzhineng/gxzn27
124213bb4c 解决代码生成模块无法复制 2023-05-31 15:56:43 +08:00
gexinzhineng/gxzn27
5f17504d3c 显示查询合理化 2023-05-30 13:45:14 +08:00
gexinzhineng/gxzn27
b603464771 租户列表编辑回显下拉位置调整 2023-05-29 14:03:04 +08:00
gexinzhineng/gxzn27
090791a38b 租户列表系统租户编辑回显bug 2023-05-29 13:48:46 +08:00
gexinzhineng/gxzn27
615ae3d651 重置vxe会导致新增表单无限增加用户名和密码 2023-05-26 15:46:22 +08:00
gexinzhineng/gxzn27
7c4025954a 退出系统重新登录会弹出重新登录弹窗 2023-05-23 13:31:34 +08:00
gexinzhineng/gxzn27
ad248250a1 新增岗位后端有验证,前端也加上 2023-05-19 14:29:31 +08:00
gexinzhineng/gxzn27
886c971447 导入失败无法继续上传 2023-04-13 15:23:17 +08:00
gexinzhineng/gxzn27
b2fda6d476 css类型 2023-04-12 18:30:28 +08:00
gexinzhineng/gxzn27
42035104ac 上传文件错误无法重新选择文件 2023-04-12 11:16:00 +08:00
gexinzhineng/gxzn27
946a189b82 样式问题 2023-04-10 17:31:06 +08:00
gexinzhineng/gxzn27
2dbb363b00 密码校验 2023-04-10 10:48:56 +08:00
gexinzhineng/gxzn27
af26859ba8 路由及相应重构回退vxe 2023-04-06 14:33:01 +08:00
gexinzhineng/gxzn27
561b617ca4 工作流文字显示错误 2023-04-04 09:54:37 +08:00
gexinzhineng/gxzn27
a5fedfe15b 接口修改 2023-04-03 18:02:31 +08:00
gexinzhineng/gxzn27
f1e801e9ad vxe回返bug 2023-04-03 17:48:38 +08:00
gexinzhineng/gxzn27
12c5116dfd 删除非vxe文件 2023-04-03 16:38:01 +08:00
gexinzhineng/gxzn27
b967c4e01e 错误提交 2023-04-03 16:11:12 +08:00
gexinzhineng/gxzn27
0e578f8d0a 回退vxe版本 2023-04-03 15:26:56 +08:00
YunaiV
87a5ddfd2c REVIEW 图文发表记录 2023-04-02 11:48:54 +08:00
YunaiV
a56a2f6099 REVIEW OAuth2 客户端 2023-04-02 11:05:51 +08:00
YunaiV
d50bbf01d7 Merge branch 'dev' of https://gitee.com/txyyj/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/views/system/oauth2/client/index.vue
2023-04-02 10:36:07 +08:00
YunaiV
a319d090bb REVIEW 支付商户 2023-04-02 10:24:03 +08:00
芋道源码
aea1270d8f
!81 Vue3 重构:支付管理 -> 商户信息
Merge pull request !81 from 凌太虚/dev
2023-04-02 01:51:10 +00:00
YunaiV
b18bf8a95f REVIEW 商品属性 2023-04-02 09:46:45 +08:00
YunaiV
5a5202d483 REVIEW 商品属性 2023-04-02 01:25:31 +08:00
芋道源码
616243a0ab
!83 商品属性模块
Merge pull request !83 from 孔思宇/feat/mall-product-property
2023-04-01 16:25:24 +00:00
YunaiV
00c3133391 REVIEW 商品分类 2023-04-02 00:17:56 +08:00
芋道源码
59c44d9819
!82 商品分类管理
Merge pull request !82 from 孔思宇/feat/mall-product-category
2023-04-01 14:49:58 +00:00
YunaiV
7b700d875c REVIEW 角色管理(设置数据权限) 2023-04-01 22:30:02 +08:00
YunaiV
ecde723fa2 REVIEW 角色管理(设置菜单权限) 2023-04-01 17:45:31 +08:00
芋道源码
70fa36a262
!85 【REVIEW】Vue3 管理后台:[系统管理 -> 角色管理] 使用 Element Plus 原生实现
Merge pull request !85 from Chika/dev
2023-04-01 06:31:15 +00:00
YunaiV
8810cb953e REVIEW 定时日志 2023-04-01 14:26:29 +08:00
YunaiV
65663df3aa REVIEW 定时任务(详细) 2023-04-01 13:41:21 +08:00
YunaiV
eace25d3a2 REVIEW 定时任务(表单) 2023-04-01 11:33:50 +08:00
Chika
20b3eacce9 【重构】Vue3 管理后台:[系统管理 -> 角色管理] 使用 Element Plus 原生实现 2023-04-01 10:03:11 +08:00
YunaiV
f8878f7a76 REVIEW 定时任务(列表) 2023-04-01 09:14:59 +08:00
YunaiV
cebe6f93db REVIEW 用户管理(导入用户) 2023-04-01 00:04:28 +08:00
YunaiV
0a69041602 REVIEW 用户管理(修改用户) 2023-03-31 23:34:19 +08:00
YunaiV
7d84f86081 REVIEW 用户管理(分配用户角色) 2023-03-31 13:40:57 +08:00
YunaiV
643b387367 REVIEW 用户管理(列表) 2023-03-31 07:54:33 +08:00
YunaiV
1434cdabe0 REVIEW 用户管理(调整布局) 2023-03-30 22:59:29 +08:00
admin
a2a3b90735 重写商户信息 2023-03-30 21:59:06 +08:00
admin
e0469bf64e 重写商户 2023-03-30 21:42:42 +08:00
YunaiV
854bf851e8 REVIEW 租户套餐 2023-03-30 21:38:46 +08:00
Siyu Kong
1724f2c674 feat: 新增商品属性(值)模块页面 2023-03-30 16:58:06 +08:00
Siyu Kong
fdbae2dd37 feat: 新增商品属性值路由配置 2023-03-30 16:57:48 +08:00
Siyu Kong
4906cecd14 feat: 新增商品属性api 2023-03-30 16:57:27 +08:00
puhui999
ad16456379 update: 修复tree组件在已有展开节点后全部展开和折叠的bug 2023-03-30 10:18:11 +08:00
芋道源码
d28179d196
!76 用户管理代码二次重构
Merge pull request !76 from fessor/dev
2023-03-30 01:42:08 +00:00
YunaiV
84ab75b475 REVIEW 租户套餐 2023-03-30 09:35:35 +08:00
YunaiV
216ad84938 REVIEW 租户套餐 2023-03-29 23:43:22 +08:00
fengjingtao
3c6d96d9f0 fix: 恢复某些不上传git的文件 2023-03-29 23:28:23 +08:00
芋道源码
e30d32effb
!75 Vue3重构租户套餐
Merge pull request !75 from puhui999/dev
2023-03-29 14:54:49 +00:00
YunaiV
98afdfc040 REVIEW 代码生成 2023-03-29 22:38:19 +08:00
YunaiV
e6dac1ebda REVIEW 代码预览(PreviewCode) 2023-03-29 22:25:53 +08:00
fengjingtao
66460539ea feat: 优化重构用户管理代码 2023-03-29 22:07:53 +08:00
fengjingtao
a1609e3046 Merge branch 'dev' of https://gitee.com/fessor/yudao-ui-admin-vue3 into dev 2023-03-29 20:35:30 +08:00
fengjingtao
29fd92e60c Merge branch 'dev' of https://gitee.com/fessor/yudao-ui-admin-vue3 into dev 2023-03-29 20:24:11 +08:00
fengjingtao
ca1b6df5ca feat: 用户管理review以后 2023-03-29 20:21:58 +08:00
puhui999
a9df1463f0 add: Vue3重构租户套餐列表 2023-03-29 17:50:13 +08:00
puhui999
64b974deaf add: Vue3重构租户套餐列表 2023-03-29 17:49:17 +08:00
puhui999
86c6073f1f update:修复角色管理菜单权限表单tree组件一直显示加载中的问题 2023-03-29 15:31:34 +08:00
puhui999
cc41c20709 update:修复角色管理打不开权限表单的问题 2023-03-29 15:29:24 +08:00
YunaiV
b1e74a1d05 REVIEW 代码生成(ImportTable) 2023-03-29 15:07:50 +08:00
YunaiV
d5f3f0add1 REVIEW 代码生成 2023-03-29 13:57:16 +08:00
YunaiV
76c5c7c1de REVIEW 代码生成 2023-03-29 09:09:34 +08:00
芋道源码
95b7eb9856
!68 Vue3 重构:基础设施 -> 代码生成
Merge pull request !68 from xiaowuye/dev
2023-03-28 16:05:31 +00:00
芋道源码
e3bcfa50e9
!70 微信组件按照vue3的方式重写了一遍
Merge pull request !70 from &wxr/dev
2023-03-28 16:02:31 +00:00
YunaiV
17ef65df06 同步 master 最新代码 2023-03-29 00:01:39 +08:00
YunaiV
03db8fece4 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/views/bpm/form/formEditor.vue
	src/views/bpm/model/index.vue
	src/views/infra/config/form.vue
	src/views/infra/config/index.vue
	src/views/infra/fileConfig/index.vue
	src/views/infra/fileList/index.vue
	src/views/system/mail/log/log.data.ts
	src/views/system/tenant/tenant.data.ts
	src/views/system/user/index.vue
	src/views/system/user/user.data.ts
2023-03-28 23:57:47 +08:00
芋道源码
c65a9d92bb
!71 测试所提bug修改
Merge pull request !71 from 周建/master
2023-03-28 15:57:02 +00:00
YunaiV
ce936ed296 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	.gitignore
	src/views/infra/job/JobLog.vue
2023-03-28 23:55:19 +08:00
芋道源码
8b9d2c7e29
!65 refactor: 重构定时任务模块
Merge pull request !65 from 孔思宇/refector/job
2023-03-28 15:52:40 +00:00
YunaiV
7ab8aa7168 Vue3 重构:REVIEW 用户管理 2023-03-28 23:50:32 +08:00
YunaiV
c9e63c320e Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-03-28 23:35:32 +08:00
芋道源码
696d359f7f
!67 Vue3重构: 用户管理
Merge pull request !67 from fessor/dev
2023-03-28 15:33:27 +00:00
YunaiV
337b80ca3d Vue3 重构:REVIEW 公众号统计 2023-03-28 23:28:29 +08:00
芋道源码
80b690b305
!72 Vue3重构:公众号统计优化
Merge pull request !72 from kinlon92/dev
2023-03-28 15:24:36 +00:00
YunaiV
a4dea6c254 Vue3 重构:REVIEW 站内信 2023-03-28 23:18:10 +08:00
Siyu Kong
b8ce330c12 feat: 新增产品分类模块页面&api 2023-03-28 20:35:31 +08:00
kinlon92
658150c1c8 Vue3重构:公众号统计优化 TODO 2023-03-28 18:23:58 +08:00
gexinzhineng/gxzn27
0503b7d078 新的租户需要选择岗位才能修改,暂将其设成必填 2023-03-28 18:00:18 +08:00
gexinzhineng/gxzn27
46fc6ce1b7 最小值为0会报错 2023-03-28 17:24:20 +08:00
gexinzhineng/gxzn27
ffd2b5b8ee 系统管理/租户管理/租户列表新增时账号额度默认为1
用户管理不选择性别 修改时选择框为0
2023-03-28 16:10:07 +08:00
gexinzhineng/gxzn27
90959702ee 邮件记录详情,创建时间显示不正确
编辑参数键名,键不能修改,修改时只读,新增时正常
租户套餐显示备注及搜索条件显示(同vue2)
2023-03-28 13:41:56 +08:00
芋道源码
969c83a8dc
!53 重构VUE3【站内信-消息记录】
Merge pull request !53 from 咱哥丶/dev
2023-03-28 04:15:58 +00:00
gexinzhineng/gxzn27
944015484a 1、配合地区管理接口的api文件,后端修改相应字段可以不要此文件
2、基础设施/文件管理/文件列表 上传失败无法上传只能刷新页面才能上传bug
3、基础设施/文件管理/文件列表 新增是下拉框显示0 设置为null
2023-03-28 11:27:08 +08:00
YunaiV
66d412c10a Vue3 重构:REVIEW 公众号标签统计 2023-03-28 09:24:12 +08:00
芋道源码
c4e5419d65
!69 Vue3重构:公众号统计
Merge pull request !69 from kinlon92/dev
2023-03-28 00:12:13 +00:00
YunaiV
d7891fe759 Vue3 重构:流程实例的创建 2023-03-28 08:10:11 +08:00
YunaiV
ddd6bbbee1 Vue3 重构:流程实例的创建的目录调整 2023-03-28 07:51:46 +08:00
YunaiV
7587acedb0 Vue3 重构:流程实例的详情(流程任务列表) 2023-03-28 07:45:18 +08:00
YunaiV
4388d6565a Vue3 重构:流程实例的详情(流程任务列表) 2023-03-28 07:29:32 +08:00
YunaiV
9e6da44881 Vue3 重构:流程实例的详情(流程图预览) 2023-03-28 01:19:25 +08:00
wuxiran
16c5e3ea01 1、微信组件更新第三波,消息页面能正常展示了。但是页面可能还要错乱 2023-03-28 01:18:37 +08:00
YunaiV
c5a3fa1f94 Vue3 重构:流程实例的详情 2023-03-28 00:10:42 +08:00
zhangjinlong
51344a5967 Vue3重构:公众号统计 2023-03-27 18:18:29 +08:00
dlarmor
bedcd2205e update: 解决合并问题 2023-03-27 14:18:35 +08:00
dlarmor
0c71d0dd93 Merge remote-tracking branch 'origin/dev' into dev 2023-03-27 14:15:53 +08:00
dlarmor
636e07fcf6 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/infra/codegen/components/BasicInfoForm.vue
#	src/views/infra/codegen/components/ImportTable.vue
2023-03-27 14:09:20 +08:00
dlarmor
f33935868d Vue3 重构:基础设施 -> 代码生成 2023-03-27 14:06:30 +08:00
fessor
1ef6563429 Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vue3 into dev
Signed-off-by: fessor <352475718@qq.com>
2023-03-27 04:43:26 +00:00
fessor
4563f6a947
删除文件 src/views/system/user/user.data.ts 2023-03-27 04:32:33 +00:00
YunaiV
1a4311309d Vue3 重构:REVIEW 角色管理 2023-03-27 12:29:34 +08:00