layhuts
9d36b34c4c
docs: 修复错误的注释说明
2026-07-01 09:52:51 +08:00
dependabot[bot]
9b356d731d
build(deps): bump actions/checkout from 6 to 7 ( #8080 )
...
Bumps [actions/checkout](https://github.com/actions/checkout ) from 6 to 7.
- [Release notes](https://github.com/actions/checkout/releases )
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md )
- [Commits](https://github.com/actions/checkout/compare/v6...v7 )
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-version: '7'
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-06-30 22:42:58 +08:00
Evan
18e2bbf969
Merge branch 'main' into refactor/router-redirect
2026-06-30 22:23:54 +08:00
layhuts
14bb94245c
feat: 新增logo铺满显示和是否显示text配置 ( #8102 )
...
* feat: 新增logo铺满显示和是否显示text配置
* feat: logo.enable=false时隐藏logo区域占位；设置logoMode、showText为必填。
* style: 修复注释问题
* fix: 删除多余属性
2026-06-30 21:50:45 +08:00
Evan
feb0265744
Merge branch 'main' into refactor/router-redirect
2026-06-30 14:26:23 +08:00
xueyitt
7182405d24
fix: 修复弹框自定义宽度 class 被默认 max-w 覆盖的问题 ( #8100 )
...
将 modalClass 参数移至 cn() 末尾，确保用户通过 class 传入的宽度样式
优先于内置默认的 max-w-[calc(100vw-20px)] 生效，使 业务使用Modal 上的自定义的max-w-[50%] 等方式能正确控制弹框宽度。
2026-06-30 14:24:18 +08:00
陆伯言
d7d6d2e337
fix: lint issue from a8c3729 ( #8098 )
2026-06-30 14:23:52 +08:00
Harold Zhang
31c31b914b
feat: fix check error ( #8094 )
2026-06-30 14:23:27 +08:00
Evan
f00a881295
refactor(@vben/access): 重构路由的重定向逻辑
...
@vben-core/shared
@vben/playground
@vben/backend-mock
@vben/web-antd
@vben/web-antdv-next
@vben/web-ele
@vben/naive
@vben/tdesign
2026-06-30 13:36:37 +08:00
zoumingjun
5ed867eb95
feat: 优化禁用的开关组件也可以查看help帮助信息
2026-06-30 09:39:32 +08:00
zoumingjun
ae5bd3afc5
feat: 首选项导航栏选项标题过长时显示省略号，且增加聚焦时文字提示
2026-06-30 09:37:28 +08:00
李琦
a38da5ce92
1. Excel交互组件封装优化
CI / Test (ubuntu-latest) (push) Has been cancelled
CI / Test (windows-latest) (push) Has been cancelled
CI / Lint (ubuntu-latest) (push) Has been cancelled
CI / Lint (windows-latest) (push) Has been cancelled
CI / Check (ubuntu-latest) (push) Has been cancelled
CI / Check (windows-latest) (push) Has been cancelled
CodeQL / Analyze (javascript-typescript) (push) Has been cancelled
Deploy Website on push / Deploy Push Playground Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Docs Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Antd Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Element Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Naive Ftp (push) Has been cancelled
Release Drafter / update_release_draft (push) Has been cancelled
CI / CI OK (push) Has been cancelled
Lock Threads / action (push) Has been cancelled
Issue Close Require / close-issues (push) Has been cancelled
Close stale issues / stale (push) Has been cancelled
2026-06-26 12:52:26 +08:00
李琦
69862cd982
1. Excel交互组件封装
CI / Test (ubuntu-latest) (push) Has been cancelled
CI / Test (windows-latest) (push) Has been cancelled
CI / Lint (ubuntu-latest) (push) Has been cancelled
CI / Lint (windows-latest) (push) Has been cancelled
CI / Check (ubuntu-latest) (push) Has been cancelled
CI / Check (windows-latest) (push) Has been cancelled
CI / CI OK (push) Has been cancelled
CodeQL / Analyze (javascript-typescript) (push) Has been cancelled
Deploy Website on push / Deploy Push Playground Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Docs Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Antd Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Element Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Naive Ftp (push) Has been cancelled
Release Drafter / update_release_draft (push) Has been cancelled
Lock Threads / action (push) Has been cancelled
Issue Close Require / close-issues (push) Has been cancelled
Close stale issues / stale (push) Has been cancelled
2026-06-25 16:09:07 +08:00
李琦
8cfef12a56
1. 加工费模块重构
...
CI / Test (ubuntu-latest) (push) Has been cancelled
CI / Test (windows-latest) (push) Has been cancelled
CI / Lint (ubuntu-latest) (push) Has been cancelled
CI / Lint (windows-latest) (push) Has been cancelled
CI / Check (ubuntu-latest) (push) Has been cancelled
CI / Check (windows-latest) (push) Has been cancelled
CI / CI OK (push) Has been cancelled
CodeQL / Analyze (javascript-typescript) (push) Has been cancelled
Deploy Website on push / Deploy Push Playground Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Docs Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Antd Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Element Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Naive Ftp (push) Has been cancelled
Release Drafter / update_release_draft (push) Has been cancelled
Close stale issues / stale (push) Has been cancelled
2. 快递费模块重构
3. 订单导出功能优化
4. 商品订单的折扣功能
5. 修复了一些已知BUG
2026-06-25 08:17:00 +08:00
vben
a8c3729850
feat: add ICP filing number to copyright across app
2026-06-24 10:04:10 +08:00
李琦
e6306eea75
1. 加工费模块重构
...
CI / Test (ubuntu-latest) (push) Has been cancelled
CI / Test (windows-latest) (push) Has been cancelled
CI / Lint (ubuntu-latest) (push) Has been cancelled
CI / Lint (windows-latest) (push) Has been cancelled
CI / Check (ubuntu-latest) (push) Has been cancelled
CI / Check (windows-latest) (push) Has been cancelled
CI / CI OK (push) Has been cancelled
CodeQL / Analyze (javascript-typescript) (push) Has been cancelled
Deploy Website on push / Deploy Push Playground Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Docs Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Antd Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Element Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Naive Ftp (push) Has been cancelled
Release Drafter / update_release_draft (push) Has been cancelled
Close stale issues / stale (push) Has been cancelled
Lock Threads / action (push) Has been cancelled
Issue Close Require / close-issues (push) Has been cancelled
2. 快递费模块重构
3. 订单导出功能优化
4. 商品订单的折扣功能
5. 修复了一些已知BUG
2026-06-24 08:11:15 +08:00
gotounix
794edd419e
fix: add includes in mock tsconfig ( #8085 )
2026-06-23 21:47:08 +08:00
layhuts
9a284ee385
style: 处理modal设置class="md:w-5/12"格式时Fullscreen时无法最大化问题 ( #8084 )
2026-06-23 21:46:43 +08:00
gotounix
e031457271
fix: add missing imports ( #8082 )
2026-06-23 21:46:19 +08:00
李琦
824dc2b0e3
1. 加工费模块重构
...
CI / Test (ubuntu-latest) (push) Has been cancelled
CI / Test (windows-latest) (push) Has been cancelled
CI / Lint (ubuntu-latest) (push) Has been cancelled
CI / Lint (windows-latest) (push) Has been cancelled
CI / Check (ubuntu-latest) (push) Has been cancelled
CI / Check (windows-latest) (push) Has been cancelled
CI / CI OK (push) Has been cancelled
CodeQL / Analyze (javascript-typescript) (push) Has been cancelled
Deploy Website on push / Deploy Push Playground Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Docs Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Antd Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Element Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Naive Ftp (push) Has been cancelled
Release Drafter / update_release_draft (push) Has been cancelled
Lock Threads / action (push) Has been cancelled
Issue Close Require / close-issues (push) Has been cancelled
2. 快递费模块重构
3. 订单导出功能优化
4. 商品订单的折扣功能
5. 修复了一些已知BUG
2026-06-23 15:06:41 +08:00
金毛88
0931599f96
chore: update deps
2026-06-21 14:48:51 +08:00
李琦
8eb479696e
1. 加工费模块重构（1/3）
CI / Test (ubuntu-latest) (push) Has been cancelled
CI / Test (windows-latest) (push) Has been cancelled
CI / Lint (ubuntu-latest) (push) Has been cancelled
CI / Lint (windows-latest) (push) Has been cancelled
CI / Check (ubuntu-latest) (push) Has been cancelled
CI / Check (windows-latest) (push) Has been cancelled
CodeQL / Analyze (javascript-typescript) (push) Has been cancelled
Deploy Website on push / Deploy Push Playground Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Docs Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Antd Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Element Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Naive Ftp (push) Has been cancelled
Release Drafter / update_release_draft (push) Has been cancelled
CI / CI OK (push) Has been cancelled
Lock Threads / action (push) Has been cancelled
Issue Close Require / close-issues (push) Has been cancelled
Close stale issues / stale (push) Has been cancelled
2026-06-18 17:04:14 +08:00
李琦
75dd690188
1. 右键菜单通用组件封装
...
CI / Test (ubuntu-latest) (push) Has been cancelled
CI / Test (windows-latest) (push) Has been cancelled
CI / Lint (ubuntu-latest) (push) Has been cancelled
CI / Lint (windows-latest) (push) Has been cancelled
CI / Check (ubuntu-latest) (push) Has been cancelled
CI / Check (windows-latest) (push) Has been cancelled
CI / CI OK (push) Has been cancelled
CodeQL / Analyze (javascript-typescript) (push) Has been cancelled
Deploy Website on push / Deploy Push Playground Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Docs Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Antd Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Element Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Naive Ftp (push) Has been cancelled
Release Drafter / update_release_draft (push) Has been cancelled
2. 文件管理优化功能（后续需要新增分组、个人收藏）
3. 优化订单页面、诊所管理页面的布局，更加集中，减少表长度
4. 新增诊所的时候业务员支持气泡卡片点击选择，不用再输入业务码
5. 接口日志筛选优化
2026-06-18 16:42:51 +08:00
xingyu4j
dc3865f778
fix: 优化 lint 执行策略并修复 pre-commit 依赖解析
...
- vsh lint 按硬件自适应：CPU<=4 核串行（汇总错误），>4 核并行；
CPU>4 且空闲内存>8GB 时 oxfmt/oxlint 默认线程数提升至 4，否则维持 2
- lefthook pre-commit 改为串行执行，避免与 check:type 并行导致低配机资源飙升
- pre-commit 仅对暂存文件 lint 并自动修复回填（stage_fixed）
- lint 命令统一加 pnpm exec 前缀，修复 lefthook 经 sh 调用时
oxlint 找不到 workspace 局部依赖（eslint-plugin-eslint-comments）的问题
2026-06-18 16:35:27 +08:00
yshbyy
45399d0299
fix(@vben-core/shadcn-ui): 补全 ScrollArea onScroll 滚动事件透传 ( #8069 )
2026-06-18 16:10:21 +08:00
xingyu
dc3466d77a
refactor: 将 unicorn / TypeScript 规则迁移至 oxlint，并完善 oxfmt 配置 ( #8067 )
...
* chore: update deps
* chore: update archiver v8
* fix: 还原 vue/html-closing-bracket-newline
* feat: 增加默认配置和配置注释
* feat: 增加oxlint默认插件配置和注释
* refactor: remove unicorn ESLint configuration and update dependencies
- Deleted the unicorn ESLint configuration file from the lint-configs package.
- Removed unicorn configuration from the main index file.
- Updated oxlint-config to include a comprehensive set of unicorn rules.
- Adjusted preferences and vxe-table files to disable specific unicorn rules.
- Removed references to eslint-plugin-unicorn from pnpm-lock.yaml and pnpm-workspace.yaml.
* refactor: 移除 eslint 的 @typescript-eslint/eslint-plugin 依赖，将 TypeScript 配置迁移到 oxlint
* feat: open typeAware
* fix: mac 和linux下报错
2026-06-18 16:10:01 +08:00
李琦
073f7f882b
1. 推广员功能增强
CI / Test (ubuntu-latest) (push) Has been cancelled
CI / Test (windows-latest) (push) Has been cancelled
CI / Lint (ubuntu-latest) (push) Has been cancelled
CI / Lint (windows-latest) (push) Has been cancelled
CI / Check (ubuntu-latest) (push) Has been cancelled
CI / Check (windows-latest) (push) Has been cancelled
CI / CI OK (push) Has been cancelled
CodeQL / Analyze (javascript-typescript) (push) Has been cancelled
Deploy Website on push / Deploy Push Playground Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Docs Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Antd Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Element Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Naive Ftp (push) Has been cancelled
Release Drafter / update_release_draft (push) Has been cancelled
2026-06-18 15:05:02 +08:00
李琦
d9db629c5d
1. 推广员功能增强
CI / Test (ubuntu-latest) (push) Has been cancelled
CI / Test (windows-latest) (push) Has been cancelled
CI / Lint (ubuntu-latest) (push) Has been cancelled
CI / Lint (windows-latest) (push) Has been cancelled
CI / Check (ubuntu-latest) (push) Has been cancelled
CI / Check (windows-latest) (push) Has been cancelled
CI / CI OK (push) Has been cancelled
CodeQL / Analyze (javascript-typescript) (push) Has been cancelled
Deploy Website on push / Deploy Push Playground Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Docs Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Antd Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Element Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Naive Ftp (push) Has been cancelled
Release Drafter / update_release_draft (push) Has been cancelled
2026-06-18 13:49:06 +08:00
李琦
f36ef45ee2
1. 推广员功能增强
CI / Test (ubuntu-latest) (push) Has been cancelled
CI / Test (windows-latest) (push) Has been cancelled
CI / Lint (ubuntu-latest) (push) Has been cancelled
CI / Lint (windows-latest) (push) Has been cancelled
CI / Check (ubuntu-latest) (push) Has been cancelled
CI / Check (windows-latest) (push) Has been cancelled
CI / CI OK (push) Has been cancelled
CodeQL / Analyze (javascript-typescript) (push) Has been cancelled
Deploy Website on push / Deploy Push Playground Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Docs Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Antd Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Element Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Naive Ftp (push) Has been cancelled
Release Drafter / update_release_draft (push) Has been cancelled
2026-06-18 13:24:58 +08:00
金毛88
65885ea74b
chore: update lockfile
2026-06-16 16:47:33 +08:00
金毛88
769791351f
chore: update deps && lint
2026-06-16 16:25:21 +08:00
金毛88
741cbb3794
Merge branch 'fork/xueyitt/feat/feat3'
2026-06-16 16:16:56 +08:00
金毛88
edd110ac4e
Merge branch 'fork/xueyitt/feat/feat1'
2026-06-16 16:15:33 +08:00
xueyitt
7824219557
fix: 修正AppPreferences中defaultAvatar、dynamicTitle注释 ( #8060 )
2026-06-16 14:23:25 +08:00
雪忆天堂
dd4afec7ed
feat: workbench公共组件增加支持slot方式进行自定义
2026-06-16 10:01:24 +08:00
雪忆天堂
ebebb42625
feat: 1、FieldMappingTime拆解独立FieldMappingTimeItem+集合形式，方便单独对象定义;
...
2、表单submitOnChange增加changeDebouncedTime防抖处理，允许自定义防抖周期;
3、handleValuesChange事件set增加cloneDeep，防止对象值污染;
2026-06-16 09:48:27 +08:00
雪忆天堂
d1e6d4a3da
Merge remote-tracking branch 'origin/main'
2026-06-16 09:10:50 +08:00
Jefsky Wong
ad3f996bdb
fix(@vben/common-ui): prevent footer slot from overlapping content when Page contains Grid ( #8056 )
...
The Page component's outer container used min-h-full, which doesn't
provide an explicit height for flex children. Combined with h-full on
the content div, this caused the footer slot to overlap table content
(Grid/vxe-table) because the content area didn't properly account for
footer space in the flex column layout.
Fix:
1. Change outer container from min-h-full to h-full — gives the flex
container an explicit height so percentage heights resolve correctly.
2. Change content area from static h-full to flex-1 when autoContentHeight
is false — lets the flex layout naturally distribute remaining space
between content and footer.
Closes #5494
Co-authored-by: jefsky <jefsky@users.noreply.github.com >
2026-06-16 08:36:39 +08:00
HaroldZhangCode91
68877a7e97
Merge branch 'main' into feature/fix_confirm_regression
2026-06-15 17:46:19 +08:00
雪忆天堂
c5a839f652
Merge remote-tracking branch 'origin/main'
...
# Conflicts:
# packages/effects/plugins/src/vxe-table/use-vxe-grid.vue
2026-06-15 17:41:12 +08:00
HaroldZhangCode91
bf8c3d6411
feat: aligns ESLint with oxfmt's behavior ( #8054 )
2026-06-15 17:25:04 +08:00
HaroldZhangCode91
f753a3b75f
Merge branch 'main' into feature/fix_confirm_regression
2026-06-15 16:45:08 +08:00
曾兴顺
fcf726f953
fix: 修复Tree组件不支持半选的问题（子节点全选时父节点选中图标为勾选状态，子节点部分选中时父节点图标为减号，也就是版勾选状态，子节点未被选中时，父节点不被选中） ( #8050 )
2026-06-15 16:38:21 +08:00
Harold Zhang
16ebc67796
feat: fixed useScrollLock() can not be unlock
2026-06-15 16:34:53 +08:00
Harold Zhang
6b109c9ae6
fix: fixed regression of confirm
2026-06-15 16:24:17 +08:00
李琦
9a1435996e
1. 推广员功能增强
CI / Test (ubuntu-latest) (push) Has been cancelled
CI / Test (windows-latest) (push) Has been cancelled
CI / Lint (ubuntu-latest) (push) Has been cancelled
CI / Lint (windows-latest) (push) Has been cancelled
CI / Check (ubuntu-latest) (push) Has been cancelled
CI / Check (windows-latest) (push) Has been cancelled
CodeQL / Analyze (javascript-typescript) (push) Has been cancelled
Deploy Website on push / Deploy Push Playground Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Docs Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Antd Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Element Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Naive Ftp (push) Has been cancelled
Release Drafter / update_release_draft (push) Has been cancelled
CI / CI OK (push) Has been cancelled
Lock Threads / action (push) Has been cancelled
Issue Close Require / close-issues (push) Has been cancelled
Close stale issues / stale (push) Has been cancelled
2026-06-15 14:01:30 +08:00
李琦
4090c2ca3a
1. 推广员功能增强
2026-06-12 15:07:14 +08:00
xingyu
160114c5e0
fix: select and user-dropdown ( #8042 )
...
* fix: 偏好设置中下拉框无法选择的问题，原因： 同步 shadcn-vue 将 z-popup 同步为 shadcn 的 z-50
* fix: 鼠标hover到用户登录头像 下拉来回闪烁 隐藏 显示
2026-06-10 21:26:47 +08:00
李琦
2f37bf2909
1. 推广员功能增强
CI / Test (ubuntu-latest) (push) Has been cancelled
CI / Test (windows-latest) (push) Has been cancelled
CI / Lint (ubuntu-latest) (push) Has been cancelled
CI / Lint (windows-latest) (push) Has been cancelled
CI / Check (ubuntu-latest) (push) Has been cancelled
CI / Check (windows-latest) (push) Has been cancelled
CodeQL / Analyze (javascript-typescript) (push) Has been cancelled
Deploy Website on push / Deploy Push Playground Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Docs Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Antd Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Element Ftp (push) Has been cancelled
Deploy Website on push / Deploy Push Naive Ftp (push) Has been cancelled
Release Drafter / update_release_draft (push) Has been cancelled
CI / CI OK (push) Has been cancelled
Lock Threads / action (push) Has been cancelled
Issue Close Require / close-issues (push) Has been cancelled
Close stale issues / stale (push) Has been cancelled
2026-06-09 14:54:52 +08:00
金毛88
4b1fada0ab
Merge branch 'fork/zhb410181/fix/style'
2026-06-09 11:22:58 +08:00
