center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
6,852 Commits 1 Branch 86 Tags 417 MiB
6914d1e9f1
Commit Graph

6852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
taojinlong
6914d1e9f1 fix(数据源): 删除驱动报错 2022-08-26 16:07:36 +08:00
taojinlong
a298dd9ee9 fix(数据集): api 数据集字段丢失 2022-08-26 15:47:12 +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
fit2cloud-chenyw
fa709d5339 fix(仪表板-查询按钮): 查询按钮对tab内部视图无效 2022-08-25 15:53:57 +08:00
wangjiahao
ad34325bab refactor(仪表板): 仪表板使用缓存后保存按钮默认可用 2022-08-25 15:50:32 +08:00
taojinlong
57855c5937 fix(数据集): 任务管理中设置开始时间 2022-08-25 15:39:07 +08:00
taojinlong
50d7be8780 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-08-25 15:21:34 +08:00
taojinlong
6b436eb6e6 fix(数据集): 任务管理中预览数据 2022-08-25 15:21:16 +08:00
fit2cloud-chenyw
f1853fbb48 fix(仪表板-过滤器按钮): 清空按钮可以拖入多个 2022-08-25 15:04:29 +08:00
fit2cloud-chenyw
8cd0eb8932
Merge pull request #2943 from dataease/pr@dev@fix_filter_button 
fix(仪表板-过滤器按钮): 清空按钮可以拖入多个
 2022-08-25 15:00:52 +08:00
fit2cloud-chenyw
2a97a51164 fix(仪表板-过滤器按钮): 清空按钮可以拖入多个 2022-08-25 14:59:25 +08:00
王嘉豪
5885be9664
Merge pull request #2942 from dataease/dev 
dev merge
 2022-08-25 14:50:37 +08:00
fit2cloudrd
cb12d7d40c
fix(仪表板): 仪表板编辑状态点击浏览器回退后仪表板预览界面无法显示问题 (#2941) 
Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-08-25 14:49:35 +08:00
wangjiahao
e71d6a6b90 style: 国际化 2022-08-25 14:27:40 +08:00
wangjiahao
b58691a76c Merge remote-tracking branch 'origin/dev' into dev 2022-08-25 14:20:12 +08:00
wangjiahao
97ef183e36 fix: 解决分离部署状态下，无法加载仪表板背景图片问题 2022-08-25 14:19:48 +08:00
taojinlong
dc754054b4 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-08-25 14:01:56 +08:00
taojinlong
2ced0d8e38 fix(数据源驱动): jar报路径穿透 2022-08-25 14:00:47 +08:00
fit2cloudrd
183b06019a
refactor(仪表板): 富文本备选字段增加记录数 (#2940) 
* fix(仪表板): 修复富文本在tab页无效的问题

* refactor(富文本): 富文本编辑区结果展示文案修改，去掉下钻

* refactor(富文本): 富文本字段选择按钮再进入编辑状态再显示

* fix(仪表板): 富文本初始化进入仪表板编辑状态保存按钮会显示可以用问题

* refactor(仪表板): 富文本备选字段增加记录数

Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-08-25 13:39:25 +08:00
fit2cloudrd
75c21bf04d
refactor(仪表板): 优化修复富文本显示文案，tab页中的显示优化 (#2936) 
* fix(仪表板): 修复富文本在tab页无效的问题

* refactor(富文本): 富文本编辑区结果展示文案修改，去掉下钻

* refactor(富文本): 富文本字段选择按钮再进入编辑状态再显示

* fix(仪表板): 富文本初始化进入仪表板编辑状态保存按钮会显示可以用问题

Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-08-25 11:55:22 +08:00
dataeaseShu
95dbfd14a2
Merge pull request #2937 from dataease/pr@dev_station_msg 
Pr@dev station msg
 2022-08-25 11:26:41 +08:00
dataeaseShu
89fc43c1d4 Merge branch 'pr@dev_station_msg' of https://github.com/dataease/dataease into pr@dev_station_msg 2022-08-25 11:23:18 +08:00
dataeaseShu
4c31d9a6bd fix: 任务详情 2022-08-25 11:23:11 +08:00
dataeaseShu
ed587a4286 fix: 任务详情 2022-08-25 11:22:02 +08:00