8ab0c53011
Merge remote-tracking branch 'origin/master' into migration
...
# Conflicts:
# apps/web-antd/src/views/iot/home/modules/message-trend-card.vue
# apps/web-antd/src/views/iot/rule/data/sink/config/redis-stream-config-form.vue
# apps/web-antd/src/views/mes/md/client/components/md-client-select-dialog.vue
# apps/web-ele/src/views/iot/home/modules/message-trend-card.vue
# apps/web-ele/src/views/iot/rule/data/sink/config/redis-stream-config-form.vue
# apps/web-ele/src/views/iot/thingmodel/modules/input-output-param.vue
# pnpm-lock.yaml
# pnpm-workspace.yaml
2026-05-24 22:20:36 +08:00
aeff25209d
fix(iot): 修复 13 处 bug 并完成 codex 三轮收口
...
按 codex 两轮 review 分批处理 IoT 模块 13 处 bug，对第二轮反馈中
B42/B47 的类型/字段问题做最终收尾，所有修复 web-antd / web-ele 两端同步。
主要修复：
- B91 设备分组：删除前校验 deviceCount，分组下有设备时弹警告
- B40 物模型 array 数据规格：从 Radio.Group @change 事件正确取值（antd）
- B42 物模型属性历史：list 写入时按 idx 生成 _rowKey，模板 row-key="_rowKey"
list 类型改 IotDeviceApi.DeviceProperty & { _rowKey: string }
匹配后端 IotDevicePropertyMapper.xml 实际返回的字段
（修掉 codex 指出的 antd row-key TS2322 与 ele 同毫秒撞键）
- B119 物模型表单：edit 模式禁用 identifier 编辑
- B47 场景规则主条件：产品/设备切换时清 deviceId/identifier/operator/value
（修掉 codex 指出的 condition.value.param TS2339，Trigger 无 param）
- B44 数据目的数据库配置：SQL 复制按钮 setTimeout 在 onBeforeUnmount 中清理
- B51 场景规则首页统计：total 取接口 result.total，其余基于当前页
- B29 产品卡片视图：图标为 URL 时改用 <img> 渲染，复用 @vben/utils 的 isHttpUrl
- B43 首页设备地图：移除过度设计的 AbortController，回归 vue3 源项目同款
InfoWindow 监听写法，querySelector 限定到 .BMap_bubble_content 子树
- B105 场景规则设备选择器：productId 变化后旧 deviceId 不在新列表则清空
- B45 通用 key-value 编辑器：v-for key 改用递增的 _uid，避免编辑/删除时 DOM 复用错乱
- B132 设备导入表单：beforeUpload 校验 .xls/.xlsx
- B126 设备详情：四个 tab 子组件 v-if 增加 device.id 守卫
附带工具收敛：
- @vben-core/shared/utils 新增 formatDayjs，统一 antd TimePicker/DatePicker
value-format 后回传的 Dayjs|string 归一
- 场景规则首页 updateStatistics 补回 JSDoc，对齐文件内其他 function 风格
验证：
- 改动文件 pnpm exec eslint 0 error
- pnpm -F @vben/web-antd / @vben/web-ele exec vue-tsc --noEmit --skipLibCheck
过滤 src/views/iot/|src/api/iot/ 均 0 hit
2026-05-24 10:11:43 +08:00
fb2595ef90
Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin
2026-05-23 18:39:12 +08:00
f813245827
feat: 偏好设置的快捷键列表追加ESC快捷键的控制（关闭当前窗口） ( #7947 )
...
* feat: 快捷键追加ESC控制，关闭当前窗口
* feat: 偏好设置中，页面切换动画的颜色看不清的问题（使用当前主题色）
* feat: 三种弹出框支持快捷键ESC动作
* feat: 代码自动格式化（3个框架改动）
* feat: 代码自动格式化（3个框架改动）
* fix: 修正locale数据获取方式
* 单元测试问题修改
* 单元测试问题修改
* fix: 解决代码评论的问题
* fix: 解决代码评论的问题
* fix: 解决代码评论的问题
* fix: 解决代码评论的问题
* 单元测试问题修改
* fix: 解决评论问题
* fix: 解决代码格式导致pnpm run lint报错的问题
---------
Co-authored-by: PanFu <panfu@zhihuaai.com>
2026-05-23 09:50:35 +08:00
cfbd13289f
!345 迁移 wms + iot 部分
...
Merge pull request !345 from 芋道源码/migration
2026-05-23 01:42:47 +00:00
60eb1335f8
chore: vite 降级到8.0.10
2026-05-22 13:20:25 +08:00
f2b3b12553
chore: pnpm v11 ( #7942 )
...
* chore: remove rolldown dep
* fix: issues-helper and maintain-one-comment are temporarily disabled due to security issues
* chore: update deps
* fix: change error type to TypeError for non-browser environment check in LocalStorageDriver
* chore: update pnpm v11
2026-05-22 12:02:14 +08:00
5b67c2e740
chore: 更新pnpm-lock
2026-05-21 20:44:38 +08:00
2d7c3c3072
chore: 更新pnpm-lock
2026-05-21 20:40:49 +08:00
fda4b39c01
chore: update deps
2026-05-20 16:38:19 +08:00
74d8942f39
chore: remove Unused deps
2026-05-20 16:24:59 +08:00
9ec98f0846
refactor: replace depcheck with knip for dependency checking
...
Migrate vsh check-dep from depcheck to knip, reducing
315 transitive dependencies. Config is inlined in
DEFAULT_CONFIG, matching the check-circular pattern.
Also re-export CollapsibleParams from @vben/common-ui.
2026-05-20 16:14:21 +08:00
f71094e878
refactor: migrate json-viewer from vue-json-viewer to vue-json-pretty
...
- Replace vue-json-viewer with vue-json-pretty (actively maintained, Vue 3 native)
- Map original props to vue-json-pretty API in bindProps for backward compatibility
- Implement copy functionality via renderNodeActions slot with i18n support
- Update style.scss from .jv-* to .vjs-* class names
2026-05-20 14:39:17 +08:00
9badda3d11
chore: update deps
2026-05-20 11:30:03 +08:00
f77166b3a2
chore: update deps
2026-05-19 15:59:43 +08:00
5db93a345a
fix: doc build error
2026-05-18 20:17:35 +08:00
6592135cc5
chore: update vitepress v2
2026-05-18 18:23:10 +08:00
2f16ee7cf5
docs: use antdv-next
2026-05-18 17:30:59 +08:00
350d5ee60e
refactor: playground use antdv-next
2026-05-18 16:18:46 +08:00
1ec058cbe3
chore: update deps
2026-05-18 15:06:59 +08:00
0e4012c623
feat（全局）：增加 barcode 二维码组件
2026-05-17 23:07:56 +08:00
aa577d84e9
fix(@vben/web-antdv-next): 更新 antdv-next 依赖版本至 1.3.0，修复相关兼容性问题
2026-05-17 20:13:14 +08:00
aadf9b6e39
chore: update deps
2026-05-16 11:52:20 +08:00
ccfc122eae
fix(@vben/web-antdv-next): 将依赖从 @form-create/ant-design-vue 改为 @form-create/antdv-next
2026-05-15 18:05:31 +08:00
40f0ba71f5
feat(@vben/web-antdv-next): migrate ant-design-vue to antdv-next
...
Migration Summary: ant-design-vue → antdv-next
Core Changes
package.json - Replaced "ant-design-vue": "catalog:" with "antdv-next": "catalog:"
bootstrap.ts - Changed @vben/styles/antd to @vben/styles/antdv-next
adapter/component/index.ts - Major rewrite:
Removed dynamic defineAsyncComponent imports from ant-design-vue/es/...
Added static imports from antdv-next main entry
Renamed RangePicker → DateRangePicker, Textarea → TextArea
Defined local types for Rule, Locale, UploadRequestOption, FileType, Key
Bulk Import Replacements (100+ files)
from ant-design-vue → from antdv-next
from ant-design-vue/es/locale/... → from antdv-next/locale/...
from ant-design-vue/es/... → removed (use main entry)
from ant-design-vue/lib/... → removed (use main entry)
Component API Differences Handled
ant-design-vue antdv-next Files affected
Form.Item FormItem 475 references
Tabs.TabPane TabPane 240 references
Select.Option SelectOption 151 references
Descriptions.Item DescriptionsItem 2 references
Timeline.Item TimelineItem 2 references
Radio.Group RadioGroup 20 references
Collapse.Panel CollapsePanel 9 references
Layout.Content/Sider/Header/Footer LayoutContent/LayoutSider/... 14 references
Dropdown#overlay slot Dropdown#popupRender 6 references
RangePicker DateRangePicker 15+ references
Textarea TextArea 37 references
ButtonGroup Space (fallback) 12 references
Known Issues (requires manual attention)
List component - Not available in antdv-next. 4 files have TODO comments where List/List.Item/List.Item.Meta are used
@form-create/ant-design-vue - Kept as-is (compatible with antdv-next at runtime)
Type errors - ~366 type errors remain (vs 189 in web-antd), mostly pre-existing business logic issues and minor API differences
2026-05-12 15:30:08 +08:00
0fced45a9c
refactor(@vben/web-antdv-next): 根据web-antd初始化web-antdv-next
2026-05-12 12:14:32 +08:00
d55f17670a
chore: 更新依赖包版本
...
- 更新 pkg-types 从 2.3.0 到 2.3.1
- 更新 rolldown 从 1.0.0-rc.15 到 1.0.0-rc.17
- 更新 typescript 从 6.0.2 到 6.0.3
- 更新 vite 从 8.0.8 到 8.0.10
2026-05-01 06:55:42 +08:00
4ca2f1c6e8
feat(@vben/plugins): tiptap 支持图片上传功能
...
- 新增 imageUpload 配置项，支持自定义上传接口
- 支持文件选择、拖拽、粘贴三种上传方式
- 上传中显示 blob 预览图 + loading spinner / 进度条
- 支持 accept 和 maxSize 文件校验
- 支持 onUploadError 自定义错误处理
- 未配置 imageUpload 时保持原有 URL 插入行为不变
- 使用 NodeView 实现实时 DOM 控制的进度展示
2026-04-27 13:42:36 +08:00
6885927441
chore: fix actions error
2026-04-15 18:49:07 +08:00
6f18718c87
feat: add collapsible 组件，form表单增加单项可折叠，支持schema配置默认关闭/开启
...
feat: add collapsible 组件，form表单增加单项可折叠，支持schema配置默认关闭/开启
- shadcn-ui 增加 collapsible组件，collapsible-params组件
- form新增支持单项折叠
- collapsible-params组件在Form表单应用
2026-04-13 19:20:01 +08:00
37393e1820
chore: fix actions error
2026-04-13 17:52:16 +08:00
93e23c6b05
chore: update deps
2026-04-13 17:52:16 +08:00
093479bb33
chore: remove vite-plugin-html
2026-04-13 17:52:16 +08:00
bd369df3bc
fix: check deps
2026-04-13 17:52:16 +08:00
4f7b396ebb
chore: update deps
2026-04-13 17:52:16 +08:00
7a60a081a2
chore: update deps
2026-04-13 17:52:13 +08:00
c693c854a7
fix: extension-document
2026-04-13 17:52:13 +08:00
5eca357a5c
feat(@vben/plugins): add tiptap rich text editor
2026-04-13 17:52:13 +08:00
e421d9d99b
chore: update deps
2026-04-13 17:52:12 +08:00
a653e428f3
Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin
2026-04-13 16:45:32 +08:00
4af5d6152b
chore: fix actions error
2026-04-11 14:13:13 +08:00
307781f437
chore: update deps
2026-04-10 22:16:33 +08:00
298930b0d7
chore: remove vite-plugin-html
2026-04-10 22:00:33 +08:00
54d95b8761
fix: check deps
2026-04-10 21:23:24 +08:00
4a16040d3e
chore: update deps
2026-04-10 21:18:26 +08:00
44a5809a46
chore: update deps
2026-04-01 08:10:49 +08:00
2428fb1407
fix: extension-document
2026-03-30 19:50:44 +08:00
bb78882f72
feat(@vben/plugins): add tiptap rich text editor
2026-03-30 19:36:29 +08:00
ca5f360231
chore: update deps
2026-03-30 18:24:25 +08:00
1128ef5acd
chore: update deps
2026-03-23 17:13:39 +08:00
YunaiV