24b8bba754
fix: lint
2026-01-26 10:34:14 +08:00
baed599fcc
Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev
2026-01-26 10:13:23 +08:00
1ce562601f
feat(iot):【网关设备：80%】动态注册的初步实现（已测试）
2026-01-25 18:50:26 +08:00
b9224fc379
Merge branch 'main' into fix
2026-01-23 13:48:54 +08:00
ba08820be8
Merge remote-tracking branch 'yudao/dev' into dev
2026-01-21 23:28:00 +08:00
d9e933e3a6
feat: [bpm][antd] 审批签名大小控制
2026-01-21 23:25:48 +08:00
50216e5047
feat（iot）：【设备定位】添加设备位置功能，支持地图展示和坐标选择
2026-01-21 21:10:09 +08:00
6c8c49966a
Perf: 优化antd upload组件参数获取 ( #7114 )
...
* perf(antd upload params): 优化组件参数取值 确保不同调用场景配置参数可用
* perf(antd upload params): 优化组件参数取值 确保不同调用场景配置参数可用
* perf(antd upload params): 优化组件参数取值 确保不同调用场景配置参数可用
* perf(antd upload params): 优化组件参数取值 确保不同调用场景配置参数可用
2026-01-21 17:20:53 +08:00
4aeb7a489a
!322 refactor:【antd】【iot】将 DeviceSaveReqVO 和 DeviceRespVO 合并到 Device，简化设备 API 接口
...
Merge pull request !322 from haohaoMT/dev
2026-01-21 05:43:57 +00:00
8571fc43b0
Merge branch 'main' into fix
2026-01-19 15:28:12 +08:00
59aabd956d
Perf: Optimization of cropping component result acquisition & optimization of cropping frame prompts ( #7111 )
...
* perf(cropper): enhance image cropping functionality and add output type support
* perf(cropper): enhance image cropping functionality and add output type support
2026-01-19 14:18:36 +08:00
9b09ba4483
Merge branch 'main' into fix
2026-01-19 10:54:43 +08:00
9e3d75ae65
fix：【infra】代码生成：全选不生效的问题
2026-01-18 16:20:43 +08:00
4cc900f542
review：【antd/ele】【mall】商城相关的代码
2026-01-18 14:43:49 +08:00
db1dfae481
feat: [bpm][antd] todo 修改
2026-01-17 15:47:31 +08:00
012412ec22
feat: [bpm][antd] todo 修改
2026-01-17 15:31:54 +08:00
db97d414ec
feat: [bpm][antd] todo 流程监听器、流程表达式修改
2026-01-17 12:09:46 +08:00
8bf286fda0
refactor:【antd】【iot】将 DeviceSaveReqVO 和 DeviceRespVO 合并到 Device，简化设备 API 接口
2026-01-16 17:38:02 +08:00
174c4ae749
fix(antd Upload onChange Event): rewrite onChange event to handle upl… ( #7098 )
...
* fix(antd Upload onChange Event): rewrite onChange event to handle upload success or error messages
* fix(antd Upload onChange Event): rewrite onChange event to handle upload success or error messages
* fix(antd Upload onChange Event): rewrite onChange event to handle upload success or error messages
2026-01-14 15:38:21 +08:00
67da9417a8
feat(upload prop:crop,aspectRatio): from Upload component accept prop… ( #7095 )
...
* feat(upload prop:crop,aspectRatio): from Upload component accept prop crop,aspectRatio
* feat(upload prop:crop,aspectRatio): from Upload component accept prop crop,aspectRatio
* feat(upload prop:crop,aspectRatio): from Upload component accept prop crop,aspectRatio
* feat(upload prop:crop,aspectRatio): from Upload component accept prop crop,aspectRatio
2026-01-14 15:38:05 +08:00
d5b49e6a3b
fix：【ele/antd】修复更新个人信息后菜单丢失问题
...
Signed-off-by: zlflying <zlflying@qq.com>
2026-01-14 14:44:17 +08:00
10f4641fee
fix：【ele/antd】修复 setup() 函数没有接收 props 参数，导致渲染函数中的 props 无法从 formCreate 传递
2026-01-13 12:37:13 +08:00
2426f891e7
feat：【antd/ele】将文章的商品关联字段从手动输入 SPU 编号改为使用 SpuShowcase 组件选择商品
2026-01-13 12:13:22 +08:00
e2433fc531
feat：【antd/ele】使用 productSpuIds 和 productCategoryIds 自定义插槽的表单在验证前同步 formData 中的值到表单中
2026-01-13 12:06:10 +08:00
bbc74ae663
feat：【antd/ele】discountActivity 移除 structuredClone 使用 cloneDeep
2026-01-13 11:55:13 +08:00
ea79b7d6a1
feat：【antd】cropper-modal 删除多余的 Image 预加载逻辑
2026-01-13 11:33:11 +08:00
51bca25345
fix(lint): pnpm format lint warning ( #7080 )
2026-01-10 14:06:03 +08:00
17d5d1b889
review：【antd】【iot】设备管理相关
2026-01-05 20:45:39 +08:00
de28c5c4c2
refactor:【antd】【iot】设备管理跟后端对齐，必要的 ReqVO、RespVO，子设备管理实现
2026-01-04 12:25:25 +08:00
ce7b7b910a
Merge branch 'main' of https://github.com/xingyu4j/vue-vben-admin into fix
2026-01-04 10:56:14 +08:00
81a61558cb
feat(upload prop:maxSize): from Upload component accept prop maxSize (AI prompt fixed) ( #7059 )
...
* feat(upload prop:maxSize): from component accept prop maxSize
* feat(upload prop:maxSize): from component accept prop maxSize
* feat(upload prop:maxSize): from component accept prop maxSize
* feat(upload prop:maxSize): from component accept prop maxSize
2026-01-03 13:19:40 +08:00
a9f21c1acb
feat：【system】菜单管理：增加 visible 管理字段
2026-01-02 19:50:38 +08:00
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
4395353c22
feat：【ele/antd】rewardActivity todo 优化
2025-12-28 17:35:43 +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
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
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
568d5aa4cf
feat：【antd】【mall】修复满减送编辑时表单打开异常的问题，原因：antd RangePicker 需要 dayjs 对象
2025-12-20 11:35:01 +08:00
41f0a9465d
feat：【ele】【mall】point 代码对齐 antd
2025-12-20 10:59:40 +08:00
d4b99f321d
fix：【system】登录日志的“操作类型”改为“登录类型”
2025-12-20 09:23:34 +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
fbcb498f5b
feat：【system】操作日志增加 userType 的展示
2025-12-17 13:13:22 +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
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
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
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
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
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
28e4305916
feat: [bpm][antd] bpm 设计器接收任务优化
2025-12-09 20:20:47 +08:00
70bcc5ea0f
feat: [bpm][antd] bpmn设计器脚本任务优化
2025-12-08 23:41:34 +08:00
fba43de19f
fix: [bpm][antd] bpm设计器 ServiceTask 问题修复
2025-12-08 22:55:27 +08:00
xingyu4j