|
|
54a680c0ff
|
feat(tsconfig): 修改参数
|
2024-05-30 11:41:50 +08:00 |
|
江志雄
|
6a75d0412a
|
Merge branch 'hotfix/fixRequestTs-20240530' into 'master'
修改ts报错
See merge request web-project/zhst-lambo!38
|
2024-05-30 10:41:17 +08:00 |
|
|
|
0718d8c4d1
|
修改ts报错
|
2024-05-30 10:40:46 +08:00 |
|
江志雄
|
ed22f8bcf9
|
Merge branch 'develop' into 'master'
feat(biz,map): 添加文档
See merge request web-project/zhst-lambo!37
|
2024-05-30 10:39:07 +08:00 |
|
|
|
6f4797694f
|
feat(biz,map): 添加文档
|
2024-05-30 10:37:55 +08:00 |
|
江志雄
|
375d5983f4
|
Merge branch 'feat/update-mapDoc' into 'develop'
feat(zhst/map,zhst/biz): map完善文档,biz修改boxSelectTree的文档格式
See merge request web-project/zhst-lambo!36
|
2024-05-30 10:36:03 +08:00 |
|
|
|
c65756bbb2
|
feat(zhst/map,zhst/biz): map完善文档,biz修改boxSelectTree的文档格式
|
2024-05-30 10:34:04 +08:00 |
|
|
|
3666fc4ed1
|
feat(zhst/map): 添加例子
|
2024-05-30 09:13:15 +08:00 |
|
江志雄
|
05f99f7359
|
Merge branch 'develop' into 'master'
feat(zhst/biz,zhst/material): 修改版本统一
See merge request web-project/zhst-lambo!35
|
2024-05-29 14:56:55 +08:00 |
|
|
|
3bd50deeb3
|
Merge branch 'develop' of http://10.0.0.88/web-project/zhst-lambo into develop
|
2024-05-29 14:55:03 +08:00 |
|
江志雄
|
60ef9e88ee
|
Merge branch 'develop' into 'master'
feat(zhst/meta,zhst/map): zhst/map:拓展地图api,加入tools组件、cluster组价、marker组件
See merge request web-project/zhst-lambo!34
|
2024-05-29 14:53:21 +08:00 |
|
|
|
b930efa40d
|
feat(zhst/biz,zhst/material): 修改版本统一
|
2024-05-29 14:52:01 +08:00 |
|
江志雄
|
0cfdaa4851
|
Merge branch 'feat/create-map-20240521' into 'develop'
feat(zhst/meta,zhst/map): zhst/map:拓展地图api,加入tools组件、cluster组价、marker组件、draw组件、popup组件；zhst/mata:添加floatButton组件
See merge request web-project/zhst-lambo!33
|
2024-05-29 14:50:16 +08:00 |
|
|
|
f9c5dccb73
|
fix(biz,material): 修改冲突
|
2024-05-29 14:49:53 +08:00 |
|
|
|
f778ec1b72
|
feat(zhst/meta,zhst/map): zhst/map:拓展地图api,加入tools组件、cluster组价、marker组件
、draw组件、popup组件；zhst/mata:添加floatButton组件
|
2024-05-29 14:43:41 +08:00 |
|
|
|
dd6ff1d2be
|
feat(@zhst/map): 添加popup功能
|
2024-05-24 18:03:43 +08:00 |
|
|
|
23706fabf9
|
feat(@zhst/map): 添加marker功能
|
2024-05-23 18:14:32 +08:00 |
|
江志雄
|
e8ddd60daa
|
Merge branch 'develop' into 'master'
feat(@zhst/biz): 树组件支持tag面板、优化filter传参、优化option传参、废弃之前的定制化方案
See merge request web-project/zhst-lambo!32
|
2024-05-23 15:16:14 +08:00 |
|
|
|
da3c1714c5
|
feat(@zhst/biz): 树组件支持tag面板、优化filter传参、优化option传参、废弃之前的定制化方案
|
2024-05-23 15:14:17 +08:00 |
|
|
|
2e753a7259
|
feat(map): 工具箱完成
|
2024-05-21 19:07:15 +08:00 |
|
江志雄
|
e90dcce641
|
Merge branch 'develop' into 'master'
feat(biz无限滚动组件): 添加屏幕自适应撑开
See merge request web-project/zhst-lambo!31
|
2024-05-21 10:45:10 +08:00 |
|
|
|
d02a2b2015
|
feat(biz): 提交打包信息
|
2024-05-21 10:44:25 +08:00 |
|
|
|
e3e3c05ae0
|
feat(map地图): 初始化地图配置,引入相关js文件作为参考
|
2024-05-21 10:42:01 +08:00 |
|
江志雄
|
d95fe37e43
|
Merge branch 'feat/upgrade-infinityList' into 'develop'
Feat/upgrade infinity list
See merge request web-project/zhst-lambo!30
|
2024-05-21 10:40:24 +08:00 |
|
|
|
570f183382
|
feat(biz无限滚动组件): 添加屏幕自适应撑开
|
2024-05-21 10:37:47 +08:00 |
|
江志雄
|
1f6c7ccb18
|
Merge branch 'develop' into 'master'
fix(reqeust,func): zhst/request 修改重新登录问题,zhst/func 添加指定路由跳转方法
See merge request web-project/zhst-lambo!29
|
2024-05-17 11:50:49 +08:00 |
|
|
|
b2dbace653
|
fix(reqeust,func): zhst/request 修改重新登录问题,zhst/func 添加指定路由跳转方法
|
2024-05-17 11:49:47 +08:00 |
|
江志雄
|
3b9d13d9b9
|
Merge branch 'develop' into 'master'
fix(zhst/meta、zhst/biz、zhst/material): 修改图片标注组件
See merge request web-project/zhst-lambo!28
|
2024-05-17 09:57:09 +08:00 |
|
|
|
8215fa5e4f
|
Merge branch 'master' into develop
|
2024-05-17 09:17:40 +08:00 |
|
戴炜
|
f09b77e689
|
只有master分支触发打包
|
2024-05-17 09:16:01 +08:00 |
|
|
|
a65d6e062d
|
fix conflict
|
2024-05-16 18:13:40 +08:00 |
|
|
|
fe321d1c3b
|
fix conflict
|
2024-05-16 18:12:04 +08:00 |
|
|
|
b3a18efa8f
|
fix conflict
|
2024-05-16 18:04:34 +08:00 |
|
|
|
8dc81e1743
|
fix(zhst/meta、zhst/biz、zhst/material): 修改图片标注组件
|
2024-05-16 18:02:10 +08:00 |
|
戴炜
|
6b7dc33bce
|
打包使用带git的镜像
|
2024-05-16 14:50:10 +08:00 |
|
|
|
5fe34f8b87
|
fix: 添加首页
|
2024-05-15 11:18:44 +08:00 |
|
|
|
f766136844
|
fix: 删除md中的ts语法
|
2024-05-15 09:38:31 +08:00 |
|
|
|
2310cac125
|
Merge branch 'develop'
# Conflicts:
# deploy/build.sh
|
2024-05-15 09:18:11 +08:00 |
|
戴炜
|
eb72f16e3a
|
gitlab-ci修改
|
2024-05-14 17:52:05 +08:00 |
|
江志雄
|
1f6d3cd5d7
|
Update build.sh
|
2024-05-14 17:12:18 +08:00 |
|
|
|
37c34eb785
|
Merge branch 'develop' into feat/cropper-upgrade
# Conflicts:
# packages/meta/src/cropperImage/CropperImage.tsx
# packages/meta/src/cropperImage/demo/basic.tsx
|
2024-05-14 14:01:51 +08:00 |
|
江志雄
|
511471e5c5
|
Update .npmrc
|
2024-05-14 11:36:25 +08:00 |
|
|
|
d80cab2407
|
Merge branch 'develop' into feat/cropper-upgrade
# Conflicts:
# packages/meta/src/cropperImage/CropperImage.tsx
# packages/meta/src/cropperImage/demo/basic.tsx
|
2024-05-14 11:27:13 +08:00 |
|
|
|
59f0924c66
|
fix(all): zhst/biz、zhst/meta、zhst/material: 修改 od、修改 boxSelectTree
|
2024-05-14 11:24:21 +08:00 |
|
|
|
0f0644495a
|
fix(zhst/meta): 修改圈选重新渲染,透出重新绘制方法
|
2024-05-13 19:36:45 +08:00 |
|
|
|
457fa88dcc
|
Merge branch 'develop' into feat/cropper-upgrade
|
2024-05-13 10:51:47 +08:00 |
|
|
|
3083ef7865
|
fix(deploy.build): 修改打包命令
|
2024-05-13 10:37:12 +08:00 |
|
|
|
5f806dadba
|
fix: 边框颜色主题色，实时监控窗口有图片和选中，预警记录文字溢出
|
2024-05-13 10:33:49 +08:00 |
|
江志雄
|
72db5f1273
|
Merge branch 'hongbo/file-cabinet' into 'develop'
fix: 边框颜色主题色，实时监控窗口有图片和选中，预警记录文字溢出
See merge request web-project/zhst-lambo!27
|
2024-05-13 10:27:13 +08:00 |
|
苑宏博
|
64d38943f7
|
fix: 代码优化
|
2024-05-13 09:57:44 +08:00 |
|
