Commit Graph

1268 Commits (8ab311b46f5465374c5b67626607f9dbd2a13017)

Author SHA1 Message Date
xingyu 8ab311b46f
!86 Merge branch 'dev'
Merge pull request !86 from xingyu/dev
2025-04-30 07:51:30 +00:00
xingyu4j e02b5590dd Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-04-30 15:50:05 +08:00
xingyu4j 6cfe9e0300 fix: warn 2025-04-30 15:35:48 +08:00
xingyu4j 2860faf987 feat: crm business status 2025-04-30 15:29:05 +08:00
xingyu4j 15557250b0 feat: pay refund [未测试] 2025-04-30 14:37:40 +08:00
xingyu4j 70bb20b41f feat: remove demos 2025-04-30 11:41:53 +08:00
xingyu4j 2ccb88af1a feat: add report 2025-04-30 11:39:53 +08:00
xingyu4j 1335616fe7 feat: pay notify [detail 未测试] 2025-04-30 11:25:46 +08:00
xingyu4j 1aefecfcf3 feat: type add period 2025-04-30 11:25:16 +08:00
xingyu4j 2650d8da36 feat: crm backlog 2025-04-29 22:52:15 +08:00
xingyu4j 43bfd8bd39 feat: vxe add formatAmount 2025-04-29 22:33:33 +08:00
xingyu4j 3e6a23db16 fix: formData 2025-04-29 22:33:11 +08:00
xingyu4j 0dacc08c2b perf: 使用 modalApi.unlock() 替换 modalApi.lock(false) 2025-04-29 22:29:03 +08:00
xingyu4j 84584a6fd9 fix: style code 2025-04-29 22:25:19 +08:00
xingyu e2a31c1c2b
!85 fix: 冲突解决
Merge pull request !85 from Jason/dev
2025-04-29 12:33:10 +00:00
Jin Mao 20c15f352f
perf: page componet supports custom height offset for flexible content height … (#6081)
* perf: Page supports custom height offset for flexible content height control.

允许通过 height 属性调整页面内容高度计算。修改了 Page 组件以支持自定义高度偏移量,用于更灵活的内容高度控制。

* chore: typo

* perf(page): replace height with heightOffset for flexible content sizing

The `height` prop was replaced with `heightOffset` to better describe its purpose when used with `autoContentHeight`. The new prop allows custom offset values (in pixels) to adjust content area sizing, with clearer documentation.
2025-04-29 18:15:12 +08:00
jason 3d2f803dd8 fix: 冲突解决 2025-04-29 15:57:14 +08:00
jason ab60f8eb3a Merge remote-tracking branch 'yudao/dev' into dev 2025-04-29 15:45:48 +08:00
jason 16140848b1 feat: 模型列表 50% 2025-04-29 15:30:19 +08:00
xingyu4j 380eaed159 feat: crm api 2025-04-29 14:41:32 +08:00
xingyu4j 5d02400053 docs: doc url 2025-04-29 14:24:26 +08:00
xingyu4j 0defca66e2 fix: code style 2025-04-29 14:23:56 +08:00
Netfan 8aa7dabeff
fix: calculation for collapsing search form is incorrect while initially hidden (#6068)
* 修复当默认隐藏搜索表单时,折叠位置的计算不正确的问题
2025-04-28 23:20:33 +08:00
vben 78c7c1589a chore: update readme.md 2025-04-28 23:11:34 +08:00
Vben dd833ca56b
chore: update dependencies and documentation, optimize build toolchain (#6060)
* chore: update packageManager version to pnpm@10.9.0 for compatibility improvements

* chore: Update dependent versions and configurations to improve compatibility and stability

- Update Node version to 22.1.0
- Updated pnpm version to 10.10.0
- Fixed syntax error in prettier command in lintstagedrc
- Update dependent versions in pnpm-lock.yaml to ensure consistency
- Update format and content in README documents to improve readability

* fix: lint error
2025-04-28 23:08:05 +08:00
vem 681c1dc267
fix: Update existing route index to prevent 404 on user switch (#6003)
Co-authored-by: tars-macmini <vem@qq.com>
2025-04-28 18:19:47 +08:00
Netfan 4545422ee0
fix: lock state will not change overflow style in drawer and modal (#6067)
* Modal和Drawer的锁定状态不再修改overflow样式
2025-04-28 17:02:54 +08:00
xingyu4j 023a6ee29a feat: pay api 2025-04-28 16:27:34 +08:00
xingyu 6794f1a7f7
!84 merge dev
Merge pull request !84 from xingyu/dev
2025-04-28 07:18:29 +00:00
xingyu4j f4fe36e9d0 chore: package lint 2025-04-28 15:06:12 +08:00
xingyu4j c2af4fc83a chore: cspell 2025-04-28 15:05:19 +08:00
xingyu4j afd22aefbb fix: VxeTableGridOptions 从 #/adapter/vxe-table 导入 2025-04-28 15:04:01 +08:00
xingyu4j 3e6d9cb1cd feat: add useVbenForm common config class 2025-04-28 11:42:33 +08:00
xingyu4j bb72b91a1d fix: style code 2025-04-28 10:17:21 +08:00
xingyu4j 50d028f6b8 Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev 2025-04-28 10:06:29 +08:00
Gahotx ca94ca906f
fix: add rounded corners to project and quick nav items (#5296) 2025-04-27 22:50:42 +08:00
Vben 76de450c71
chore: update dependency version for improved stability and compatibility (#6023)
* chore: update dependency version for improved stability and compatibility

* fix: optimize clearPoints function in useCaptchaPoints hook to improve performance

* fix: make several props optional in various components for better flexibility
2025-04-27 22:06:49 +08:00
Trivikram Kamat dd2b1ed580
fix: install corepack from npm (#5905)
* fix: install corepack from npm

* docs: install corepack from npm
2025-04-27 22:03:35 +08:00
ming4762 baec89f896
perf: resolve duplicate component names (#6039) 2025-04-27 22:02:38 +08:00
vben 7c7051a11e chore: release v5.5.5 2025-04-27 21:45:10 +08:00
Netfan aa27a2f7a1
feat: encrypt the privacy data when it is persisted (#6056)
* 对私密数据持久化时执行加密
* 将锁屏密码合并到accessStore中进行加密
2025-04-27 20:59:10 +08:00
Jin Mao 9ee6d06d50
docs: add deepWiki doc link (#6057) 2025-04-27 20:54:07 +08:00
xingyu4j ecdca981b0 fix: fix lint 2025-04-27 20:52:12 +08:00
xingyu4j c4b8d694b8 style: fix lint 2025-04-27 20:49:57 +08:00
xingyu4j 7af4a0261c feat: add help 2025-04-27 20:48:44 +08:00
xingyu4j 1c2da07ded feat: 增加 useVbenForm 样式,去掉data.ts 中 字段class 2025-04-27 14:59:53 +08:00
xingyu4j 2a805f560f feat: 调整显示比例为p-4 2025-04-27 14:41:04 +08:00
xingyu4j 2df1c949f7 feat: 优化user页面显示,右侧用户列表占满 2025-04-27 14:36:32 +08:00
xingyu4j 093bc823e2 feat: 优化doc显示,增加圆角 2025-04-27 14:35:49 +08:00
ming4762 0cc1cb5a7b
perf: improve destroyOnClose for VbenDrawer&VbenModal (#6051)
* fix: fix that the default value of modal destroyOnClose does not take effect

* perf: improve destroyOnClose for VbenDrawer
2025-04-27 11:26:50 +08:00