Commit Graph

6536 Commits

Author SHA1 Message Date
fit2cloud-chenyw
575e175e3d feat(视图-地图): 地图增加区域名称映射配置 2022-07-31 20:04:44 +08:00
fit2cloud-chenyw
c1cbd88597
Merge pull request #2743 from dataease/pr@dev@feat_map_mapping
feat(视图-地图): 地图增加区域名称映射配置
2022-07-31 19:59:34 +08:00
fit2cloud-chenyw
ff8409883c feat(视图-地图): 地图增加区域名称映射配置 2022-07-31 19:58:29 +08:00
taojinlong
d68aa61b9a fix(数据源): es 字段类型处理 2022-07-31 16:51:10 +08:00
taojinlong
39e4e02221 fix(数据源): es 字段类型处理 2022-07-31 16:40:11 +08:00
taojinlong
a8e816588a fix(数据源): api 数据源校验问题 2022-07-31 15:44:25 +08:00
taojinlong
a2fe087ca1 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-31 15:43:30 +08:00
taojinlong
94e96c8b99 Merge branch 'v1.13' of github.com:dataease/dataease into v1.13 2022-07-31 15:43:09 +08:00
taojinlong
bb11dbf40b fix(数据源): api 数据源校验问题 2022-07-31 15:42:38 +08:00
fit2cloud-chenyw
be9a1ac3bf fix(视图): 地图地名映射配置以解决世界地图无法下钻 2022-07-29 18:30:39 +08:00
fit2cloud-chenyw
b7f8514930
Merge pull request #2741 from dataease/pr@dev@fix_global_map_mapping
fix(视图): 地图地名映射配置以解决世界地图无法下钻
2022-07-29 18:29:36 +08:00
fit2cloud-chenyw
6d64044bbe fix(视图): 地图地名映射配置以解决世界地图无法下钻 2022-07-29 18:28:41 +08:00
王嘉豪
4361dc1f76
Merge pull request #2740 from dataease/dev
dev merge
2022-07-29 18:16:01 +08:00
wangjiahao
4b2db13671 pref: 移除未使用的npm包 2022-07-29 18:15:04 +08:00
dataeaseShu
49af07827c
Merge pull request #2739 from dataease/pr@dev_api_datasource
fix: API字段校验 导航栏展开bug修复
2022-07-29 15:27:37 +08:00
dataeaseShu
3ae8198a66 fix: API字段校验 导航栏展开bug修复 2022-07-29 15:22:50 +08:00
王嘉豪
b64ac729a9
Merge pull request #2738 from dataease/fix_panel-edit
style: 跳转系统管理边距等
2022-07-29 13:20:29 +08:00
wangjiahao
75a373c222 style: 跳转系统管理边距等 2022-07-29 13:19:24 +08:00
王嘉豪
73fe16cc50
Merge pull request #2737 from dataease/dev
dev merge
2022-07-29 12:09:21 +08:00
王嘉豪
2cab2f35c0
Merge pull request #2736 from dataease/pr@dev@style-edit
style: 替换菜单为新主题色
2022-07-29 12:07:33 +08:00
wangjiahao
d5d91b0d73 style: 替换菜单为新主题色 2022-07-29 12:05:53 +08:00
taojinlong
57a9a7c0f0 fix(数据源): 校验参数有效性 2022-07-29 12:03:35 +08:00
taojinlong
5030ced037 fix(数据源): 校验参数有效性 2022-07-29 12:02:10 +08:00
王嘉豪
8934162058
Merge pull request #2735 from dataease/dev
dev merge
2022-07-29 11:56:14 +08:00
王嘉豪
8ef554c5be
Merge pull request #2734 from dataease/pr@dev@fix_panel-edit
fix(仪表板): 修复目录也可以通过预览编辑按钮进入仪表板编辑页面的问题
2022-07-29 11:55:30 +08:00
wangjiahao
d69b5756f5 fix(仪表板): 修复目录也可以通过预览编辑按钮进入仪表板编辑页面的问题 2022-07-29 11:54:29 +08:00
taojinlong
a9f6d0ac98 fix(数据集): 数据集sql变量 2022-07-29 11:49:33 +08:00
taojinlong
a52d706877 fix(数据集): 数据集sql变量 2022-07-29 11:44:18 +08:00
wangjiahao
d934726036 Merge remote-tracking branch 'origin/dev' into dev 2022-07-29 11:28:23 +08:00
wangjiahao
226d70a2ee style(仪表板): 删除仪表板增加loading效果 2022-07-29 11:28:12 +08:00
taojinlong
2cab3b33a7 fix(数据集): 数据集列权限 2022-07-29 11:05:25 +08:00
taojinlong
223ebc0bfd Merge branch 'v1.13' of github.com:dataease/dataease into v1.13 2022-07-29 11:05:16 +08:00
taojinlong
5083cea4b9 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-29 11:03:12 +08:00
taojinlong
9162b96fbe fix(数据集): 数据集列权限 2022-07-29 11:03:02 +08:00
dataeaseShu
bf5de1b5ea
Merge pull request #2733 from dataease/pr@dev_user_manage
fix: 表格翻页样式统一
2022-07-29 10:35:54 +08:00
wangjiahao
81ac688970 Merge remote-tracking branch 'origin/dev' into dev 2022-07-29 10:35:06 +08:00
wangjiahao
611ffb9ccb refactor(仪表板): 下钻区域的维度也可以设置跳转 2022-07-29 10:34:53 +08:00
dataeaseShu
769ae00303 fix: 表格翻页样式统一 2022-07-29 10:34:00 +08:00
junjun
e83687c9e7 refactor(视图): 表格阈值null与空字符串合并成一个条件 2022-07-28 22:16:37 +08:00
junjun
c07b4326e3 refactor(视图): 视图计算字段限制过滤 2022-07-28 22:15:26 +08:00
fit2cloud-chenyw
7c14840da8 fix(仪表板-过滤器): 时间过滤组件过滤精度到毫秒的视图有误差 2022-07-28 22:14:41 +08:00
fit2cloud-chenyw
25a72fe68a
Merge pull request #2731 from dataease/pr@dev@fix_time_filter
fix(仪表板-过滤器): 时间过滤组件过滤精度到毫秒的视图有误差
2022-07-28 22:13:21 +08:00
fit2cloud-chenyw
76ee642459 fix(仪表板-过滤器): 时间过滤组件过滤精度到毫秒的视图有误差 2022-07-28 22:11:32 +08:00
fit2cloud-chenyw
a81c323457 fix(仪表板-过滤器): 日期范围过滤器失效 2022-07-28 20:37:13 +08:00
fit2cloud-chenyw
d575e73a7c perf(系统管理-定时报告): 发送视图信息需要带入过滤条件 2022-07-28 20:36:41 +08:00
fit2cloud-chenyw
c38a346414
Merge pull request #2730 from dataease/pr@dev@fix_date_ranger
fix(仪表板-过滤器): 日期范围过滤器失效
2022-07-28 20:33:14 +08:00
fit2cloud-chenyw
a703eb3cd5 fix(仪表板-过滤器): 日期范围过滤器失效 2022-07-28 20:32:28 +08:00
taojinlong
3dd8c45e92 fix(数据集): sql数据集变量 2022-07-28 18:34:49 +08:00
taojinlong
1c5a5af56c fix(数据集): sql数据集变量 2022-07-28 18:34:08 +08:00
dataeaseShu
f1a302871c
Merge pull request #2727 from dataease/pr@dev_filter_search
Pr@dev filter search
2022-07-28 17:55:23 +08:00