Commit Graph

511 Commits (013f3f3d2d1b20f800aac5711903439541bc3337)

Author SHA1 Message Date
xingyu4j 643b44862a fix: 文本错误 2025-05-28 20:05:46 +08:00
xingyu4j 089d3bbd9b feat: add member config 2025-05-28 19:00:21 +08:00
xingyu4j 6236f59473 perf: 优化部分显示效果 2025-05-28 11:36:52 +08:00
xingyu4j cd239afd83 feat: pay cashier 2025-05-27 22:15:34 +08:00
xingyu4j 58bef6359f fix: pay app 2025-05-27 22:15:24 +08:00
xingyu4j 4736a5b3fe fix: error 2025-05-27 19:53:44 +08:00
xingyu4j 09942f0257 feat: add cashier views 2025-05-27 18:40:02 +08:00
xingyu4j 612d4930e2 feat: add pay wallet 2025-05-27 15:31:19 +08:00
xingyu4j d46c17293c feat: pay tansfer 2025-05-27 14:38:38 +08:00
xingyu4j 3b25efcc7e feat: pay demo 2025-05-27 14:20:07 +08:00
xingyu4j b67e4faab4 feat: add pay cashier route 2025-05-27 11:50:16 +08:00
xingyu4j cdd136d4fd feat: 移除slots 2025-05-27 10:39:06 +08:00
xingyu4j 6098e84119 feat: add height 2025-05-26 19:05:45 +08:00
xingyu4j f15f7d4fc2 perf: code style 2025-05-26 19:05:31 +08:00
xingyu4j 7b886b315b feat: 去除 slotName 使用input upload 2025-05-26 18:48:27 +08:00
xingyu 3c4f954b77
!115 Merge remote-tracking branch 'yudao/dev' into dev
Merge pull request !115 from Jason/dev
2025-05-26 09:30:11 +00:00
xingyu4j 281a2ebae0 fix: formatAmount 重复定义 2025-05-26 17:29:34 +08:00
xingyu4j ae7b549879 refactor: pay 2025-05-26 17:22:09 +08:00
jason ce02f7d520 Merge remote-tracking branch 'yudao/dev' into dev 2025-05-26 16:58:43 +08:00
xingyu4j a602decde9 refactor: pay app 2025-05-26 16:52:11 +08:00
jason ef93c9824a Merge remote-tracking branch 'yudao/dev' into dev 2025-05-26 16:44:20 +08:00
xingyu4j 67af898baf Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev 2025-05-26 14:49:12 +08:00
jason 11f32258e6 feat: Simple 流程模型- 发起人节点配置 2025-05-26 14:20:32 +08:00
xingyu f64425b724
!88 feat: 添加渠道配置和应用管理功能,更新相关表单和数据结构
Merge pull request !88 from 痴货/pay-master
2025-05-26 02:24:11 +00:00
xingyu 3355024e42
!114 Merge remote-tracking branch 'yudao/dev' into dev
Merge pull request !114 from Jason/dev
2025-05-26 02:23:22 +00:00
jason deefea6a18 perf: review todo 的修改 2025-05-25 08:46:09 +08:00
jason 8e88db8d11 Merge remote-tracking branch 'yudao/dev' into dev 2025-05-24 23:31:18 +08:00
jason 0f576e006b feat: 流程设计- Simple 模型设计 20% 2025-05-24 23:02:24 +08:00
子夜 e3948bbc50 fix: 【BPM 工作流】修复流程表单操作列宽,消除控制台警告 2025-05-24 16:53:59 +08:00
子夜 7762059537 fix: 优化待办任务摘要字段的渲染方式 2025-05-24 16:43:44 +08:00
子夜 e1434c7b2d feat: 【BPM 工作流】新增OA请假示例详情页面,完善请假信息展示和数据获取逻辑 2025-05-24 16:29:38 +08:00
子夜 370c257cf5 fix: 【BPM 工作流】选择发起人时 activityId 类型转换导致无法正确选择发起人的问题。 2025-05-24 16:07:18 +08:00
子夜 01f929e10f feat: 【BPM 工作流】完善操作按钮、流程签名组件 2025-05-24 15:10:03 +08:00
子夜 66ac3de5c1 feat:【BPM 工作流】 完善流转记录列表 2025-05-24 10:51:57 +08:00
子夜 c0a82df7f4 Merge remote-tracking branch 'origin/dev' into dev-bpm 2025-05-24 09:35:54 +08:00
ziye ec2716c81e fix: 修复TODO列表中摘要字段的插槽配置,确保正确渲染 2025-05-21 01:38:03 +08:00
ziye a4839416fe refactor:【BPM 工作流】 针对TODO 更新流程相关接口和组件,优化文档提示,调整表单字段类型 2025-05-21 01:29:03 +08:00
YunaiV f03d8fa9ee review:【ANTD】批量删除代码 2025-05-20 21:02:28 +08:00
puhui999 33d0da02ef perf: 【ANTD】新增 general 标准模式批量删除代码示例 2025-05-20 18:00:11 +08:00
puhui999 495aa10695 Merge remote-tracking branch 'yudao/dev' into dev-new
# Conflicts:
#	apps/web-antd/src/views/infra/demo/demo01/index.vue
#	apps/web-antd/src/views/infra/demo/general/demo01/index.vue
#	apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue
#	apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue
#	apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue
#	apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue
#	apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue
2025-05-20 17:56:53 +08:00
puhui999 b2411ea8f5 feat: 【ANTD】新增 general 标准模式批量删除代码示例 2025-05-20 17:55:04 +08:00
xingyu4j 7a54f7767a fix: message loading 2025-05-20 17:07:54 +08:00
xingyu4j 8cb92462ea Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev 2025-05-20 16:48:43 +08:00
xingyu4j 0a40bdf276 perf: infra table action 2025-05-20 16:45:38 +08:00
puhui999 98a742895d perf: 【ANTD】优化一些 todo 提到的问题 2025-05-20 15:08:54 +08:00
puhui999 074eb0e83d Merge remote-tracking branch 'yudao/dev' into dev-new
# Conflicts:
#	apps/web-antd/src/api/infra/codegen/index.ts
#	apps/web-antd/src/views/infra/codegen/data.ts
2025-05-20 14:13:14 +08:00
xingyu4j 302bcc25fb perf: 方法名前缀 handle 2025-05-20 11:23:02 +08:00
puhui999 86c554fd01 perf: 【ANTD】代码生成批量删除接口配置改为通过后端配置文件 2025-05-20 10:14:39 +08:00
芋道源码 891daec857
!110 perf: 【ANTD】优化代码生成示例 demo03
Merge pull request !110 from puhui999/dev-new
2025-05-19 11:56:39 +00:00
YunaiV 241e340c3f review:【ANTD】批量删除代码 2025-05-19 19:52:25 +08:00
puhui999 b410e50edb perf: 【ANTD】优化代码生成示例 demo03 inner 2025-05-19 18:19:31 +08:00
xingyu4j 9503ef4b52 perf: table action from adapter/vxe-table 2025-05-19 18:13:13 +08:00
xingyu4j 52ae513e1c perf: use table action 2025-05-19 17:58:06 +08:00
puhui999 11316a7c76 perf: 【ANTD】优化代码生成示例 demo03 normal 2025-05-19 17:56:40 +08:00
xingyu4j 28abdb019b perf: use TableAction 2025-05-19 16:31:17 +08:00
xingyu4j b125299c38 feat: use TableAction 2025-05-19 16:31:07 +08:00
xingyu4j 0a9b2ba383 perf: use table action 2025-05-19 16:19:53 +08:00
puhui999 513f6d4b57 feat: 【ANTD】新增代码生成批量删除接口示例 demo03 erp 模式 2025-05-19 15:12:14 +08:00
xingyu 1cb00f1470
!109 antd-schema 代码生成时,可选择生成批量删除接口
Merge pull request !109 from puhui999/dev-new
2025-05-19 06:08:14 +00:00
puhui999 98e9d9fbfc feat: 【ANTD】新增代码生成批量删除接口示例 demo01 2025-05-19 12:53:10 +08:00
puhui999 2e0c7e23e9 feat: 【ANTD】代码生成时,可选择生成批量删除接口 2025-05-19 12:52:14 +08:00
jason 4469e9dfc7 Merge remote-tracking branch 'yudao/dev' into dev 2025-05-19 12:39:10 +08:00
xingyu4j 0af58f8f9a feat: use table action 2025-05-19 11:21:04 +08:00
jason da3a580711 feat: 流程模型新增: 表单设计 2025-05-19 11:19:59 +08:00
xingyu4j 2ea9b4781e fix: delete loading 2025-05-19 11:10:38 +08:00
xingyu4j 8c42af49d2 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev 2025-05-19 10:48:17 +08:00
xingyu4j 84f441684f Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev 2025-05-19 10:45:16 +08:00
xingyu4j 0602e8d620 perf: table action 2025-05-19 10:45:14 +08:00
jason 2d153de6dc feat: 流程模型新增:基本信息, 部门选择组件 2025-05-18 17:53:17 +08:00
jason 6ab03dacc2 Merge remote-tracking branch 'yudao/dev' into dev 2025-05-16 14:42:24 +08:00
jason c5e844460e feat: 流程模型新增: 基本信息 2025-05-16 14:05:52 +08:00
YunaiV e60974618b review:【ANTD】TableAction 2025-05-15 17:42:14 +08:00
xingyu4j 007faab168 feat: use table actions 2025-05-15 14:47:19 +08:00
xingyu4j ff5358da4b feat: popConfirm button 2025-05-15 14:37:02 +08:00
YunaiV 56263ec782 review:【ANTD】TableAction 2025-05-15 12:13:11 +08:00
xingyu4j e8c87b5a2b feat: use table-actions 2025-05-15 11:50:13 +08:00
YunaiV 6fd1b18c31 review:【EP】【BPM 工作流】infra 相关功能的实现 2025-05-14 23:34:32 +08:00
YunaiV 769cb87035 review:【BPM 工作流】流程、任务相关的逻辑 2025-05-14 23:08:31 +08:00
xingyu4j 5c405d60c9 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev 2025-05-14 11:53:25 +08:00
xingyu 7a6f3a8c0c
!103 refactor:【BPM工作流】 更新 BPM 任务相关组件,优化表格展示逻辑,工作流整体进度 50%
Merge pull request !103 from 子夜/feature/bpm-process-instance
2025-05-14 02:51:48 +00:00
ziye 18c4e92418 feat: 【BPM 工作流】完善流程表单模块 2025-05-14 01:20:11 +08:00
子夜 3ac5f784e7 refactor:【BPM】 更新 BPM 任务相关组件,优化表格展示逻辑 工作流整体进度 50% 2025-05-13 19:54:11 +08:00
YunaiV 09f4baa578 review:【ep 全局】实现 2025-05-13 19:15:38 +08:00
ziye acf3d9a6f0 refactor: 优化 BPM 工作流相关组件,更新用户组显示逻辑,调整图标样式 2025-05-13 01:26:36 +08:00
puhui999 f33be71b79 refactor: 优化重置 ele vxe CellOperation 中按钮默认内边距 2025-05-12 17:14:10 +08:00
xingyu4j 8f7343c31e feat: 非必填邮箱 2025-05-12 15:16:21 +08:00
YunaiV 0f44d460e2 review:【BPM 工作流】流程实例相关的实现 2025-05-12 13:04:14 +08:00
YunaiV 708587f023 review:【BPM 工作流】流程实例相关的实现 2025-05-12 12:58:57 +08:00
xingyu a7dcebc82a
!100 feat: 完善审批中心、发起流程、查看流程、工作流整体进度 40%
Merge pull request !100 from 子夜/feature/bpm-process-instance
2025-05-12 02:16:06 +00:00
ziye 2705fb7a4d feat: 重构流程定义和流程实例模块,更新API命名,增强用户选择弹窗功能,支持多用户选择,优化流程实例创建界面。
feat: 完善流程定义模块、完善流程实例模块
feat: 完善OA请假模块
feat: 完善审批中心、发起流程、查看流程、工作流整体进度 40%
2025-05-12 00:53:48 +08:00
子夜 730786b61e feat: 增强用户选择弹窗功能,添加关闭事件处理,优化用户ID去重逻辑,改进流程实例创建界面,支持分类和搜索功能 2025-05-09 20:23:19 +08:00
puhui999 8859ee5f29 feat: 新增 useTableToolbar hooks 简化 toolbar 工具栏挂载 2025-05-09 16:42:44 +08:00
puhui999 98676e1dc9 feat: @vben/plugins/vxe-table 异步导出 vxe-table 相关组件提供给需要单独使用 vxe-table 的场景 2025-05-09 13:09:24 +08:00
xingyu 62570fa745
!96 feat: 完善用户选择弹窗功能,添加分页和搜索功能,优化部门选择逻辑 进度 30%
Merge pull request !96 from 子夜/feature/bpm-process-instance
2025-05-09 01:09:01 +00:00
ziye bc50357548 feat: 完善用户选择弹窗功能,添加分页和搜索功能,优化部门选择逻辑 进度 30% 2025-05-09 01:26:33 +08:00
子夜 c201766bdb feat: 完善流程详情模块,进度 28%,调整样式并添加用户选择弹窗 2025-05-08 18:29:28 +08:00
子夜 e40a29ccb4 feat: 完善流程详情模块,进度 25%,添加时间线组件并调整样式 2025-05-08 16:52:46 +08:00
xingyu4j e8046f3a48 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev 2025-05-08 11:23:06 +08:00
ziye 654bd3ff8e feat: 完善流程详情模块,进度 21% 2025-05-08 00:02:13 +08:00
ziye ae2cb4ae0c feat: 完善流程详情模块,进度 20% 2025-05-07 23:57:41 +08:00
xingyu 14dbff7304
!94 feat: 完善流程实例管理功能,实现取消流程功能,流程实例详情待完善
Merge pull request !94 from 子夜/feature/bpm-process-instance
2025-05-07 12:40:00 +00:00
xingyu4j 86c6d712fe feat: crm customer list 2025-05-07 18:47:23 +08:00
xingyu4j ff79b79456 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev 2025-05-07 18:22:31 +08:00
xingyu4j 12823a1d09 feat: crm clue 2025-05-07 17:41:44 +08:00
子夜 f30199f9ae feat: 完善流程实例管理功能,实现取消流程功能,流程实例详情待完善 2025-05-07 17:31:06 +08:00
jason 3949c215d8 Merge remote-tracking branch 'yudao/dev' into dev 2025-05-07 16:49:09 +08:00
jason 9f7761f832 fix: 代码 review 修改 2025-05-07 16:36:17 +08:00
jason 6a029ad7a0 feat: 流程模型列表 70% 2025-05-07 16:28:57 +08:00
xingyu4j 073f9ddcdb perf: notify detail 2025-05-07 15:24:28 +08:00
xingyu4j 31e88875e2 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev 2025-05-07 14:08:18 +08:00
子夜 abe1c32b3e feat: 完善流程表达式管理功能 2025-05-07 10:54:56 +08:00
xingyu4j afbc2e800c feat: crm business 2025-05-07 10:27:29 +08:00
xingyu4j 211c403940 perf: 合并 utils 导出 2025-05-06 23:59:01 +08:00
xingyu c4d0dbaaf3
!91 feat: 完善流程监听器功能
Merge pull request !91 from 子夜/feature/bpm-process-listener
2025-05-06 15:58:05 +00:00
xingyu4j bd9d07dadd feat: add rangePicker locales 2025-05-06 23:44:30 +08:00
xingyu4j 6ff4c3b99d perf: utils 统一导出 2025-05-06 23:23:42 +08:00
ziye 34eebc14cf feat: 完善流程监听器功能 2025-05-06 23:23:40 +08:00
YunaiV c05c3281db review:通用的代码生成 demo 2025-05-06 22:37:19 +08:00
YunaiV 361cfca312 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	apps/web-antd/src/views/infra/demo/demo01/index.vue
2025-05-06 22:33:23 +08:00
YunaiV 2fd6367983 review:通用的代码生成 demo 2025-05-06 22:32:09 +08:00
xingyu4j 3b8b328053 perf: 删除没有必要的 message key 2025-05-06 22:30:37 +08:00
xingyu 5f3c3719ef
!90 feat: 完善用户分组管理功能
Merge pull request !90 from 子夜/feature/bpm
2025-05-06 14:28:16 +00:00
xingyu4j 4669713422 perf: 删除没有必要的 message key 2025-05-06 22:09:44 +08:00
xingyu4j 4741819826 perf: 删除没有必要的 message key 2025-05-06 22:06:25 +08:00
xingyu4j d92972ba3e perf: 使用封装的 confirm 替换 Modal.confirm 2025-05-06 21:38:46 +08:00
ziye 413ed3526d refactor: 修改分类编号标题为“编号”以提升一致性 2025-05-06 21:15:14 +08:00
ziye bd38076d40 feat: 完善用户分组管理功能 2025-05-06 21:07:31 +08:00
xingyu4j 5af8a3c40c perf: 优化 cropper 组件的类型 2025-05-06 16:15:56 +08:00
xingyu4j e5f33cd12b style: code style 2025-05-06 14:47:02 +08:00
xingyu4j eb5710b880 fix: vxe warn 2025-05-06 14:42:40 +08:00
xingyu4j 703d88d799 Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-05-06 14:39:03 +08:00
痴货 0b9c16a023 feat: 更新支付渠道表单组件,新增支付宝、微信、钱包和模拟渠道配置,重命名相关模块,优化订单详情展示 2025-05-05 18:18:48 +08:00
痴货 3be7961de5 feat: 完善支付订单功能,新增订单数据结构和详情展示,更新相关表单和表格配置 2025-05-05 17:57:08 +08:00
痴货 d0870beb40 feat: 更新支付渠道相关功能,修改渠道获取参数类型,重命名事件,新增渠道表单组件 2025-05-05 16:29:59 +08:00
痴货 61e06cce09 feat: 添加支付宝渠道配置和应用管理功能,更新相关表单和数据结构 2025-05-05 12:19:04 +08:00
puhui999 d746b8f572 feat: 新增 antd 主子表 erp 模式代码生成示例 2025-05-03 18:23:51 +08:00
puhui999 1bfcdcb708 feat: 新增 antd 主子表 inner 模式代码生成示例 2025-05-03 17:30:56 +08:00
puhui999 e4b19eb8c8 feat: 新增 antd 主子表 normal 模式代码生成示例 2025-05-03 16:42:23 +08:00
puhui999 0a14751fbd feat: 新增 antd 树表代码生成示例 2025-05-03 15:05:35 +08:00
puhui999 abb9cfc05f Merge remote-tracking branch 'refs/remotes/yudao/dev' into develop 2025-05-03 13:49:52 +08:00
puhui999 448b4c983a refactor: 优化 antd 模板代码生成示例提到的一些问题 2025-05-03 13:48:27 +08:00
YunaiV 42c99639b9 feat:【报表】增加 GoView 自动登录 2025-05-03 11:53:24 +08:00
YunaiV dcecde0967 feat:集成积木仪表盘 2025-05-03 10:38:48 +08:00
YunaiV 91d70b41cb reactor:【INFRA】文件上传 api,增加 directory 参数,去除 path 参数,并支持按照日期分目录、文件名不再使用 sha256 而是时间戳 2025-05-02 19:59:05 +08:00
xingyu4j c9d5b55870 feat: dict type disabled 2025-05-02 14:14:07 +08:00
xingyu4j 2860faf987 feat: crm business status 2025-04-30 15:29:05 +08:00
xingyu4j 15557250b0 feat: pay refund [未测试] 2025-04-30 14:37:40 +08:00
xingyu4j 70bb20b41f feat: remove demos 2025-04-30 11:41:53 +08:00
xingyu4j 2ccb88af1a feat: add report 2025-04-30 11:39:53 +08:00
xingyu4j 1335616fe7 feat: pay notify [detail 未测试] 2025-04-30 11:25:46 +08:00