yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,290 Commits
4 Branches
20 Tags
50 MiB
Commit Graph

794 Commits (a653e428f38f815087b1c45368bcd456a2370a69)

Author SHA1 Message Date
Jin Mao bb5d75bc7e
fix: 修复表单展开无效 (#7148) 
- 修正模板中 ref 属性的引用名称
 2026-01-27 11:35:50 +08:00
ming4762 528395e2c3
perf: optimizing hidden fields cannot trigger `dependencies` (#7142) 2026-01-26 16:12:26 +08:00
橙子 6e8315ab40
fix: arguments order update (#7132) 
Co-authored-by: Jin Mao <50581550+jinmao88@users.noreply.github.com>
 2026-01-26 16:11:37 +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
Jin Mao 6aca9a9c99 test(dom): 更新元素可见区域计算的测试用例 
- 修正了getElementVisibleRect函数的期望值断言
- 将bottom值从800更正为0以匹配实际计算结果
- 将left值从1100更正为0以匹配实际计算结果
- 将right值从1000更正为0以匹配实际计算结果
- 将top值从900更正为0以匹配实际计算结果
 2026-01-25 14:22:22 +08:00
xingyu4j fa195fde8e fix: lint 2026-01-23 14:48:21 +08:00
Jin Mao b9224fc379
Merge branch 'main' into fix 2026-01-23 13:48:54 +08:00
橙子 44f8aed06d
fix: timer not need reactivity (#7128) 2026-01-23 13:16:09 +08:00
yuhengshen 74381aa8c1
fix: 嵌套弹窗，错误 merge options (#7126) 2026-01-22 20:07:13 +08:00
橙子 203ee9b623
fix(@vben-core/shared): element outside viewport, the element visible rect each prop expect 0 (#7120) 
* fix(@vben-core/shared): element outside viewport

* fix(@vben-core/shared): element outside viewport
 2026-01-22 11:37:01 +08:00
xingyu 9b09ba4483
Merge branch 'main' into fix 2026-01-19 10:54:43 +08:00
橙子 686c3f9208
docs(@vben-core/preferences): update comments (#7107) 2026-01-14 19:36:45 +08:00
ppxb f4a4ced88d
fix: header auto mode issue (#7096) 2026-01-12 21:40:26 +08:00
ppxb 51bca25345
fix(lint): pnpm format lint warning (#7080) 2026-01-10 14:06:03 +08:00
xingyu 49b884c0b1
Merge branch 'main' into fix 2026-01-06 13:50:26 +08:00
ppxb 24d20ca9ee
refactor: preference manager and export (#7068) 
* fix: preferences drawer outline z-index

* refactor: preferencesManager and exports
 2026-01-06 12:42:32 +08:00
xingyu4j ce7b7b910a Merge branch 'main' of https://github.com/xingyu4j/vue-vben-admin into fix 2026-01-04 10:56:14 +08:00
ppxb 7d2bc2e885
fix: dropdown raido menu type error (#7062) 
* fix: dropdown raido menu type

* chore: format code
 2026-01-02 14:25:19 +08:00
luoqiz 89b237f6b4
feat: 添加上下文菜单演示，添加菜单项隐藏性 (#7057) 
Co-authored-by: luoqiz <851092732@qq.com>
 2026-01-02 14:22:19 +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
xueyitt ccf70a1b76
feat: 修正菜单排序在二级菜单不生效问题 (#7007) 
* treeUtil增加对树形结构数据进行递归排序

* 菜单sort排序各级菜单均生效
 2025-12-22 19:57:21 +08:00
xingyu4j af3fe53ec8 fix: type error 2025-12-22 17:50:06 +08:00
xingyu4j 7bf7c0bb06 chore: remove unused deps 2025-12-03 16:26:58 +08:00
xingyu4j 6753834054 fix: lint 2025-12-03 15:37:33 +08:00
xingyu4j e44f9a0aca Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-11-24 11:47:31 +08:00
milletpeak 1f1ba16ead
Merge branch 'main' into milletpeak-fontsize 2025-11-24 08:55:54 +08:00
panda7 b6edc5f574
fix: centered 为 true 时设置 draggable 无法拖拽 (#6948) 
Co-authored-by: sqchen <chenshiqi@sshlx.com>
 2025-11-24 08:38:10 +08:00
Jin Mao 8b0f138100
Merge branch 'main' into deps 2025-11-24 08:23:02 +08:00
aonoa b17fec41b0
fix: tree component cannot set a value (#6941) 
Signed-off-by: aonoa <1991849113@qq.com>
 2025-11-24 07:56:16 +08:00
米山 aaf0274fe9 feat: add menu font size variable and update related components 
- Introduced a new CSS variable `--menu-font-size` calculated from the base font size.
- Updated `PreferenceManager` to trigger CSS variable updates when `fontSize` is modified.
- Adjusted `updateCSSVariables` to set the new `--menu-font-size` based on the theme's font size.
- Ensured that the menu components utilize the updated font size with `!important` to maintain styling consistency.
 2025-11-19 10:51:10 +08:00
米山 c142af482b fix: update snapshot for defaultPreferences immutability test to reflect fontSize change 
- Adjusted the snapshot to ensure consistency with the updated defaultPreferences configuration, specifically retaining the fontSize property.
 2025-11-19 10:19:16 +08:00
米山 cd7c11c7d0 fix: run 'pnpm format' update various components and improve layout structure 
- Updated demo-preview and preview-group components for better error handling and layout.
- Enhanced drawer and modal components for improved auto-height functionality.
- Refactored layout components including header, footer, sidebar, and tabbar for better responsiveness and usability.
- Adjusted tooltip and help tooltip components for better user guidance.
- Fixed issues in various UI components to ensure consistent styling and functionality across the application.
 2025-11-19 10:14:04 +08:00
milletpeak fb8f36eeec
Merge branch 'main' into milletpeak-fontsize 2025-11-19 09:41:55 +08:00
YunaiV 37e6775282 feat：【ele】【crm】business 的迁移部分（list、form、detail） 2025-11-18 22:17:29 +08:00
xingyu4j 60854e59f1 feat: use vben/utils upload 2025-11-18 17:33:39 +08:00
xingyu4j ec23e8acf6 feat: import form vben/utils 2025-11-18 17:29:52 +08:00
xingyu4j 114114fc32 feat: 统一使用 utils 2025-11-18 17:22:12 +08:00
xingyu4j 9a4f0f6ab1 feat: Consider multi-line formatting for readability 2025-11-17 14:24:43 +08:00
xingyu4j bed52983a0 fix: lint 2025-11-17 12:15:14 +08:00
YunaiV a35485e618 feat：【antd】【ai】chat “附件列表功能”的迁移 2025-11-15 21:25:14 +08:00
Jin Mao f09aace765 fix: 更新依赖后的表格显示问题 2025-11-14 21:44:32 +08:00
Jin Mao c3a7562e2c
Merge branch 'main' into milletpeak-fontsize 2025-11-13 17:01:42 +08:00
Jin Mao f918dc24c6 chore(@vben/utils): 移除冗余的 lodash 依赖 2025-11-13 07:47:48 +08:00
Jin Mao e898993fe8 chore(@vben/utils): 替换 lodash 工具函数为 es-toolkit 实现 2025-11-13 07:45:10 +08:00
Jin Mao 5cafcb4a01 refactor(shared): 替换 lodash 工具函数为 es-toolkit 兼容版本 
- 将 get 和 isEqual 方法从 lodash 替换为 es-toolkit/compat 导出
- 更新 package.json 添加 es-toolkit 依赖
- 注释掉原有的 lodash.get 和 lodash.isequal 导出语句- 锁定 es-toolkit 版本至1.41.0 并更新相关依赖配置
 2025-11-13 07:28:52 +08:00
米山 0bc7169698 feat: add global font size adjustment 2025-11-12 17:39:07 +08:00
米山 24b6e7a835 feat: add global font size adjustment 2025-11-12 17:38:41 +08:00
panda7 573637222d
feat: add form handleCollapsedChange event (#6893) 
* feat: add form handleCollapsedChange event

* fix: ts lint

* fix: ts error

---------

Co-authored-by: sqchen <chenshiqi@sshlx.com>
 2025-11-12 02:03:12 +08:00
xingyu4j a3356a0a5e Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-11-10 09:16:13 +08:00
Jin Mao a4aa133db5
Merge branch 'main' into tdesign 2025-11-09 12:04:30 +08:00
Utopia 6bbe523f6f
chore: 增强 util-formatDate ts 类型提示 (#6886) 
* feat: 为 auth layout 添加 slot: logo, 提升组件的灵活性和可复用性

* feat: 增强 util-formatDate ts 类型提示
 2025-11-09 12:00:49 +08:00
xingyu 20410aeb03
fix: updating Tailwind CSS variables from --radix-* to --reka-* (#6890) 
* fix: radix => reka

* chore: add reka cspell

* fix: Composition url
 2025-11-09 11:49:01 +08:00
xingyu4j d7e585641f fix: use tabs warn 2025-11-07 15:13:34 +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
xingyu4j 44675a847c Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-11-06 16:50:09 +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
Copilot c7c39047de
feat: add theme-aware logo support via optional sourceDark configuration (#6866) 
* Initial plan

* Initial exploration and setup

Co-authored-by: aonoa <32682251+aonoa@users.noreply.github.com>

* Add support for separate light and dark theme logos

Co-authored-by: aonoa <32682251+aonoa@users.noreply.github.com>

* Update documentation with dark theme logo configuration

Co-authored-by: aonoa <32682251+aonoa@users.noreply.github.com>

* feat: Add theme-aware logo support for authentication/login page

Co-authored-by: aonoa <32682251+aonoa@users.noreply.github.com>

* revert: .npmrc

Signed-off-by: aonoa <1991849113@qq.com>

---------

Signed-off-by: aonoa <1991849113@qq.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: aonoa <32682251+aonoa@users.noreply.github.com>
Co-authored-by: Li Kui <90845831+likui628@users.noreply.github.com>
Co-authored-by: aonoa <1991849113@qq.com>
 2025-11-03 13:07:36 +08:00
Jin Mao f8a7a0a9a2 chore: lint 2025-10-31 09:11:40 +08:00
zhongming4762 639ea96bb9 fix: resolve the issue of logout failure caused by the timezone store 2025-10-30 17:12:45 +08:00
zhongming4762 565be77e96 fix: resolve the issue of logout failure caused by the timezone store 2025-10-30 17:01:49 +08:00
jawe 0ef91c1cad feat(@vben/web-antd):迁移客服模块 2025-10-30 15:39:08 +08:00
Jin Mao ac6de0324c Merge branch 'fork/ming4762/timezone-20251020' 2025-10-30 00:42:05 +08:00
zhongming4762 4d713db546 feat: increase support for multiple time zones 
* 优化实现方法
 2025-10-29 19:47:10 +08:00
Jin Mao cfbce0d737 chore: fix lint 2025-10-26 15:27:28 +08:00
Jin Mao 6b6cdef42d chore: 一些调整 2025-10-26 15:00:47 +08:00
YunaiV cbb65ffff3 feat：【antd】【bpm】processInstance/create 代码评审 2025-10-23 23:14:01 +08:00
zhongming4762 b029f77b6a feat: increase support for multiple time zones 2025-10-22 20:18:25 +08:00
zhongming4762 0a8339a405 feat: increase support for multiple time zones 2025-10-22 19:52:01 +08:00
xingyu4j 80545f973a fix: lint 2025-10-21 17:45:43 +08:00
puhui999 5a4ecd4ad7
Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vben into dev-spu 
Signed-off-by: puhui999 <puhui999@163.com>
 2025-10-21 08:53:26 +00:00
puhui999 6bbf878171 feat：【mall 商城】商品发布 - 库存价格【antd】100%: 迁移完成 2025-10-21 16:39:54 +08:00
xingyu4j e5d69952cb fix: 统一代码格式 2025-10-21 14:34:05 +08:00
YunaiV 3aee960954 feat：【mall 商城】交易统计、商品统计【antd】20%：product-summary-card.vue 完善 2025-10-20 09:29:00 +08:00
YunaiV b5bc8d24b9 feat：【mall 商城】交易统计、商品统计【antd】15%：product-rank-card.vue 完善 2025-10-19 22:14:49 +08:00
YunaiV 1628ab8cb5 feat：【mall 商城】商城首页的迁移【antd】45%：member-funnel-card.vue 修复缺陷 2025-10-19 15:37:48 +08:00
zoumingjun 08b6e7713e fix: 修复对话框modal组件方法名错误 2025-10-18 21:13:34 +08:00
zoumingjun 6a89814b83 chore: 优化侧边栏展开折叠图标 2025-10-18 20:59:14 +08:00
zoumingjun 52d3aa9315 fix: 优化Checkbox组件hover样式,Input组件placeholder样式,TabsList组件圆角样式 2025-10-18 20:58:48 +08:00
zoumingjun 32051e9ca0 fix: 优化左侧和右侧认证面板动画效果 2025-10-18 20:52:27 +08:00
xingyu4j c19097ec0c Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-10-14 10:06:36 +08:00
zouawen 59097e2466
chore: 新增是否开启首选项导航栏（外观、布局、快捷键、通用）吸顶效果，调整部分样式 (#6804) 2025-10-14 06:55:11 +08:00
xingyu4j 99dd3350f4 Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-10-09 11:19:32 +08:00
zouawen 2ce161e585
feat: 1、新增水印文案自定义功能；2、input-item输入框组件新增清除功能(可用于快捷清除水印文案)；3、偏好设置、主题切换、语言选择、是否全屏按钮新增动画效果 (#6800) 
* feature: 新增水印文案自定义功能；

* chore: 偏好设置、主题切换、语言选择、是否全屏按钮新增动画效果
 2025-10-07 06:15:41 +08:00
YunaiV 95295d5b93 feat：【框架】form-api 增加 disabled 控制的能力 2025-10-03 20:15:31 +08:00
shierd 42e3de9e2c
fix: 修复设置表单值时合并子对象的错误 (#6780) 
Co-authored-by: shier <shier@shierd.com>
 2025-09-30 05:10:39 +08:00
xingyu4j 0cfdbe75e4 Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-09-24 14:30:35 +08:00
Cup_Of_Bread 81bb7456f8
fix: 修复注解错误 (#6763) 2025-09-23 23:49:25 +08:00
pangyajun123 26f8d2aa30
perf: 表单需要通过权限控制是否需要展示，dependencies.if 这种方式需要别triggerFields触发字段，不能满足要求 (#6756) 2025-09-23 23:48:27 +08:00
boisduval a8b848d367
fix: 解决搜索表单中arrayToStringFields属性无法在搜索时生效的问题 (#6591) 
- 合并handleArrayToStringFields与handleStringToArrayFields为handleMultiFields
- 在handleMultiFields判断arrayToString或stringToArray
- 删除两个方法在其他地方的引用 统一为在handleRangeTimeValue内调用handleMultiFields实现数据转换

Co-authored-by: 宛晴 <wanqing@mengtaigroup.com>
 2025-09-23 23:45:26 +08:00
xingyu4j 7689aff790 Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-09-18 17:58:14 +08:00
zouawen a4b8f8f795 fix: 节点选中时过滤父节点禁用状态 2025-09-12 17:31:42 +08:00
zouawen dfa2ac3435 fix: 全选时过滤disabled的节点 2025-09-11 18:16:10 +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
xingyu4j 7f3e2a90ae fix: captcha aes encrypt 2025-09-03 18:04:35 +08:00
xingyu4j f0f094a28d chore: fix missing dependencies 2025-09-03 17:10:12 +08:00
xingyu4j 25468bece5 Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-09-03 14:58:59 +08:00
谦元吉 c57592f3a6
fix(@vben-core/shadcn-ui): 修复VbenPinInput组件在点击获取验证码和回车同时进行时会重复触发计时器的问题 (#6705) 2025-09-02 16:56:46 +08:00
xingyu4j b55c291af1 Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-08-26 16:57:32 +08:00
Ken Hai b0d7b177be
fix: 角色管理，授权的树形组件，取消勾选叶子节点，父级节点状态错误 (#6680) 
Co-authored-by: haiyinlong <haiyinlong@uhigame.com>
 2025-08-25 21:32:01 +08:00
LinaBell 566d3bdf7c
fix: appendToMain warning (#6684) 2025-08-25 21:25:29 +08:00
LinaBell cf6c4c9aae
fix: cannot read properties of null (reading 'nextSibling') (#6667) 2025-08-21 22:26:10 +08:00
panda7 2cc78f925f
fix: the bug in the lock method of the vbenModal component (#6648) 2025-08-21 15:17:55 +08:00
ming4762 93f0eea4e7
fix: fix the issue of excessive line spacing in vbenForm (#6653) 
* gap-2和 pb-4/2 重叠导致间距过宽，gap-x只保留列间距
 2025-08-21 12:41:04 +08:00
xingyu4j 8fdbbfad22 Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-08-19 17:41:16 +08:00
xingyu4j 1d5bfaac5a Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev 2025-08-19 17:34:00 +08:00
Svend 3ad433a50b
fix: 修复在 hash 路由模式下无法在新窗口打开路由的问题 (#6652) 
此问题是由于 PR #6583 中新增的 `resolveHref` 函数导致的。其在 hash 路由模式下，得到的 URL 会包含 #/ 前缀。在经过 openRouteInNewWindow 的逻辑后就会出现两次 /# 前缀
 2025-08-19 16:47:45 +08:00
ming4762 8ac2db5b7c
fix: fix the issue of `VbenForm` `compact` reactive failure (#6654) 2025-08-19 16:46:14 +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
芋道源码 43c8ce2d7d
!194 refactor: (web-ele)优化移动端组件代码结构 
Merge pull request !194 from 痴货/master
 2025-08-16 13:12:10 +00:00
YunaiV 4be6d26375 feat：【framework 框架】增加 api 加解密能力（优化代码） 2025-08-16 17:20:45 +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
lrl 2166ce3e4e feat: 新增多个组件并优化优惠券相关功能 
- 新增 AppLinkSelectDialog 组件，用于选择 APP 链接- 新增 NavigationBarCellProperty组件，用于导航栏单元格属性设置
- 新增 CombinationShowcase 和 CombinationTableSelect 组件，用于拼团活动展示和选择- 优化优惠券相关组件，导出所有优惠券相关组件
- 新增 ComponentContainer 组件，用于包裹和样式化 DIY 组件
 2025-08-04 09:09:39 +08:00
xingyu4j 8b89a32813 Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-07-29 15:21:32 +08:00
zhongming4762 06ffdf164a feat: add dingding login 2025-07-25 22:02:55 +08:00
ming4762 5b75e5e917
perf: perf the control logic of `VbenModal` full screen and header (#6566) 
* resolve the issue of header=false and full screen button display but not operable
 2025-07-25 21:45:45 +08:00
Jin Mao 260e45cd7b
Merge branch 'main' into feat/add-vben-modal-animation 2025-07-25 21:33:11 +08:00
芋道源码 27ad777c2c
!179 fix: 删除china2相关的地图json 
Merge pull request !179 from 痴货/master
 2025-07-23 05:08:38 +00:00
vben 1575619d53 chore: release v5.5.8 2025-07-19 22:19:50 +08:00
xingyu4j 879de80857 Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-07-19 12:24:22 +08:00
panda7 fc9ea347ca
Merge branch 'main' into feat/add-vben-modal-animation 2025-07-18 00:38:54 +08:00
panda7 1a9b0509d5 feat: add animation effects to VbenModal component 2025-07-18 00:15:40 +08:00
lrl d2a2227c4c Merge remote-tracking branch 'remote/master' 
# Conflicts:
#	packages/effects/plugins/src/echarts/use-echarts.ts
 2025-07-17 10:09:54 +08:00
lrl 4620ede9b9 feat: 新增商品统计组件和优化数据处理逻辑 
- 引入商品排行和商品概况组件，展示商品相关统计信息
- 更新商品统计 API，支持时间范围查询和数据格式化
- 优化数据加载逻辑，提升用户体验
- 添加日期范围选择器，增强统计数据的灵活性
 2025-07-17 09:53:04 +08:00
panda7 07b64ad384
feat: add function support for formItemClass prop (#6511) 
* feat: add function support for formItemClass prop

* feat: add try-catch to formItemClass function

* fix: formItemClass function ts error

---------

Co-authored-by: sqchen <chenshiqi@sshlx.com>
 2025-07-17 09:37:39 +08:00
lrl 8c2f982ab6 feat: 更新日期格式化方法，新增多个统计卡片组件 
- 将日期格式化方法从 formatDate 更新为 formatDate2，提升日期处理的灵活性
- 新增会员概览、用户统计、会员终端和交易量趋势等统计卡片组件
- 在商城首页引入新组件以展示关键会员和交易数据
- 优化数据获取逻辑，提升用户体验
 2025-07-16 11:01:27 +08:00
xingyu4j 379e8e755f perf: 将 getUrlValue 放入 vben/utils 下 2025-07-09 17:11:22 +08:00
xingyu4j a950b7b6e7 Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-07-08 14:25:47 +08:00
Jin Mao 3b673ca915
Merge branch 'main' into feature/scroll_to_the_error_field 2025-07-07 08:21:50 +08:00
Jin Mao bbf0287511
chore: fix lint warning (#6487) 2025-07-07 08:21:25 +08:00
sqchen f1051c8773 feat: add scrollToFirstError to the form component 2025-07-05 00:50:53 +08:00
sqchen 243f3a201d feat: add scrollToFirstError to the form component 2025-07-05 00:19:12 +08:00
xue-jn 253b0da7d2
fix: 接口返回子节点为空数组时，还会显示折叠箭头 (#6463) 2025-07-03 18:35:03 +08:00
xingyu4j 77c16cd8e2 Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-06-28 12:04:15 +08:00
CG.gatspy 3230781538
feat: [vben-tree]增加数据disabled (#6343) 
* feat: [vben-tree]增加数据disabled

* Update packages/@core/ui-kit/shadcn-ui/src/ui/tree/tree.vue

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.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-06-27 19:09:30 +08:00
yuhengshen 2f7d1f009d
fix: 全屏状态下弹窗圆角优化 (#6413) 2025-06-24 23:41:54 +08:00
yuhengshen 946f91f387
feat: optimize modal dragging range(#6414) 
* 当弹窗指定了容器时，拖拽将被限制在容器范围内
 2025-06-24 17:05:59 +08:00
xingyu4j f15be6eade feat: format time utils 2025-06-21 19:30:43 +08:00
xingyu4j f4b03b6101 Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-06-20 10:24:12 +08:00
xingyu4j d09b993bc8 feat: 将一些utils放到package/core/base/shared/src/utils 2025-06-16 14:46:59 +08:00
xingyu4j 2885dc43bf feat: download 统一使用@vben/utils 2025-06-15 19:46:09 +08:00
xingyu4j fcce15c0b8 feat: formatNumber 移动到 @vben/utils 2025-06-11 20:15:27 +08:00
Netfan c0962fec18
fix: auto close popup on deactivated (#6368) 
* 修复挂载到内容区域的弹窗和抽屉被意外关闭的问题
 2025-06-11 12:20:52 +08:00
xingyu4j ea31db17ad Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-06-09 10:19:25 +08:00
XiaoHetitu 8ba7bdf2bd
fix(button): 为按钮添加type属性防止表单提交意外触发表单验证机制 (#6340) 
在按钮组件中，按钮元素缺少type="button"属性可能导致在表单中意外提交。添加此属性以确保按钮行为符合预期。

Co-authored-by: yuanwj <ywj6792341@qq.com>
 2025-06-08 17:56:24 +08:00
xingyu4j c7013a030e feat: treeToString 2025-06-07 12:54:50 +08:00
xingyu4j b6075a6611 Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-06-04 13:49:25 +08:00
vben b9aef618fe chore: release 5.5.7 2025-06-04 05:33:06 +08:00
Netfan 4102cc2211
feat: improve vbenCheckButtonGroup (#6329) 
* 按钮组支持单选清除和多选限制最大选项数

* 按钮组支持icon插槽来定制图标
 2025-06-03 23:11:56 +08:00