Commit Graph

623 Commits

Author SHA1 Message Date
YunaiV
0d5daa69fb Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/dev-yunai
# Conflicts:
#	yudao-ui-admin-vue3/pnpm-lock.yaml
2023-02-07 22:56:49 +08:00
YunaiV
1b6124a0db 集成 Go-View 大屏设计器 2023-02-07 22:56:33 +08:00
xingyuv
9ab8288851 fix: error 2023-02-06 11:42:35 +08:00
xingyuv
559436dae7 chore: remove treeselect 2023-02-06 11:40:33 +08:00
xingyuv
1bb66e6783 feat: code format 2023-02-06 11:40:03 +08:00
xingyuv
0486ec9d30 chore: update deps 2023-02-06 10:26:17 +08:00
xingyuv
aba35678bc Merge remote-tracking branch 'origin/master' into 1.X-dev
# Conflicts:
#	yudao-ui-admin-vue3/package.json
#	yudao-ui-admin-vue3/pnpm-lock.yaml
#	yudao-ui-admin-vue3/src/main.ts
2023-02-06 09:18:48 +08:00
YunaiV
de7d26129c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java
2023-02-04 20:58:09 +08:00
xingyuv
bc75ad7a40 Merge branch 'master' into 1.X-dev 2023-02-04 20:26:55 +08:00
gexinzhineng/gxzn27
2d5470bcf3 xml转json 2023-02-02 13:35:58 +08:00
xingyu
9ebff2787e perf: post 2023-02-02 10:55:24 +08:00
gexinzhineng/gxzn27
ff147137c8 动态表单详情页面隐藏提交重置按钮,不可填写 2023-02-02 09:44:10 +08:00
xingyu
d2805b1dca perf: 重构post 2023-02-01 16:45:37 +08:00
xingyu
654fce751a chore: optimize 2023-02-01 16:22:36 +08:00
xingyu
469c01d4dd fix: copper modal 2023-02-01 16:21:45 +08:00
xingyu
ba40db4ba6 feat: add Logger 2023-02-01 16:21:29 +08:00
gexinzhineng/gxzn27
bdf8bafec5 bpmnjs图提示框显示问题 2023-02-01 16:20:16 +08:00
xingyu
19fe7ea8f9 fix: ts type eroor 2023-02-01 15:53:55 +08:00
xingyu
5fe0106155 chore: update deps 2023-02-01 15:53:39 +08:00
gexinzhineng/gxzn27
467a984955 路由问题 2023-02-01 15:37:58 +08:00
gexinzhineng/gxzn27
e718263f5f 时间保存问题 2023-02-01 15:18:59 +08:00
gexinzhineng/gxzn27
9e35ca512c 基本流通 2023-02-01 14:16:32 +08:00
gexinzhineng/gxzn27
63055cc559 详情显示bpmn 2023-01-31 16:17:11 +08:00
gexinzhineng/gxzn27
3a954b47bb 列表浏览bpmn图 2023-01-31 14:12:29 +08:00
gexinzhineng/gxzn27
b700b316cd bug 2023-01-31 10:37:35 +08:00
YunaiV
1e8a379ed0 vue3 工作流:修复流程详情的报错 2023-01-30 22:10:41 +08:00
YunaiV
8ce0c8081c vue3 工作流:1. 完成流程设计的接口对接;2. 流程任务的分配规则的 modelId 不存在的问题修复 2023-01-30 22:03:03 +08:00
YunaiV
5bedff605a Merge branch 'feature/vue3-bpm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm 2023-01-30 20:48:29 +08:00
gexinzhineng/gxzn27
00a93ab9bf 无用注释 2023-01-30 10:30:08 +08:00
gexinzhineng/gxzn27
d6a4dc7d11 bug 2023-01-30 10:18:49 +08:00
xingyu
08a4de37c2 Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
#	README.md
2023-01-30 10:08:31 +08:00
YunaiV
c04ef59e81 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm 2023-01-30 08:11:24 +08:00
YunaiV
ca8bb72417 版本 1.7.0 发布:增加微信公众号、站内信、邮箱、数据脱敏! 2023-01-30 02:30:42 +08:00
YunaiV
f7762e646e 站内信模块:我的站内信 vue3 2023-01-29 18:31:52 +08:00
xingyu
ffb0358ce2 Merge remote-tracking branch 'origin/master' into feature/springdoc 2023-01-29 16:11:51 +08:00
gexinzhineng/gxzn27
252ef55a6c 接口数据替换假数据 2023-01-29 14:50:27 +08:00
gexinzhineng/gxzn27
3b9fe77036 高亮 2023-01-29 14:46:08 +08:00
gexinzhineng/gxzn27
2be0ea5ffb 各个节点绑定值 修改等bug 2023-01-29 14:12:16 +08:00
gexinzhineng/gxzn27
548f8bc32c 部分绑定值问题 2023-01-29 10:57:04 +08:00
YunaiV
91dd4a32b1 站内信模块:vue3 站内信弹板 2023-01-29 09:26:06 +08:00
YunaiV
8cdae12b34 站内信模块:vue3 消息 2023-01-29 08:43:37 +08:00
YunaiV
cb0da2db6a 站内信模块:vue3 模版 2023-01-28 23:51:31 +08:00
gexinzhineng/gxzn27
0d0554e76c 数据绑定 2023-01-28 18:10:51 +08:00
gexinzhineng/gxzn27
ba11e6612e 各个节点数据绑定 2023-01-28 18:07:17 +08:00
gexinzhineng/gxzn27
b704aae49b 报错基本解决,数据绑定还有些错误 2023-01-28 17:42:19 +08:00
gexinzhineng/gxzn27
3ce663c7a5 bug 2023-01-28 15:30:52 +08:00
gexinzhineng/gxzn27
a03f702fa1 修改数据弹出层 2023-01-28 11:28:52 +08:00
gexinzhineng/gxzn27
89c366be68 嵌入bpmn设计流程模块 2023-01-28 09:53:43 +08:00
xingyu
e439a72210 fix: warn 2023-01-28 09:25:49 +08:00
xingyu
e7a8d45a67 chore: update deps 2023-01-28 09:25:34 +08:00