center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
2,179 Commits 1 Branch 86 Tags 417 MiB
c7a6378c80
Commit Graph

897 Commits

Author SHA1 Message Date
junjie
333df18a7f fix: 底层sql逻辑 2021-07-28 19:47:10 +08:00
junjie
dd411588e1 fix: 自定义数据集关联问题 2021-07-28 18:57:52 +08:00
junjie
62a0d51144 test: doris 测试 2021-07-28 18:27:55 +08:00
fit2cloud-chenyw
dffed82491 fix: 定不定阅总是能接收到"默认消息" 2021-07-28 17:48:28 +08:00
wangjiahao
e10579cb57 Merge remote-tracking branch 'origin/dev' into dev 2021-07-28 17:47:56 +08:00
wangjiahao
5c98e39451 fix:视图按钮权限控制，同步在仪表板编辑时也适用 2021-07-28 17:47:39 +08:00
junjie
4abdd3a6cb fix: 过滤兼容 2021-07-28 17:26:07 +08:00
XiaJunjie2020
ce2ad0ce9c
Merge pull request #387 from dataease/pr@dev@fix_flyway兼容 
fix: flyway兼容
 2021-07-28 17:11:39 +08:00
junjie
3098ea882d fix: flyway兼容 2021-07-28 17:10:41 +08:00
taojinlong
7cc006fe4a fix: 修复excel 替换/追加 2021-07-28 16:48:44 +08:00
wangjiahao
594d20eb4d refactor:代码格式化 2021-07-28 14:40:22 +08:00
taojinlong
988efcee1b
Merge pull request #379 from dataease/pr@dev@oracle 
fix: 修复抽取oracle数据
 2021-07-28 14:18:21 +08:00
taojinlong
bdadbfa2f2 fix: 修复抽取oracle数据 2021-07-28 14:17:08 +08:00
wangjiahao
c25adf6ba2 refactor:代码格式化 2021-07-28 14:04:59 +08:00
XiaJunjie2020
4d0165f46a
Merge pull request #370 from dataease/pr@dev@fix_新建视图后权限问题 
fix: 新建视图后权限问题
 2021-07-28 12:18:15 +08:00
junjie
c6fd782d39 fix: 新建视图后权限问题 2021-07-28 12:16:59 +08:00
taojinlong
7ea80cd633 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-28 12:09:35 +08:00
taojinlong
67d66c5481 fix: 判断excel 第一行不为空并且不能有空单元格 2021-07-28 12:09:16 +08:00
junjie
89a7d4b311 fix: 过滤器多条件异常问题；编辑数据集切换到添加数据集界面异常问题 2021-07-28 11:41:06 +08:00
wangjiahao
180020c75b fix:不参与授权的菜单授权页面不再显示 2021-07-27 18:57:07 +08:00
taojinlong
beeae23d9f Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-27 18:54:59 +08:00
taojinlong
fa00806f4d fix: 定时任务权限标识 2021-07-27 18:54:49 +08:00
junjie
b3145c680f fix: 数据集预览条数 2021-07-27 18:39:38 +08:00
taojinlong
6678a9b5a7 fix: 抽取oracle数据时有多余空格 2021-07-27 17:59:10 +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
1e33054903 feat: everyone默认订阅仪表板分享、任务失败消息通知 2021-07-26 21:37:08 +08:00
junjie
67f5160312 refactor: 数据集字段将维度指标分类展示，后续维度和指标具有不同的操作，为配置钻取目录、字段计算做前置准备 2021-07-26 16:08:14 +08:00
taojinlong
d324ff8c6e fix: 更新任务状态 2021-07-23 18:37:56 +08:00
wangjiahao
17ef829166 fix:在编辑仪表板时，复制堆叠柱状图时出错 2021-07-23 16:06:12 +08:00
junjie
065b334064 fix: 编辑字段全不选后弹框报错 2021-07-23 12:42:33 +08:00
fit2cloud-chenyw
bc06646e32 fix: 合并冲突解决 2021-07-23 12:20:15 +08:00
fit2cloud-chenyw
f1e3621fac fix: 合并v1.1fix 2021-07-23 12:18:05 +08:00
taojinlong
0415c14c51 feat: 更改历史任务状态 2021-07-23 11:32:09 +08:00
taojinlong
4b2f68b484 feat: 调整定时任务 2021-07-23 10:54:44 +08:00
junjie
b2c45730f9 fix: 回退 2021-07-22 19:34:16 +08:00
junjie
b7936b91f9 fix: 视图中数据集权限校验 2021-07-22 18:59:36 +08:00
fit2cloud-chenyw
aaf9f958a0 fix: 1.类型拍戏报错 
2.分页数据错误
     3.全部消息取消默认状态排序
     4.数据集同步消息跳转路由修改
 2021-07-22 16:59:34 +08:00
junjie
a450a023aa feat: 支持仪表板数字区间过滤 2021-07-22 12:43:52 +08:00
junjie
6825383d9a feat: 过滤器兼容flyway 2021-07-21 18:30:13 +08:00
fit2cloud-chenyw
0620d58313 feat: 行政区划代码表 2021-07-21 17:51:03 +08:00
junjie
a8e6e2d0e1 feat: 堆叠图支持堆叠项 2021-07-21 17:36:50 +08:00
fit2cloud-chenyw
f0a2532b51 feat: 视图图表类型增加地图 2021-07-21 17:12:40 +08:00
taojinlong
403350e3b9 Merge branch 'dev' into pr@dev@excel 2021-07-21 15:09:48 +08:00
taojinlong
d4a95c28f3 feat: SAX 解析 excel 2021-07-21 15:07:51 +08:00
junjie
4316db704a fix: 创建视图报错 2021-07-20 18:58:49 +08:00
junjie
8369a8ffc6 fix: 单指标图表可能下标越界 2021-07-20 17:52:51 +08:00
junjie
7411ba40da feat: 视图过滤重新设计，支持单维度指标展示 2021-07-20 12:16:37 +08:00
taojinlong
da17d8f19c
Merge pull request #248 from dataease/pr@dev@errorlog 
feat: 适配oracle 11g
 2021-07-15 18:33:51 +08:00
taojinlong
f9f74f072c feat: 适配oracle 11g 2021-07-15 18:32:39 +08:00
fit2cloud-chenyw
c2a0925d02 fix: 去除无用import 2021-07-15 15:16:38 +08:00
fit2cloud-chenyw
ad20039851 fix: 过滤组件弹框样式错位 2021-07-15 15:11:17 +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
taojinlong
ae32cba668 fix: 只打印错误日志 2021-07-14 18:37:15 +08:00
fit2cloud-chenyw
090d00534b
Merge pull request #233 from dataease/pr@dev@fix_flyway版本 
fix: flyway版本号
 2021-07-13 19:01:38 +08:00
fit2cloud-chenyw
9425ef38ec fix: flyway版本号 2021-07-13 19:00:03 +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
王嘉豪
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