Commit Graph

8855 Commits

Author SHA1 Message Date
fit2cloud-chenyw
cd3122f9e0 fix(api): 恢复错误提交 2023-01-04 09:48:50 +08:00
王嘉豪
6e99a24ba0
Merge pull request #4263 from dataease/pr@dev@refactor_map-style
style: 调整地图跳转弹框样式
2023-01-03 18:21:57 +08:00
wangjiahao
77dc7162aa style: 调整地图跳转弹框样式 2023-01-03 18:14:24 +08:00
wisonic-s
425c001d2d
Merge pull request #4262 from dataease/pr@dev@fix_relation_delete_tip
fix(血源关系): 删除数据源和数据集时如果没有查看血源关系的权限则不提示跳转
2023-01-03 17:50:19 +08:00
wisonic-s
037cfed585 fix(血源关系): 删除数据源和数据集时如果没有查看血源关系的权限则不提示跳转 2023-01-03 17:45:28 +08:00
王嘉豪
8ca993a5db
Merge pull request #4261 from dataease/pr@dev@refactor_details-style
style: 明细导出等样式调整
2023-01-03 17:37:38 +08:00
wangjiahao
e225a60b95 style: 明细导出等样式调整 2023-01-03 17:26:33 +08:00
taojinlong
653cdacd79 fix: 增量sql出错 2023-01-03 17:16:47 +08:00
taojinlong
f2c0cbc48c fix: 替换Excel时,判断字段变更 2023-01-03 16:48:25 +08:00
dataeaseShu
dbd02fa562
Merge pull request #4259 from dataease/pr@dev_memory_component
Pr@dev memory component
2023-01-03 16:41:04 +08:00
dataeaseShu
40547c7da3 Merge branch 'dev' into pr@dev_memory_component 2023-01-03 16:37:00 +08:00
dataeaseShu
d68b811962 fix: 上传两个相同列Excel时,修改某个表最后一列字段类型,另一个Excel的最后一个字段类型会同时改变。 2023-01-03 16:34:15 +08:00
fit2cloudrd
baf8e7a2c4
Update README.md 2023-01-03 15:14:12 +08:00
王嘉豪
17378ae562
Merge pull request #4257 from dataease/pr@dev@refactor_subject-style
refactor: 优化仪表板主题样式
2023-01-03 14:55:19 +08:00
wangjiahao
6c1cf41828 refactor: 优化仪表板主题样式 2023-01-03 14:52:14 +08:00
王嘉豪
9586f9959c
Merge pull request #4256 from dataease/pr@dev@refactor_app-edit
refactor(应用): 复用数据源的应用记录允许编辑
2023-01-03 12:53:20 +08:00
wangjiahao
6ca72d0ba8 refactor(应用): 复用数据源的应用记录允许编辑 2023-01-03 12:46:26 +08:00
王嘉豪
7fe50fa920
Merge pull request #4255 from dataease/pr@dev@fix_app-datasource
fix(应用): 复用历史数据源记录名称,数据源删除时在应用日志中也进行显示
2023-01-03 11:51:58 +08:00
wangjiahao
219af08ee3 fix(应用): 复用历史数据源记录名称,数据源删除时在应用日志中也进行显示 2023-01-03 11:49:31 +08:00
fit2cloud-chenyw
b56b2f94ec
Merge pull request #4250 from dataease/pr@dev@fix_api
fix(api): api文档token无法续命
2022-12-30 17:20:04 +08:00
fit2cloud-chenyw
4a68c0fcbc fix(api): api文档token无法续命 2022-12-30 16:51:51 +08:00
dataeaseShu
61eb33b406
Merge pull request #4249 from dataease/pr@dev_memory_component
Pr@dev memory component
2022-12-30 16:06:25 +08:00
dataeaseShu
842ad33853 Merge branch 'dev' into pr@dev_memory_component 2022-12-30 16:02:00 +08:00
dataeaseShu
0728264056 fix: 上传Excel后,标题上的字段类型下拉框切换字段类型功能异常 2022-12-30 16:01:22 +08:00
王嘉豪
78e1299ec7
Merge pull request #4248 from dataease/pr@dev@refactor_url-check
refactor(仪表板): 增加仪表板跳转外部链接URL非法提示
2022-12-30 13:49:40 +08:00
wangjiahao
0cea8a41ae refactor(仪表板): 增加仪表板跳转外部链接URL非法提示 2022-12-30 13:48:18 +08:00
王嘉豪
719c3f197b
Merge pull request #4247 from dataease/pr@dev@refactor_subject
refactor(仪表板): 默认主题背景更新为高清
2022-12-30 12:15:46 +08:00
wangjiahao
b60f78fd56 refactor(仪表板): 默认主题背景更新为高清 2022-12-30 12:09:56 +08:00
xuwei-fit2cloud
a629af0c4e
Merge pull request #4246 from dataease/pr@dev@fix_mark_map_copy
fix(地图): 跟随仪表板复制后丢失经纬度以及标记字段
2022-12-30 10:59:01 +08:00
fit2cloud-chenyw
0230fbb7c0 fix(地图): 跟随仪表板复制后丢失经纬度以及标记字段 2022-12-30 10:52:53 +08:00
taojinlong
f5af838dfc
Merge pull request #4245 from dataease/pr@dev@fixds
fix: 同步数据分页错误
2022-12-29 22:29:41 +08:00
taojinlong
14a85cbcc6 fix: 同步数据分页错误 2022-12-29 22:28:10 +08:00
wisonic-s
943e32862c
Merge pull request #4244 from dataease/pr@dev@fix_relation_analyze
fix(血源关系): 修复存在多个 Excel 数据集依赖时的报错
2022-12-29 19:35:26 +08:00
wisonic-s
d0418edd8d fix(血源关系): 修复存在多个 Excel 数据集依赖时的报错 2022-12-29 19:26:32 +08:00
wisonic-s
4111e52396 fix(数据集): 修复数据集不存在依赖时的提示 2022-12-29 19:24:59 +08:00
wisonic-s
ec3243e4ed fix(数据源): 修复数据源删除提示 2022-12-29 19:23:44 +08:00
王嘉豪
a4302bb8b7
Merge pull request #4243 from dataease/pr@dev@fix_tab-switch
fix: 修复收藏tab切换至仪表板tab页面右侧没有内容显示
2022-12-29 18:32:53 +08:00
wangjiahao
63edb86766 fix: 修复收藏tab切换至仪表板tab页面右侧没有内容显示 2022-12-29 18:30:01 +08:00
dataeaseShu
3b7f39c7c3
Merge pull request #4242 from dataease/pr@dev_memory_component
Pr@dev memory component
2022-12-29 18:21:01 +08:00
dataeaseShu
6b0f7f2cf1 Merge branch 'dev' into pr@dev_memory_component 2022-12-29 18:19:51 +08:00
dataeaseShu
fc99267188 fix: excel数据集无数据源 2022-12-29 18:18:00 +08:00
王嘉豪
e3bacf0d57
Merge pull request #4241 from dataease/pr@dev@refactor_manager-auth
refactor: 更新默认管理员权限
2022-12-29 17:51:55 +08:00
wangjiahao
686edb3456 refactor: 更新默认管理员权限 2022-12-29 17:49:20 +08:00
dataeaseShu
cd91a2e33b
Merge pull request #4240 from dataease/pr@dev_memory_component
Pr@dev memory component
2022-12-29 17:43:25 +08:00
dataeaseShu
101d190127 Merge branch 'dev' into pr@dev_memory_component 2022-12-29 17:39:23 +08:00
dataeaseShu
d5798723c9 fix: 创建数据源保存后没有退回数据源列表页面 2022-12-29 17:38:48 +08:00
dataeaseShu
4c89078a21
Merge pull request #4239 from dataease/pr@dev_memory_component
Pr@dev memory component
2022-12-29 17:33:27 +08:00
dataeaseShu
bcf4bbe8b0 Merge branch 'dev' into pr@dev_memory_component 2022-12-29 17:28:30 +08:00
dataeaseShu
b97f1dcfb9 fix: 创建数据源保存后没有退回数据源列表页面 2022-12-29 17:27:49 +08:00
dataeaseShu
40389740e0
Merge pull request #4238 from dataease/pr@dev_memory_component
Pr@dev memory component
2022-12-29 17:02:28 +08:00