Commit Graph

838 Commits

Author SHA1 Message Date
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
王嘉豪
5a2a5830b1
Merge pull request #222 from dataease/pr@dev@panel
feat:编辑保存,放大效果等文案修改
2021-07-13 12:13:48 +08:00
wangjiahao
ab7c33c82a feat:编辑保存,放大效果等文案修改 2021-07-13 12:13:17 +08:00
王嘉豪
bf29a9bc1c
Merge pull request #220 from dataease/pr@dev@panel
fix:仪表板复制视图时特殊情况出现重名的问题
2021-07-13 10:35:39 +08:00
wangjiahao
15ce253f4c fix:仪表板复制视图时特殊情况出现重名的问题 2021-07-13 10:34:44 +08:00
junjie
4f9abf5af6 fix: 数据集编辑后空白 2021-07-12 19:27:34 +08:00
junjie
131eb3e353 fix: 数据集字段浮点转整型 2021-07-12 18:57:51 +08:00
taojinlong
d611114f8d feat: 根据预览的前100行推断excel类型 2021-07-12 18:39:34 +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
junjie
6611d4de50 refactor: SQL拼接 2021-07-12 15:53:40 +08:00
junjie
6401d1277a refactor: 底层SQL拼接 2021-07-12 15:13:22 +08:00
fit2cloud-chenyw
d02f249b8b
Merge pull request #208 from dataease/pr@dev@fix_组织名称验重
fix: 组织名称验重
2021-07-12 14:56:56 +08:00
fit2cloud-chenyw
849450dbe8 fix: 组织名称验重 2021-07-12 14:47:25 +08:00
junjie
79151c4fbe refactor: 底层SQL拼接 2021-07-12 14:32:01 +08:00
taojinlong
4d57f23c1d refactor: 去掉无用代码 2021-07-12 13:17:59 +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
3f15bf573a feat: 去掉unused引用 2021-07-12 11:37:47 +08:00
fit2cloud-chenyw
b329f894d1 feat: 完善消息接收设置 2021-07-12 11:30:57 +08:00
XiaJunjie2020
cf2623a7b6
Merge pull request #204 from dataease/pr@dev@feat_底层sql代码优化
feat: 数据集视图底层sql拼接使用stg重构(mysql部分)
2021-07-10 10:50:49 +08:00
junjie
d58b06928e feat: 数据集视图底层sql拼接使用stg重构(mysql部分) 2021-07-10 10:47:47 +08:00
fit2cloud-chenyw
ff82cffff4 feat: 增加消息接收设置 2021-07-09 18:37:07 +08:00
taojinlong
60f4f11d50 fix(抽取数据): 处理kettle tinyint 识别错误的问题 2021-07-09 17:28:28 +08:00
taojinlong
3b0b5d2f0c fix(數據集): 数据集任务,增加简单重复执行的功能 2021-07-09 16:06:43 +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
161dd394b4 fix: sql根据类型修复 2021-07-08 15:47:06 +08:00
taojinlong
d3cc82d59f fix: 代码冲突 2021-07-08 15:07:39 +08:00
taojinlong
cd4806ac3a feat(數據集): 添加非直连数据集時,默认全量同步一次 2021-07-08 15:05:25 +08:00
junjie
8e08808b83 feat: 视图返回sql 2021-07-08 14:27:34 +08:00
taojinlong
83b56beeb4
Merge branch 'dev' into pr@dev@taskmgm 2021-07-08 14:17:00 +08:00
taojinlong
4ee8896a4f feat: 任务管理 2021-07-08 14:12:30 +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
3707ca5adb feat(国际化): 任务管理 2021-07-08 09:14:55 +08:00
junjie
66244bafb2 feat: 数据集预览数量修改 2021-07-07 18:36:16 +08:00
junjie
0296ab1727 feat: 数据集预览数量修改 2021-07-07 17:56:01 +08:00
wangjiahao
eaa730ee13 refactor:删除多余的代码 2021-07-07 16:09:13 +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
71d190d38c feat: 视图过滤优化 2021-07-06 15:04:42 +08:00
junjie
df0c0b8777 feat: 视图过滤增加包含与不包含 2021-07-06 11:01:08 +08:00
fit2cloud-chenyw
09f4c3d88a feat: 添加站内消息sql 2021-07-06 09:51:16 +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
d8fd3cd3ba feat: 删除unuserd引入 2021-07-06 09:35:22 +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
wangjiahao
a8e097409f feat: 仪表板复制视图时名称和title保持一致 2021-07-05 12:42:40 +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
fit2cloud-chenyw
25203a6bb8 feat: 消息中心 2021-07-02 19:19:38 +08:00
taojinlong
684134f2c7 fix(excel): 识别 excel 列数 2021-07-02 15:31:45 +08:00
taojinlong
c5df1c1ca1 feat: 删除数据源时,同时释放掉连接池 2021-07-02 14:12:53 +08:00
taojinlong
696549c45f feat: 优化 oracle 增量更新 2021-07-01 18:20:02 +08:00
taojinlong
c9ab03103a feat: oracle 增量更新 2021-07-01 16:08:25 +08:00
taojinlong
4338aa9133 feat: oracle 增量更新 2021-07-01 15:52:45 +08:00
taojinlong
988064dd89 feat: 显示 oracle 分类 2021-07-01 15:08:57 +08:00
taojinlong
9b7fa951d7 Merge branch 'dev' into pr@dev@oracle 2021-07-01 12:30:25 +08:00
taojinlong
043c8a893b feat: 支持oracle 2021-07-01 12:29:26 +08:00
junjie
162ac4d69a fix: Excel支持公式;错误提示增加文档链接 2021-07-01 11:24:53 +08:00
fit2cloud-chenyw
f027928a36 fix: axios线上build后导致弹框 2021-07-01 10:51:44 +08:00
taojinlong
10143222d7 feat: 支持oracle 2021-06-30 18:56:12 +08:00
fit2cloud-chenyw
8acf0c3f3d feat: 组织管理增加可拖拽移动功能 2021-06-30 17:05:36 +08:00
fit2cloud-chenyw
ab2f513078 fix: 内网环境请求远程axios.js报错 2021-06-30 17:02:45 +08:00
taojinlong
43ee00d701 Merge branch 'dev' into pr@dev@oracle 2021-06-30 14:02:18 +08:00
taojinlong
3c58ffbac3 feat: 支持oracle 2021-06-30 14:01:46 +08:00
taojinlong
c0246106a8 fix: 检测kettle状态 2021-06-30 11:19:34 +08:00
taojinlong
b57e71cee6 Merge branch 'dev' into pr@dev@oracle 2021-06-30 10:53:08 +08:00
taojinlong
4b450bb86f fix: 检测kettle状态 2021-06-30 10:37:12 +08:00
taojinlong
69321b08a0 支持oracle 2021-06-30 10:11:12 +08:00
junjie
5df3037226 fix: xPack SDK pom依赖artifactId修复 2021-06-29 17:59:59 +08:00
fit2cloud-chenyw
9db28c74a4 feat: 视图缓存 增加互斥锁 避免出现 缓存击穿现象 2021-06-29 17:34:58 +08:00
王嘉豪
43b85e6108
Merge pull request #99 from dataease/pr@dev@wjh-copy-view
feat: 仪表板编辑时可以进行视图的复制,复制后的视图样式等改变不影响原有视图
2021-06-29 13:47:19 +08:00
wangjiahao
2fc2bb1f88 feat: 仪表板编辑时可以进行视图的复制,复制后的视图样式等改变不影响原有视图 2021-06-29 13:44:30 +08:00
junjie
c519ddefa2 fix: 视图计算SQL修复 2021-06-29 11:06:51 +08:00
fit2cloud-chenyw
b00d779f22 feat: 仪表板有过滤条件时 不使用缓存 2021-06-28 19:13:53 +08:00
taojinlong
1051f59059
Merge pull request #88 from dataease/pr@dev@fix_check_kettle_status
fix: kettle 状态检测
2021-06-28 17:26:38 +08:00
taojinlong
f312eea03f fix: kettle 状态检测 2021-06-28 17:25:16 +08:00
fit2cloud-chenyw
d840266320 feat: 增加 抽取模式视图 后台缓存 2021-06-28 16:47:16 +08:00
junjie
05d46702dd fix: 自定义sql中出现count(*)等函数导致数据查询异常bug修复 2021-06-28 15:43:02 +08:00
junjie
42325c6568 fix: 自定义sql中出现count(*)等函数导致数据查询异常bug修复;doris查询 排序 过滤冲突sql修复 2021-06-28 13:53:10 +08:00
junjie
d264ed636e fix: 增加excel字段重复错误提示 2021-06-28 13:51:43 +08:00
junjie
9f8ef33647 fix: 增加excel字段重复错误提示 2021-06-28 13:50:53 +08:00
fit2cloud-chenyw
b717b406b2 fix: 仪表盘分享公共连接地址为localhost,无法访问 2021-06-25 14:05:36 +08:00
fit2cloud-chenyw
256c0efe6b fix: 用户管理删除组织会闪现0(null) 2021-06-24 18:34:05 +08:00
taojinlong
a056afe236 feat: 优化默认仪表板 2021-06-24 17:37:56 +08:00
taojinlong
66d36d05a5 feat: 更新默认仪表板 2021-06-24 16:38:21 +08:00
junjie
879d284145 fix:项目启动,定时任务修复 2021-06-24 16:05:09 +08:00
wangjiahao
d56c292d40 fix: 保存默认仪表板时创建人不对问题 2021-06-24 15:21:27 +08:00
wangjiahao
cce1ac4ba2 fix: 保存默认仪表板时创建人不对问题 2021-06-24 15:06:27 +08:00
wangjiahao
9bd75d6a41 fix: 增加同步xpack菜单异常捕获 2021-06-24 14:42:55 +08:00
wangjiahao
51d94ba3f4 fix: 增加保存仪表板错误提示 2021-06-24 14:38:11 +08:00
taojinlong
c18988b0e8 refactor: 去掉 unused imports 2021-06-24 14:24:05 +08:00
taojinlong
8a04a2d136 refactor: 去掉 unused imports 2021-06-24 14:01:40 +08:00
taojinlong
1ec001c3d7 refactor: 去掉 unused imports 2021-06-24 14:00:46 +08:00
wangjiahao
4a5935ca73 feat: 优化代码格式 异常抛出优化 2021-06-24 13:49:01 +08:00
wangjiahao
3f94b2f743 Merge remote-tracking branch 'origin/main' into main 2021-06-24 12:21:45 +08:00
wangjiahao
66cb80c5fc feat: 增加默认主题 2021-06-24 12:21:34 +08:00
taojinlong
8b176bda6f fix: doris varchar 中文 占三个字节 2021-06-24 12:09:31 +08:00
taojinlong
c027f32482 feat: 版本号 2021-06-24 10:08:10 +08:00
taojinlong
2d749d76a0 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-24 10:03:30 +08:00
taojinlong
21b98098ea feat: 默认主题 2021-06-24 10:03:19 +08:00
xiajunjie
2a2de5f829 fix:视图结果过滤器容错 2021-06-23 20:54:01 +08:00
wangjiahao
874fd25a7f feat: 国际化信息添加 2021-06-23 18:26:07 +08:00
junjie
1663560f90 fix:视图结果过滤器条件增加容错;数据集tree重命名、删除后,右侧界面优化 2021-06-23 17:44:47 +08:00
wangjiahao
d8983a9547 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java
2021-06-23 17:40:41 +08:00
wangjiahao
c07462bd55 fix: 修复更新xpack菜单 事务失效问题 2021-06-23 17:40:21 +08:00
taojinlong
1b73e41063 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-23 17:19:47 +08:00
taojinlong
06ad50d0d4 feat: 几处国际化问题 2021-06-23 17:19:26 +08:00
fit2cloud-chenyw
aa68694f9f feat: 测试插件菜单bug 2021-06-23 17:11:42 +08:00
wangjiahao
4d26122532 feat(fix): 增加删除目录权限校验 增加数据源权限控制 2021-06-23 15:28:06 +08:00
junjie
35a9a8f390 feat(fix):数据集、视图分组权限返回修复 2021-06-22 11:48:39 +08:00
taojinlong
97c90910a1 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-21 16:00:22 +08:00
taojinlong
17dcc57963 feat: 示例数据 2021-06-21 16:00:09 +08:00
junjie
c536ab7666 feat(fix):定时任务修复 2021-06-21 15:59:32 +08:00
junjie
f6593d2360 feat(fix):视图移动功能 2021-06-21 11:18:38 +08:00
junjie
9bc0ec95da feat(feat):数据集,视图分组树优化,去除场景 2021-06-19 11:58:19 +08:00
junjie
cdaba0eb03 feat(feat):数据集,视图分组树优化,去除场景 2021-06-19 11:42:14 +08:00
taojinlong
976db21091 fix: 处理数据换行 2021-06-18 18:20:44 +08:00
junjie
060c41380c feat(fix):cron修复 2021-06-18 11:19:55 +08:00
taojinlong
54cc69278d fix: 校驗增量sql 2021-06-17 11:39:52 +08:00
taojinlong
43e1c198a3 fix: 校驗增量sql 2021-06-17 11:11:24 +08:00
taojinlong
4d03ce78d2 fix: 抽取數據錯誤 2021-06-17 10:43:28 +08:00
taojinlong
74df70866d fix:抽取数据 2021-06-16 19:28:02 +08:00
taojinlong
946c84ecaf Merge branch 'main' of github.com:dataease/dataease into main 2021-06-16 19:08:25 +08:00
taojinlong
a16f133706 fix:校验增量sql 2021-06-16 19:08:15 +08:00
fit2cloud-chenyw
f3cbed1f0c fix: 修复分享列表查询逻辑错误 2021-06-16 18:51:47 +08:00
wangjiahao
1dcdff500f Merge remote-tracking branch 'origin/main' into main 2021-06-16 18:05:59 +08:00
wangjiahao
2d35f27ee3 feat: 默认仪表盘指向源仪表盘 2021-06-16 18:05:47 +08:00
fit2cloud-chenyw
6bce1414c6 Merge branch 'main' of fit2cloud:dataease/dataease into main 2021-06-16 18:04:17 +08:00
fit2cloud-chenyw
a8b9a4fbb2 feat: 删除不等于 不包含 2021-06-16 18:03:59 +08:00
taojinlong
7e4ead4830 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-16 18:03:25 +08:00
taojinlong
ec4dcf93a9 feat: 清理临时文件 2021-06-16 18:03:07 +08:00
wangjiahao
216f722a99 Merge remote-tracking branch 'origin/main' into main 2021-06-16 15:31:48 +08:00
wangjiahao
a8ce990a4d feat: 默认仪表盘直接关联源仪表盘 2021-06-16 15:31:27 +08:00
taojinlong
064b0fe835 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-16 15:00:37 +08:00