c164904a14
chore: 合并 github/master，引入 PR #259 BPMN 流程设计器审批节点自定义配置编辑后丢失修复
2026-05-04 00:36:22 +08:00
a0ceb45df9
Merge pull request #259 from lb1565387341/fix_bpmn_custom_user_config
...
fix: [bpm][antd&ele] 修复流程设计器自定义配置编辑后丢失的问题
2026-05-04 00:26:29 +08:00
c641542c71
fix(bpm)：修正 BPM 流程实例审批弹窗网关分支重算的并发与提交问题
...
- 提交时不再用节点表单值覆盖 data.variables；与预览阶段使用同一份合并变量
- onChange 加 useDebounceFn(300ms) + 请求序号去重，handleAudit 提交前 await 最新一轮重算
- 切换任务时重置请求序号与 pending 重算
- 改用 form-create 官方 formData() 取节点表单当前值
- 节点表单初始化等 fApi 就绪后再计算下一节点（until + 1s 兜底）
同步至 web-antd / web-ele 两端
2026-05-03 16:35:03 +08:00
a3d8e4bfc1
feat: 添加包含和不包含条件选项到常量定义
2026-05-03 11:04:58 +08:00
e385823d46
fix: 修复 Vben5.0 form-create 多图上传校验拒绝 png/jpeg/gif，isImage 兼容 MIME 与扩展名两种 accept 写法
2026-05-02 22:56:38 +08:00
897220e19a
fix: 修复 Vben5.0 download 接口 token 过期不触发刷新，导出/下载文件变成「账号未登录」JSON；web-antd / web-ele / web-naive / web-tdesign 加 Blob 业务错误嗅探拦截器
2026-05-02 20:36:00 +08:00
b293e112c6
fix: 修复 MALL 商品保存时 SKU 价格被反复 *100 的漂移
2026-05-02 20:23:43 +08:00
627e31f1b0
fix: 修复 Vben5.0 CRM 合同配置 / 客户公海规则配置表单 label 错用 `labelClass: 'w-100'`，Tailwind v4 动态间距下被解析为 400px 撑爆 `w-1/4` 容器，挤掉 RadioGroup 输入区，改用 `labelWidth: 120`
2026-05-02 19:44:21 +08:00
8020b4b743
fix: 修复 MALL 商品列表/选择器「价格」列展示原始的「分」（web-antd / web-ele）
...
商品列表 [mall/product/spu/data.ts] 与商品选择器 [mall/product/spu/components/spu-select-data.ts]
的「价格」列原先 formatter: 'formatAmount2'，只做了小数格式化、漏了「分转元」，导致
19900 直接显示成 19900.00（应为 199.00 元）。同文件的 marketPrice / costPrice 已正确使用
fenToYuan，唯独 price 漏了。
顺手将 spu/data.ts 的 price / marketPrice / costPrice 三列从手写闭包统一切到已注册的
formatFenToYuanAmount formatter，单位「元」从 cell 后缀挪进列标题（如「价格(元)」），
减少 8 处闭包并复用平台统一的 null/NaN 处理。
2026-05-02 19:38:50 +08:00
228c5463da
fix: 修复 IoT 物模型表单 Form.Item 嵌套字段 name 误用点号字符串，事件类型等校验始终失败 / resetFields 写错路径
2026-05-02 19:27:35 +08:00
42317ddf41
feat(watermark): 添加暗黑模式水印颜色适配
...
为水印功能添加暗黑模式适配，根据当前主题自动切换水印颜色。在暗黑模式下使用浅色水印，在亮色模式下使用深色水印，提升视觉体验。
2026-04-24 15:42:07 +08:00
f542db27f9
!340 feat: 商城订单发货后可再修改发货信息
...
Merge pull request !340 from hice/master
2026-04-13 08:47:29 +00:00
b2cf1646a4
fix: lint
2026-04-13 16:46:44 +08:00
a653e428f3
Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin
2026-04-13 16:45:32 +08:00
eb62e63a04
feat: 商城订单发货后可再修改发货信息
2026-04-13 16:31:48 +08:00
6c029bfa32
Merge branch 'main' into main
2026-04-13 16:10:29 +08:00
fe77bc8bc9
feat: 通知模块自定义加强
2026-04-13 16:05:42 +08:00
ccabbf0e97
feat: enable project-scoped preferences extension tabs ( #7803 )
...
* feat: enable project-scoped preferences extension tabs
Add a typed extension schema so subprojects can define extra settings,
render them in the shared preferences drawer only when configured, and
consume them in playground as a real feature demo. Extension labels now
follow locale keys instead of hardcoded app-specific strings.
Constraint: Reuse the shared preferences drawer and field blocks
Rejected: Add app-specific fields to core preferences | too tightly coupled
Rejected: Inline localized label objects | breaks existing locale-key flow
Confidence: high
Scope-risk: moderate
Reversibility: clean
Directive: Keep extension labels as locale keys rendered via $t in UI
Tested: Vitest preferences tests
Tested: Turbo typecheck for preferences, layouts, web-antd, and playground
Tested: ESLint for touched preferences and playground files
Not-tested: Manual browser interaction in playground preferences drawer
* fix: satisfy lint formatting for preferences extension demo
Adjust the playground preferences extension demo template so formatter and
Vue template lint rules agree on the rendered markup. This keeps CI green
without changing runtime behavior.
Constraint: Must preserve the existing demo behavior while fixing CI only
Rejected: Disable the Vue newline rule | would weaken shared lint guarantees
Confidence: high
Scope-risk: narrow
Reversibility: clean
Directive: Prefer computed/template structures that avoid formatter-vs-lint conflicts
Tested: pnpm run lint
Not-tested: Manual browser interaction in playground preferences extension demo
* fix: harden custom preferences validation and i18n labels
Tighten custom preferences handling so numeric extension fields respect
min, max, and step constraints. Number inputs now ignore NaN values,
and web-antd extension metadata uses locale keys instead of raw strings.
Also align tip-based hover guards in shared preference inputs/selects.
Constraint: Keep fixes scoped to verified findings only
Rejected: Broader refactor of preferences field components | not needed for these fixes
Confidence: high
Scope-risk: narrow
Reversibility: clean
Directive: Reuse the same validation path for updates and cache hydration
Tested: Vitest preferences tests
Tested: ESLint for touched preferences and widget files
Tested: Typecheck for web-antd, layouts, and core preferences
Not-tested: Manual browser interaction for all preference field variants
* fix: remove localized default from playground extension config
Drop the hardcoded Chinese default value from the playground extension
report title field and fall back to an empty string instead. This keeps
extension config locale-neutral while preserving localized labels and
placeholders through translation keys.
Constraint: Keep the fix limited to the verified localized default issue
Rejected: Compute the default from runtime locale in config | unnecessary for this finding
Confidence: high
Scope-risk: narrow
Reversibility: clean
Directive: Avoid embedding localized literals in extension default values
Tested: ESLint for playground/src/preferences.ts
Tested: Oxfmt check for playground/src/preferences.ts
Not-tested: Manual playground preferences interaction
* docs: document project-scoped preferences extension workflow
Add Chinese and English guide sections explaining how to define,
initialize, read, and update project-scoped preferences extensions.
Also document numeric field validation and point readers to the
playground demo for a complete example.
Constraint: Keep this docs-only and aligned with the shipped API
Rejected: Update only Chinese docs | would leave English docs inconsistent
Confidence: high
Scope-risk: narrow
Reversibility: clean
Directive: Keep zh/en examples and playground demo paths synchronized
Tested: git diff --check; pnpm build:docs
Not-tested: Manual browser review of the rendered docs site
* fix: harden custom preferences defaults and baselines
Use a locale-neutral default for the web-antd report title.
Also stop preference getters from exposing mutable baseline
or extension schema objects, and add a regression test for
external mutation attempts.
Constraint: Keep behavior compatible with the shipped preferences API
Rejected: Return raw refs with readonly typing only | callers could still mutate internals
Confidence: high
Scope-risk: narrow
Reversibility: clean
Directive: Keep defensive copies for baseline and schema getters unless storage semantics change
Tested: eslint, oxlint, targeted vitest, filtered typecheck, git diff --check
Not-tested: Full monorepo typecheck and test suite
* test: relax custom preference cache key matching
Avoid coupling the custom-number cache test to one exact
localStorage key string. Match the intended cache lookup
more loosely so the test still verifies filtering behavior
without depending on the full namespaced cache key.
Constraint: Focus the test on cache filtering behavior
Rejected: Assert one exact key | brittle with namespace changes
Confidence: high
Scope-risk: narrow
Reversibility: clean
Directive: Prefer behavior tests over literal storage keys
Tested: targeted vitest, eslint, git diff --check
Not-tested: Full monorepo test suite
---------
Co-authored-by: caisin <caisin@caisins-Mac-mini.local>
2026-04-13 15:11:57 +08:00
76f9d3d9fc
merge: 合并 master 分支，解决 isUrl 冲突（保留从 @vben/utils 导出的方式）
...
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-04-12 21:27:05 +08:00
53ccec1d80
fix: 修复VITE_APP_TITLE变量替换语法
...
- 将index.html中的<%= VITE_APP_TITLE %>替换为%VITE_APP_TITLE%
- 更新web-antd、web-antdv-next、web-ele、web-naive、web-tdesign应用
- 修改文档中loading组件的VITE_APP_TITLE引用方式
- 修复vite-config插件中默认加载模板的变量语法
- 统一所有应用和模板中的环境变量引用格式
2026-04-11 14:29:18 +08:00
7e4edd270d
fix: 补全 ComponentPropsMap 与 Vxe 表格表单链路的类型
2026-04-05 19:03:03 +08:00
5211f5065d
feat: 表单 Schema 支持组件 Props 映射泛型，同步适配VxeGrid
2026-04-04 23:40:27 +08:00
96d6f89732
refactor: 简化 componentProps 回调的类型写法
2026-04-03 15:02:32 +08:00
6ab06584eb
fix: 函数式 componentProps 按已注册 component 的 Props 校验返回值
2026-04-03 13:36:03 +08:00
a6433c2b50
feat: Schema 中 componentProps 随注册组件联动类型提示
2026-04-03 01:39:49 +08:00
fece74f744
Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into vite8
2026-03-23 16:55:27 +08:00
4b3205fee8
feat: antd Upload 组件上传文件组支持拖拽排序
2026-03-16 15:01:43 +08:00
f32818c6aa
fix(lint): resolve shared form and utility warnings
2026-03-14 13:28:45 +08:00
fb03afb6b7
fix(lint): clean up ai rich text views
2026-03-14 13:28:13 +08:00
577efa56a9
fix(lint): update bpmn designer compatibility code
2026-03-14 13:27:38 +08:00
cb98b3a47e
fix(lint): add ts-expect-error descriptions
2026-03-14 13:27:00 +08:00
a83d8248d7
fix: lint
2026-03-14 12:27:31 +08:00
4cdc92f759
fix: lint
2026-03-14 12:16:31 +08:00
ac3fc6b7d3
Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into vite8
2026-03-14 11:34:06 +08:00
a6a6efdf59
chore: release 5.7.0
...
- 更新 backend-mock 包版本
- 更新 web-antd 包版本
- 更新 web-antdv-next 包版本
- 更新 web-ele 包版本
- 更新 web-naive 包版本
- 更新 web-tdesign 包版本
- 更新 docs 包版本
- 更新 commitlint-config 包版本
- 更新 eslint-config 包版本
- 更新 oxfmt-config 包版本
- 更新 oxlint-config 包版本
- 更新 stylelint-config 包版本
- 更新 node-utils 包版本
- 更新 tsconfig 包版本
- 更新 vite-config 包版本
- 更新 @core/base/design 包版本
- 更新 @core/base/icons 包版本
- 更新 @core/base/shared 包版本
- 更新 @core/base/typings 包版本
- 更新 @core/composables 包版本
- 更新 @core/preferences 包版本
- 更新 @core/ui-kit/form-ui 包版本
- 更新 @core/ui-kit/layout-ui 包版本
- 更新 @core/ui-kit/menu-ui 包版本
- 更新 @core/ui-kit/popup-ui 包版本
- 更新 @core/ui-kit/shadcn-ui 包版本
- 更新 @core/ui-kit/tabs-ui 包版本
- 更新 constants 包版本
- 更新 access 包版本
- 更新 common-ui 包版本
- 更新 hooks 包版本
- 更新 layouts 包版本
- 更新 plugins 包版本
- 更新 request 包版本
- 更新 icons 包版本
- 更新 locales 包版本
- 更新 preferences 包版本
- 更新 stores 包版本
- 更新 styles 包版本
- 更新 types 包版本
- 更新 utils 包版本
- 更新 playground 包版本
- 更新 turbo-run 包版本
- 更新 vsh 包版本
- 更新根目录包版本
2026-03-14 09:14:23 +08:00
395babc1f5
feat: tsgolint
2026-03-13 23:13:10 +08:00
68cde54bad
feat: add tsgolint
2026-03-13 23:13:01 +08:00
c7d7529c00
chore: ts
2026-03-13 23:07:04 +08:00
a850d426ef
chore: fix lint and typecheck issues
2026-03-13 20:57:52 +08:00
a4736a49f8
feat: migrate to Tailwind CSS v4 ( #7614 )
...
* chore: update deps
* feat: use jsonc/x language
* chore: update eslint 10.0
* fix: no-useless-assignment
* feat: add CLAUDE.md
* chore: ignore
* feat: claude
* fix: lint
* chore: suppot eslint v10
* fix: lint
* fix: lint
* fix: type check
* fix: unit test
* fix: Suggested fix
* fix: unit test
* chore: update stylelint v17
* chore: update all major deps
* fix: echarts console warn
* chore: update vitest v4
* feat: add skills ignores
* chore: update deps
* chore: update deps
* fix: cspell
* chore: update deps
* chore: update tailwindcss v4
* chore: remove postcss config
* fix: no use catalog
* chore: tailwind v4 config
* fix: tailwindcss v4 sort
* feat: use eslint-plugin-better-tailwindcss
* fix: Interference between enforce-consistent-line-wrapping, jsx-curly-brace-presence and Prettier
* fix: Interference between enforce-consistent-line-wrapping, jsx-curly-brace-presence and Prettier
* fix(lint): resolve prettier and better-tailwindcss formatting conflicts
* fix(tailwind): update theme references and lint sources
* style(format): normalize apps docs and playground vue files
* style(format): normalize core ui-kit components
* style(format): normalize effects ui and layout components
2026-03-10 05:08:45 +08:00
1cbdf442ee
feat: 添加 URL 验证工具函数并优化 area-select 组件的类型定义
2026-03-07 17:33:02 +08:00
c885c0c71a
!333 fix(form-create): 【ele/antd】完成 vue3 review c153ff93 的所有 TODO 修复
...
Merge pull request !333 from puhui999/master-fix
2026-03-07 03:23:42 +00:00
586978f1b0
fix: 修复上传头像时，如果图片加载失败，弹框一直loading的问题
2026-02-28 10:00:39 +08:00
dd69d7c1a5
!334 feat(iot)：增加 modbus 配置 100%
...
Merge pull request !334 from 芋道源码/dev
2026-02-14 03:04:43 +00:00
63743b6929
feat(iot)：增加 modbus 配置 100%
2026-02-14 11:02:56 +08:00
38597dd19d
feat(iot)：增加 modbus 配置 50%
2026-02-14 09:19:43 +08:00
e7365a4a00
fix(form-create): 【ele/antd】完成 vue3 review c153ff93 的所有 TODO 修复
2026-02-11 17:58:13 +08:00
bf4fed78f2
!332 Merge branch 'main' of <a href=" https://gitee.com/link?target=https%3A%2F%2Fgithub.com%2Fvbenjs%2Fvue-vben-admin "> https://github.com/vbenjs/vue-vben-admin </a> into dev
...
Merge pull request !332 from xingyu/dev
2026-02-11 03:12:23 +00:00
722afc85df
Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev
2026-02-11 11:01:44 +08:00
05b41692ba
feat: 移动端 uniapp 流程表单嵌入页面
2026-02-10 22:07:19 +08:00
e136679934
fix: [bpm][antd&ele] 修复流程设计器自定义配置编辑后丢失的问题
2026-02-09 15:35:53 +08:00
8a215fbcc7
chore: release 5.6.0
2026-02-09 05:09:57 +08:00
8cadad0a1e
feat(web): add antdv-next model
2026-02-08 23:00:19 +08:00
f3deefae56
Merge remote-tracking branch 'yudao/master' into master-fix
2026-02-08 11:57:23 +08:00
d0a7065991
feat(form-create): 【ele/antd】新增 iframe 和省市区选择器组件
...
- 新增 iframe 网页嵌入组件，支持 URL 配置和实时预览
- 新增省市区三级联动选择器组件
- 支持 web-ele 和 web-antd 双版本
2026-02-08 11:56:02 +08:00
448f073143
review：【antd/ele】【bpm】工作流相关的代码
2026-01-29 21:20:24 +08:00
548da70f9f
fix(mall): 【antd/ele】修复商品 SKU 名称校验失败的问题
...
前端创建/编辑商品时，SKU 对象缺少 name 字段初始化，导致提交时后端校验 "商品 SKU 名字不能为空" 失败。
修改内容：
- form/index.vue: 初始化 SKU 添加 name 字段，提交前校验商品名称并赋值给 SKU
- sku-list.vue: createEmptySku 函数添加 name 字段
影响范围：web-antd、web-ele 两个版本
2026-01-28 17:45:20 +08:00
0441afc24f
Merge remote-tracking branch 'yudao/master'
2026-01-28 17:37:04 +08:00
1196dab9e4
feat(form-create): 【antd/ele】表单选择器支持默认选中当前用户/部门
...
- UserSelect 组件新增 defaultCurrentUser 配置，支持默认选中当前登录用户
- DeptSelect 组件重构为独立的树形选择器，支持 defaultCurrentDept 配置
- DeptSelect 支持 returnType 配置，可返回部门 ID 或部门名称
- 修复 useSelectRule 未将自定义 props 默认值传递给组件的问题
- 修复 DeptSelect 数据加载完成前回显失败的问题
- 同时支持 web-antd 和 web-ele 两个应用
2026-01-28 17:23:39 +08:00
dbb1a19c5d
fix: lint
2026-01-28 15:24:49 +08:00
82b91dfed3
fix: lint
2026-01-28 15:22:35 +08:00
24b8bba754
fix: lint
2026-01-26 10:34:14 +08:00
baed599fcc
Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev
2026-01-26 10:13:23 +08:00
1ce562601f
feat(iot):【网关设备：80%】动态注册的初步实现（已测试）
2026-01-25 18:50:26 +08:00
b9224fc379
Merge branch 'main' into fix
2026-01-23 13:48:54 +08:00
ba08820be8
Merge remote-tracking branch 'yudao/dev' into dev
2026-01-21 23:28:00 +08:00
d9e933e3a6
feat: [bpm][antd] 审批签名大小控制
2026-01-21 23:25:48 +08:00
50216e5047
feat（iot）：【设备定位】添加设备位置功能，支持地图展示和坐标选择
2026-01-21 21:10:09 +08:00
6c8c49966a
Perf: 优化antd upload组件参数获取 ( #7114 )
...
* perf(antd upload params): 优化组件参数取值 确保不同调用场景配置参数可用
* perf(antd upload params): 优化组件参数取值 确保不同调用场景配置参数可用
* perf(antd upload params): 优化组件参数取值 确保不同调用场景配置参数可用
* perf(antd upload params): 优化组件参数取值 确保不同调用场景配置参数可用
2026-01-21 17:20:53 +08:00
4aeb7a489a
!322 refactor:【antd】【iot】将 DeviceSaveReqVO 和 DeviceRespVO 合并到 Device，简化设备 API 接口
...
Merge pull request !322 from haohaoMT/dev
2026-01-21 05:43:57 +00:00
8571fc43b0
Merge branch 'main' into fix
2026-01-19 15:28:12 +08:00
59aabd956d
Perf: Optimization of cropping component result acquisition & optimization of cropping frame prompts ( #7111 )
...
* perf(cropper): enhance image cropping functionality and add output type support
* perf(cropper): enhance image cropping functionality and add output type support
2026-01-19 14:18:36 +08:00
9b09ba4483
Merge branch 'main' into fix
2026-01-19 10:54:43 +08:00
af0057940a
feat：增加 allowedHosts 变量，允许 natapp 转发，对应 https://t.zsxq.com/kSg2A
2026-01-18 17:04:03 +08:00
9e3d75ae65
fix：【infra】代码生成：全选不生效的问题
2026-01-18 16:20:43 +08:00
4cc900f542
review：【antd/ele】【mall】商城相关的代码
2026-01-18 14:43:49 +08:00
db1dfae481
feat: [bpm][antd] todo 修改
2026-01-17 15:47:31 +08:00
012412ec22
feat: [bpm][antd] todo 修改
2026-01-17 15:31:54 +08:00
db97d414ec
feat: [bpm][antd] todo 流程监听器、流程表达式修改
2026-01-17 12:09:46 +08:00
8bf286fda0
refactor:【antd】【iot】将 DeviceSaveReqVO 和 DeviceRespVO 合并到 Device，简化设备 API 接口
2026-01-16 17:38:02 +08:00
174c4ae749
fix(antd Upload onChange Event): rewrite onChange event to handle upl… ( #7098 )
...
* fix(antd Upload onChange Event): rewrite onChange event to handle upload success or error messages
* fix(antd Upload onChange Event): rewrite onChange event to handle upload success or error messages
* fix(antd Upload onChange Event): rewrite onChange event to handle upload success or error messages
2026-01-14 15:38:21 +08:00
67da9417a8
feat(upload prop:crop,aspectRatio): from Upload component accept prop… ( #7095 )
...
* feat(upload prop:crop,aspectRatio): from Upload component accept prop crop,aspectRatio
* feat(upload prop:crop,aspectRatio): from Upload component accept prop crop,aspectRatio
* feat(upload prop:crop,aspectRatio): from Upload component accept prop crop,aspectRatio
* feat(upload prop:crop,aspectRatio): from Upload component accept prop crop,aspectRatio
2026-01-14 15:38:05 +08:00
d5b49e6a3b
fix：【ele/antd】修复更新个人信息后菜单丢失问题
...
Signed-off-by: zlflying <zlflying@qq.com>
2026-01-14 14:44:17 +08:00
10f4641fee
fix：【ele/antd】修复 setup() 函数没有接收 props 参数，导致渲染函数中的 props 无法从 formCreate 传递
2026-01-13 12:37:13 +08:00
2426f891e7
feat：【antd/ele】将文章的商品关联字段从手动输入 SPU 编号改为使用 SpuShowcase 组件选择商品
2026-01-13 12:13:22 +08:00
e2433fc531
feat：【antd/ele】使用 productSpuIds 和 productCategoryIds 自定义插槽的表单在验证前同步 formData 中的值到表单中
2026-01-13 12:06:10 +08:00
bbc74ae663
feat：【antd/ele】discountActivity 移除 structuredClone 使用 cloneDeep
2026-01-13 11:55:13 +08:00
ea79b7d6a1
feat：【antd】cropper-modal 删除多余的 Image 预加载逻辑
2026-01-13 11:33:11 +08:00
51bca25345
fix(lint): pnpm format lint warning ( #7080 )
2026-01-10 14:06:03 +08:00
17d5d1b889
review：【antd】【iot】设备管理相关
2026-01-05 20:45:39 +08:00
de28c5c4c2
refactor:【antd】【iot】设备管理跟后端对齐，必要的 ReqVO、RespVO，子设备管理实现
2026-01-04 12:25:25 +08:00
ce7b7b910a
Merge branch 'main' of https://github.com/xingyu4j/vue-vben-admin into fix
2026-01-04 10:56:14 +08:00
f7f01c9280
feat：【antd/ele】生产环境下，默认开启 CAPTCHA 验证码，保证安全性
2026-01-03 19:20:25 +08:00
81a61558cb
feat(upload prop:maxSize): from Upload component accept prop maxSize (AI prompt fixed) ( #7059 )
...
* feat(upload prop:maxSize): from component accept prop maxSize
* feat(upload prop:maxSize): from component accept prop maxSize
* feat(upload prop:maxSize): from component accept prop maxSize
* feat(upload prop:maxSize): from component accept prop maxSize
2026-01-03 13:19:40 +08:00
a9f21c1acb
feat：【system】菜单管理：增加 visible 管理字段
2026-01-02 19:50:38 +08:00
19c7f0d5dd
feat: 【框架】更新 operate-log 的实现
2026-01-02 19:44:09 +08:00
cd43149429
review：【antd/ele】【bpm】流程模型的迁移
2026-01-02 18:49:47 +08:00
19919f6685
Merge remote-tracking branch 'origin/dev' into dev
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2026-01-02 18:29:54 +08:00
036ef294db
feat：【infra】代码生成：字典筛选时，支持 key、name 两种类型
2026-01-02 18:12:23 +08:00
f8ce09a203
Merge remote-tracking branch 'yudao/dev' into dev
2025-12-31 11:02:11 +08:00
59d83d29cb
feat: [bpm][ele] bpm oa 请假迁移
2025-12-31 11:00:13 +08:00
02193755be
feat: [bpm][antd] oa 请假优化
2025-12-31 00:04:40 +08:00
6d524906a3
!313 Merge remote-tracking branch 'yudao/dev' into dev
...
Merge pull request !313 from Jason/dev
2025-12-29 14:43:47 +00:00
cbd1f0bcbb
Merge remote-tracking branch 'yudao/dev' into dev
2025-12-29 11:53:00 +08:00
2ba2c8e986
feat: [bpm] [ele,antd] todo 优化, 更多设置问题修复
2025-12-29 11:51:48 +08:00
06f1ae1a66
review：【mall】营销相关
2025-12-29 08:17:35 +08:00
029b2ffaab
review：【antd/ele】【mall】营销活动的实现
2025-12-29 07:03:00 +08:00
64ac25de00
Merge remote-tracking branch 'yudao/dev' into dev
2025-12-29 00:12:30 +08:00
6606dfd40a
feat: [bpm][ele] todo 优化
2025-12-29 00:09:22 +08:00
aa95d0e87c
feat：【ele/antd】profile todo 优化
2025-12-28 18:55:07 +08:00
6353f0a8e9
feat：【ele/antd】discountActivity todo 优化
2025-12-28 18:34:28 +08:00
4395353c22
feat：【ele/antd】rewardActivity todo 优化
2025-12-28 17:35:43 +08:00
63a8d562ce
feat：【antd/ele】文件上传的组件优化
2025-12-27 18:50:42 +08:00
a109168c66
fix：【pay】修复钱包支付、模拟支付配置的修改报错问题
2025-12-27 17:29:08 +08:00
826a1b355a
feat：【antd/ele】对齐两侧的代码
2025-12-27 17:06:15 +08:00
9ef218f930
refactor: 【crm】【antd/ele】提取图表配置生成函数，统一 legend/grid/tooltip 处理，优化饼图面板生成
2025-12-27 17:02:11 +08:00
5a5d2f17da
feat：【bpm】【antd/ele】业务表单，支持重新发起流程
2025-12-27 12:49:14 +08:00
ab7b77989f
fix: lint
2025-12-26 14:25:55 +08:00
77cd814c99
Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev
2025-12-26 14:00:55 +08:00
68bb90a503
review：【antd】【iot】代码实现
2025-12-25 09:19:17 +08:00
11b5068e91
review：【antd】【bpm】评审流程详情界面
2025-12-25 00:58:16 +08:00
a1bb132233
feat(api-cascader): 添加联级组件ApiCascader ( #7031 )
2025-12-22 20:00:31 +08:00
af3fe53ec8
fix: type error
2025-12-22 17:50:06 +08:00
6bf9acbfb2
refactor:【antd】【iot】代码优化
2025-12-22 17:30:59 +08:00
13f81b3130
review：【antd】【iot】代码实现
2025-12-21 23:04:57 +08:00
835da00f2c
review：【antd/ele】【bpm】流程模型的迁移
2025-12-21 22:41:03 +08:00
3ea5510a21
review：【antd/ele】【mall】营销模块的迁移
2025-12-21 20:50:27 +08:00
a3f282cba3
!307 mall 商城优化完善
...
Merge pull request !307 from puhui999/dev-mall
2025-12-21 11:13:33 +00:00
7ab917dc48
fix：【system】邮箱移除无用的 remark 字段及相关表单项
2025-12-20 20:48:24 +08:00
e850ffb038
fix：【bpm】修复流程模型的业务表单，路径的 tooltip 不对
2025-12-20 15:11:54 +08:00
568d5aa4cf
feat：【antd】【mall】修复满减送编辑时表单打开异常的问题，原因：antd RangePicker 需要 dayjs 对象
2025-12-20 11:35:01 +08:00
41f0a9465d
feat：【ele】【mall】point 代码对齐 antd
2025-12-20 10:59:40 +08:00
d4b99f321d
fix：【system】登录日志的“操作类型”改为“登录类型”
2025-12-20 09:23:34 +08:00
f429e74e79
feat：【antd】【mall】point 优化完善
2025-12-20 08:56:32 +08:00
f99d708c97
feat：【antd】【mall】rewardActivity 优化完善
2025-12-20 08:53:47 +08:00
57855eff06
feat：【antd】【mall】seckill 优化完善
2025-12-20 08:40:09 +08:00
348cc35aec
feat：【antd】【mall】combination 优化完善
2025-12-20 08:33:40 +08:00
6922ab13fc
feat：【antd】【mall】bargain 优化完善
2025-12-20 08:24:30 +08:00
fbcb498f5b
feat：【system】操作日志增加 userType 的展示
2025-12-17 13:13:22 +08:00
2202ef3b3c
!304 refactor:【antd】【iot】重构设备详情页面，优化组件结构与路径，优化设备配置、属性、事件管理等功能
...
Merge pull request !304 from haohaoMT/dev
2025-12-16 14:55:09 +00:00
191e15975c
refactor:【antd】【iot】重构设备详情页面，优化组件结构与路径，优化设备配置、属性、事件管理等功能
2025-12-16 16:45:35 +08:00
5532f59c40
!303 refactor:【antd】【iot】统一列表视图和卡片视图的查询接口
...
Merge pull request !303 from haohaoMT/dev
2025-12-16 05:28:16 +00:00
439a35c165
refactor:【antd】【iot】统一列表视图和卡片视图的查询接口
2025-12-16 09:58:16 +08:00
3744069aa2
refactor:【antd】【iot】产品详情修改路径到 detail
2025-12-15 22:48:09 +08:00
1d8d70e71a
!301 refactor:【antd】【iot】更新首页必要的 ReqVO、RespVO
...
Merge pull request !301 from haohaoMT/dev
2025-12-15 14:28:31 +00:00
5cb412a4da
refactor:【antd】【iot】更新首页必要的 ReqVO、RespVO
2025-12-15 21:51:09 +08:00
e3c1676523
review：【antd/ele】【mall】商品模块的迁移
2025-12-15 19:44:11 +08:00
4ec82f0fd0
review：【antd/ele】【mall】营销模块的迁移
2025-12-15 19:29:47 +08:00
ef0f0a9a9d
!300 feat：【ele】【mall】promotion 代码迁移
...
Merge pull request !300 from puhui999/dev-mall
2025-12-15 09:01:19 +00:00
3088fb3d46
review：【antd/ele】【MP】代码迁移的 review
2025-12-15 14:27:09 +08:00
YunaiV