xingyu
bf4fed78f2
!332 Merge branch 'main' of <a href=" https://gitee.com/link?target=https%3A%2F%2Fgithub.com%2Fvbenjs%2Fvue-vben-admin "> https://github.com/vbenjs/vue-vben-admin </a> into dev
...
Merge pull request !332 from xingyu/dev
2026-02-11 03:12:23 +00:00
xingyu4j
722afc85df
Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev
2026-02-11 11:01:44 +08:00
Jin Mao
8a215fbcc7
chore: release 5.6.0
2026-02-09 05:09:57 +08:00
Bin
8cadad0a1e
feat(web): add antdv-next model
2026-02-08 23:00:19 +08:00
puhui999
f3deefae56
Merge remote-tracking branch 'yudao/master' into master-fix
2026-02-08 11:57:23 +08:00
puhui999
d0a7065991
feat(form-create): 【ele/antd】新增 iframe 和省市区选择器组件
...
- 新增 iframe 网页嵌入组件，支持 URL 配置和实时预览
- 新增省市区三级联动选择器组件
- 支持 web-ele 和 web-antd 双版本
2026-02-08 11:56:02 +08:00
YunaiV
448f073143
review：【antd/ele】【bpm】工作流相关的代码
2026-01-29 21:20:24 +08:00
puhui999
548da70f9f
fix(mall): 【antd/ele】修复商品 SKU 名称校验失败的问题
...
前端创建/编辑商品时，SKU 对象缺少 name 字段初始化，导致提交时后端校验 "商品 SKU 名字不能为空" 失败。
修改内容：
- form/index.vue: 初始化 SKU 添加 name 字段，提交前校验商品名称并赋值给 SKU
- sku-list.vue: createEmptySku 函数添加 name 字段
影响范围：web-antd、web-ele 两个版本
2026-01-28 17:45:20 +08:00
puhui999
1196dab9e4
feat(form-create): 【antd/ele】表单选择器支持默认选中当前用户/部门
...
- UserSelect 组件新增 defaultCurrentUser 配置，支持默认选中当前登录用户
- DeptSelect 组件重构为独立的树形选择器，支持 defaultCurrentDept 配置
- DeptSelect 支持 returnType 配置，可返回部门 ID 或部门名称
- 修复 useSelectRule 未将自定义 props 默认值传递给组件的问题
- 修复 DeptSelect 数据加载完成前回显失败的问题
- 同时支持 web-antd 和 web-ele 两个应用
2026-01-28 17:23:39 +08:00
xingyu4j
cdcbd58f0e
fix: ele auto complete
2026-01-26 14:35:53 +08:00
xingyu4j
c57f3d8820
fix: ele auto complete
2026-01-26 14:34:45 +08:00
xingyu4j
02c977f969
fix: IDLPAD
2026-01-26 11:06:38 +08:00
xingyu4j
24b8bba754
fix: lint
2026-01-26 10:34:14 +08:00
xingyu4j
baed599fcc
Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev
2026-01-26 10:13:23 +08:00
YunaiV
9e3d75ae65
fix：【infra】代码生成：全选不生效的问题
2026-01-18 16:20:43 +08:00
YunaiV
4cc900f542
review：【antd/ele】【mall】商城相关的代码
2026-01-18 14:43:49 +08:00
zlflying
d5b49e6a3b
fix：【ele/antd】修复更新个人信息后菜单丢失问题
...
Signed-off-by: zlflying <zlflying@qq.com >
2026-01-14 14:44:17 +08:00
puhui999
10f4641fee
fix：【ele/antd】修复 setup() 函数没有接收 props 参数，导致渲染函数中的 props 无法从 formCreate 传递
2026-01-13 12:37:13 +08:00
puhui999
c478bef269
feat：【ele】cropper todo 优化，对齐 antd
2026-01-13 12:32:00 +08:00
puhui999
0302b70c48
feat：【antd/ele】Element Plus 的 value-format="x" 返回的值可以直接赋值，不需要 Number() 转换，与 antd 版本保持一致
2026-01-13 12:25:27 +08:00
puhui999
2426f891e7
feat：【antd/ele】将文章的商品关联字段从手动输入 SPU 编号改为使用 SpuShowcase 组件选择商品
2026-01-13 12:13:22 +08:00
puhui999
e2433fc531
feat：【antd/ele】使用 productSpuIds 和 productCategoryIds 自定义插槽的表单在验证前同步 formData 中的值到表单中
2026-01-13 12:06:10 +08:00
puhui999
bbc74ae663
feat：【antd/ele】discountActivity 移除 structuredClone 使用 cloneDeep
2026-01-13 11:55:13 +08:00
YunaiV
f7f01c9280
feat：【antd/ele】生产环境下，默认开启 CAPTCHA 验证码，保证安全性
2026-01-03 19:20:25 +08:00
YunaiV
a9f21c1acb
feat：【system】菜单管理：增加 visible 管理字段
2026-01-02 19:50:38 +08:00
YunaiV
19c7f0d5dd
feat: 【框架】更新 operate-log 的实现
2026-01-02 19:44:09 +08:00
YunaiV
cd43149429
review：【antd/ele】【bpm】流程模型的迁移
2026-01-02 18:49:47 +08:00
YunaiV
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
YunaiV
036ef294db
feat：【infra】代码生成：字典筛选时，支持 key、name 两种类型
2026-01-02 18:12:23 +08:00
jason
f8ce09a203
Merge remote-tracking branch 'yudao/dev' into dev
2025-12-31 11:02:11 +08:00
jason
59d83d29cb
feat: [bpm][ele] bpm oa 请假迁移
2025-12-31 11:00:13 +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
jason
cbd1f0bcbb
Merge remote-tracking branch 'yudao/dev' into dev
2025-12-29 11:53:00 +08:00
jason
2ba2c8e986
feat: [bpm] [ele,antd] todo 优化, 更多设置问题修复
2025-12-29 11:51:48 +08:00
YunaiV
06f1ae1a66
review：【mall】营销相关
2025-12-29 08:17:35 +08:00
YunaiV
029b2ffaab
review：【antd/ele】【mall】营销活动的实现
2025-12-29 07:03:00 +08:00
jason
64ac25de00
Merge remote-tracking branch 'yudao/dev' into dev
2025-12-29 00:12:30 +08:00
jason
6606dfd40a
feat: [bpm][ele] todo 优化
2025-12-29 00:09:22 +08:00
puhui999
aa95d0e87c
feat：【ele/antd】profile todo 优化
2025-12-28 18:55:07 +08:00
puhui999
6353f0a8e9
feat：【ele/antd】discountActivity todo 优化
2025-12-28 18:34:28 +08:00
puhui999
e6327ae9da
feat：【ele】spu todo 优化
2025-12-28 17:57:10 +08:00
puhui999
4395353c22
feat：【ele/antd】rewardActivity todo 优化
2025-12-28 17:35:43 +08:00
puhui999
c023ebbdb9
feat：【ele】cropper、form-create\rules todo 优化
2025-12-28 15:44:21 +08:00
YunaiV
63a8d562ce
feat：【antd/ele】文件上传的组件优化
2025-12-27 18:50:42 +08:00
YunaiV
a109168c66
fix：【pay】修复钱包支付、模拟支付配置的修改报错问题
2025-12-27 17:29:08 +08:00
YunaiV
304f2442eb
feat：【antd/ele】【infra】统一 cron-tab 的封装
2025-12-27 17:13:40 +08:00
YunaiV
9ef218f930
refactor: 【crm】【antd/ele】提取图表配置生成函数，统一 legend/grid/tooltip 处理，优化饼图面板生成
2025-12-27 17:02:11 +08:00
YunaiV
5a5d2f17da
feat：【bpm】【antd/ele】业务表单，支持重新发起流程
2025-12-27 12:49:14 +08:00
xingyu4j
77cd814c99
Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev
2025-12-26 14:00:55 +08:00
xingyu4j
af3fe53ec8
fix: type error
2025-12-22 17:50:06 +08:00
