Commit Graph

6873 Commits

Author SHA1 Message Date
taojinlong
a28ab4e81a fix: 去除重名变量 2022-08-29 11:44:40 +08:00
fit2cloud-chenyw
7edebc36cd
Merge pull request #2963 from dataease/pr@dev@fix_reset_button_and_select_all
fix(仪表板-清空按钮): 过滤器全选后清空按钮无法重置全选状态
2022-08-29 10:27:10 +08:00
taojinlong
719ca79c7c Merge branch 'v1.14' into dev 2022-08-29 10:26:15 +08:00
fit2cloud-chenyw
be7e501390 fix(仪表板-清空按钮): 过滤器全选后清空按钮无法重置全选状态 2022-08-29 10:26:07 +08:00
taojinlong
e140941c0d Merge branch 'v1.14' of github.com:dataease/dataease into v1.14 2022-08-29 10:19:11 +08:00
Zhimin Ruan
f39d15a7f9 chore: cleanup unnecessary console log 2022-08-26 22:22:23 +08:00
dataeaseShu
b2e48eefe5
Merge pull request #2957 from dataease/pr@dev_station_msg
Pr@dev station msg
2022-08-26 18:05:39 +08:00
dataeaseShu
47ae49047f Merge branch 'pr@dev_station_msg' of https://github.com/dataease/dataease into pr@dev_station_msg 2022-08-26 18:01:39 +08:00
dataeaseShu
ffc6f7dbe9 fix: 导航栏图标更换 逻辑修改 2022-08-26 18:01:34 +08:00
dataeaseShu
675db63496 fix: 导航栏图标更换 逻辑修改 2022-08-26 17:58:14 +08:00
taojinlong
81a438b28d refactor: 梳理国际化 2022-08-26 16:58:41 +08:00
taojinlong
6914d1e9f1 fix(数据源): 删除驱动报错 2022-08-26 16:07:36 +08:00
taojinlong
a298dd9ee9 fix(数据集): api 数据集字段丢失 2022-08-26 15:47:12 +08:00
dataeaseShu
eac04be960
Merge pull request #2955 from dataease/pr@dev_station_msg
fix: 插件图片路径报错修复
2022-08-26 13:49:28 +08:00
dataeaseShu
fcb4957699 fix: 插件图片路径报错修复 2022-08-26 13:46:40 +08:00
wangjiahao
668aadca92 refactor: 更新flyway 2022-08-26 13:08:41 +08:00
dataeaseShu
d4dbedebef fix: 模版管理 插件管理 国际化 bug修复 2022-08-26 13:02:19 +08:00
dataeaseShu
74e7a830ff
Merge pull request #2954 from dataease/pr@dev_station_msg
Pr@dev station msg
2022-08-26 13:01:49 +08:00
dataeaseShu
df339a075c Merge branch 'pr@dev_station_msg' of https://github.com/dataease/dataease into pr@dev_station_msg 2022-08-26 13:01:02 +08:00
dataeaseShu
9bf6a752bb fix: 模版管理 插件管理 国际化 bug修复 2022-08-26 13:00:57 +08:00
dataeaseShu
b7619388b5 fix: 模版管理 插件管理 国际化 bug修复 2022-08-26 13:00:23 +08:00
wangjiahao
495fe81801 Merge remote-tracking branch 'origin/dev' into dev 2022-08-26 11:32:19 +08:00
wangjiahao
0549689f56 fix: 修复背景格式转换错误可能导致背景无法显示问题 2022-08-26 11:32:08 +08:00
taojinlong
2a16f1fc5f fix(数据集): with查询支持变量 2022-08-26 11:08:22 +08:00
taojinlong
074ca0f23c Merge branch 'dev' into v1.14 2022-08-25 22:06:16 +08:00
taojinlong
30cfa8e5c0 fix(数据集): 添加API数据表报错 2022-08-25 22:04:56 +08:00
taojinlong
43cb2c2190 fix(数据集): SQL数据集参数会把between等条件丢失 2022-08-25 21:59:27 +08:00
taojinlong
d915775007 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-08-25 21:53:39 +08:00
fit2cloud-chenyw
a7ec063a65 style(仪表板-树过滤器): 树过滤器弹出两个下拉框 2022-08-25 20:34:39 +08:00
fit2cloud-chenyw
d658ea4159
Merge pull request #2952 from dataease/pr@dev@style_tree_filter
style(仪表板-树过滤器): 树过滤器弹出两个下拉框
2022-08-25 20:33:55 +08:00
fit2cloud-chenyw
a8e1634c23 style(仪表板-树过滤器): 树过滤器弹出两个下拉框 2022-08-25 20:33:06 +08:00
maninhill
7f29acd229
Merge pull request #2946 from limboinf/dev
fix typo
2022-08-25 18:00:46 +08:00
dataeaseShu
91d4b6c5d8 fix: 任务管理 bug修复 2022-08-25 17:58:37 +08:00
dataeaseShu
72691b8498
Merge pull request #2951 from dataease/pr@dev_station_msg
Pr@dev station msg
2022-08-25 17:57:31 +08:00
dataeaseShu
b5f57f75f4 Merge branch 'pr@dev_station_msg' of https://github.com/dataease/dataease into pr@dev_station_msg 2022-08-25 17:56:00 +08:00
dataeaseShu
aa3b1e7830 fix: 任务管理 bug修复 2022-08-25 17:55:55 +08:00
dataeaseShu
58f4ab3ff4 fix: 任务管理 bug修复 2022-08-25 17:54:28 +08:00
taojinlong
28cb167fbe fix(数据源): 复制API数据表,增加后缀 2022-08-25 17:11:55 +08:00
wangjiahao
ca133ccc64 Merge remote-tracking branch 'origin/dev' into dev 2022-08-25 16:50:37 +08:00
wangjiahao
864c6e42fd refactor(视图): 富文本视图如果未定义字段显示'无法获取字段'定义字段但没有值则不显示 2022-08-25 16:50:27 +08:00
fit2cloud-chenyw
45bd320c0b fix(仪表板-日期范围过滤器): 显示时间默认值调整 2022-08-25 16:17:28 +08:00
fit2cloud-chenyw
ade4bf7c2d
Merge pull request #2947 from dataease/pr@dev@fix_time_range
fix(仪表板-日期范围过滤器): 显示时间默认值调整
2022-08-25 16:16:38 +08:00
fit2cloud-chenyw
ec3f5c8701 fix(仪表板-日期范围过滤器): 显示时间默认值调整 2022-08-25 16:15:42 +08:00
taojinlong
9c9898b4b5 fix(数据集): 修改文档路径 2022-08-25 16:12:05 +08:00
taojinlong
83553c85ff Merge branch 'dev' of github.com:dataease/dataease into dev 2022-08-25 16:10:29 +08:00
limbo
6278f8b4a2 fix typo 2022-08-25 16:09:21 +08:00
taojinlong
63648496a8 fix(数据源): 校验api数据源状态 2022-08-25 16:04:59 +08:00
wangjiahao
634530411e Merge remote-tracking branch 'origin/dev' into dev 2022-08-25 15:56:20 +08:00
fit2cloud-chenyw
75a0e37a9b fix(仪表板-查询按钮): 查询按钮对tab内部视图无效 2022-08-25 15:55:49 +08:00
fit2cloud-chenyw
4ca7df5a6a
Merge pull request #2945 from dataease/pr@dev@fix_filter_button_tab
fix(仪表板-查询按钮): 查询按钮对tab内部视图无效
2022-08-25 15:54:45 +08:00