Commit Graph

1025 Commits

Author SHA1 Message Date
junjie
c6fd782d39 fix: 新建视图后权限问题 2021-07-28 12:16:59 +08:00
junjie
89a7d4b311 fix: 过滤器多条件异常问题;编辑数据集切换到添加数据集界面异常问题 2021-07-28 11:41:06 +08:00
junjie
62301c881d Merge remote-tracking branch 'origin/dev' into dev 2021-07-28 11:39:27 +08:00
junjie
990c6778df fix: 编辑数据集页面切换添加数据集页面异常问题 2021-07-28 11:37:41 +08:00
wangjiahao
09d6ae7396 reactor:去掉无用的日志等 2021-07-28 11:36:51 +08:00
junjie
f7132e9e71 fix: 数据集切换页面权限问题 2021-07-27 19:19:35 +08:00
junjie
f952c1f0f1 fix: 数据集切换界面权限问题 2021-07-27 19:13:22 +08:00
XiaJunjie2020
e1ce57c154
Merge pull request #357 from dataease/pr@dev@fix_数据集预览翻页不显示数据;国际化
fix: 数据集翻页不显示数据;国际化
2021-07-27 18:14:00 +08:00
junjie
50c8def3ab fix: 数据集翻页不显示数据;国际化 2021-07-27 18:11:49 +08:00
fit2cloud-chenyw
c805f28089 perf: 地图坐标json使用缓存 2021-07-27 18:03:56 +08:00
junjie
af67336b42 refactor: 字段编辑UI优化 2021-07-27 17:26:41 +08:00
junjie
35a7da380b feat: 字段管理多处优化,初步完成字段公式编辑前端UI 2021-07-27 16:58:03 +08:00
fit2cloud-chenyw
3c5002443f fix: 过滤组件弹框回显问题 2021-07-27 16:50:56 +08:00
taojinlong
157a961d94 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-27 16:40:25 +08:00
taojinlong
8adb9dcbe2 feat: 选择“数据库Schema”的地方加个搜索 2021-07-27 16:39:57 +08:00
wangjiahao
27328e9f45 refactor:重构仪表板主题设置组件,适配视图样式设置相关变化 2021-07-27 16:23:06 +08:00
taojinlong
1d55507388
Merge branch 'dev' into pr@dev@task 2021-07-27 16:09:41 +08:00
taojinlong
585755a37a fix: 更新任务状态 2021-07-27 16:07:03 +08:00
fit2cloud-chenyw
6718d15cf0 fix: 跳转任务消息延时 2021-07-27 12:30:29 +08:00
fit2cloud-chenyw
e03b2894ea fix: 删除未读消息列选择器 2021-07-27 10:35:38 +08:00
fit2cloud-chenyw
1e33054903 feat: everyone默认订阅仪表板分享、任务失败消息通知 2021-07-26 21:37:08 +08:00
junjie
51e1856411 refactor: 全局滚动条样式调整,字段编辑样式调整 2021-07-26 16:45:11 +08:00
junjie
67f5160312 refactor: 数据集字段将维度指标分类展示,后续维度和指标具有不同的操作,为配置钻取目录、字段计算做前置准备 2021-07-26 16:08:14 +08:00
fit2cloud-chenyw
43f038ab65
Merge pull request #335 from dataease/pr@dev@feat_过滤组件下拉列表
feat: 增加过滤组件下拉列表
2021-07-26 15:16:36 +08:00
fit2cloud-chenyw
9890d02e6c feat: 增加过滤组件下拉列表 2021-07-26 15:05:26 +08:00
junjie
482f06bf76 fix: 视图缩放 2021-07-26 14:22:19 +08:00
junjie
3671a33984 refactor: 视图缩放暂时去掉 2021-07-26 14:00:45 +08:00
junjie
c0870cc0ea fix: 视图表格组件高度问题 2021-07-26 11:15:48 +08:00
junjie
078a0f5b58 refactor: 维度指标色彩区分 2021-07-24 10:19:24 +08:00
junjie
d3b7dfc19b refactor: 视图字段拖拽区增加placeholder 2021-07-24 10:06:16 +08:00
taojinlong
d324ff8c6e fix: 更新任务状态 2021-07-23 18:37:56 +08:00
junjie
99b2ac0c7a refactor: 视图拖拽块增加placeholder 2021-07-23 17:02:50 +08:00
wangjiahao
1826a7025b fix:【仪表板】同一张图片无法连续两次被导入到仪表盘 2021-07-23 15:35:38 +08:00
junjie
0e56bea06f refactor: 视图拖拽块增加placeholder 2021-07-23 14:42:15 +08:00
wangjiahao
35c9802381 Merge remote-tracking branch 'origin/dev' into fix_panel_edit_attr-auto-save
# Conflicts:
#	frontend/src/components/canvas/components/RectangleAttr.vue
#	frontend/src/views/Tinymce/RectangleAttr.vue
#	frontend/src/views/system/task/TaskRecord.vue
#	frontend/src/views/system/task/dataset.vue
2021-07-23 14:00:28 +08:00
wangjiahao
a2425538fa Merge remote-tracking branch 'origin/dev' into fix_panel_edit_attr-auto-save
# Conflicts:
#	frontend/src/components/canvas/components/RectangleAttr.vue
2021-07-23 13:58:13 +08:00
wangjiahao
e09e352f46 feat:组件样式修改时可以延迟保存组件镜像 2021-07-23 13:45:01 +08:00
fit2cloud-chenyw
f40073a8ca fix: 消息跳转到同步任务记录后加载有延时 2021-07-23 13:35:27 +08:00
taojinlong
0415c14c51 feat: 更改历史任务状态 2021-07-23 11:32:09 +08:00
wangjiahao
b2ea0c7123 fix:修复编辑过滤组件时,悬浮组件依然在遮罩上方 2021-07-23 11:30:33 +08:00
taojinlong
4b2f68b484 feat: 调整定时任务 2021-07-23 10:54:44 +08:00
fit2cloud-chenyw
eb6b190d4f fix: 修复跳转后菜单不打开 2021-07-23 10:47:30 +08:00
fit2cloud-chenyw
409e5a1e82 fix: 完善数据集消息任务跳转 2021-07-23 10:47:24 +08:00
fit2cloud-chenyw
4b4bd65065 fix: 数据集消息任务跳转 2021-07-23 10:47:13 +08:00
fit2cloud-chenyw
14a58ac561 fix: 1.类型拍戏报错
2.分页数据错误
     3.全部消息取消默认状态排序
     4.数据集同步消息跳转路由修改
2021-07-23 10:47:06 +08:00
junjie
e73d004fd8 fix: 视图中数据集字段 2021-07-23 10:44:48 +08:00
junjie
30c00ec79a fix: 视图中数据集字段获取 2021-07-23 10:21:22 +08:00
junjie
b7936b91f9 fix: 视图中数据集权限校验 2021-07-22 18:59:36 +08:00
fit2cloud-chenyw
06e1fbde14
Merge pull request #296 from dataease/pr@dev@fix_数据集消息跳转
fix: 修复跳转后菜单不打开
2021-07-22 18:36:53 +08:00
fit2cloud-chenyw
c7c1ac02e8 fix: 修复跳转后菜单不打开 2021-07-22 18:34:27 +08:00
junjie
f11bb8305d refactor: 颜色选择器更换element自带组件 2021-07-22 18:31:18 +08:00
junjie
6903d30de0 fix: 数据集权限问题导致视图没有字段 2021-07-22 18:23:33 +08:00
junjie
f2ac1b6a6c refactor: 视图样式界面优化 2021-07-22 18:20:44 +08:00
fit2cloud-chenyw
deaf1aa3a9 fix: 完善数据集消息任务跳转 2021-07-22 18:08:39 +08:00
fit2cloud-chenyw
c3af183fdb fix: 数据集消息任务跳转 2021-07-22 17:27:49 +08:00
fit2cloud-chenyw
aaf9f958a0 fix: 1.类型拍戏报错
2.分页数据错误
     3.全部消息取消默认状态排序
     4.数据集同步消息跳转路由修改
2021-07-22 16:59:34 +08:00
XiaJunjie2020
e2051479bd
Merge pull request #286 from dataease/pr@dev@refactor_坐标轴图表滚轮缩放优化
refactor: 坐标轴图表滚轮缩放优化
2021-07-22 16:20:09 +08:00
王嘉豪
7e12879de5
Merge pull request #288 from dataease/pr@dev@fix_panel_other-component
fix:修复编辑过滤组件时,悬浮组件依然在遮罩上方
2021-07-22 16:19:53 +08:00
wangjiahao
2e7e958b2f fix:修复编辑过滤组件时,悬浮组件依然在遮罩上方 2021-07-22 16:18:07 +08:00
fit2cloud-chenyw
d3494ea3cb fix: 仪表板过滤组件国际化 2021-07-22 15:27:44 +08:00
junjie
f85db005e1 refactor: 坐标轴图表滚轮缩放优化 2021-07-22 15:00:01 +08:00
fit2cloud-chenyw
9582bed910
Merge pull request #284 from dataease/pr@dev@feat_仪表板数值区间组件
feat: 仪表板过滤组件数值区间
2021-07-22 13:59:20 +08:00
fit2cloud-chenyw
f9bfbd93e8 feat: 仪表板过滤组件数值区间 2021-07-22 13:56:28 +08:00
junjie
c7450f65c6 fix: 视图样式 2021-07-22 12:26:22 +08:00
junjie
acace5e57d refactor: 视图样式调整 2021-07-22 12:07:17 +08:00
junjie
4087b60366 fix: 视图样式 2021-07-22 11:02:33 +08:00
junjie
fa257167e6 refactor: 界面样式调整 2021-07-22 10:49:23 +08:00
wangjiahao
5f95db6a53 Merge remote-tracking branch 'origin/dev' into dev 2021-07-22 10:02:31 +08:00
wangjiahao
ad1b829356 fix:Mac M1 arm64 chrome浏览器版本适配,修复仪表板编辑是全屏模式可能出现滚动条问题 2021-07-22 10:02:17 +08:00
junjie
ee0ecadfcb fix: 堆叠bug修复 2021-07-21 18:57:16 +08:00
junjie
3a8adf4023 feat: 视图字段排序增加icon标识 2021-07-21 18:17:30 +08:00
junjie
a8e6e2d0e1 feat: 堆叠图支持堆叠项 2021-07-21 17:36:50 +08:00
fit2cloud-chenyw
5715563714 feat: 替换缩略图 2021-07-21 17:23:58 +08:00
fit2cloud-chenyw
f0a2532b51 feat: 视图图表类型增加地图 2021-07-21 17:12:40 +08:00
junjie
694022ad71 feat: 视图维度指标拖动区域文案细节优化 2021-07-20 13:35:48 +08:00
junjie
7411ba40da feat: 视图过滤重新设计,支持单维度指标展示 2021-07-20 12:16:37 +08:00
junjie
c429821c5c feat: 过滤组件条件调整,视图界面调整 2021-07-19 16:04:51 +08:00
junjie
7957ac5a40 feat: 过滤组件条件调整 2021-07-19 15:47:23 +08:00
junjie
5c4bb9f7c5 refactor: 视图UI布局初步调整 2021-07-19 12:36:25 +08:00
wangjiahao
a42e37aa47 fix:仪表板Mac M1版电脑保存模板时失败的问题 2021-07-16 17:55:00 +08:00
junjie
e787aa235e fix: tree搜索后无法折叠 2021-07-16 14:59:01 +08:00
junjie
4f37bda3f8 feat: 更换数据集确认按钮调整 2021-07-16 12:42:04 +08:00
junjie
7596debca6 feat: 视图增加默认padding 2021-07-15 18:30:16 +08:00
王嘉豪
5c15ac930f
Merge pull request #246 from dataease/pr@dev@panel
feat:增加过滤组件标题样式设置
2021-07-15 16:32:13 +08:00
wangjiahao
f9695bbe8d feat:增加过滤组件标题样式设置 2021-07-15 16:22:42 +08:00
fit2cloud-chenyw
ad20039851 fix: 过滤组件弹框样式错位 2021-07-15 15:11:17 +08:00
junjie
9c6c162e67 feat: 同数据源直连数据集之间支持数据关联 2021-07-15 14:37:01 +08:00
taojinlong
a4c7527a99
Merge pull request #243 from dataease/pr@dev@errorlog
fix: 抽取数据的错误日志
2021-07-15 11:32:45 +08:00
taojinlong
f527eefef0 fix: 抽取数据的错误日志 2021-07-15 11:30:40 +08:00
junjie
a68323de2f feat: 同数据源直连数据集之间支持数据关联 2021-07-15 11:05:11 +08:00
wangjiahao
f35cbc166b fix:仪表板全屏预览过滤组件下拉框不显示问题 2021-07-15 09:57:10 +08:00
fit2cloud-chenyw
dfd0f04698 feat: 仪表板条件过滤组件增加标题 2021-07-14 16:58:07 +08:00
王嘉豪
a10d4372c9
Merge pull request #234 from dataease/pr@dev@panel
feat:创建分组或者仪表板时,点击取消按钮,不发出目录树的请求
2021-07-14 10:55:28 +08:00
wangjiahao
39d5ea5aa5 feat:创建分组或者仪表板时,点击取消按钮,不发出目录树的请求 2021-07-14 10:53:47 +08:00
fit2cloud-chenyw
84808a6e96 feat: 添加测试地图 2021-07-13 18:44:33 +08:00
taojinlong
e42b8b73ab fix: 执行记录状态修改;执行记录显示错误;简单执行增加描述 2021-07-13 18:34:17 +08:00
junjie
54820d6746 feat: 数据关联改为左连接等方式 2021-07-13 15:55:22 +08:00
junjie
ccd07cc85a feat: excel上传后可编辑字段类型再保存 2021-07-13 12:32:20 +08:00
junjie
4f9abf5af6 fix: 数据集编辑后空白 2021-07-12 19:27:34 +08:00
junjie
131eb3e353 fix: 数据集字段浮点转整型 2021-07-12 18:57:51 +08:00
王嘉豪
b75d9b1eda
Merge pull request #216 from dataease/pr@dev@panel
Pr@dev@panel
2021-07-12 17:59:30 +08:00
wangjiahao
4151f17609 fix:保存模板部分浏览器出现堆栈超出的情况,降低一下截图图片质量 2021-07-12 17:50:33 +08:00
taojinlong
9060a789f0
Merge pull request #215 from dataease/pr@dev@check-excel-columns
feat: 追加/更新 excel 数据集时,列名与原数据集保持一致
2021-07-12 17:25:33 +08:00
taojinlong
48ed621854 feat: 追加/更新 excel 数据集时,列名与原数据集保持一致 2021-07-12 17:24:35 +08:00
junjie
ad23936022 refactor: SQL拼接 2021-07-12 16:35:03 +08:00
fit2cloud-chenyw
7b993b609a fix: 中文输入法回车键直接保存 2021-07-12 15:15:19 +08:00
taojinlong
f8e2c53e85
Merge branch 'dev' into pr@dev@errormsg 2021-07-12 11:49:45 +08:00
taojinlong
fd7d70e86a feat(错误信息): 抽取数据的错误信息仅显示错误基本描述 2021-07-12 11:47:26 +08:00
fit2cloud-chenyw
8a5ccbb26b
Merge pull request #203 from dataease/pr@dev@feat_消息设置
feat: 增加消息接收设置
2021-07-12 11:42:59 +08:00
fit2cloud-chenyw
b329f894d1 feat: 完善消息接收设置 2021-07-12 11:30:57 +08:00
fit2cloud-chenyw
ff82cffff4 feat: 增加消息接收设置 2021-07-09 18:37:07 +08:00
wangjiahao
6e17a5f4a2 Merge remote-tracking branch 'origin/dev' into pr@dev@panel
# Conflicts:
#	frontend/src/lang/en.js
#	frontend/src/lang/tw.js
#	frontend/src/lang/zh.js
2021-07-09 16:48:24 +08:00
wangjiahao
05caadb0fe feat:【仪表盘】可支持查看仪表盘中图表的明细数据,在查看窗口可下载明细数据 2021-07-09 16:44:36 +08:00
taojinlong
7b345b400f
Merge pull request #192 from dataease/pr@dev@simple-repeat
feat(數據集): 数据集任务,增加简单重复执行的功能
2021-07-09 10:53:21 +08:00
taojinlong
d1174fed5c feat(數據集): 数据集任务,增加简单重复执行的功能 2021-07-09 10:52:20 +08:00
junjie
7c9c690c5d feat: 视图颜色增加多种配色方案 2021-07-08 18:29:26 +08:00
taojinlong
7f388f1edd feat(數據集): 添加非直连数据集時,默认全量同步一次 2021-07-08 15:11:56 +08:00
taojinlong
d3cc82d59f fix: 代码冲突 2021-07-08 15:07:39 +08:00
taojinlong
cd4806ac3a feat(數據集): 添加非直连数据集時,默认全量同步一次 2021-07-08 15:05:25 +08:00
taojinlong
83b56beeb4
Merge branch 'dev' into pr@dev@taskmgm 2021-07-08 14:17:00 +08:00
taojinlong
00202fa718 feat: 任务管理 2021-07-08 14:11:59 +08:00
taojinlong
3af3e5798c feat: 任务管理 2021-07-08 14:00:06 +08:00
junjie
acaf405131 feat: 数据集编辑字段,增加维度指标选项,而非老版本中通过字段类型判定 2021-07-08 13:50:22 +08:00
taojinlong
5721088ec3 fix(數據源): 校驗 oracle schema 2021-07-08 09:54:08 +08:00
taojinlong
3707ca5adb feat(国际化): 任务管理 2021-07-08 09:14:55 +08:00
王嘉豪
66760cdf9a
Merge pull request #178 from dataease/pr@dev@panel
fix:矩形组件和文本组件在非自适应画布区域的模式下对应悬浮组件定位问题
2021-07-07 19:10:30 +08:00
wangjiahao
88f5e25e39 fix:矩形组件和文本组件在非自适应画布区域的模式下对应悬浮组件定位问题 2021-07-07 19:09:28 +08:00
王嘉豪
00a6cac95c
Merge pull request #174 from dataease/pr@dev@panel
refactor:删除多余的代码
2021-07-07 16:10:52 +08:00
wangjiahao
eaa730ee13 refactor:删除多余的代码 2021-07-07 16:09:13 +08:00
王嘉豪
b4b3ad3a86
Merge pull request #173 from dataease/pr@dev@panel
Pr@dev@panel
2021-07-07 14:16:37 +08:00
wangjiahao
036bc45b6b fix: 【仪表板】仪表板收藏后再取消,仪表板显示为空 2021-07-07 14:13:13 +08:00
wangjiahao
24c5581def fix: 【仪表板】仪表板收藏后再取消,仪表板显示为空 2021-07-07 12:44:59 +08:00
junjie
73b9e82042 feat: 视图数据集权限控制 2021-07-07 11:06:53 +08:00
junjie
cc14b0f3be feat: 视图数据集权限控制 2021-07-06 19:26:15 +08:00
wangjiahao
c05e4b842d Merge remote-tracking branch 'origin/dev' into pr@dev@panel
# Conflicts:
#	frontend/src/views/chart/view/ChartEdit.vue
2021-07-06 18:46:54 +08:00
wangjiahao
4b11bfeb72 feat: 仪表板编辑增加新建视图功能,可以直接在仪表板新建视图 2021-07-06 18:34:01 +08:00
junjie
77f5414125 feat: 同步数据集预览数据从doris中取 2021-07-06 16:32:38 +08:00
fit2cloud-chenyw
b8ae6a36f7 fix:修复组件查询条件无效 2021-07-06 16:22:19 +08:00
fit2cloud-chenyw
f64e8cabba
Merge pull request #160 from dataease/pr@dev@feat_消息提醒继续完善
feat: 继续完善消息提醒
2021-07-06 15:29:03 +08:00
fit2cloud-chenyw
0fc1c742a5 feat: 继续完善消息提醒 2021-07-06 15:24:34 +08:00
junjie
33d6ea2439 feat: 视图维度指标增加快速搜索;视图界面可以编辑数据集字段 2021-07-06 12:30:48 +08:00
junjie
df0c0b8777 feat: 视图过滤增加包含与不包含 2021-07-06 11:01:08 +08:00
fit2cloud-chenyw
46ca995ec1
Merge pull request #149 from dataease/pr@dev@feat_完善消息
feat: 完善分享消息
2021-07-06 09:38:23 +08:00
fit2cloud-chenyw
8f2f6f1670 feat: 完善分享消息 2021-07-05 18:18:06 +08:00
junjie
8f0eeaff19 fix: 视图过滤不能设置无限制 2021-07-05 17:24:23 +08:00
junjie
141e146909 feat: radar支持轴线样式设置 2021-07-05 13:57:10 +08:00
taojinlong
f055d97488
Merge pull request #142 from dataease/pr@dev@oracle
feat(数据源): 添加oracle 数据源时,指定schema
2021-07-05 12:18:07 +08:00
taojinlong
6ce1adf57a feat(数据源): 添加oracle 数据源时,指定schema 2021-07-05 12:17:16 +08:00
fit2cloud-chenyw
4c422b9cd4
Merge branch 'dev' into pr@dev@feat_message-center 2021-07-03 19:17:59 +08:00
fit2cloud-chenyw
dadeb745b4 feat: 增加数据集同步消息提醒 2021-07-03 18:01:30 +08:00