Commit Graph

99 Commits

Author SHA1 Message Date
YuanHongbo
718d348d91 fix: 测试视频播放 2024-04-21 18:43:20 +08:00
YuanHongbo
feb2ef7db1 fix: 优化预警记录 od 添加容错 img.onerror 2024-04-21 17:07:26 +08:00
YuanHongbo
93f0670ded fix: 优化预警记录 od 2024-04-21 15:43:25 +08:00
YuanHongbo
e25180d3ee fix: 预警记录添加 od 2024-04-20 16:47:10 +08:00
YuanHongbo
911ae99e27 fix: 修改变量名字 2024-04-09 19:48:19 +08:00
YuanHongbo
37794c50f3 Merge remote-tracking branch 'remotes/origin/develop' into hongbo/file-cabinet 2024-04-09 19:44:56 +08:00
8b2902f7fa feat: 优化图片预览组件 2024-04-08 16:40:58 +08:00
39a11cbed3 fix: 添加依赖包 2024-04-08 09:55:31 +08:00
0ea53caade fix: 删除lock文件 2024-04-07 16:39:09 +08:00
c47d4ff80b fix: 修改schema透出 2024-04-07 16:36:14 +08:00
35497d39ad feat(升级包): request、slave 2024-04-07 11:52:34 +08:00
b433d5f182 fix: 修改打包文件 2024-03-27 11:39:19 +08:00
c4088792e8 fix: 优化 slave 跳转方法 2024-03-27 11:38:12 +08:00
江志雄
8eb6ad5fd7 Merge branch 'develop-lf' into 'develop'
fix: mapbox添加react导入

See merge request web-project/zhst-lambo!11
2024-03-27 10:56:01 +08:00
18d44be102 fix: 修改打包依赖 2024-03-27 10:24:53 +08:00
lifan
619cbffa1c fix: mapbox添加react导入 2024-03-27 09:08:17 +08:00
4bbfce77c0 Merge branch 'feat/update_slave-20240324' into develop 2024-03-26 18:04:53 +08:00
ea867cd1ac fix(biz): 添加 traansfer 组件 searchProps 透传 2024-03-26 18:04:26 +08:00
江志雄
e59b290559 Merge branch 'develop-lf' into 'develop'
完善地图组件与示例,抛出mapConfig定制化参数传入,完善API说明

See merge request web-project/zhst-lambo!10
2024-03-26 17:51:00 +08:00
lifan
0a7a210322 fix: 合并代码 2024-03-25 17:27:24 +08:00
lifan
95bd78f3b1 Merge branch 'develop-lf' of http://gitlab.zhst-dev.com/web-project/zhst-lambo into develop-lf 2024-03-25 17:23:02 +08:00
lifan
0d2a8a232d feat: 完善地图例子,抛出mapConfig定制化参数传入,完善API说明 2024-03-25 17:22:36 +08:00
lifan
6f65746373 feat: 完善地图组件 2024-03-25 17:13:42 +08:00
843df14b69 fix: 忽略所有上传 2024-03-24 13:53:42 +08:00
李帆
d370fed819 Merge branch 'develop' into 'develop-lf'
# Conflicts:
#   packages/map/es/index.d.ts
#   packages/map/es/index.js
#   packages/map/lib/index.js
2024-03-22 17:56:14 +08:00
lifan
b2df3e3a7c feat: map包v1 2024-03-22 17:39:53 +08:00
lifan
caf7869f15 feat: 优化iconfont组件库用户体验 2024-03-22 17:19:37 +08:00
f9ce7156b4 Merge branch 'develop' into jzx/add_slave_docs-20240322 2024-03-22 17:13:20 +08:00
51b793019d fix: 修改物料登录组件 2024-03-22 17:12:38 +08:00
c0ede44b4d fix: 新生成的lib、es包缓存 2024-03-22 13:43:40 +08:00
江志雄
eddd4c7afb Merge branch 'develop-lf' into 'develop'
feat: 顺利打包并上传es与lib

See merge request web-project/zhst-lambo!8
2024-03-22 12:00:23 +08:00
lifan
d36518078d feat: 顺利打包并上传es与lib 2024-03-22 11:58:15 +08:00
江志雄
4fb21f0236 Merge branch 'develop-lf' into 'develop'
feat: 引入iconfont组件

See merge request web-project/zhst-lambo!7
2024-03-22 11:45:06 +08:00
lifan
72ba7bcc83 fix: 更换包依赖所在地 2024-03-22 11:41:55 +08:00
lifan
7aa51db9b2 feat: 引入iconfont组件 2024-03-22 11:23:16 +08:00
7a264f4e47 Merge branch 'develop'
# Conflicts:
#	package.json
2024-03-22 11:11:14 +08:00
8daa0a5fbe fix: 修改md文件 2024-03-22 10:47:05 +08:00
42513c21cf feat: 初始化icon、map包 2024-03-22 10:45:18 +08:00
bc5a281a50 fix: 添加slave包 2024-03-22 09:17:08 +08:00
江志雄
679ff254bf Merge branch 'hostfix/fix_command' into 'master'
fix: 修改打包命令

See merge request web-project/zhst-lambo!5
2024-03-19 09:45:01 +08:00
江志雄
204b050233 Merge branch 'master' into 'hostfix/fix_command'
# Conflicts:
#   packages/biz/src/boxSelectTree/components/boxPanel/index.tsx
2024-03-19 09:40:40 +08:00
江志雄
b42be0d8b1 Merge branch 'develop' into 'master'
Develop

See merge request web-project/zhst-lambo!6
2024-03-19 09:39:58 +08:00
88a1fb0715 fix: 修改文件引用 2024-03-19 09:38:16 +08:00
a0ba07963d fix: 修改打包命令 2024-03-19 09:31:46 +08:00
xlx
f5af44bcb7 feat:添加ci 2024-03-19 09:23:48 +08:00
YuanHongbo
ea77da711f fix: 边框设置2px 防止闪烁 2024-03-18 11:06:11 +08:00
YuanHongbo
b5faa55ada fix: 修改包引入方式 2024-03-18 10:39:52 +08:00
YuanHongbo
59ce1a5218 fix: 优化部分样式表,修改包引入方式 2024-03-18 10:20:17 +08:00
57f54b7164 fix: 添加数据为空时自定义 2024-03-15 17:27:42 +08:00
江志雄
572876c585 fix: 修改biz盒子树组件校验规则 2024-03-14 10:47:05 +08:00