19c7f0d5dd
feat: 【框架】更新 operate-log 的实现
2026-01-02 19:44:09 +08:00
cd43149429
review：【antd/ele】【bpm】流程模型的迁移
2026-01-02 18:49:47 +08:00
19919f6685
Merge remote-tracking branch 'origin/dev' into dev
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2026-01-02 18:29:54 +08:00
036ef294db
feat：【infra】代码生成：字典筛选时，支持 key、name 两种类型
2026-01-02 18:12:23 +08:00
f8ce09a203
Merge remote-tracking branch 'yudao/dev' into dev
2025-12-31 11:02:11 +08:00
59d83d29cb
feat: [bpm][ele] bpm oa 请假迁移
2025-12-31 11:00:13 +08:00
02193755be
feat: [bpm][antd] oa 请假优化
2025-12-31 00:04:40 +08:00
6d524906a3
!313 Merge remote-tracking branch 'yudao/dev' into dev
...
Merge pull request !313 from Jason/dev
2025-12-29 14:43:47 +00:00
cbd1f0bcbb
Merge remote-tracking branch 'yudao/dev' into dev
2025-12-29 11:53:00 +08:00
2ba2c8e986
feat: [bpm] [ele,antd] todo 优化, 更多设置问题修复
2025-12-29 11:51:48 +08:00
06f1ae1a66
review：【mall】营销相关
2025-12-29 08:17:35 +08:00
029b2ffaab
review：【antd/ele】【mall】营销活动的实现
2025-12-29 07:03:00 +08:00
64ac25de00
Merge remote-tracking branch 'yudao/dev' into dev
2025-12-29 00:12:30 +08:00
6606dfd40a
feat: [bpm][ele] todo 优化
2025-12-29 00:09:22 +08:00
aa95d0e87c
feat：【ele/antd】profile todo 优化
2025-12-28 18:55:07 +08:00
6353f0a8e9
feat：【ele/antd】discountActivity todo 优化
2025-12-28 18:34:28 +08:00
e6327ae9da
feat：【ele】spu todo 优化
2025-12-28 17:57:10 +08:00
4395353c22
feat：【ele/antd】rewardActivity todo 优化
2025-12-28 17:35:43 +08:00
c023ebbdb9
feat：【ele】cropper、form-create\rules todo 优化
2025-12-28 15:44:21 +08:00
63a8d562ce
feat：【antd/ele】文件上传的组件优化
2025-12-27 18:50:42 +08:00
a109168c66
fix：【pay】修复钱包支付、模拟支付配置的修改报错问题
2025-12-27 17:29:08 +08:00
304f2442eb
feat：【antd/ele】【infra】统一 cron-tab 的封装
2025-12-27 17:13:40 +08:00
826a1b355a
feat：【antd/ele】对齐两侧的代码
2025-12-27 17:06:15 +08:00
9ef218f930
refactor: 【crm】【antd/ele】提取图表配置生成函数，统一 legend/grid/tooltip 处理，优化饼图面板生成
2025-12-27 17:02:11 +08:00
5a5d2f17da
feat：【bpm】【antd/ele】业务表单，支持重新发起流程
2025-12-27 12:49:14 +08:00
ab7b77989f
fix: lint
2025-12-26 14:25:55 +08:00
77cd814c99
Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev
2025-12-26 14:00:55 +08:00
68bb90a503
review：【antd】【iot】代码实现
2025-12-25 09:19:17 +08:00
11b5068e91
review：【antd】【bpm】评审流程详情界面
2025-12-25 00:58:16 +08:00
a1bb132233
feat(api-cascader): 添加联级组件ApiCascader ( #7031 )
2025-12-22 20:00:31 +08:00
af3fe53ec8
fix: type error
2025-12-22 17:50:06 +08:00
6bf9acbfb2
refactor:【antd】【iot】代码优化
2025-12-22 17:30:59 +08:00
13f81b3130
review：【antd】【iot】代码实现
2025-12-21 23:04:57 +08:00
835da00f2c
review：【antd/ele】【bpm】流程模型的迁移
2025-12-21 22:41:03 +08:00
bc654c9d45
fix：【ele】【mall】商品列表的“商品分类”不展示的问题，对应 https://t.zsxq.com/JCOWV
2025-12-21 21:24:59 +08:00
0f864b22c1
fix：【ele】【infra】代码生成时，无法选中菜单，对应 https://t.zsxq.com/xZ4fL
2025-12-21 21:15:49 +08:00
08f6cb7d14
!305 fix: [ele] 树形控件展开和选择属性配置问题
...
Merge pull request !305 from Lcp/dev
2025-12-21 12:53:39 +00:00
3ea5510a21
review：【antd/ele】【mall】营销模块的迁移
2025-12-21 20:50:27 +08:00
a3f282cba3
!307 mall 商城优化完善
...
Merge pull request !307 from puhui999/dev-mall
2025-12-21 11:13:33 +00:00
7ab917dc48
fix：【system】邮箱移除无用的 remark 字段及相关表单项
2025-12-20 20:48:24 +08:00
e850ffb038
fix：【bpm】修复流程模型的业务表单，路径的 tooltip 不对
2025-12-20 15:11:54 +08:00
1fc39e3fbb
!306 Merge remote-tracking branch 'yudao/dev' into dev
...
Merge pull request !306 from Jason/dev
2025-12-20 07:10:35 +00:00
568d5aa4cf
feat：【antd】【mall】修复满减送编辑时表单打开异常的问题，原因：antd RangePicker 需要 dayjs 对象
2025-12-20 11:35:01 +08:00
535c82c844
feat：【ele】【mall】seckill 代码对齐 antd
2025-12-20 11:20:34 +08:00
c1b1343794
feat：【ele】【mall】rewardActivity 代码对齐 antd
2025-12-20 11:11:00 +08:00
41f0a9465d
feat：【ele】【mall】point 代码对齐 antd
2025-12-20 10:59:40 +08:00
a7054ec09c
feat：【ele】【mall】coupon 代码对齐 antd
2025-12-20 10:46:59 +08:00
ebf7221fd2
feat：【ele】【mall】ElDialog :append-to-body="true"
2025-12-20 10:40:27 +08:00
fad560db52
feat：【ele】【mall】discountActivity 代码对齐 antd
2025-12-20 10:36:50 +08:00
503ed01c57
feat：【ele】【mall】combination 代码对齐 antd
2025-12-20 10:32:38 +08:00
b9466282fc
feat：【ele】【mall】bargain 代码对齐 antd
2025-12-20 10:10:19 +08:00
d3a7a874a6
feat：【ele】【mall】comment 代码对齐 antd
2025-12-20 10:04:24 +08:00
d4b99f321d
fix：【system】登录日志的“操作类型”改为“登录类型”
2025-12-20 09:23:34 +08:00
e1e0554aca
feat：【ele】【mall】spu 代码对齐 antd
2025-12-20 09:13:38 +08:00
f429e74e79
feat：【antd】【mall】point 优化完善
2025-12-20 08:56:32 +08:00
f99d708c97
feat：【antd】【mall】rewardActivity 优化完善
2025-12-20 08:53:47 +08:00
57855eff06
feat：【antd】【mall】seckill 优化完善
2025-12-20 08:40:09 +08:00
348cc35aec
feat：【antd】【mall】combination 优化完善
2025-12-20 08:33:40 +08:00
6922ab13fc
feat：【antd】【mall】bargain 优化完善
2025-12-20 08:24:30 +08:00
01dd8171e9
Merge remote-tracking branch 'yudao/dev' into dev
2025-12-18 23:32:39 +08:00
0d043bca94
feat: [bpm][ele] bpmn 设计器问题修复
2025-12-18 23:28:59 +08:00
9504fa3980
feat: [bpm][ele] bpmn 设计器流程监听器选择弹窗组件
2025-12-18 23:27:38 +08:00
a91be61c21
feat: [bpm][ele] bpmn 设计器流程表达式选择弹窗组件
2025-12-18 23:25:37 +08:00
b18353e171
feat: [bpm][ele] bpmn 设计器时间事件配置优化
2025-12-18 11:15:35 +08:00
fbcb498f5b
feat：【system】操作日志增加 userType 的展示
2025-12-17 13:13:22 +08:00
32263c2b09
fix: [ele] 树形控件展开和选择属性配置问题
2025-12-17 11:12:51 +08:00
2202ef3b3c
!304 refactor:【antd】【iot】重构设备详情页面，优化组件结构与路径，优化设备配置、属性、事件管理等功能
...
Merge pull request !304 from haohaoMT/dev
2025-12-16 14:55:09 +00:00
191e15975c
refactor:【antd】【iot】重构设备详情页面，优化组件结构与路径，优化设备配置、属性、事件管理等功能
2025-12-16 16:45:35 +08:00
eb17976e96
merge: 合并远程 origin/dev 分支代码
2025-12-16 13:35:38 +08:00
70982eff92
fix：【ele】promotion activity 漏了一个 } 导致报错
2025-12-16 13:33:26 +08:00
5532f59c40
!303 refactor:【antd】【iot】统一列表视图和卡片视图的查询接口
...
Merge pull request !303 from haohaoMT/dev
2025-12-16 05:28:16 +00:00
439a35c165
refactor:【antd】【iot】统一列表视图和卡片视图的查询接口
2025-12-16 09:58:16 +08:00
3744069aa2
refactor:【antd】【iot】产品详情修改路径到 detail
2025-12-15 22:48:09 +08:00
936e127c0d
Merge remote-tracking branch 'yudao/dev' into dev
2025-12-15 22:42:17 +08:00
ba126288a0
feat: [bpm][ele] bpmn 设计器 用户任务配置迁移优化
2025-12-15 22:39:59 +08:00
1d8d70e71a
!301 refactor:【antd】【iot】更新首页必要的 ReqVO、RespVO
...
Merge pull request !301 from haohaoMT/dev
2025-12-15 14:28:31 +00:00
5cb412a4da
refactor:【antd】【iot】更新首页必要的 ReqVO、RespVO
2025-12-15 21:51:09 +08:00
dde16e26fe
feat: [bpm][ele] bpmn 设计器迁移
2025-12-15 21:21:54 +08:00
ca8ac99b6e
feat: [bpm][ele] bpmn 设计器迁移
2025-12-15 21:03:28 +08:00
e3c1676523
review：【antd/ele】【mall】商品模块的迁移
2025-12-15 19:44:11 +08:00
4ec82f0fd0
review：【antd/ele】【mall】营销模块的迁移
2025-12-15 19:29:47 +08:00
ef0f0a9a9d
!300 feat：【ele】【mall】promotion 代码迁移
...
Merge pull request !300 from puhui999/dev-mall
2025-12-15 09:01:19 +00:00
b36c3c4209
feat：【ele】【mall】combination 代码迁移
2025-12-15 16:26:23 +08:00
f137a66b6c
feat：【ele】【mall】bargain 代码迁移
2025-12-15 16:18:14 +08:00
e8526674c5
feat：【ele】【mall】seckill 代码迁移
2025-12-15 16:16:50 +08:00
5417b19a8b
feat：【ele】【mall】spu 选择组件优化
2025-12-15 16:07:47 +08:00
e0d3fac19e
feat：【ele】【mall】rewardActivity 代码迁移
2025-12-15 15:55:56 +08:00
f943b175eb
feat：【ele】【mall】point 代码迁移
2025-12-15 15:29:37 +08:00
3088fb3d46
review：【antd/ele】【MP】代码迁移的 review
2025-12-15 14:27:09 +08:00
bdf1c293bd
Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev
2025-12-15 10:18:46 +08:00
12b0575ca1
fix: resolve todo
2025-12-15 10:13:13 +08:00
3102eb511f
feat：【ele】【mall】spu 代码迁移
2025-12-14 16:35:58 +08:00
d8c87c0f7c
feat：【antd】【mall】砍价活动商品选择优化
2025-12-14 15:05:46 +08:00
f849f3ad3d
feat：【antd】【mall】拼团活动商品选择优化
2025-12-14 14:59:24 +08:00
47dfccd9eb
Merge pull request #187 from solante1012/dev
...
fix: [bpm][antd] BPM 设计器用户任务， 点击查不到数据问题
2025-12-13 10:27:01 +08:00
8df5fbc843
feat: [bpm][antd] bpmn 设计器时间事件定义优化
2025-12-13 00:39:00 +08:00
51ce864dbd
fix: [bpm][antd] BPM 设计器用户任务， 点击查不到数据问题
2025-12-12 15:12:39 +08:00
d50b9fae60
fix: [bpm][antd] bpmn 设计器审批人超时未处理自定义配置问题修复
2025-12-12 13:36:50 +08:00
0db2710e80
fix: [bpm][antd] bpmn 设计器流转条件问题修复
2025-12-11 18:05:58 +08:00
43ed7aeefb
feat: [bpm][antd] bpmn 设计器子流程调用问题修复
2025-12-09 23:14:35 +08:00
YunaiV