Commit Graph

3484 Commits

Author SHA1 Message Date
王嘉豪
5aed9bf03d
Merge pull request #1275 from dataease/dev
Dev
2021-11-25 14:11:24 +08:00
王嘉豪
6cdf366888
Merge pull request #1274 from dataease/pr@dev@refactor_panel-jump
refactor: 更新flyway
2021-11-25 14:10:54 +08:00
wangjiahao
995dd148df refactor: 更新flyway 2021-11-25 14:09:53 +08:00
fit2cloud-chenyw
011b6d6927 fix: 时钟组件边框属性导致背景下移 2021-11-25 12:52:18 +08:00
fit2cloud-chenyw
1ef27410f6
Merge pull request #1273 from dataease/pr@dev@fix_时钟组件边框属性
fix: 时钟组件边框属性导致背景下移
2021-11-25 12:51:27 +08:00
fit2cloud-chenyw
e98b09a329 fix: 时钟组件边框属性导致背景下移 2021-11-25 12:50:31 +08:00
fit2cloud-chenyw
a4a1a6f50d fix: 仪表板下拉列表组件显示异常 2021-11-25 12:20:40 +08:00
fit2cloud-chenyw
d90bda5014
Merge pull request #1272 from dataease/pr@dev@fix_下拉列表组件显示异常
fix: 仪表板下拉列表组件显示异常
2021-11-25 12:19:08 +08:00
fit2cloud-chenyw
914536943b fix: 仪表板下拉列表组件显示异常 2021-11-25 12:17:41 +08:00
王嘉豪
59e0612d5f
Merge pull request #1271 from dataease/pr@dev@refactor_panel-jump
refactor: 仪表板跳转时首次刷新强制使用跳转条件
2021-11-25 12:13:51 +08:00
wangjiahao
1366892de7 refactor: 仪表板跳转时首次刷新强制使用跳转条件 2021-11-25 12:13:03 +08:00
junjie
3c78b3bec2 feat(数据集): 关联数据集 2021-11-25 11:33:47 +08:00
王嘉豪
6ec3276889
Merge pull request #1270 from dataease/dev
Dev
2021-11-25 11:26:47 +08:00
王嘉豪
f9a8518975
Merge pull request #1269 from dataease/pr@dev@refactor-panel-flyway
refactor: 添加flyway
2021-11-25 11:26:14 +08:00
wangjiahao
b7bd9e6177 refactor: 添加flyway 2021-11-25 11:23:35 +08:00
fit2cloud-chenyw
53263de98e
Merge pull request #1268 from dataease/pr@dev@fix_sass_version
fix: 升级sass版本
2021-11-25 11:19:16 +08:00
fit2cloud-chenyw
1b95ce1f8e fix: 升级sass版本 2021-11-25 11:18:18 +08:00
junjie
56169e3d24 feat(数据集):数据集字段管理页面,增加同步字段功能 2021-11-25 10:10:57 +08:00
taojinlong
db249689c7 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-24 18:50:07 +08:00
taojinlong
bf7c8bb333 refactor: 整理代码 2021-11-24 18:49:41 +08:00
王嘉豪
b55ac1bf9d
Merge pull request #1267 from dataease/pr@dev@refactor_sort
refactor: 树形列表统一使用拼音排序规则
2021-11-24 18:45:06 +08:00
wangjiahao
483bd8f0b1 refactor: 树形列表统一使用拼音排序规则 2021-11-24 18:42:16 +08:00
王嘉豪
381789bb32
Merge pull request #1266 from dataease/pr@dev@feat_authmodel-view
feat: 增加授权模型统一查询功能,视图使授权模型查询
2021-11-24 18:16:05 +08:00
wangjiahao
c15c58f63d feat: 增加授权模型统一查询功能,视图使授权模型查询 2021-11-24 18:14:41 +08:00
xuwei-fit2cloud
9e87a08a5b refactor: 设定flyway中数据表编码 2021-11-24 16:56:56 +08:00
taojinlong
8a3a793cbe refactor: 整理 sql 2021-11-24 16:21:49 +08:00
fit2cloud-chenyw
2bd7ae4036
Merge pull request #1265 from dataease/pr@dev@refactor_优化chorme_driver
refactor: 修改chromedriver路径
2021-11-24 14:46:50 +08:00
fit2cloud-chenyw
5d68cda520 refactor: 修改chromedriver路径 2021-11-24 14:45:23 +08:00
fit2cloud-chenyw
f9240e2fdd
Merge pull request #1264 from dataease/pr@dev@feat_change_dataset_task_icon
feat: 替换数据同步任务图标
2021-11-24 12:20:02 +08:00
fit2cloud-chenyw
9bd684988d feat: 替换数据同步任务图标 2021-11-24 12:18:59 +08:00
fit2cloud-chenyw
52036e5aae
Merge pull request #1263 from dataease/pr@dev@fix_flyway_error
fix: 定时报告flyway逻辑错误
2021-11-24 12:10:23 +08:00
fit2cloud-chenyw
1f4a2a6d3a fix: 定时报告flyway逻辑错误 2021-11-24 12:09:16 +08:00
王嘉豪
252560e3da
Merge pull request #1262 from dataease/pr@dev@fix_panel-default-edit
fix: 默认仪表板不需要显示编辑按钮
2021-11-24 12:02:55 +08:00
wangjiahao
066e6b57da fix: 默认仪表板不需要显示编辑按钮 2021-11-24 11:49:40 +08:00
王嘉豪
77a31d7b8c
Merge pull request #1261 from dataease/pr@dev@feat_panel-view-result
feat: 仪表板支持统一设置视图结果显示数量
2021-11-24 11:27:17 +08:00
wangjiahao
abb58954af feat: 仪表板支持统一设置视图结果显示数量 2021-11-24 11:25:01 +08:00
fit2cloud-chenyw
9387770fc1
Merge pull request #1260 from dataease/pr@dev@feat_chrome_driver_image
feat: 增加chromium镜像
2021-11-24 11:02:57 +08:00
fit2cloud-chenyw
0e6cc7c017 feat: 增加chromium镜像 2021-11-24 11:01:55 +08:00
fit2cloud-chenyw
ee4fe0cb7f
Merge pull request #1259 from dataease/pr@dev@refactor_format_code_style
refactor: 格式化代码
2021-11-24 10:33:40 +08:00
fit2cloud-chenyw
e7b413582e refactor: 格式化代码 2021-11-24 10:32:29 +08:00
fit2cloud-chenyw
5b66754c35
Merge pull request #1258 from dataease/pr@dev@feat_xpack_定时报告sql
feat: 定时报告sql语句
2021-11-23 18:51:17 +08:00
fit2cloud-chenyw
fb6347b4ea feat: 定时报告sql语句 2021-11-23 18:50:11 +08:00
fit2cloud-chenyw
5e00cf6a3a
Merge pull request #1257 from dataease/pr@dev@feat_xpack定时报告自测版本
feat: 定时报告自测版本
2021-11-23 18:41:12 +08:00
fit2cloud-chenyw
cdf75963b6
Merge branch 'dev' into pr@dev@feat_xpack定时报告自测版本 2021-11-23 18:40:40 +08:00
fit2cloud-chenyw
09d6cc7103 feat: 定时报告自测版本 2021-11-23 18:37:32 +08:00
taojinlong
b9742acbb7 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-23 17:39:06 +08:00
taojinlong
99dcfa8511 refactor: 整理 sql 2021-11-23 17:38:55 +08:00
XiaJunjie2020
7d07a2c81d
Merge pull request #1256 from dataease/pr@dev@feat_union_dataset
feat(数据集): 关联数据集
2021-11-23 17:37:46 +08:00
junjie
0069c5a4b1 feat(数据集): 关联数据集 2021-11-23 17:34:54 +08:00
XiaJunjie2020
9b6c85d511
Merge pull request #1252 from dataease/pr@dev@fix_chart_switch
fix(视图): 修复图表类型切换逻辑
2021-11-23 16:58:09 +08:00