Commit Graph

4772 Commits (9c68eb18c11717253a9d6cbeff7b0caefd638876)

Author SHA1 Message Date
YunaiV 9c68eb18c1 fix(web-antdv-next): 修复商城组件类型与 WMS 枚举导入
- 修复 web-antdv-next 商城 Banner、活动选择、DIY 装修等组件类型问题
- 收窄热区、魔方、导航栏、公告栏等装修组件配置类型
- 修复 web-antd WMS 首页单据统计枚举从 vue 错误导入的问题
- 修复商城统计时间参数、客服消息类型导入等类型错误
- 对齐 web-antd、web-ele、web-antdv-next 的商城促销组件类型定义
- 修复 DIY 装修、组合活动、积分活动、运费模板等组件兼容问题
2026-06-07 00:52:07 +08:00
YunaiV f2a5bc522d fix(mall): 修复多端商城模块类型与组件兼容问题
- 修复商城统计时间参数、客服消息类型导入等类型错误
- 对齐 web-antd、web-ele、web-antdv-next 的商城促销组件类型定义
- 修复 DIY 装修、组合活动、积分活动、运费模板等组件兼容问题
2026-06-07 00:31:26 +08:00
YunaiV f8fb3d881d fix(mall): 修复首页账户充值金额单位显示错误
- 首页运营数据的账户充值金额从分转换为元后展示
- 同步修复 Vue3 与 Vben 的 antd、ele、antdv-next 三端
2026-06-06 23:40:11 +08:00
YunaiV 9d2446b6ff fix(crm): 修复回款新增弹窗预填数据被清空
- 将回款表单下游字段清空逻辑从 schema 依赖刷新移到用户选择事件
- 修复从回款计划新增回款时合同、期数、金额等预填数据被清空的问题
- 兼容回款管理、回款计划、客户/合同详情等新增回款入口
- 同步处理 web-antd、web-ele、web-antdv-next
2026-06-06 22:26:20 +08:00
YunaiV 651a525187 fix(erp): 修复单据选择弹窗宽高与嵌套关闭问题
- 调整 ERP 单据选择弹窗宽度为 80%
- 固定选择弹窗 Grid 高度,避免表格被压扁
- 禁用主表单弹窗遮罩点击关闭,避免子弹窗操作误关闭主弹窗
- 同步处理 web-antd、web-ele、web-antdv-next
2026-06-06 21:40:45 +08:00
xingyu da85dcf87c
!357 feat(web-antdv-next): 同步 MES/WMS/IoT 模块并对齐上游 Vben 框架
Merge pull request !357 from XuZhiqiang/feat-antdv-next
2026-06-06 03:43:07 +00:00
XuZhiqiang 1123f00795 fix(web-antdv-next): adapt notification and open change APIs 2026-06-06 11:17:21 +08:00
XuZhiqiang 0efde47539 chore(web-antdv-next): sync MES formatting 2026-06-06 07:37:45 +08:00
XuZhiqiang 569ded85f9 fix(web-antdv-next): sync dashboard workspace spacing 2026-06-06 07:36:56 +08:00
XuZhiqiang e046050ef0 fix(web-antdv-next): sync BPM timeout duration format 2026-06-06 07:35:49 +08:00
XuZhiqiang 615749daf1 chore: 保证和上游Vben-admin的框架依赖一致性 2026-06-06 06:53:11 +08:00
XuZhiqiang db3081ee62 chore: 应该和vben-admin版本保持一致 2026-06-06 06:35:10 +08:00
xingyu4j 58d4be5893 fix: type 2026-06-05 19:03:12 +08:00
xingyu4j 0483d5cd8b Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin 2026-06-05 19:03:00 +08:00
xingyu a0735e1bba
!354 fix: [bpm] OA 请假流程重新发起问题修复
Merge pull request !354 from Jason/master
2026-06-05 10:22:47 +00:00
jason 705aa2fa7b fix: [bpm] web-ele 审批等按钮点击没反应问题修复 2026-06-05 10:07:09 +08:00
jason 1b5a06f3a2 fix: [bpm] web-ele 修复审批等按钮不能操作等问题 2026-06-05 08:11:00 +08:00
afe1 748b182e44
fix: workflow (#8013)
* fix: catelog

* fix: system

* chore: sync upstream changes

* feat:  component and workflow error
2026-06-05 05:13:08 +08:00
XuZhiqiang cf0f7cedca fix(web-antdv-next): sync dept delete confirmation state 2026-06-04 22:57:28 +08:00
XuZhiqiang 70aed10752 fix(@vben/web-antdv-next): 在web-antdv-next,表单适配器只有TextArea,没有Textarea 2026-06-04 16:42:46 +08:00
XuZhiqiang 03f167b7d0 fix(web-antdv-next): sync remaining upstream fixes 2026-06-04 16:22:52 +08:00
XuZhiqiang f6a8c6e652 fix(web-antdv-next): sync shared UI fixes 2026-06-04 16:20:42 +08:00
XuZhiqiang 09970d89a4 feat(web-antdv-next): sync IoT module 2026-06-04 16:17:45 +08:00
XuZhiqiang 6315055c08 feat(web-antdv-next): migrate MES module 2026-06-04 16:08:03 +08:00
XuZhiqiang 82b22173c0 feat(web-antdv-next): migrate WMS module 2026-06-04 15:57:43 +08:00
XuZhiqiang e6e4d8ce1e fix(@vben/web-antdv-next): 修复IOT模块若干导入异常问题 2026-06-04 15:28:56 +08:00
XuZhiqiang bac2f92d1a chore(@vben/web-antdv-next): 升级antdv-next版本为1.3.3 2026-06-04 15:27:45 +08:00
jason a357dbf940 fix: [bpm] OA 请假流程重新发起问题修复 2026-06-04 14:11:30 +08:00
金毛88 6544340d80 Merge branch 'fork/HaroldZhangCode91/feature/fix_freeze_scrollbar_of_modal' 2026-06-04 13:54:21 +08:00
jason 8146ebde8c Merge remote-tracking branch 'yudao/master' 2026-06-04 12:42:27 +08:00
jason b91268923f fix: [bpm] 超时时间天的格式问题修复 2026-06-04 12:40:51 +08:00
jason 4a597c0806 fix: 发起人节点显示审批意见 2026-06-04 12:37:51 +08:00
Harold Zhang 6b7cb7b1fc feat: fixed the regression of changing Menu to MenuUI 2026-06-04 11:46:53 +08:00
Harold Zhang d90d45a128 fix: fixed modal freeze issue 2026-06-04 11:19:38 +08:00
Harold Zhang 66077b3bcf Merge branch 'main' into feature/fix_freeze_scrollbar_of_modal 2026-06-03 18:07:37 +08:00
Harold Zhang 0328594747 feat: fixed the overlay layer can not work with reka-ui 2026-06-03 17:52:41 +08:00
金毛88 790e114d41 chore: 固定vite 8.0.10,避免编译后异常 2026-06-03 17:32:13 +08:00
Harold Zhang cc60ca9592 feat: fixed the defects the scrollbar disapear when modal close 2026-06-03 16:10:17 +08:00
HaroldZhangCode91 79707a2ebd
feat: fixed regression of modal for element plus (#7999) 2026-06-03 13:27:12 +08:00
金毛88 0eb72ca4fd feat: add useTDesignDesignTokens 2026-06-03 13:25:23 +08:00
金毛88 7fd4b1de04 Merge branch 'fork/SaleriHQ/feat/form-field-array' 2026-06-03 13:22:21 +08:00
xingyu 1f8e9f6bb0
update README.md.
Signed-off-by: xingyu <xingyu4j@vip.qq.com>
2026-06-02 00:55:21 +00:00
YunaiV 044ba2382d feat(im):增加 im 的功能说明 2026-06-01 08:17:48 +08:00
Saleri 9ffd42f013 chore: add changeset for form field array 2026-05-31 23:06:00 +08:00
芋道源码 72aac700ff
!353 fix(bpm): clean up BPMN viewer resize observer
Merge pull request !353 from 芋道源码/dev
2026-05-31 13:50:10 +00:00
芋道源码 e943f4fcfd
!352 MES 所有功能的迁移
Merge pull request !352 from 芋道源码/migration
2026-05-31 11:33:31 +00:00
YunaiV 840f4efbbe fix(bpm): 完善流程实例打印字段展示
- Vben5 web-antd/web-ele/web-antdv-next 同步支持更多表单字段打印
- Vue3 + Element Plus 流程打印补齐字典、用户、部门、省市区、文件、图片、开关、富文本等字段展示
- 普通字段和流程记录改为安全文本渲染,保留富文本 HTML 展示
- 打印时间改为每次打开弹窗时刷新
- web-ele 补充 ElButton 显式导入,避免运行时组件解析风险
2026-05-31 18:25:33 +08:00
YunaiV 64eea34a63 fix(bpm): 完善流程实例打印字段展示
- Vben5 web-antd/web-ele/web-antdv-next 同步支持更多表单字段打印
- Vue3 + Element Plus 流程打印补齐字典、用户、部门、省市区、文件、图片、开关、富文本等字段展示
- 普通字段和流程记录改为安全文本渲染,保留富文本 HTML 展示
- 打印时间改为每次打开弹窗时刷新
- web-ele 补充 ElButton 显式导入,避免运行时组件解析风险
2026-05-31 18:22:15 +08:00
YunaiV 54e5036171 fix(form-create): 修复字典选择器 modelValue 回显兼容
- Vben5 web-ele 使用默认 modelValue 绑定,修正相关注释避免误用 model-value
- Vben5 web-antd 保留 value 绑定并明确组件库差异
- Vue3 DictSelect 显式接收 modelValue 并派发 update:modelValue,避免选择值更新后回显异常
2026-05-31 17:16:17 +08:00
YunaiV 1896c60f53 feat(mes): add MES production task issue API and improve combination record validation 2026-05-31 16:48:00 +08:00