Commit Graph

2581 Commits

Author SHA1 Message Date
lzh
b34973ca92 chore: build and deploy web-antd [skip ci] 2025-12-23 14:05:04 +08:00
lzh
7a9142673d chore: build and deploy web-antd [skip ci] 2025-12-23 13:56:38 +08:00
lzh
58630196f7 cleaning - 前端基础样式调整v1.0 (#2)
Some checks failed
Web UI CI/CD / build-and-deploy (push) Failing after 46m41s
## 描述

将 `cleaning` 开发分支合并到 `master`。

主要改动包括:
- 基础前端页面调整为初版设计

`cleaning` 分支中包含了多个开发过程的提交,本次合并计划 **使用 Squash 合并为一次提交**,以保持 `master` 分支历史清晰。

## 类型

- [ ] Bug 修复(非破坏性修改)
- [x] 新功能(非破坏性新增功能)
- [ ] 破坏性修改(修改会影响现有功能)
- [ ] 需要更新文档
- [x] 除非引入新的测试示例,否则不修改 `pnpm-lock.yaml`

Reviewed-on: http://124.221.55.225:3000/XW-AIOT/aiot-platform-ui/pulls/2
2025-12-23 10:51:03 +08:00
lzh
3260ec0e99 chore: ensure app joins 1panel-network"
All checks were successful
Web UI CI/CD / build-and-deploy (push) Successful in 5m22s
2025-12-18 15:05:45 +08:00
lzh
179afea2e1 fix: 使用aiot-server容器名
All checks were successful
Web UI CI/CD / build-and-deploy (push) Successful in 3m9s
2025-12-18 14:41:21 +08:00
lzh
ac76faacc4 fix: 使用后端容器ip
Some checks failed
Web UI CI/CD / build-and-deploy (push) Has been cancelled
2025-12-18 14:37:41 +08:00
lzh
7773b1dc88 fix: 修复后端接口连接不上问题
All checks were successful
Web UI CI/CD / build-and-deploy (push) Successful in 3m40s
2025-12-18 14:20:06 +08:00
lzh
874c06fa51 fix: 优化构建速度,后端容器名
All checks were successful
Web UI CI/CD / build-and-deploy (push) Successful in 3m31s
2025-12-18 14:03:54 +08:00
lzh
1c04ff0d7b fix: 解决后端服务跨域的问题
All checks were successful
Web UI CI/CD / build-and-deploy (push) Successful in 3m23s
2025-12-18 13:57:00 +08:00
lzh
5fcb011bd1 fix: 修改配置文件172.17.16.14
Some checks failed
Web UI CI/CD / build-and-deploy (push) Failing after 8s
2025-12-18 13:43:55 +08:00
lzh
924b66f836 fix: 修改后端地址为172.17.16.14
All checks were successful
Web UI CI/CD / build-and-deploy (push) Successful in 4m3s
2025-12-18 13:33:36 +08:00
lzh
e6b1d7400d Merge branch 'master' of http://124.221.55.225:3000/XW-AIOT/aiot-platform-ui
Some checks failed
Web UI CI/CD / build-and-deploy (push) Failing after 3m49s
2025-12-18 12:05:15 +08:00
lzh
b2e831155c feat: 构建cicd | docke部署 | nginx 配置文件 2025-12-18 12:04:23 +08:00
lzh
b98a7dc924 fix: 名称修改
Some checks failed
Semantic Pull Request / Semantic Pull Request (pull_request_target) Has been cancelled
CI / Test (ubuntu-latest) (pull_request) Has been cancelled
CI / Test (windows-latest) (pull_request) Has been cancelled
CI / Lint (ubuntu-latest) (pull_request) Has been cancelled
CI / Lint (windows-latest) (pull_request) Has been cancelled
CI / Check (ubuntu-latest) (pull_request) Has been cancelled
CI / Check (windows-latest) (pull_request) Has been cancelled
CI / CI OK (pull_request) Has been cancelled
2025-12-17 17:34:03 +08:00
jason
86efe618de Merge remote-tracking branch 'yudao/dev' into dev 2025-11-28 09:13:09 +08:00
jason
c9d917b649 feat: [bpm][ele] 发起流程迁移 2025-11-28 00:26:42 +08:00
YunaiV
6a8f60957d review:【antd/ele】【mall】代码迁移的 review 2025-11-27 17:58:54 +08:00
芋道源码
271923999c !282 feat:【antd】【mall】满减送组件优化
Merge pull request !282 from puhui999/dev-mall
2025-11-27 09:54:39 +00:00
puhui999
33c7f38ec3 feat:【antd】【mall】满减送组件优化 2025-11-27 17:50:07 +08:00
xingyu4j
1f212e7e6a Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev 2025-11-27 17:25:13 +08:00
puhui999
07c209bd1d feat:【antd】【mall】满减送组件优化 2025-11-27 17:20:12 +08:00
YunaiV
7d9285de96 review:【antd/ele】【mp】代码迁移的 review 2025-11-27 16:24:39 +08:00
xingyu4j
d558ebe510 fix: todo 比较通用 2025-11-27 14:08:17 +08:00
xingyu4j
0ab23a98d8 fix: todo 比较通用的功能 2025-11-27 14:07:00 +08:00
xingyu4j
7fea95adff fix: lint 2025-11-27 13:55:12 +08:00
xingyu
a976ca88f6 !281 Merge branch 'dev' of <a href="https://gitee.com/yudaocode/yudao-ui-admin-vben">https://gitee.com/yudaocode/yudao-ui-admin-vben</a> into dev
Merge pull request !281 from dylanmay/dev
2025-11-27 05:33:41 +00:00
dylanmay
6c5a65a6bd Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev 2025-11-27 12:17:53 +08:00
xingyu4j
8d9d60b960 fix: ele build error 2025-11-27 11:27:42 +08:00
xingyu4j
80c61f00eb fix: build error 2025-11-27 11:24:07 +08:00
xingyu4j
08eb0d6bc0 fix: build error 2025-11-27 11:22:19 +08:00
xingyu4j
dcb491dfa8 fix: build error 2025-11-27 11:22:17 +08:00
xingyu4j
219c8e19c4 fix: tailwindcss style 2025-11-27 11:05:57 +08:00
xingyu4j
1a18c5c771 fix: tailwindcss style 2025-11-27 11:05:04 +08:00
xingyu4j
8e2c85770c fix: lint 2025-11-27 11:04:41 +08:00
xingyu4j
54bd498f24 fix: tailwindcss style 2025-11-27 11:04:23 +08:00
xingyu4j
9ce498f269 fix: lint 2025-11-27 11:03:49 +08:00
dylanmay
5374e64bcb fix: resolve todo 2025-11-27 09:55:24 +08:00
jason
8fa9366a19 Merge remote-tracking branch 'yudao/dev' into dev 2025-11-26 22:50:12 +08:00
jason
fe8d13da66 feat: [bpm][ele] 流程/任务详情迁移 2025-11-26 22:49:00 +08:00
jason
ac305676d8 feat: [bpm][ele] 流程/任务详情迁移 2025-11-26 22:46:38 +08:00
YunaiV
03e5bf5c3d fix:【antd】构建失败的问题 2025-11-26 19:24:49 +08:00
YunaiV
4af433e4d7 review:【antd/ele】代码迁移的 review 2025-11-26 19:17:55 +08:00
芋道源码
d5e2afdb55 !279 fix: 图文草稿箱样式调整、todo修复
Merge pull request !279 from hw/dev
2025-11-26 11:08:51 +00:00
YunaiV
3cb0afe319 feat:【ele】【mp】模版消息的新增 2025-11-26 19:08:09 +08:00
YunaiV
672a6c9ccc feat:【antd】【mp】模版消息的新增 2025-11-26 19:05:08 +08:00
puhui999
4f45438e11 feat:【antd】【mall】积分商城活动优化 2025-11-26 16:40:13 +08:00
puhui999
0ded54872b fix:【antd】【mall】优化修复 spu-and-sku-list 选择器 2025-11-26 16:34:14 +08:00
puhui999
ea57b64795 fix:【antd】【mall】优化修复 sku-table-select 选择器 2025-11-26 16:30:30 +08:00
hw
0b2d35fc67 fix: 草稿箱行内样式修改 2025-11-26 15:44:00 +08:00
hw
c014f2a188 fix: 图文草稿箱样式调整、todo修复 2025-11-26 10:46:24 +08:00