Commit Graph

1403 Commits

Author SHA1 Message Date
junjie
18b68616ac Merge branch 'dev' of /Users/gin/dataease/dataease with conflicts. 2021-08-10 16:13:22 +08:00
wangjiahao
b3c7aa5d16 refactor:仪表版多组件间联动 2021-08-10 15:50:00 +08:00
junjie
20fc994cac feat: 矩形树图 2021-08-10 11:00:38 +08:00
junjie
be0971e965 feat: 散点气泡图 2021-08-09 17:21:35 +08:00
XiaJunjie2020
b79339ce9e
Merge pull request #562 from dataease/pr@dev@feat_限制矩形图指标数量
feat: 限制矩形图指标数量
2021-08-09 16:57:48 +08:00
junjie
54e0490279 feat: 限制矩形图指标数量 2021-08-09 16:56:49 +08:00
fit2cloud-chenyw
9adde0ca10
Merge pull request #561 from dataease/pr@dev@feat_aksk_sql
feat: 添加ak,sk的flyway
2021-08-09 16:53:21 +08:00
fit2cloud-chenyw
8b421b8f91 feat: 添加ak,sk的flyway 2021-08-09 16:52:04 +08:00
junjie
64f7b943e4 fix: 删除多余代码 2021-08-09 16:43:47 +08:00
junjie
ed034e59f4 feat: 矩形树图 2021-08-09 16:37:15 +08:00
fit2cloud-chenyw
c94c02f24b
Merge pull request #558 from dataease/pr@dev@feat_aksk
feat: 添加ak,sk
2021-08-09 16:04:02 +08:00
fit2cloud-chenyw
bb711fb406 feat: 添加ak,sk 2021-08-09 16:01:29 +08:00
junjie
f521f2b7a1 refactor: 视图返回参数构建 2021-08-09 13:43:54 +08:00
taojinlong
dcbea29b55 Merge branch 'dev' into pr@dev@sqlserver 2021-08-09 12:45:42 +08:00
wangjiahao
d46a40dcd2 feat:仪表板联动设置浮层 2021-08-06 17:24:17 +08:00
junjie
f8980b59e2 refactor: scatter优化 2021-08-06 16:40:48 +08:00
junjie
911573673b feat: 散点图、气泡图 2021-08-06 16:15:59 +08:00
taojinlong
4ec3cdb68d Merge branch 'dev' into pr@dev@sqlserver 2021-08-06 12:25:22 +08:00
taojinlong
c983b661ff feat: sqlserver 2021-08-06 12:19:25 +08:00
taojinlong
74b849d0b9 feat: sqlserver 2021-08-06 10:21:50 +08:00
wangjiahao
49ce82cac7 refactor:临时提交 2021-08-05 18:41:47 +08:00
wangjiahao
3a2bb24ca8 refactor:设置弹出框优化 2021-08-05 16:54:47 +08:00
wangjiahao
ad42815ca2 refactor:图片修改为自适应,不保持宽高比例 2021-08-05 13:47:48 +08:00
junjie
5ae6475da7 refactor: 指标卡样式选项优化 2021-08-05 11:19:06 +08:00
fit2cloud-chenyw
ed0f59097a feat: dev版本号升1.2.0 2021-08-05 10:11:00 +08:00
wangjiahao
9dd6e403c6 refactor:仪表板联动目标视图获取方式优化 2021-08-04 21:44:50 +08:00
junjie
2d9b13570d feat: 视图下钻 2021-08-04 18:07:06 +08:00
王嘉豪
c856d1c91d
Merge branch 'dev' into pr@dev@feat_panel-linkage 2021-08-04 16:54:22 +08:00
wangjiahao
1c91e0e831 feat:仪表板联动增加源联动视图虚化样式,过滤非视图组件等 2021-08-04 16:52:49 +08:00
junjie
68a80e2cc8 feat: 视图钻取 2021-08-04 16:40:53 +08:00
junjie
13576f0d4d refactor: tree菜单位置飘移优化 2021-08-04 11:57:39 +08:00
taojinlong
85059c5cfa Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-04 10:35:18 +08:00
taojinlong
e438d4e1f0 fix: 原始表添加列时,同步失败 2021-08-04 10:34:50 +08:00
taojinlong
e4b16b33c3 fix: 没有经过全量更新不能进行增量更新,并记录日志 2021-08-04 10:34:43 +08:00
taojinlong
225c36230a fix: 查询任务日志 2021-08-04 10:34:41 +08:00
taojinlong
a3defb1a88 feat: 优化任务状态的切换 2021-08-04 10:34:37 +08:00
wangjiahao
ae520246bd refactor:仪表板编辑入口鼠标悬浮去掉颜色变化 2021-08-03 18:50:42 +08:00
wangjiahao
94be9ecb25 refactor:仪表板联动设置按钮样式调整 2021-08-03 18:45:42 +08:00
wangjiahao
f909427422 feat:仪表板联动设置 2021-08-03 18:37:24 +08:00
junjie
8bee21e36a refactor: 堆叠项不允许指标拖入 2021-08-03 17:33:05 +08:00
junjie
cabb266545 refactor: 数据集tree修复 2021-08-03 17:12:48 +08:00
junjie
dc0131ee05 refactor: 去掉多余请求 2021-08-03 16:50:43 +08:00
fit2cloud-chenyw
546152fe27
Merge pull request #501 from dataease/pr@dev@perf_优化地图文件请求速度
perf: rest请求优化为json文件请求
2021-08-03 16:06:20 +08:00
fit2cloud-chenyw
1aa5b483fb perf: rest请求优化为json文件请求 2021-08-03 16:05:05 +08:00
wangjiahao
52990c9684 refactor:更换仪表板视图设置组件 2021-08-03 15:49:04 +08:00
junjie
4b039160e3 fix: 字段编辑修复 2021-08-03 14:51:52 +08:00
fit2cloud-chenyw
721c5858e8
Merge pull request #492 from dataease/pr@dev@fix_国际化冲突
fix: 解决国际化冲突
2021-08-03 14:05:19 +08:00
fit2cloud-chenyw
94d716d1bc fix: 解决国际化冲突 2021-08-03 14:03:34 +08:00
junjie
bb58d690dc refactor: 编辑字段样式调整 2021-08-03 13:48:14 +08:00
wangjiahao
b0905f98d2 fix:仪表板样式修改保存按钮还是灰的问题 2021-08-03 13:25:27 +08:00
taojinlong
38e05c2dc6
Merge pull request #485 from dataease/pr@dev@edit-datasource
feat: 允许修改数据源
2021-08-03 12:22:08 +08:00
taojinlong
d22c809421 feat: 允许修改数据源 2021-08-03 12:21:10 +08:00
王嘉豪
355b780579
Merge pull request #484 from dataease/pr@dev@feat_panel-view-set-bar
refactor:明细弹出样式修改
2021-08-03 12:06:25 +08:00
wangjiahao
d61795898c refactor:明细弹出样式修改 2021-08-03 12:05:29 +08:00
junjie
e8fa584d47 fix: 雷达图数据结构 2021-08-03 11:50:15 +08:00
王嘉豪
1ebb5690a8
Merge pull request #480 from dataease/pr@dev@feat_panel-view-set-bar
feat:预览界面点击组件显示设置入口,点击空白也取消设置入口;去掉原有鼠标移入显示的样式
2021-08-03 11:33:37 +08:00
wangjiahao
7960180858 feat:预览界面点击组件显示设置入口,点击空白也取消设置入口;去掉原有鼠标移入显示的样式 2021-08-03 11:31:17 +08:00
wangjiahao
2bbca0e525 feat:组件预览入口修改为悬浮蓝色悬浮框展示 2021-08-03 11:29:32 +08:00
fit2cloud-chenyw
b09bf1ca54 refactor: 优化token过期提示框 2021-08-03 11:28:45 +08:00
wangjiahao
e4e0eef948 feat:增加组件的悬浮工具入口 2021-08-03 11:28:12 +08:00
taojinlong
cbf8c94fc7 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-03 11:11:04 +08:00
taojinlong
ed71f845de feat: 登录过期弹框->重新登录;优化任务日志查询 2021-08-03 11:10:53 +08:00
junjie
2b0ee551c9 fix: 雷达图tooltip 2021-08-03 11:00:10 +08:00
junjie
ab891386ce feat: 搜索优化 2021-08-02 19:26:28 +08:00
fit2cloud-chenyw
ee234898cd
Merge pull request #470 from dataease/pr@dev@fix_token过期
fix: token过期点击确定没有跳转到登录
2021-08-02 18:28:22 +08:00
junjie
2772d78e78 fix: 关联字段数据集及时刷新 2021-08-02 18:27:10 +08:00
fit2cloud-chenyw
f9493fe2d7 fix: token过期点击确定没有跳转到登录 2021-08-02 18:27:03 +08:00
junjie
15cfbaaea8 feat: 字段支持公式计算 2021-08-02 15:46:12 +08:00
fit2cloud-chenyw
0039a27b92 fix: 去除已读消息搜索 2021-08-02 15:41:28 +08:00
taojinlong
e59864c5ee feat: 优化查询任务日志 2021-08-02 10:08:31 +08:00
taojinlong
4352479850 feat: 优化查询任务日志 2021-08-01 15:12:42 +08:00
junjie
4c5290d87b fix: tree搜索 2021-07-31 16:13:53 +08:00
junjie
cc5a92e3d4 refactor: 视图分组tree优化 2021-07-30 18:45:08 +08:00
junjie
fe4fa7cf50 refactor: 文案修改;视图创建分组默认展开 2021-07-30 18:24:46 +08:00
junjie
97612f1968 refactor: 数据预览接口延长请求时间 2021-07-30 17:44:44 +08:00
wangjiahao
e534b31f8e refactor:延长模板相关api超时时间 2021-07-30 13:55:35 +08:00
taojinlong
4dcfcf604e Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-30 13:28:47 +08:00
taojinlong
ed55454242 fix: 任务结束后,不允许编辑 2021-07-30 13:28:32 +08:00
junjie
05ab2d576b refactor: 视图样式优化 2021-07-30 12:47:15 +08:00
taojinlong
5da8de3332 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-30 12:27:30 +08:00
taojinlong
577fa304f0 fix: 识别 excel 类型 2021-07-30 12:27:14 +08:00
wangjiahao
5ee5bbb2c1 Merge remote-tracking branch 'origin/dev' into dev 2021-07-30 12:13:52 +08:00
wangjiahao
0f6b870d76 refactor:代码回退 2021-07-30 12:13:40 +08:00
fit2cloud-chenyw
ba3b212679 Merge branch 'dev' of fit2cloud:dataease/dataease into dev 2021-07-30 12:06:01 +08:00
fit2cloud-chenyw
ed1fcd7671 fix: 标记已读未记录查看时间 2021-07-30 12:02:39 +08:00
junjie
6cc9cc14e4 refactor: 视图更换数据集优化 2021-07-30 11:54:45 +08:00
wangjiahao
e6beaed195 refactor:仪表板自适应模式下,去掉滚动条 2021-07-30 11:46:43 +08:00
fit2cloud-chenyw
162ba5f48b fix: 前端插件(角色组织)字体文件404错误 2021-07-30 11:09:44 +08:00
wangjiahao
22ff43afc9 refactor:仪表板名称限制在50字符内 2021-07-30 10:30:31 +08:00
wangjiahao
d641d71753 refactor:优化视图明细导出,导出excel中不需要合计 2021-07-30 10:26:34 +08:00
taojinlong
0ab579b4fe Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-29 19:22:52 +08:00
taojinlong
b177feef56 fix: 用户信息长度限制 2021-07-29 19:22:32 +08:00
taojinlong
0a0a38c9d7 fix: 任务管理增加权限-> 用户只能管理拥有[管理权限]的数据集的任务 2021-07-29 19:22:29 +08:00
XiaJunjie2020
04624bf657
Merge pull request #418 from dataease/pr@dev@refactor_视图坐标轴标签角度设置调整位置
refactor: 视图坐标轴标签角度设置位置调整
2021-07-29 18:20:30 +08:00
junjie
5c8b4f2cff refactor: 视图坐标轴标签角度设置位置调整 2021-07-29 18:18:27 +08:00
fit2cloud-chenyw
261d5fe574 fix: 消息跳转到无权限路由,显示空白 2021-07-29 18:02:59 +08:00
fit2cloud-chenyw
bcd786c48c refactor: 查看分享链接使用独立拦截器 2021-07-29 16:46:17 +08:00
junjie
243dacc959 feat(数据集): 数据集字段支持公式运算等操作(UI和CRUD) 2021-07-29 16:31:49 +08:00
junjie
e0c23d5211 feat(数据集): 数据集字段支持公式运算等操作(UI和CRUD) 2021-07-29 15:56:59 +08:00
junjie
adf5f700f0 fix: 数据集切换页面权限问题 2021-07-29 15:29:25 +08:00