public/ruoyi-plus-vben5
1
0
Fork 0
mirror of https://gitee.com/dapppp/ruoyi-plus-vben5.git synced 2026-03-08 07:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,627 Commits 5 Branches 24 Tags
880a768f342fa7cbdffc03dc925d8ca12df5c3ec
Commit Graph

417 Commits

Author SHA1 Message Date
dap
880a768f34 merge 2025-11-30 01:57:43 +08:00
dap
e595a9712f merge 2025-11-30 01:57:18 +08:00
Jin Mao
6f39e9136e Merge branch 'main' into feature/antd上传组件支持调用Image组件查看图片 2025-11-24 21:59:34 +08:00
Jin Mao
8b0f138100 Merge branch 'main' into deps 2025-11-24 08:23:02 +08:00
Rex
5fcfabf1d4 fix: 修复菜单管理中标题栏样式异常问题 (#6934) 2025-11-24 07:00:08 +08:00
yuan.ji
1d77b018bb feat(function): add antd上传组件支持调用Image组件查看图片 2025-11-21 17:33:59 +08:00
dap
13f5e949a9 Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-11-18 16:24:31 +08:00
xingyu4j
bed52983a0 fix: lint 2025-11-17 12:15:14 +08:00
Jin Mao
f59e33682c Merge branch 'main' into main 2025-11-12 04:27:57 +08:00
shixi
0bbb20fee0 feat: sport notification link 2025-11-12 00:55:24 +08:00
xingyu4j
0319604863 feat: playground add profile 2025-11-10 18:00:50 +08:00
Jin Mao
a4aa133db5 Merge branch 'main' into tdesign 2025-11-09 12:04:30 +08:00
Copilot
fef1e35c54 fix: prevent JSONBigInt parsing error on non-string data (#6891) 
* Initial plan

* Fix json-bigint serialization error when data is not a string

Co-authored-by: likui628 <90845831+likui628@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: likui628 <90845831+likui628@users.noreply.github.com>
 2025-11-09 11:49:38 +08:00
dap
5e4cc5729b Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-11-07 14:39:42 +08:00
Li Kui
1af11240a6 chore: add tdesign logo 2025-11-06 22:37:55 +08:00
Li Kui
3e8e8690e3 chore: Merge branch 'main' into tdesign 2025-11-06 17:49:51 +08:00
Li Kui
be843300be chore: update demo routes 2025-11-06 17:44:34 +08:00
Copilot
1e09fa4642 feat: migrate from Radix Vue to Reka UI (#6870) 
* Initial plan

* Update dependencies and imports from radix-vue to reka-ui

Co-authored-by: likui628 <90845831+likui628@users.noreply.github.com>

* Fix type errors after reka-ui migration

Co-authored-by: likui628 <90845831+likui628@users.noreply.github.com>

* Run formatter to fix code style

Co-authored-by: likui628 <90845831+likui628@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: likui628 <90845831+likui628@users.noreply.github.com>
 2025-11-06 16:22:24 +08:00
dap
8c42c8cc70 merge 2025-11-06 09:38:42 +08:00
Jin Mao
ac6de0324c Merge branch 'fork/ming4762/timezone-20251020' 2025-10-30 00:42:05 +08:00
zhongming4762
f46ae023ba feat: increase support for multiple time zones 
* 优化实现方法
 2025-10-29 20:14:48 +08:00
zhongming4762
3eed51fd3e feat: increase support for multiple time zones 
* 优化实现方法
 2025-10-29 20:03:21 +08:00
zhongming4762
4d713db546 feat: increase support for multiple time zones 
* 优化实现方法
 2025-10-29 19:47:10 +08:00
zoumingjun
38f91da5af fix: 优化双列布局组件点击展开左侧按钮位置不居中问题 2025-10-18 21:22:58 +08:00
zoumingjun
8edea3aee5 fix: 调整zh-CN/system.json中<"title": "系统管理">配置位置，保持与en-US/system.json中位置一致 2025-10-18 21:20:54 +08:00
dap
80328e7565 chore: merge 2025-10-09 20:53:21 +08:00
zouawen
2ce161e585 feat: 1、新增水印文案自定义功能；2、input-item输入框组件新增清除功能(可用于快捷清除水印文案)；3、偏好设置、主题切换、语言选择、是否全屏按钮新增动画效果 (#6800) 
* feature: 新增水印文案自定义功能；

* chore: 偏好设置、主题切换、语言选择、是否全屏按钮新增动画效果
 2025-10-07 06:15:41 +08:00
zouawen
33306a5aff chore: 更换其他登录方式图标为彩色图标，新增其他登录方式tooltip文字提示 (#6799) 2025-10-06 06:56:54 +08:00
lw567
6e03de5011 fix: watermark create error #6788 (#6789) 
Co-authored-by: liwei567 <liwei567@example.com>
 2025-09-30 19:53:09 +08:00
dap
f87a38a2f0 Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-09-19 11:58:53 +08:00
zouawen
39820c783c fix: 
1、VbenTree新增是否全选、展开折叠功能；
2、解决当点击子节点label文字区域，而非checkbox时，关联父组件不能选中问题；
3、优化子节点选中时关联父节点选中功能：删除VbenTree中processParentSelection方法，改为在onSelect中实现，原因：processParentSelection在每次模型值更新时都会被调用，且计算复杂度为O(n^2)，onSelect只在交互时触发，复杂度为O(n)；
4、新增中间层tree组件，处理无数据时显示场景（显示图标Inbox和国际化comom.noData文本）；
5、为防止父组件传值子组件boolean类型默认false问题，新增treePropsDefaults方法，为TreeProps赋默认值，Tree组件和VbenTree组件统一使用；
6、优化VbenTree组件整体样式（优化padding、margin、gap值，优化type为button时outline左右空白区域不对称问题），优化内部header、footer插槽样式。
 2025-09-11 16:41:42 +08:00
dap
2d89492790 Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-08-21 19:20:46 +08:00
Ken Hai
ffaf85c8f3 fix: 修复角色修改时VbenTree组件没有回显选中 (#6662) 
* fix: 修复角色修改时VbenTree组件没有回显选中

* chore: use nextTick

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fix: merge

* chore: 更新

---------

Co-authored-by: haiyinlong <haiyinlong@uhigame.com>
Co-authored-by: Jin Mao <50581550+jinmao88@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
 2025-08-21 15:30:58 +08:00
dap
a4a7f7d096 Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-08-18 09:40:54 +08:00
ming4762
1e6417f95b feat: vBenForm add layout: inline (#6644) 2025-08-16 22:41:08 +08:00
vben
e147a9d2fd chore: release 5.5.9 2025-08-16 22:16:02 +08:00
dap
46e642a2ce Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-08-08 09:27:26 +08:00
xueyang
9fc594434f perf: 优化useVbenForm样式 (#6611) 
* perf(style): 优化useVbenForm垂直布局 actions 样式

* perf(style): 优化useVbenForm actions 布局样式

- 操作按钮组显示位置
```
actionPosition?: 'center' | 'left' | 'right';
```
- 操作按钮组的样式
```
actionType?: 'block' | 'inline'
inline: 行类显示，block: 新一行单独显示
```

* perf: 优化useVbenForm actions 布局样式

删除 actionType
增加 actionLayout
- actionLayout?: 'inline' | 'newLine' | 'rowEnd';
- newLine: 在新行显示。rowEnd: 在行内显示，靠右对齐（默认）。inline: 使用grid默认样式
- 删除无用代码 queryFormStyle

* perf: 优化useVbenForm使用案例

* perf: 优化form组件样式

去掉padding，改为gap

* docs: update vben-form.md

* fix: 修复FormMessage位置

* perf: Avoid direct mutation of props object.

-  props.actionLayout = props.actionLayout || 'rowEnd';
-  props.actionPosition = props.actionPosition || 'right';
+  const actionLayout = props.actionLayout || 'rowEnd';
+  const actionPosition = props.actionPosition || 'right';

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fix: 修复 wrapperClass 权重

* fix: 全局搜索结果不匹配 #6603

* fix: 避免FormMessage溢出

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
 2025-08-07 23:48:34 +08:00
dap
d22e494551 Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-07-28 20:06:10 +08:00
zhongming4762
06ffdf164a feat: add dingding login 2025-07-25 22:02:55 +08:00
aonoa
fad0b49841 fix: adding roles does not automatically refresh (#6548) 
* fix: adding roles does not automatically refresh

* style: fix code style err
 2025-07-25 21:35:57 +08:00
dap
c762f8370b Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-07-20 16:59:49 +08:00
vben
1575619d53 chore: release v5.5.8 2025-07-19 22:19:50 +08:00
Jin Mao
d5a36a167d fix: fix vxeTable commit proxy (#6536) 
* fix: 修正use-vxe-grid中的代理配置提交类型

* chore: change config
 2025-07-19 16:07:15 +08:00
dap
72e1115330 Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-07-16 19:22:15 +08:00
Jin Mao
1bc5d2986b chore: update-vxe-table (#6516) 
* chore: update vxe-pc-ui,vxe-table

* fix(ui): 修复代理配置初始化方法名错误

* fix(ui): 修改远程表格刷新配置

* chroe: update vxeTable

更新到最新
 2025-07-16 19:15:39 +08:00
panda7
d4786f3f75 Merge branch 'main' into feature/scroll_to_the_error_field 2025-07-06 21:19:52 +08:00
sqchen
243f3a201d feat: add scrollToFirstError to the form component 2025-07-05 00:19:12 +08:00
陈蔚然
2f7de243f6 Merge branch 'vbenjs:main' into slider-translate-captcha 2025-07-04 10:28:40 +08:00
dap
1e4824fe27 Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-07-03 20:24:50 +08:00