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

1408 Commits

Author SHA1 Message Date
junjie
5b83a779f5 feat: 视图增加组合图 2021-08-31 17:15:20 +08:00
taojinlong
4b20298adc fix: oracle 时间转换 2021-08-31 16:57:01 +08:00
fit2cloud-chenyw
ad7569badb fix: 完善sql注入拦截器 2021-08-31 15:30:10 +08:00
fit2cloud-chenyw
6b1f54808b fix: 完善sql注入拦截器 2021-08-31 15:26:49 +08:00
taojinlong
9f51920c55 fix: 抽取excel 数据 2021-08-31 12:52:21 +08:00
taojinlong
439e9da1ab fix: 处理 oracle sql 2021-08-31 12:52:18 +08:00
taojinlong
08f42aa86d fix: 抽取excel 数据 2021-08-31 12:49:15 +08:00
taojinlong
50e9e333e4 fix: 处理 oracle sql 2021-08-31 12:29:04 +08:00
taojinlong
70387ead68 feat: 默认去掉数据源参数里首尾空格 2021-08-31 11:52:10 +08:00
taojinlong
e72b70d45e feat: 默认去掉数据源参数里首尾空格 2021-08-31 11:50:03 +08:00
taojinlong
a90bc12900 fix: 数据集移动 2021-08-30 16:18:31 +08:00
taojinlong
d303ae90fe fix: 数据集移动 2021-08-30 16:18:03 +08:00
taojinlong
d2674bd472 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-30 15:51:29 +08:00
taojinlong
b2e0089277 fix: 数据集重命名 2021-08-30 15:51:21 +08:00
taojinlong
7dfe9ccf34 fix: 数据集重命名 2021-08-30 15:47:39 +08:00
fit2cloud-chenyw
b23f2f3456 fix: 顶级地名错误 2021-08-30 10:08:22 +08:00
junjie
5d36a577b4 fix: 颜色选择器去掉清空；矩形树图标签修复；doris 计算字段支持小数 2021-08-27 18:36:58 +08:00
junjie
21af196e17 fix: 颜色选择器去掉清空；矩形树图标签修复；doris 计算字段支持小数 2021-08-27 18:21:02 +08:00
taojinlong
cdee8d66f9 fix: sqlserver 字段识别 2021-08-27 18:07:19 +08:00
taojinlong
2cc028a219 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-27 18:05:34 +08:00
taojinlong
7c09002c9b fix: sqlserver 字段识别 2021-08-27 18:05:04 +08:00
fit2cloud-chenyw
2ff07ba064
Merge pull request #719 from dataease/pr@dev@feat_ds_invalid_msg 
feat: 完善数据源失效消息
 2021-08-27 17:58:03 +08:00
fit2cloud-chenyw
a9123035d7 feat: 完善数据源失效消息 2021-08-27 17:56:10 +08:00
taojinlong
ee8370a078
Merge pull request #718 from dataease/pr@v1.2@excel 
fix: 解析excel出错
 2021-08-27 17:43:49 +08:00
taojinlong
39026784e0
Merge pull request #717 from dataease/pr@v1.2@excel 
fix: 解析excel出错
 2021-08-27 17:43:03 +08:00
taojinlong
2fd29a71e4 fix: 解析excel出错 2021-08-27 17:40:25 +08:00
fit2cloud-chenyw
9132355ebc fix: 顶级地名错误 2021-08-27 16:36:55 +08:00
fit2cloud-chenyw
aac751b08d feat:增加数据源无效消息 2021-08-27 16:34:40 +08:00
fit2cloud-chenyw
74cc2bb0e1 feat:未读消息列表增加一键全部已读 2021-08-27 13:25:18 +08:00
wangjiahao
044faf7845 refactor:增加demo 2021-08-26 18:14:54 +08:00
wangjiahao
8be42ca584 refactro:更换demo 2021-08-26 16:34:38 +08:00
taojinlong
5f0ad8d200 fix: 数据源高级设置不能编辑 2021-08-26 12:35:54 +08:00
taojinlong
bba0c57f39 fix: excel 多sheets页面 2021-08-25 21:51:09 +08:00
taojinlong
1ba98b57b3 fix: excel 多sheets页面 2021-08-25 18:40:42 +08:00
wangjiahao
8d6d49eb14 refactor:优化页面查询速度 2021-08-24 16:51:09 +08:00
taojinlong
e83510f4b7 fix: 数据源校验 2021-08-24 15:03:17 +08:00
taojinlong
461f5135de Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-24 11:54:29 +08:00
taojinlong
7adf045701 fix: 时间类型长度 2021-08-24 11:52:42 +08:00
fit2cloud-chenyw
f26adc38c9 fix: 公共链接弹出登录框 2021-08-23 17:23:11 +08:00
taojinlong
4eaaf2273e feat: 校验数据源状态时，同时刷新左侧菜单中数据源的状态 2021-08-23 16:27:05 +08:00
taojinlong
378a034f85 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-23 12:12:29 +08:00
taojinlong
9c910893ce fix: 识别日期类型 2021-08-23 12:12:12 +08:00
fit2cloud-chenyw
aef2d49f35 fix: api验证lic 2021-08-23 11:36:52 +08:00
fit2cloud-chenyw
ad10184c1f
Merge pull request #679 from dataease/pr@dev@feat_完善apiModelProperty 
feat: 完善apiModelProperties
 2021-08-23 11:34:16 +08:00
fit2cloud-chenyw
96291da02a feat: 完善apiModelProperties 2021-08-23 11:33:07 +08:00
taojinlong
85d840d91a fix: 尝试解决导入excle 报找不到字段的问题 2021-08-23 10:17:22 +08:00
taojinlong
130cbb23cf fix: 尝试解决导入excle 报找不到字段的问题 2021-08-20 17:55:50 +08:00
taojinlong
df0c6a0759 fix: 尝试解决导入excle 报找不到字段的问题 2021-08-20 17:14:07 +08:00
taojinlong
f7baa9a032 fix: 尝试解决导入excle 报找不到字段的问题 2021-08-19 22:22:06 +08:00
taojinlong
4681c10b76 fix: 尝试解决导入excle 报找不到字段的问题 2021-08-19 16:42:41 +08:00
taojinlong
53fc333341 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-19 16:22:54 +08:00
taojinlong
371750f70d fix: 尝试解决导入excle 报找不到字段的问题 2021-08-19 16:22:41 +08:00
wangjiahao
1556b1fc91 refactor:增加新的demo仪表板 2021-08-19 15:49:34 +08:00
fit2cloud-chenyw
6883911ccc
Merge pull request #668 from dataease/pr@dev@feat_public_short_link 
feat: 公共链接分享增加短链接
 2021-08-19 14:55:39 +08:00
fit2cloud-chenyw
acab3ceb24 feat: 公共链接分享增加短链接 2021-08-19 14:54:32 +08:00
taojinlong
36b0a2a614 fix: 检测数据源状态 2021-08-19 14:09:51 +08:00
taojinlong
e1835b5326 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-19 10:10:36 +08:00
taojinlong
5f60eb3faf feat: 抽取数据适配[新增字段] 2021-08-19 09:55:23 +08:00
junjie
f3902e3bac fix: 计算字段dataease name 2021-08-19 09:54:12 +08:00
taojinlong
b84225bee7 feat: 抽取数据适配[新增字段] 2021-08-19 09:48:33 +08:00
junjie
3b5bb9b17b feat: 字段编辑优化界面显示 2021-08-18 14:01:56 +08:00
wangjiahao
1dca2e0ff7 refactor:去除无用代码 2021-08-17 17:55:56 +08:00
taojinlong
ffbd32febf Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-17 16:19:32 +08:00
taojinlong
f1f20b2dbe feat: 抽取数据适配[新增字段] 2021-08-17 16:16:04 +08:00
wangjiahao
81a84a54e3 refactor:去除无用代码 2021-08-17 14:40:01 +08:00
fit2cloud-chenyw
24ed0baeb2
Merge pull request #644 from dataease/pr@dev@fix_msg_timer_error 
fix: 定时查询未读消息条数错误
 2021-08-17 12:26:32 +08:00
fit2cloud-chenyw
2fbed9fdec fix: 定时查询未读消息条数错误 2021-08-17 12:25:22 +08:00
taojinlong
238bc186fb Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-17 12:21:13 +08:00
taojinlong
d4d7261df9 feat: sqlserver、pg内置函数 2021-08-17 12:20:47 +08:00
junjie
1dc681216a fix: doris函数 2021-08-17 12:17:09 +08:00
fit2cloud-chenyw
d2b6fe4356
Merge pull request #642 from dataease/pr@dev@refactor_system_style 
refactor: 优化分享组织树
 2021-08-17 11:09:23 +08:00
fit2cloud-chenyw
d99229dd44 refactor: 优化分享组织树 2021-08-17 11:08:11 +08:00
taojinlong
7c391ed8cf refactor: 代码格式化 2021-08-16 18:27:20 +08:00
taojinlong
d7f363e97b feat: 数据源高级参数设置 2021-08-16 18:05:46 +08:00
taojinlong
9cda59e224 feat: 定时检测数据源状态信息 2021-08-16 14:09:02 +08:00
taojinlong
b8f4a819f9 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-16 12:47:35 +08:00
taojinlong
4c8e061e1d feat: 定时检测数据源状态信息 2021-08-16 12:46:34 +08:00
junjie
3e6b61a88c fix: 地图code 2021-08-16 11:48:12 +08:00
junjie
7bd5f3dc0f fix: 地图code，json 2021-08-16 11:18:48 +08:00
junjie
7905c85110 feat: 地图json，区域 2021-08-16 09:56:19 +08:00
taojinlong
9623c15d01 fix: 解析excel失败 2021-08-13 17:31:18 +08:00
taojinlong
19d08770a9 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-13 17:11:15 +08:00
taojinlong
1e67e6669c fix: 解析excel失败 2021-08-13 17:10:59 +08:00
fit2cloud-chenyw
93b2dc8b78 fix: 删除行政区划代码前端缓存 2021-08-13 17:06:24 +08:00
taojinlong
af79e725a3 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-13 12:04:31 +08:00
taojinlong
8f494f3755 feat: 替换excel时，替换成功后，才更新数据集字段 2021-08-13 12:04:17 +08:00
fit2cloud-chenyw
f7699aae6b feat: 地图联动 2021-08-13 11:23:35 +08:00
taojinlong
c36fd88f3f feat: 支持excel多sheet页 2021-08-13 09:51:54 +08:00
taojinlong
b4a09f37dc Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-12 19:23:16 +08:00
taojinlong
4a9009dee1 feat: 支持同时导入excel的多sheet页 2021-08-12 19:23:01 +08:00
junjie
b2718c6c14 feat: 堆叠图下钻 2021-08-12 15:11:54 +08:00
王嘉豪
f6058ed78b
Merge pull request #599 from dataease/pr@dev@feat_panel-up-drill 
refactor:恢复超级管理员无需授权功能
 2021-08-12 11:57:29 +08:00
wangjiahao
db3a3c3f27 refactor:恢复超级管理员无需授权功能 2021-08-12 11:52:02 +08:00
王嘉豪
62a3c61a0a
Merge pull request #598 from dataease/pr@dev@feat_panel-up-drill 
feat:【用户管理】增加根据角色/组织进行查询的支持
 2021-08-12 11:24:03 +08:00
wangjiahao
d714f146a0 feat:【用户管理】增加根据角色/组织进行查询的支持，增加查看指定用户拥有的所有权限的功能 2021-08-12 11:22:27 +08:00
junjie
b29d4b3cf2 feat: 视图下钻 2021-08-11 18:44:07 +08:00
junjie
c75f9c5fb7 feat: 视图下钻 2021-08-11 18:10:34 +08:00
junjie
85c744f679 feat: 视图上卷 2021-08-11 17:01:51 +08:00
fit2cloud-chenyw
5d2340975c fix: 数据集消息获取接受人权限错误 2021-08-11 15:55:34 +08:00
fit2cloud-chenyw
e3cff22620
Merge pull request #587 from dataease/pr@dev@feat_包装api接口文档 
feat: 包装api接口文档
 2021-08-11 15:03:05 +08:00
fit2cloud-chenyw
99aac19d46 feat: 包装api接口文档 2021-08-11 14:58:29 +08:00
fit2cloud-chenyw
483b187aee fix: 删除xpack api 2021-08-11 11:45:41 +08:00
junjie
3a6f89eb21 feat: 视图下钻 2021-08-11 10:35:00 +08:00
taojinlong
75d223f417 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-11 09:54:03 +08:00
taojinlong
4cef74e41a fix: 解析 excel 报错 2021-08-11 09:53:48 +08:00
fit2cloud-chenyw
5235c72582
Merge pull request #579 from dataease/pr@dev@fix_spring依赖bug 
fix: spring依赖bug
 2021-08-10 19:44:46 +08:00
fit2cloud-chenyw
e973fd31df ftx: spring依赖bug 2021-08-10 19:43:36 +08:00
fit2cloud-chenyw
2ec0194d16 ftx: 增加lic验证log 2021-08-10 19:13:53 +08:00
taojinlong
808ac5ed54
Merge pull request #577 from dataease/pr@dev@pg 
feat: 支持 postgresql
 2021-08-10 19:12:22 +08:00
taojinlong
670bc54546 feat: 支持 postgresql 2021-08-10 19:11:14 +08:00
fit2cloud-chenyw
a211b8b765
Merge pull request #572 from dataease/pr@dev@feat_add_xpack_api 
feat: 增加xpack插件内api
 2021-08-10 17:54:21 +08:00
fit2cloud-chenyw
80548698b9 feat: 增加xpack插件内api 2021-08-10 17:51:11 +08:00
taojinlong
d9ebc295b4 Merge branch 'dev' into pr@dev@pg 2021-08-10 17:06:57 +08:00
taojinlong
347b64eff2 feat: pg 2021-08-10 17:01:20 +08:00
junjie
affdf3ad00 feat: 视图下钻 2021-08-10 17:00:15 +08:00
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
fit2cloud-chenyw
3ea7da10ca feat: 使用ak，sk访问api接口以及swagger 2021-08-10 14:24:13 +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
ed034e59f4 feat: 矩形树图 2021-08-09 16:37:15 +08:00
taojinlong
c7a6378c80 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-09 16:25:56 +08:00
taojinlong
55fc58fda9 fix: 抽取 oralce 数据 2021-08-09 16:25:46 +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
taojinlong
2edef2432e
Merge branch 'dev' into pr@dev@sqlserver 2021-08-09 14:18:54 +08:00
taojinlong
cbe4965485 feat: sqlserver 2021-08-09 14:17:22 +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
taojinlong
a5dd1e3698 feat: sqlserver 2021-08-09 12:45:01 +08:00
wangjiahao
d46a40dcd2 feat:仪表板联动设置浮层 2021-08-06 17:24:17 +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
1b26790db3 refactor: 恢复覆盖的sql 2021-08-06 10:25:59 +08:00
wangjiahao
7598584b07 Merge remote-tracking branch 'origin/dev' into dev 2021-08-05 18:42:03 +08:00
wangjiahao
49ce82cac7 refactor:临时提交 2021-08-05 18:41:47 +08:00
taojinlong
a72c679631 feat: 新增示例数据 2021-08-05 17:58:45 +08:00
wangjiahao
3a2bb24ca8 refactor:设置弹出框优化 2021-08-05 16:54:47 +08:00
wangjiahao
ea72141d45 refactor:代码回退 2021-08-05 14:02:39 +08:00
taojinlong
ddb6e767fd feat: sqlserver 2021-08-05 13:43:33 +08:00
wangjiahao
4838839e2b refactor:优化联动设置 2021-08-05 13:31:31 +08:00
junjie
41259ae347 fix: 恢复flyway误删 2021-08-05 10:19:58 +08:00
fit2cloud-chenyw
d51a1c46b0 fix: flywaysql去除重复信息 2021-08-05 09:49:19 +08:00
wangjiahao
9dd6e403c6 refactor:仪表板联动目标视图获取方式优化 2021-08-04 21:44:50 +08:00
taojinlong
dfe654c547 feat: sqlserver 2021-08-04 21:27:37 +08:00
fit2cloud-chenyw
c64343a289 fix: 增加sql注入白名单；sql注入拦截器只验证排序字段 2021-08-04 18:11:37 +08:00
wangjiahao
6bfb5a74c1 Merge branch 'pr@dev@feat_panel-linkage' of github.com:dataease/dataease into feat_panel-linkage 2021-08-04 17:00:29 +08:00
wangjiahao
b09a935a06 refactor:增加视图联动相关表结构等 2021-08-04 16:57:16 +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
XiaJunjie2020
958cbabb6f
Merge pull request #521 from dataease/pr@dev@feat_视图钻取 
feat: 视图钻取
 2021-08-04 16:50:55 +08:00
junjie
05e9f8274e fix: sql注入排除减号 2021-08-04 16:47:11 +08:00
junjie
68a80e2cc8 feat: 视图钻取 2021-08-04 16:40:53 +08:00
fit2cloud-chenyw
2f06f3720e fix: sql注入和xss攻击 2021-08-04 15:18:12 +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
b4a057d46b fix: 更新任务状态-> 执行结束 2021-08-04 10:34:46 +08:00
taojinlong
e4b16b33c3 fix: 没有经过全量更新不能进行增量更新，并记录日志 2021-08-04 10:34:43 +08:00
taojinlong
a3defb1a88 feat: 优化任务状态的切换 2021-08-04 10:34:37 +08:00
taojinlong
d86531967f feat: sqlserver 2021-08-03 17:29:38 +08:00
junjie
5a0fcc52c9 refactor: 堆叠图优化 2021-08-03 16:12:15 +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
junjie
1ceee0f445 feat: 函数库flyway 2021-08-03 15:06:40 +08:00
junjie
a76ab93009 feat: 函数库flyway 2021-08-03 14:35:39 +08:00
junjie
ddcfd700ff feat: 函数库flyway 2021-08-03 13:24:35 +08:00
taojinlong
41f3b001a7 Merge branch 'dev' into pr@dev@sqlserver 2021-08-03 12:23:23 +08:00
fit2cloud-chenyw
6fa6cc83a1 fix: 资源权限逻辑错误 2021-08-03 09:52:49 +08:00
taojinlong
532cdf67b4 fix: 执行问任务后删除文件 2021-08-02 21:18:33 +08:00
taojinlong
ac8f71577b Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-02 18:33:10 +08:00
taojinlong
e5c4606334 feat: 可配置kettle 相关的文件是否保留 2021-08-02 18:32:44 +08:00
fit2cloud-chenyw
f9493fe2d7 fix: token过期点击确定没有跳转到登录 2021-08-02 18:27:03 +08:00
taojinlong
fbb884bcbf Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-02 18:13:33 +08:00
taojinlong
6261dff6cc fix: 校验增量更新sql 2021-08-02 18:13:24 +08:00
fit2cloud-chenyw
e459225f3b feat: 完善全局token 2021-08-02 17:52:43 +08:00
XiaJunjie2020
c2674f738d
Merge pull request #463 from dataease/pr@dev@feat_支持公式编辑 
feat: 支持字段编辑
 2021-08-02 16:37:16 +08:00
taojinlong
4b5d272f63 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-02 16:36:39 +08:00
taojinlong
285c48143f fix: 更新任务状态 2021-08-02 16:36:23 +08:00
junjie
28d93227f4 feat: 支持字段编辑 2021-08-02 16:34:11 +08:00
fit2cloud-chenyw
91b2b29108
Merge pull request #461 from dataease/pr@dev@feat_去除openApi 
feat: 去除openApi
 2021-08-02 16:09:28 +08:00
fit2cloud-chenyw
17585b4239 feat: 去除openApi 2021-08-02 16:07:59 +08:00
junjie
15cfbaaea8 feat: 字段支持公式计算 2021-08-02 15:46:12 +08:00
fit2cloud-chenyw
de5022a1fb fix: 公共链接分享未启用密码保护出现空白页面 2021-08-02 15:41:36 +08:00
fit2cloud-chenyw
22faf33a01
Merge pull request #456 from dataease/pr@dev@feat_完善api 
feat: 补齐api
 2021-08-02 15:02:05 +08:00
fit2cloud-chenyw
b3c63dda62 feat: 补齐api 2021-08-02 15:00:46 +08:00
taojinlong
350303baf3 refactor: 去掉无用代码 2021-08-02 14:34:18 +08:00
taojinlong
96e6ab150c 支持 sqlserver 2021-08-02 14:30:35 +08:00
taojinlong
cc2bf3e3c1 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-02 13:39:40 +08:00
taojinlong
7376becd68 fix： 处理 excel 公式错误 2021-08-02 13:39:30 +08:00
fit2cloud-chenyw
81ee2455fd
Merge pull request #454 from dataease/feat_完善api 
fix: 删除无用代码 增加knife4j api文档
 2021-08-02 12:14:08 +08:00
fit2cloud-chenyw
b3d0b32e19 fix: 删除无用代码 增加knife4j api文档 2021-08-02 12:01:29 +08:00
taojinlong
084aab5e92 feat： 优化查询任务日志 2021-08-02 10:08:33 +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
57f131d86d fix: tree搜索 2021-07-31 16:55:53 +08:00
junjie
4c5290d87b fix: tree搜索 2021-07-31 16:13:53 +08:00
wangjiahao
dde57617ba refactor:恢复v17 flyway 2021-07-30 17:04:54 +08:00
junjie
91a0f71a35 fix: doris类型转换 2021-07-30 16:34:27 +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
fit2cloud-chenyw
ed1fcd7671 fix: 标记已读未记录查看时间 2021-07-30 12:02:39 +08:00
taojinlong
0ab579b4fe Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-29 19:22:52 +08:00
taojinlong
0a0a38c9d7 fix: 任务管理增加权限-> 用户只能管理拥有[管理权限]的数据集的任务 2021-07-29 19:22:29 +08:00
fit2cloud-chenyw
bcd786c48c refactor: 查看分享链接使用独立拦截器 2021-07-29 16:46:17 +08:00
taojinlong
3db9e41108 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-29 16:17:14 +08:00
taojinlong
42b8840a58 fix: 校验 excel 空单元格 2021-07-29 16:17:03 +08:00
XiaJunjie2020
70cacc656a
Merge pull request #411 from dataease/pr@dev@feat_数据集字段管理支持公式函数等运算（UI与CRUD） 
fix: 数据集切换页面权限问题
 2021-07-29 15:31:27 +08:00
junjie
be0b530bfe feat(数据集): 数据集字段支持公式运算等操作（UI和CRUD） 2021-07-29 15:13:18 +08:00
junjie
b99d9e2d8b feat(数据集): 数据集字段支持公式运算等操作（UI和CRUD） 2021-07-29 15:12:29 +08:00
wangjiahao
ecd06677fb refactor:去掉数据库创建函数root用户限制 2021-07-29 15:09:53 +08:00
wangjiahao
fdf8ca012d fix:修复普通用户创建视图权限查不到的问题 2021-07-29 15:05:23 +08:00
taojinlong
86f0791a4f fix: 任务列表上次执行时间与执行记录执行时间不一致 2021-07-29 12:18:29 +08:00
taojinlong
9536f730ed Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-29 11:29:03 +08:00
taojinlong
14b456f32a fix: 校验 excel 第一行不能有空格 2021-07-29 11:28:50 +08:00
wangjiahao
6a29e2b45c refactor:调整flyway 2021-07-29 10:52:44 +08:00
wangjiahao
33da6c00d0 refactor:菜单权限控制增加显示标志，可以区分菜单师傅接受权限控制 2021-07-29 10:48:17 +08:00
xiajunjie
0e95154a4d fix: 底层sql逻辑 2021-07-28 21:37:23 +08:00
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
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
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
taojinlong
8a39eeee9c feat: Doris table KEY 类型：UNIQUE 2021-06-16 14:42:02 +08:00
junjie
b622ee8ae7 feat(fix):定时任务修复 2021-06-16 14:09:37 +08:00
fit2cloud-chenyw
4dff1f4d96 fix: 修复'不包含'查询逻辑 2021-06-16 11:09:20 +08:00
junjie
93d380673e feat(fix):数据集预览分页优化 2021-06-16 10:38:33 +08:00
wangjiahao
0b1d5a07c9 Merge remote-tracking branch 'origin/main' into main 2021-06-16 10:24:38 +08:00
wangjiahao
d13c69496f fix: 修复因放开管理员权限而导致的权限问题 2021-06-16 10:24:25 +08:00
fit2cloud-chenyw
1881b60f71 fix: 修改用户管理查询条件label 2021-06-16 10:09:50 +08:00
junjie
137ddafd7e feat(fix):自定义数据集错误提示优化 2021-06-16 09:22:48 +08:00
junjie
1c4d9fe371 feat(fix):自定义数据集字段顺序优化 2021-06-15 18:26:01 +08:00
taojinlong
ef6385d529 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-15 17:51:28 +08:00
taojinlong
a75734b948 feat: 增量更新的sql，增加校验 2021-06-15 17:51:18 +08:00
junjie
f261acb72f feat(fix):视图字段变化优化；过滤组件优化；返回数据优化 2021-06-15 17:11:47 +08:00
junjie
c084ac68cf feat(fix):直连数据集限制预览数目；数据源文字替换 2021-06-15 16:01:30 +08:00
taojinlong
07f520698c feat: 更改 doris key 类型 2021-06-15 14:41:02 +08:00
junjie
139952b110 feat(fix):自定义数据集选择字段顺序优化，按照用户点击顺序 2021-06-11 17:36:25 +08:00
junjie
d8830e1753 feat(fix):删除数据集，自定义数据集报错；添加视图数据预览滚动条优化；关联数据表名优化；切换视图，不清空维度 2021-06-11 17:11:13 +08:00
taojinlong
0011bae39c fix: sql 数据集 抽取 2021-06-11 16:59:10 +08:00
taojinlong
dbf671c4f7 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-11 16:47:54 +08:00
taojinlong
6c62ff00a6 fix: sql 数据集 抽取 2021-06-11 16:47:42 +08:00
fit2cloud-chenyw
ec0a1f9524 fix: 【ID1004304】全新安装的环境，添加license的时候页面报错 2021-06-11 16:06:15 +08:00
junjie
e53363d828 feat(同步任务):定时任务开始时间修复 2021-06-11 14:23:53 +08:00
wangjiahao
0c4f54bb6f Merge remote-tracking branch 'origin/main' into main 2021-06-11 14:04:40 +08:00
wangjiahao
cfa88996b7 feat: admin 等默认管理员权限全开 2021-06-11 14:04:30 +08:00
junjie
26bc2b605e feat(backend):数据计算sql修复 2021-06-11 13:35:11 +08:00
taojinlong
f89c0819f4 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-11 12:47:52 +08:00